diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_1.svg b/cells/a2111o/sky130_fd_sc_hs__a2111o_1.svg
index c0ff1e7..9ea2502 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_1.svg
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 625.5 616.5 L 659.5 616.5 L 659.5 762.5 L 625.5 762.5 Z M 708.5 616.5 L 742.5 616.5 L 742.5 762.5 L 708.5 762.5 Z M 1072.5 616.5 L 1106.5 616.5 L 1106.5 762.5 L 1072.5 762.5 Z M 930.5 616.5 L 964.5 616.5 L 964.5 762.5 L 930.5 762.5 Z M 831.5 616.5 L 866.5 616.5 L 866.5 762.5 L 831.5 762.5 Z M 1324.5 659.5 L 1358.5 659.5 L 1358.5 829.5 L 1324.5 829.5 Z M 1324.5 659.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 1016.5 240.5 L 1050.5 240.5 L 1050.5 469.5 L 1016.5 469.5 Z M 622.5 240.5 L 656.5 240.5 L 656.5 469.5 L 622.5 469.5 Z M 734.5 240.5 L 768.5 240.5 L 768.5 469.5 L 734.5 469.5 Z M 837.5 240.5 L 871.5 240.5 L 871.5 469.5 L 837.5 469.5 Z M 926.5 240.5 L 961.5 240.5 L 961.5 469.5 L 926.5 469.5 Z M 1321.5 240.5 L 1355.5 240.5 L 1355.5 496.5 L 1321.5 496.5 Z M 1321.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -192,6 +192,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 1102.476562 527.503906 L 1091.90625 527.503906 L 1091.90625 523.261719 L 1093.722656 523.058594 L 1095.339844 522.789062 L 1096.753906 522.453125 L 1097.964844 522.183594 L 1098.972656 521.847656 L 1099.847656 521.445312 L 1100.523438 521.039062 L 1101.128906 520.570312 L 1101.667969 520.03125 L 1102.207031 519.355469 L 1102.675781 518.617188 L 1103.148438 517.742188 L 1103.351562 517.269531 L 1103.550781 516.730469 L 1103.753906 516.125 L 1104.023438 515.386719 L 1104.226562 514.644531 L 1104.496094 513.769531 L 1108.398438 513.769531 L 1108.398438 561.5 L 1102.476562 561.5 Z M 1102.476562 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_2.svg b/cells/a2111o/sky130_fd_sc_hs__a2111o_2.svg
index 10dae8a..eb775b5 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_2.svg
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1342.5 664.5 L 1377.5 664.5 L 1377.5 833.5 L 1342.5 833.5 Z M 522.5 664.5 L 556.5 664.5 L 556.5 833.5 L 522.5 833.5 Z M 620.5 664.5 L 655.5 664.5 L 655.5 833.5 L 620.5 833.5 Z M 889.5 664.5 L 923.5 664.5 L 923.5 833.5 L 889.5 833.5 Z M 996.5 664.5 L 1031.5 664.5 L 1031.5 833.5 L 996.5 833.5 Z M 1095.5 664.5 L 1129.5 664.5 L 1129.5 833.5 L 1095.5 833.5 Z M 1260.5 664.5 L 1294.5 664.5 L 1294.5 833.5 L 1260.5 833.5 Z M 1260.5 664.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 1346.5 240.5 L 1380.5 240.5 L 1380.5 496.5 L 1346.5 496.5 Z M 518.5 240.5 L 553.5 240.5 L 553.5 496.5 L 518.5 496.5 Z M 622.5 240.5 L 656.5 240.5 L 656.5 496.5 L 622.5 496.5 Z M 885.5 240.5 L 920.5 240.5 L 920.5 496.5 L 885.5 496.5 Z M 975.5 240.5 L 1009.5 240.5 L 1009.5 496.5 L 975.5 496.5 Z M 1098.5 240.5 L 1133.5 240.5 L 1133.5 496.5 L 1098.5 496.5 Z M 1222.5 240.5 L 1256.5 240.5 L 1256.5 496.5 L 1222.5 496.5 Z M 1222.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -191,6 +191,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 580.824219 282.320312 L 598.191406 307.5 L 590.449219 307.5 L 577.050781 287.035156 L 563.589844 307.5 L 555.980469 307.5 L 573.351562 282.320312 L 557.058594 258.421875 L 564.664062 258.421875 L 577.253906 277.675781 L 589.910156 258.421875 L 597.382812 258.421875 Z M 580.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 556 816 L 595 816 M 556 777 L 595 777 M 556 777 L 556 816 M 595 777 L 595 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 556 816 L 595 816 M 556 777 L 595 777 M 595 816 L 595 777 M 556 816 L 556 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111o/sky130_fd_sc_hs__a2111o_4.svg b/cells/a2111o/sky130_fd_sc_hs__a2111o_4.svg
index 1a7549a..1c0b1f6 100644
--- a/cells/a2111o/sky130_fd_sc_hs__a2111o_4.svg
+++ b/cells/a2111o/sky130_fd_sc_hs__a2111o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 432.5 638.5 L 459.5 638.5 L 459.5 774.5 L 432.5 774.5 Z M 1607.5 656.5 L 1635.5 656.5 L 1635.5 774.5 L 1607.5 774.5 Z M 1528.5 656.5 L 1556.5 656.5 L 1556.5 774.5 L 1528.5 774.5 Z M 1449.5 656.5 L 1477.5 656.5 L 1477.5 774.5 L 1449.5 774.5 Z M 1370.5 656.5 L 1398.5 656.5 L 1398.5 774.5 L 1370.5 774.5 Z M 1155.5 656.5 L 1183.5 656.5 L 1183.5 774.5 L 1155.5 774.5 Z M 1076.5 656.5 L 1103.5 656.5 L 1103.5 774.5 L 1076.5 774.5 Z M 995.5 656.5 L 1023.5 656.5 L 1023.5 774.5 L 995.5 774.5 Z M 916.5 656.5 L 944.5 656.5 L 944.5 774.5 L 916.5 774.5 Z M 835.5 656.5 L 863.5 656.5 L 863.5 774.5 L 835.5 774.5 Z M 756.5 656.5 L 784.5 656.5 L 784.5 774.5 L 756.5 774.5 Z M 669.5 638.5 L 696.5 638.5 L 696.5 774.5 L 669.5 774.5 Z M 590.5 638.5 L 617.5 638.5 L 617.5 774.5 L 590.5 774.5 Z M 511.5 638.5 L 538.5 638.5 L 538.5 774.5 L 511.5 774.5 Z M 511.5 638.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1604.5 298.5 L 1632.5 298.5 L 1632.5 481.5 L 1604.5 481.5 Z M 1522.5 298.5 L 1549.5 298.5 L 1549.5 481.5 L 1522.5 481.5 Z M 1356.5 298.5 L 1384.5 298.5 L 1384.5 481.5 L 1356.5 481.5 Z M 930.5 298.5 L 957.5 298.5 L 957.5 481.5 L 930.5 481.5 Z M 847.5 298.5 L 875.5 298.5 L 875.5 481.5 L 847.5 481.5 Z M 1273.5 298.5 L 1301.5 298.5 L 1301.5 481.5 L 1273.5 481.5 Z M 764.5 298.5 L 792.5 298.5 L 792.5 481.5 L 764.5 481.5 Z M 1439.5 298.5 L 1467.5 298.5 L 1467.5 481.5 L 1439.5 481.5 Z M 1012.5 298.5 L 1040.5 298.5 L 1040.5 481.5 L 1012.5 481.5 Z M 1191.5 298.5 L 1218.5 298.5 L 1218.5 481.5 L 1191.5 481.5 Z M 586.5 298.5 L 614.5 298.5 L 614.5 504.5 L 586.5 504.5 Z M 503.5 298.5 L 531.5 298.5 L 531.5 504.5 L 503.5 504.5 Z M 338.5 298.5 L 365.5 298.5 L 365.5 504.5 L 338.5 504.5 Z M 421.5 298.5 L 448.5 298.5 L 448.5 504.5 L 421.5 504.5 Z M 421.5 298.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface357">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -185,6 +185,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 1512.097656 527.878906 L 1503.507812 527.878906 L 1503.507812 524.429688 L 1504.984375 524.265625 L 1506.296875 524.046875 L 1507.445312 523.773438 L 1508.429688 523.554688 L 1509.25 523.28125 L 1509.960938 522.953125 L 1510.511719 522.625 L 1511.003906 522.242188 L 1511.441406 521.804688 L 1511.878906 521.257812 L 1512.261719 520.65625 L 1512.644531 519.945312 L 1512.808594 519.5625 L 1512.972656 519.125 L 1513.136719 518.632812 L 1513.355469 518.03125 L 1513.519531 517.429688 L 1513.738281 516.71875 L 1516.910156 516.71875 L 1516.910156 555.5 L 1512.097656 555.5 Z M 1512.097656 527.878906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1473 559 L 1504 559 M 1473 528 L 1504 528 M 1473 528 L 1473 559 M 1504 528 L 1504 559 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1473 559 L 1504 559 M 1473 528 L 1504 528 M 1504 559 L 1504 528 M 1473 559 L 1473 528 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.svg b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.svg
index 9575f7d..9daa4b1 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.svg
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1178.5 664.5 L 1213.5 664.5 L 1213.5 833.5 L 1178.5 833.5 Z M 725.5 664.5 L 759.5 664.5 L 759.5 833.5 L 725.5 833.5 Z M 823.5 664.5 L 858.5 664.5 L 858.5 833.5 L 823.5 833.5 Z M 972.5 664.5 L 1007.5 664.5 L 1007.5 833.5 L 972.5 833.5 Z M 1071.5 664.5 L 1105.5 664.5 L 1105.5 833.5 L 1071.5 833.5 Z M 1071.5 664.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1182.5 240.5 L 1216.5 240.5 L 1216.5 496.5 L 1182.5 496.5 Z M 721.5 240.5 L 756.5 240.5 L 756.5 496.5 L 721.5 496.5 Z M 811.5 240.5 L 845.5 240.5 L 845.5 496.5 L 811.5 496.5 Z M 934.5 240.5 L 969.5 240.5 L 969.5 496.5 L 934.5 496.5 Z M 1058.5 240.5 L 1093.5 240.5 L 1093.5 496.5 L 1058.5 496.5 Z M 1058.5 240.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface310">
+<g id="surface338">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,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 856.554688 288.246094 L 856.554688 307.5 L 850.292969 307.5 L 850.292969 288.246094 L 831.375 258.421875 L 839.117188 258.421875 L 853.523438 282.320312 L 867.527344 258.421875 L 875 258.421875 Z M 856.554688 288.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 832 816 L 871 816 M 832 777 L 871 777 M 832 777 L 832 816 M 871 777 L 871 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 832 816 L 871 816 M 832 777 L 871 777 M 871 816 L 871 777 M 832 816 L 832 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.svg b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.svg
index 01e0d3b..0120ee2 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.svg
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1486.5 664.5 L 1520.5 664.5 L 1520.5 833.5 L 1486.5 833.5 Z M 521.5 664.5 L 555.5 664.5 L 555.5 833.5 L 521.5 833.5 Z M 644.5 664.5 L 679.5 664.5 L 679.5 833.5 L 644.5 833.5 Z M 768.5 664.5 L 803.5 664.5 L 803.5 833.5 L 768.5 833.5 Z M 1188.5 664.5 L 1222.5 664.5 L 1222.5 833.5 L 1188.5 833.5 Z M 1286.5 664.5 L 1321.5 664.5 L 1321.5 833.5 L 1286.5 833.5 Z M 1385.5 664.5 L 1419.5 664.5 L 1419.5 833.5 L 1385.5 833.5 Z M 1385.5 664.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1489.5 240.5 L 1523.5 240.5 L 1523.5 496.5 L 1489.5 496.5 Z M 442.5 240.5 L 476.5 240.5 L 476.5 496.5 L 442.5 496.5 Z M 545.5 240.5 L 579.5 240.5 L 579.5 496.5 L 545.5 496.5 Z M 648.5 240.5 L 682.5 240.5 L 682.5 496.5 L 648.5 496.5 Z M 751.5 240.5 L 785.5 240.5 L 785.5 496.5 L 751.5 496.5 Z M 973.5 240.5 L 1008.5 240.5 L 1008.5 496.5 L 973.5 496.5 Z M 1077.5 240.5 L 1111.5 240.5 L 1111.5 496.5 L 1077.5 496.5 Z M 1180.5 240.5 L 1214.5 240.5 L 1214.5 496.5 L 1180.5 496.5 Z M 1283.5 240.5 L 1317.5 240.5 L 1317.5 496.5 L 1283.5 496.5 Z M 1386.5 240.5 L 1420.5 240.5 L 1420.5 496.5 L 1386.5 496.5 Z M 1386.5 240.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -185,6 +185,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 1373.773438 527.503906 L 1363.203125 527.503906 L 1363.203125 523.261719 L 1365.019531 523.058594 L 1366.636719 522.789062 L 1368.050781 522.453125 L 1369.261719 522.183594 L 1370.269531 521.847656 L 1371.148438 521.445312 L 1371.820312 521.039062 L 1372.425781 520.570312 L 1372.964844 520.03125 L 1373.503906 519.355469 L 1373.972656 518.617188 L 1374.445312 517.742188 L 1374.648438 517.269531 L 1374.847656 516.730469 L 1375.050781 516.125 L 1375.320312 515.386719 L 1375.523438 514.644531 L 1375.792969 513.769531 L 1379.695312 513.769531 L 1379.695312 561.5 L 1373.773438 561.5 Z M 1373.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1325 562 L 1364 562 M 1325 523 L 1364 523 M 1325 523 L 1325 562 M 1364 523 L 1364 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1325 562 L 1364 562 M 1325 523 L 1364 523 M 1364 562 L 1364 523 M 1325 562 L 1325 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.svg b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.svg
index b73ecb8..74dd037 100644
--- a/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.svg
+++ b/cells/a2111oi/sky130_fd_sc_hs__a2111oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1618.5 618.5 L 1641.5 618.5 L 1641.5 729.5 L 1618.5 729.5 Z M 402.5 618.5 L 424.5 618.5 L 424.5 729.5 L 402.5 729.5 Z M 466.5 618.5 L 489.5 618.5 L 489.5 729.5 L 466.5 729.5 Z M 531.5 618.5 L 553.5 618.5 L 553.5 729.5 L 531.5 729.5 Z M 595.5 618.5 L 618.5 618.5 L 618.5 729.5 L 595.5 729.5 Z M 795.5 618.5 L 817.5 618.5 L 817.5 729.5 L 795.5 729.5 Z M 859.5 618.5 L 882.5 618.5 L 882.5 729.5 L 859.5 729.5 Z M 1167.5 618.5 L 1189.5 618.5 L 1189.5 729.5 L 1167.5 729.5 Z M 1231.5 618.5 L 1254.5 618.5 L 1254.5 729.5 L 1231.5 729.5 Z M 1296.5 618.5 L 1318.5 618.5 L 1318.5 729.5 L 1296.5 729.5 Z M 1360.5 618.5 L 1383.5 618.5 L 1383.5 729.5 L 1360.5 729.5 Z M 1425.5 618.5 L 1447.5 618.5 L 1447.5 729.5 L 1425.5 729.5 Z M 1489.5 618.5 L 1512.5 618.5 L 1512.5 729.5 L 1489.5 729.5 Z M 1554.5 618.5 L 1576.5 618.5 L 1576.5 729.5 L 1554.5 729.5 Z M 1554.5 618.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1630.5 341.5 L 1652.5 341.5 L 1652.5 509.5 L 1630.5 509.5 Z M 266.5 341.5 L 289.5 341.5 L 289.5 509.5 L 266.5 509.5 Z M 334.5 341.5 L 356.5 341.5 L 356.5 509.5 L 334.5 509.5 Z M 401.5 341.5 L 424.5 341.5 L 424.5 509.5 L 401.5 509.5 Z M 469.5 341.5 L 491.5 341.5 L 491.5 509.5 L 469.5 509.5 Z M 536.5 341.5 L 559.5 341.5 L 559.5 509.5 L 536.5 509.5 Z M 604.5 341.5 L 626.5 341.5 L 626.5 509.5 L 604.5 509.5 Z M 671.5 341.5 L 694.5 341.5 L 694.5 509.5 L 671.5 509.5 Z M 739.5 341.5 L 761.5 341.5 L 761.5 509.5 L 739.5 509.5 Z M 887.5 341.5 L 910.5 341.5 L 910.5 509.5 L 887.5 509.5 Z M 955.5 341.5 L 977.5 341.5 L 977.5 509.5 L 955.5 509.5 Z M 1022.5 341.5 L 1045.5 341.5 L 1045.5 509.5 L 1022.5 509.5 Z M 1090.5 341.5 L 1112.5 341.5 L 1112.5 509.5 L 1090.5 509.5 Z M 1157.5 341.5 L 1180.5 341.5 L 1180.5 509.5 L 1157.5 509.5 Z M 1225.5 341.5 L 1247.5 341.5 L 1247.5 509.5 L 1225.5 509.5 Z M 1292.5 341.5 L 1315.5 341.5 L 1315.5 509.5 L 1292.5 509.5 Z M 1360.5 341.5 L 1382.5 341.5 L 1382.5 509.5 L 1360.5 509.5 Z M 1427.5 341.5 L 1450.5 341.5 L 1450.5 509.5 L 1427.5 509.5 Z M 1495.5 341.5 L 1517.5 341.5 L 1517.5 509.5 L 1495.5 509.5 Z M 1562.5 341.5 L 1585.5 341.5 L 1585.5 509.5 L 1562.5 509.5 Z M 1562.5 341.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image358"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface353">
+<g id="surface382">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -201,6 +201,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1409.71875 529.542969 L 1402.890625 529.542969 L 1402.890625 526.804688 L 1404.066406 526.675781 L 1405.109375 526.5 L 1406.023438 526.28125 L 1406.804688 526.109375 L 1407.457031 525.890625 L 1408.023438 525.628906 L 1408.457031 525.371094 L 1408.847656 525.066406 L 1409.195312 524.71875 L 1409.542969 524.28125 L 1409.847656 523.804688 L 1410.152344 523.238281 L 1410.28125 522.933594 L 1410.414062 522.585938 L 1410.542969 522.195312 L 1410.71875 521.71875 L 1410.847656 521.238281 L 1411.023438 520.675781 L 1413.542969 520.675781 L 1413.542969 551.5 L 1409.71875 551.5 Z M 1409.71875 529.542969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1378 557 L 1404 557 M 1378 531 L 1404 531 M 1378 531 L 1378 557 M 1404 531 L 1404 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1378 557 L 1404 557 M 1378 531 L 1404 531 M 1404 557 L 1404 531 M 1378 557 L 1378 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_1.svg b/cells/a211o/sky130_fd_sc_hs__a211o_1.svg
index c9c6867..a1372a0 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_1.svg
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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 1114.5 616.5 L 1149.5 616.5 L 1149.5 762.5 L 1114.5 762.5 Z M 907.5 616.5 L 941.5 616.5 L 941.5 762.5 L 907.5 762.5 Z M 1229.5 616.5 L 1263.5 616.5 L 1263.5 762.5 L 1229.5 762.5 Z M 1016.5 616.5 L 1050.5 616.5 L 1050.5 762.5 L 1016.5 762.5 Z M 781.5 664.5 L 815.5 664.5 L 815.5 833.5 L 781.5 833.5 Z M 781.5 664.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 1207.5 240.5 L 1242.5 240.5 L 1242.5 469.5 L 1207.5 469.5 Z M 1118.5 240.5 L 1152.5 240.5 L 1152.5 469.5 L 1118.5 469.5 Z M 905.5 240.5 L 939.5 240.5 L 939.5 469.5 L 905.5 469.5 Z M 1015.5 240.5 L 1049.5 240.5 L 1049.5 469.5 L 1015.5 469.5 Z M 618.5 240.5 L 653.5 240.5 L 653.5 496.5 L 618.5 496.5 Z M 618.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.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>
@@ -168,6 +168,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 1155.773438 527.503906 L 1145.203125 527.503906 L 1145.203125 523.261719 L 1147.019531 523.058594 L 1148.636719 522.789062 L 1150.050781 522.453125 L 1151.261719 522.183594 L 1152.269531 521.847656 L 1153.148438 521.445312 L 1153.820312 521.039062 L 1154.425781 520.570312 L 1154.964844 520.03125 L 1155.503906 519.355469 L 1155.972656 518.617188 L 1156.445312 517.742188 L 1156.648438 517.269531 L 1156.847656 516.730469 L 1157.050781 516.125 L 1157.320312 515.386719 L 1157.523438 514.644531 L 1157.792969 513.769531 L 1161.695312 513.769531 L 1161.695312 561.5 L 1155.773438 561.5 Z M 1155.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1107 562 L 1146 562 M 1107 523 L 1146 523 M 1107 523 L 1107 562 M 1146 523 L 1146 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1107 562 L 1146 562 M 1107 523 L 1146 523 M 1146 562 L 1146 523 M 1107 562 L 1107 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_2.svg b/cells/a211o/sky130_fd_sc_hs__a211o_2.svg
index 2b2858d..09cbc9d 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_2.svg
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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 1275.5 664.5 L 1309.5 664.5 L 1309.5 833.5 L 1275.5 833.5 Z M 661.5 664.5 L 695.5 664.5 L 695.5 833.5 L 661.5 833.5 Z M 759.5 664.5 L 793.5 664.5 L 793.5 833.5 L 759.5 833.5 Z M 945.5 664.5 L 979.5 664.5 L 979.5 833.5 L 945.5 833.5 Z M 1027.5 664.5 L 1062.5 664.5 L 1062.5 833.5 L 1027.5 833.5 Z M 1151.5 664.5 L 1185.5 664.5 L 1185.5 833.5 L 1151.5 833.5 Z M 1151.5 664.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 1271.5 240.5 L 1306.5 240.5 L 1306.5 469.5 L 1271.5 469.5 Z M 1175.5 240.5 L 1209.5 240.5 L 1209.5 469.5 L 1175.5 469.5 Z M 948.5 240.5 L 983.5 240.5 L 983.5 469.5 L 948.5 469.5 Z M 1072.5 240.5 L 1106.5 240.5 L 1106.5 469.5 L 1072.5 469.5 Z M 623.5 240.5 L 657.5 240.5 L 657.5 496.5 L 623.5 496.5 Z M 726.5 240.5 L 760.5 240.5 L 760.5 496.5 L 726.5 496.5 Z M 726.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.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>
@@ -170,6 +170,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 691.824219 282.320312 L 709.191406 307.5 L 701.449219 307.5 L 688.050781 287.035156 L 674.589844 307.5 L 666.980469 307.5 L 684.351562 282.320312 L 668.058594 258.421875 L 675.664062 258.421875 L 688.253906 277.675781 L 700.910156 258.421875 L 708.382812 258.421875 Z M 691.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 667 816 L 706 816 M 667 777 L 706 777 M 667 777 L 667 816 M 706 777 L 706 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 667 816 L 706 816 M 667 777 L 706 777 M 706 816 L 706 777 M 667 816 L 667 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211o/sky130_fd_sc_hs__a211o_4.svg b/cells/a211o/sky130_fd_sc_hs__a211o_4.svg
index 624eaa9..2ba4587 100644
--- a/cells/a211o/sky130_fd_sc_hs__a211o_4.svg
+++ b/cells/a211o/sky130_fd_sc_hs__a211o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1552.5 621.5 L 1583.5 621.5 L 1583.5 754.5 L 1552.5 754.5 Z M 1373.5 621.5 L 1404.5 621.5 L 1404.5 754.5 L 1373.5 754.5 Z M 1104.5 621.5 L 1135.5 621.5 L 1135.5 754.5 L 1104.5 754.5 Z M 1284.5 621.5 L 1315.5 621.5 L 1315.5 754.5 L 1284.5 754.5 Z M 1462.5 621.5 L 1494.5 621.5 L 1494.5 754.5 L 1462.5 754.5 Z M 1006.5 637.5 L 1037.5 637.5 L 1037.5 769.5 L 1006.5 769.5 Z M 815.5 651.5 L 846.5 651.5 L 846.5 784.5 L 815.5 784.5 Z M 904.5 651.5 L 935.5 651.5 L 935.5 784.5 L 904.5 784.5 Z M 625.5 651.5 L 656.5 651.5 L 656.5 804.5 L 625.5 804.5 Z M 536.5 651.5 L 567.5 651.5 L 567.5 804.5 L 536.5 804.5 Z M 447.5 651.5 L 478.5 651.5 L 478.5 804.5 L 447.5 804.5 Z M 714.5 651.5 L 745.5 651.5 L 745.5 804.5 L 714.5 804.5 Z M 714.5 651.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1548.5 268.5 L 1579.5 268.5 L 1579.5 475.5 L 1548.5 475.5 Z M 1455.5 268.5 L 1486.5 268.5 L 1486.5 475.5 L 1455.5 475.5 Z M 1195.5 268.5 L 1226.5 268.5 L 1226.5 475.5 L 1195.5 475.5 Z M 806.5 268.5 L 837.5 268.5 L 837.5 475.5 L 806.5 475.5 Z M 1101.5 268.5 L 1132.5 268.5 L 1132.5 475.5 L 1101.5 475.5 Z M 1362.5 268.5 L 1393.5 268.5 L 1393.5 475.5 L 1362.5 475.5 Z M 910.5 268.5 L 941.5 268.5 L 941.5 475.5 L 910.5 475.5 Z M 1003.5 268.5 L 1034.5 268.5 L 1034.5 475.5 L 1003.5 475.5 Z M 512.5 268.5 L 543.5 268.5 L 543.5 500.5 L 512.5 500.5 Z M 419.5 268.5 L 450.5 268.5 L 450.5 500.5 L 419.5 500.5 Z M 326.5 268.5 L 357.5 268.5 L 357.5 500.5 L 326.5 500.5 Z M 605.5 268.5 L 636.5 268.5 L 636.5 500.5 L 605.5 500.5 Z M 605.5 268.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface310">
+<g id="surface339">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,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 1483.582031 527.335938 L 1473.894531 527.335938 L 1473.894531 523.449219 L 1475.558594 523.261719 L 1477.042969 523.015625 L 1478.335938 522.707031 L 1479.449219 522.460938 L 1480.375 522.152344 L 1481.175781 521.78125 L 1481.792969 521.410156 L 1482.347656 520.980469 L 1482.84375 520.484375 L 1483.335938 519.867188 L 1483.769531 519.191406 L 1484.199219 518.386719 L 1484.386719 517.957031 L 1484.570312 517.460938 L 1484.753906 516.90625 L 1485.003906 516.226562 L 1485.1875 515.550781 L 1485.433594 514.746094 L 1489.011719 514.746094 L 1489.011719 558.5 L 1483.582031 558.5 Z M 1483.582031 527.335938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1439 560 L 1474 560 M 1439 525 L 1474 525 M 1439 525 L 1439 560 M 1474 525 L 1474 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1439 560 L 1474 560 M 1439 525 L 1474 525 M 1474 560 L 1474 525 M 1439 560 L 1439 525 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_1.svg b/cells/a211oi/sky130_fd_sc_hs__a211oi_1.svg
index d25dfdc..9c395d9 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_1.svg
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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 1111.5 664.5 L 1145.5 664.5 L 1145.5 833.5 L 1111.5 833.5 Z M 781.5 664.5 L 815.5 664.5 L 815.5 833.5 L 781.5 833.5 Z M 863.5 664.5 L 898.5 664.5 L 898.5 833.5 L 863.5 833.5 Z M 987.5 664.5 L 1022.5 664.5 L 1022.5 833.5 L 987.5 833.5 Z M 987.5 664.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 1114.5 240.5 L 1149.5 240.5 L 1149.5 496.5 L 1114.5 496.5 Z M 777.5 240.5 L 812.5 240.5 L 812.5 496.5 L 777.5 496.5 Z M 901.5 240.5 L 936.5 240.5 L 936.5 496.5 L 901.5 496.5 Z M 1004.5 240.5 L 1039.5 240.5 L 1039.5 496.5 L 1004.5 496.5 Z M 1004.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.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>
@@ -164,6 +164,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 936.773438 527.503906 L 926.203125 527.503906 L 926.203125 523.261719 L 928.019531 523.058594 L 929.636719 522.789062 L 931.050781 522.453125 L 932.261719 522.183594 L 933.269531 521.847656 L 934.148438 521.445312 L 934.820312 521.039062 L 935.425781 520.570312 L 935.964844 520.03125 L 936.503906 519.355469 L 936.972656 518.617188 L 937.445312 517.742188 L 937.648438 517.269531 L 937.847656 516.730469 L 938.050781 516.125 L 938.320312 515.386719 L 938.523438 514.644531 L 938.792969 513.769531 L 942.695312 513.769531 L 942.695312 561.5 L 936.773438 561.5 Z M 936.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 889 562 L 928 562 M 889 523 L 928 523 M 889 523 L 889 562 M 928 523 L 928 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 889 562 L 928 562 M 889 523 L 928 523 M 928 562 L 928 523 M 889 562 L 889 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_2.svg b/cells/a211oi/sky130_fd_sc_hs__a211oi_2.svg
index b051fdb..3fef613 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_2.svg
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image319" 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="#image319"/>
+  <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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#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 1244.5 664.5 L 1278.5 664.5 L 1278.5 833.5 L 1244.5 833.5 Z M 515.5 664.5 L 549.5 664.5 L 549.5 833.5 L 515.5 833.5 Z M 614.5 664.5 L 648.5 664.5 L 648.5 833.5 L 614.5 833.5 Z M 712.5 664.5 L 746.5 664.5 L 746.5 833.5 L 712.5 833.5 Z M 820.5 664.5 L 854.5 664.5 L 854.5 833.5 L 820.5 833.5 Z M 1044.5 664.5 L 1079.5 664.5 L 1079.5 833.5 L 1044.5 833.5 Z M 1044.5 664.5 "/>
 </clipPath>
-<image id="image320" 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="#image320"/>
+  <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 1357.5 240.5 L 1392.5 240.5 L 1392.5 496.5 L 1357.5 496.5 Z M 507.5 240.5 L 541.5 240.5 L 541.5 496.5 L 507.5 496.5 Z M 610.5 240.5 L 644.5 240.5 L 644.5 496.5 L 610.5 496.5 Z M 713.5 240.5 L 748.5 240.5 L 748.5 496.5 L 713.5 496.5 Z M 816.5 240.5 L 851.5 240.5 L 851.5 496.5 L 816.5 496.5 Z M 1048.5 240.5 L 1082.5 240.5 L 1082.5 496.5 L 1048.5 496.5 Z M 1151.5 240.5 L 1185.5 240.5 L 1185.5 496.5 L 1151.5 496.5 Z M 1254.5 240.5 L 1289.5 240.5 L 1289.5 496.5 L 1254.5 496.5 Z M 1254.5 240.5 "/>
 </clipPath>
-<image id="image321" 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="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image322" 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="#image322"/>
+  <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="surface316">
+<g id="surface344">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,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 494.773438 612.503906 L 484.203125 612.503906 L 484.203125 608.261719 L 486.019531 608.058594 L 487.636719 607.789062 L 489.050781 607.453125 L 490.261719 607.183594 L 491.269531 606.847656 L 492.148438 606.445312 L 492.820312 606.039062 L 493.425781 605.570312 L 493.964844 605.03125 L 494.503906 604.355469 L 494.972656 603.617188 L 495.445312 602.742188 L 495.648438 602.269531 L 495.847656 601.730469 L 496.050781 601.125 L 496.320312 600.386719 L 496.523438 599.644531 L 496.792969 598.769531 L 500.695312 598.769531 L 500.695312 646.5 L 494.773438 646.5 Z M 494.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 446 477 L 485 477 M 446 438 L 485 438 M 446 438 L 446 477 M 485 438 L 485 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 446 477 L 485 477 M 446 438 L 485 438 M 485 477 L 485 438 M 446 477 L 446 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a211oi/sky130_fd_sc_hs__a211oi_4.svg b/cells/a211oi/sky130_fd_sc_hs__a211oi_4.svg
index 81af1ff..b87bcd3 100644
--- a/cells/a211oi/sky130_fd_sc_hs__a211oi_4.svg
+++ b/cells/a211oi/sky130_fd_sc_hs__a211oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image380"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image380"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1421.5 632.5 L 1447.5 632.5 L 1447.5 761.5 L 1421.5 761.5 Z M 333.5 632.5 L 359.5 632.5 L 359.5 761.5 L 333.5 761.5 Z M 408.5 632.5 L 434.5 632.5 L 434.5 761.5 L 408.5 761.5 Z M 483.5 632.5 L 509.5 632.5 L 509.5 761.5 L 483.5 761.5 Z M 558.5 632.5 L 584.5 632.5 L 584.5 761.5 L 558.5 761.5 Z M 632.5 632.5 L 659.5 632.5 L 659.5 761.5 L 632.5 761.5 Z M 707.5 632.5 L 733.5 632.5 L 733.5 761.5 L 707.5 761.5 Z M 782.5 632.5 L 808.5 632.5 L 808.5 761.5 L 782.5 761.5 Z M 857.5 632.5 L 883.5 632.5 L 883.5 761.5 L 857.5 761.5 Z M 1196.5 632.5 L 1222.5 632.5 L 1222.5 761.5 L 1196.5 761.5 Z M 1271.5 632.5 L 1297.5 632.5 L 1297.5 761.5 L 1271.5 761.5 Z M 1346.5 632.5 L 1372.5 632.5 L 1372.5 761.5 L 1346.5 761.5 Z M 1346.5 632.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image381"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1587.5 310.5 L 1613.5 310.5 L 1613.5 505.5 L 1587.5 505.5 Z M 322.5 310.5 L 348.5 310.5 L 348.5 505.5 L 322.5 505.5 Z M 400.5 310.5 L 426.5 310.5 L 426.5 505.5 L 400.5 505.5 Z M 478.5 310.5 L 505.5 310.5 L 505.5 505.5 L 478.5 505.5 Z M 557.5 310.5 L 583.5 310.5 L 583.5 505.5 L 557.5 505.5 Z M 635.5 310.5 L 661.5 310.5 L 661.5 505.5 L 635.5 505.5 Z M 713.5 310.5 L 739.5 310.5 L 739.5 505.5 L 713.5 505.5 Z M 792.5 310.5 L 818.5 310.5 L 818.5 505.5 L 792.5 505.5 Z M 870.5 310.5 L 896.5 310.5 L 896.5 505.5 L 870.5 505.5 Z M 1039.5 310.5 L 1065.5 310.5 L 1065.5 505.5 L 1039.5 505.5 Z M 1117.5 310.5 L 1143.5 310.5 L 1143.5 505.5 L 1117.5 505.5 Z M 1195.5 310.5 L 1221.5 310.5 L 1221.5 505.5 L 1195.5 505.5 Z M 1274.5 310.5 L 1300.5 310.5 L 1300.5 505.5 L 1274.5 505.5 Z M 1352.5 310.5 L 1378.5 310.5 L 1378.5 505.5 L 1352.5 505.5 Z M 1430.5 310.5 L 1456.5 310.5 L 1456.5 505.5 L 1430.5 505.5 Z M 1508.5 310.5 L 1535.5 310.5 L 1535.5 505.5 L 1508.5 505.5 Z M 1508.5 310.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface377">
+<g id="surface406">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -223,6 +223,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 855.203125 529.003906 L 847.277344 529.003906 L 847.277344 525.820312 L 848.640625 525.667969 L 849.851562 525.46875 L 850.914062 525.214844 L 851.820312 525.011719 L 852.578125 524.761719 L 853.234375 524.457031 L 853.738281 524.15625 L 854.195312 523.800781 L 854.597656 523.398438 L 855.003906 522.894531 L 855.355469 522.335938 L 855.707031 521.679688 L 855.859375 521.328125 L 856.011719 520.921875 L 856.164062 520.46875 L 856.367188 519.914062 L 856.515625 519.359375 L 856.71875 518.703125 L 859.648438 518.703125 L 859.648438 554.5 L 855.203125 554.5 Z M 855.203125 529.003906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 819 558 L 848 558 M 819 529 L 848 529 M 819 529 L 819 558 M 848 529 L 848 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 819 558 L 848 558 M 819 529 L 848 529 M 848 558 L 848 529 M 819 558 L 819 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_1.svg b/cells/a21bo/sky130_fd_sc_hs__a21bo_1.svg
index 4cdaa3e..4ba39f2 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_1.svg
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 627.5 616.5 L 662.5 616.5 L 662.5 762.5 L 627.5 762.5 Z M 710.5 616.5 L 744.5 616.5 L 744.5 762.5 L 710.5 762.5 Z M 834.5 616.5 L 868.5 616.5 L 868.5 762.5 L 834.5 762.5 Z M 1248.5 664.5 L 1283.5 664.5 L 1283.5 833.5 L 1248.5 833.5 Z M 1140.5 707.5 L 1174.5 707.5 L 1174.5 833.5 L 1140.5 833.5 Z M 1140.5 707.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 624.5 240.5 L 658.5 240.5 L 658.5 469.5 L 624.5 469.5 Z M 734.5 240.5 L 768.5 240.5 L 768.5 469.5 L 734.5 469.5 Z M 837.5 240.5 L 871.5 240.5 L 871.5 469.5 L 837.5 469.5 Z M 1259.5 240.5 L 1293.5 240.5 L 1293.5 496.5 L 1259.5 496.5 Z M 1136.5 304.5 L 1170.5 304.5 L 1170.5 496.5 L 1136.5 496.5 Z M 1136.5 304.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -162,6 +162,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 586.703125 784.332031 L 587.242188 779.28125 L 588.652344 775.175781 L 590.875 771.941406 L 593.90625 769.652344 L 597.742188 768.242188 L 602.457031 767.769531 L 604.609375 767.902344 L 606.695312 768.242188 L 608.648438 768.777344 L 610.398438 769.585938 L 612.015625 770.597656 L 613.5625 771.742188 L 614.773438 773.15625 L 615.851562 774.636719 L 616.660156 776.25 L 617.265625 777.933594 L 617.601562 779.820312 L 617.738281 781.773438 L 617.46875 784.53125 L 616.726562 787.089844 L 615.449219 789.445312 L 613.699219 791.667969 L 611.410156 793.753906 L 608.648438 795.574219 L 607.640625 796.179688 L 600.90625 799.8125 L 599.15625 800.824219 L 597.609375 801.832031 L 596.261719 802.84375 L 595.183594 803.851562 L 594.242188 804.863281 L 593.570312 805.875 L 593.230469 806.480469 L 592.960938 807.015625 L 592.761719 807.691406 L 592.558594 808.296875 L 592.355469 808.96875 L 592.289062 809.644531 L 617.402344 809.644531 L 617.402344 815.5 L 585.625 815.5 L 585.757812 813.144531 L 586.097656 810.988281 L 586.5 808.96875 L 587.039062 807.21875 L 587.644531 805.535156 L 588.386719 804.054688 L 589.191406 802.777344 L 590.203125 801.496094 L 591.414062 800.21875 L 592.761719 799.007812 L 594.308594 797.792969 L 596.125 796.582031 L 596.53125 796.3125 L 597.003906 796.042969 L 597.472656 795.707031 L 597.945312 795.4375 L 598.484375 795.167969 L 599.023438 794.832031 L 605.214844 791.332031 L 607.167969 790.050781 L 608.785156 788.640625 L 610.0625 787.15625 L 610.9375 785.542969 L 611.476562 783.792969 L 611.679688 781.90625 L 611.542969 780.628906 L 611.339844 779.347656 L 610.871094 778.203125 L 610.332031 777.125 L 609.523438 776.183594 L 608.648438 775.242188 L 607.707031 774.570312 L 606.765625 773.960938 L 605.6875 773.558594 L 604.609375 773.222656 L 603.464844 773.019531 L 602.253906 772.953125 L 599.628906 773.289062 L 597.40625 774.097656 L 595.589844 775.511719 L 594.242188 777.464844 L 593.300781 780.023438 L 592.761719 783.050781 L 592.695312 783.320312 L 592.695312 783.722656 L 592.625 783.925781 L 592.625 784.332031 Z M 586.703125 784.332031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 557 307 L 596 307 M 557 269 L 596 269 M 557 269 L 557 307 M 596 269 L 596 307 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 557 307 L 596 307 M 557 269 L 596 269 M 596 307 L 596 269 M 557 307 L 557 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 522 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_2.svg b/cells/a21bo/sky130_fd_sc_hs__a21bo_2.svg
index 48f2a63..22e0102 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_2.svg
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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 654.5 664.5 L 688.5 664.5 L 688.5 790.5 L 654.5 790.5 Z M 1062.5 664.5 L 1096.5 664.5 L 1096.5 833.5 L 1062.5 833.5 Z M 776.5 664.5 L 811.5 664.5 L 811.5 833.5 L 776.5 833.5 Z M 875.5 664.5 L 909.5 664.5 L 909.5 833.5 L 875.5 833.5 Z M 1268.5 664.5 L 1302.5 664.5 L 1302.5 833.5 L 1268.5 833.5 Z M 1160.5 664.5 L 1195.5 664.5 L 1195.5 833.5 L 1160.5 833.5 Z M 1160.5 664.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 1168.5 240.5 L 1203.5 240.5 L 1203.5 469.5 L 1168.5 469.5 Z M 1065.5 240.5 L 1099.5 240.5 L 1099.5 469.5 L 1065.5 469.5 Z M 1271.5 240.5 L 1306.5 240.5 L 1306.5 469.5 L 1271.5 469.5 Z M 740.5 240.5 L 774.5 240.5 L 774.5 496.5 L 740.5 496.5 Z M 843.5 240.5 L 877.5 240.5 L 877.5 496.5 L 843.5 496.5 Z M 622.5 304.5 L 656.5 304.5 L 656.5 496.5 L 622.5 496.5 Z M 622.5 304.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.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>
@@ -156,6 +156,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 801.824219 706.320312 L 819.191406 731.5 L 811.449219 731.5 L 798.050781 711.035156 L 784.589844 731.5 L 776.980469 731.5 L 794.351562 706.320312 L 778.058594 682.421875 L 785.664062 682.421875 L 798.253906 701.675781 L 810.910156 682.421875 L 818.382812 682.421875 Z M 801.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 777 392 L 816 392 M 777 353 L 816 353 M 777 353 L 777 392 M 816 353 L 816 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 777 392 L 816 392 M 777 353 L 816 353 M 816 392 L 816 353 M 777 392 L 777 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21bo/sky130_fd_sc_hs__a21bo_4.svg b/cells/a21bo/sky130_fd_sc_hs__a21bo_4.svg
index 7bcc213..7f72324 100644
--- a/cells/a21bo/sky130_fd_sc_hs__a21bo_4.svg
+++ b/cells/a21bo/sky130_fd_sc_hs__a21bo_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 538.5 L 201.5 538.5 Z M 201.5 111.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 245.5 862.5 L 1675.5 862.5 L 1675.5 918.5 L 245.5 918.5 Z M 245.5 862.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="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1510.5 631.5 L 1544.5 631.5 L 1544.5 777.5 L 1510.5 777.5 Z M 1411.5 631.5 L 1446.5 631.5 L 1446.5 777.5 L 1411.5 777.5 Z M 1200.5 631.5 L 1235.5 631.5 L 1235.5 777.5 L 1200.5 777.5 Z M 1022.5 631.5 L 1056.5 631.5 L 1056.5 777.5 L 1022.5 777.5 Z M 1313.5 631.5 L 1347.5 631.5 L 1347.5 777.5 L 1313.5 777.5 Z M 380.5 631.5 L 414.5 631.5 L 414.5 777.5 L 380.5 777.5 Z M 923.5 631.5 L 957.5 631.5 L 957.5 777.5 L 923.5 777.5 Z M 614.5 634.5 L 648.5 634.5 L 648.5 804.5 L 614.5 804.5 Z M 515.5 634.5 L 549.5 634.5 L 549.5 804.5 L 515.5 804.5 Z M 811.5 634.5 L 845.5 634.5 L 845.5 804.5 L 811.5 804.5 Z M 712.5 634.5 L 746.5 634.5 L 746.5 804.5 L 712.5 804.5 Z M 712.5 634.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1506.5 240.5 L 1541.5 240.5 L 1541.5 469.5 L 1506.5 469.5 Z M 341.5 240.5 L 375.5 240.5 L 375.5 469.5 L 341.5 469.5 Z M 1403.5 240.5 L 1437.5 240.5 L 1437.5 469.5 L 1403.5 469.5 Z M 1197.5 240.5 L 1231.5 240.5 L 1231.5 469.5 L 1197.5 469.5 Z M 1094.5 240.5 L 1128.5 240.5 L 1128.5 469.5 L 1094.5 469.5 Z M 1300.5 240.5 L 1334.5 240.5 L 1334.5 469.5 L 1300.5 469.5 Z M 991.5 240.5 L 1025.5 240.5 L 1025.5 469.5 L 991.5 469.5 Z M 562.5 240.5 L 596.5 240.5 L 596.5 496.5 L 562.5 496.5 Z M 459.5 240.5 L 493.5 240.5 L 493.5 496.5 L 459.5 496.5 Z M 768.5 240.5 L 803.5 240.5 L 803.5 496.5 L 768.5 496.5 Z M 665.5 240.5 L 699.5 240.5 L 699.5 496.5 L 665.5 496.5 Z M 665.5 240.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 280.5 136.5 L 319.5 136.5 L 319.5 174.5 L 280.5 174.5 Z M 1600.5 136.5 L 1639.5 136.5 L 1639.5 174.5 L 1600.5 174.5 Z M 1490.5 136.5 L 1529.5 136.5 L 1529.5 174.5 L 1490.5 174.5 Z M 1380.5 136.5 L 1419.5 136.5 L 1419.5 174.5 L 1380.5 174.5 Z M 1270.5 136.5 L 1309.5 136.5 L 1309.5 174.5 L 1270.5 174.5 Z M 1160.5 136.5 L 1199.5 136.5 L 1199.5 174.5 L 1160.5 174.5 Z M 1050.5 136.5 L 1089.5 136.5 L 1089.5 174.5 L 1050.5 174.5 Z M 940.5 136.5 L 979.5 136.5 L 979.5 174.5 L 940.5 174.5 Z M 830.5 136.5 L 869.5 136.5 L 869.5 174.5 L 830.5 174.5 Z M 720.5 136.5 L 759.5 136.5 L 759.5 174.5 L 720.5 174.5 Z M 610.5 136.5 L 649.5 136.5 L 649.5 174.5 L 610.5 174.5 Z M 500.5 136.5 L 539.5 136.5 L 539.5 174.5 L 500.5 174.5 Z M 390.5 136.5 L 429.5 136.5 L 429.5 174.5 L 390.5 174.5 Z M 280.5 899.5 L 319.5 899.5 L 319.5 938.5 L 280.5 938.5 Z M 1600.5 899.5 L 1639.5 899.5 L 1639.5 938.5 L 1600.5 938.5 Z M 1490.5 899.5 L 1529.5 899.5 L 1529.5 938.5 L 1490.5 938.5 Z M 1380.5 899.5 L 1419.5 899.5 L 1419.5 938.5 L 1380.5 938.5 Z M 1270.5 899.5 L 1309.5 899.5 L 1309.5 938.5 L 1270.5 938.5 Z M 1160.5 899.5 L 1199.5 899.5 L 1199.5 938.5 L 1160.5 938.5 Z M 1050.5 899.5 L 1089.5 899.5 L 1089.5 938.5 L 1050.5 938.5 Z M 940.5 899.5 L 979.5 899.5 L 979.5 938.5 L 940.5 938.5 Z M 830.5 899.5 L 869.5 899.5 L 869.5 938.5 L 830.5 938.5 Z M 720.5 899.5 L 759.5 899.5 L 759.5 938.5 L 720.5 938.5 Z M 610.5 899.5 L 649.5 899.5 L 649.5 938.5 L 610.5 938.5 Z M 500.5 899.5 L 539.5 899.5 L 539.5 938.5 L 500.5 938.5 Z M 390.5 899.5 L 429.5 899.5 L 429.5 938.5 L 390.5 938.5 Z M 390.5 899.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,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 414.824219 536.320312 L 432.191406 561.5 L 424.449219 561.5 L 411.050781 541.035156 L 397.589844 561.5 L 389.980469 561.5 L 407.351562 536.320312 L 391.058594 512.421875 L 398.664062 512.421875 L 411.253906 531.675781 L 423.910156 512.421875 L 431.382812 512.421875 Z M 414.824219 536.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 390 562 L 429 562 M 390 523 L 429 523 M 390 523 L 390 562 M 429 523 L 429 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 390 562 L 429 562 M 390 523 L 429 523 M 429 562 L 429 523 M 390 562 L 390 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 245 156 L 245 165 M 240 161 L 249 161 M 244 162 L 246 162 M 244 160 L 246 160 M 244 160 L 244 162 M 246 160 L 246 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_1.svg b/cells/a21boi/sky130_fd_sc_hs__a21boi_1.svg
index 7b35a87..dc76e99 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_1.svg
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 789.5 664.5 L 823.5 664.5 L 823.5 790.5 L 789.5 790.5 Z M 1043.5 664.5 L 1078.5 664.5 L 1078.5 833.5 L 1043.5 833.5 Z M 945.5 664.5 L 979.5 664.5 L 979.5 833.5 L 945.5 833.5 Z M 1151.5 664.5 L 1185.5 664.5 L 1185.5 833.5 L 1151.5 833.5 Z M 1151.5 664.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 673.5 240.5 L 708.5 240.5 L 708.5 432.5 L 673.5 432.5 Z M 1044.5 240.5 L 1079.5 240.5 L 1079.5 496.5 L 1044.5 496.5 Z M 941.5 240.5 L 976.5 240.5 L 976.5 496.5 L 941.5 496.5 Z M 1154.5 240.5 L 1189.5 240.5 L 1189.5 496.5 L 1154.5 496.5 Z M 1154.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -178,6 +178,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 1100.773438 527.503906 L 1090.203125 527.503906 L 1090.203125 523.261719 L 1092.019531 523.058594 L 1093.636719 522.789062 L 1095.050781 522.453125 L 1096.261719 522.183594 L 1097.269531 521.847656 L 1098.148438 521.445312 L 1098.820312 521.039062 L 1099.425781 520.570312 L 1099.964844 520.03125 L 1100.503906 519.355469 L 1100.972656 518.617188 L 1101.445312 517.742188 L 1101.648438 517.269531 L 1101.847656 516.730469 L 1102.050781 516.125 L 1102.320312 515.386719 L 1102.523438 514.644531 L 1102.792969 513.769531 L 1106.695312 513.769531 L 1106.695312 561.5 L 1100.773438 561.5 Z M 1100.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_2.svg b/cells/a21boi/sky130_fd_sc_hs__a21boi_2.svg
index 1b9f917..16955f3 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_2.svg
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 599.5 664.5 L 633.5 664.5 L 633.5 810.5 L 599.5 810.5 Z M 1126.5 664.5 L 1160.5 664.5 L 1160.5 833.5 L 1126.5 833.5 Z M 711.5 664.5 L 745.5 664.5 L 745.5 833.5 L 711.5 833.5 Z M 810.5 664.5 L 844.5 664.5 L 844.5 833.5 L 810.5 833.5 Z M 1027.5 664.5 L 1062.5 664.5 L 1062.5 833.5 L 1027.5 833.5 Z M 1323.5 664.5 L 1357.5 664.5 L 1357.5 833.5 L 1323.5 833.5 Z M 1224.5 664.5 L 1259.5 664.5 L 1259.5 833.5 L 1224.5 833.5 Z M 1224.5 664.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 584.5 240.5 L 618.5 240.5 L 618.5 469.5 L 584.5 469.5 Z M 1115.5 240.5 L 1150.5 240.5 L 1150.5 496.5 L 1115.5 496.5 Z M 806.5 240.5 L 840.5 240.5 L 840.5 496.5 L 806.5 496.5 Z M 909.5 240.5 L 944.5 240.5 L 944.5 496.5 L 909.5 496.5 Z M 1012.5 240.5 L 1047.5 240.5 L 1047.5 496.5 L 1012.5 496.5 Z M 1326.5 240.5 L 1361.5 240.5 L 1361.5 496.5 L 1326.5 496.5 Z M 1219.5 240.5 L 1253.5 240.5 L 1253.5 496.5 L 1219.5 496.5 Z M 1219.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -156,6 +156,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 1100.773438 527.503906 L 1090.203125 527.503906 L 1090.203125 523.261719 L 1092.019531 523.058594 L 1093.636719 522.789062 L 1095.050781 522.453125 L 1096.261719 522.183594 L 1097.269531 521.847656 L 1098.148438 521.445312 L 1098.820312 521.039062 L 1099.425781 520.570312 L 1099.964844 520.03125 L 1100.503906 519.355469 L 1100.972656 518.617188 L 1101.445312 517.742188 L 1101.648438 517.269531 L 1101.847656 516.730469 L 1102.050781 516.125 L 1102.320312 515.386719 L 1102.523438 514.644531 L 1102.792969 513.769531 L 1106.695312 513.769531 L 1106.695312 561.5 L 1100.773438 561.5 Z M 1100.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21boi/sky130_fd_sc_hs__a21boi_4.svg b/cells/a21boi/sky130_fd_sc_hs__a21boi_4.svg
index 6f80f17..7b213d2 100644
--- a/cells/a21boi/sky130_fd_sc_hs__a21boi_4.svg
+++ b/cells/a21boi/sky130_fd_sc_hs__a21boi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 537.5 L 174.5 537.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image357" 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="#image357"/>
+  <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 211.5 812.5 L 1706.5 812.5 L 1706.5 860.5 L 211.5 860.5 Z M 211.5 812.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#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 1419.5 644.5 L 1448.5 644.5 L 1448.5 788.5 L 1419.5 788.5 Z M 308.5 644.5 L 337.5 644.5 L 337.5 788.5 L 308.5 788.5 Z M 391.5 644.5 L 420.5 644.5 L 420.5 788.5 L 391.5 788.5 Z M 475.5 644.5 L 504.5 644.5 L 504.5 788.5 L 475.5 788.5 Z M 559.5 644.5 L 588.5 644.5 L 588.5 788.5 L 559.5 788.5 Z M 642.5 644.5 L 672.5 644.5 L 672.5 788.5 L 642.5 788.5 Z M 726.5 644.5 L 755.5 644.5 L 755.5 788.5 L 726.5 788.5 Z M 810.5 644.5 L 839.5 644.5 L 839.5 788.5 L 810.5 788.5 Z M 893.5 644.5 L 923.5 644.5 L 923.5 788.5 L 893.5 788.5 Z M 1084.5 644.5 L 1113.5 644.5 L 1113.5 788.5 L 1084.5 788.5 Z M 1168.5 644.5 L 1197.5 644.5 L 1197.5 788.5 L 1168.5 788.5 Z M 1252.5 644.5 L 1281.5 644.5 L 1281.5 788.5 L 1252.5 788.5 Z M 1335.5 644.5 L 1365.5 644.5 L 1365.5 788.5 L 1335.5 788.5 Z M 1335.5 644.5 "/>
 </clipPath>
-<image id="image358" 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="#image358"/>
+  <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 1535.5 284.5 L 1564.5 284.5 L 1564.5 447.5 L 1535.5 447.5 Z M 1447.5 284.5 L 1477.5 284.5 L 1477.5 447.5 L 1447.5 447.5 Z M 382.5 284.5 L 412.5 284.5 L 412.5 502.5 L 382.5 502.5 Z M 470.5 284.5 L 499.5 284.5 L 499.5 502.5 L 470.5 502.5 Z M 558.5 284.5 L 587.5 284.5 L 587.5 502.5 L 558.5 502.5 Z M 645.5 284.5 L 674.5 284.5 L 674.5 502.5 L 645.5 502.5 Z M 733.5 284.5 L 762.5 284.5 L 762.5 502.5 L 733.5 502.5 Z M 820.5 284.5 L 850.5 284.5 L 850.5 502.5 L 820.5 502.5 Z M 908.5 284.5 L 937.5 284.5 L 937.5 502.5 L 908.5 502.5 Z M 996.5 284.5 L 1025.5 284.5 L 1025.5 502.5 L 996.5 502.5 Z M 1083.5 284.5 L 1113.5 284.5 L 1113.5 502.5 L 1083.5 502.5 Z M 1171.5 284.5 L 1200.5 284.5 L 1200.5 502.5 L 1171.5 502.5 Z M 1259.5 284.5 L 1288.5 284.5 L 1288.5 502.5 L 1259.5 502.5 Z M 295.5 284.5 L 324.5 284.5 L 324.5 502.5 L 295.5 502.5 Z M 295.5 284.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 241.5 195.5 L 274.5 195.5 L 274.5 228.5 L 241.5 228.5 Z M 1643.5 195.5 L 1676.5 195.5 L 1676.5 228.5 L 1643.5 228.5 Z M 1550.5 195.5 L 1583.5 195.5 L 1583.5 228.5 L 1550.5 228.5 Z M 1456.5 195.5 L 1489.5 195.5 L 1489.5 228.5 L 1456.5 228.5 Z M 1363.5 195.5 L 1396.5 195.5 L 1396.5 228.5 L 1363.5 228.5 Z M 1269.5 195.5 L 1302.5 195.5 L 1302.5 228.5 L 1269.5 228.5 Z M 1176.5 195.5 L 1209.5 195.5 L 1209.5 228.5 L 1176.5 228.5 Z M 1082.5 195.5 L 1115.5 195.5 L 1115.5 228.5 L 1082.5 228.5 Z M 989.5 195.5 L 1022.5 195.5 L 1022.5 228.5 L 989.5 228.5 Z M 895.5 195.5 L 929.5 195.5 L 929.5 228.5 L 895.5 228.5 Z M 802.5 195.5 L 835.5 195.5 L 835.5 228.5 L 802.5 228.5 Z M 709.5 195.5 L 742.5 195.5 L 742.5 228.5 L 709.5 228.5 Z M 615.5 195.5 L 648.5 195.5 L 648.5 228.5 L 615.5 228.5 Z M 522.5 195.5 L 555.5 195.5 L 555.5 228.5 L 522.5 228.5 Z M 428.5 195.5 L 461.5 195.5 L 461.5 228.5 L 428.5 228.5 Z M 335.5 195.5 L 368.5 195.5 L 368.5 228.5 L 335.5 228.5 Z M 241.5 843.5 L 274.5 843.5 L 274.5 877.5 L 241.5 877.5 Z M 1643.5 843.5 L 1676.5 843.5 L 1676.5 877.5 L 1643.5 877.5 Z M 1550.5 843.5 L 1583.5 843.5 L 1583.5 877.5 L 1550.5 877.5 Z M 1456.5 843.5 L 1489.5 843.5 L 1489.5 877.5 L 1456.5 877.5 Z M 1363.5 843.5 L 1396.5 843.5 L 1396.5 877.5 L 1363.5 877.5 Z M 1269.5 843.5 L 1302.5 843.5 L 1302.5 877.5 L 1269.5 877.5 Z M 1176.5 843.5 L 1209.5 843.5 L 1209.5 877.5 L 1176.5 877.5 Z M 1082.5 843.5 L 1115.5 843.5 L 1115.5 877.5 L 1082.5 877.5 Z M 989.5 843.5 L 1022.5 843.5 L 1022.5 877.5 L 989.5 877.5 Z M 895.5 843.5 L 929.5 843.5 L 929.5 877.5 L 895.5 877.5 Z M 802.5 843.5 L 835.5 843.5 L 835.5 877.5 L 802.5 877.5 Z M 709.5 843.5 L 742.5 843.5 L 742.5 877.5 L 709.5 877.5 Z M 615.5 843.5 L 648.5 843.5 L 648.5 877.5 L 615.5 877.5 Z M 522.5 843.5 L 555.5 843.5 L 555.5 877.5 L 522.5 877.5 Z M 428.5 843.5 L 461.5 843.5 L 461.5 877.5 L 428.5 877.5 Z M 335.5 843.5 L 368.5 843.5 L 368.5 877.5 L 335.5 877.5 Z M 335.5 843.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <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="surface354">
+<g id="surface384">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -197,6 +197,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 563.691406 528.460938 L 554.664062 528.460938 L 554.664062 524.839844 L 556.214844 524.664062 L 557.59375 524.433594 L 558.804688 524.148438 L 559.839844 523.917969 L 560.699219 523.628906 L 561.449219 523.285156 L 562.023438 522.941406 L 562.539062 522.539062 L 563 522.078125 L 563.460938 521.503906 L 563.863281 520.871094 L 564.265625 520.121094 L 564.4375 519.71875 L 564.609375 519.261719 L 564.785156 518.742188 L 565.011719 518.109375 L 565.1875 517.476562 L 565.414062 516.730469 L 568.75 516.730469 L 568.75 557.5 L 563.691406 557.5 Z M 563.691406 528.460938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 560 L 555 560 M 522 527 L 555 527 M 522 527 L 522 560 M 555 527 L 555 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 522 560 L 555 560 M 522 527 L 555 527 M 555 560 L 555 527 M 522 560 L 522 527 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 214 L 211 223 M 206 219 L 215 219 M 210 220 L 212 220 M 210 218 L 212 218 M 210 218 L 210 220 M 212 218 L 212 220 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_1.svg b/cells/a21o/sky130_fd_sc_hs__a21o_1.svg
index 645aa6d..6f73224 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_1.svg
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 1169.5 616.5 L 1204.5 616.5 L 1204.5 762.5 L 1169.5 762.5 Z M 1060.5 616.5 L 1095.5 616.5 L 1095.5 762.5 L 1060.5 762.5 Z M 962.5 616.5 L 996.5 616.5 L 996.5 762.5 L 962.5 762.5 Z M 836.5 616.5 L 870.5 616.5 L 870.5 785.5 L 836.5 785.5 Z M 836.5 616.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 1173.5 240.5 L 1207.5 240.5 L 1207.5 469.5 L 1173.5 469.5 Z M 1063.5 240.5 L 1097.5 240.5 L 1097.5 469.5 L 1063.5 469.5 Z M 960.5 240.5 L 994.5 240.5 L 994.5 469.5 L 960.5 469.5 Z M 673.5 240.5 L 708.5 240.5 L 708.5 496.5 L 673.5 496.5 Z M 673.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -160,6 +160,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 1301.703125 784.332031 L 1302.242188 779.28125 L 1303.652344 775.175781 L 1305.875 771.941406 L 1308.90625 769.652344 L 1312.742188 768.242188 L 1317.457031 767.769531 L 1319.609375 767.902344 L 1321.695312 768.242188 L 1323.648438 768.777344 L 1325.398438 769.585938 L 1327.015625 770.597656 L 1328.5625 771.742188 L 1329.773438 773.15625 L 1330.851562 774.636719 L 1331.660156 776.25 L 1332.265625 777.933594 L 1332.601562 779.820312 L 1332.738281 781.773438 L 1332.46875 784.53125 L 1331.726562 787.089844 L 1330.449219 789.445312 L 1328.699219 791.667969 L 1326.410156 793.753906 L 1323.648438 795.574219 L 1322.640625 796.179688 L 1315.90625 799.8125 L 1314.15625 800.824219 L 1312.609375 801.832031 L 1311.261719 802.84375 L 1310.183594 803.851562 L 1309.242188 804.863281 L 1308.570312 805.875 L 1308.230469 806.480469 L 1307.960938 807.015625 L 1307.761719 807.691406 L 1307.558594 808.296875 L 1307.355469 808.96875 L 1307.289062 809.644531 L 1332.402344 809.644531 L 1332.402344 815.5 L 1300.625 815.5 L 1300.757812 813.144531 L 1301.097656 810.988281 L 1301.5 808.96875 L 1302.039062 807.21875 L 1302.644531 805.535156 L 1303.386719 804.054688 L 1304.191406 802.777344 L 1305.203125 801.496094 L 1306.414062 800.21875 L 1307.761719 799.007812 L 1309.308594 797.792969 L 1311.125 796.582031 L 1311.53125 796.3125 L 1312.003906 796.042969 L 1312.472656 795.707031 L 1312.945312 795.4375 L 1313.484375 795.167969 L 1314.023438 794.832031 L 1320.214844 791.332031 L 1322.167969 790.050781 L 1323.785156 788.640625 L 1325.0625 787.15625 L 1325.9375 785.542969 L 1326.476562 783.792969 L 1326.679688 781.90625 L 1326.542969 780.628906 L 1326.339844 779.347656 L 1325.871094 778.203125 L 1325.332031 777.125 L 1324.523438 776.183594 L 1323.648438 775.242188 L 1322.707031 774.570312 L 1321.765625 773.960938 L 1320.6875 773.558594 L 1319.609375 773.222656 L 1318.464844 773.019531 L 1317.253906 772.953125 L 1314.628906 773.289062 L 1312.40625 774.097656 L 1310.589844 775.511719 L 1309.242188 777.464844 L 1308.300781 780.023438 L 1307.761719 783.050781 L 1307.695312 783.320312 L 1307.695312 783.722656 L 1307.625 783.925781 L 1307.625 784.332031 Z M 1301.703125 784.332031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 307 L 1311 307 M 1272 269 L 1311 269 M 1272 269 L 1272 307 M 1311 269 L 1311 307 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 307 L 1311 307 M 1272 269 L 1311 269 M 1311 307 L 1311 269 M 1272 307 L 1272 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_2.svg b/cells/a21o/sky130_fd_sc_hs__a21o_2.svg
index 4d712ec..70a986b 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_2.svg
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1205.5 664.5 L 1239.5 664.5 L 1239.5 833.5 L 1205.5 833.5 Z M 714.5 664.5 L 749.5 664.5 L 749.5 833.5 L 714.5 833.5 Z M 813.5 664.5 L 847.5 664.5 L 847.5 833.5 L 813.5 833.5 Z M 999.5 664.5 L 1033.5 664.5 L 1033.5 833.5 L 999.5 833.5 Z M 1097.5 664.5 L 1132.5 664.5 L 1132.5 833.5 L 1097.5 833.5 Z M 1097.5 664.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1208.5 240.5 L 1243.5 240.5 L 1243.5 469.5 L 1208.5 469.5 Z M 1105.5 240.5 L 1140.5 240.5 L 1140.5 469.5 L 1105.5 469.5 Z M 1002.5 240.5 L 1036.5 240.5 L 1036.5 469.5 L 1002.5 469.5 Z M 780.5 240.5 L 814.5 240.5 L 814.5 496.5 L 780.5 496.5 Z M 677.5 240.5 L 711.5 240.5 L 711.5 496.5 L 677.5 496.5 Z M 677.5 240.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 746.824219 282.320312 L 764.191406 307.5 L 756.449219 307.5 L 743.050781 287.035156 L 729.589844 307.5 L 721.980469 307.5 L 739.351562 282.320312 L 723.058594 258.421875 L 730.664062 258.421875 L 743.253906 277.675781 L 755.910156 258.421875 L 763.382812 258.421875 Z M 746.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 722 816 L 761 816 M 722 777 L 761 777 M 722 777 L 722 816 M 761 777 L 761 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 722 816 L 761 816 M 722 777 L 761 777 M 761 816 L 761 777 M 722 816 L 722 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21o/sky130_fd_sc_hs__a21o_4.svg b/cells/a21o/sky130_fd_sc_hs__a21o_4.svg
index 9e6f3d5..fd35294 100644
--- a/cells/a21o/sky130_fd_sc_hs__a21o_4.svg
+++ b/cells/a21o/sky130_fd_sc_hs__a21o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 812.5 664.5 L 846.5 664.5 L 846.5 810.5 L 812.5 810.5 Z M 910.5 664.5 L 945.5 664.5 L 945.5 810.5 L 910.5 810.5 Z M 1360.5 687.5 L 1394.5 687.5 L 1394.5 833.5 L 1360.5 833.5 Z M 1261.5 687.5 L 1295.5 687.5 L 1295.5 833.5 L 1261.5 833.5 Z M 1162.5 687.5 L 1197.5 687.5 L 1197.5 833.5 L 1162.5 833.5 Z M 601.5 664.5 L 635.5 664.5 L 635.5 833.5 L 601.5 833.5 Z M 502.5 664.5 L 537.5 664.5 L 537.5 833.5 L 502.5 833.5 Z M 699.5 664.5 L 734.5 664.5 L 734.5 833.5 L 699.5 833.5 Z M 1458.5 687.5 L 1492.5 687.5 L 1492.5 833.5 L 1458.5 833.5 Z M 404.5 664.5 L 438.5 664.5 L 438.5 833.5 L 404.5 833.5 Z M 404.5 664.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1455.5 240.5 L 1489.5 240.5 L 1489.5 469.5 L 1455.5 469.5 Z M 1352.5 240.5 L 1386.5 240.5 L 1386.5 469.5 L 1352.5 469.5 Z M 1145.5 240.5 L 1180.5 240.5 L 1180.5 469.5 L 1145.5 469.5 Z M 1042.5 240.5 L 1077.5 240.5 L 1077.5 469.5 L 1042.5 469.5 Z M 1248.5 240.5 L 1283.5 240.5 L 1283.5 469.5 L 1248.5 469.5 Z M 939.5 240.5 L 973.5 240.5 L 973.5 469.5 L 939.5 469.5 Z M 510.5 240.5 L 545.5 240.5 L 545.5 496.5 L 510.5 496.5 Z M 407.5 240.5 L 442.5 240.5 L 442.5 496.5 L 407.5 496.5 Z M 717.5 240.5 L 751.5 240.5 L 751.5 496.5 L 717.5 496.5 Z M 614.5 240.5 L 648.5 240.5 L 648.5 496.5 L 614.5 496.5 Z M 614.5 240.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface292">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1263.773438 527.503906 L 1253.203125 527.503906 L 1253.203125 523.261719 L 1255.019531 523.058594 L 1256.636719 522.789062 L 1258.050781 522.453125 L 1259.261719 522.183594 L 1260.269531 521.847656 L 1261.148438 521.445312 L 1261.820312 521.039062 L 1262.425781 520.570312 L 1262.964844 520.03125 L 1263.503906 519.355469 L 1263.972656 518.617188 L 1264.445312 517.742188 L 1264.648438 517.269531 L 1264.847656 516.730469 L 1265.050781 516.125 L 1265.320312 515.386719 L 1265.523438 514.644531 L 1265.792969 513.769531 L 1269.695312 513.769531 L 1269.695312 561.5 L 1263.773438 561.5 Z M 1263.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1215 562 L 1254 562 M 1215 523 L 1254 523 M 1215 523 L 1215 562 M 1254 523 L 1254 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1215 562 L 1254 562 M 1215 523 L 1254 523 M 1254 562 L 1254 523 M 1215 562 L 1215 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_1.svg b/cells/a21oi/sky130_fd_sc_hs__a21oi_1.svg
index 359dcc5..b0db0f8 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_1.svg
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 538.5 L 701.5 538.5 Z M 701.5 111.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 744.5 862.5 L 1184.5 862.5 L 1184.5 918.5 L 744.5 918.5 Z M 744.5 862.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 1050.5 664.5 L 1085.5 664.5 L 1085.5 833.5 L 1050.5 833.5 Z M 844.5 664.5 L 878.5 664.5 L 878.5 833.5 L 844.5 833.5 Z M 926.5 664.5 L 961.5 664.5 L 961.5 833.5 L 926.5 833.5 Z M 926.5 664.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 1054.5 240.5 L 1088.5 240.5 L 1088.5 496.5 L 1054.5 496.5 Z M 840.5 240.5 L 875.5 240.5 L 875.5 496.5 L 840.5 496.5 Z M 950.5 240.5 L 985.5 240.5 L 985.5 496.5 L 950.5 496.5 Z M 950.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 780.5 136.5 L 819.5 136.5 L 819.5 174.5 L 780.5 174.5 Z M 1110.5 136.5 L 1149.5 136.5 L 1149.5 174.5 L 1110.5 174.5 Z M 1000.5 136.5 L 1039.5 136.5 L 1039.5 174.5 L 1000.5 174.5 Z M 890.5 136.5 L 929.5 136.5 L 929.5 174.5 L 890.5 174.5 Z M 780.5 899.5 L 819.5 899.5 L 819.5 938.5 L 780.5 938.5 Z M 1110.5 899.5 L 1149.5 899.5 L 1149.5 938.5 L 1110.5 938.5 Z M 1000.5 899.5 L 1039.5 899.5 L 1039.5 938.5 L 1000.5 938.5 Z M 890.5 899.5 L 929.5 899.5 L 929.5 938.5 L 890.5 938.5 Z M 890.5 899.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>
@@ -160,6 +160,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 937.773438 527.503906 L 927.203125 527.503906 L 927.203125 523.261719 L 929.019531 523.058594 L 930.636719 522.789062 L 932.050781 522.453125 L 933.261719 522.183594 L 934.269531 521.847656 L 935.148438 521.445312 L 935.820312 521.039062 L 936.425781 520.570312 L 936.964844 520.03125 L 937.503906 519.355469 L 937.972656 518.617188 L 938.445312 517.742188 L 938.648438 517.269531 L 938.847656 516.730469 L 939.050781 516.125 L 939.320312 515.386719 L 939.523438 514.644531 L 939.792969 513.769531 L 943.695312 513.769531 L 943.695312 561.5 L 937.773438 561.5 Z M 937.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 890 562 L 929 562 M 890 523 L 929 523 M 890 523 L 890 562 M 929 523 L 929 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 890 562 L 929 562 M 890 523 L 929 523 M 929 562 L 929 523 M 890 562 L 890 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 156 L 744 165 M 739 161 L 748 161 M 743 162 L 745 162 M 743 160 L 745 160 M 743 160 L 743 162 M 745 160 L 745 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_2.svg b/cells/a21oi/sky130_fd_sc_hs__a21oi_2.svg
index 16f5dc1..181af72 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_2.svg
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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 917.5 626.5 L 952.5 626.5 L 952.5 796.5 L 917.5 796.5 Z M 1263.5 664.5 L 1298.5 664.5 L 1298.5 833.5 L 1263.5 833.5 Z M 1165.5 664.5 L 1199.5 664.5 L 1199.5 833.5 L 1165.5 833.5 Z M 1066.5 664.5 L 1101.5 664.5 L 1101.5 833.5 L 1066.5 833.5 Z M 615.5 664.5 L 649.5 664.5 L 649.5 833.5 L 615.5 833.5 Z M 615.5 664.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 1264.5 240.5 L 1299.5 240.5 L 1299.5 496.5 L 1264.5 496.5 Z M 735.5 240.5 L 769.5 240.5 L 769.5 496.5 L 735.5 496.5 Z M 838.5 240.5 L 873.5 240.5 L 873.5 496.5 L 838.5 496.5 Z M 941.5 240.5 L 976.5 240.5 L 976.5 496.5 L 941.5 496.5 Z M 1058.5 240.5 L 1093.5 240.5 L 1093.5 496.5 L 1058.5 496.5 Z M 1161.5 240.5 L 1196.5 240.5 L 1196.5 496.5 L 1161.5 496.5 Z M 1161.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.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>
@@ -169,6 +169,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 1265.773438 527.503906 L 1255.203125 527.503906 L 1255.203125 523.261719 L 1257.019531 523.058594 L 1258.636719 522.789062 L 1260.050781 522.453125 L 1261.261719 522.183594 L 1262.269531 521.847656 L 1263.148438 521.445312 L 1263.820312 521.039062 L 1264.425781 520.570312 L 1264.964844 520.03125 L 1265.503906 519.355469 L 1265.972656 518.617188 L 1266.445312 517.742188 L 1266.648438 517.269531 L 1266.847656 516.730469 L 1267.050781 516.125 L 1267.320312 515.386719 L 1267.523438 514.644531 L 1267.792969 513.769531 L 1271.695312 513.769531 L 1271.695312 561.5 L 1265.773438 561.5 Z M 1265.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1217 562 L 1256 562 M 1217 523 L 1256 523 M 1217 523 L 1217 562 M 1256 523 L 1256 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1217 562 L 1256 562 M 1217 523 L 1256 523 M 1256 562 L 1256 523 M 1217 562 L 1217 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a21oi/sky130_fd_sc_hs__a21oi_4.svg b/cells/a21oi/sky130_fd_sc_hs__a21oi_4.svg
index 4889277..dba6ed5 100644
--- a/cells/a21oi/sky130_fd_sc_hs__a21oi_4.svg
+++ b/cells/a21oi/sky130_fd_sc_hs__a21oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 538.5 L 201.5 538.5 Z M 201.5 111.5 "/>
 </clipPath>
-<image id="image317" 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="#image317"/>
+  <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 245.5 862.5 L 1675.5 862.5 L 1675.5 918.5 L 245.5 918.5 Z M 245.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#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 1421.5 664.5 L 1456.5 664.5 L 1456.5 833.5 L 1421.5 833.5 Z M 402.5 664.5 L 436.5 664.5 L 436.5 833.5 L 402.5 833.5 Z M 500.5 664.5 L 534.5 664.5 L 534.5 833.5 L 500.5 833.5 Z M 599.5 664.5 L 633.5 664.5 L 633.5 833.5 L 599.5 833.5 Z M 697.5 664.5 L 732.5 664.5 L 732.5 833.5 L 697.5 833.5 Z M 796.5 664.5 L 830.5 664.5 L 830.5 833.5 L 796.5 833.5 Z M 894.5 664.5 L 929.5 664.5 L 929.5 833.5 L 894.5 833.5 Z M 993.5 664.5 L 1027.5 664.5 L 1027.5 833.5 L 993.5 833.5 Z M 1091.5 664.5 L 1126.5 664.5 L 1126.5 833.5 L 1091.5 833.5 Z M 1323.5 664.5 L 1357.5 664.5 L 1357.5 833.5 L 1323.5 833.5 Z M 1323.5 664.5 "/>
 </clipPath>
-<image id="image318" 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="#image318"/>
+  <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 1521.5 240.5 L 1556.5 240.5 L 1556.5 496.5 L 1521.5 496.5 Z M 387.5 240.5 L 421.5 240.5 L 421.5 496.5 L 387.5 496.5 Z M 490.5 240.5 L 524.5 240.5 L 524.5 496.5 L 490.5 496.5 Z M 593.5 240.5 L 627.5 240.5 L 627.5 496.5 L 593.5 496.5 Z M 696.5 240.5 L 730.5 240.5 L 730.5 496.5 L 696.5 496.5 Z M 799.5 240.5 L 834.5 240.5 L 834.5 496.5 L 799.5 496.5 Z M 902.5 240.5 L 937.5 240.5 L 937.5 496.5 L 902.5 496.5 Z M 1005.5 240.5 L 1040.5 240.5 L 1040.5 496.5 L 1005.5 496.5 Z M 1109.5 240.5 L 1143.5 240.5 L 1143.5 496.5 L 1109.5 496.5 Z M 1212.5 240.5 L 1246.5 240.5 L 1246.5 496.5 L 1212.5 496.5 Z M 1315.5 240.5 L 1349.5 240.5 L 1349.5 496.5 L 1315.5 496.5 Z M 1418.5 240.5 L 1452.5 240.5 L 1452.5 496.5 L 1418.5 496.5 Z M 1418.5 240.5 "/>
 </clipPath>
-<image id="image319" 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="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 280.5 136.5 L 319.5 136.5 L 319.5 174.5 L 280.5 174.5 Z M 1600.5 136.5 L 1639.5 136.5 L 1639.5 174.5 L 1600.5 174.5 Z M 1490.5 136.5 L 1529.5 136.5 L 1529.5 174.5 L 1490.5 174.5 Z M 1380.5 136.5 L 1419.5 136.5 L 1419.5 174.5 L 1380.5 174.5 Z M 1270.5 136.5 L 1309.5 136.5 L 1309.5 174.5 L 1270.5 174.5 Z M 1160.5 136.5 L 1199.5 136.5 L 1199.5 174.5 L 1160.5 174.5 Z M 1050.5 136.5 L 1089.5 136.5 L 1089.5 174.5 L 1050.5 174.5 Z M 940.5 136.5 L 979.5 136.5 L 979.5 174.5 L 940.5 174.5 Z M 830.5 136.5 L 869.5 136.5 L 869.5 174.5 L 830.5 174.5 Z M 720.5 136.5 L 759.5 136.5 L 759.5 174.5 L 720.5 174.5 Z M 610.5 136.5 L 649.5 136.5 L 649.5 174.5 L 610.5 174.5 Z M 500.5 136.5 L 539.5 136.5 L 539.5 174.5 L 500.5 174.5 Z M 390.5 136.5 L 429.5 136.5 L 429.5 174.5 L 390.5 174.5 Z M 280.5 899.5 L 319.5 899.5 L 319.5 938.5 L 280.5 938.5 Z M 1600.5 899.5 L 1639.5 899.5 L 1639.5 938.5 L 1600.5 938.5 Z M 1490.5 899.5 L 1529.5 899.5 L 1529.5 938.5 L 1490.5 938.5 Z M 1380.5 899.5 L 1419.5 899.5 L 1419.5 938.5 L 1380.5 938.5 Z M 1270.5 899.5 L 1309.5 899.5 L 1309.5 938.5 L 1270.5 938.5 Z M 1160.5 899.5 L 1199.5 899.5 L 1199.5 938.5 L 1160.5 938.5 Z M 1050.5 899.5 L 1089.5 899.5 L 1089.5 938.5 L 1050.5 938.5 Z M 940.5 899.5 L 979.5 899.5 L 979.5 938.5 L 940.5 938.5 Z M 830.5 899.5 L 869.5 899.5 L 869.5 938.5 L 830.5 938.5 Z M 720.5 899.5 L 759.5 899.5 L 759.5 938.5 L 720.5 938.5 Z M 610.5 899.5 L 649.5 899.5 L 649.5 938.5 L 610.5 938.5 Z M 500.5 899.5 L 539.5 899.5 L 539.5 938.5 L 500.5 938.5 Z M 390.5 899.5 L 429.5 899.5 L 429.5 938.5 L 390.5 938.5 Z M 390.5 899.5 "/>
 </clipPath>
-<image id="image320" 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="#image320"/>
+  <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="surface314">
+<g id="surface343">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -176,6 +176,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1098.773438 527.503906 L 1088.203125 527.503906 L 1088.203125 523.261719 L 1090.019531 523.058594 L 1091.636719 522.789062 L 1093.050781 522.453125 L 1094.261719 522.183594 L 1095.269531 521.847656 L 1096.148438 521.445312 L 1096.820312 521.039062 L 1097.425781 520.570312 L 1097.964844 520.03125 L 1098.503906 519.355469 L 1098.972656 518.617188 L 1099.445312 517.742188 L 1099.648438 517.269531 L 1099.847656 516.730469 L 1100.050781 516.125 L 1100.320312 515.386719 L 1100.523438 514.644531 L 1100.792969 513.769531 L 1104.695312 513.769531 L 1104.695312 561.5 L 1098.773438 561.5 Z M 1098.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1050 562 L 1089 562 M 1050 523 L 1089 523 M 1050 523 L 1050 562 M 1089 523 L 1089 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1050 562 L 1089 562 M 1050 523 L 1089 523 M 1089 562 L 1089 523 M 1050 562 L 1050 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 245 156 L 245 165 M 240 161 L 249 161 M 244 162 L 246 162 M 244 160 L 246 160 M 244 160 L 244 162 M 246 160 L 246 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_1.svg b/cells/a221o/sky130_fd_sc_hs__a221o_1.svg
index 884bd3f..7fb2675 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_1.svg
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 1323.5 631.5 L 1357.5 631.5 L 1357.5 777.5 L 1323.5 777.5 Z M 910.5 681.5 L 945.5 681.5 L 945.5 828.5 L 910.5 828.5 Z M 1199.5 681.5 L 1234.5 681.5 L 1234.5 828.5 L 1199.5 828.5 Z M 1117.5 681.5 L 1151.5 681.5 L 1151.5 828.5 L 1117.5 828.5 Z M 993.5 681.5 L 1027.5 681.5 L 1027.5 828.5 L 993.5 828.5 Z M 678.5 664.5 L 712.5 664.5 L 712.5 833.5 L 678.5 833.5 Z M 678.5 664.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 1326.5 240.5 L 1361.5 240.5 L 1361.5 469.5 L 1326.5 469.5 Z M 1216.5 240.5 L 1251.5 240.5 L 1251.5 469.5 L 1216.5 469.5 Z M 788.5 240.5 L 822.5 240.5 L 822.5 469.5 L 788.5 469.5 Z M 891.5 240.5 L 925.5 240.5 L 925.5 469.5 L 891.5 469.5 Z M 1113.5 240.5 L 1148.5 240.5 L 1148.5 469.5 L 1113.5 469.5 Z M 670.5 240.5 L 704.5 240.5 L 704.5 496.5 L 670.5 496.5 Z M 670.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -177,6 +177,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 1100.773438 527.503906 L 1090.203125 527.503906 L 1090.203125 523.261719 L 1092.019531 523.058594 L 1093.636719 522.789062 L 1095.050781 522.453125 L 1096.261719 522.183594 L 1097.269531 521.847656 L 1098.148438 521.445312 L 1098.820312 521.039062 L 1099.425781 520.570312 L 1099.964844 520.03125 L 1100.503906 519.355469 L 1100.972656 518.617188 L 1101.445312 517.742188 L 1101.648438 517.269531 L 1101.847656 516.730469 L 1102.050781 516.125 L 1102.320312 515.386719 L 1102.523438 514.644531 L 1102.792969 513.769531 L 1106.695312 513.769531 L 1106.695312 561.5 L 1100.773438 561.5 Z M 1100.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_2.svg b/cells/a221o/sky130_fd_sc_hs__a221o_2.svg
index 8d96107..8ec41e3 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_2.svg
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 1330.5 664.5 L 1364.5 664.5 L 1364.5 833.5 L 1330.5 833.5 Z M 577.5 664.5 L 611.5 664.5 L 611.5 833.5 L 577.5 833.5 Z M 675.5 664.5 L 710.5 664.5 L 710.5 833.5 L 675.5 833.5 Z M 819.5 664.5 L 853.5 664.5 L 853.5 833.5 L 819.5 833.5 Z M 901.5 664.5 L 936.5 664.5 L 936.5 833.5 L 901.5 833.5 Z M 1123.5 664.5 L 1158.5 664.5 L 1158.5 833.5 L 1123.5 833.5 Z M 1206.5 664.5 L 1240.5 664.5 L 1240.5 833.5 L 1206.5 833.5 Z M 1206.5 664.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 1326.5 240.5 L 1361.5 240.5 L 1361.5 469.5 L 1326.5 469.5 Z M 1223.5 240.5 L 1258.5 240.5 L 1258.5 469.5 L 1223.5 469.5 Z M 898.5 240.5 L 932.5 240.5 L 932.5 469.5 L 898.5 469.5 Z M 795.5 240.5 L 829.5 240.5 L 829.5 469.5 L 795.5 469.5 Z M 1120.5 240.5 L 1154.5 240.5 L 1154.5 469.5 L 1120.5 469.5 Z M 573.5 240.5 L 608.5 240.5 L 608.5 496.5 L 573.5 496.5 Z M 677.5 240.5 L 711.5 240.5 L 711.5 496.5 L 677.5 496.5 Z M 677.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -168,6 +168,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 636.824219 282.320312 L 654.191406 307.5 L 646.449219 307.5 L 633.050781 287.035156 L 619.589844 307.5 L 611.980469 307.5 L 629.351562 282.320312 L 613.058594 258.421875 L 620.664062 258.421875 L 633.253906 277.675781 L 645.910156 258.421875 L 653.382812 258.421875 Z M 636.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 612 816 L 651 816 M 612 777 L 651 777 M 612 777 L 612 816 M 651 777 L 651 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 612 816 L 651 816 M 612 777 L 651 777 M 651 816 L 651 777 M 612 816 L 612 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221o/sky130_fd_sc_hs__a221o_4.svg b/cells/a221o/sky130_fd_sc_hs__a221o_4.svg
index 91301f1..2ae3c3c 100644
--- a/cells/a221o/sky130_fd_sc_hs__a221o_4.svg
+++ b/cells/a221o/sky130_fd_sc_hs__a221o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 243.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 204.5 758.5 L 1714.5 758.5 L 1714.5 797.5 L 204.5 797.5 Z M 204.5 758.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 301.5 590.5 L 325.5 590.5 L 325.5 691.5 L 301.5 691.5 Z M 369.5 590.5 L 392.5 590.5 L 392.5 691.5 L 369.5 691.5 Z M 646.5 600.5 L 670.5 600.5 L 670.5 700.5 L 646.5 700.5 Z M 1239.5 600.5 L 1262.5 600.5 L 1262.5 700.5 L 1239.5 700.5 Z M 579.5 600.5 L 602.5 600.5 L 602.5 700.5 L 579.5 700.5 Z M 1306.5 600.5 L 1330.5 600.5 L 1330.5 700.5 L 1306.5 700.5 Z M 1066.5 602.5 L 1090.5 602.5 L 1090.5 703.5 L 1066.5 703.5 Z M 1134.5 602.5 L 1158.5 602.5 L 1158.5 703.5 L 1134.5 703.5 Z M 859.5 602.5 L 882.5 602.5 L 882.5 718.5 L 859.5 718.5 Z M 926.5 602.5 L 950.5 602.5 L 950.5 718.5 L 926.5 718.5 Z M 791.5 602.5 L 815.5 602.5 L 815.5 718.5 L 791.5 718.5 Z M 724.5 602.5 L 747.5 602.5 L 747.5 718.5 L 724.5 718.5 Z M 1460.5 637.5 L 1484.5 637.5 L 1484.5 737.5 L 1460.5 737.5 Z M 1528.5 637.5 L 1552.5 637.5 L 1552.5 737.5 L 1528.5 737.5 Z M 1528.5 637.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1326.5 331.5 L 1349.5 331.5 L 1349.5 489.5 L 1326.5 489.5 Z M 1442.5 331.5 L 1466.5 331.5 L 1466.5 489.5 L 1442.5 489.5 Z M 1184.5 331.5 L 1208.5 331.5 L 1208.5 489.5 L 1184.5 489.5 Z M 1114.5 331.5 L 1137.5 331.5 L 1137.5 489.5 L 1114.5 489.5 Z M 1255.5 331.5 L 1279.5 331.5 L 1279.5 489.5 L 1255.5 489.5 Z M 1519.5 331.5 L 1543.5 331.5 L 1543.5 489.5 L 1519.5 489.5 Z M 393.5 344.5 L 417.5 344.5 L 417.5 501.5 L 393.5 501.5 Z M 605.5 344.5 L 628.5 344.5 L 628.5 501.5 L 605.5 501.5 Z M 534.5 344.5 L 558.5 344.5 L 558.5 501.5 L 534.5 501.5 Z M 304.5 344.5 L 327.5 344.5 L 327.5 501.5 L 304.5 501.5 Z M 842.5 331.5 L 866.5 331.5 L 866.5 508.5 L 842.5 508.5 Z M 771.5 331.5 L 795.5 331.5 L 795.5 508.5 L 771.5 508.5 Z M 701.5 331.5 L 724.5 331.5 L 724.5 508.5 L 701.5 508.5 Z M 913.5 331.5 L 937.5 331.5 L 937.5 508.5 L 913.5 508.5 Z M 913.5 331.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 228.5 260.5 L 255.5 260.5 L 255.5 287.5 L 228.5 287.5 Z M 1662.5 260.5 L 1689.5 260.5 L 1689.5 287.5 L 1662.5 287.5 Z M 1587.5 260.5 L 1614.5 260.5 L 1614.5 287.5 L 1587.5 287.5 Z M 1511.5 260.5 L 1538.5 260.5 L 1538.5 287.5 L 1511.5 287.5 Z M 1436.5 260.5 L 1463.5 260.5 L 1463.5 287.5 L 1436.5 287.5 Z M 1360.5 260.5 L 1387.5 260.5 L 1387.5 287.5 L 1360.5 287.5 Z M 1285.5 260.5 L 1312.5 260.5 L 1312.5 287.5 L 1285.5 287.5 Z M 1209.5 260.5 L 1236.5 260.5 L 1236.5 287.5 L 1209.5 287.5 Z M 1134.5 260.5 L 1161.5 260.5 L 1161.5 287.5 L 1134.5 287.5 Z M 1059.5 260.5 L 1085.5 260.5 L 1085.5 287.5 L 1059.5 287.5 Z M 983.5 260.5 L 1010.5 260.5 L 1010.5 287.5 L 983.5 287.5 Z M 908.5 260.5 L 934.5 260.5 L 934.5 287.5 L 908.5 287.5 Z M 832.5 260.5 L 859.5 260.5 L 859.5 287.5 L 832.5 287.5 Z M 757.5 260.5 L 783.5 260.5 L 783.5 287.5 L 757.5 287.5 Z M 681.5 260.5 L 708.5 260.5 L 708.5 287.5 L 681.5 287.5 Z M 606.5 260.5 L 632.5 260.5 L 632.5 287.5 L 606.5 287.5 Z M 530.5 260.5 L 557.5 260.5 L 557.5 287.5 L 530.5 287.5 Z M 455.5 260.5 L 481.5 260.5 L 481.5 287.5 L 455.5 287.5 Z M 379.5 260.5 L 406.5 260.5 L 406.5 287.5 L 379.5 287.5 Z M 304.5 260.5 L 330.5 260.5 L 330.5 287.5 L 304.5 287.5 Z M 228.5 580.5 L 255.5 580.5 L 255.5 607.5 L 228.5 607.5 Z M 681.5 580.5 L 708.5 580.5 L 708.5 607.5 L 681.5 607.5 Z M 228.5 784.5 L 255.5 784.5 L 255.5 810.5 L 228.5 810.5 Z M 1662.5 784.5 L 1689.5 784.5 L 1689.5 810.5 L 1662.5 810.5 Z M 1587.5 784.5 L 1614.5 784.5 L 1614.5 810.5 L 1587.5 810.5 Z M 1511.5 784.5 L 1538.5 784.5 L 1538.5 810.5 L 1511.5 810.5 Z M 1436.5 784.5 L 1463.5 784.5 L 1463.5 810.5 L 1436.5 810.5 Z M 1360.5 784.5 L 1387.5 784.5 L 1387.5 810.5 L 1360.5 810.5 Z M 1285.5 784.5 L 1312.5 784.5 L 1312.5 810.5 L 1285.5 810.5 Z M 1209.5 784.5 L 1236.5 784.5 L 1236.5 810.5 L 1209.5 810.5 Z M 1134.5 784.5 L 1161.5 784.5 L 1161.5 810.5 L 1134.5 810.5 Z M 1059.5 784.5 L 1085.5 784.5 L 1085.5 810.5 L 1059.5 810.5 Z M 983.5 784.5 L 1010.5 784.5 L 1010.5 810.5 L 983.5 810.5 Z M 908.5 784.5 L 934.5 784.5 L 934.5 810.5 L 908.5 810.5 Z M 832.5 784.5 L 859.5 784.5 L 859.5 810.5 L 832.5 810.5 Z M 757.5 784.5 L 783.5 784.5 L 783.5 810.5 L 757.5 810.5 Z M 681.5 784.5 L 708.5 784.5 L 708.5 810.5 L 681.5 810.5 Z M 606.5 784.5 L 632.5 784.5 L 632.5 810.5 L 606.5 810.5 Z M 530.5 784.5 L 557.5 784.5 L 557.5 810.5 L 530.5 810.5 Z M 455.5 784.5 L 481.5 784.5 L 481.5 810.5 L 455.5 810.5 Z M 379.5 784.5 L 406.5 784.5 L 406.5 810.5 L 379.5 810.5 Z M 304.5 784.5 L 330.5 784.5 L 330.5 810.5 L 304.5 810.5 Z M 304.5 784.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -174,6 +174,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 488.3125 645.125 L 481.046875 645.125 L 481.046875 642.210938 L 482.296875 642.070312 L 483.40625 641.886719 L 484.378906 641.65625 L 485.210938 641.46875 L 485.90625 641.238281 L 486.507812 640.960938 L 486.96875 640.683594 L 487.386719 640.359375 L 487.757812 639.988281 L 488.125 639.527344 L 488.449219 639.015625 L 488.773438 638.414062 L 488.914062 638.09375 L 489.050781 637.722656 L 489.191406 637.304688 L 489.375 636.796875 L 489.515625 636.285156 L 489.699219 635.683594 L 492.386719 635.683594 L 492.386719 668.5 L 488.3125 668.5 Z M 488.3125 645.125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 455 441 L 481 441 M 455 414 L 481 414 M 455 414 L 455 441 M 481 414 L 481 441 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 455 441 L 481 441 M 455 414 L 481 414 M 481 441 L 481 414 M 455 441 L 455 414 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204 277 L 204 286 M 199 282 L 208 282 M 203 283 L 205 283 M 203 281 L 205 281 M 203 281 L 203 283 M 205 281 L 205 283 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_1.svg b/cells/a221oi/sky130_fd_sc_hs__a221oi_1.svg
index 2557f68..e459d8e 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_1.svg
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1220.5 664.5 L 1254.5 664.5 L 1254.5 833.5 L 1220.5 833.5 Z M 766.5 664.5 L 800.5 664.5 L 800.5 833.5 L 766.5 833.5 Z M 890.5 664.5 L 924.5 664.5 L 924.5 833.5 L 890.5 833.5 Z M 972.5 664.5 L 1007.5 664.5 L 1007.5 833.5 L 972.5 833.5 Z M 1137.5 664.5 L 1172.5 664.5 L 1172.5 833.5 L 1137.5 833.5 Z M 1137.5 664.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1223.5 240.5 L 1258.5 240.5 L 1258.5 496.5 L 1223.5 496.5 Z M 623.5 240.5 L 657.5 240.5 L 657.5 496.5 L 623.5 496.5 Z M 886.5 240.5 L 921.5 240.5 L 921.5 496.5 L 886.5 496.5 Z M 989.5 240.5 L 1024.5 240.5 L 1024.5 496.5 L 989.5 496.5 Z M 1099.5 240.5 L 1134.5 240.5 L 1134.5 496.5 L 1099.5 496.5 Z M 1099.5 240.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface325">
+<g id="surface353">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1356.703125 615.332031 L 1357.242188 610.28125 L 1358.652344 606.175781 L 1360.875 602.941406 L 1363.90625 600.652344 L 1367.742188 599.242188 L 1372.457031 598.769531 L 1374.609375 598.902344 L 1376.695312 599.242188 L 1378.648438 599.777344 L 1380.398438 600.585938 L 1382.015625 601.597656 L 1383.5625 602.742188 L 1384.773438 604.15625 L 1385.851562 605.636719 L 1386.660156 607.25 L 1387.265625 608.933594 L 1387.601562 610.820312 L 1387.738281 612.773438 L 1387.46875 615.53125 L 1386.726562 618.089844 L 1385.449219 620.445312 L 1383.699219 622.667969 L 1381.410156 624.753906 L 1378.648438 626.574219 L 1377.640625 627.179688 L 1370.90625 630.8125 L 1369.15625 631.824219 L 1367.609375 632.832031 L 1366.261719 633.84375 L 1365.183594 634.851562 L 1364.242188 635.863281 L 1363.570312 636.875 L 1363.230469 637.480469 L 1362.960938 638.015625 L 1362.761719 638.691406 L 1362.558594 639.296875 L 1362.355469 639.96875 L 1362.289062 640.644531 L 1387.402344 640.644531 L 1387.402344 646.5 L 1355.625 646.5 L 1355.757812 644.144531 L 1356.097656 641.988281 L 1356.5 639.96875 L 1357.039062 638.21875 L 1357.644531 636.535156 L 1358.386719 635.054688 L 1359.191406 633.777344 L 1360.203125 632.496094 L 1361.414062 631.21875 L 1362.761719 630.007812 L 1364.308594 628.792969 L 1366.125 627.582031 L 1366.53125 627.3125 L 1367.003906 627.042969 L 1367.472656 626.707031 L 1367.945312 626.4375 L 1368.484375 626.167969 L 1369.023438 625.832031 L 1375.214844 622.332031 L 1377.167969 621.050781 L 1378.785156 619.640625 L 1380.0625 618.15625 L 1380.9375 616.542969 L 1381.476562 614.792969 L 1381.679688 612.90625 L 1381.542969 611.628906 L 1381.339844 610.347656 L 1380.871094 609.203125 L 1380.332031 608.125 L 1379.523438 607.183594 L 1378.648438 606.242188 L 1377.707031 605.570312 L 1376.765625 604.960938 L 1375.6875 604.558594 L 1374.609375 604.222656 L 1373.464844 604.019531 L 1372.253906 603.953125 L 1369.628906 604.289062 L 1367.40625 605.097656 L 1365.589844 606.511719 L 1364.242188 608.464844 L 1363.300781 611.023438 L 1362.761719 614.050781 L 1362.695312 614.320312 L 1362.695312 614.722656 L 1362.625 614.925781 L 1362.625 615.332031 Z M 1356.703125 615.332031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1327 477 L 1366 477 M 1327 438 L 1366 438 M 1327 438 L 1327 477 M 1366 438 L 1366 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1327 477 L 1366 477 M 1327 438 L 1366 438 M 1366 477 L 1366 438 M 1327 477 L 1327 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_2.svg b/cells/a221oi/sky130_fd_sc_hs__a221oi_2.svg
index 6f35d5a..008fac3 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_2.svg
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image319" 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="#image319"/>
+  <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 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#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 1440.5 664.5 L 1474.5 664.5 L 1474.5 833.5 L 1440.5 833.5 Z M 399.5 664.5 L 434.5 664.5 L 434.5 833.5 L 399.5 833.5 Z M 502.5 664.5 L 537.5 664.5 L 537.5 833.5 L 502.5 833.5 Z M 601.5 664.5 L 635.5 664.5 L 635.5 833.5 L 601.5 833.5 Z M 709.5 664.5 L 743.5 664.5 L 743.5 833.5 L 709.5 833.5 Z M 832.5 664.5 L 867.5 664.5 L 867.5 833.5 L 832.5 833.5 Z M 931.5 664.5 L 965.5 664.5 L 965.5 833.5 L 931.5 833.5 Z M 1039.5 664.5 L 1073.5 664.5 L 1073.5 833.5 L 1039.5 833.5 Z M 1227.5 664.5 L 1261.5 664.5 L 1261.5 833.5 L 1227.5 833.5 Z M 1341.5 664.5 L 1376.5 664.5 L 1376.5 833.5 L 1341.5 833.5 Z M 1341.5 664.5 "/>
 </clipPath>
-<image id="image320" 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="#image320"/>
+  <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 1450.5 240.5 L 1484.5 240.5 L 1484.5 496.5 L 1450.5 496.5 Z M 396.5 240.5 L 430.5 240.5 L 430.5 496.5 L 396.5 496.5 Z M 499.5 240.5 L 533.5 240.5 L 533.5 496.5 L 499.5 496.5 Z M 602.5 240.5 L 636.5 240.5 L 636.5 496.5 L 602.5 496.5 Z M 712.5 240.5 L 746.5 240.5 L 746.5 496.5 L 712.5 496.5 Z M 815.5 240.5 L 850.5 240.5 L 850.5 496.5 L 815.5 496.5 Z M 918.5 240.5 L 953.5 240.5 L 953.5 496.5 L 918.5 496.5 Z M 1141.5 240.5 L 1175.5 240.5 L 1175.5 496.5 L 1141.5 496.5 Z M 1244.5 240.5 L 1278.5 240.5 L 1278.5 496.5 L 1244.5 496.5 Z M 1347.5 240.5 L 1381.5 240.5 L 1381.5 496.5 L 1347.5 496.5 Z M 1347.5 240.5 "/>
 </clipPath>
-<image id="image321" 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="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image322" 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="#image322"/>
+  <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="surface316">
+<g id="surface344">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,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 495.476562 526.953125 L 484.90625 526.953125 L 484.90625 522.714844 L 486.722656 522.511719 L 488.339844 522.242188 L 489.753906 521.90625 L 490.964844 521.636719 L 491.972656 521.300781 L 492.847656 520.894531 L 493.523438 520.492188 L 494.128906 520.019531 L 494.667969 519.480469 L 495.207031 518.808594 L 495.675781 518.066406 L 496.148438 517.191406 L 496.351562 516.722656 L 496.550781 516.183594 L 496.753906 515.578125 L 497.023438 514.835938 L 497.226562 514.097656 L 497.496094 513.222656 L 501.398438 513.222656 L 501.398438 560.953125 L 495.476562 560.953125 Z M 495.476562 526.953125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 445 562 L 484 562 M 445 523 L 484 523 M 445 523 L 445 562 M 484 523 L 484 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 445 562 L 484 562 M 445 523 L 484 523 M 484 562 L 484 523 M 445 562 L 445 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a221oi/sky130_fd_sc_hs__a221oi_4.svg b/cells/a221oi/sky130_fd_sc_hs__a221oi_4.svg
index d386720..b67677d 100644
--- a/cells/a221oi/sky130_fd_sc_hs__a221oi_4.svg
+++ b/cells/a221oi/sky130_fd_sc_hs__a221oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 269.5 L 1743.5 269.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 269.5 "/>
 </clipPath>
-<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image436" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image407"/>
+  <use xlink:href="#image436"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 201.5 739.5 L 1716.5 739.5 L 1716.5 774.5 L 201.5 774.5 Z M 201.5 739.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image407"/>
+  <use xlink:href="#image436"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1622.5 615.5 L 1644.5 615.5 L 1644.5 721.5 L 1622.5 721.5 Z M 280.5 615.5 L 301.5 615.5 L 301.5 721.5 L 280.5 721.5 Z M 342.5 615.5 L 363.5 615.5 L 363.5 721.5 L 342.5 721.5 Z M 403.5 615.5 L 425.5 615.5 L 425.5 721.5 L 403.5 721.5 Z M 465.5 615.5 L 487.5 615.5 L 487.5 721.5 L 465.5 721.5 Z M 622.5 615.5 L 644.5 615.5 L 644.5 721.5 L 622.5 721.5 Z M 684.5 615.5 L 705.5 615.5 L 705.5 721.5 L 684.5 721.5 Z M 746.5 615.5 L 767.5 615.5 L 767.5 721.5 L 746.5 721.5 Z M 807.5 615.5 L 829.5 615.5 L 829.5 721.5 L 807.5 721.5 Z M 869.5 615.5 L 890.5 615.5 L 890.5 721.5 L 869.5 721.5 Z M 931.5 615.5 L 952.5 615.5 L 952.5 721.5 L 931.5 721.5 Z M 992.5 615.5 L 1014.5 615.5 L 1014.5 721.5 L 992.5 721.5 Z M 1054.5 615.5 L 1076.5 615.5 L 1076.5 721.5 L 1054.5 721.5 Z M 1190.5 615.5 L 1212.5 615.5 L 1212.5 721.5 L 1190.5 721.5 Z M 1252.5 615.5 L 1274.5 615.5 L 1274.5 721.5 L 1252.5 721.5 Z M 1314.5 615.5 L 1335.5 615.5 L 1335.5 721.5 L 1314.5 721.5 Z M 1375.5 615.5 L 1397.5 615.5 L 1397.5 721.5 L 1375.5 721.5 Z M 1437.5 615.5 L 1459.5 615.5 L 1459.5 721.5 L 1437.5 721.5 Z M 1499.5 615.5 L 1520.5 615.5 L 1520.5 721.5 L 1499.5 721.5 Z M 1561.5 615.5 L 1582.5 615.5 L 1582.5 721.5 L 1561.5 721.5 Z M 1561.5 615.5 "/>
 </clipPath>
-<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image408"/>
+  <use xlink:href="#image437"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1623.5 349.5 L 1644.5 349.5 L 1644.5 510.5 L 1623.5 510.5 Z M 261.5 349.5 L 283.5 349.5 L 283.5 510.5 L 261.5 510.5 Z M 326.5 349.5 L 347.5 349.5 L 347.5 510.5 L 326.5 510.5 Z M 390.5 349.5 L 412.5 349.5 L 412.5 510.5 L 390.5 510.5 Z M 455.5 349.5 L 477.5 349.5 L 477.5 510.5 L 455.5 510.5 Z M 621.5 349.5 L 643.5 349.5 L 643.5 510.5 L 621.5 510.5 Z M 686.5 349.5 L 708.5 349.5 L 708.5 510.5 L 686.5 510.5 Z M 751.5 349.5 L 772.5 349.5 L 772.5 510.5 L 751.5 510.5 Z M 815.5 349.5 L 837.5 349.5 L 837.5 510.5 L 815.5 510.5 Z M 880.5 349.5 L 901.5 349.5 L 901.5 510.5 L 880.5 510.5 Z M 944.5 349.5 L 966.5 349.5 L 966.5 510.5 L 944.5 510.5 Z M 1009.5 349.5 L 1030.5 349.5 L 1030.5 510.5 L 1009.5 510.5 Z M 1106.5 349.5 L 1128.5 349.5 L 1128.5 510.5 L 1106.5 510.5 Z M 1171.5 349.5 L 1192.5 349.5 L 1192.5 510.5 L 1171.5 510.5 Z M 1236.5 349.5 L 1257.5 349.5 L 1257.5 510.5 L 1236.5 510.5 Z M 1300.5 349.5 L 1322.5 349.5 L 1322.5 510.5 L 1300.5 510.5 Z M 1365.5 349.5 L 1386.5 349.5 L 1386.5 510.5 L 1365.5 510.5 Z M 1429.5 349.5 L 1451.5 349.5 L 1451.5 510.5 L 1429.5 510.5 Z M 1494.5 349.5 L 1515.5 349.5 L 1515.5 510.5 L 1494.5 510.5 Z M 1558.5 349.5 L 1580.5 349.5 L 1580.5 510.5 L 1558.5 510.5 Z M 1558.5 349.5 "/>
 </clipPath>
-<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image409"/>
+  <use xlink:href="#image438"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 223.5 284.5 L 248.5 284.5 L 248.5 308.5 L 223.5 308.5 Z M 1670.5 284.5 L 1694.5 284.5 L 1694.5 308.5 L 1670.5 308.5 Z M 1601.5 284.5 L 1625.5 284.5 L 1625.5 308.5 L 1601.5 308.5 Z M 1532.5 284.5 L 1556.5 284.5 L 1556.5 308.5 L 1532.5 308.5 Z M 1463.5 284.5 L 1487.5 284.5 L 1487.5 308.5 L 1463.5 308.5 Z M 1394.5 284.5 L 1418.5 284.5 L 1418.5 308.5 L 1394.5 308.5 Z M 1325.5 284.5 L 1350.5 284.5 L 1350.5 308.5 L 1325.5 308.5 Z M 1256.5 284.5 L 1281.5 284.5 L 1281.5 308.5 L 1256.5 308.5 Z M 1187.5 284.5 L 1212.5 284.5 L 1212.5 308.5 L 1187.5 308.5 Z M 1119.5 284.5 L 1143.5 284.5 L 1143.5 308.5 L 1119.5 308.5 Z M 1050.5 284.5 L 1074.5 284.5 L 1074.5 308.5 L 1050.5 308.5 Z M 981.5 284.5 L 1005.5 284.5 L 1005.5 308.5 L 981.5 308.5 Z M 912.5 284.5 L 936.5 284.5 L 936.5 308.5 L 912.5 308.5 Z M 843.5 284.5 L 867.5 284.5 L 867.5 308.5 L 843.5 308.5 Z M 774.5 284.5 L 799.5 284.5 L 799.5 308.5 L 774.5 308.5 Z M 705.5 284.5 L 730.5 284.5 L 730.5 308.5 L 705.5 308.5 Z M 636.5 284.5 L 661.5 284.5 L 661.5 308.5 L 636.5 308.5 Z M 568.5 284.5 L 592.5 284.5 L 592.5 308.5 L 568.5 308.5 Z M 499.5 284.5 L 523.5 284.5 L 523.5 308.5 L 499.5 308.5 Z M 430.5 284.5 L 454.5 284.5 L 454.5 308.5 L 430.5 308.5 Z M 361.5 284.5 L 385.5 284.5 L 385.5 308.5 L 361.5 308.5 Z M 292.5 284.5 L 317.5 284.5 L 317.5 308.5 L 292.5 308.5 Z M 223.5 762.5 L 248.5 762.5 L 248.5 786.5 L 223.5 786.5 Z M 1670.5 762.5 L 1694.5 762.5 L 1694.5 786.5 L 1670.5 786.5 Z M 1601.5 762.5 L 1625.5 762.5 L 1625.5 786.5 L 1601.5 786.5 Z M 1532.5 762.5 L 1556.5 762.5 L 1556.5 786.5 L 1532.5 786.5 Z M 1463.5 762.5 L 1487.5 762.5 L 1487.5 786.5 L 1463.5 786.5 Z M 1394.5 762.5 L 1418.5 762.5 L 1418.5 786.5 L 1394.5 786.5 Z M 1325.5 762.5 L 1350.5 762.5 L 1350.5 786.5 L 1325.5 786.5 Z M 1256.5 762.5 L 1281.5 762.5 L 1281.5 786.5 L 1256.5 786.5 Z M 1187.5 762.5 L 1212.5 762.5 L 1212.5 786.5 L 1187.5 786.5 Z M 1119.5 762.5 L 1143.5 762.5 L 1143.5 786.5 L 1119.5 786.5 Z M 1050.5 762.5 L 1074.5 762.5 L 1074.5 786.5 L 1050.5 786.5 Z M 981.5 762.5 L 1005.5 762.5 L 1005.5 786.5 L 981.5 786.5 Z M 912.5 762.5 L 936.5 762.5 L 936.5 786.5 L 912.5 786.5 Z M 843.5 762.5 L 867.5 762.5 L 867.5 786.5 L 843.5 786.5 Z M 774.5 762.5 L 799.5 762.5 L 799.5 786.5 L 774.5 786.5 Z M 705.5 762.5 L 730.5 762.5 L 730.5 786.5 L 705.5 786.5 Z M 636.5 762.5 L 661.5 762.5 L 661.5 786.5 L 636.5 786.5 Z M 568.5 762.5 L 592.5 762.5 L 592.5 786.5 L 568.5 786.5 Z M 499.5 762.5 L 523.5 762.5 L 523.5 786.5 L 499.5 786.5 Z M 430.5 762.5 L 454.5 762.5 L 454.5 786.5 L 430.5 786.5 Z M 361.5 762.5 L 385.5 762.5 L 385.5 786.5 L 361.5 786.5 Z M 292.5 762.5 L 317.5 762.5 L 317.5 786.5 L 292.5 786.5 Z M 292.5 762.5 "/>
 </clipPath>
-<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image410"/>
+  <use xlink:href="#image439"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface404">
+<g id="surface433">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -240,6 +240,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 1080.421875 529.25 L 1073.8125 529.25 L 1073.8125 526.601562 L 1074.949219 526.476562 L 1075.960938 526.304688 L 1076.84375 526.097656 L 1077.601562 525.929688 L 1078.230469 525.71875 L 1078.777344 525.464844 L 1079.199219 525.210938 L 1079.578125 524.917969 L 1079.914062 524.582031 L 1080.25 524.160156 L 1080.546875 523.699219 L 1080.839844 523.152344 L 1080.96875 522.855469 L 1081.09375 522.519531 L 1081.21875 522.140625 L 1081.386719 521.679688 L 1081.515625 521.214844 L 1081.683594 520.667969 L 1084.121094 520.667969 L 1084.121094 550.5 L 1080.421875 550.5 Z M 1080.421875 529.25 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1050 556 L 1074 556 M 1050 532 L 1074 532 M 1050 532 L 1050 556 M 1074 532 L 1074 556 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1050 556 L 1074 556 M 1050 532 L 1074 532 M 1074 556 L 1074 532 M 1050 556 L 1050 532 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201 300 L 201 309 M 196 305 L 205 305 M 200 306 L 202 306 M 200 304 L 202 304 M 200 304 L 200 306 M 202 304 L 202 306 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a222o/sky130_fd_sc_hs__a222o_1.svg b/cells/a222o/sky130_fd_sc_hs__a222o_1.svg
index 3fd539a..4c49c9a 100644
--- a/cells/a222o/sky130_fd_sc_hs__a222o_1.svg
+++ b/cells/a222o/sky130_fd_sc_hs__a222o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1380.5 664.5 L 1415.5 664.5 L 1415.5 833.5 L 1380.5 833.5 Z M 602.5 687.5 L 636.5 687.5 L 636.5 833.5 L 602.5 833.5 Z M 1212.5 687.5 L 1246.5 687.5 L 1246.5 833.5 L 1212.5 833.5 Z M 1122.5 687.5 L 1157.5 687.5 L 1157.5 833.5 L 1122.5 833.5 Z M 908.5 687.5 L 942.5 687.5 L 942.5 833.5 L 908.5 833.5 Z M 819.5 687.5 L 853.5 687.5 L 853.5 833.5 L 819.5 833.5 Z M 513.5 687.5 L 547.5 687.5 L 547.5 833.5 L 513.5 833.5 Z M 513.5 687.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 509.5 242.5 L 544.5 242.5 L 544.5 471.5 L 509.5 471.5 Z M 898.5 242.5 L 932.5 242.5 L 932.5 471.5 L 898.5 471.5 Z M 648.5 242.5 L 682.5 242.5 L 682.5 471.5 L 648.5 471.5 Z M 763.5 242.5 L 797.5 242.5 L 797.5 471.5 L 763.5 471.5 Z M 1244.5 250.5 L 1278.5 250.5 L 1278.5 479.5 L 1244.5 479.5 Z M 1141.5 250.5 L 1175.5 250.5 L 1175.5 479.5 L 1141.5 479.5 Z M 1378.5 240.5 L 1412.5 240.5 L 1412.5 496.5 L 1378.5 496.5 Z M 1378.5 240.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface346">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1044.773438 527.503906 L 1034.203125 527.503906 L 1034.203125 523.261719 L 1036.019531 523.058594 L 1037.636719 522.789062 L 1039.050781 522.453125 L 1040.261719 522.183594 L 1041.269531 521.847656 L 1042.148438 521.445312 L 1042.820312 521.039062 L 1043.425781 520.570312 L 1043.964844 520.03125 L 1044.503906 519.355469 L 1044.972656 518.617188 L 1045.445312 517.742188 L 1045.648438 517.269531 L 1045.847656 516.730469 L 1046.050781 516.125 L 1046.320312 515.386719 L 1046.523438 514.644531 L 1046.792969 513.769531 L 1050.695312 513.769531 L 1050.695312 561.5 L 1044.773438 561.5 Z M 1044.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 996 562 L 1035 562 M 996 523 L 1035 523 M 996 523 L 996 562 M 1035 523 L 1035 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 996 562 L 1035 562 M 996 523 L 1035 523 M 1035 562 L 1035 523 M 996 562 L 996 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a222o/sky130_fd_sc_hs__a222o_2.svg b/cells/a222o/sky130_fd_sc_hs__a222o_2.svg
index c32e737..6107ea6 100644
--- a/cells/a222o/sky130_fd_sc_hs__a222o_2.svg
+++ b/cells/a222o/sky130_fd_sc_hs__a222o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 814.5 655.5 L 848.5 655.5 L 848.5 824.5 L 814.5 824.5 Z M 716.5 655.5 L 750.5 655.5 L 750.5 824.5 L 716.5 824.5 Z M 452.5 678.5 L 486.5 678.5 L 486.5 824.5 L 452.5 824.5 Z M 541.5 678.5 L 576.5 678.5 L 576.5 824.5 L 541.5 824.5 Z M 1067.5 687.5 L 1102.5 687.5 L 1102.5 833.5 L 1067.5 833.5 Z M 1429.5 687.5 L 1464.5 687.5 L 1464.5 833.5 L 1429.5 833.5 Z M 1209.5 687.5 L 1244.5 687.5 L 1244.5 833.5 L 1209.5 833.5 Z M 1299.5 687.5 L 1333.5 687.5 L 1333.5 833.5 L 1299.5 833.5 Z M 1299.5 687.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 454.5 240.5 L 489.5 240.5 L 489.5 469.5 L 454.5 469.5 Z M 557.5 240.5 L 592.5 240.5 L 592.5 469.5 L 557.5 469.5 Z M 1307.5 267.5 L 1341.5 267.5 L 1341.5 496.5 L 1307.5 496.5 Z M 1204.5 267.5 L 1238.5 267.5 L 1238.5 496.5 L 1204.5 496.5 Z M 1054.5 267.5 L 1088.5 267.5 L 1088.5 496.5 L 1054.5 496.5 Z M 911.5 240.5 L 946.5 240.5 L 946.5 496.5 L 911.5 496.5 Z M 808.5 240.5 L 843.5 240.5 L 843.5 496.5 L 808.5 496.5 Z M 1433.5 267.5 L 1467.5 267.5 L 1467.5 496.5 L 1433.5 496.5 Z M 1433.5 267.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface334">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,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 1099.773438 442.503906 L 1089.203125 442.503906 L 1089.203125 438.261719 L 1091.019531 438.058594 L 1092.636719 437.789062 L 1094.050781 437.453125 L 1095.261719 437.183594 L 1096.269531 436.847656 L 1097.148438 436.445312 L 1097.820312 436.039062 L 1098.425781 435.570312 L 1098.964844 435.03125 L 1099.503906 434.355469 L 1099.972656 433.617188 L 1100.445312 432.742188 L 1100.648438 432.269531 L 1100.847656 431.730469 L 1101.050781 431.125 L 1101.320312 430.386719 L 1101.523438 429.644531 L 1101.792969 428.769531 L 1105.695312 428.769531 L 1105.695312 476.5 L 1099.773438 476.5 Z M 1099.773438 442.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1051 647 L 1090 647 M 1051 608 L 1090 608 M 1051 608 L 1051 647 M 1090 608 L 1090 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1051 647 L 1090 647 M 1051 608 L 1090 608 M 1090 647 L 1090 608 M 1051 647 L 1051 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a222oi/sky130_fd_sc_hs__a222oi_1.svg b/cells/a222oi/sky130_fd_sc_hs__a222oi_1.svg
index b0186f5..cef8902 100644
--- a/cells/a222oi/sky130_fd_sc_hs__a222oi_1.svg
+++ b/cells/a222oi/sky130_fd_sc_hs__a222oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 1321.5 687.5 L 1355.5 687.5 L 1355.5 833.5 L 1321.5 833.5 Z M 569.5 687.5 L 603.5 687.5 L 603.5 833.5 L 569.5 833.5 Z M 658.5 687.5 L 693.5 687.5 L 693.5 833.5 L 658.5 833.5 Z M 961.5 687.5 L 995.5 687.5 L 995.5 833.5 L 961.5 833.5 Z M 1050.5 687.5 L 1085.5 687.5 L 1085.5 833.5 L 1050.5 833.5 Z M 1231.5 687.5 L 1266.5 687.5 L 1266.5 833.5 L 1231.5 833.5 Z M 1231.5 687.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 1324.5 240.5 L 1358.5 240.5 L 1358.5 469.5 L 1324.5 469.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 469.5 L 565.5 469.5 Z M 680.5 240.5 L 714.5 240.5 L 714.5 469.5 L 680.5 469.5 Z M 957.5 240.5 L 992.5 240.5 L 992.5 469.5 L 957.5 469.5 Z M 1072.5 240.5 L 1106.5 240.5 L 1106.5 469.5 L 1072.5 469.5 Z M 1187.5 240.5 L 1221.5 240.5 L 1221.5 469.5 L 1187.5 469.5 Z M 1187.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -192,6 +192,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 971.703125 530.332031 L 972.242188 525.28125 L 973.652344 521.175781 L 975.875 517.941406 L 978.90625 515.652344 L 982.742188 514.242188 L 987.457031 513.769531 L 989.609375 513.902344 L 991.695312 514.242188 L 993.648438 514.777344 L 995.398438 515.585938 L 997.015625 516.597656 L 998.5625 517.742188 L 999.773438 519.15625 L 1000.851562 520.636719 L 1001.660156 522.25 L 1002.265625 523.933594 L 1002.601562 525.820312 L 1002.738281 527.773438 L 1002.46875 530.53125 L 1001.726562 533.089844 L 1000.449219 535.445312 L 998.699219 537.667969 L 996.410156 539.753906 L 993.648438 541.574219 L 992.640625 542.179688 L 985.90625 545.8125 L 984.15625 546.824219 L 982.609375 547.832031 L 981.261719 548.84375 L 980.183594 549.851562 L 979.242188 550.863281 L 978.570312 551.875 L 978.230469 552.480469 L 977.960938 553.015625 L 977.761719 553.691406 L 977.558594 554.296875 L 977.355469 554.96875 L 977.289062 555.644531 L 1002.402344 555.644531 L 1002.402344 561.5 L 970.625 561.5 L 970.757812 559.144531 L 971.097656 556.988281 L 971.5 554.96875 L 972.039062 553.21875 L 972.644531 551.535156 L 973.386719 550.054688 L 974.191406 548.777344 L 975.203125 547.496094 L 976.414062 546.21875 L 977.761719 545.007812 L 979.308594 543.792969 L 981.125 542.582031 L 981.53125 542.3125 L 982.003906 542.042969 L 982.472656 541.707031 L 982.945312 541.4375 L 983.484375 541.167969 L 984.023438 540.832031 L 990.214844 537.332031 L 992.167969 536.050781 L 993.785156 534.640625 L 995.0625 533.15625 L 995.9375 531.542969 L 996.476562 529.792969 L 996.679688 527.90625 L 996.542969 526.628906 L 996.339844 525.347656 L 995.871094 524.203125 L 995.332031 523.125 L 994.523438 522.183594 L 993.648438 521.242188 L 992.707031 520.570312 L 991.765625 519.960938 L 990.6875 519.558594 L 989.609375 519.222656 L 988.464844 519.019531 L 987.253906 518.953125 L 984.628906 519.289062 L 982.40625 520.097656 L 980.589844 521.511719 L 979.242188 523.464844 L 978.300781 526.023438 L 977.761719 529.050781 L 977.695312 529.320312 L 977.695312 529.722656 L 977.625 529.925781 L 977.625 530.332031 Z M 971.703125 530.332031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 942 562 L 981 562 M 942 523 L 981 523 M 942 523 L 942 562 M 981 523 L 981 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 942 562 L 981 562 M 942 523 L 981 523 M 981 562 L 981 523 M 942 562 L 942 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a222oi/sky130_fd_sc_hs__a222oi_2.svg b/cells/a222oi/sky130_fd_sc_hs__a222oi_2.svg
index 294a596..3c18dfa 100644
--- a/cells/a222oi/sky130_fd_sc_hs__a222oi_2.svg
+++ b/cells/a222oi/sky130_fd_sc_hs__a222oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 127.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 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#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 1570.5 681.5 L 1603.5 681.5 L 1603.5 823.5 L 1570.5 823.5 Z M 335.5 681.5 L 368.5 681.5 L 368.5 823.5 L 335.5 823.5 Z M 430.5 681.5 L 463.5 681.5 L 463.5 823.5 L 430.5 823.5 Z M 525.5 681.5 L 558.5 681.5 L 558.5 823.5 L 525.5 823.5 Z M 620.5 681.5 L 653.5 681.5 L 653.5 823.5 L 620.5 823.5 Z M 838.5 681.5 L 871.5 681.5 L 871.5 823.5 L 838.5 823.5 Z M 933.5 681.5 L 967.5 681.5 L 967.5 823.5 L 933.5 823.5 Z M 1077.5 681.5 L 1110.5 681.5 L 1110.5 823.5 L 1077.5 823.5 Z M 1172.5 681.5 L 1205.5 681.5 L 1205.5 823.5 L 1172.5 823.5 Z M 1267.5 681.5 L 1300.5 681.5 L 1300.5 823.5 L 1267.5 823.5 Z M 1377.5 681.5 L 1411.5 681.5 L 1411.5 823.5 L 1377.5 823.5 Z M 1475.5 681.5 L 1508.5 681.5 L 1508.5 823.5 L 1475.5 823.5 Z M 1475.5 681.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 1573.5 250.5 L 1606.5 250.5 L 1606.5 471.5 L 1573.5 471.5 Z M 311.5 250.5 L 345.5 250.5 L 345.5 471.5 L 311.5 471.5 Z M 411.5 250.5 L 444.5 250.5 L 444.5 471.5 L 411.5 471.5 Z M 517.5 250.5 L 550.5 250.5 L 550.5 471.5 L 517.5 471.5 Z M 616.5 250.5 L 649.5 250.5 L 649.5 471.5 L 616.5 471.5 Z M 851.5 250.5 L 884.5 250.5 L 884.5 471.5 L 851.5 471.5 Z M 950.5 250.5 L 983.5 250.5 L 983.5 471.5 L 950.5 471.5 Z M 1049.5 250.5 L 1082.5 250.5 L 1082.5 471.5 L 1049.5 471.5 Z M 1169.5 250.5 L 1202.5 250.5 L 1202.5 471.5 L 1169.5 471.5 Z M 1268.5 250.5 L 1301.5 250.5 L 1301.5 471.5 L 1268.5 471.5 Z M 1374.5 250.5 L 1407.5 250.5 L 1407.5 471.5 L 1374.5 471.5 Z M 1474.5 250.5 L 1507.5 250.5 L 1507.5 471.5 L 1474.5 471.5 Z M 1474.5 250.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.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>
@@ -172,6 +172,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 933.175781 527.917969 L 923.046875 527.917969 L 923.046875 523.855469 L 924.789062 523.660156 L 926.339844 523.402344 L 927.695312 523.082031 L 928.855469 522.824219 L 929.824219 522.5 L 930.660156 522.113281 L 931.304688 521.726562 L 931.886719 521.273438 L 932.402344 520.757812 L 932.917969 520.113281 L 933.371094 519.402344 L 933.824219 518.566406 L 934.015625 518.113281 L 934.210938 517.597656 L 934.402344 517.015625 L 934.660156 516.304688 L 934.855469 515.597656 L 935.113281 514.757812 L 938.855469 514.757812 L 938.855469 560.5 L 933.175781 560.5 Z M 933.175781 527.917969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 887 561 L 925 561 M 887 524 L 925 524 M 887 524 L 887 561 M 925 524 L 925 561 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 887 561 L 925 561 M 887 524 L 925 524 M 925 561 L 925 524 M 887 561 L 887 524 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_1.svg b/cells/a22o/sky130_fd_sc_hs__a22o_1.svg
index 1e30691..e58f503 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_1.svg
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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="#image343"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 697.5 631.5 L 732.5 631.5 L 732.5 777.5 L 697.5 777.5 Z M 806.5 681.5 L 840.5 681.5 L 840.5 828.5 L 806.5 828.5 Z M 987.5 681.5 L 1022.5 681.5 L 1022.5 828.5 L 987.5 828.5 Z M 889.5 681.5 L 923.5 681.5 L 923.5 828.5 L 889.5 828.5 Z M 1219.5 664.5 L 1253.5 664.5 L 1253.5 833.5 L 1219.5 833.5 Z M 1219.5 664.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1031.5 240.5 L 1065.5 240.5 L 1065.5 469.5 L 1031.5 469.5 Z M 694.5 240.5 L 728.5 240.5 L 728.5 469.5 L 694.5 469.5 Z M 797.5 240.5 L 831.5 240.5 L 831.5 469.5 L 797.5 469.5 Z M 907.5 240.5 L 941.5 240.5 L 941.5 469.5 L 907.5 469.5 Z M 1198.5 240.5 L 1232.5 240.5 L 1232.5 496.5 L 1198.5 496.5 Z M 1198.5 240.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface312">
+<g id="surface340">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1100.773438 527.503906 L 1090.203125 527.503906 L 1090.203125 523.261719 L 1092.019531 523.058594 L 1093.636719 522.789062 L 1095.050781 522.453125 L 1096.261719 522.183594 L 1097.269531 521.847656 L 1098.148438 521.445312 L 1098.820312 521.039062 L 1099.425781 520.570312 L 1099.964844 520.03125 L 1100.503906 519.355469 L 1100.972656 518.617188 L 1101.445312 517.742188 L 1101.648438 517.269531 L 1101.847656 516.730469 L 1102.050781 516.125 L 1102.320312 515.386719 L 1102.523438 514.644531 L 1102.792969 513.769531 L 1106.695312 513.769531 L 1106.695312 561.5 L 1100.773438 561.5 Z M 1100.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_2.svg b/cells/a22o/sky130_fd_sc_hs__a22o_2.svg
index 0ee0259..84beb60 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_2.svg
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1266.5 664.5 L 1300.5 664.5 L 1300.5 833.5 L 1266.5 833.5 Z M 615.5 664.5 L 649.5 664.5 L 649.5 833.5 L 615.5 833.5 Z M 713.5 664.5 L 748.5 664.5 L 748.5 833.5 L 713.5 833.5 Z M 936.5 664.5 L 970.5 664.5 L 970.5 833.5 L 936.5 833.5 Z M 1050.5 664.5 L 1085.5 664.5 L 1085.5 833.5 L 1050.5 833.5 Z M 1142.5 664.5 L 1176.5 664.5 L 1176.5 833.5 L 1142.5 833.5 Z M 1142.5 664.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 705.5 240.5 L 740.5 240.5 L 740.5 496.5 L 705.5 496.5 Z M 1269.5 267.5 L 1303.5 267.5 L 1303.5 496.5 L 1269.5 496.5 Z M 1150.5 267.5 L 1184.5 267.5 L 1184.5 496.5 L 1150.5 496.5 Z M 1035.5 267.5 L 1070.5 267.5 L 1070.5 496.5 L 1035.5 496.5 Z M 932.5 267.5 L 967.5 267.5 L 967.5 496.5 L 932.5 496.5 Z M 808.5 240.5 L 843.5 240.5 L 843.5 496.5 L 808.5 496.5 Z M 808.5 240.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,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 935.773438 527.503906 L 925.203125 527.503906 L 925.203125 523.261719 L 927.019531 523.058594 L 928.636719 522.789062 L 930.050781 522.453125 L 931.261719 522.183594 L 932.269531 521.847656 L 933.148438 521.445312 L 933.820312 521.039062 L 934.425781 520.570312 L 934.964844 520.03125 L 935.503906 519.355469 L 935.972656 518.617188 L 936.445312 517.742188 L 936.648438 517.269531 L 936.847656 516.730469 L 937.050781 516.125 L 937.320312 515.386719 L 937.523438 514.644531 L 937.792969 513.769531 L 941.695312 513.769531 L 941.695312 561.5 L 935.773438 561.5 Z M 935.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 887 562 L 926 562 M 887 523 L 926 523 M 887 523 L 887 562 M 926 523 L 926 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 887 562 L 926 562 M 887 523 L 926 523 M 926 562 L 926 523 M 887 562 L 887 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22o/sky130_fd_sc_hs__a22o_4.svg b/cells/a22o/sky130_fd_sc_hs__a22o_4.svg
index 7948ac6..8e745f6 100644
--- a/cells/a22o/sky130_fd_sc_hs__a22o_4.svg
+++ b/cells/a22o/sky130_fd_sc_hs__a22o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.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 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.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 1552.5 621.5 L 1583.5 621.5 L 1583.5 754.5 L 1552.5 754.5 Z M 1462.5 621.5 L 1494.5 621.5 L 1494.5 754.5 L 1462.5 754.5 Z M 1284.5 621.5 L 1315.5 621.5 L 1315.5 754.5 L 1284.5 754.5 Z M 1127.5 621.5 L 1158.5 621.5 L 1158.5 754.5 L 1127.5 754.5 Z M 1373.5 621.5 L 1404.5 621.5 L 1404.5 754.5 L 1373.5 754.5 Z M 851.5 624.5 L 882.5 624.5 L 882.5 757.5 L 851.5 757.5 Z M 940.5 624.5 L 971.5 624.5 L 971.5 757.5 L 940.5 757.5 Z M 1029.5 624.5 L 1060.5 624.5 L 1060.5 757.5 L 1029.5 757.5 Z M 568.5 624.5 L 599.5 624.5 L 599.5 777.5 L 568.5 777.5 Z M 657.5 624.5 L 688.5 624.5 L 688.5 777.5 L 657.5 777.5 Z M 746.5 624.5 L 777.5 624.5 L 777.5 777.5 L 746.5 777.5 Z M 479.5 624.5 L 510.5 624.5 L 510.5 777.5 L 479.5 777.5 Z M 479.5 624.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 1548.5 268.5 L 1579.5 268.5 L 1579.5 475.5 L 1548.5 475.5 Z M 1455.5 268.5 L 1486.5 268.5 L 1486.5 475.5 L 1455.5 475.5 Z M 1224.5 268.5 L 1255.5 268.5 L 1255.5 475.5 L 1224.5 475.5 Z M 845.5 268.5 L 876.5 268.5 L 876.5 475.5 L 845.5 475.5 Z M 1125.5 268.5 L 1156.5 268.5 L 1156.5 475.5 L 1125.5 475.5 Z M 1362.5 268.5 L 1393.5 268.5 L 1393.5 475.5 L 1362.5 475.5 Z M 939.5 268.5 L 970.5 268.5 L 970.5 475.5 L 939.5 475.5 Z M 1032.5 268.5 L 1063.5 268.5 L 1063.5 475.5 L 1032.5 475.5 Z M 502.5 268.5 L 533.5 268.5 L 533.5 500.5 L 502.5 500.5 Z M 408.5 268.5 L 439.5 268.5 L 439.5 500.5 L 408.5 500.5 Z M 315.5 268.5 L 346.5 268.5 L 346.5 500.5 L 315.5 500.5 Z M 595.5 268.5 L 626.5 268.5 L 626.5 500.5 L 595.5 500.5 Z M 595.5 268.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.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>
@@ -169,6 +169,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 1483.582031 527.335938 L 1473.894531 527.335938 L 1473.894531 523.449219 L 1475.558594 523.261719 L 1477.042969 523.015625 L 1478.335938 522.707031 L 1479.449219 522.460938 L 1480.375 522.152344 L 1481.175781 521.78125 L 1481.792969 521.410156 L 1482.347656 520.980469 L 1482.84375 520.484375 L 1483.335938 519.867188 L 1483.769531 519.191406 L 1484.199219 518.386719 L 1484.386719 517.957031 L 1484.570312 517.460938 L 1484.753906 516.90625 L 1485.003906 516.226562 L 1485.1875 515.550781 L 1485.433594 514.746094 L 1489.011719 514.746094 L 1489.011719 558.5 L 1483.582031 558.5 Z M 1483.582031 527.335938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1439 560 L 1474 560 M 1439 525 L 1474 525 M 1439 525 L 1439 560 M 1474 525 L 1474 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1439 560 L 1474 560 M 1439 525 L 1474 525 M 1474 560 L 1474 525 M 1439 560 L 1439 525 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_1.svg b/cells/a22oi/sky130_fd_sc_hs__a22oi_1.svg
index 78a0e03..177c9c6 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_1.svg
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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 1111.5 664.5 L 1145.5 664.5 L 1145.5 833.5 L 1111.5 833.5 Z M 781.5 664.5 L 815.5 664.5 L 815.5 833.5 L 781.5 833.5 Z M 863.5 664.5 L 898.5 664.5 L 898.5 833.5 L 863.5 833.5 Z M 987.5 664.5 L 1022.5 664.5 L 1022.5 833.5 L 987.5 833.5 Z M 987.5 664.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 1114.5 240.5 L 1149.5 240.5 L 1149.5 496.5 L 1114.5 496.5 Z M 777.5 240.5 L 812.5 240.5 L 812.5 496.5 L 777.5 496.5 Z M 881.5 240.5 L 915.5 240.5 L 915.5 496.5 L 881.5 496.5 Z M 991.5 240.5 L 1025.5 240.5 L 1025.5 496.5 L 991.5 496.5 Z M 991.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.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>
@@ -169,6 +169,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 1046.773438 527.503906 L 1036.203125 527.503906 L 1036.203125 523.261719 L 1038.019531 523.058594 L 1039.636719 522.789062 L 1041.050781 522.453125 L 1042.261719 522.183594 L 1043.269531 521.847656 L 1044.148438 521.445312 L 1044.820312 521.039062 L 1045.425781 520.570312 L 1045.964844 520.03125 L 1046.503906 519.355469 L 1046.972656 518.617188 L 1047.445312 517.742188 L 1047.648438 517.269531 L 1047.847656 516.730469 L 1048.050781 516.125 L 1048.320312 515.386719 L 1048.523438 514.644531 L 1048.792969 513.769531 L 1052.695312 513.769531 L 1052.695312 561.5 L 1046.773438 561.5 Z M 1046.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 999 562 L 1038 562 M 999 523 L 1038 523 M 999 523 L 999 562 M 1038 523 L 1038 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 999 562 L 1038 562 M 999 523 L 1038 523 M 1038 562 L 1038 523 M 999 562 L 999 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_2.svg b/cells/a22oi/sky130_fd_sc_hs__a22oi_2.svg
index 148973c..7a797ff 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_2.svg
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1337.5 664.5 L 1371.5 664.5 L 1371.5 833.5 L 1337.5 833.5 Z M 546.5 664.5 L 580.5 664.5 L 580.5 833.5 L 546.5 833.5 Z M 644.5 664.5 L 679.5 664.5 L 679.5 833.5 L 644.5 833.5 Z M 759.5 664.5 L 793.5 664.5 L 793.5 833.5 L 759.5 833.5 Z M 858.5 664.5 L 892.5 664.5 L 892.5 833.5 L 858.5 833.5 Z M 1016.5 664.5 L 1050.5 664.5 L 1050.5 833.5 L 1016.5 833.5 Z M 1140.5 664.5 L 1174.5 664.5 L 1174.5 833.5 L 1140.5 833.5 Z M 1238.5 664.5 L 1272.5 664.5 L 1272.5 833.5 L 1238.5 833.5 Z M 1238.5 664.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 1349.5 240.5 L 1384.5 240.5 L 1384.5 496.5 L 1349.5 496.5 Z M 549.5 240.5 L 584.5 240.5 L 584.5 496.5 L 549.5 496.5 Z M 653.5 240.5 L 687.5 240.5 L 687.5 496.5 L 653.5 496.5 Z M 756.5 240.5 L 790.5 240.5 L 790.5 496.5 L 756.5 496.5 Z M 930.5 240.5 L 964.5 240.5 L 964.5 496.5 L 930.5 496.5 Z M 1033.5 240.5 L 1067.5 240.5 L 1067.5 496.5 L 1033.5 496.5 Z M 1143.5 240.5 L 1177.5 240.5 L 1177.5 496.5 L 1143.5 496.5 Z M 1246.5 240.5 L 1280.5 240.5 L 1280.5 496.5 L 1246.5 496.5 Z M 1246.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -162,6 +162,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1154.773438 612.503906 L 1144.203125 612.503906 L 1144.203125 608.261719 L 1146.019531 608.058594 L 1147.636719 607.789062 L 1149.050781 607.453125 L 1150.261719 607.183594 L 1151.269531 606.847656 L 1152.148438 606.445312 L 1152.820312 606.039062 L 1153.425781 605.570312 L 1153.964844 605.03125 L 1154.503906 604.355469 L 1154.972656 603.617188 L 1155.445312 602.742188 L 1155.648438 602.269531 L 1155.847656 601.730469 L 1156.050781 601.125 L 1156.320312 600.386719 L 1156.523438 599.644531 L 1156.792969 598.769531 L 1160.695312 598.769531 L 1160.695312 646.5 L 1154.773438 646.5 Z M 1154.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1106 477 L 1145 477 M 1106 438 L 1145 438 M 1106 438 L 1106 477 M 1145 438 L 1145 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1106 477 L 1145 477 M 1106 438 L 1145 438 M 1145 477 L 1145 438 M 1106 477 L 1106 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a22oi/sky130_fd_sc_hs__a22oi_4.svg b/cells/a22oi/sky130_fd_sc_hs__a22oi_4.svg
index 1fc1b68..c2f2324 100644
--- a/cells/a22oi/sky130_fd_sc_hs__a22oi_4.svg
+++ b/cells/a22oi/sky130_fd_sc_hs__a22oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image338" 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="#image338"/>
+  <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 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1583.5 638.5 L 1611.5 638.5 L 1611.5 774.5 L 1583.5 774.5 Z M 302.5 638.5 L 330.5 638.5 L 330.5 774.5 L 302.5 774.5 Z M 381.5 638.5 L 409.5 638.5 L 409.5 774.5 L 381.5 774.5 Z M 460.5 638.5 L 488.5 638.5 L 488.5 774.5 L 460.5 774.5 Z M 539.5 638.5 L 567.5 638.5 L 567.5 774.5 L 539.5 774.5 Z M 618.5 638.5 L 646.5 638.5 L 646.5 774.5 L 618.5 774.5 Z M 697.5 638.5 L 725.5 638.5 L 725.5 774.5 L 697.5 774.5 Z M 776.5 638.5 L 804.5 638.5 L 804.5 774.5 L 776.5 774.5 Z M 855.5 638.5 L 883.5 638.5 L 883.5 774.5 L 855.5 774.5 Z M 1030.5 638.5 L 1057.5 638.5 L 1057.5 774.5 L 1030.5 774.5 Z M 1109.5 638.5 L 1137.5 638.5 L 1137.5 774.5 L 1109.5 774.5 Z M 1188.5 638.5 L 1216.5 638.5 L 1216.5 774.5 L 1188.5 774.5 Z M 1267.5 638.5 L 1295.5 638.5 L 1295.5 774.5 L 1267.5 774.5 Z M 1346.5 638.5 L 1374.5 638.5 L 1374.5 774.5 L 1346.5 774.5 Z M 1425.5 638.5 L 1453.5 638.5 L 1453.5 774.5 L 1425.5 774.5 Z M 1504.5 638.5 L 1532.5 638.5 L 1532.5 774.5 L 1504.5 774.5 Z M 1504.5 638.5 "/>
 </clipPath>
-<image id="image339" 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="#image339"/>
+  <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 1584.5 298.5 L 1612.5 298.5 L 1612.5 504.5 L 1584.5 504.5 Z M 301.5 298.5 L 329.5 298.5 L 329.5 504.5 L 301.5 504.5 Z M 384.5 298.5 L 411.5 298.5 L 411.5 504.5 L 384.5 504.5 Z M 466.5 298.5 L 494.5 298.5 L 494.5 504.5 L 466.5 504.5 Z M 549.5 298.5 L 577.5 298.5 L 577.5 504.5 L 549.5 504.5 Z M 632.5 298.5 L 660.5 298.5 L 660.5 504.5 L 632.5 504.5 Z M 715.5 298.5 L 742.5 298.5 L 742.5 504.5 L 715.5 504.5 Z M 797.5 298.5 L 825.5 298.5 L 825.5 504.5 L 797.5 504.5 Z M 880.5 298.5 L 908.5 298.5 L 908.5 504.5 L 880.5 504.5 Z M 963.5 298.5 L 990.5 298.5 L 990.5 504.5 L 963.5 504.5 Z M 1046.5 298.5 L 1073.5 298.5 L 1073.5 504.5 L 1046.5 504.5 Z M 1128.5 298.5 L 1156.5 298.5 L 1156.5 504.5 L 1128.5 504.5 Z M 1253.5 298.5 L 1281.5 298.5 L 1281.5 504.5 L 1253.5 504.5 Z M 1336.5 298.5 L 1364.5 298.5 L 1364.5 504.5 L 1336.5 504.5 Z M 1419.5 298.5 L 1446.5 298.5 L 1446.5 504.5 L 1419.5 504.5 Z M 1501.5 298.5 L 1529.5 298.5 L 1529.5 504.5 L 1501.5 504.5 Z M 1501.5 298.5 "/>
 </clipPath>
-<image id="image340" 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="#image340"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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="surface335">
+<g id="surface364">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -189,6 +189,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 1248.097656 527.878906 L 1239.507812 527.878906 L 1239.507812 524.429688 L 1240.984375 524.265625 L 1242.296875 524.046875 L 1243.445312 523.773438 L 1244.429688 523.554688 L 1245.25 523.28125 L 1245.960938 522.953125 L 1246.511719 522.625 L 1247.003906 522.242188 L 1247.441406 521.804688 L 1247.878906 521.257812 L 1248.261719 520.65625 L 1248.644531 519.945312 L 1248.808594 519.5625 L 1248.972656 519.125 L 1249.136719 518.632812 L 1249.355469 518.03125 L 1249.519531 517.429688 L 1249.738281 516.71875 L 1252.910156 516.71875 L 1252.910156 555.5 L 1248.097656 555.5 Z M 1248.097656 527.878906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1208 559 L 1239 559 M 1208 528 L 1239 528 M 1208 528 L 1208 559 M 1239 528 L 1239 559 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1208 559 L 1239 559 M 1208 528 L 1239 528 M 1239 559 L 1239 528 M 1208 559 L 1208 528 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.svg b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.svg
index 4eeaa61..e46184e 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.svg
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1126.5 627.5 L 1160.5 627.5 L 1160.5 774.5 L 1126.5 774.5 Z M 727.5 648.5 L 761.5 648.5 L 761.5 774.5 L 727.5 774.5 Z M 1250.5 627.5 L 1284.5 627.5 L 1284.5 774.5 L 1250.5 774.5 Z M 826.5 648.5 L 860.5 648.5 L 860.5 774.5 L 826.5 774.5 Z M 1027.5 627.5 L 1062.5 627.5 L 1062.5 774.5 L 1027.5 774.5 Z M 615.5 648.5 L 649.5 648.5 L 649.5 817.5 L 615.5 817.5 Z M 615.5 648.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image362"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1253.5 240.5 L 1287.5 240.5 L 1287.5 469.5 L 1253.5 469.5 Z M 1143.5 240.5 L 1177.5 240.5 L 1177.5 469.5 L 1143.5 469.5 Z M 728.5 240.5 L 763.5 240.5 L 763.5 469.5 L 728.5 469.5 Z M 818.5 240.5 L 852.5 240.5 L 852.5 469.5 L 818.5 469.5 Z M 1040.5 240.5 L 1074.5 240.5 L 1074.5 469.5 L 1040.5 469.5 Z M 610.5 240.5 L 644.5 240.5 L 644.5 496.5 L 610.5 496.5 Z M 610.5 240.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image364"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface358">
+<g id="surface387">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -187,6 +187,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 934.550781 596.574219 L 934.550781 645.652344 L 927.484375 645.652344 L 902.101562 605.863281 L 902.101562 645.652344 L 896.179688 645.652344 L 896.179688 596.574219 L 902.976562 596.574219 L 928.628906 636.699219 L 928.628906 596.574219 Z M 934.550781 596.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 832 477 L 871 477 M 832 438 L 871 438 M 832 438 L 832 477 M 871 438 L 871 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 832 477 L 871 477 M 832 438 L 871 438 M 871 477 L 871 438 M 832 477 L 832 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.svg b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.svg
index d7b1de1..7bd4ed8 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.svg
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 547.5 664.5 L 581.5 664.5 L 581.5 833.5 L 547.5 833.5 Z M 983.5 707.5 L 1017.5 707.5 L 1017.5 833.5 L 983.5 833.5 Z M 1081.5 707.5 L 1115.5 707.5 L 1115.5 833.5 L 1081.5 833.5 Z M 1205.5 664.5 L 1239.5 664.5 L 1239.5 833.5 L 1205.5 833.5 Z M 1303.5 664.5 L 1338.5 664.5 L 1338.5 833.5 L 1303.5 833.5 Z M 753.5 664.5 L 788.5 664.5 L 788.5 833.5 L 753.5 833.5 Z M 630.5 664.5 L 664.5 664.5 L 664.5 833.5 L 630.5 833.5 Z M 630.5 664.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 544.5 240.5 L 578.5 240.5 L 578.5 469.5 L 544.5 469.5 Z M 647.5 240.5 L 681.5 240.5 L 681.5 469.5 L 647.5 469.5 Z M 750.5 240.5 L 784.5 240.5 L 784.5 469.5 L 750.5 469.5 Z M 1002.5 256.5 L 1036.5 256.5 L 1036.5 485.5 L 1002.5 485.5 Z M 1091.5 256.5 L 1126.5 256.5 L 1126.5 485.5 L 1091.5 485.5 Z M 1311.5 240.5 L 1346.5 240.5 L 1346.5 496.5 L 1311.5 496.5 Z M 1208.5 240.5 L 1243.5 240.5 L 1243.5 496.5 L 1208.5 496.5 Z M 1208.5 240.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image378"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface343">
+<g id="surface372">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -190,6 +190,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1208.550781 427.574219 L 1208.550781 476.652344 L 1201.484375 476.652344 L 1176.101562 436.863281 L 1176.101562 476.652344 L 1170.179688 476.652344 L 1170.179688 427.574219 L 1176.976562 427.574219 L 1202.628906 467.699219 L 1202.628906 427.574219 Z M 1208.550781 427.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1106 647 L 1145 647 M 1106 608 L 1145 608 M 1106 608 L 1106 647 M 1145 608 L 1145 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1106 647 L 1145 647 M 1106 608 L 1145 608 M 1145 647 L 1145 608 M 1106 647 L 1106 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.svg b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.svg
index cdb15ad..92441c1 100644
--- a/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.svg
+++ b/cells/a2bb2o/sky130_fd_sc_hs__a2bb2o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 789.5 651.5 L 821.5 651.5 L 821.5 784.5 L 789.5 784.5 Z M 878.5 651.5 L 910.5 651.5 L 910.5 784.5 L 878.5 784.5 Z M 1491.5 672.5 L 1523.5 672.5 L 1523.5 804.5 L 1491.5 804.5 Z M 1402.5 672.5 L 1433.5 672.5 L 1433.5 804.5 L 1402.5 804.5 Z M 1313.5 672.5 L 1344.5 672.5 L 1344.5 804.5 L 1313.5 804.5 Z M 1117.5 651.5 L 1148.5 651.5 L 1148.5 804.5 L 1117.5 804.5 Z M 560.5 651.5 L 591.5 651.5 L 591.5 804.5 L 560.5 804.5 Z M 471.5 651.5 L 502.5 651.5 L 502.5 804.5 L 471.5 804.5 Z M 649.5 651.5 L 680.5 651.5 L 680.5 804.5 L 649.5 804.5 Z M 1589.5 672.5 L 1620.5 672.5 L 1620.5 804.5 L 1589.5 804.5 Z M 381.5 651.5 L 413.5 651.5 L 413.5 804.5 L 381.5 804.5 Z M 381.5 651.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1586.5 268.5 L 1617.5 268.5 L 1617.5 475.5 L 1586.5 475.5 Z M 1492.5 268.5 L 1524.5 268.5 L 1524.5 475.5 L 1492.5 475.5 Z M 1306.5 268.5 L 1337.5 268.5 L 1337.5 475.5 L 1306.5 475.5 Z M 1213.5 268.5 L 1244.5 268.5 L 1244.5 475.5 L 1213.5 475.5 Z M 1399.5 268.5 L 1430.5 268.5 L 1430.5 475.5 L 1399.5 475.5 Z M 1120.5 268.5 L 1151.5 268.5 L 1151.5 475.5 L 1120.5 475.5 Z M 867.5 268.5 L 898.5 268.5 L 898.5 500.5 L 867.5 500.5 Z M 675.5 268.5 L 706.5 268.5 L 706.5 500.5 L 675.5 500.5 Z M 488.5 268.5 L 519.5 268.5 L 519.5 500.5 L 488.5 500.5 Z M 395.5 268.5 L 426.5 268.5 L 426.5 500.5 L 395.5 500.5 Z M 786.5 268.5 L 817.5 268.5 L 817.5 500.5 L 786.5 500.5 Z M 581.5 268.5 L 612.5 268.5 L 612.5 500.5 L 581.5 500.5 Z M 581.5 268.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface323">
+<g id="surface353">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 836.964844 513.652344 L 836.964844 558.640625 L 830.484375 558.640625 L 807.21875 522.167969 L 807.21875 558.640625 L 801.789062 558.640625 L 801.789062 513.652344 L 808.023438 513.652344 L 831.535156 550.429688 L 831.535156 513.652344 Z M 836.964844 513.652344 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 743 560 L 778 560 M 743 525 L 778 525 M 743 525 L 743 560 M 778 525 L 778 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 743 560 L 778 560 M 743 525 L 778 525 M 778 560 L 778 525 M 743 560 L 743 525 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.svg b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.svg
index 87091d1..552935b 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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="#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 785.5 664.5 L 820.5 664.5 L 820.5 790.5 L 785.5 790.5 Z M 687.5 664.5 L 721.5 664.5 L 721.5 790.5 L 687.5 790.5 Z M 1102.5 664.5 L 1136.5 664.5 L 1136.5 833.5 L 1102.5 833.5 Z M 1003.5 664.5 L 1038.5 664.5 L 1038.5 833.5 L 1003.5 833.5 Z M 1209.5 664.5 L 1244.5 664.5 L 1244.5 833.5 L 1209.5 833.5 Z M 1209.5 664.5 "/>
 </clipPath>
-<image id="image312" 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="#image312"/>
+  <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 766.5 240.5 L 800.5 240.5 L 800.5 469.5 L 766.5 469.5 Z M 677.5 240.5 L 711.5 240.5 L 711.5 469.5 L 677.5 469.5 Z M 1103.5 240.5 L 1137.5 240.5 L 1137.5 496.5 L 1103.5 496.5 Z M 1000.5 240.5 L 1034.5 240.5 L 1034.5 496.5 L 1000.5 496.5 Z M 1213.5 240.5 L 1247.5 240.5 L 1247.5 496.5 L 1213.5 496.5 Z M 1213.5 240.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <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="surface308">
+<g id="surface337">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,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 1320.773438 612.503906 L 1310.203125 612.503906 L 1310.203125 608.261719 L 1312.019531 608.058594 L 1313.636719 607.789062 L 1315.050781 607.453125 L 1316.261719 607.183594 L 1317.269531 606.847656 L 1318.148438 606.445312 L 1318.820312 606.039062 L 1319.425781 605.570312 L 1319.964844 605.03125 L 1320.503906 604.355469 L 1320.972656 603.617188 L 1321.445312 602.742188 L 1321.648438 602.269531 L 1321.847656 601.730469 L 1322.050781 601.125 L 1322.320312 600.386719 L 1322.523438 599.644531 L 1322.792969 598.769531 L 1326.695312 598.769531 L 1326.695312 646.5 L 1320.773438 646.5 Z M 1320.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 477 L 1311 477 M 1272 438 L 1311 438 M 1272 438 L 1272 477 M 1311 438 L 1311 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 477 L 1311 477 M 1272 438 L 1311 438 M 1311 477 L 1311 438 M 1272 477 L 1272 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.svg b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.svg
index 8bd099a..09a3b58 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 564.5 655.5 L 599.5 655.5 L 599.5 801.5 L 564.5 801.5 Z M 673.5 655.5 L 708.5 655.5 L 708.5 801.5 L 673.5 801.5 Z M 884.5 655.5 L 918.5 655.5 L 918.5 824.5 L 884.5 824.5 Z M 785.5 655.5 L 820.5 655.5 L 820.5 824.5 L 785.5 824.5 Z M 1121.5 664.5 L 1156.5 664.5 L 1156.5 833.5 L 1121.5 833.5 Z M 1417.5 664.5 L 1451.5 664.5 L 1451.5 833.5 L 1417.5 833.5 Z M 1220.5 664.5 L 1254.5 664.5 L 1254.5 833.5 L 1220.5 833.5 Z M 1318.5 664.5 L 1353.5 664.5 L 1353.5 833.5 L 1318.5 833.5 Z M 1318.5 664.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 650.5 240.5 L 685.5 240.5 L 685.5 469.5 L 650.5 469.5 Z M 561.5 240.5 L 595.5 240.5 L 595.5 469.5 L 561.5 469.5 Z M 1214.5 240.5 L 1248.5 240.5 L 1248.5 496.5 L 1214.5 496.5 Z M 905.5 240.5 L 939.5 240.5 L 939.5 496.5 L 905.5 496.5 Z M 1008.5 240.5 L 1042.5 240.5 L 1042.5 496.5 L 1008.5 496.5 Z M 1317.5 240.5 L 1352.5 240.5 L 1352.5 496.5 L 1317.5 496.5 Z M 1420.5 240.5 L 1455.5 240.5 L 1455.5 496.5 L 1420.5 496.5 Z M 1111.5 240.5 L 1145.5 240.5 L 1145.5 496.5 L 1111.5 496.5 Z M 1111.5 240.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface340">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 493.550781 766.574219 L 493.550781 815.652344 L 486.484375 815.652344 L 461.101562 775.863281 L 461.101562 815.652344 L 455.179688 815.652344 L 455.179688 766.574219 L 461.976562 766.574219 L 487.628906 806.699219 L 487.628906 766.574219 Z M 493.550781 766.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 391 307 L 430 307 M 391 269 L 430 269 M 391 269 L 391 307 M 430 269 L 430 307 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 391 307 L 430 307 M 391 269 L 430 269 M 430 307 L 430 269 M 391 307 L 391 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.svg b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.svg
index 8d1c536..81f5d46 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_hs__a2bb2oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image381"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.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="#image411"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1572.5 632.5 L 1598.5 632.5 L 1598.5 761.5 L 1572.5 761.5 Z M 424.5 632.5 L 450.5 632.5 L 450.5 761.5 L 424.5 761.5 Z M 498.5 632.5 L 525.5 632.5 L 525.5 761.5 L 498.5 761.5 Z M 580.5 632.5 L 606.5 632.5 L 606.5 761.5 L 580.5 761.5 Z M 655.5 632.5 L 681.5 632.5 L 681.5 761.5 L 655.5 761.5 Z M 730.5 632.5 L 756.5 632.5 L 756.5 761.5 L 730.5 761.5 Z M 805.5 632.5 L 831.5 632.5 L 831.5 761.5 L 805.5 761.5 Z M 1048.5 632.5 L 1074.5 632.5 L 1074.5 761.5 L 1048.5 761.5 Z M 1123.5 632.5 L 1149.5 632.5 L 1149.5 761.5 L 1123.5 761.5 Z M 1198.5 632.5 L 1224.5 632.5 L 1224.5 761.5 L 1198.5 761.5 Z M 1273.5 632.5 L 1299.5 632.5 L 1299.5 761.5 L 1273.5 761.5 Z M 1348.5 632.5 L 1374.5 632.5 L 1374.5 761.5 L 1348.5 761.5 Z M 1422.5 632.5 L 1448.5 632.5 L 1448.5 761.5 L 1422.5 761.5 Z M 1497.5 632.5 L 1523.5 632.5 L 1523.5 761.5 L 1497.5 761.5 Z M 1497.5 632.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image412"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 515.5 310.5 L 541.5 310.5 L 541.5 484.5 L 515.5 484.5 Z M 280.5 310.5 L 306.5 310.5 L 306.5 484.5 L 280.5 484.5 Z M 437.5 310.5 L 463.5 310.5 L 463.5 484.5 L 437.5 484.5 Z M 358.5 310.5 L 385.5 310.5 L 385.5 484.5 L 358.5 484.5 Z M 1194.5 310.5 L 1220.5 310.5 L 1220.5 505.5 L 1194.5 505.5 Z M 724.5 310.5 L 750.5 310.5 L 750.5 505.5 L 724.5 505.5 Z M 802.5 310.5 L 828.5 310.5 L 828.5 505.5 L 802.5 505.5 Z M 880.5 310.5 L 906.5 310.5 L 906.5 505.5 L 880.5 505.5 Z M 959.5 310.5 L 985.5 310.5 L 985.5 505.5 L 959.5 505.5 Z M 1350.5 310.5 L 1376.5 310.5 L 1376.5 505.5 L 1350.5 505.5 Z M 1585.5 310.5 L 1611.5 310.5 L 1611.5 505.5 L 1585.5 505.5 Z M 1428.5 310.5 L 1455.5 310.5 L 1455.5 505.5 L 1428.5 505.5 Z M 1272.5 310.5 L 1298.5 310.5 L 1298.5 505.5 L 1272.5 505.5 Z M 1507.5 310.5 L 1533.5 310.5 L 1533.5 505.5 L 1507.5 505.5 Z M 1115.5 310.5 L 1141.5 310.5 L 1141.5 505.5 L 1115.5 505.5 Z M 1037.5 310.5 L 1063.5 310.5 L 1063.5 505.5 L 1037.5 505.5 Z M 1037.5 310.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image413"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image414"/>
 </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="surface408">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -207,6 +207,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 644.789062 517.804688 L 644.789062 554.613281 L 639.488281 554.613281 L 620.453125 524.773438 L 620.453125 554.613281 L 616.007812 554.613281 L 616.007812 517.804688 L 621.109375 517.804688 L 640.347656 547.898438 L 640.347656 517.804688 Z M 644.789062 517.804688 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 568 558 L 598 558 M 568 529 L 598 529 M 568 529 L 568 558 M 598 529 L 598 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 568 558 L 598 558 M 568 529 L 598 529 M 598 558 L 598 529 M 568 558 L 568 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_1.svg b/cells/a311o/sky130_fd_sc_hs__a311o_1.svg
index ae51150..2e462dc 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_1.svg
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image308" 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="#image308"/>
+  <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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1237.5 631.5 L 1271.5 631.5 L 1271.5 777.5 L 1237.5 777.5 Z M 1105.5 631.5 L 1140.5 631.5 L 1140.5 777.5 L 1105.5 777.5 Z M 899.5 631.5 L 933.5 631.5 L 933.5 777.5 L 899.5 777.5 Z M 1007.5 631.5 L 1041.5 631.5 L 1041.5 777.5 L 1007.5 777.5 Z M 790.5 634.5 L 824.5 634.5 L 824.5 781.5 L 790.5 781.5 Z M 673.5 634.5 L 708.5 634.5 L 708.5 804.5 L 673.5 804.5 Z M 673.5 634.5 "/>
 </clipPath>
-<image id="image309" 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="#image309"/>
+  <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 1203.5 240.5 L 1237.5 240.5 L 1237.5 469.5 L 1203.5 469.5 Z M 1113.5 240.5 L 1148.5 240.5 L 1148.5 469.5 L 1113.5 469.5 Z M 783.5 240.5 L 818.5 240.5 L 818.5 469.5 L 783.5 469.5 Z M 886.5 240.5 L 921.5 240.5 L 921.5 469.5 L 886.5 469.5 Z M 1010.5 240.5 L 1044.5 240.5 L 1044.5 469.5 L 1010.5 469.5 Z M 627.5 240.5 L 662.5 240.5 L 662.5 496.5 L 627.5 496.5 Z M 627.5 240.5 "/>
 </clipPath>
-<image id="image310" 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="#image310"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <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="surface305">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,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 1045.773438 781.503906 L 1035.203125 781.503906 L 1035.203125 777.261719 L 1037.019531 777.058594 L 1038.636719 776.789062 L 1040.050781 776.453125 L 1041.261719 776.183594 L 1042.269531 775.847656 L 1043.148438 775.445312 L 1043.820312 775.039062 L 1044.425781 774.570312 L 1044.964844 774.03125 L 1045.503906 773.355469 L 1045.972656 772.617188 L 1046.445312 771.742188 L 1046.648438 771.269531 L 1046.847656 770.730469 L 1047.050781 770.125 L 1047.320312 769.386719 L 1047.523438 768.644531 L 1047.792969 767.769531 L 1051.695312 767.769531 L 1051.695312 815.5 L 1045.773438 815.5 Z M 1045.773438 781.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 997 307 L 1036 307 M 997 269 L 1036 269 M 997 269 L 997 307 M 1036 269 L 1036 307 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 997 307 L 1036 307 M 997 269 L 1036 269 M 1036 307 L 1036 269 M 997 307 L 997 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 522 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_2.svg b/cells/a311o/sky130_fd_sc_hs__a311o_2.svg
index 5b1ce88..b41e6cd 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_2.svg
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 1289.5 664.5 L 1323.5 664.5 L 1323.5 833.5 L 1289.5 833.5 Z M 606.5 664.5 L 640.5 664.5 L 640.5 833.5 L 606.5 833.5 Z M 704.5 664.5 L 738.5 664.5 L 738.5 833.5 L 704.5 833.5 Z M 835.5 664.5 L 869.5 664.5 L 869.5 833.5 L 835.5 833.5 Z M 917.5 664.5 L 952.5 664.5 L 952.5 833.5 L 917.5 833.5 Z M 1041.5 664.5 L 1075.5 664.5 L 1075.5 833.5 L 1041.5 833.5 Z M 1165.5 664.5 L 1199.5 664.5 L 1199.5 833.5 L 1165.5 833.5 Z M 1165.5 664.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 1285.5 240.5 L 1319.5 240.5 L 1319.5 469.5 L 1285.5 469.5 Z M 1189.5 240.5 L 1223.5 240.5 L 1223.5 469.5 L 1189.5 469.5 Z M 921.5 240.5 L 955.5 240.5 L 955.5 469.5 L 921.5 469.5 Z M 811.5 240.5 L 845.5 240.5 L 845.5 469.5 L 811.5 469.5 Z M 1079.5 240.5 L 1113.5 240.5 L 1113.5 469.5 L 1079.5 469.5 Z M 588.5 240.5 L 623.5 240.5 L 623.5 496.5 L 588.5 496.5 Z M 691.5 240.5 L 726.5 240.5 L 726.5 496.5 L 691.5 496.5 Z M 691.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -166,6 +166,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 636.824219 536.320312 L 654.191406 561.5 L 646.449219 561.5 L 633.050781 541.035156 L 619.589844 561.5 L 611.980469 561.5 L 629.351562 536.320312 L 613.058594 512.421875 L 620.664062 512.421875 L 633.253906 531.675781 L 645.910156 512.421875 L 653.382812 512.421875 Z M 636.824219 536.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 612 562 L 651 562 M 612 523 L 651 523 M 612 523 L 612 562 M 651 523 L 651 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 612 562 L 651 562 M 612 523 L 651 523 M 651 562 L 651 523 M 612 562 L 612 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311o/sky130_fd_sc_hs__a311o_4.svg b/cells/a311o/sky130_fd_sc_hs__a311o_4.svg
index ed52582..4310747 100644
--- a/cells/a311o/sky130_fd_sc_hs__a311o_4.svg
+++ b/cells/a311o/sky130_fd_sc_hs__a311o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 537.5 L 174.5 537.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 211.5 812.5 L 1706.5 812.5 L 1706.5 860.5 L 211.5 860.5 Z M 211.5 812.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1410.5 622.5 L 1440.5 622.5 L 1440.5 746.5 L 1410.5 746.5 Z M 1506.5 622.5 L 1535.5 622.5 L 1535.5 746.5 L 1506.5 746.5 Z M 1327.5 622.5 L 1356.5 622.5 L 1356.5 746.5 L 1327.5 746.5 Z M 1589.5 622.5 L 1619.5 622.5 L 1619.5 746.5 L 1589.5 746.5 Z M 1130.5 633.5 L 1159.5 633.5 L 1159.5 758.5 L 1130.5 758.5 Z M 1046.5 633.5 L 1076.5 633.5 L 1076.5 758.5 L 1046.5 758.5 Z M 951.5 633.5 L 980.5 633.5 L 980.5 777.5 L 951.5 777.5 Z M 867.5 633.5 L 896.5 633.5 L 896.5 777.5 L 867.5 777.5 Z M 691.5 636.5 L 720.5 636.5 L 720.5 780.5 L 691.5 780.5 Z M 347.5 656.5 L 377.5 656.5 L 377.5 780.5 L 347.5 780.5 Z M 431.5 656.5 L 460.5 656.5 L 460.5 780.5 L 431.5 780.5 Z M 599.5 656.5 L 628.5 656.5 L 628.5 780.5 L 599.5 780.5 Z M 515.5 656.5 L 544.5 656.5 L 544.5 780.5 L 515.5 780.5 Z M 775.5 636.5 L 804.5 636.5 L 804.5 780.5 L 775.5 780.5 Z M 775.5 636.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1590.5 284.5 L 1620.5 284.5 L 1620.5 478.5 L 1590.5 478.5 Z M 1503.5 284.5 L 1532.5 284.5 L 1532.5 478.5 L 1503.5 478.5 Z M 419.5 284.5 L 449.5 284.5 L 449.5 478.5 L 419.5 478.5 Z M 507.5 284.5 L 536.5 284.5 L 536.5 478.5 L 507.5 478.5 Z M 595.5 284.5 L 624.5 284.5 L 624.5 478.5 L 595.5 478.5 Z M 1322.5 284.5 L 1351.5 284.5 L 1351.5 478.5 L 1322.5 478.5 Z M 1234.5 284.5 L 1263.5 284.5 L 1263.5 478.5 L 1234.5 478.5 Z M 1409.5 284.5 L 1439.5 284.5 L 1439.5 478.5 L 1409.5 478.5 Z M 332.5 284.5 L 361.5 284.5 L 361.5 478.5 L 332.5 478.5 Z M 1147.5 284.5 L 1176.5 284.5 L 1176.5 478.5 L 1147.5 478.5 Z M 784.5 284.5 L 813.5 284.5 L 813.5 502.5 L 784.5 502.5 Z M 1046.5 284.5 L 1076.5 284.5 L 1076.5 502.5 L 1046.5 502.5 Z M 959.5 284.5 L 988.5 284.5 L 988.5 502.5 L 959.5 502.5 Z M 871.5 284.5 L 900.5 284.5 L 900.5 502.5 L 871.5 502.5 Z M 871.5 284.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 241.5 195.5 L 274.5 195.5 L 274.5 228.5 L 241.5 228.5 Z M 1643.5 195.5 L 1676.5 195.5 L 1676.5 228.5 L 1643.5 228.5 Z M 1550.5 195.5 L 1583.5 195.5 L 1583.5 228.5 L 1550.5 228.5 Z M 1456.5 195.5 L 1489.5 195.5 L 1489.5 228.5 L 1456.5 228.5 Z M 1363.5 195.5 L 1396.5 195.5 L 1396.5 228.5 L 1363.5 228.5 Z M 1269.5 195.5 L 1302.5 195.5 L 1302.5 228.5 L 1269.5 228.5 Z M 1176.5 195.5 L 1209.5 195.5 L 1209.5 228.5 L 1176.5 228.5 Z M 1082.5 195.5 L 1115.5 195.5 L 1115.5 228.5 L 1082.5 228.5 Z M 989.5 195.5 L 1022.5 195.5 L 1022.5 228.5 L 989.5 228.5 Z M 895.5 195.5 L 929.5 195.5 L 929.5 228.5 L 895.5 228.5 Z M 802.5 195.5 L 835.5 195.5 L 835.5 228.5 L 802.5 228.5 Z M 709.5 195.5 L 742.5 195.5 L 742.5 228.5 L 709.5 228.5 Z M 615.5 195.5 L 648.5 195.5 L 648.5 228.5 L 615.5 228.5 Z M 522.5 195.5 L 555.5 195.5 L 555.5 228.5 L 522.5 228.5 Z M 428.5 195.5 L 461.5 195.5 L 461.5 228.5 L 428.5 228.5 Z M 335.5 195.5 L 368.5 195.5 L 368.5 228.5 L 335.5 228.5 Z M 709.5 663.5 L 742.5 663.5 L 742.5 685.5 L 709.5 685.5 Z M 709.5 685.5 L 742.5 685.5 L 742.5 696.5 L 709.5 696.5 Z M 241.5 663.5 L 274.5 663.5 L 274.5 696.5 L 241.5 696.5 Z M 241.5 843.5 L 274.5 843.5 L 274.5 877.5 L 241.5 877.5 Z M 1643.5 843.5 L 1676.5 843.5 L 1676.5 877.5 L 1643.5 877.5 Z M 1550.5 843.5 L 1583.5 843.5 L 1583.5 877.5 L 1550.5 877.5 Z M 1456.5 843.5 L 1489.5 843.5 L 1489.5 877.5 L 1456.5 877.5 Z M 1363.5 843.5 L 1396.5 843.5 L 1396.5 877.5 L 1363.5 877.5 Z M 1269.5 843.5 L 1302.5 843.5 L 1302.5 877.5 L 1269.5 877.5 Z M 1176.5 843.5 L 1209.5 843.5 L 1209.5 877.5 L 1176.5 877.5 Z M 1082.5 843.5 L 1115.5 843.5 L 1115.5 877.5 L 1082.5 877.5 Z M 989.5 843.5 L 1022.5 843.5 L 1022.5 877.5 L 989.5 877.5 Z M 895.5 843.5 L 929.5 843.5 L 929.5 877.5 L 895.5 877.5 Z M 802.5 843.5 L 835.5 843.5 L 835.5 877.5 L 802.5 877.5 Z M 709.5 843.5 L 742.5 843.5 L 742.5 877.5 L 709.5 877.5 Z M 615.5 843.5 L 648.5 843.5 L 648.5 877.5 L 615.5 877.5 Z M 522.5 843.5 L 555.5 843.5 L 555.5 877.5 L 522.5 877.5 Z M 428.5 843.5 L 461.5 843.5 L 461.5 877.5 L 428.5 877.5 Z M 335.5 843.5 L 368.5 843.5 L 368.5 877.5 L 335.5 877.5 Z M 335.5 843.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface334">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,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 1590.691406 528.460938 L 1581.664062 528.460938 L 1581.664062 524.839844 L 1583.214844 524.664062 L 1584.59375 524.433594 L 1585.804688 524.148438 L 1586.839844 523.917969 L 1587.699219 523.628906 L 1588.449219 523.285156 L 1589.023438 522.941406 L 1589.539062 522.539062 L 1590 522.078125 L 1590.460938 521.503906 L 1590.863281 520.871094 L 1591.265625 520.121094 L 1591.4375 519.71875 L 1591.609375 519.261719 L 1591.785156 518.742188 L 1592.011719 518.109375 L 1592.1875 517.476562 L 1592.414062 516.730469 L 1595.75 516.730469 L 1595.75 557.5 L 1590.691406 557.5 Z M 1590.691406 528.460938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1550 560 L 1583 560 M 1550 527 L 1583 527 M 1550 527 L 1550 560 M 1583 527 L 1583 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1550 560 L 1583 560 M 1550 527 L 1583 527 M 1583 560 L 1583 527 M 1550 560 L 1550 527 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 214 L 211 223 M 206 219 L 215 219 M 210 220 L 212 220 M 210 218 L 212 218 M 210 218 L 210 220 M 212 218 L 212 220 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_1.svg b/cells/a311oi/sky130_fd_sc_hs__a311oi_1.svg
index dac5706..f55c9d3 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_1.svg
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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="#image345"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1178.5 664.5 L 1213.5 664.5 L 1213.5 833.5 L 1178.5 833.5 Z M 725.5 664.5 L 759.5 664.5 L 759.5 833.5 L 725.5 833.5 Z M 807.5 664.5 L 842.5 664.5 L 842.5 833.5 L 807.5 833.5 Z M 931.5 664.5 L 965.5 664.5 L 965.5 833.5 L 931.5 833.5 Z M 1055.5 664.5 L 1089.5 664.5 L 1089.5 833.5 L 1055.5 833.5 Z M 1055.5 664.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1182.5 240.5 L 1216.5 240.5 L 1216.5 496.5 L 1182.5 496.5 Z M 721.5 240.5 L 756.5 240.5 L 756.5 496.5 L 721.5 496.5 Z M 824.5 240.5 L 859.5 240.5 L 859.5 496.5 L 824.5 496.5 Z M 969.5 240.5 L 1003.5 240.5 L 1003.5 496.5 L 969.5 496.5 Z M 1072.5 240.5 L 1106.5 240.5 L 1106.5 496.5 L 1072.5 496.5 Z M 1072.5 240.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface315">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 966.554688 712.246094 L 966.554688 731.5 L 960.292969 731.5 L 960.292969 712.246094 L 941.375 682.421875 L 949.117188 682.421875 L 963.523438 706.320312 L 977.527344 682.421875 L 985 682.421875 Z M 966.554688 712.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 942 392 L 981 392 M 942 353 L 981 353 M 942 353 L 942 392 M 981 353 L 981 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 942 392 L 981 392 M 942 353 L 981 353 M 981 392 L 981 353 M 942 392 L 942 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_2.svg b/cells/a311oi/sky130_fd_sc_hs__a311oi_2.svg
index 8fb38d9..8cff105 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_2.svg
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image319" 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="#image319"/>
+  <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 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#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 1345.5 664.5 L 1379.5 664.5 L 1379.5 833.5 L 1345.5 833.5 Z M 412.5 664.5 L 446.5 664.5 L 446.5 833.5 L 412.5 833.5 Z M 510.5 664.5 L 545.5 664.5 L 545.5 833.5 L 510.5 833.5 Z M 609.5 664.5 L 643.5 664.5 L 643.5 833.5 L 609.5 833.5 Z M 708.5 664.5 L 742.5 664.5 L 742.5 833.5 L 708.5 833.5 Z M 955.5 664.5 L 989.5 664.5 L 989.5 833.5 L 955.5 833.5 Z M 1054.5 664.5 L 1088.5 664.5 L 1088.5 833.5 L 1054.5 833.5 Z M 1152.5 664.5 L 1187.5 664.5 L 1187.5 833.5 L 1152.5 833.5 Z M 1152.5 664.5 "/>
 </clipPath>
-<image id="image320" 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="#image320"/>
+  <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 1465.5 240.5 L 1499.5 240.5 L 1499.5 496.5 L 1465.5 496.5 Z M 411.5 240.5 L 445.5 240.5 L 445.5 496.5 L 411.5 496.5 Z M 514.5 240.5 L 548.5 240.5 L 548.5 496.5 L 514.5 496.5 Z M 617.5 240.5 L 651.5 240.5 L 651.5 496.5 L 617.5 496.5 Z M 720.5 240.5 L 755.5 240.5 L 755.5 496.5 L 720.5 496.5 Z M 830.5 240.5 L 865.5 240.5 L 865.5 496.5 L 830.5 496.5 Z M 933.5 240.5 L 968.5 240.5 L 968.5 496.5 L 933.5 496.5 Z M 1156.5 240.5 L 1190.5 240.5 L 1190.5 496.5 L 1156.5 496.5 Z M 1259.5 240.5 L 1293.5 240.5 L 1293.5 496.5 L 1259.5 496.5 Z M 1362.5 240.5 L 1396.5 240.5 L 1396.5 496.5 L 1362.5 496.5 Z M 1362.5 240.5 "/>
 </clipPath>
-<image id="image321" 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="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image322" 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="#image322"/>
+  <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="surface316">
+<g id="surface344">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1043.773438 527.503906 L 1033.203125 527.503906 L 1033.203125 523.261719 L 1035.019531 523.058594 L 1036.636719 522.789062 L 1038.050781 522.453125 L 1039.261719 522.183594 L 1040.269531 521.847656 L 1041.148438 521.445312 L 1041.820312 521.039062 L 1042.425781 520.570312 L 1042.964844 520.03125 L 1043.503906 519.355469 L 1043.972656 518.617188 L 1044.445312 517.742188 L 1044.648438 517.269531 L 1044.847656 516.730469 L 1045.050781 516.125 L 1045.320312 515.386719 L 1045.523438 514.644531 L 1045.792969 513.769531 L 1049.695312 513.769531 L 1049.695312 561.5 L 1043.773438 561.5 Z M 1043.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 995 562 L 1034 562 M 995 523 L 1034 523 M 995 523 L 995 562 M 1034 523 L 1034 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 995 562 L 1034 562 M 995 523 L 1034 523 M 1034 562 L 1034 523 M 995 562 L 995 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a311oi/sky130_fd_sc_hs__a311oi_4.svg b/cells/a311oi/sky130_fd_sc_hs__a311oi_4.svg
index 66c9e46..3a064dc 100644
--- a/cells/a311oi/sky130_fd_sc_hs__a311oi_4.svg
+++ b/cells/a311oi/sky130_fd_sc_hs__a311oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1477.5 618.5 L 1500.5 618.5 L 1500.5 729.5 L 1477.5 729.5 Z M 271.5 618.5 L 294.5 618.5 L 294.5 729.5 L 271.5 729.5 Z M 336.5 618.5 L 358.5 618.5 L 358.5 729.5 L 336.5 729.5 Z M 400.5 618.5 L 423.5 618.5 L 423.5 729.5 L 400.5 729.5 Z M 465.5 618.5 L 487.5 618.5 L 487.5 729.5 L 465.5 729.5 Z M 529.5 618.5 L 552.5 618.5 L 552.5 729.5 L 529.5 729.5 Z M 594.5 618.5 L 616.5 618.5 L 616.5 729.5 L 594.5 729.5 Z M 658.5 618.5 L 681.5 618.5 L 681.5 729.5 L 658.5 729.5 Z M 723.5 618.5 L 745.5 618.5 L 745.5 729.5 L 723.5 729.5 Z M 898.5 618.5 L 921.5 618.5 L 921.5 729.5 L 898.5 729.5 Z M 963.5 618.5 L 985.5 618.5 L 985.5 729.5 L 963.5 729.5 Z M 1027.5 618.5 L 1050.5 618.5 L 1050.5 729.5 L 1027.5 729.5 Z M 1092.5 618.5 L 1114.5 618.5 L 1114.5 729.5 L 1092.5 729.5 Z M 1156.5 618.5 L 1179.5 618.5 L 1179.5 729.5 L 1156.5 729.5 Z M 1348.5 618.5 L 1371.5 618.5 L 1371.5 729.5 L 1348.5 729.5 Z M 1413.5 618.5 L 1435.5 618.5 L 1435.5 729.5 L 1413.5 729.5 Z M 1413.5 618.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1627.5 341.5 L 1649.5 341.5 L 1649.5 509.5 L 1627.5 509.5 Z M 266.5 341.5 L 289.5 341.5 L 289.5 509.5 L 266.5 509.5 Z M 334.5 341.5 L 356.5 341.5 L 356.5 509.5 L 334.5 509.5 Z M 401.5 341.5 L 424.5 341.5 L 424.5 509.5 L 401.5 509.5 Z M 469.5 341.5 L 491.5 341.5 L 491.5 509.5 L 469.5 509.5 Z M 536.5 341.5 L 559.5 341.5 L 559.5 509.5 L 536.5 509.5 Z M 604.5 341.5 L 626.5 341.5 L 626.5 509.5 L 604.5 509.5 Z M 671.5 341.5 L 694.5 341.5 L 694.5 509.5 L 671.5 509.5 Z M 739.5 341.5 L 761.5 341.5 L 761.5 509.5 L 739.5 509.5 Z M 806.5 341.5 L 829.5 341.5 L 829.5 509.5 L 806.5 509.5 Z M 874.5 341.5 L 896.5 341.5 L 896.5 509.5 L 874.5 509.5 Z M 941.5 341.5 L 964.5 341.5 L 964.5 509.5 L 941.5 509.5 Z M 1009.5 341.5 L 1031.5 341.5 L 1031.5 509.5 L 1009.5 509.5 Z M 1154.5 341.5 L 1177.5 341.5 L 1177.5 509.5 L 1154.5 509.5 Z M 1222.5 341.5 L 1244.5 341.5 L 1244.5 509.5 L 1222.5 509.5 Z M 1289.5 341.5 L 1312.5 341.5 L 1312.5 509.5 L 1289.5 509.5 Z M 1357.5 341.5 L 1379.5 341.5 L 1379.5 509.5 L 1357.5 509.5 Z M 1424.5 341.5 L 1447.5 341.5 L 1447.5 509.5 L 1424.5 509.5 Z M 1492.5 341.5 L 1514.5 341.5 L 1514.5 509.5 L 1492.5 509.5 Z M 1559.5 341.5 L 1582.5 341.5 L 1582.5 509.5 L 1559.5 509.5 Z M 1559.5 341.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface349">
+<g id="surface377">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -200,6 +200,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 1121.71875 529.542969 L 1114.890625 529.542969 L 1114.890625 526.804688 L 1116.066406 526.675781 L 1117.109375 526.5 L 1118.023438 526.28125 L 1118.804688 526.109375 L 1119.457031 525.890625 L 1120.023438 525.628906 L 1120.457031 525.371094 L 1120.847656 525.066406 L 1121.195312 524.71875 L 1121.542969 524.28125 L 1121.847656 523.804688 L 1122.152344 523.238281 L 1122.28125 522.933594 L 1122.414062 522.585938 L 1122.542969 522.195312 L 1122.71875 521.71875 L 1122.847656 521.238281 L 1123.023438 520.675781 L 1125.542969 520.675781 L 1125.542969 551.5 L 1121.71875 551.5 Z M 1121.71875 529.542969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1090 557 L 1116 557 M 1090 531 L 1116 531 M 1090 531 L 1090 557 M 1116 531 L 1116 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1090 557 L 1116 557 M 1090 531 L 1116 531 M 1116 557 L 1116 531 M 1090 557 L 1090 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_1.svg b/cells/a31o/sky130_fd_sc_hs__a31o_1.svg
index 9f38e40..25a2994 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_1.svg
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image308" 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="#image308"/>
+  <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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1188.5 631.5 L 1222.5 631.5 L 1222.5 777.5 L 1188.5 777.5 Z M 1052.5 631.5 L 1087.5 631.5 L 1087.5 777.5 L 1052.5 777.5 Z M 846.5 634.5 L 881.5 634.5 L 881.5 781.5 L 846.5 781.5 Z M 929.5 634.5 L 963.5 634.5 L 963.5 781.5 L 929.5 781.5 Z M 677.5 634.5 L 711.5 634.5 L 711.5 804.5 L 677.5 804.5 Z M 677.5 634.5 "/>
 </clipPath>
-<image id="image309" 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="#image309"/>
+  <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 240.5 L 1214.5 240.5 L 1214.5 469.5 L 1180.5 469.5 Z M 1077.5 240.5 L 1111.5 240.5 L 1111.5 469.5 L 1077.5 469.5 Z M 829.5 240.5 L 863.5 240.5 L 863.5 469.5 L 829.5 469.5 Z M 932.5 240.5 L 967.5 240.5 L 967.5 469.5 L 932.5 469.5 Z M 673.5 240.5 L 708.5 240.5 L 708.5 496.5 L 673.5 496.5 Z M 673.5 240.5 "/>
 </clipPath>
-<image id="image310" 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="#image310"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <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="surface305">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,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 1210.773438 781.503906 L 1200.203125 781.503906 L 1200.203125 777.261719 L 1202.019531 777.058594 L 1203.636719 776.789062 L 1205.050781 776.453125 L 1206.261719 776.183594 L 1207.269531 775.847656 L 1208.148438 775.445312 L 1208.820312 775.039062 L 1209.425781 774.570312 L 1209.964844 774.03125 L 1210.503906 773.355469 L 1210.972656 772.617188 L 1211.445312 771.742188 L 1211.648438 771.269531 L 1211.847656 770.730469 L 1212.050781 770.125 L 1212.320312 769.386719 L 1212.523438 768.644531 L 1212.792969 767.769531 L 1216.695312 767.769531 L 1216.695312 815.5 L 1210.773438 815.5 Z M 1210.773438 781.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1162 307 L 1201 307 M 1162 269 L 1201 269 M 1162 269 L 1162 307 M 1201 269 L 1201 307 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1162 307 L 1201 307 M 1162 269 L 1201 269 M 1201 307 L 1201 269 M 1162 307 L 1162 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_2.svg b/cells/a31o/sky130_fd_sc_hs__a31o_2.svg
index 0d26742..f7be3b6 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_2.svg
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1263.5 664.5 L 1298.5 664.5 L 1298.5 833.5 L 1263.5 833.5 Z M 634.5 664.5 L 669.5 664.5 L 669.5 833.5 L 634.5 833.5 Z M 733.5 664.5 L 767.5 664.5 L 767.5 833.5 L 733.5 833.5 Z M 913.5 664.5 L 947.5 664.5 L 947.5 833.5 L 913.5 833.5 Z M 1002.5 664.5 L 1036.5 664.5 L 1036.5 833.5 L 1002.5 833.5 Z M 1133.5 664.5 L 1167.5 664.5 L 1167.5 833.5 L 1133.5 833.5 Z M 1133.5 664.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 636.5 240.5 L 671.5 240.5 L 671.5 496.5 L 636.5 496.5 Z M 1267.5 267.5 L 1301.5 267.5 L 1301.5 496.5 L 1267.5 496.5 Z M 1152.5 267.5 L 1187.5 267.5 L 1187.5 496.5 L 1152.5 496.5 Z M 1005.5 267.5 L 1040.5 267.5 L 1040.5 496.5 L 1005.5 496.5 Z M 902.5 267.5 L 937.5 267.5 L 937.5 496.5 L 902.5 496.5 Z M 740.5 240.5 L 774.5 240.5 L 774.5 496.5 L 740.5 496.5 Z M 740.5 240.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,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 691.824219 282.320312 L 709.191406 307.5 L 701.449219 307.5 L 688.050781 287.035156 L 674.589844 307.5 L 666.980469 307.5 L 684.351562 282.320312 L 668.058594 258.421875 L 675.664062 258.421875 L 688.253906 277.675781 L 700.910156 258.421875 L 708.382812 258.421875 Z M 691.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 667 816 L 706 816 M 667 777 L 706 777 M 667 777 L 667 816 M 706 777 L 706 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 667 816 L 706 816 M 667 777 L 706 777 M 706 816 L 706 777 M 667 816 L 667 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31o/sky130_fd_sc_hs__a31o_4.svg b/cells/a31o/sky130_fd_sc_hs__a31o_4.svg
index 1d2d1c6..cb47bd4 100644
--- a/cells/a31o/sky130_fd_sc_hs__a31o_4.svg
+++ b/cells/a31o/sky130_fd_sc_hs__a31o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.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 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.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 306.5 651.5 L 337.5 651.5 L 337.5 804.5 L 306.5 804.5 Z M 1575.5 672.5 L 1606.5 672.5 L 1606.5 804.5 L 1575.5 804.5 Z M 1486.5 672.5 L 1517.5 672.5 L 1517.5 804.5 L 1486.5 804.5 Z M 1397.5 672.5 L 1428.5 672.5 L 1428.5 804.5 L 1397.5 804.5 Z M 1308.5 672.5 L 1339.5 672.5 L 1339.5 804.5 L 1308.5 804.5 Z M 1089.5 672.5 L 1120.5 672.5 L 1120.5 804.5 L 1089.5 804.5 Z M 985.5 672.5 L 1016.5 672.5 L 1016.5 804.5 L 985.5 804.5 Z M 896.5 672.5 L 927.5 672.5 L 927.5 804.5 L 896.5 804.5 Z M 793.5 672.5 L 824.5 672.5 L 824.5 804.5 L 793.5 804.5 Z M 588.5 651.5 L 619.5 651.5 L 619.5 804.5 L 588.5 804.5 Z M 493.5 651.5 L 524.5 651.5 L 524.5 804.5 L 493.5 804.5 Z M 404.5 651.5 L 435.5 651.5 L 435.5 804.5 L 404.5 804.5 Z M 404.5 651.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 1585.5 268.5 L 1616.5 268.5 L 1616.5 475.5 L 1585.5 475.5 Z M 1481.5 268.5 L 1512.5 268.5 L 1512.5 475.5 L 1481.5 475.5 Z M 1262.5 268.5 L 1293.5 268.5 L 1293.5 475.5 L 1262.5 475.5 Z M 823.5 268.5 L 854.5 268.5 L 854.5 475.5 L 823.5 475.5 Z M 1168.5 268.5 L 1199.5 268.5 L 1199.5 475.5 L 1168.5 475.5 Z M 1378.5 268.5 L 1409.5 268.5 L 1409.5 475.5 L 1378.5 475.5 Z M 930.5 268.5 L 961.5 268.5 L 961.5 475.5 L 930.5 475.5 Z M 1055.5 268.5 L 1086.5 268.5 L 1086.5 475.5 L 1055.5 475.5 Z M 510.5 268.5 L 541.5 268.5 L 541.5 500.5 L 510.5 500.5 Z M 396.5 268.5 L 427.5 268.5 L 427.5 500.5 L 396.5 500.5 Z M 303.5 268.5 L 334.5 268.5 L 334.5 500.5 L 303.5 500.5 Z M 603.5 268.5 L 634.5 268.5 L 634.5 500.5 L 603.5 500.5 Z M 603.5 268.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.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>
@@ -179,6 +179,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 367.628906 305.421875 L 383.550781 328.5 L 376.453125 328.5 L 364.171875 309.738281 L 351.832031 328.5 L 344.859375 328.5 L 360.777344 305.421875 L 345.84375 283.511719 L 352.820312 283.511719 L 364.359375 301.160156 L 375.960938 283.511719 L 382.808594 283.511719 Z M 367.628906 305.421875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 345 790 L 380 790 M 345 755 L 380 755 M 345 755 L 345 790 M 380 755 L 380 790 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 345 790 L 380 790 M 345 755 L 380 755 M 380 790 L 380 755 M 345 790 L 345 755 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_1.svg b/cells/a31oi/sky130_fd_sc_hs__a31oi_1.svg
index ae6a883..170a49b 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_1.svg
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image309" 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="#image309"/>
+  <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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#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 1115.5 664.5 L 1150.5 664.5 L 1150.5 833.5 L 1115.5 833.5 Z M 765.5 664.5 L 799.5 664.5 L 799.5 833.5 L 765.5 833.5 Z M 854.5 664.5 L 889.5 664.5 L 889.5 833.5 L 854.5 833.5 Z M 985.5 664.5 L 1019.5 664.5 L 1019.5 833.5 L 985.5 833.5 Z M 985.5 664.5 "/>
 </clipPath>
-<image id="image310" 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="#image310"/>
+  <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 1119.5 240.5 L 1153.5 240.5 L 1153.5 496.5 L 1119.5 496.5 Z M 755.5 240.5 L 789.5 240.5 L 789.5 496.5 L 755.5 496.5 Z M 858.5 240.5 L 892.5 240.5 L 892.5 496.5 L 858.5 496.5 Z M 1004.5 240.5 L 1039.5 240.5 L 1039.5 496.5 L 1004.5 496.5 Z M 1004.5 240.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image312" 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="#image312"/>
+  <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="surface306">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,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 1046.773438 612.503906 L 1036.203125 612.503906 L 1036.203125 608.261719 L 1038.019531 608.058594 L 1039.636719 607.789062 L 1041.050781 607.453125 L 1042.261719 607.183594 L 1043.269531 606.847656 L 1044.148438 606.445312 L 1044.820312 606.039062 L 1045.425781 605.570312 L 1045.964844 605.03125 L 1046.503906 604.355469 L 1046.972656 603.617188 L 1047.445312 602.742188 L 1047.648438 602.269531 L 1047.847656 601.730469 L 1048.050781 601.125 L 1048.320312 600.386719 L 1048.523438 599.644531 L 1048.792969 598.769531 L 1052.695312 598.769531 L 1052.695312 646.5 L 1046.773438 646.5 Z M 1046.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 999 477 L 1038 477 M 999 438 L 1038 438 M 999 438 L 999 477 M 1038 438 L 1038 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 999 477 L 1038 477 M 999 438 L 1038 438 M 1038 477 L 1038 438 M 999 477 L 999 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_2.svg b/cells/a31oi/sky130_fd_sc_hs__a31oi_2.svg
index 0d53217..a5b01b1 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_2.svg
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1310.5 664.5 L 1345.5 664.5 L 1345.5 833.5 L 1310.5 833.5 Z M 563.5 664.5 L 598.5 664.5 L 598.5 833.5 L 563.5 833.5 Z M 662.5 664.5 L 696.5 664.5 L 696.5 833.5 L 662.5 833.5 Z M 776.5 664.5 L 811.5 664.5 L 811.5 833.5 L 776.5 833.5 Z M 891.5 664.5 L 925.5 664.5 L 925.5 833.5 L 891.5 833.5 Z M 1022.5 664.5 L 1056.5 664.5 L 1056.5 833.5 L 1022.5 833.5 Z M 1208.5 664.5 L 1243.5 664.5 L 1243.5 833.5 L 1208.5 833.5 Z M 1208.5 664.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1324.5 240.5 L 1358.5 240.5 L 1358.5 496.5 L 1324.5 496.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 671.5 240.5 L 705.5 240.5 L 705.5 496.5 L 671.5 496.5 Z M 783.5 240.5 L 818.5 240.5 L 818.5 496.5 L 783.5 496.5 Z M 898.5 240.5 L 932.5 240.5 L 932.5 496.5 L 898.5 496.5 Z M 1003.5 240.5 L 1038.5 240.5 L 1038.5 496.5 L 1003.5 496.5 Z M 1106.5 240.5 L 1141.5 240.5 L 1141.5 496.5 L 1106.5 496.5 Z M 1221.5 240.5 L 1255.5 240.5 L 1255.5 496.5 L 1221.5 496.5 Z M 1221.5 240.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,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 1100.773438 612.503906 L 1090.203125 612.503906 L 1090.203125 608.261719 L 1092.019531 608.058594 L 1093.636719 607.789062 L 1095.050781 607.453125 L 1096.261719 607.183594 L 1097.269531 606.847656 L 1098.148438 606.445312 L 1098.820312 606.039062 L 1099.425781 605.570312 L 1099.964844 605.03125 L 1100.503906 604.355469 L 1100.972656 603.617188 L 1101.445312 602.742188 L 1101.648438 602.269531 L 1101.847656 601.730469 L 1102.050781 601.125 L 1102.320312 600.386719 L 1102.523438 599.644531 L 1102.792969 598.769531 L 1106.695312 598.769531 L 1106.695312 646.5 L 1100.773438 646.5 Z M 1100.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 477 L 1091 477 M 1052 438 L 1091 438 M 1052 438 L 1052 477 M 1091 438 L 1091 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 477 L 1091 477 M 1052 438 L 1091 438 M 1091 477 L 1091 438 M 1052 477 L 1052 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a31oi/sky130_fd_sc_hs__a31oi_4.svg b/cells/a31oi/sky130_fd_sc_hs__a31oi_4.svg
index 683cbeb..4a31d21 100644
--- a/cells/a31oi/sky130_fd_sc_hs__a31oi_4.svg
+++ b/cells/a31oi/sky130_fd_sc_hs__a31oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1611.5 632.5 L 1637.5 632.5 L 1637.5 761.5 L 1611.5 761.5 Z M 283.5 632.5 L 309.5 632.5 L 309.5 761.5 L 283.5 761.5 Z M 358.5 632.5 L 384.5 632.5 L 384.5 761.5 L 358.5 761.5 Z M 432.5 632.5 L 458.5 632.5 L 458.5 761.5 L 432.5 761.5 Z M 519.5 632.5 L 545.5 632.5 L 545.5 761.5 L 519.5 761.5 Z M 594.5 632.5 L 620.5 632.5 L 620.5 761.5 L 594.5 761.5 Z M 671.5 632.5 L 697.5 632.5 L 697.5 761.5 L 671.5 761.5 Z M 746.5 632.5 L 772.5 632.5 L 772.5 761.5 L 746.5 761.5 Z M 845.5 632.5 L 871.5 632.5 L 871.5 761.5 L 845.5 761.5 Z M 1019.5 632.5 L 1045.5 632.5 L 1045.5 761.5 L 1019.5 761.5 Z M 1144.5 632.5 L 1170.5 632.5 L 1170.5 761.5 L 1144.5 761.5 Z M 1231.5 632.5 L 1257.5 632.5 L 1257.5 761.5 L 1231.5 761.5 Z M 1306.5 632.5 L 1332.5 632.5 L 1332.5 761.5 L 1306.5 761.5 Z M 1393.5 632.5 L 1419.5 632.5 L 1419.5 761.5 L 1393.5 761.5 Z M 1393.5 632.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image362"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1609.5 310.5 L 1635.5 310.5 L 1635.5 505.5 L 1609.5 505.5 Z M 282.5 310.5 L 308.5 310.5 L 308.5 505.5 L 282.5 505.5 Z M 360.5 310.5 L 386.5 310.5 L 386.5 505.5 L 360.5 505.5 Z M 438.5 310.5 L 465.5 310.5 L 465.5 505.5 L 438.5 505.5 Z M 517.5 310.5 L 543.5 310.5 L 543.5 505.5 L 517.5 505.5 Z M 595.5 310.5 L 621.5 310.5 L 621.5 505.5 L 595.5 505.5 Z M 682.5 310.5 L 708.5 310.5 L 708.5 505.5 L 682.5 505.5 Z M 760.5 310.5 L 786.5 310.5 L 786.5 505.5 L 760.5 505.5 Z M 847.5 310.5 L 873.5 310.5 L 873.5 505.5 L 847.5 505.5 Z M 934.5 310.5 L 960.5 310.5 L 960.5 505.5 L 934.5 505.5 Z M 1021.5 310.5 L 1047.5 310.5 L 1047.5 505.5 L 1021.5 505.5 Z M 1192.5 310.5 L 1218.5 310.5 L 1218.5 505.5 L 1192.5 505.5 Z M 1287.5 310.5 L 1314.5 310.5 L 1314.5 505.5 L 1287.5 505.5 Z M 1371.5 310.5 L 1397.5 310.5 L 1397.5 505.5 L 1371.5 505.5 Z M 1453.5 310.5 L 1479.5 310.5 L 1479.5 505.5 L 1453.5 505.5 Z M 1531.5 310.5 L 1557.5 310.5 L 1557.5 505.5 L 1531.5 505.5 Z M 1531.5 310.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image364"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface358">
+<g id="surface386">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -205,6 +205,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1004.039062 540.058594 L 1004.039062 554.5 L 999.34375 554.5 L 999.34375 540.058594 L 985.15625 517.691406 L 990.960938 517.691406 L 1001.769531 535.617188 L 1012.269531 517.691406 L 1017.875 517.691406 Z M 1004.039062 540.058594 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 986 558 L 1015 558 M 986 529 L 1015 529 M 986 529 L 986 558 M 1015 529 L 1015 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 986 558 L 1015 558 M 986 529 L 1015 529 M 1015 558 L 1015 529 M 986 558 L 986 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_1.svg b/cells/a32o/sky130_fd_sc_hs__a32o_1.svg
index d32b374..f35d07f 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_1.svg
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1266.5 664.5 L 1300.5 664.5 L 1300.5 810.5 L 1266.5 810.5 Z M 1176.5 664.5 L 1211.5 664.5 L 1211.5 810.5 L 1176.5 810.5 Z M 784.5 664.5 L 819.5 664.5 L 819.5 810.5 L 784.5 810.5 Z M 874.5 664.5 L 908.5 664.5 L 908.5 810.5 L 874.5 810.5 Z M 997.5 664.5 L 1032.5 664.5 L 1032.5 810.5 L 997.5 810.5 Z M 618.5 664.5 L 653.5 664.5 L 653.5 833.5 L 618.5 833.5 Z M 618.5 664.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 623.5 240.5 L 657.5 240.5 L 657.5 496.5 L 623.5 496.5 Z M 1269.5 267.5 L 1303.5 267.5 L 1303.5 496.5 L 1269.5 496.5 Z M 1143.5 267.5 L 1177.5 267.5 L 1177.5 496.5 L 1143.5 496.5 Z M 1040.5 267.5 L 1074.5 267.5 L 1074.5 496.5 L 1040.5 496.5 Z M 870.5 267.5 L 905.5 267.5 L 905.5 496.5 L 870.5 496.5 Z M 767.5 267.5 L 801.5 267.5 L 801.5 496.5 L 767.5 496.5 Z M 767.5 267.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,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 821.511719 603.40625 L 819.292969 603.605469 L 817.40625 604.078125 L 815.859375 604.886719 L 814.578125 606.03125 L 813.636719 607.511719 L 812.960938 609.328125 L 812.761719 609.933594 L 812.625 610.609375 L 812.558594 611.28125 L 812.492188 612.089844 L 812.425781 612.828125 L 812.425781 613.636719 L 806.5 613.636719 L 806.769531 609.867188 L 807.644531 606.636719 L 808.921875 603.941406 L 810.808594 601.722656 L 813.097656 600.039062 L 815.992188 598.894531 L 816.800781 598.691406 L 817.675781 598.558594 L 818.550781 598.421875 L 820.433594 598.289062 L 821.445312 598.222656 L 823.9375 598.355469 L 826.292969 598.757812 L 828.378906 599.433594 L 830.265625 600.308594 L 831.878906 601.519531 L 833.292969 602.933594 L 834.101562 604.144531 L 834.773438 605.355469 L 835.3125 606.703125 L 835.648438 608.183594 L 835.851562 609.734375 L 835.988281 611.347656 L 835.785156 613.703125 L 835.246094 615.722656 L 834.304688 617.476562 L 833.023438 619.023438 L 831.339844 620.300781 L 829.320312 621.246094 L 831.003906 621.917969 L 832.484375 622.726562 L 833.765625 623.601562 L 834.84375 624.609375 L 835.71875 625.753906 L 836.390625 626.96875 L 836.660156 627.773438 L 836.929688 628.648438 L 837.132812 629.59375 L 837.265625 630.535156 L 837.332031 631.542969 L 837.402344 632.621094 L 837.265625 634.910156 L 836.863281 636.996094 L 836.1875 638.882812 L 835.3125 640.699219 L 834.167969 642.316406 L 832.753906 643.730469 L 831.207031 644.875 L 829.523438 645.816406 L 827.707031 646.488281 L 825.6875 647.027344 L 823.53125 647.367188 L 821.242188 647.5 L 817.609375 647.230469 L 814.511719 646.421875 L 811.820312 645.210938 L 809.597656 643.394531 L 807.847656 641.105469 L 806.632812 638.277344 L 806.296875 637.402344 L 806.097656 636.390625 L 805.894531 635.382812 L 805.691406 634.371094 L 805.558594 633.296875 L 805.488281 632.082031 L 811.414062 632.082031 L 811.683594 634.507812 L 812.222656 636.59375 L 813.03125 638.34375 L 814.105469 639.757812 L 815.453125 640.902344 L 817.136719 641.644531 L 817.742188 641.84375 L 818.414062 641.980469 L 819.089844 642.113281 L 819.828125 642.179688 L 820.570312 642.25 L 821.445312 642.25 L 823.261719 642.179688 L 824.945312 641.84375 L 826.425781 641.304688 L 827.773438 640.566406 L 828.917969 639.554688 L 829.859375 638.34375 L 830.265625 637.605469 L 830.667969 636.730469 L 830.9375 635.785156 L 831.140625 634.84375 L 831.273438 633.832031 L 831.339844 632.6875 L 831.070312 630.265625 L 830.398438 628.246094 L 829.253906 626.5625 L 827.640625 625.351562 L 825.550781 624.542969 L 822.992188 624.070312 L 821.648438 624.070312 L 821.445312 624.003906 L 818.953125 624.070312 L 818.214844 624.070312 L 818.214844 619.023438 L 820.234375 618.957031 L 822.050781 618.820312 L 823.667969 618.621094 L 825.011719 618.351562 L 826.15625 618.011719 L 827.167969 617.542969 L 827.976562 616.9375 L 828.648438 616.128906 L 829.1875 615.253906 L 829.589844 614.175781 L 829.792969 612.964844 L 829.929688 611.550781 L 829.792969 610.070312 L 829.523438 608.65625 L 829.050781 607.445312 L 828.378906 606.367188 L 827.503906 605.425781 L 826.425781 604.617188 L 825.6875 604.28125 L 824.878906 603.941406 L 824.136719 603.742188 L 823.261719 603.539062 Z M 821.511719 603.40625 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 777 477 L 816 477 M 777 438 L 816 438 M 777 438 L 777 477 M 816 438 L 816 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 777 477 L 816 477 M 777 438 L 816 438 M 816 477 L 816 438 M 777 477 L 777 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_2.svg b/cells/a32o/sky130_fd_sc_hs__a32o_2.svg
index 7ad82b3..df1cadf 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_2.svg
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1321.5 664.5 L 1355.5 664.5 L 1355.5 833.5 L 1321.5 833.5 Z M 578.5 664.5 L 612.5 664.5 L 612.5 833.5 L 578.5 833.5 Z M 679.5 664.5 L 713.5 664.5 L 713.5 833.5 L 679.5 833.5 Z M 839.5 664.5 L 874.5 664.5 L 874.5 833.5 L 839.5 833.5 Z M 929.5 664.5 L 963.5 664.5 L 963.5 833.5 L 929.5 833.5 Z M 1059.5 664.5 L 1094.5 664.5 L 1094.5 833.5 L 1059.5 833.5 Z M 1190.5 664.5 L 1224.5 664.5 L 1224.5 833.5 L 1190.5 833.5 Z M 1190.5 664.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 1324.5 267.5 L 1358.5 267.5 L 1358.5 496.5 L 1324.5 496.5 Z M 1198.5 267.5 L 1232.5 267.5 L 1232.5 496.5 L 1198.5 496.5 Z M 1095.5 267.5 L 1129.5 267.5 L 1129.5 496.5 L 1095.5 496.5 Z M 932.5 267.5 L 967.5 267.5 L 967.5 496.5 L 932.5 496.5 Z M 829.5 267.5 L 863.5 267.5 L 863.5 496.5 L 829.5 496.5 Z M 669.5 240.5 L 703.5 240.5 L 703.5 496.5 L 669.5 496.5 Z M 669.5 240.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -162,6 +162,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 636.824219 451.320312 L 654.191406 476.5 L 646.449219 476.5 L 633.050781 456.035156 L 619.589844 476.5 L 611.980469 476.5 L 629.351562 451.320312 L 613.058594 427.421875 L 620.664062 427.421875 L 633.253906 446.675781 L 645.910156 427.421875 L 653.382812 427.421875 Z M 636.824219 451.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 612 647 L 651 647 M 612 608 L 651 608 M 612 608 L 612 647 M 651 608 L 651 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 612 647 L 651 647 M 612 608 L 651 608 M 651 647 L 651 608 M 612 647 L 612 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32o/sky130_fd_sc_hs__a32o_4.svg b/cells/a32o/sky130_fd_sc_hs__a32o_4.svg
index edb4434..4e9b2c0 100644
--- a/cells/a32o/sky130_fd_sc_hs__a32o_4.svg
+++ b/cells/a32o/sky130_fd_sc_hs__a32o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 515.5 L 174.5 515.5 Z M 1109.5 515.5 L 1744.5 515.5 L 1744.5 537.5 L 1109.5 537.5 Z M 174.5 515.5 L 779.5 515.5 L 779.5 537.5 L 174.5 537.5 Z M 174.5 515.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 894.5 596.5 L 921.5 596.5 L 921.5 714.5 L 894.5 714.5 Z M 973.5 596.5 L 1001.5 596.5 L 1001.5 714.5 L 973.5 714.5 Z M 1252.5 612.5 L 1280.5 612.5 L 1280.5 730.5 L 1252.5 730.5 Z M 1508.5 612.5 L 1535.5 612.5 L 1535.5 730.5 L 1508.5 730.5 Z M 1331.5 612.5 L 1359.5 612.5 L 1359.5 730.5 L 1331.5 730.5 Z M 1604.5 612.5 L 1632.5 612.5 L 1632.5 730.5 L 1604.5 730.5 Z M 1173.5 612.5 L 1201.5 612.5 L 1201.5 730.5 L 1173.5 730.5 Z M 1425.5 612.5 L 1453.5 612.5 L 1453.5 730.5 L 1425.5 730.5 Z M 800.5 623.5 L 828.5 623.5 L 828.5 741.5 L 800.5 741.5 Z M 721.5 623.5 L 749.5 623.5 L 749.5 741.5 L 721.5 741.5 Z M 368.5 623.5 L 396.5 623.5 L 396.5 759.5 L 368.5 759.5 Z M 286.5 623.5 L 314.5 623.5 L 314.5 759.5 L 286.5 759.5 Z M 475.5 623.5 L 502.5 623.5 L 502.5 759.5 L 475.5 759.5 Z M 554.5 623.5 L 581.5 623.5 L 581.5 759.5 L 554.5 759.5 Z M 554.5 623.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1603.5 298.5 L 1630.5 298.5 L 1630.5 481.5 L 1603.5 481.5 Z M 1511.5 298.5 L 1538.5 298.5 L 1538.5 481.5 L 1511.5 481.5 Z M 1334.5 298.5 L 1362.5 298.5 L 1362.5 481.5 L 1334.5 481.5 Z M 915.5 298.5 L 943.5 298.5 L 943.5 481.5 L 915.5 481.5 Z M 823.5 298.5 L 851.5 298.5 L 851.5 481.5 L 823.5 481.5 Z M 1248.5 298.5 L 1275.5 298.5 L 1275.5 481.5 L 1248.5 481.5 Z M 731.5 298.5 L 759.5 298.5 L 759.5 481.5 L 731.5 481.5 Z M 1428.5 298.5 L 1455.5 298.5 L 1455.5 481.5 L 1428.5 481.5 Z M 1007.5 298.5 L 1035.5 298.5 L 1035.5 481.5 L 1007.5 481.5 Z M 1135.5 298.5 L 1162.5 298.5 L 1162.5 481.5 L 1135.5 481.5 Z M 546.5 298.5 L 573.5 298.5 L 573.5 504.5 L 546.5 504.5 Z M 463.5 298.5 L 490.5 298.5 L 490.5 504.5 L 463.5 504.5 Z M 288.5 298.5 L 316.5 298.5 L 316.5 504.5 L 288.5 504.5 Z M 371.5 298.5 L 398.5 298.5 L 398.5 504.5 L 371.5 504.5 Z M 371.5 298.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface307">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,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 1143.664062 530.175781 L 1144.101562 526.070312 L 1145.25 522.734375 L 1147.054688 520.109375 L 1149.515625 518.25 L 1152.632812 517.101562 L 1156.464844 516.71875 L 1158.214844 516.828125 L 1159.910156 517.101562 L 1161.496094 517.539062 L 1162.917969 518.195312 L 1164.230469 519.015625 L 1165.488281 519.945312 L 1166.472656 521.09375 L 1167.347656 522.296875 L 1168.003906 523.609375 L 1168.496094 524.976562 L 1168.769531 526.511719 L 1168.878906 528.097656 L 1168.660156 530.339844 L 1168.058594 532.417969 L 1167.019531 534.332031 L 1165.597656 536.136719 L 1163.738281 537.832031 L 1161.496094 539.308594 L 1160.675781 539.800781 L 1155.207031 542.753906 L 1153.785156 543.574219 L 1152.523438 544.394531 L 1151.429688 545.214844 L 1150.554688 546.039062 L 1149.789062 546.859375 L 1149.242188 547.679688 L 1148.96875 548.171875 L 1148.75 548.609375 L 1148.585938 549.15625 L 1148.421875 549.648438 L 1148.257812 550.195312 L 1148.203125 550.742188 L 1168.605469 550.742188 L 1168.605469 555.5 L 1142.789062 555.5 L 1142.898438 553.585938 L 1143.171875 551.835938 L 1143.5 550.195312 L 1143.9375 548.773438 L 1144.429688 547.40625 L 1145.03125 546.203125 L 1145.6875 545.160156 L 1146.507812 544.121094 L 1147.492188 543.082031 L 1148.585938 542.097656 L 1149.84375 541.113281 L 1151.648438 539.910156 L 1152.03125 539.691406 L 1152.414062 539.417969 L 1152.796875 539.199219 L 1153.234375 538.980469 L 1153.675781 538.707031 L 1158.707031 535.863281 L 1160.292969 534.824219 L 1161.605469 533.675781 L 1162.644531 532.472656 L 1163.355469 531.160156 L 1163.792969 529.738281 L 1163.957031 528.207031 L 1163.847656 527.167969 L 1163.683594 526.125 L 1163.300781 525.195312 L 1162.863281 524.320312 L 1162.207031 523.554688 L 1161.496094 522.789062 L 1160.730469 522.242188 L 1159.964844 521.75 L 1159.089844 521.421875 L 1158.214844 521.148438 L 1157.285156 520.984375 L 1156.300781 520.929688 L 1154.167969 521.203125 L 1152.359375 521.859375 L 1150.882812 523.007812 L 1149.789062 524.59375 L 1149.023438 526.675781 L 1148.585938 529.136719 L 1148.53125 529.355469 L 1148.53125 529.683594 L 1148.476562 529.847656 L 1148.476562 530.175781 Z M 1143.664062 530.175781 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1120 559 L 1151 559 M 1120 528 L 1151 528 M 1120 528 L 1120 559 M 1151 528 L 1151 559 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1120 559 L 1151 559 M 1120 528 L 1151 528 M 1151 559 L 1151 528 M 1120 559 L 1120 528 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_1.svg b/cells/a32oi/sky130_fd_sc_hs__a32oi_1.svg
index b986e46..7f3f445 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_1.svg
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 1211.5 664.5 L 1245.5 664.5 L 1245.5 833.5 L 1211.5 833.5 Z M 679.5 664.5 L 713.5 664.5 L 713.5 833.5 L 679.5 833.5 Z M 768.5 664.5 L 803.5 664.5 L 803.5 833.5 L 768.5 833.5 Z M 991.5 664.5 L 1025.5 664.5 L 1025.5 833.5 L 991.5 833.5 Z M 1080.5 664.5 L 1114.5 664.5 L 1114.5 833.5 L 1080.5 833.5 Z M 1080.5 664.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 1214.5 240.5 L 1248.5 240.5 L 1248.5 496.5 L 1214.5 496.5 Z M 675.5 240.5 L 710.5 240.5 L 710.5 496.5 L 675.5 496.5 Z M 790.5 240.5 L 824.5 240.5 L 824.5 496.5 L 790.5 496.5 Z M 930.5 240.5 L 964.5 240.5 L 964.5 496.5 L 930.5 496.5 Z M 1111.5 240.5 L 1145.5 240.5 L 1145.5 496.5 L 1111.5 496.5 Z M 1111.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -170,6 +170,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 990.773438 612.503906 L 980.203125 612.503906 L 980.203125 608.261719 L 982.019531 608.058594 L 983.636719 607.789062 L 985.050781 607.453125 L 986.261719 607.183594 L 987.269531 606.847656 L 988.148438 606.445312 L 988.820312 606.039062 L 989.425781 605.570312 L 989.964844 605.03125 L 990.503906 604.355469 L 990.972656 603.617188 L 991.445312 602.742188 L 991.648438 602.269531 L 991.847656 601.730469 L 992.050781 601.125 L 992.320312 600.386719 L 992.523438 599.644531 L 992.792969 598.769531 L 996.695312 598.769531 L 996.695312 646.5 L 990.773438 646.5 Z M 990.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 942 477 L 981 477 M 942 438 L 981 438 M 942 438 L 942 477 M 981 438 L 981 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 942 477 L 981 477 M 942 438 L 981 438 M 981 477 L 981 438 M 942 477 L 942 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_2.svg b/cells/a32oi/sky130_fd_sc_hs__a32oi_2.svg
index 2009b21..94218cc 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_2.svg
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 538.5 L 201.5 538.5 Z M 201.5 111.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 245.5 862.5 L 1675.5 862.5 L 1675.5 918.5 L 245.5 918.5 Z M 245.5 862.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 1544.5 664.5 L 1578.5 664.5 L 1578.5 833.5 L 1544.5 833.5 Z M 341.5 664.5 L 375.5 664.5 L 375.5 833.5 L 341.5 833.5 Z M 451.5 664.5 L 485.5 664.5 L 485.5 833.5 L 451.5 833.5 Z M 549.5 664.5 L 584.5 664.5 L 584.5 833.5 L 549.5 833.5 Z M 648.5 664.5 L 682.5 664.5 L 682.5 833.5 L 648.5 833.5 Z M 891.5 664.5 L 925.5 664.5 L 925.5 833.5 L 891.5 833.5 Z M 989.5 664.5 L 1024.5 664.5 L 1024.5 833.5 L 989.5 833.5 Z M 1094.5 664.5 L 1128.5 664.5 L 1128.5 833.5 L 1094.5 833.5 Z M 1219.5 664.5 L 1253.5 664.5 L 1253.5 833.5 L 1219.5 833.5 Z M 1446.5 664.5 L 1480.5 664.5 L 1480.5 833.5 L 1446.5 833.5 Z M 1446.5 664.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 1484.5 240.5 L 1519.5 240.5 L 1519.5 496.5 L 1484.5 496.5 Z M 344.5 240.5 L 379.5 240.5 L 379.5 496.5 L 344.5 496.5 Z M 458.5 240.5 L 492.5 240.5 L 492.5 496.5 L 458.5 496.5 Z M 572.5 240.5 L 607.5 240.5 L 607.5 496.5 L 572.5 496.5 Z M 687.5 240.5 L 721.5 240.5 L 721.5 496.5 L 687.5 496.5 Z M 801.5 240.5 L 836.5 240.5 L 836.5 496.5 L 801.5 496.5 Z M 994.5 240.5 L 1028.5 240.5 L 1028.5 496.5 L 994.5 496.5 Z M 1097.5 240.5 L 1132.5 240.5 L 1132.5 496.5 L 1097.5 496.5 Z M 1215.5 240.5 L 1250.5 240.5 L 1250.5 496.5 L 1215.5 496.5 Z M 1358.5 240.5 L 1393.5 240.5 L 1393.5 496.5 L 1358.5 496.5 Z M 1358.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 280.5 136.5 L 319.5 136.5 L 319.5 174.5 L 280.5 174.5 Z M 1600.5 136.5 L 1639.5 136.5 L 1639.5 174.5 L 1600.5 174.5 Z M 1490.5 136.5 L 1529.5 136.5 L 1529.5 174.5 L 1490.5 174.5 Z M 1380.5 136.5 L 1419.5 136.5 L 1419.5 174.5 L 1380.5 174.5 Z M 1270.5 136.5 L 1309.5 136.5 L 1309.5 174.5 L 1270.5 174.5 Z M 1160.5 136.5 L 1199.5 136.5 L 1199.5 174.5 L 1160.5 174.5 Z M 1050.5 136.5 L 1089.5 136.5 L 1089.5 174.5 L 1050.5 174.5 Z M 940.5 136.5 L 979.5 136.5 L 979.5 174.5 L 940.5 174.5 Z M 830.5 136.5 L 869.5 136.5 L 869.5 174.5 L 830.5 174.5 Z M 720.5 136.5 L 759.5 136.5 L 759.5 174.5 L 720.5 174.5 Z M 610.5 136.5 L 649.5 136.5 L 649.5 174.5 L 610.5 174.5 Z M 500.5 136.5 L 539.5 136.5 L 539.5 174.5 L 500.5 174.5 Z M 390.5 136.5 L 429.5 136.5 L 429.5 174.5 L 390.5 174.5 Z M 280.5 899.5 L 319.5 899.5 L 319.5 938.5 L 280.5 938.5 Z M 1600.5 899.5 L 1639.5 899.5 L 1639.5 938.5 L 1600.5 938.5 Z M 1490.5 899.5 L 1529.5 899.5 L 1529.5 938.5 L 1490.5 938.5 Z M 1380.5 899.5 L 1419.5 899.5 L 1419.5 938.5 L 1380.5 938.5 Z M 1270.5 899.5 L 1309.5 899.5 L 1309.5 938.5 L 1270.5 938.5 Z M 1160.5 899.5 L 1199.5 899.5 L 1199.5 938.5 L 1160.5 938.5 Z M 1050.5 899.5 L 1089.5 899.5 L 1089.5 938.5 L 1050.5 938.5 Z M 940.5 899.5 L 979.5 899.5 L 979.5 938.5 L 940.5 938.5 Z M 830.5 899.5 L 869.5 899.5 L 869.5 938.5 L 830.5 938.5 Z M 720.5 899.5 L 759.5 899.5 L 759.5 938.5 L 720.5 938.5 Z M 610.5 899.5 L 649.5 899.5 L 649.5 938.5 L 610.5 938.5 Z M 500.5 899.5 L 539.5 899.5 L 539.5 938.5 L 500.5 938.5 Z M 390.5 899.5 L 429.5 899.5 L 429.5 938.5 L 390.5 938.5 Z M 390.5 899.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>
@@ -170,6 +170,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 964.554688 542.246094 L 964.554688 561.5 L 958.292969 561.5 L 958.292969 542.246094 L 939.375 512.421875 L 947.117188 512.421875 L 961.523438 536.320312 L 975.527344 512.421875 L 983 512.421875 Z M 964.554688 542.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 940 562 L 979 562 M 940 523 L 979 523 M 940 523 L 940 562 M 979 523 L 979 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 940 562 L 979 562 M 940 523 L 979 523 M 979 562 L 979 523 M 940 562 L 940 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 245 156 L 245 165 M 240 161 L 249 161 M 244 162 L 246 162 M 244 160 L 246 160 M 244 160 L 244 162 M 246 160 L 246 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a32oi/sky130_fd_sc_hs__a32oi_4.svg b/cells/a32oi/sky130_fd_sc_hs__a32oi_4.svg
index 62662df..5d4b2cd 100644
--- a/cells/a32oi/sky130_fd_sc_hs__a32oi_4.svg
+++ b/cells/a32oi/sky130_fd_sc_hs__a32oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 269.5 L 1743.5 269.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 269.5 "/>
 </clipPath>
-<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 201.5 739.5 L 1716.5 739.5 L 1716.5 774.5 L 201.5 774.5 Z M 201.5 739.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1634.5 615.5 L 1656.5 615.5 L 1656.5 721.5 L 1634.5 721.5 Z M 261.5 615.5 L 283.5 615.5 L 283.5 721.5 L 261.5 721.5 Z M 333.5 615.5 L 355.5 615.5 L 355.5 721.5 L 333.5 721.5 Z M 395.5 615.5 L 416.5 615.5 L 416.5 721.5 L 395.5 721.5 Z M 466.5 615.5 L 487.5 615.5 L 487.5 721.5 L 466.5 721.5 Z M 527.5 615.5 L 549.5 615.5 L 549.5 721.5 L 527.5 721.5 Z M 589.5 615.5 L 611.5 615.5 L 611.5 721.5 L 589.5 721.5 Z M 661.5 615.5 L 682.5 615.5 L 682.5 721.5 L 661.5 721.5 Z M 723.5 615.5 L 744.5 615.5 L 744.5 721.5 L 723.5 721.5 Z M 865.5 615.5 L 886.5 615.5 L 886.5 721.5 L 865.5 721.5 Z M 936.5 615.5 L 958.5 615.5 L 958.5 721.5 L 936.5 721.5 Z M 998.5 615.5 L 1020.5 615.5 L 1020.5 721.5 L 998.5 721.5 Z M 1060.5 615.5 L 1081.5 615.5 L 1081.5 721.5 L 1060.5 721.5 Z M 1121.5 615.5 L 1143.5 615.5 L 1143.5 721.5 L 1121.5 721.5 Z M 1183.5 615.5 L 1205.5 615.5 L 1205.5 721.5 L 1183.5 721.5 Z M 1246.5 615.5 L 1267.5 615.5 L 1267.5 721.5 L 1246.5 721.5 Z M 1307.5 615.5 L 1329.5 615.5 L 1329.5 721.5 L 1307.5 721.5 Z M 1449.5 615.5 L 1471.5 615.5 L 1471.5 721.5 L 1449.5 721.5 Z M 1511.5 615.5 L 1533.5 615.5 L 1533.5 721.5 L 1511.5 721.5 Z M 1573.5 615.5 L 1594.5 615.5 L 1594.5 721.5 L 1573.5 721.5 Z M 1573.5 615.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image396"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1632.5 349.5 L 1654.5 349.5 L 1654.5 510.5 L 1632.5 510.5 Z M 263.5 349.5 L 285.5 349.5 L 285.5 510.5 L 263.5 510.5 Z M 334.5 349.5 L 356.5 349.5 L 356.5 510.5 L 334.5 510.5 Z M 399.5 349.5 L 421.5 349.5 L 421.5 510.5 L 399.5 510.5 Z M 464.5 349.5 L 485.5 349.5 L 485.5 510.5 L 464.5 510.5 Z M 535.5 349.5 L 557.5 349.5 L 557.5 510.5 L 535.5 510.5 Z M 607.5 349.5 L 629.5 349.5 L 629.5 510.5 L 607.5 510.5 Z M 679.5 349.5 L 700.5 349.5 L 700.5 510.5 L 679.5 510.5 Z M 751.5 349.5 L 772.5 349.5 L 772.5 510.5 L 751.5 510.5 Z M 842.5 349.5 L 864.5 349.5 L 864.5 510.5 L 842.5 510.5 Z M 914.5 349.5 L 936.5 349.5 L 936.5 510.5 L 914.5 510.5 Z M 979.5 349.5 L 1000.5 349.5 L 1000.5 510.5 L 979.5 510.5 Z M 1058.5 349.5 L 1079.5 349.5 L 1079.5 510.5 L 1058.5 510.5 Z M 1124.5 349.5 L 1145.5 349.5 L 1145.5 510.5 L 1124.5 510.5 Z M 1201.5 349.5 L 1223.5 349.5 L 1223.5 510.5 L 1201.5 510.5 Z M 1266.5 349.5 L 1287.5 349.5 L 1287.5 510.5 L 1266.5 510.5 Z M 1337.5 349.5 L 1359.5 349.5 L 1359.5 510.5 L 1337.5 510.5 Z M 1409.5 349.5 L 1431.5 349.5 L 1431.5 510.5 L 1409.5 510.5 Z M 1481.5 349.5 L 1502.5 349.5 L 1502.5 510.5 L 1481.5 510.5 Z M 1553.5 349.5 L 1574.5 349.5 L 1574.5 510.5 L 1553.5 510.5 Z M 1553.5 349.5 "/>
 </clipPath>
-<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 223.5 284.5 L 248.5 284.5 L 248.5 308.5 L 223.5 308.5 Z M 1670.5 284.5 L 1694.5 284.5 L 1694.5 308.5 L 1670.5 308.5 Z M 1601.5 284.5 L 1625.5 284.5 L 1625.5 308.5 L 1601.5 308.5 Z M 1532.5 284.5 L 1556.5 284.5 L 1556.5 308.5 L 1532.5 308.5 Z M 1463.5 284.5 L 1487.5 284.5 L 1487.5 308.5 L 1463.5 308.5 Z M 1394.5 284.5 L 1418.5 284.5 L 1418.5 308.5 L 1394.5 308.5 Z M 1325.5 284.5 L 1350.5 284.5 L 1350.5 308.5 L 1325.5 308.5 Z M 1256.5 284.5 L 1281.5 284.5 L 1281.5 308.5 L 1256.5 308.5 Z M 1187.5 284.5 L 1212.5 284.5 L 1212.5 308.5 L 1187.5 308.5 Z M 1119.5 284.5 L 1143.5 284.5 L 1143.5 308.5 L 1119.5 308.5 Z M 1050.5 284.5 L 1074.5 284.5 L 1074.5 308.5 L 1050.5 308.5 Z M 981.5 284.5 L 1005.5 284.5 L 1005.5 308.5 L 981.5 308.5 Z M 912.5 284.5 L 936.5 284.5 L 936.5 308.5 L 912.5 308.5 Z M 843.5 284.5 L 867.5 284.5 L 867.5 308.5 L 843.5 308.5 Z M 774.5 284.5 L 799.5 284.5 L 799.5 308.5 L 774.5 308.5 Z M 705.5 284.5 L 730.5 284.5 L 730.5 308.5 L 705.5 308.5 Z M 636.5 284.5 L 661.5 284.5 L 661.5 308.5 L 636.5 308.5 Z M 568.5 284.5 L 592.5 284.5 L 592.5 308.5 L 568.5 308.5 Z M 499.5 284.5 L 523.5 284.5 L 523.5 308.5 L 499.5 308.5 Z M 430.5 284.5 L 454.5 284.5 L 454.5 308.5 L 430.5 308.5 Z M 361.5 284.5 L 385.5 284.5 L 385.5 308.5 L 361.5 308.5 Z M 292.5 284.5 L 317.5 284.5 L 317.5 308.5 L 292.5 308.5 Z M 223.5 762.5 L 248.5 762.5 L 248.5 786.5 L 223.5 786.5 Z M 1670.5 762.5 L 1694.5 762.5 L 1694.5 786.5 L 1670.5 786.5 Z M 1601.5 762.5 L 1625.5 762.5 L 1625.5 786.5 L 1601.5 786.5 Z M 1532.5 762.5 L 1556.5 762.5 L 1556.5 786.5 L 1532.5 786.5 Z M 1463.5 762.5 L 1487.5 762.5 L 1487.5 786.5 L 1463.5 786.5 Z M 1394.5 762.5 L 1418.5 762.5 L 1418.5 786.5 L 1394.5 786.5 Z M 1325.5 762.5 L 1350.5 762.5 L 1350.5 786.5 L 1325.5 786.5 Z M 1256.5 762.5 L 1281.5 762.5 L 1281.5 786.5 L 1256.5 786.5 Z M 1187.5 762.5 L 1212.5 762.5 L 1212.5 786.5 L 1187.5 786.5 Z M 1119.5 762.5 L 1143.5 762.5 L 1143.5 786.5 L 1119.5 786.5 Z M 1050.5 762.5 L 1074.5 762.5 L 1074.5 786.5 L 1050.5 786.5 Z M 981.5 762.5 L 1005.5 762.5 L 1005.5 786.5 L 981.5 786.5 Z M 912.5 762.5 L 936.5 762.5 L 936.5 786.5 L 912.5 786.5 Z M 843.5 762.5 L 867.5 762.5 L 867.5 786.5 L 843.5 786.5 Z M 774.5 762.5 L 799.5 762.5 L 799.5 786.5 L 774.5 786.5 Z M 705.5 762.5 L 730.5 762.5 L 730.5 786.5 L 705.5 786.5 Z M 636.5 762.5 L 661.5 762.5 L 661.5 786.5 L 636.5 786.5 Z M 568.5 762.5 L 592.5 762.5 L 592.5 786.5 L 568.5 786.5 Z M 499.5 762.5 L 523.5 762.5 L 523.5 786.5 L 499.5 786.5 Z M 430.5 762.5 L 454.5 762.5 L 454.5 786.5 L 430.5 786.5 Z M 361.5 762.5 L 385.5 762.5 L 385.5 786.5 L 361.5 786.5 Z M 292.5 762.5 L 317.5 762.5 L 317.5 786.5 L 292.5 786.5 Z M 292.5 762.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface392">
+<g id="surface421">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -228,6 +228,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1064.785156 644.464844 L 1064.785156 656.5 L 1060.871094 656.5 L 1060.871094 644.464844 L 1049.046875 625.828125 L 1053.886719 625.828125 L 1062.890625 640.765625 L 1071.640625 625.828125 L 1076.3125 625.828125 Z M 1064.785156 644.464844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1050 450 L 1074 450 M 1050 426 L 1074 426 M 1050 426 L 1050 450 M 1074 426 L 1074 450 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1050 450 L 1074 450 M 1050 426 L 1074 426 M 1074 450 L 1074 426 M 1050 450 L 1050 426 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201 300 L 201 309 M 196 305 L 205 305 M 200 306 L 202 306 M 200 304 L 202 304 M 200 304 L 200 306 M 202 304 L 202 306 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_1.svg b/cells/a41o/sky130_fd_sc_hs__a41o_1.svg
index 63f9110..2ccccad 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_1.svg
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1316.5 664.5 L 1350.5 664.5 L 1350.5 833.5 L 1316.5 833.5 Z M 718.5 664.5 L 752.5 664.5 L 752.5 833.5 L 718.5 833.5 Z M 848.5 664.5 L 883.5 664.5 L 883.5 833.5 L 848.5 833.5 Z M 947.5 664.5 L 981.5 664.5 L 981.5 833.5 L 947.5 833.5 Z M 1055.5 664.5 L 1089.5 664.5 L 1089.5 833.5 L 1055.5 833.5 Z M 1185.5 664.5 L 1220.5 664.5 L 1220.5 833.5 L 1185.5 833.5 Z M 1185.5 664.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1319.5 240.5 L 1354.5 240.5 L 1354.5 469.5 L 1319.5 469.5 Z M 1189.5 240.5 L 1223.5 240.5 L 1223.5 469.5 L 1189.5 469.5 Z M 838.5 240.5 L 873.5 240.5 L 873.5 469.5 L 838.5 469.5 Z M 953.5 240.5 L 987.5 240.5 L 987.5 469.5 L 953.5 469.5 Z M 1086.5 240.5 L 1120.5 240.5 L 1120.5 469.5 L 1086.5 469.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 565.5 240.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface334">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,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 526.824219 790.320312 L 544.191406 815.5 L 536.449219 815.5 L 523.050781 795.035156 L 509.589844 815.5 L 501.980469 815.5 L 519.351562 790.320312 L 503.058594 766.421875 L 510.664062 766.421875 L 523.253906 785.675781 L 535.910156 766.421875 L 543.382812 766.421875 Z M 526.824219 790.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 502 307 L 541 307 M 502 269 L 541 269 M 502 269 L 502 307 M 541 269 L 541 307 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 502 307 L 541 307 M 502 269 L 541 269 M 541 307 L 541 269 M 502 307 L 502 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_2.svg b/cells/a41o/sky130_fd_sc_hs__a41o_2.svg
index 93fdfe6..230aa9c 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_2.svg
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1267.5 664.5 L 1301.5 664.5 L 1301.5 833.5 L 1267.5 833.5 Z M 515.5 664.5 L 549.5 664.5 L 549.5 833.5 L 515.5 833.5 Z M 604.5 664.5 L 639.5 664.5 L 639.5 833.5 L 604.5 833.5 Z M 735.5 664.5 L 769.5 664.5 L 769.5 833.5 L 735.5 833.5 Z M 882.5 664.5 L 916.5 664.5 L 916.5 833.5 L 882.5 833.5 Z M 1005.5 664.5 L 1040.5 664.5 L 1040.5 833.5 L 1005.5 833.5 Z M 1138.5 664.5 L 1173.5 664.5 L 1173.5 833.5 L 1138.5 833.5 Z M 1138.5 664.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1009.5 240.5 L 1043.5 240.5 L 1043.5 469.5 L 1009.5 469.5 Z M 509.5 240.5 L 544.5 240.5 L 544.5 469.5 L 509.5 469.5 Z M 906.5 240.5 L 940.5 240.5 L 940.5 469.5 L 906.5 469.5 Z M 738.5 240.5 L 773.5 240.5 L 773.5 469.5 L 738.5 469.5 Z M 635.5 240.5 L 670.5 240.5 L 670.5 469.5 L 635.5 469.5 Z M 1263.5 240.5 L 1298.5 240.5 L 1298.5 496.5 L 1263.5 496.5 Z M 1366.5 240.5 L 1401.5 240.5 L 1401.5 496.5 L 1366.5 496.5 Z M 1366.5 240.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface348">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -178,6 +178,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1240.824219 790.320312 L 1258.191406 815.5 L 1250.449219 815.5 L 1237.050781 795.035156 L 1223.589844 815.5 L 1215.980469 815.5 L 1233.351562 790.320312 L 1217.058594 766.421875 L 1224.664062 766.421875 L 1237.253906 785.675781 L 1249.910156 766.421875 L 1257.382812 766.421875 Z M 1240.824219 790.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1216 307 L 1255 307 M 1216 269 L 1255 269 M 1216 269 L 1216 307 M 1255 269 L 1255 307 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1216 307 L 1255 307 M 1216 269 L 1255 269 M 1255 307 L 1255 269 M 1216 307 L 1216 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41o/sky130_fd_sc_hs__a41o_4.svg b/cells/a41o/sky130_fd_sc_hs__a41o_4.svg
index af108c1..9090786 100644
--- a/cells/a41o/sky130_fd_sc_hs__a41o_4.svg
+++ b/cells/a41o/sky130_fd_sc_hs__a41o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.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 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.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 285.5 616.5 L 313.5 616.5 L 313.5 752.5 L 285.5 752.5 Z M 364.5 616.5 L 392.5 616.5 L 392.5 752.5 L 364.5 752.5 Z M 550.5 616.5 L 578.5 616.5 L 578.5 752.5 L 550.5 752.5 Z M 656.5 616.5 L 683.5 616.5 L 683.5 752.5 L 656.5 752.5 Z M 471.5 616.5 L 499.5 616.5 L 499.5 752.5 L 471.5 752.5 Z M 735.5 616.5 L 762.5 616.5 L 762.5 752.5 L 735.5 752.5 Z M 1110.5 638.5 L 1137.5 638.5 L 1137.5 774.5 L 1110.5 774.5 Z M 1031.5 638.5 L 1058.5 638.5 L 1058.5 774.5 L 1031.5 774.5 Z M 952.5 638.5 L 979.5 638.5 L 979.5 774.5 L 952.5 774.5 Z M 1368.5 638.5 L 1396.5 638.5 L 1396.5 774.5 L 1368.5 774.5 Z M 1526.5 638.5 L 1554.5 638.5 L 1554.5 774.5 L 1526.5 774.5 Z M 1605.5 638.5 L 1633.5 638.5 L 1633.5 774.5 L 1605.5 774.5 Z M 1189.5 638.5 L 1217.5 638.5 L 1217.5 774.5 L 1189.5 774.5 Z M 1447.5 638.5 L 1475.5 638.5 L 1475.5 774.5 L 1447.5 774.5 Z M 1447.5 638.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 1603.5 298.5 L 1630.5 298.5 L 1630.5 481.5 L 1603.5 481.5 Z M 288.5 298.5 L 316.5 298.5 L 316.5 481.5 L 288.5 481.5 Z M 380.5 298.5 L 408.5 298.5 L 408.5 481.5 L 380.5 481.5 Z M 1520.5 298.5 L 1547.5 298.5 L 1547.5 481.5 L 1520.5 481.5 Z M 1336.5 298.5 L 1364.5 298.5 L 1364.5 481.5 L 1336.5 481.5 Z M 910.5 298.5 L 937.5 298.5 L 937.5 481.5 L 910.5 481.5 Z M 1235.5 298.5 L 1262.5 298.5 L 1262.5 481.5 L 1235.5 481.5 Z M 1428.5 298.5 L 1455.5 298.5 L 1455.5 481.5 L 1428.5 481.5 Z M 1028.5 298.5 L 1056.5 298.5 L 1056.5 481.5 L 1028.5 481.5 Z M 1152.5 298.5 L 1180.5 298.5 L 1180.5 481.5 L 1152.5 481.5 Z M 731.5 298.5 L 759.5 298.5 L 759.5 504.5 L 731.5 504.5 Z M 648.5 298.5 L 676.5 298.5 L 676.5 504.5 L 648.5 504.5 Z M 566.5 298.5 L 593.5 298.5 L 593.5 504.5 L 566.5 504.5 Z M 814.5 298.5 L 841.5 298.5 L 841.5 504.5 L 814.5 504.5 Z M 814.5 298.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.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>
@@ -188,6 +188,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 786.886719 603.042969 L 801 623.5 L 794.707031 623.5 L 783.824219 606.871094 L 772.882812 623.5 L 766.703125 623.5 L 780.816406 603.042969 L 767.578125 583.625 L 773.757812 583.625 L 783.988281 599.269531 L 794.269531 583.625 L 800.34375 583.625 Z M 786.886719 603.042969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 767 491 L 798 491 M 767 460 L 798 460 M 767 460 L 767 491 M 798 460 L 798 491 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 767 491 L 798 491 M 767 460 L 798 460 M 798 491 L 798 460 M 767 491 L 767 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_1.svg b/cells/a41oi/sky130_fd_sc_hs__a41oi_1.svg
index cdf2cb5..c303fc7 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_1.svg
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 1211.5 664.5 L 1245.5 664.5 L 1245.5 833.5 L 1211.5 833.5 Z M 673.5 664.5 L 708.5 664.5 L 708.5 833.5 L 673.5 833.5 Z M 860.5 664.5 L 894.5 664.5 L 894.5 833.5 L 860.5 833.5 Z M 949.5 664.5 L 984.5 664.5 L 984.5 833.5 L 949.5 833.5 Z M 1080.5 664.5 L 1114.5 664.5 L 1114.5 833.5 L 1080.5 833.5 Z M 1080.5 664.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 1214.5 240.5 L 1248.5 240.5 L 1248.5 496.5 L 1214.5 496.5 Z M 675.5 240.5 L 710.5 240.5 L 710.5 496.5 L 675.5 496.5 Z M 790.5 240.5 L 824.5 240.5 L 824.5 496.5 L 790.5 496.5 Z M 983.5 240.5 L 1017.5 240.5 L 1017.5 496.5 L 983.5 496.5 Z M 1086.5 240.5 L 1120.5 240.5 L 1120.5 496.5 L 1086.5 496.5 Z M 1086.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -162,6 +162,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 986.511719 518.40625 L 984.292969 518.605469 L 982.40625 519.078125 L 980.859375 519.886719 L 979.578125 521.03125 L 978.636719 522.511719 L 977.960938 524.328125 L 977.761719 524.933594 L 977.625 525.609375 L 977.558594 526.28125 L 977.492188 527.089844 L 977.425781 527.828125 L 977.425781 528.636719 L 971.5 528.636719 L 971.769531 524.867188 L 972.644531 521.636719 L 973.921875 518.941406 L 975.808594 516.722656 L 978.097656 515.039062 L 980.992188 513.894531 L 981.800781 513.691406 L 982.675781 513.558594 L 983.550781 513.421875 L 985.433594 513.289062 L 986.445312 513.222656 L 988.9375 513.355469 L 991.292969 513.757812 L 993.378906 514.433594 L 995.265625 515.308594 L 996.878906 516.519531 L 998.292969 517.933594 L 999.101562 519.144531 L 999.773438 520.355469 L 1000.3125 521.703125 L 1000.648438 523.183594 L 1000.851562 524.734375 L 1000.988281 526.347656 L 1000.785156 528.703125 L 1000.246094 530.722656 L 999.304688 532.476562 L 998.023438 534.023438 L 996.339844 535.300781 L 994.320312 536.246094 L 996.003906 536.917969 L 997.484375 537.726562 L 998.765625 538.601562 L 999.84375 539.609375 L 1000.71875 540.753906 L 1001.390625 541.96875 L 1001.660156 542.773438 L 1001.929688 543.648438 L 1002.132812 544.59375 L 1002.265625 545.535156 L 1002.332031 546.542969 L 1002.402344 547.621094 L 1002.265625 549.910156 L 1001.863281 551.996094 L 1001.1875 553.882812 L 1000.3125 555.699219 L 999.167969 557.316406 L 997.753906 558.730469 L 996.207031 559.875 L 994.523438 560.816406 L 992.707031 561.488281 L 990.6875 562.027344 L 988.53125 562.367188 L 986.242188 562.5 L 982.609375 562.230469 L 979.511719 561.421875 L 976.820312 560.210938 L 974.597656 558.394531 L 972.847656 556.105469 L 971.632812 553.277344 L 971.296875 552.402344 L 971.097656 551.390625 L 970.894531 550.382812 L 970.691406 549.371094 L 970.558594 548.296875 L 970.488281 547.082031 L 976.414062 547.082031 L 976.683594 549.507812 L 977.222656 551.59375 L 978.03125 553.34375 L 979.105469 554.757812 L 980.453125 555.902344 L 982.136719 556.644531 L 982.742188 556.84375 L 983.414062 556.980469 L 984.089844 557.113281 L 984.828125 557.179688 L 985.570312 557.25 L 986.445312 557.25 L 988.261719 557.179688 L 989.945312 556.84375 L 991.425781 556.304688 L 992.773438 555.566406 L 993.917969 554.554688 L 994.859375 553.34375 L 995.265625 552.605469 L 995.667969 551.730469 L 995.9375 550.785156 L 996.140625 549.84375 L 996.273438 548.832031 L 996.339844 547.6875 L 996.070312 545.265625 L 995.398438 543.246094 L 994.253906 541.5625 L 992.640625 540.351562 L 990.550781 539.542969 L 987.992188 539.070312 L 986.648438 539.070312 L 986.445312 539.003906 L 983.953125 539.070312 L 983.214844 539.070312 L 983.214844 534.023438 L 985.234375 533.957031 L 987.050781 533.820312 L 988.667969 533.621094 L 990.011719 533.351562 L 991.15625 533.011719 L 992.167969 532.542969 L 992.976562 531.9375 L 993.648438 531.128906 L 994.1875 530.253906 L 994.589844 529.175781 L 994.792969 527.964844 L 994.929688 526.550781 L 994.792969 525.070312 L 994.523438 523.65625 L 994.050781 522.445312 L 993.378906 521.367188 L 992.503906 520.425781 L 991.425781 519.617188 L 990.6875 519.28125 L 989.878906 518.941406 L 989.136719 518.742188 L 988.261719 518.539062 Z M 986.511719 518.40625 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 942 562 L 981 562 M 942 523 L 981 523 M 942 523 L 942 562 M 981 523 L 981 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 942 562 L 981 562 M 942 523 L 981 523 M 981 562 L 981 523 M 942 562 L 942 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_2.svg b/cells/a41oi/sky130_fd_sc_hs__a41oi_2.svg
index 127b0ec..2b5c9c6 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_2.svg
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 412.5 652.5 L 446.5 652.5 L 446.5 822.5 L 412.5 822.5 Z M 1484.5 664.5 L 1519.5 664.5 L 1519.5 833.5 L 1484.5 833.5 Z M 1374.5 664.5 L 1409.5 664.5 L 1409.5 833.5 L 1374.5 833.5 Z M 1276.5 664.5 L 1310.5 664.5 L 1310.5 833.5 L 1276.5 833.5 Z M 1177.5 664.5 L 1212.5 664.5 L 1212.5 833.5 L 1177.5 833.5 Z M 950.5 664.5 L 985.5 664.5 L 985.5 833.5 L 950.5 833.5 Z M 852.5 664.5 L 886.5 664.5 L 886.5 833.5 L 852.5 833.5 Z M 737.5 664.5 L 772.5 664.5 L 772.5 833.5 L 737.5 833.5 Z M 639.5 664.5 L 673.5 664.5 L 673.5 833.5 L 639.5 833.5 Z M 639.5 664.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1481.5 240.5 L 1515.5 240.5 L 1515.5 496.5 L 1481.5 496.5 Z M 398.5 240.5 L 432.5 240.5 L 432.5 496.5 L 398.5 496.5 Z M 513.5 240.5 L 547.5 240.5 L 547.5 496.5 L 513.5 496.5 Z M 627.5 240.5 L 662.5 240.5 L 662.5 496.5 L 627.5 496.5 Z M 797.5 240.5 L 831.5 240.5 L 831.5 496.5 L 797.5 496.5 Z M 900.5 240.5 L 934.5 240.5 L 934.5 496.5 L 900.5 496.5 Z M 1026.5 240.5 L 1060.5 240.5 L 1060.5 496.5 L 1026.5 496.5 Z M 1129.5 240.5 L 1164.5 240.5 L 1164.5 496.5 L 1129.5 496.5 Z M 1255.5 240.5 L 1290.5 240.5 L 1290.5 496.5 L 1255.5 496.5 Z M 1378.5 240.5 L 1412.5 240.5 L 1412.5 496.5 L 1378.5 496.5 Z M 1378.5 240.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface320">
+<g id="surface349">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -178,6 +178,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 493.773438 527.503906 L 483.203125 527.503906 L 483.203125 523.261719 L 485.019531 523.058594 L 486.636719 522.789062 L 488.050781 522.453125 L 489.261719 522.183594 L 490.269531 521.847656 L 491.148438 521.445312 L 491.820312 521.039062 L 492.425781 520.570312 L 492.964844 520.03125 L 493.503906 519.355469 L 493.972656 518.617188 L 494.445312 517.742188 L 494.648438 517.269531 L 494.847656 516.730469 L 495.050781 516.125 L 495.320312 515.386719 L 495.523438 514.644531 L 495.792969 513.769531 L 499.695312 513.769531 L 499.695312 561.5 L 493.773438 561.5 Z M 493.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 445 562 L 484 562 M 445 523 L 484 523 M 445 523 L 445 562 M 484 523 L 484 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 445 562 L 484 562 M 445 523 L 484 523 M 484 562 L 484 523 M 445 562 L 445 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/a41oi/sky130_fd_sc_hs__a41oi_4.svg b/cells/a41oi/sky130_fd_sc_hs__a41oi_4.svg
index 6fb5520..6e762fa 100644
--- a/cells/a41oi/sky130_fd_sc_hs__a41oi_4.svg
+++ b/cells/a41oi/sky130_fd_sc_hs__a41oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.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 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.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 1630.5 618.5 L 1652.5 618.5 L 1652.5 729.5 L 1630.5 729.5 Z M 266.5 618.5 L 289.5 618.5 L 289.5 729.5 L 266.5 729.5 Z M 341.5 618.5 L 364.5 618.5 L 364.5 729.5 L 341.5 729.5 Z M 490.5 618.5 L 512.5 618.5 L 512.5 729.5 L 490.5 729.5 Z M 565.5 618.5 L 587.5 618.5 L 587.5 729.5 L 565.5 729.5 Z M 680.5 618.5 L 703.5 618.5 L 703.5 729.5 L 680.5 729.5 Z M 745.5 618.5 L 767.5 618.5 L 767.5 729.5 L 745.5 729.5 Z M 820.5 618.5 L 842.5 618.5 L 842.5 729.5 L 820.5 729.5 Z M 895.5 618.5 L 917.5 618.5 L 917.5 729.5 L 895.5 729.5 Z M 959.5 618.5 L 982.5 618.5 L 982.5 729.5 L 959.5 729.5 Z M 1024.5 618.5 L 1046.5 618.5 L 1046.5 729.5 L 1024.5 729.5 Z M 1172.5 618.5 L 1195.5 618.5 L 1195.5 729.5 L 1172.5 729.5 Z M 1237.5 618.5 L 1259.5 618.5 L 1259.5 729.5 L 1237.5 729.5 Z M 1301.5 618.5 L 1324.5 618.5 L 1324.5 729.5 L 1301.5 729.5 Z M 1366.5 618.5 L 1388.5 618.5 L 1388.5 729.5 L 1366.5 729.5 Z M 1430.5 618.5 L 1453.5 618.5 L 1453.5 729.5 L 1430.5 729.5 Z M 1495.5 618.5 L 1517.5 618.5 L 1517.5 729.5 L 1495.5 729.5 Z M 1559.5 618.5 L 1582.5 618.5 L 1582.5 729.5 L 1559.5 729.5 Z M 1559.5 618.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 1627.5 341.5 L 1650.5 341.5 L 1650.5 509.5 L 1627.5 509.5 Z M 268.5 341.5 L 291.5 341.5 L 291.5 509.5 L 268.5 509.5 Z M 343.5 341.5 L 365.5 341.5 L 365.5 509.5 L 343.5 509.5 Z M 418.5 341.5 L 440.5 341.5 L 440.5 509.5 L 418.5 509.5 Z M 485.5 341.5 L 508.5 341.5 L 508.5 509.5 L 485.5 509.5 Z M 553.5 341.5 L 575.5 341.5 L 575.5 509.5 L 553.5 509.5 Z M 635.5 341.5 L 658.5 341.5 L 658.5 509.5 L 635.5 509.5 Z M 703.5 341.5 L 725.5 341.5 L 725.5 509.5 L 703.5 509.5 Z M 778.5 341.5 L 801.5 341.5 L 801.5 509.5 L 778.5 509.5 Z M 846.5 341.5 L 868.5 341.5 L 868.5 509.5 L 846.5 509.5 Z M 922.5 341.5 L 945.5 341.5 L 945.5 509.5 L 922.5 509.5 Z M 990.5 341.5 L 1012.5 341.5 L 1012.5 509.5 L 990.5 509.5 Z M 1065.5 341.5 L 1087.5 341.5 L 1087.5 509.5 L 1065.5 509.5 Z M 1132.5 341.5 L 1155.5 341.5 L 1155.5 509.5 L 1132.5 509.5 Z M 1207.5 341.5 L 1230.5 341.5 L 1230.5 509.5 L 1207.5 509.5 Z M 1275.5 341.5 L 1297.5 341.5 L 1297.5 509.5 L 1275.5 509.5 Z M 1350.5 341.5 L 1372.5 341.5 L 1372.5 509.5 L 1350.5 509.5 Z M 1425.5 341.5 L 1447.5 341.5 L 1447.5 509.5 L 1425.5 509.5 Z M 1492.5 341.5 L 1515.5 341.5 L 1515.5 509.5 L 1492.5 509.5 Z M 1560.5 341.5 L 1582.5 341.5 L 1582.5 509.5 L 1560.5 509.5 Z M 1560.5 341.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.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>
@@ -206,6 +206,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 401.71875 529.542969 L 394.890625 529.542969 L 394.890625 526.804688 L 396.066406 526.675781 L 397.109375 526.5 L 398.023438 526.28125 L 398.804688 526.109375 L 399.457031 525.890625 L 400.023438 525.628906 L 400.457031 525.371094 L 400.847656 525.066406 L 401.195312 524.71875 L 401.542969 524.28125 L 401.847656 523.804688 L 402.152344 523.238281 L 402.28125 522.933594 L 402.414062 522.585938 L 402.542969 522.195312 L 402.71875 521.71875 L 402.847656 521.238281 L 403.023438 520.675781 L 405.542969 520.675781 L 405.542969 551.5 L 401.71875 551.5 Z M 401.71875 529.542969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 370 557 L 396 557 M 370 531 L 396 531 M 370 531 L 370 557 M 396 531 L 396 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 557 L 396 557 M 370 531 L 396 531 M 396 557 L 396 531 M 370 557 L 370 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2/sky130_fd_sc_hs__and2_1.svg b/cells/and2/sky130_fd_sc_hs__and2_1.svg
index 8b28b14..dcd4429 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_1.svg
+++ b/cells/and2/sky130_fd_sc_hs__and2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 818.5 616.5 L 852.5 616.5 L 852.5 762.5 L 818.5 762.5 Z M 948.5 634.5 L 983.5 634.5 L 983.5 781.5 L 948.5 781.5 Z M 1081.5 634.5 L 1115.5 634.5 L 1115.5 804.5 L 1081.5 804.5 Z M 1081.5 634.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 956.5 240.5 L 991.5 240.5 L 991.5 432.5 L 956.5 432.5 Z M 842.5 240.5 L 876.5 240.5 L 876.5 432.5 L 842.5 432.5 Z M 1079.5 240.5 L 1113.5 240.5 L 1113.5 496.5 L 1079.5 496.5 Z M 1079.5 240.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface279">
+<g id="surface307">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,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 1187.824219 282.320312 L 1205.191406 307.5 L 1197.449219 307.5 L 1184.050781 287.035156 L 1170.589844 307.5 L 1162.980469 307.5 L 1180.351562 282.320312 L 1164.058594 258.421875 L 1171.664062 258.421875 L 1184.253906 277.675781 L 1196.910156 258.421875 L 1204.382812 258.421875 Z M 1187.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1164 816 L 1203 816 M 1164 777 L 1203 777 M 1164 777 L 1164 816 M 1203 777 L 1203 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1164 816 L 1203 816 M 1164 777 L 1203 777 M 1203 816 L 1203 777 M 1164 816 L 1164 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2/sky130_fd_sc_hs__and2_2.svg b/cells/and2/sky130_fd_sc_hs__and2_2.svg
index 26e8756..84d7018 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_2.svg
+++ b/cells/and2/sky130_fd_sc_hs__and2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1094.5 664.5 L 1128.5 664.5 L 1128.5 833.5 L 1094.5 833.5 Z M 789.5 664.5 L 823.5 664.5 L 823.5 833.5 L 789.5 833.5 Z M 878.5 664.5 L 913.5 664.5 L 913.5 833.5 L 878.5 833.5 Z M 995.5 664.5 L 1030.5 664.5 L 1030.5 833.5 L 995.5 833.5 Z M 995.5 664.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 889.5 240.5 L 923.5 240.5 L 923.5 469.5 L 889.5 469.5 Z M 785.5 240.5 L 820.5 240.5 L 820.5 469.5 L 785.5 469.5 Z M 1107.5 240.5 L 1142.5 240.5 L 1142.5 496.5 L 1107.5 496.5 Z M 1004.5 240.5 L 1039.5 240.5 L 1039.5 496.5 L 1004.5 496.5 Z M 1004.5 240.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1077.824219 282.320312 L 1095.191406 307.5 L 1087.449219 307.5 L 1074.050781 287.035156 L 1060.589844 307.5 L 1052.980469 307.5 L 1070.351562 282.320312 L 1054.058594 258.421875 L 1061.664062 258.421875 L 1074.253906 277.675781 L 1086.910156 258.421875 L 1094.382812 258.421875 Z M 1077.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1054 816 L 1093 816 M 1054 777 L 1093 777 M 1054 777 L 1054 816 M 1093 777 L 1093 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1054 816 L 1093 816 M 1054 777 L 1093 777 M 1093 816 L 1093 777 M 1054 816 L 1054 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2/sky130_fd_sc_hs__and2_4.svg b/cells/and2/sky130_fd_sc_hs__and2_4.svg
index e937f97..72a76ef 100644
--- a/cells/and2/sky130_fd_sc_hs__and2_4.svg
+++ b/cells/and2/sky130_fd_sc_hs__and2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 1326.5 635.5 L 1361.5 635.5 L 1361.5 782.5 L 1326.5 782.5 Z M 1223.5 635.5 L 1258.5 635.5 L 1258.5 782.5 L 1223.5 782.5 Z M 1010.5 635.5 L 1044.5 635.5 L 1044.5 782.5 L 1010.5 782.5 Z M 1114.5 635.5 L 1149.5 635.5 L 1149.5 782.5 L 1114.5 782.5 Z M 893.5 635.5 L 928.5 635.5 L 928.5 805.5 L 893.5 805.5 Z M 563.5 635.5 L 598.5 635.5 L 598.5 805.5 L 563.5 805.5 Z M 760.5 635.5 L 795.5 635.5 L 795.5 805.5 L 760.5 805.5 Z M 662.5 635.5 L 696.5 635.5 L 696.5 805.5 L 662.5 805.5 Z M 662.5 635.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 1002.5 257.5 L 1036.5 257.5 L 1036.5 449.5 L 1002.5 449.5 Z M 1323.5 257.5 L 1357.5 257.5 L 1357.5 449.5 L 1323.5 449.5 Z M 1220.5 257.5 L 1254.5 257.5 L 1254.5 449.5 L 1220.5 449.5 Z M 1111.5 257.5 L 1145.5 257.5 L 1145.5 449.5 L 1111.5 449.5 Z M 669.5 240.5 L 703.5 240.5 L 703.5 496.5 L 669.5 496.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 772.5 240.5 L 806.5 240.5 L 806.5 496.5 L 772.5 496.5 Z M 879.5 240.5 L 914.5 240.5 L 914.5 496.5 L 879.5 496.5 Z M 879.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -148,6 +148,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 1093.441406 547.496094 L 1093.304688 549.652344 L 1092.96875 551.605469 L 1092.363281 553.421875 L 1091.554688 555.039062 L 1090.480469 556.585938 L 1089.199219 557.933594 L 1087.785156 559.078125 L 1086.304688 559.953125 L 1084.621094 560.625 L 1082.871094 561.164062 L 1080.988281 561.433594 L 1078.96875 561.5 L 1056.820312 561.5 L 1056.820312 512.421875 L 1076.746094 512.421875 L 1079.640625 512.625 L 1082.199219 513.097656 L 1084.488281 513.902344 L 1086.441406 515.046875 L 1088.121094 516.53125 L 1089.46875 518.347656 L 1090.007812 519.355469 L 1090.480469 520.433594 L 1090.816406 521.445312 L 1091.085938 522.589844 L 1091.21875 523.734375 L 1091.285156 524.878906 L 1091.085938 527.300781 L 1090.480469 529.386719 L 1089.535156 531.339844 L 1088.191406 532.957031 L 1086.507812 534.4375 L 1084.488281 535.582031 L 1086.441406 536.457031 L 1088.121094 537.398438 L 1089.605469 538.476562 L 1090.816406 539.6875 L 1091.757812 540.96875 L 1092.5 542.3125 L 1092.769531 543.121094 L 1092.96875 543.929688 L 1093.171875 544.738281 L 1093.304688 545.679688 L 1093.375 546.554688 Z M 1085.027344 525.753906 L 1084.824219 523.734375 L 1084.21875 522.050781 L 1083.277344 520.570312 L 1081.929688 519.492188 L 1080.246094 518.683594 L 1078.160156 518.144531 L 1077.6875 518.144531 L 1077.214844 518.078125 L 1076.746094 518.011719 L 1075.667969 518.011719 L 1075.195312 517.941406 L 1063.078125 517.941406 L 1063.078125 533.5625 L 1075.195312 533.5625 L 1077.6875 533.425781 L 1079.84375 533.023438 L 1081.660156 532.28125 L 1083.007812 531.273438 L 1084.082031 529.925781 L 1084.757812 528.3125 L 1084.824219 527.972656 L 1084.957031 527.167969 L 1084.957031 526.222656 Z M 1078.359375 555.980469 L 1080.246094 555.914062 L 1081.929688 555.507812 L 1083.410156 554.835938 L 1084.621094 553.960938 L 1085.632812 552.816406 L 1086.441406 551.402344 L 1086.640625 550.863281 L 1086.777344 550.257812 L 1086.976562 549.585938 L 1087.046875 548.976562 L 1087.113281 548.304688 L 1087.179688 547.566406 L 1087.046875 546.082031 L 1086.777344 544.667969 L 1086.304688 543.457031 L 1085.632812 542.3125 L 1084.757812 541.371094 L 1083.746094 540.496094 L 1083.007812 540.09375 L 1082.199219 539.753906 L 1081.324219 539.484375 L 1080.378906 539.285156 L 1079.371094 539.148438 L 1078.359375 539.082031 L 1063.078125 539.082031 L 1063.078125 555.980469 Z M 1078.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_1.svg b/cells/and2b/sky130_fd_sc_hs__and2b_1.svg
index 1a206e4..7f327be 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_1.svg
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 947.5 659.5 L 981.5 659.5 L 981.5 806.5 L 947.5 806.5 Z M 1036.5 659.5 L 1071.5 659.5 L 1071.5 806.5 L 1036.5 806.5 Z M 1216.5 659.5 L 1251.5 659.5 L 1251.5 829.5 L 1216.5 829.5 Z M 673.5 707.5 L 708.5 707.5 L 708.5 833.5 L 673.5 833.5 Z M 673.5 707.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1181.5 240.5 L 1215.5 240.5 L 1215.5 496.5 L 1181.5 496.5 Z M 840.5 304.5 L 875.5 304.5 L 875.5 496.5 L 840.5 496.5 Z M 1047.5 304.5 L 1081.5 304.5 L 1081.5 496.5 L 1047.5 496.5 Z M 944.5 304.5 L 978.5 304.5 L 978.5 496.5 L 944.5 496.5 Z M 944.5 304.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface292">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1296.824219 282.320312 L 1314.191406 307.5 L 1306.449219 307.5 L 1293.050781 287.035156 L 1279.589844 307.5 L 1271.980469 307.5 L 1289.351562 282.320312 L 1273.058594 258.421875 L 1280.664062 258.421875 L 1293.253906 277.675781 L 1305.910156 258.421875 L 1313.382812 258.421875 Z M 1296.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 816 L 1311 816 M 1272 777 L 1311 777 M 1272 777 L 1272 816 M 1311 777 L 1311 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 816 L 1311 816 M 1272 777 L 1311 777 M 1311 816 L 1311 777 M 1272 816 L 1272 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_2.svg b/cells/and2b/sky130_fd_sc_hs__and2b_2.svg
index f56da3b..8493d95 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_2.svg
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1121.5 664.5 L 1156.5 664.5 L 1156.5 833.5 L 1121.5 833.5 Z M 673.5 707.5 L 708.5 707.5 L 708.5 833.5 L 673.5 833.5 Z M 1211.5 664.5 L 1245.5 664.5 L 1245.5 833.5 L 1211.5 833.5 Z M 902.5 664.5 L 937.5 664.5 L 937.5 833.5 L 902.5 833.5 Z M 804.5 664.5 L 838.5 664.5 L 838.5 833.5 L 804.5 833.5 Z M 804.5 664.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1111.5 256.5 L 1145.5 256.5 L 1145.5 485.5 L 1111.5 485.5 Z M 1214.5 256.5 L 1248.5 256.5 L 1248.5 485.5 L 1214.5 485.5 Z M 818.5 240.5 L 852.5 240.5 L 852.5 496.5 L 818.5 496.5 Z M 921.5 240.5 L 955.5 240.5 L 955.5 496.5 L 921.5 496.5 Z M 675.5 304.5 L 710.5 304.5 L 710.5 496.5 L 675.5 496.5 Z M 675.5 304.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface277">
+<g id="surface306">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -150,6 +150,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 696.1875 512.574219 L 696.1875 561.652344 L 689.121094 561.652344 L 663.738281 521.863281 L 663.738281 561.652344 L 657.816406 561.652344 L 657.816406 512.574219 L 664.613281 512.574219 L 690.265625 552.699219 L 690.265625 512.574219 Z M 696.1875 512.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 612 562 L 651 562 M 612 523 L 651 523 M 612 523 L 612 562 M 651 523 L 651 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 612 562 L 651 562 M 612 523 L 651 523 M 651 562 L 651 523 M 612 562 L 612 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and2b/sky130_fd_sc_hs__and2b_4.svg b/cells/and2b/sky130_fd_sc_hs__and2b_4.svg
index 7038c4d..8cb52ed 100644
--- a/cells/and2b/sky130_fd_sc_hs__and2b_4.svg
+++ b/cells/and2b/sky130_fd_sc_hs__and2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1172.5 664.5 L 1206.5 664.5 L 1206.5 833.5 L 1172.5 833.5 Z M 758.5 687.5 L 792.5 687.5 L 792.5 833.5 L 758.5 833.5 Z M 643.5 687.5 L 678.5 687.5 L 678.5 833.5 L 643.5 833.5 Z M 529.5 687.5 L 563.5 687.5 L 563.5 833.5 L 529.5 833.5 Z M 856.5 687.5 L 891.5 687.5 L 891.5 833.5 L 856.5 833.5 Z M 960.5 687.5 L 994.5 687.5 L 994.5 833.5 L 960.5 833.5 Z M 1071.5 664.5 L 1105.5 664.5 L 1105.5 833.5 L 1071.5 833.5 Z M 1377.5 664.5 L 1411.5 664.5 L 1411.5 833.5 L 1377.5 833.5 Z M 1278.5 664.5 L 1313.5 664.5 L 1313.5 833.5 L 1278.5 833.5 Z M 1278.5 664.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 952.5 240.5 L 986.5 240.5 L 986.5 432.5 L 952.5 432.5 Z M 626.5 240.5 L 661.5 240.5 L 661.5 432.5 L 626.5 432.5 Z M 848.5 240.5 L 883.5 240.5 L 883.5 432.5 L 848.5 432.5 Z M 729.5 240.5 L 764.5 240.5 L 764.5 432.5 L 729.5 432.5 Z M 507.5 240.5 L 541.5 240.5 L 541.5 469.5 L 507.5 469.5 Z M 1277.5 240.5 L 1311.5 240.5 L 1311.5 496.5 L 1277.5 496.5 Z M 1380.5 240.5 L 1415.5 240.5 L 1415.5 496.5 L 1380.5 496.5 Z M 1071.5 240.5 L 1105.5 240.5 L 1105.5 496.5 L 1071.5 496.5 Z M 1174.5 240.5 L 1208.5 240.5 L 1208.5 496.5 L 1174.5 496.5 Z M 1174.5 240.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,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 1460.824219 621.320312 L 1478.191406 646.5 L 1470.449219 646.5 L 1457.050781 626.035156 L 1443.589844 646.5 L 1435.980469 646.5 L 1453.351562 621.320312 L 1437.058594 597.421875 L 1444.664062 597.421875 L 1457.253906 616.675781 L 1469.910156 597.421875 L 1477.382812 597.421875 Z M 1460.824219 621.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1436 477 L 1475 477 M 1436 438 L 1475 438 M 1436 438 L 1436 477 M 1475 438 L 1475 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1436 477 L 1475 477 M 1436 438 L 1475 438 M 1475 477 L 1475 438 M 1436 477 L 1436 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3/sky130_fd_sc_hs__and3_1.svg b/cells/and3/sky130_fd_sc_hs__and3_1.svg
index c9e366f..124714d 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_1.svg
+++ b/cells/and3/sky130_fd_sc_hs__and3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 737.5 616.5 L 772.5 616.5 L 772.5 762.5 L 737.5 762.5 Z M 866.5 616.5 L 900.5 616.5 L 900.5 762.5 L 866.5 762.5 Z M 975.5 634.5 L 1009.5 634.5 L 1009.5 781.5 L 975.5 781.5 Z M 1107.5 634.5 L 1142.5 634.5 L 1142.5 804.5 L 1107.5 804.5 Z M 1107.5 634.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 858.5 270.5 L 892.5 270.5 L 892.5 462.5 L 858.5 462.5 Z M 732.5 270.5 L 766.5 270.5 L 766.5 462.5 L 732.5 462.5 Z M 961.5 270.5 L 995.5 270.5 L 995.5 462.5 L 961.5 462.5 Z M 1160.5 240.5 L 1195.5 240.5 L 1195.5 496.5 L 1160.5 496.5 Z M 1160.5 240.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,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 1242.824219 282.320312 L 1260.191406 307.5 L 1252.449219 307.5 L 1239.050781 287.035156 L 1225.589844 307.5 L 1217.980469 307.5 L 1235.351562 282.320312 L 1219.058594 258.421875 L 1226.664062 258.421875 L 1239.253906 277.675781 L 1251.910156 258.421875 L 1259.382812 258.421875 Z M 1242.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1219 816 L 1258 816 M 1219 777 L 1258 777 M 1219 777 L 1219 816 M 1258 777 L 1258 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1219 816 L 1258 816 M 1219 777 L 1258 777 M 1258 816 L 1258 777 M 1219 816 L 1219 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3/sky130_fd_sc_hs__and3_2.svg b/cells/and3/sky130_fd_sc_hs__and3_2.svg
index c93d2c2..ad843d3 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_2.svg
+++ b/cells/and3/sky130_fd_sc_hs__and3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 695.5 616.5 L 729.5 616.5 L 729.5 762.5 L 695.5 762.5 Z M 826.5 616.5 L 860.5 616.5 L 860.5 762.5 L 826.5 762.5 Z M 915.5 616.5 L 949.5 616.5 L 949.5 762.5 L 915.5 762.5 Z M 1048.5 655.5 L 1082.5 655.5 L 1082.5 824.5 L 1048.5 824.5 Z M 1156.5 655.5 L 1190.5 655.5 L 1190.5 824.5 L 1156.5 824.5 Z M 1156.5 655.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 925.5 286.5 L 960.5 286.5 L 960.5 478.5 L 925.5 478.5 Z M 822.5 286.5 L 856.5 286.5 L 856.5 478.5 L 822.5 478.5 Z M 691.5 286.5 L 726.5 286.5 L 726.5 478.5 L 691.5 478.5 Z M 1090.5 240.5 L 1125.5 240.5 L 1125.5 496.5 L 1090.5 496.5 Z M 1193.5 240.5 L 1228.5 240.5 L 1228.5 496.5 L 1193.5 496.5 Z M 1193.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -160,6 +160,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 873.441406 547.496094 L 873.304688 549.652344 L 872.96875 551.605469 L 872.363281 553.421875 L 871.554688 555.039062 L 870.480469 556.585938 L 869.199219 557.933594 L 867.785156 559.078125 L 866.304688 559.953125 L 864.621094 560.625 L 862.871094 561.164062 L 860.988281 561.433594 L 858.96875 561.5 L 836.820312 561.5 L 836.820312 512.421875 L 856.746094 512.421875 L 859.640625 512.625 L 862.199219 513.097656 L 864.488281 513.902344 L 866.441406 515.046875 L 868.121094 516.53125 L 869.46875 518.347656 L 870.007812 519.355469 L 870.480469 520.433594 L 870.816406 521.445312 L 871.085938 522.589844 L 871.21875 523.734375 L 871.285156 524.878906 L 871.085938 527.300781 L 870.480469 529.386719 L 869.535156 531.339844 L 868.191406 532.957031 L 866.507812 534.4375 L 864.488281 535.582031 L 866.441406 536.457031 L 868.121094 537.398438 L 869.605469 538.476562 L 870.816406 539.6875 L 871.757812 540.96875 L 872.5 542.3125 L 872.769531 543.121094 L 872.96875 543.929688 L 873.171875 544.738281 L 873.304688 545.679688 L 873.375 546.554688 Z M 865.027344 525.753906 L 864.824219 523.734375 L 864.21875 522.050781 L 863.277344 520.570312 L 861.929688 519.492188 L 860.246094 518.683594 L 858.160156 518.144531 L 857.6875 518.144531 L 857.214844 518.078125 L 856.746094 518.011719 L 855.667969 518.011719 L 855.195312 517.941406 L 843.078125 517.941406 L 843.078125 533.5625 L 855.195312 533.5625 L 857.6875 533.425781 L 859.84375 533.023438 L 861.660156 532.28125 L 863.007812 531.273438 L 864.082031 529.925781 L 864.757812 528.3125 L 864.824219 527.972656 L 864.957031 527.167969 L 864.957031 526.222656 Z M 858.359375 555.980469 L 860.246094 555.914062 L 861.929688 555.507812 L 863.410156 554.835938 L 864.621094 553.960938 L 865.632812 552.816406 L 866.441406 551.402344 L 866.640625 550.863281 L 866.777344 550.257812 L 866.976562 549.585938 L 867.046875 548.976562 L 867.113281 548.304688 L 867.179688 547.566406 L 867.046875 546.082031 L 866.777344 544.667969 L 866.304688 543.457031 L 865.632812 542.3125 L 864.757812 541.371094 L 863.746094 540.496094 L 863.007812 540.09375 L 862.199219 539.753906 L 861.324219 539.484375 L 860.378906 539.285156 L 859.371094 539.148438 L 858.359375 539.082031 L 843.078125 539.082031 L 843.078125 555.980469 Z M 858.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 832 562 L 871 562 M 832 523 L 871 523 M 832 523 L 832 562 M 871 523 L 871 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 832 562 L 871 562 M 832 523 L 871 523 M 871 562 L 871 523 M 832 562 L 832 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3/sky130_fd_sc_hs__and3_4.svg b/cells/and3/sky130_fd_sc_hs__and3_4.svg
index 7958941..c20690b 100644
--- a/cells/and3/sky130_fd_sc_hs__and3_4.svg
+++ b/cells/and3/sky130_fd_sc_hs__and3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 399.5 664.5 L 434.5 664.5 L 434.5 833.5 L 399.5 833.5 Z M 1476.5 687.5 L 1511.5 687.5 L 1511.5 833.5 L 1476.5 833.5 Z M 1357.5 687.5 L 1392.5 687.5 L 1392.5 833.5 L 1357.5 833.5 Z M 1259.5 687.5 L 1293.5 687.5 L 1293.5 833.5 L 1259.5 833.5 Z M 1151.5 687.5 L 1185.5 687.5 L 1185.5 833.5 L 1151.5 833.5 Z M 924.5 687.5 L 958.5 687.5 L 958.5 833.5 L 924.5 833.5 Z M 826.5 687.5 L 860.5 687.5 L 860.5 833.5 L 826.5 833.5 Z M 711.5 664.5 L 745.5 664.5 L 745.5 833.5 L 711.5 833.5 Z M 612.5 664.5 L 647.5 664.5 L 647.5 833.5 L 612.5 833.5 Z M 498.5 664.5 L 532.5 664.5 L 532.5 833.5 L 498.5 833.5 Z M 498.5 664.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1475.5 240.5 L 1510.5 240.5 L 1510.5 432.5 L 1475.5 432.5 Z M 1372.5 240.5 L 1407.5 240.5 L 1407.5 432.5 L 1372.5 432.5 Z M 1143.5 240.5 L 1177.5 240.5 L 1177.5 432.5 L 1143.5 432.5 Z M 960.5 240.5 L 994.5 240.5 L 994.5 432.5 L 960.5 432.5 Z M 1255.5 240.5 L 1290.5 240.5 L 1290.5 432.5 L 1255.5 432.5 Z M 856.5 240.5 L 891.5 240.5 L 891.5 432.5 L 856.5 432.5 Z M 501.5 240.5 L 536.5 240.5 L 536.5 496.5 L 501.5 496.5 Z M 398.5 240.5 L 432.5 240.5 L 432.5 496.5 L 398.5 496.5 Z M 730.5 240.5 L 765.5 240.5 L 765.5 496.5 L 730.5 496.5 Z M 627.5 240.5 L 662.5 240.5 L 662.5 496.5 L 627.5 496.5 Z M 627.5 240.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -175,6 +175,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 995.730469 536.984375 L 995.796875 534.292969 L 996.066406 531.667969 L 996.539062 529.175781 L 997.144531 526.753906 L 997.953125 524.464844 L 999.03125 522.242188 L 1000.714844 519.347656 L 1002.800781 516.855469 L 1005.15625 514.835938 L 1007.847656 513.222656 L 1010.8125 512.078125 L 1014.175781 511.335938 L 1014.785156 511.269531 L 1015.457031 511.203125 L 1016.0625 511.132812 L 1017.410156 511.132812 L 1018.148438 511.066406 L 1022.457031 511.402344 L 1026.226562 512.414062 L 1029.460938 514.027344 L 1032.152344 516.316406 L 1034.304688 519.210938 L 1035.988281 522.78125 L 1036.394531 524.125 L 1036.59375 524.867188 L 1036.730469 525.609375 L 1036.863281 526.347656 L 1037.066406 527.089844 L 1030.671875 527.089844 L 1029.996094 524.734375 L 1029.121094 522.714844 L 1028.046875 520.960938 L 1026.632812 519.480469 L 1025.082031 518.335938 L 1023.265625 517.460938 L 1022.390625 517.191406 L 1021.449219 516.992188 L 1020.503906 516.855469 L 1019.496094 516.722656 L 1018.484375 516.652344 L 1017.410156 516.585938 L 1015.050781 516.789062 L 1012.898438 517.261719 L 1010.878906 518 L 1009.0625 519.144531 L 1007.378906 520.558594 L 1005.964844 522.242188 L 1004.753906 524.195312 L 1003.742188 526.347656 L 1002.933594 528.703125 L 1002.394531 531.261719 L 1002.058594 534.023438 L 1001.992188 536.917969 L 1002.058594 540.082031 L 1002.464844 542.910156 L 1003.136719 545.601562 L 1004.078125 547.957031 L 1005.292969 550.179688 L 1006.773438 552.066406 L 1008.253906 553.613281 L 1009.867188 554.824219 L 1011.621094 555.769531 L 1013.570312 556.441406 L 1015.660156 556.84375 L 1017.949219 556.980469 L 1020.371094 556.84375 L 1022.59375 556.375 L 1024.613281 555.566406 L 1026.296875 554.421875 L 1027.777344 552.941406 L 1029.054688 551.121094 L 1029.59375 550.046875 L 1030.066406 548.832031 L 1030.535156 547.554688 L 1030.941406 546.140625 L 1031.277344 544.660156 L 1031.613281 543.042969 L 1038.078125 543.042969 L 1036.863281 549.035156 L 1034.84375 553.882812 L 1031.882812 557.652344 L 1028.113281 560.347656 L 1023.402344 561.894531 L 1017.878906 562.5 L 1013.976562 562.230469 L 1010.476562 561.421875 L 1007.3125 560.210938 L 1004.484375 558.394531 L 1001.992188 556.039062 L 999.90625 553.140625 L 998.695312 551.054688 L 997.683594 548.765625 L 996.875 546.34375 L 996.269531 543.785156 L 995.867188 541.09375 L 995.730469 538.265625 Z M 995.730469 536.984375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 995 562 L 1034 562 M 995 523 L 1034 523 M 995 523 L 995 562 M 1034 523 L 1034 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 995 562 L 1034 562 M 995 523 L 1034 523 M 1034 562 L 1034 523 M 995 562 L 995 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_1.svg b/cells/and3b/sky130_fd_sc_hs__and3b_1.svg
index b59d80c..65d7597 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_1.svg
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1105.5 664.5 L 1140.5 664.5 L 1140.5 810.5 L 1105.5 810.5 Z M 892.5 664.5 L 926.5 664.5 L 926.5 810.5 L 892.5 810.5 Z M 981.5 664.5 L 1016.5 664.5 L 1016.5 810.5 L 981.5 810.5 Z M 1269.5 664.5 L 1303.5 664.5 L 1303.5 833.5 L 1269.5 833.5 Z M 618.5 707.5 L 653.5 707.5 L 653.5 833.5 L 618.5 833.5 Z M 618.5 707.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 622.5 240.5 L 656.5 240.5 L 656.5 432.5 L 622.5 432.5 Z M 894.5 304.5 L 929.5 304.5 L 929.5 496.5 L 894.5 496.5 Z M 1123.5 304.5 L 1158.5 304.5 L 1158.5 496.5 L 1123.5 496.5 Z M 1019.5 304.5 L 1054.5 304.5 L 1054.5 496.5 L 1019.5 496.5 Z M 1258.5 240.5 L 1292.5 240.5 L 1292.5 496.5 L 1258.5 496.5 Z M 1258.5 240.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,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 1038.441406 547.496094 L 1038.304688 549.652344 L 1037.96875 551.605469 L 1037.363281 553.421875 L 1036.554688 555.039062 L 1035.480469 556.585938 L 1034.199219 557.933594 L 1032.785156 559.078125 L 1031.304688 559.953125 L 1029.621094 560.625 L 1027.871094 561.164062 L 1025.988281 561.433594 L 1023.96875 561.5 L 1001.820312 561.5 L 1001.820312 512.421875 L 1021.746094 512.421875 L 1024.640625 512.625 L 1027.199219 513.097656 L 1029.488281 513.902344 L 1031.441406 515.046875 L 1033.121094 516.53125 L 1034.46875 518.347656 L 1035.007812 519.355469 L 1035.480469 520.433594 L 1035.816406 521.445312 L 1036.085938 522.589844 L 1036.21875 523.734375 L 1036.285156 524.878906 L 1036.085938 527.300781 L 1035.480469 529.386719 L 1034.535156 531.339844 L 1033.191406 532.957031 L 1031.507812 534.4375 L 1029.488281 535.582031 L 1031.441406 536.457031 L 1033.121094 537.398438 L 1034.605469 538.476562 L 1035.816406 539.6875 L 1036.757812 540.96875 L 1037.5 542.3125 L 1037.769531 543.121094 L 1037.96875 543.929688 L 1038.171875 544.738281 L 1038.304688 545.679688 L 1038.375 546.554688 Z M 1030.027344 525.753906 L 1029.824219 523.734375 L 1029.21875 522.050781 L 1028.277344 520.570312 L 1026.929688 519.492188 L 1025.246094 518.683594 L 1023.160156 518.144531 L 1022.6875 518.144531 L 1022.214844 518.078125 L 1021.746094 518.011719 L 1020.667969 518.011719 L 1020.195312 517.941406 L 1008.078125 517.941406 L 1008.078125 533.5625 L 1020.195312 533.5625 L 1022.6875 533.425781 L 1024.84375 533.023438 L 1026.660156 532.28125 L 1028.007812 531.273438 L 1029.082031 529.925781 L 1029.757812 528.3125 L 1029.824219 527.972656 L 1029.957031 527.167969 L 1029.957031 526.222656 Z M 1023.359375 555.980469 L 1025.246094 555.914062 L 1026.929688 555.507812 L 1028.410156 554.835938 L 1029.621094 553.960938 L 1030.632812 552.816406 L 1031.441406 551.402344 L 1031.640625 550.863281 L 1031.777344 550.257812 L 1031.976562 549.585938 L 1032.046875 548.976562 L 1032.113281 548.304688 L 1032.179688 547.566406 L 1032.046875 546.082031 L 1031.777344 544.667969 L 1031.304688 543.457031 L 1030.632812 542.3125 L 1029.757812 541.371094 L 1028.746094 540.496094 L 1028.007812 540.09375 L 1027.199219 539.753906 L 1026.324219 539.484375 L 1025.378906 539.285156 L 1024.371094 539.148438 L 1023.359375 539.082031 L 1008.078125 539.082031 L 1008.078125 555.980469 Z M 1023.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 997 562 L 1036 562 M 997 523 L 1036 523 M 997 523 L 997 562 M 1036 523 L 1036 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 997 562 L 1036 562 M 997 523 L 1036 523 M 1036 562 L 1036 523 M 997 562 L 997 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_2.svg b/cells/and3b/sky130_fd_sc_hs__and3b_2.svg
index 52042a9..1b8781d 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_2.svg
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 563.5 691.5 L 598.5 691.5 L 598.5 817.5 L 563.5 817.5 Z M 953.5 664.5 L 987.5 664.5 L 987.5 833.5 L 953.5 833.5 Z M 1313.5 664.5 L 1347.5 664.5 L 1347.5 833.5 L 1313.5 833.5 Z M 1083.5 664.5 L 1118.5 664.5 L 1118.5 833.5 L 1083.5 833.5 Z M 1214.5 664.5 L 1248.5 664.5 L 1248.5 833.5 L 1214.5 833.5 Z M 863.5 664.5 L 898.5 664.5 L 898.5 833.5 L 863.5 833.5 Z M 863.5 664.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 565.5 240.5 L 600.5 240.5 L 600.5 432.5 L 565.5 432.5 Z M 860.5 267.5 L 894.5 267.5 L 894.5 496.5 L 860.5 496.5 Z M 991.5 267.5 L 1025.5 267.5 L 1025.5 496.5 L 991.5 496.5 Z M 1094.5 267.5 L 1128.5 267.5 L 1128.5 496.5 L 1094.5 496.5 Z M 1217.5 240.5 L 1252.5 240.5 L 1252.5 496.5 L 1217.5 496.5 Z M 1324.5 240.5 L 1358.5 240.5 L 1358.5 496.5 L 1324.5 496.5 Z M 1324.5 240.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1296.824219 536.320312 L 1314.191406 561.5 L 1306.449219 561.5 L 1293.050781 541.035156 L 1279.589844 561.5 L 1271.980469 561.5 L 1289.351562 536.320312 L 1273.058594 512.421875 L 1280.664062 512.421875 L 1293.253906 531.675781 L 1305.910156 512.421875 L 1313.382812 512.421875 Z M 1296.824219 536.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 562 L 1311 562 M 1272 523 L 1311 523 M 1272 523 L 1272 562 M 1311 523 L 1311 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 562 L 1311 562 M 1272 523 L 1311 523 M 1311 562 L 1311 523 M 1272 562 L 1272 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and3b/sky130_fd_sc_hs__and3b_4.svg b/cells/and3b/sky130_fd_sc_hs__and3b_4.svg
index 3875801..90f8d7a 100644
--- a/cells/and3b/sky130_fd_sc_hs__and3b_4.svg
+++ b/cells/and3b/sky130_fd_sc_hs__and3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 127.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 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#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 844.5 655.5 L 877.5 655.5 L 877.5 796.5 L 844.5 796.5 Z M 543.5 655.5 L 577.5 655.5 L 577.5 796.5 L 543.5 796.5 Z M 733.5 655.5 L 767.5 655.5 L 767.5 796.5 L 733.5 796.5 Z M 638.5 655.5 L 672.5 655.5 L 672.5 796.5 L 638.5 796.5 Z M 1063.5 659.5 L 1096.5 659.5 L 1096.5 800.5 L 1063.5 800.5 Z M 1158.5 659.5 L 1191.5 659.5 L 1191.5 800.5 L 1158.5 800.5 Z M 1575.5 659.5 L 1608.5 659.5 L 1608.5 823.5 L 1575.5 823.5 Z M 1381.5 659.5 L 1414.5 659.5 L 1414.5 823.5 L 1381.5 823.5 Z M 309.5 681.5 L 342.5 681.5 L 342.5 823.5 L 309.5 823.5 Z M 1270.5 659.5 L 1303.5 659.5 L 1303.5 823.5 L 1270.5 823.5 Z M 1480.5 659.5 L 1513.5 659.5 L 1513.5 823.5 L 1480.5 823.5 Z M 1480.5 659.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 1296.5 250.5 L 1329.5 250.5 L 1329.5 498.5 L 1296.5 498.5 Z M 612.5 277.5 L 645.5 277.5 L 645.5 498.5 L 612.5 498.5 Z M 512.5 277.5 L 546.5 277.5 L 546.5 498.5 L 512.5 498.5 Z M 391.5 277.5 L 424.5 277.5 L 424.5 498.5 L 391.5 498.5 Z M 733.5 277.5 L 767.5 277.5 L 767.5 498.5 L 733.5 498.5 Z M 1067.5 277.5 L 1100.5 277.5 L 1100.5 498.5 L 1067.5 498.5 Z M 968.5 277.5 L 1001.5 277.5 L 1001.5 498.5 L 968.5 498.5 Z M 833.5 277.5 L 866.5 277.5 L 866.5 498.5 L 833.5 498.5 Z M 1196.5 250.5 L 1229.5 250.5 L 1229.5 498.5 L 1196.5 498.5 Z M 1517.5 250.5 L 1550.5 250.5 L 1550.5 498.5 L 1517.5 498.5 Z M 1417.5 250.5 L 1450.5 250.5 L 1450.5 498.5 L 1417.5 498.5 Z M 1417.5 250.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.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>
@@ -156,6 +156,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 435.953125 595.113281 L 435.953125 642.144531 L 429.175781 642.144531 L 404.855469 604.015625 L 404.855469 642.144531 L 399.175781 642.144531 L 399.175781 595.113281 L 405.695312 595.113281 L 430.273438 633.566406 L 430.273438 595.113281 Z M 435.953125 595.113281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 357 480 L 394 480 M 357 442 L 394 442 M 357 442 L 357 480 M 394 442 L 394 480 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 357 480 L 394 480 M 357 442 L 394 442 M 394 480 L 394 442 M 357 480 L 357 442 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4/sky130_fd_sc_hs__and4_1.svg b/cells/and4/sky130_fd_sc_hs__and4_1.svg
index e62c88f..cc0c741 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_1.svg
+++ b/cells/and4/sky130_fd_sc_hs__and4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 1174.5 664.5 L 1208.5 664.5 L 1208.5 833.5 L 1174.5 833.5 Z M 837.5 687.5 L 871.5 687.5 L 871.5 833.5 L 837.5 833.5 Z M 1057.5 687.5 L 1091.5 687.5 L 1091.5 833.5 L 1057.5 833.5 Z M 926.5 687.5 L 961.5 687.5 L 961.5 833.5 L 926.5 833.5 Z M 748.5 687.5 L 782.5 687.5 L 782.5 833.5 L 748.5 833.5 Z M 748.5 687.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 1079.5 240.5 L 1113.5 240.5 L 1113.5 432.5 L 1079.5 432.5 Z M 687.5 240.5 L 721.5 240.5 L 721.5 432.5 L 687.5 432.5 Z M 801.5 240.5 L 836.5 240.5 L 836.5 432.5 L 801.5 432.5 Z M 964.5 240.5 L 999.5 240.5 L 999.5 432.5 L 964.5 432.5 Z M 1213.5 240.5 L 1247.5 240.5 L 1247.5 496.5 L 1213.5 496.5 Z M 1213.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -178,6 +178,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 1296.824219 706.320312 L 1314.191406 731.5 L 1306.449219 731.5 L 1293.050781 711.035156 L 1279.589844 731.5 L 1271.980469 731.5 L 1289.351562 706.320312 L 1273.058594 682.421875 L 1280.664062 682.421875 L 1293.253906 701.675781 L 1305.910156 682.421875 L 1313.382812 682.421875 Z M 1296.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 392 L 1311 392 M 1272 353 L 1311 353 M 1272 353 L 1272 392 M 1311 353 L 1311 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 392 L 1311 392 M 1272 353 L 1311 353 M 1311 392 L 1311 353 M 1272 392 L 1272 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4/sky130_fd_sc_hs__and4_2.svg b/cells/and4/sky130_fd_sc_hs__and4_2.svg
index 0fda767..5b4269b 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_2.svg
+++ b/cells/and4/sky130_fd_sc_hs__and4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1231.5 664.5 L 1266.5 664.5 L 1266.5 833.5 L 1231.5 833.5 Z M 651.5 664.5 L 686.5 664.5 L 686.5 833.5 L 651.5 833.5 Z M 741.5 664.5 L 775.5 664.5 L 775.5 833.5 L 741.5 833.5 Z M 871.5 664.5 L 906.5 664.5 L 906.5 833.5 L 871.5 833.5 Z M 1002.5 664.5 L 1036.5 664.5 L 1036.5 833.5 L 1002.5 833.5 Z M 1133.5 664.5 L 1167.5 664.5 L 1167.5 833.5 L 1133.5 833.5 Z M 1133.5 664.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 999.5 240.5 L 1033.5 240.5 L 1033.5 469.5 L 999.5 469.5 Z M 895.5 240.5 L 930.5 240.5 L 930.5 469.5 L 895.5 469.5 Z M 744.5 240.5 L 779.5 240.5 L 779.5 469.5 L 744.5 469.5 Z M 641.5 240.5 L 675.5 240.5 L 675.5 469.5 L 641.5 469.5 Z M 1141.5 240.5 L 1175.5 240.5 L 1175.5 496.5 L 1141.5 496.5 Z M 1244.5 240.5 L 1278.5 240.5 L 1278.5 496.5 L 1244.5 496.5 Z M 1244.5 240.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -175,6 +175,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1241.824219 451.320312 L 1259.191406 476.5 L 1251.449219 476.5 L 1238.050781 456.035156 L 1224.589844 476.5 L 1216.980469 476.5 L 1234.351562 451.320312 L 1218.058594 427.421875 L 1225.664062 427.421875 L 1238.253906 446.675781 L 1250.910156 427.421875 L 1258.382812 427.421875 Z M 1241.824219 451.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1217 647 L 1256 647 M 1217 608 L 1256 608 M 1217 608 L 1217 647 M 1256 608 L 1256 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1217 647 L 1256 647 M 1217 608 L 1256 608 M 1256 647 L 1256 608 M 1217 647 L 1217 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4/sky130_fd_sc_hs__and4_4.svg b/cells/and4/sky130_fd_sc_hs__and4_4.svg
index 8101be0..cbf0a6e 100644
--- a/cells/and4/sky130_fd_sc_hs__and4_4.svg
+++ b/cells/and4/sky130_fd_sc_hs__and4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 315.5 631.5 L 348.5 631.5 L 348.5 773.5 L 315.5 773.5 Z M 410.5 631.5 L 443.5 631.5 L 443.5 773.5 L 410.5 773.5 Z M 600.5 631.5 L 633.5 631.5 L 633.5 773.5 L 600.5 773.5 Z M 1015.5 631.5 L 1048.5 631.5 L 1048.5 773.5 L 1015.5 773.5 Z M 695.5 631.5 L 728.5 631.5 L 728.5 773.5 L 695.5 773.5 Z M 505.5 631.5 L 538.5 631.5 L 538.5 773.5 L 505.5 773.5 Z M 920.5 631.5 L 953.5 631.5 L 953.5 773.5 L 920.5 773.5 Z M 790.5 631.5 L 823.5 631.5 L 823.5 773.5 L 790.5 773.5 Z M 1351.5 659.5 L 1384.5 659.5 L 1384.5 823.5 L 1351.5 823.5 Z M 1461.5 659.5 L 1495.5 659.5 L 1495.5 823.5 L 1461.5 823.5 Z M 1556.5 659.5 L 1590.5 659.5 L 1590.5 823.5 L 1556.5 823.5 Z M 1249.5 659.5 L 1282.5 659.5 L 1282.5 823.5 L 1249.5 823.5 Z M 1249.5 659.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1129.5 250.5 L 1162.5 250.5 L 1162.5 471.5 L 1129.5 471.5 Z M 723.5 250.5 L 757.5 250.5 L 757.5 471.5 L 723.5 471.5 Z M 411.5 250.5 L 444.5 250.5 L 444.5 471.5 L 411.5 471.5 Z M 613.5 250.5 L 646.5 250.5 L 646.5 471.5 L 613.5 471.5 Z M 510.5 250.5 L 543.5 250.5 L 543.5 471.5 L 510.5 471.5 Z M 1018.5 250.5 L 1052.5 250.5 L 1052.5 471.5 L 1018.5 471.5 Z M 823.5 250.5 L 856.5 250.5 L 856.5 471.5 L 823.5 471.5 Z M 311.5 250.5 L 345.5 250.5 L 345.5 471.5 L 311.5 471.5 Z M 1463.5 250.5 L 1496.5 250.5 L 1496.5 498.5 L 1463.5 498.5 Z M 1363.5 250.5 L 1396.5 250.5 L 1396.5 498.5 L 1363.5 498.5 Z M 1253.5 250.5 L 1286.5 250.5 L 1286.5 498.5 L 1253.5 498.5 Z M 1562.5 250.5 L 1595.5 250.5 L 1595.5 498.5 L 1562.5 498.5 Z M 1562.5 250.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1652.726562 618.371094 L 1669.371094 642.5 L 1661.953125 642.5 L 1649.113281 622.886719 L 1636.210938 642.5 L 1628.917969 642.5 L 1645.566406 618.371094 L 1629.953125 595.46875 L 1637.242188 595.46875 L 1649.304688 613.917969 L 1661.433594 595.46875 L 1668.597656 595.46875 Z M 1652.726562 618.371094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1629 480 L 1667 480 M 1629 442 L 1667 442 M 1629 442 L 1629 480 M 1667 442 L 1667 480 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1629 480 L 1667 480 M 1629 442 L 1667 442 M 1667 480 L 1667 442 M 1629 480 L 1629 442 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_1.svg b/cells/and4b/sky130_fd_sc_hs__and4b_1.svg
index 60a7050..7f40938 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_1.svg
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 474.5 L 423.5 474.5 Z M 1205.5 474.5 L 1501.5 474.5 L 1501.5 538.5 L 1205.5 538.5 Z M 423.5 474.5 L 781.5 474.5 L 781.5 538.5 L 423.5 538.5 Z M 423.5 474.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1035.5 612.5 L 1070.5 612.5 L 1070.5 759.5 L 1035.5 759.5 Z M 946.5 612.5 L 980.5 612.5 L 980.5 759.5 L 946.5 759.5 Z M 837.5 629.5 L 871.5 629.5 L 871.5 776.5 L 837.5 776.5 Z M 1193.5 634.5 L 1228.5 634.5 L 1228.5 781.5 L 1193.5 781.5 Z M 1326.5 634.5 L 1361.5 634.5 L 1361.5 804.5 L 1326.5 804.5 Z M 563.5 707.5 L 598.5 707.5 L 598.5 833.5 L 563.5 833.5 Z M 563.5 707.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1173.5 240.5 L 1207.5 240.5 L 1207.5 432.5 L 1173.5 432.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 432.5 L 565.5 432.5 Z M 691.5 240.5 L 726.5 240.5 L 726.5 432.5 L 691.5 432.5 Z M 813.5 240.5 L 847.5 240.5 L 847.5 432.5 L 813.5 432.5 Z M 1058.5 240.5 L 1093.5 240.5 L 1093.5 432.5 L 1058.5 432.5 Z M 1324.5 240.5 L 1358.5 240.5 L 1358.5 496.5 L 1324.5 496.5 Z M 1324.5 240.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,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 983.441406 547.496094 L 983.304688 549.652344 L 982.96875 551.605469 L 982.363281 553.421875 L 981.554688 555.039062 L 980.480469 556.585938 L 979.199219 557.933594 L 977.785156 559.078125 L 976.304688 559.953125 L 974.621094 560.625 L 972.871094 561.164062 L 970.988281 561.433594 L 968.96875 561.5 L 946.820312 561.5 L 946.820312 512.421875 L 966.746094 512.421875 L 969.640625 512.625 L 972.199219 513.097656 L 974.488281 513.902344 L 976.441406 515.046875 L 978.121094 516.53125 L 979.46875 518.347656 L 980.007812 519.355469 L 980.480469 520.433594 L 980.816406 521.445312 L 981.085938 522.589844 L 981.21875 523.734375 L 981.285156 524.878906 L 981.085938 527.300781 L 980.480469 529.386719 L 979.535156 531.339844 L 978.191406 532.957031 L 976.507812 534.4375 L 974.488281 535.582031 L 976.441406 536.457031 L 978.121094 537.398438 L 979.605469 538.476562 L 980.816406 539.6875 L 981.757812 540.96875 L 982.5 542.3125 L 982.769531 543.121094 L 982.96875 543.929688 L 983.171875 544.738281 L 983.304688 545.679688 L 983.375 546.554688 Z M 975.027344 525.753906 L 974.824219 523.734375 L 974.21875 522.050781 L 973.277344 520.570312 L 971.929688 519.492188 L 970.246094 518.683594 L 968.160156 518.144531 L 967.6875 518.144531 L 967.214844 518.078125 L 966.746094 518.011719 L 965.667969 518.011719 L 965.195312 517.941406 L 953.078125 517.941406 L 953.078125 533.5625 L 965.195312 533.5625 L 967.6875 533.425781 L 969.84375 533.023438 L 971.660156 532.28125 L 973.007812 531.273438 L 974.082031 529.925781 L 974.757812 528.3125 L 974.824219 527.972656 L 974.957031 527.167969 L 974.957031 526.222656 Z M 968.359375 555.980469 L 970.246094 555.914062 L 971.929688 555.507812 L 973.410156 554.835938 L 974.621094 553.960938 L 975.632812 552.816406 L 976.441406 551.402344 L 976.640625 550.863281 L 976.777344 550.257812 L 976.976562 549.585938 L 977.046875 548.976562 L 977.113281 548.304688 L 977.179688 547.566406 L 977.046875 546.082031 L 976.777344 544.667969 L 976.304688 543.457031 L 975.632812 542.3125 L 974.757812 541.371094 L 973.746094 540.496094 L 973.007812 540.09375 L 972.199219 539.753906 L 971.324219 539.484375 L 970.378906 539.285156 L 969.371094 539.148438 L 968.359375 539.082031 L 953.078125 539.082031 L 953.078125 555.980469 Z M 968.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 942 562 L 981 562 M 942 523 L 981 523 M 942 523 L 942 562 M 981 523 L 981 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 942 562 L 981 562 M 942 523 L 981 523 M 981 562 L 981 523 M 942 562 L 942 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_2.svg b/cells/and4b/sky130_fd_sc_hs__and4b_2.svg
index 34366bd..ccd6168 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_2.svg
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 563.5 664.5 L 598.5 664.5 L 598.5 790.5 L 563.5 790.5 Z M 1048.5 664.5 L 1082.5 664.5 L 1082.5 833.5 L 1048.5 833.5 Z M 680.5 664.5 L 714.5 664.5 L 714.5 833.5 L 680.5 833.5 Z M 779.5 664.5 L 813.5 664.5 L 813.5 833.5 L 779.5 833.5 Z M 958.5 664.5 L 993.5 664.5 L 993.5 833.5 L 958.5 833.5 Z M 1295.5 664.5 L 1330.5 664.5 L 1330.5 833.5 L 1295.5 833.5 Z M 1172.5 664.5 L 1206.5 664.5 L 1206.5 833.5 L 1172.5 833.5 Z M 1172.5 664.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 793.5 240.5 L 828.5 240.5 L 828.5 496.5 L 793.5 496.5 Z M 565.5 304.5 L 600.5 304.5 L 600.5 496.5 L 565.5 496.5 Z M 1299.5 267.5 L 1333.5 267.5 L 1333.5 496.5 L 1299.5 496.5 Z M 1044.5 267.5 L 1079.5 267.5 L 1079.5 496.5 L 1044.5 496.5 Z M 936.5 267.5 L 970.5 267.5 L 970.5 496.5 L 936.5 496.5 Z M 1187.5 267.5 L 1221.5 267.5 L 1221.5 496.5 L 1187.5 496.5 Z M 690.5 240.5 L 725.5 240.5 L 725.5 496.5 L 690.5 496.5 Z M 690.5 240.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface284">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -156,6 +156,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 1203.441406 547.496094 L 1203.304688 549.652344 L 1202.96875 551.605469 L 1202.363281 553.421875 L 1201.554688 555.039062 L 1200.480469 556.585938 L 1199.199219 557.933594 L 1197.785156 559.078125 L 1196.304688 559.953125 L 1194.621094 560.625 L 1192.871094 561.164062 L 1190.988281 561.433594 L 1188.96875 561.5 L 1166.820312 561.5 L 1166.820312 512.421875 L 1186.746094 512.421875 L 1189.640625 512.625 L 1192.199219 513.097656 L 1194.488281 513.902344 L 1196.441406 515.046875 L 1198.121094 516.53125 L 1199.46875 518.347656 L 1200.007812 519.355469 L 1200.480469 520.433594 L 1200.816406 521.445312 L 1201.085938 522.589844 L 1201.21875 523.734375 L 1201.285156 524.878906 L 1201.085938 527.300781 L 1200.480469 529.386719 L 1199.535156 531.339844 L 1198.191406 532.957031 L 1196.507812 534.4375 L 1194.488281 535.582031 L 1196.441406 536.457031 L 1198.121094 537.398438 L 1199.605469 538.476562 L 1200.816406 539.6875 L 1201.757812 540.96875 L 1202.5 542.3125 L 1202.769531 543.121094 L 1202.96875 543.929688 L 1203.171875 544.738281 L 1203.304688 545.679688 L 1203.375 546.554688 Z M 1195.027344 525.753906 L 1194.824219 523.734375 L 1194.21875 522.050781 L 1193.277344 520.570312 L 1191.929688 519.492188 L 1190.246094 518.683594 L 1188.160156 518.144531 L 1187.6875 518.144531 L 1187.214844 518.078125 L 1186.746094 518.011719 L 1185.667969 518.011719 L 1185.195312 517.941406 L 1173.078125 517.941406 L 1173.078125 533.5625 L 1185.195312 533.5625 L 1187.6875 533.425781 L 1189.84375 533.023438 L 1191.660156 532.28125 L 1193.007812 531.273438 L 1194.082031 529.925781 L 1194.757812 528.3125 L 1194.824219 527.972656 L 1194.957031 527.167969 L 1194.957031 526.222656 Z M 1188.359375 555.980469 L 1190.246094 555.914062 L 1191.929688 555.507812 L 1193.410156 554.835938 L 1194.621094 553.960938 L 1195.632812 552.816406 L 1196.441406 551.402344 L 1196.640625 550.863281 L 1196.777344 550.257812 L 1196.976562 549.585938 L 1197.046875 548.976562 L 1197.113281 548.304688 L 1197.179688 547.566406 L 1197.046875 546.082031 L 1196.777344 544.667969 L 1196.304688 543.457031 L 1195.632812 542.3125 L 1194.757812 541.371094 L 1193.746094 540.496094 L 1193.007812 540.09375 L 1192.199219 539.753906 L 1191.324219 539.484375 L 1190.378906 539.285156 L 1189.371094 539.148438 L 1188.359375 539.082031 L 1173.078125 539.082031 L 1173.078125 555.980469 Z M 1188.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1162 562 L 1201 562 M 1162 523 L 1201 523 M 1162 523 L 1162 562 M 1201 523 L 1201 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1162 562 L 1201 562 M 1162 523 L 1201 523 M 1201 562 L 1201 523 M 1162 562 L 1162 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4b/sky130_fd_sc_hs__and4b_4.svg b/cells/and4b/sky130_fd_sc_hs__and4b_4.svg
index 3682dd6..0b5b8cd 100644
--- a/cells/and4b/sky130_fd_sc_hs__and4b_4.svg
+++ b/cells/and4b/sky130_fd_sc_hs__and4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 537.5 L 174.5 537.5 Z M 174.5 175.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 211.5 812.5 L 1706.5 812.5 L 1706.5 860.5 L 211.5 860.5 Z M 211.5 812.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 1455.5 614.5 L 1484.5 614.5 L 1484.5 738.5 L 1455.5 738.5 Z M 1582.5 614.5 L 1611.5 614.5 L 1611.5 738.5 L 1582.5 738.5 Z M 1288.5 614.5 L 1317.5 614.5 L 1317.5 738.5 L 1288.5 738.5 Z M 1120.5 614.5 L 1149.5 614.5 L 1149.5 738.5 L 1120.5 738.5 Z M 1204.5 614.5 L 1233.5 614.5 L 1233.5 738.5 L 1204.5 738.5 Z M 1371.5 614.5 L 1401.5 614.5 L 1401.5 738.5 L 1371.5 738.5 Z M 913.5 614.5 L 942.5 614.5 L 942.5 738.5 L 913.5 738.5 Z M 1005.5 614.5 L 1035.5 614.5 L 1035.5 738.5 L 1005.5 738.5 Z M 301.5 644.5 L 330.5 644.5 L 330.5 769.5 L 301.5 769.5 Z M 492.5 644.5 L 522.5 644.5 L 522.5 788.5 L 492.5 788.5 Z M 617.5 644.5 L 646.5 644.5 L 646.5 788.5 L 617.5 788.5 Z M 409.5 644.5 L 438.5 644.5 L 438.5 788.5 L 409.5 788.5 Z M 701.5 644.5 L 730.5 644.5 L 730.5 788.5 L 701.5 788.5 Z M 701.5 644.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 1460.5 284.5 L 1489.5 284.5 L 1489.5 478.5 L 1460.5 478.5 Z M 997.5 284.5 L 1026.5 284.5 L 1026.5 478.5 L 997.5 478.5 Z M 1193.5 284.5 L 1222.5 284.5 L 1222.5 478.5 L 1193.5 478.5 Z M 1285.5 284.5 L 1314.5 284.5 L 1314.5 478.5 L 1285.5 478.5 Z M 1372.5 284.5 L 1402.5 284.5 L 1402.5 478.5 L 1372.5 478.5 Z M 805.5 284.5 L 834.5 284.5 L 834.5 478.5 L 805.5 478.5 Z M 1548.5 284.5 L 1577.5 284.5 L 1577.5 478.5 L 1548.5 478.5 Z M 893.5 284.5 L 922.5 284.5 L 922.5 478.5 L 893.5 478.5 Z M 408.5 284.5 L 437.5 284.5 L 437.5 502.5 L 408.5 502.5 Z M 495.5 284.5 L 525.5 284.5 L 525.5 502.5 L 495.5 502.5 Z M 295.5 307.5 L 324.5 307.5 L 324.5 502.5 L 295.5 502.5 Z M 589.5 284.5 L 618.5 284.5 L 618.5 502.5 L 589.5 502.5 Z M 698.5 284.5 L 727.5 284.5 L 727.5 502.5 L 698.5 502.5 Z M 698.5 284.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 241.5 195.5 L 274.5 195.5 L 274.5 228.5 L 241.5 228.5 Z M 1643.5 195.5 L 1676.5 195.5 L 1676.5 228.5 L 1643.5 228.5 Z M 1550.5 195.5 L 1583.5 195.5 L 1583.5 228.5 L 1550.5 228.5 Z M 1456.5 195.5 L 1489.5 195.5 L 1489.5 228.5 L 1456.5 228.5 Z M 1363.5 195.5 L 1396.5 195.5 L 1396.5 228.5 L 1363.5 228.5 Z M 1269.5 195.5 L 1302.5 195.5 L 1302.5 228.5 L 1269.5 228.5 Z M 1176.5 195.5 L 1209.5 195.5 L 1209.5 228.5 L 1176.5 228.5 Z M 1082.5 195.5 L 1115.5 195.5 L 1115.5 228.5 L 1082.5 228.5 Z M 989.5 195.5 L 1022.5 195.5 L 1022.5 228.5 L 989.5 228.5 Z M 895.5 195.5 L 929.5 195.5 L 929.5 228.5 L 895.5 228.5 Z M 802.5 195.5 L 835.5 195.5 L 835.5 228.5 L 802.5 228.5 Z M 709.5 195.5 L 742.5 195.5 L 742.5 228.5 L 709.5 228.5 Z M 615.5 195.5 L 648.5 195.5 L 648.5 228.5 L 615.5 228.5 Z M 522.5 195.5 L 555.5 195.5 L 555.5 228.5 L 522.5 228.5 Z M 428.5 195.5 L 461.5 195.5 L 461.5 228.5 L 428.5 228.5 Z M 335.5 195.5 L 368.5 195.5 L 368.5 228.5 L 335.5 228.5 Z M 241.5 843.5 L 274.5 843.5 L 274.5 877.5 L 241.5 877.5 Z M 1643.5 843.5 L 1676.5 843.5 L 1676.5 877.5 L 1643.5 877.5 Z M 1550.5 843.5 L 1583.5 843.5 L 1583.5 877.5 L 1550.5 877.5 Z M 1456.5 843.5 L 1489.5 843.5 L 1489.5 877.5 L 1456.5 877.5 Z M 1363.5 843.5 L 1396.5 843.5 L 1396.5 877.5 L 1363.5 877.5 Z M 1269.5 843.5 L 1302.5 843.5 L 1302.5 877.5 L 1269.5 877.5 Z M 1176.5 843.5 L 1209.5 843.5 L 1209.5 877.5 L 1176.5 877.5 Z M 1082.5 843.5 L 1115.5 843.5 L 1115.5 877.5 L 1082.5 877.5 Z M 989.5 843.5 L 1022.5 843.5 L 1022.5 877.5 L 989.5 877.5 Z M 895.5 843.5 L 929.5 843.5 L 929.5 877.5 L 895.5 877.5 Z M 802.5 843.5 L 835.5 843.5 L 835.5 877.5 L 802.5 877.5 Z M 709.5 843.5 L 742.5 843.5 L 742.5 877.5 L 709.5 877.5 Z M 615.5 843.5 L 648.5 843.5 L 648.5 877.5 L 615.5 877.5 Z M 522.5 843.5 L 555.5 843.5 L 555.5 877.5 L 522.5 877.5 Z M 428.5 843.5 L 461.5 843.5 L 461.5 877.5 L 428.5 877.5 Z M 335.5 843.5 L 368.5 843.5 L 368.5 877.5 L 335.5 877.5 Z M 335.5 843.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>
@@ -174,6 +174,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 448.984375 463.992188 L 463.820312 485.5 L 457.207031 485.5 L 445.765625 468.019531 L 434.261719 485.5 L 427.765625 485.5 L 442.601562 463.992188 L 428.683594 443.578125 L 435.183594 443.578125 L 445.9375 460.027344 L 456.746094 443.578125 L 463.128906 443.578125 Z M 448.984375 463.992188 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 428 632 L 461 632 M 428 599 L 461 599 M 428 599 L 428 632 M 461 599 L 461 632 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 428 632 L 461 632 M 428 599 L 461 599 M 461 632 L 461 599 M 428 632 L 428 599 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 214 L 211 223 M 206 219 L 215 219 M 210 220 L 212 220 M 210 218 L 212 218 M 210 218 L 210 220 M 212 218 L 212 220 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_1.svg b/cells/and4bb/sky130_fd_sc_hs__and4bb_1.svg
index 2936c96..838ffba 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_1.svg
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1380.5 687.5 L 1415.5 687.5 L 1415.5 813.5 L 1380.5 813.5 Z M 507.5 707.5 L 541.5 707.5 L 541.5 833.5 L 507.5 833.5 Z M 898.5 687.5 L 932.5 687.5 L 932.5 833.5 L 898.5 833.5 Z M 1118.5 687.5 L 1152.5 687.5 L 1152.5 833.5 L 1118.5 833.5 Z M 987.5 687.5 L 1022.5 687.5 L 1022.5 833.5 L 987.5 833.5 Z M 616.5 664.5 L 650.5 664.5 L 650.5 833.5 L 616.5 833.5 Z M 1235.5 687.5 L 1269.5 687.5 L 1269.5 833.5 L 1235.5 833.5 Z M 1235.5 687.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 1238.5 240.5 L 1272.5 240.5 L 1272.5 432.5 L 1238.5 432.5 Z M 1009.5 240.5 L 1043.5 240.5 L 1043.5 432.5 L 1009.5 432.5 Z M 1369.5 240.5 L 1403.5 240.5 L 1403.5 432.5 L 1369.5 432.5 Z M 1135.5 240.5 L 1169.5 240.5 L 1169.5 432.5 L 1135.5 432.5 Z M 894.5 240.5 L 929.5 240.5 L 929.5 432.5 L 894.5 432.5 Z M 632.5 240.5 L 666.5 240.5 L 666.5 496.5 L 632.5 496.5 Z M 509.5 304.5 L 544.5 304.5 L 544.5 496.5 L 509.5 496.5 Z M 509.5 304.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -158,6 +158,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 529.1875 512.574219 L 529.1875 561.652344 L 522.121094 561.652344 L 496.738281 521.863281 L 496.738281 561.652344 L 490.816406 561.652344 L 490.816406 512.574219 L 497.613281 512.574219 L 523.265625 552.699219 L 523.265625 512.574219 Z M 529.1875 512.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 446 562 L 485 562 M 446 523 L 485 523 M 446 523 L 446 562 M 485 523 L 485 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 446 562 L 485 562 M 446 523 L 485 523 M 485 562 L 485 523 M 446 562 L 446 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_2.svg b/cells/and4bb/sky130_fd_sc_hs__and4bb_2.svg
index 80ba1a5..7e531d1 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_2.svg
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.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="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1435.5 655.5 L 1470.5 655.5 L 1470.5 781.5 L 1435.5 781.5 Z M 679.5 655.5 L 713.5 655.5 L 713.5 824.5 L 679.5 824.5 Z M 768.5 655.5 L 803.5 655.5 L 803.5 824.5 L 768.5 824.5 Z M 1201.5 655.5 L 1236.5 655.5 L 1236.5 824.5 L 1201.5 824.5 Z M 1009.5 655.5 L 1043.5 655.5 L 1043.5 824.5 L 1009.5 824.5 Z M 892.5 655.5 L 926.5 655.5 L 926.5 824.5 L 892.5 824.5 Z M 1300.5 655.5 L 1334.5 655.5 L 1334.5 824.5 L 1300.5 824.5 Z M 452.5 707.5 L 486.5 707.5 L 486.5 833.5 L 452.5 833.5 Z M 452.5 707.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 607.5 240.5 L 641.5 240.5 L 641.5 469.5 L 607.5 469.5 Z M 923.5 240.5 L 957.5 240.5 L 957.5 469.5 L 923.5 469.5 Z M 476.5 276.5 L 510.5 276.5 L 510.5 469.5 L 476.5 469.5 Z M 1026.5 240.5 L 1060.5 240.5 L 1060.5 469.5 L 1026.5 469.5 Z M 772.5 240.5 L 806.5 240.5 L 806.5 469.5 L 772.5 469.5 Z M 1307.5 240.5 L 1341.5 240.5 L 1341.5 496.5 L 1307.5 496.5 Z M 1429.5 304.5 L 1464.5 304.5 L 1464.5 496.5 L 1429.5 496.5 Z M 1204.5 240.5 L 1238.5 240.5 L 1238.5 496.5 L 1204.5 496.5 Z M 1204.5 240.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,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 942.730469 536.984375 L 942.796875 534.292969 L 943.066406 531.667969 L 943.539062 529.175781 L 944.144531 526.753906 L 944.953125 524.464844 L 946.03125 522.242188 L 947.714844 519.347656 L 949.800781 516.855469 L 952.15625 514.835938 L 954.847656 513.222656 L 957.8125 512.078125 L 961.175781 511.335938 L 961.785156 511.269531 L 962.457031 511.203125 L 963.0625 511.132812 L 964.410156 511.132812 L 965.148438 511.066406 L 969.457031 511.402344 L 973.226562 512.414062 L 976.460938 514.027344 L 979.152344 516.316406 L 981.304688 519.210938 L 982.988281 522.78125 L 983.394531 524.125 L 983.59375 524.867188 L 983.730469 525.609375 L 983.863281 526.347656 L 984.066406 527.089844 L 977.671875 527.089844 L 976.996094 524.734375 L 976.121094 522.714844 L 975.046875 520.960938 L 973.632812 519.480469 L 972.082031 518.335938 L 970.265625 517.460938 L 969.390625 517.191406 L 968.449219 516.992188 L 967.503906 516.855469 L 966.496094 516.722656 L 965.484375 516.652344 L 964.410156 516.585938 L 962.050781 516.789062 L 959.898438 517.261719 L 957.878906 518 L 956.0625 519.144531 L 954.378906 520.558594 L 952.964844 522.242188 L 951.753906 524.195312 L 950.742188 526.347656 L 949.933594 528.703125 L 949.394531 531.261719 L 949.058594 534.023438 L 948.992188 536.917969 L 949.058594 540.082031 L 949.464844 542.910156 L 950.136719 545.601562 L 951.078125 547.957031 L 952.292969 550.179688 L 953.773438 552.066406 L 955.253906 553.613281 L 956.867188 554.824219 L 958.621094 555.769531 L 960.570312 556.441406 L 962.660156 556.84375 L 964.949219 556.980469 L 967.371094 556.84375 L 969.59375 556.375 L 971.613281 555.566406 L 973.296875 554.421875 L 974.777344 552.941406 L 976.054688 551.121094 L 976.59375 550.046875 L 977.066406 548.832031 L 977.535156 547.554688 L 977.941406 546.140625 L 978.277344 544.660156 L 978.613281 543.042969 L 985.078125 543.042969 L 983.863281 549.035156 L 981.84375 553.882812 L 978.882812 557.652344 L 975.113281 560.347656 L 970.402344 561.894531 L 964.878906 562.5 L 960.976562 562.230469 L 957.476562 561.421875 L 954.3125 560.210938 L 951.484375 558.394531 L 948.992188 556.039062 L 946.90625 553.140625 L 945.695312 551.054688 L 944.683594 548.765625 L 943.875 546.34375 L 943.269531 543.785156 L 942.867188 541.09375 L 942.730469 538.265625 Z M 942.730469 536.984375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 941 562 L 980 562 M 941 523 L 980 523 M 941 523 L 941 562 M 980 523 L 980 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 941 562 L 980 562 M 941 523 L 980 523 M 980 562 L 980 523 M 941 562 L 941 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/and4bb/sky130_fd_sc_hs__and4bb_4.svg b/cells/and4bb/sky130_fd_sc_hs__and4bb_4.svg
index 6e17dfe..b095cb8 100644
--- a/cells/and4bb/sky130_fd_sc_hs__and4bb_4.svg
+++ b/cells/and4bb/sky130_fd_sc_hs__and4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 520.5 L 175.5 520.5 Z M 1192.5 520.5 L 1743.5 520.5 L 1743.5 536.5 L 1192.5 536.5 Z M 175.5 520.5 L 490.5 520.5 L 490.5 536.5 L 175.5 536.5 Z M 175.5 520.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 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.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 747.5 589.5 L 772.5 589.5 L 772.5 695.5 L 747.5 695.5 Z M 818.5 589.5 L 843.5 589.5 L 843.5 695.5 L 818.5 695.5 Z M 676.5 589.5 L 701.5 589.5 L 701.5 695.5 L 676.5 695.5 Z M 605.5 589.5 L 630.5 589.5 L 630.5 695.5 L 605.5 695.5 Z M 993.5 591.5 L 1018.5 591.5 L 1018.5 697.5 L 993.5 697.5 Z M 1064.5 591.5 L 1089.5 591.5 L 1089.5 697.5 L 1064.5 697.5 Z M 1227.5 627.5 L 1252.5 627.5 L 1252.5 733.5 L 1227.5 733.5 Z M 1298.5 627.5 L 1323.5 627.5 L 1323.5 733.5 L 1298.5 733.5 Z M 1452.5 627.5 L 1477.5 627.5 L 1477.5 749.5 L 1452.5 749.5 Z M 1617.5 627.5 L 1642.5 627.5 L 1642.5 749.5 L 1617.5 749.5 Z M 275.5 643.5 L 300.5 643.5 L 300.5 749.5 L 275.5 749.5 Z M 1381.5 627.5 L 1406.5 627.5 L 1406.5 749.5 L 1381.5 749.5 Z M 346.5 643.5 L 371.5 643.5 L 371.5 749.5 L 346.5 749.5 Z M 1539.5 627.5 L 1564.5 627.5 L 1564.5 749.5 L 1539.5 749.5 Z M 1539.5 627.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 277.5 321.5 L 302.5 321.5 L 302.5 487.5 L 277.5 487.5 Z M 368.5 321.5 L 393.5 321.5 L 393.5 487.5 L 368.5 487.5 Z M 751.5 325.5 L 776.5 325.5 L 776.5 490.5 L 751.5 490.5 Z M 995.5 325.5 L 1020.5 325.5 L 1020.5 490.5 L 995.5 490.5 Z M 921.5 325.5 L 946.5 325.5 L 946.5 490.5 L 921.5 490.5 Z M 1222.5 325.5 L 1246.5 325.5 L 1246.5 490.5 L 1222.5 490.5 Z M 571.5 325.5 L 596.5 325.5 L 596.5 490.5 L 571.5 490.5 Z M 830.5 325.5 L 855.5 325.5 L 855.5 490.5 L 830.5 490.5 Z M 673.5 325.5 L 698.5 325.5 L 698.5 490.5 L 673.5 490.5 Z M 1468.5 321.5 L 1492.5 321.5 L 1492.5 506.5 L 1468.5 506.5 Z M 1542.5 321.5 L 1567.5 321.5 L 1567.5 506.5 L 1542.5 506.5 Z M 1393.5 321.5 L 1418.5 321.5 L 1418.5 506.5 L 1393.5 506.5 Z M 1616.5 321.5 L 1641.5 321.5 L 1641.5 506.5 L 1616.5 506.5 Z M 1305.5 341.5 L 1330.5 341.5 L 1330.5 506.5 L 1305.5 506.5 Z M 1305.5 341.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.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>
@@ -190,6 +190,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1676.695312 474.140625 L 1689.359375 492.5 L 1683.714844 492.5 L 1673.945312 477.578125 L 1664.125 492.5 L 1658.578125 492.5 L 1671.246094 474.140625 L 1659.367188 456.714844 L 1664.914062 456.714844 L 1674.09375 470.753906 L 1683.320312 456.714844 L 1688.769531 456.714844 Z M 1676.695312 474.140625 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1658 619 L 1686 619 M 1658 591 L 1686 591 M 1658 591 L 1658 619 M 1686 591 L 1686 619 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1658 619 L 1686 619 M 1658 591 L 1686 591 M 1686 619 L 1686 591 M 1658 619 L 1658 591 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hs__buf_1.svg b/cells/buf/sky130_fd_sc_hs__buf_1.svg
index 5fc538e..2143e43 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_1.svg
+++ b/cells/buf/sky130_fd_sc_hs__buf_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 538.5 L 701.5 538.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 744.5 862.5 L 1184.5 862.5 L 1184.5 918.5 L 744.5 918.5 Z M 744.5 862.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="#image306"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 921.5 664.5 L 955.5 664.5 L 955.5 790.5 L 921.5 790.5 Z M 1054.5 664.5 L 1088.5 664.5 L 1088.5 833.5 L 1054.5 833.5 Z M 1054.5 664.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 924.5 240.5 L 958.5 240.5 L 958.5 432.5 L 924.5 432.5 Z M 1050.5 240.5 L 1085.5 240.5 L 1085.5 496.5 L 1050.5 496.5 Z M 1050.5 240.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 780.5 136.5 L 819.5 136.5 L 819.5 174.5 L 780.5 174.5 Z M 1110.5 136.5 L 1149.5 136.5 L 1149.5 174.5 L 1110.5 174.5 Z M 1000.5 136.5 L 1039.5 136.5 L 1039.5 174.5 L 1000.5 174.5 Z M 890.5 136.5 L 929.5 136.5 L 929.5 174.5 L 890.5 174.5 Z M 780.5 899.5 L 819.5 899.5 L 819.5 938.5 L 780.5 938.5 Z M 1110.5 899.5 L 1149.5 899.5 L 1149.5 938.5 L 1110.5 938.5 Z M 1000.5 899.5 L 1039.5 899.5 L 1039.5 938.5 L 1000.5 938.5 Z M 890.5 899.5 L 929.5 899.5 L 929.5 938.5 L 890.5 938.5 Z M 890.5 899.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface275">
+<g id="surface303">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1134.824219 282.320312 L 1152.191406 307.5 L 1144.449219 307.5 L 1131.050781 287.035156 L 1117.589844 307.5 L 1109.980469 307.5 L 1127.351562 282.320312 L 1111.058594 258.421875 L 1118.664062 258.421875 L 1131.253906 277.675781 L 1143.910156 258.421875 L 1151.382812 258.421875 Z M 1134.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1110 816 L 1149 816 M 1110 777 L 1149 777 M 1110 777 L 1110 816 M 1149 777 L 1149 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1110 816 L 1149 816 M 1110 777 L 1149 777 M 1149 816 L 1149 777 M 1110 816 L 1110 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 156 L 744 165 M 739 161 L 748 161 M 743 162 L 745 162 M 743 160 L 745 160 M 743 160 L 743 162 M 745 160 L 745 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hs__buf_16.svg b/cells/buf/sky130_fd_sc_hs__buf_16.svg
index d300db9..54bb6ae 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_16.svg
+++ b/cells/buf/sky130_fd_sc_hs__buf_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 269.5 L 1743.5 269.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 269.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 201.5 739.5 L 1716.5 739.5 L 1716.5 774.5 L 201.5 774.5 Z M 201.5 739.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1634.5 615.5 L 1656.5 615.5 L 1656.5 721.5 L 1634.5 721.5 Z M 263.5 615.5 L 285.5 615.5 L 285.5 721.5 L 263.5 721.5 Z M 325.5 615.5 L 347.5 615.5 L 347.5 721.5 L 325.5 721.5 Z M 387.5 615.5 L 408.5 615.5 L 408.5 721.5 L 387.5 721.5 Z M 449.5 615.5 L 470.5 615.5 L 470.5 721.5 L 449.5 721.5 Z M 510.5 615.5 L 532.5 615.5 L 532.5 721.5 L 510.5 721.5 Z M 572.5 615.5 L 593.5 615.5 L 593.5 721.5 L 572.5 721.5 Z M 634.5 615.5 L 655.5 615.5 L 655.5 721.5 L 634.5 721.5 Z M 695.5 615.5 L 717.5 615.5 L 717.5 721.5 L 695.5 721.5 Z M 757.5 615.5 L 779.5 615.5 L 779.5 721.5 L 757.5 721.5 Z M 819.5 615.5 L 840.5 615.5 L 840.5 721.5 L 819.5 721.5 Z M 900.5 615.5 L 922.5 615.5 L 922.5 721.5 L 900.5 721.5 Z M 962.5 615.5 L 984.5 615.5 L 984.5 721.5 L 962.5 721.5 Z M 1044.5 615.5 L 1066.5 615.5 L 1066.5 721.5 L 1044.5 721.5 Z M 1106.5 615.5 L 1127.5 615.5 L 1127.5 721.5 L 1106.5 721.5 Z M 1187.5 615.5 L 1209.5 615.5 L 1209.5 721.5 L 1187.5 721.5 Z M 1249.5 615.5 L 1271.5 615.5 L 1271.5 721.5 L 1249.5 721.5 Z M 1311.5 615.5 L 1332.5 615.5 L 1332.5 721.5 L 1311.5 721.5 Z M 1373.5 615.5 L 1394.5 615.5 L 1394.5 721.5 L 1373.5 721.5 Z M 1434.5 615.5 L 1456.5 615.5 L 1456.5 721.5 L 1434.5 721.5 Z M 1496.5 615.5 L 1517.5 615.5 L 1517.5 721.5 L 1496.5 721.5 Z M 1563.5 615.5 L 1584.5 615.5 L 1584.5 721.5 L 1563.5 721.5 Z M 1563.5 615.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1633.5 349.5 L 1654.5 349.5 L 1654.5 510.5 L 1633.5 510.5 Z M 263.5 349.5 L 284.5 349.5 L 284.5 510.5 L 263.5 510.5 Z M 327.5 349.5 L 349.5 349.5 L 349.5 510.5 L 327.5 510.5 Z M 392.5 349.5 L 413.5 349.5 L 413.5 510.5 L 392.5 510.5 Z M 456.5 349.5 L 478.5 349.5 L 478.5 510.5 L 456.5 510.5 Z M 528.5 349.5 L 550.5 349.5 L 550.5 510.5 L 528.5 510.5 Z M 593.5 349.5 L 614.5 349.5 L 614.5 510.5 L 593.5 510.5 Z M 657.5 349.5 L 679.5 349.5 L 679.5 510.5 L 657.5 510.5 Z M 722.5 349.5 L 743.5 349.5 L 743.5 510.5 L 722.5 510.5 Z M 786.5 349.5 L 808.5 349.5 L 808.5 510.5 L 786.5 510.5 Z M 851.5 349.5 L 873.5 349.5 L 873.5 510.5 L 851.5 510.5 Z M 916.5 349.5 L 937.5 349.5 L 937.5 510.5 L 916.5 510.5 Z M 980.5 349.5 L 1002.5 349.5 L 1002.5 510.5 L 980.5 510.5 Z M 1045.5 349.5 L 1066.5 349.5 L 1066.5 510.5 L 1045.5 510.5 Z M 1109.5 349.5 L 1131.5 349.5 L 1131.5 510.5 L 1109.5 510.5 Z M 1174.5 349.5 L 1195.5 349.5 L 1195.5 510.5 L 1174.5 510.5 Z M 1238.5 349.5 L 1260.5 349.5 L 1260.5 510.5 L 1238.5 510.5 Z M 1310.5 349.5 L 1332.5 349.5 L 1332.5 510.5 L 1310.5 510.5 Z M 1375.5 349.5 L 1396.5 349.5 L 1396.5 510.5 L 1375.5 510.5 Z M 1439.5 349.5 L 1461.5 349.5 L 1461.5 510.5 L 1439.5 510.5 Z M 1504.5 349.5 L 1525.5 349.5 L 1525.5 510.5 L 1504.5 510.5 Z M 1568.5 349.5 L 1590.5 349.5 L 1590.5 510.5 L 1568.5 510.5 Z M 1568.5 349.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 223.5 284.5 L 248.5 284.5 L 248.5 308.5 L 223.5 308.5 Z M 1670.5 284.5 L 1694.5 284.5 L 1694.5 308.5 L 1670.5 308.5 Z M 1601.5 284.5 L 1625.5 284.5 L 1625.5 308.5 L 1601.5 308.5 Z M 1532.5 284.5 L 1556.5 284.5 L 1556.5 308.5 L 1532.5 308.5 Z M 1463.5 284.5 L 1487.5 284.5 L 1487.5 308.5 L 1463.5 308.5 Z M 1394.5 284.5 L 1418.5 284.5 L 1418.5 308.5 L 1394.5 308.5 Z M 1325.5 284.5 L 1350.5 284.5 L 1350.5 308.5 L 1325.5 308.5 Z M 1256.5 284.5 L 1281.5 284.5 L 1281.5 308.5 L 1256.5 308.5 Z M 1187.5 284.5 L 1212.5 284.5 L 1212.5 308.5 L 1187.5 308.5 Z M 1119.5 284.5 L 1143.5 284.5 L 1143.5 308.5 L 1119.5 308.5 Z M 1050.5 284.5 L 1074.5 284.5 L 1074.5 308.5 L 1050.5 308.5 Z M 981.5 284.5 L 1005.5 284.5 L 1005.5 308.5 L 981.5 308.5 Z M 912.5 284.5 L 936.5 284.5 L 936.5 308.5 L 912.5 308.5 Z M 843.5 284.5 L 867.5 284.5 L 867.5 308.5 L 843.5 308.5 Z M 774.5 284.5 L 799.5 284.5 L 799.5 308.5 L 774.5 308.5 Z M 705.5 284.5 L 730.5 284.5 L 730.5 308.5 L 705.5 308.5 Z M 636.5 284.5 L 661.5 284.5 L 661.5 308.5 L 636.5 308.5 Z M 568.5 284.5 L 592.5 284.5 L 592.5 308.5 L 568.5 308.5 Z M 499.5 284.5 L 523.5 284.5 L 523.5 308.5 L 499.5 308.5 Z M 430.5 284.5 L 454.5 284.5 L 454.5 308.5 L 430.5 308.5 Z M 361.5 284.5 L 385.5 284.5 L 385.5 308.5 L 361.5 308.5 Z M 292.5 284.5 L 317.5 284.5 L 317.5 308.5 L 292.5 308.5 Z M 292.5 470.5 L 317.5 470.5 L 317.5 477.5 L 292.5 477.5 Z M 555.5 470.5 L 580.5 470.5 L 580.5 477.5 L 555.5 477.5 Z M 418.5 470.5 L 443.5 470.5 L 443.5 477.5 L 418.5 477.5 Z M 683.5 470.5 L 708.5 470.5 L 708.5 477.5 L 683.5 477.5 Z M 1209.5 470.5 L 1233.5 470.5 L 1233.5 477.5 L 1209.5 477.5 Z M 1076.5 470.5 L 1100.5 470.5 L 1100.5 477.5 L 1076.5 477.5 Z M 946.5 470.5 L 971.5 470.5 L 971.5 477.5 L 946.5 477.5 Z M 818.5 470.5 L 842.5 470.5 L 842.5 477.5 L 818.5 477.5 Z M 683.5 477.5 L 708.5 477.5 L 708.5 494.5 L 683.5 494.5 Z M 292.5 477.5 L 317.5 477.5 L 317.5 494.5 L 292.5 494.5 Z M 555.5 477.5 L 580.5 477.5 L 580.5 494.5 L 555.5 494.5 Z M 1076.5 477.5 L 1100.5 477.5 L 1100.5 494.5 L 1076.5 494.5 Z M 818.5 477.5 L 842.5 477.5 L 842.5 494.5 L 818.5 494.5 Z M 418.5 477.5 L 443.5 477.5 L 443.5 494.5 L 418.5 494.5 Z M 1209.5 477.5 L 1233.5 477.5 L 1233.5 494.5 L 1209.5 494.5 Z M 946.5 477.5 L 971.5 477.5 L 971.5 494.5 L 946.5 494.5 Z M 481.5 523.5 L 505.5 523.5 L 505.5 547.5 L 481.5 547.5 Z M 1266.5 523.5 L 1290.5 523.5 L 1290.5 547.5 L 1266.5 547.5 Z M 1143.5 523.5 L 1167.5 523.5 L 1167.5 547.5 L 1143.5 547.5 Z M 619.5 523.5 L 643.5 523.5 L 643.5 547.5 L 619.5 547.5 Z M 352.5 523.5 L 377.5 523.5 L 377.5 547.5 L 352.5 547.5 Z M 1012.5 523.5 L 1036.5 523.5 L 1036.5 547.5 L 1012.5 547.5 Z M 746.5 523.5 L 771.5 523.5 L 771.5 547.5 L 746.5 547.5 Z M 873.5 523.5 L 897.5 523.5 L 897.5 547.5 L 873.5 547.5 Z M 223.5 762.5 L 248.5 762.5 L 248.5 786.5 L 223.5 786.5 Z M 1670.5 762.5 L 1694.5 762.5 L 1694.5 786.5 L 1670.5 786.5 Z M 1601.5 762.5 L 1625.5 762.5 L 1625.5 786.5 L 1601.5 786.5 Z M 1532.5 762.5 L 1556.5 762.5 L 1556.5 786.5 L 1532.5 786.5 Z M 1463.5 762.5 L 1487.5 762.5 L 1487.5 786.5 L 1463.5 786.5 Z M 1394.5 762.5 L 1418.5 762.5 L 1418.5 786.5 L 1394.5 786.5 Z M 1325.5 762.5 L 1350.5 762.5 L 1350.5 786.5 L 1325.5 786.5 Z M 1256.5 762.5 L 1281.5 762.5 L 1281.5 786.5 L 1256.5 786.5 Z M 1187.5 762.5 L 1212.5 762.5 L 1212.5 786.5 L 1187.5 786.5 Z M 1119.5 762.5 L 1143.5 762.5 L 1143.5 786.5 L 1119.5 786.5 Z M 1050.5 762.5 L 1074.5 762.5 L 1074.5 786.5 L 1050.5 786.5 Z M 981.5 762.5 L 1005.5 762.5 L 1005.5 786.5 L 981.5 786.5 Z M 912.5 762.5 L 936.5 762.5 L 936.5 786.5 L 912.5 786.5 Z M 843.5 762.5 L 867.5 762.5 L 867.5 786.5 L 843.5 786.5 Z M 774.5 762.5 L 799.5 762.5 L 799.5 786.5 L 774.5 786.5 Z M 705.5 762.5 L 730.5 762.5 L 730.5 786.5 L 705.5 786.5 Z M 636.5 762.5 L 661.5 762.5 L 661.5 786.5 L 636.5 786.5 Z M 568.5 762.5 L 592.5 762.5 L 592.5 786.5 L 568.5 786.5 Z M 499.5 762.5 L 523.5 762.5 L 523.5 786.5 L 499.5 786.5 Z M 430.5 762.5 L 454.5 762.5 L 454.5 786.5 L 430.5 786.5 Z M 361.5 762.5 L 385.5 762.5 L 385.5 786.5 L 361.5 786.5 Z M 292.5 762.5 L 317.5 762.5 L 317.5 786.5 L 292.5 786.5 Z M 292.5 762.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface279">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,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 1688.445312 541.285156 L 1676.621094 541.285156 L 1673.378906 550.5 L 1669.214844 550.5 L 1680.15625 519.828125 L 1685.203125 519.828125 L 1695.976562 550.5 L 1691.597656 550.5 Z M 1687.351562 538.003906 L 1682.636719 524.035156 L 1677.589844 538.003906 Z M 1687.351562 538.003906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1670 556 L 1694 556 M 1670 532 L 1694 532 M 1670 532 L 1670 556 M 1694 532 L 1694 556 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1670 556 L 1694 556 M 1670 532 L 1694 532 M 1694 556 L 1694 532 M 1670 556 L 1670 532 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201 300 L 201 309 M 196 305 L 205 305 M 200 306 L 202 306 M 200 304 L 202 304 M 200 304 L 200 306 M 202 304 L 202 306 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hs__buf_2.svg b/cells/buf/sky130_fd_sc_hs__buf_2.svg
index 4c2011b..3465bac 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_2.svg
+++ b/cells/buf/sky130_fd_sc_hs__buf_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1107.5 664.5 L 1142.5 664.5 L 1142.5 810.5 L 1107.5 810.5 Z M 876.5 664.5 L 910.5 664.5 L 910.5 833.5 L 876.5 833.5 Z M 975.5 664.5 L 1009.5 664.5 L 1009.5 833.5 L 975.5 833.5 Z M 975.5 664.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 874.5 240.5 L 908.5 240.5 L 908.5 496.5 L 874.5 496.5 Z M 1099.5 267.5 L 1134.5 267.5 L 1134.5 496.5 L 1099.5 496.5 Z M 977.5 240.5 L 1011.5 240.5 L 1011.5 496.5 L 977.5 496.5 Z M 977.5 240.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface273">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,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 967.824219 451.320312 L 985.191406 476.5 L 977.449219 476.5 L 964.050781 456.035156 L 950.589844 476.5 L 942.980469 476.5 L 960.351562 451.320312 L 944.058594 427.421875 L 951.664062 427.421875 L 964.253906 446.675781 L 976.910156 427.421875 L 984.382812 427.421875 Z M 967.824219 451.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 944 647 L 983 647 M 944 608 L 983 608 M 944 608 L 944 647 M 983 608 L 983 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 944 647 L 983 647 M 944 608 L 983 608 M 983 647 L 983 608 M 944 647 L 944 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hs__buf_4.svg b/cells/buf/sky130_fd_sc_hs__buf_4.svg
index 06b82b8..ab16d49 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_4.svg
+++ b/cells/buf/sky130_fd_sc_hs__buf_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image270" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image270"/>
+  <use xlink:href="#image299"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image270"/>
+  <use xlink:href="#image299"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1216.5 664.5 L 1251.5 664.5 L 1251.5 833.5 L 1216.5 833.5 Z M 689.5 664.5 L 724.5 664.5 L 724.5 833.5 L 689.5 833.5 Z M 788.5 664.5 L 822.5 664.5 L 822.5 833.5 L 788.5 833.5 Z M 918.5 664.5 L 953.5 664.5 L 953.5 833.5 L 918.5 833.5 Z M 1017.5 664.5 L 1051.5 664.5 L 1051.5 833.5 L 1017.5 833.5 Z M 1017.5 664.5 "/>
 </clipPath>
-<image id="image271" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image271"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 679.5 240.5 L 713.5 240.5 L 713.5 496.5 L 679.5 496.5 Z M 1214.5 304.5 L 1248.5 304.5 L 1248.5 496.5 L 1214.5 496.5 Z M 1111.5 304.5 L 1145.5 304.5 L 1145.5 496.5 L 1111.5 496.5 Z M 988.5 240.5 L 1023.5 240.5 L 1023.5 496.5 L 988.5 496.5 Z M 885.5 240.5 L 920.5 240.5 L 920.5 496.5 L 885.5 496.5 Z M 782.5 240.5 L 816.5 240.5 L 816.5 496.5 L 782.5 496.5 Z M 782.5 240.5 "/>
 </clipPath>
-<image id="image272" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image272"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface267">
+<g id="surface296">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,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 746.824219 621.320312 L 764.191406 646.5 L 756.449219 646.5 L 743.050781 626.035156 L 729.589844 646.5 L 721.980469 646.5 L 739.351562 621.320312 L 723.058594 597.421875 L 730.664062 597.421875 L 743.253906 616.675781 L 755.910156 597.421875 L 763.382812 597.421875 Z M 746.824219 621.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 722 477 L 761 477 M 722 438 L 761 438 M 722 438 L 722 477 M 761 438 L 761 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 722 477 L 761 477 M 722 438 L 761 438 M 761 477 L 761 438 M 722 477 L 722 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/buf/sky130_fd_sc_hs__buf_8.svg b/cells/buf/sky130_fd_sc_hs__buf_8.svg
index 421a6b6..66132cd 100644
--- a/cells/buf/sky130_fd_sc_hs__buf_8.svg
+++ b/cells/buf/sky130_fd_sc_hs__buf_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1473.5 664.5 L 1507.5 664.5 L 1507.5 833.5 L 1473.5 833.5 Z M 396.5 664.5 L 430.5 664.5 L 430.5 833.5 L 396.5 833.5 Z M 505.5 664.5 L 539.5 664.5 L 539.5 833.5 L 505.5 833.5 Z M 603.5 664.5 L 638.5 664.5 L 638.5 833.5 L 603.5 833.5 Z M 702.5 664.5 L 736.5 664.5 L 736.5 833.5 L 702.5 833.5 Z M 800.5 664.5 L 835.5 664.5 L 835.5 833.5 L 800.5 833.5 Z M 915.5 664.5 L 949.5 664.5 L 949.5 833.5 L 915.5 833.5 Z M 1013.5 664.5 L 1048.5 664.5 L 1048.5 833.5 L 1013.5 833.5 Z M 1144.5 664.5 L 1178.5 664.5 L 1178.5 833.5 L 1144.5 833.5 Z M 1243.5 664.5 L 1277.5 664.5 L 1277.5 833.5 L 1243.5 833.5 Z M 1373.5 664.5 L 1408.5 664.5 L 1408.5 833.5 L 1373.5 833.5 Z M 1373.5 664.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1476.5 240.5 L 1511.5 240.5 L 1511.5 496.5 L 1476.5 496.5 Z M 399.5 240.5 L 434.5 240.5 L 434.5 496.5 L 399.5 496.5 Z M 502.5 240.5 L 537.5 240.5 L 537.5 496.5 L 502.5 496.5 Z M 606.5 240.5 L 640.5 240.5 L 640.5 496.5 L 606.5 496.5 Z M 709.5 240.5 L 743.5 240.5 L 743.5 496.5 L 709.5 496.5 Z M 823.5 240.5 L 858.5 240.5 L 858.5 496.5 L 823.5 496.5 Z M 938.5 240.5 L 972.5 240.5 L 972.5 496.5 L 938.5 496.5 Z M 1041.5 240.5 L 1075.5 240.5 L 1075.5 496.5 L 1041.5 496.5 Z M 1156.5 240.5 L 1190.5 240.5 L 1190.5 496.5 L 1156.5 496.5 Z M 1259.5 240.5 L 1293.5 240.5 L 1293.5 496.5 L 1259.5 496.5 Z M 1370.5 240.5 L 1404.5 240.5 L 1404.5 496.5 L 1370.5 496.5 Z M 1370.5 240.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface279">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,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 585.410156 546.757812 L 566.492188 546.757812 L 561.308594 561.5 L 554.644531 561.5 L 572.148438 512.421875 L 580.226562 512.421875 L 597.460938 561.5 L 590.460938 561.5 Z M 583.660156 541.503906 L 576.121094 519.15625 L 568.042969 541.503906 Z M 583.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 555 562 L 594 562 M 555 523 L 594 523 M 555 523 L 555 562 M 594 523 L 594 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 562 L 594 562 M 555 523 L 594 523 M 594 562 L 594 523 M 555 562 L 555 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.svg b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.svg
index 278eabc..7f99057 100644
--- a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.svg
+++ b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 316.5 L 1744.5 316.5 L 1744.5 535.5 L 174.5 535.5 Z M 174.5 316.5 "/>
 </clipPath>
-<image id="image270" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image270"/>
+  <use xlink:href="#image299"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 196.5 701.5 L 1721.5 701.5 L 1721.5 730.5 L 196.5 730.5 Z M 196.5 701.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image270"/>
+  <use xlink:href="#image299"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1646.5 600.5 L 1664.5 600.5 L 1664.5 687.5 L 1646.5 687.5 Z M 248.5 600.5 L 265.5 600.5 L 265.5 687.5 L 248.5 687.5 Z M 298.5 600.5 L 316.5 600.5 L 316.5 687.5 L 298.5 687.5 Z M 349.5 600.5 L 366.5 600.5 L 366.5 687.5 L 349.5 687.5 Z M 400.5 600.5 L 418.5 600.5 L 418.5 687.5 L 400.5 687.5 Z M 525.5 600.5 L 542.5 600.5 L 542.5 687.5 L 525.5 687.5 Z M 575.5 600.5 L 593.5 600.5 L 593.5 687.5 L 575.5 687.5 Z M 634.5 600.5 L 652.5 600.5 L 652.5 687.5 L 634.5 687.5 Z M 685.5 600.5 L 702.5 600.5 L 702.5 687.5 L 685.5 687.5 Z M 744.5 600.5 L 761.5 600.5 L 761.5 687.5 L 744.5 687.5 Z M 794.5 600.5 L 812.5 600.5 L 812.5 687.5 L 794.5 687.5 Z M 845.5 600.5 L 862.5 600.5 L 862.5 687.5 L 845.5 687.5 Z M 895.5 600.5 L 913.5 600.5 L 913.5 687.5 L 895.5 687.5 Z M 946.5 600.5 L 964.5 600.5 L 964.5 687.5 L 946.5 687.5 Z M 997.5 600.5 L 1014.5 600.5 L 1014.5 687.5 L 997.5 687.5 Z M 1047.5 600.5 L 1065.5 600.5 L 1065.5 687.5 L 1047.5 687.5 Z M 1098.5 600.5 L 1115.5 600.5 L 1115.5 687.5 L 1098.5 687.5 Z M 1157.5 600.5 L 1174.5 600.5 L 1174.5 687.5 L 1157.5 687.5 Z M 1207.5 600.5 L 1225.5 600.5 L 1225.5 687.5 L 1207.5 687.5 Z M 1266.5 600.5 L 1284.5 600.5 L 1284.5 687.5 L 1266.5 687.5 Z M 1317.5 600.5 L 1334.5 600.5 L 1334.5 687.5 L 1317.5 687.5 Z M 1375.5 600.5 L 1393.5 600.5 L 1393.5 687.5 L 1375.5 687.5 Z M 1426.5 600.5 L 1444.5 600.5 L 1444.5 687.5 L 1426.5 687.5 Z M 1485.5 600.5 L 1502.5 600.5 L 1502.5 687.5 L 1485.5 687.5 Z M 1535.5 600.5 L 1553.5 600.5 L 1553.5 687.5 L 1535.5 687.5 Z M 1595.5 600.5 L 1613.5 600.5 L 1613.5 687.5 L 1595.5 687.5 Z M 1595.5 600.5 "/>
 </clipPath>
-<image id="image271" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image271"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1652.5 382.5 L 1670.5 382.5 L 1670.5 514.5 L 1652.5 514.5 Z M 247.5 382.5 L 265.5 382.5 L 265.5 514.5 L 247.5 514.5 Z M 300.5 382.5 L 318.5 382.5 L 318.5 514.5 L 300.5 514.5 Z M 353.5 382.5 L 371.5 382.5 L 371.5 514.5 L 353.5 514.5 Z M 406.5 382.5 L 424.5 382.5 L 424.5 514.5 L 406.5 514.5 Z M 526.5 382.5 L 544.5 382.5 L 544.5 514.5 L 526.5 514.5 Z M 579.5 382.5 L 597.5 382.5 L 597.5 514.5 L 579.5 514.5 Z M 632.5 382.5 L 650.5 382.5 L 650.5 514.5 L 632.5 514.5 Z M 685.5 382.5 L 703.5 382.5 L 703.5 514.5 L 685.5 514.5 Z M 739.5 382.5 L 757.5 382.5 L 757.5 514.5 L 739.5 514.5 Z M 792.5 382.5 L 810.5 382.5 L 810.5 514.5 L 792.5 514.5 Z M 846.5 382.5 L 864.5 382.5 L 864.5 514.5 L 846.5 514.5 Z M 899.5 382.5 L 917.5 382.5 L 917.5 514.5 L 899.5 514.5 Z M 958.5 382.5 L 976.5 382.5 L 976.5 514.5 L 958.5 514.5 Z M 1011.5 382.5 L 1029.5 382.5 L 1029.5 514.5 L 1011.5 514.5 Z M 1064.5 382.5 L 1082.5 382.5 L 1082.5 514.5 L 1064.5 514.5 Z M 1117.5 382.5 L 1135.5 382.5 L 1135.5 514.5 L 1117.5 514.5 Z M 1170.5 382.5 L 1188.5 382.5 L 1188.5 514.5 L 1170.5 514.5 Z M 1223.5 382.5 L 1241.5 382.5 L 1241.5 514.5 L 1223.5 514.5 Z M 1276.5 382.5 L 1294.5 382.5 L 1294.5 514.5 L 1276.5 514.5 Z M 1329.5 382.5 L 1347.5 382.5 L 1347.5 514.5 L 1329.5 514.5 Z M 1382.5 382.5 L 1399.5 382.5 L 1399.5 514.5 L 1382.5 514.5 Z M 1435.5 382.5 L 1452.5 382.5 L 1452.5 514.5 L 1435.5 514.5 Z M 1488.5 382.5 L 1505.5 382.5 L 1505.5 514.5 L 1488.5 514.5 Z M 1541.5 382.5 L 1558.5 382.5 L 1558.5 514.5 L 1541.5 514.5 Z M 1594.5 382.5 L 1611.5 382.5 L 1611.5 514.5 L 1594.5 514.5 Z M 1594.5 382.5 "/>
 </clipPath>
-<image id="image272" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image272"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 215.5 328.5 L 235.5 328.5 L 235.5 348.5 L 215.5 348.5 Z M 1683.5 328.5 L 1703.5 328.5 L 1703.5 348.5 L 1683.5 348.5 Z M 1627.5 328.5 L 1647.5 328.5 L 1647.5 348.5 L 1627.5 348.5 Z M 1570.5 328.5 L 1590.5 328.5 L 1590.5 348.5 L 1570.5 348.5 Z M 1514.5 328.5 L 1534.5 328.5 L 1534.5 348.5 L 1514.5 348.5 Z M 1457.5 328.5 L 1477.5 328.5 L 1477.5 348.5 L 1457.5 348.5 Z M 1401.5 328.5 L 1421.5 328.5 L 1421.5 348.5 L 1401.5 348.5 Z M 1344.5 328.5 L 1364.5 328.5 L 1364.5 348.5 L 1344.5 348.5 Z M 1288.5 328.5 L 1308.5 328.5 L 1308.5 348.5 L 1288.5 348.5 Z M 1231.5 328.5 L 1251.5 328.5 L 1251.5 348.5 L 1231.5 348.5 Z M 1175.5 328.5 L 1195.5 328.5 L 1195.5 348.5 L 1175.5 348.5 Z M 1118.5 328.5 L 1138.5 328.5 L 1138.5 348.5 L 1118.5 348.5 Z M 1062.5 328.5 L 1082.5 328.5 L 1082.5 348.5 L 1062.5 348.5 Z M 1005.5 328.5 L 1025.5 328.5 L 1025.5 348.5 L 1005.5 348.5 Z M 949.5 328.5 L 969.5 328.5 L 969.5 348.5 L 949.5 348.5 Z M 892.5 328.5 L 912.5 328.5 L 912.5 348.5 L 892.5 348.5 Z M 836.5 328.5 L 856.5 328.5 L 856.5 348.5 L 836.5 348.5 Z M 779.5 328.5 L 799.5 328.5 L 799.5 348.5 L 779.5 348.5 Z M 723.5 328.5 L 743.5 328.5 L 743.5 348.5 L 723.5 348.5 Z M 666.5 328.5 L 686.5 328.5 L 686.5 348.5 L 666.5 348.5 Z M 610.5 328.5 L 630.5 328.5 L 630.5 348.5 L 610.5 348.5 Z M 554.5 328.5 L 574.5 328.5 L 574.5 348.5 L 554.5 348.5 Z M 497.5 328.5 L 517.5 328.5 L 517.5 348.5 L 497.5 348.5 Z M 441.5 328.5 L 461.5 328.5 L 461.5 348.5 L 441.5 348.5 Z M 384.5 328.5 L 404.5 328.5 L 404.5 348.5 L 384.5 348.5 Z M 328.5 328.5 L 348.5 328.5 L 348.5 348.5 L 328.5 348.5 Z M 271.5 328.5 L 291.5 328.5 L 291.5 348.5 L 271.5 348.5 Z M 874.5 481.5 L 894.5 481.5 L 894.5 484.5 L 874.5 484.5 Z M 1514.5 481.5 L 1534.5 481.5 L 1534.5 484.5 L 1514.5 484.5 Z M 982.5 481.5 L 1002.5 481.5 L 1002.5 484.5 L 982.5 484.5 Z M 1195.5 481.5 L 1215.5 481.5 L 1215.5 484.5 L 1195.5 484.5 Z M 1408.5 481.5 L 1428.5 481.5 L 1428.5 484.5 L 1408.5 484.5 Z M 1303.5 481.5 L 1323.5 481.5 L 1323.5 484.5 L 1303.5 484.5 Z M 1090.5 481.5 L 1110.5 481.5 L 1110.5 484.5 L 1090.5 484.5 Z M 1622.5 481.5 L 1642.5 481.5 L 1642.5 487.5 L 1622.5 487.5 Z M 1622.5 487.5 L 1642.5 487.5 L 1642.5 501.5 L 1622.5 501.5 Z M 1303.5 484.5 L 1323.5 484.5 L 1323.5 501.5 L 1303.5 501.5 Z M 1195.5 484.5 L 1215.5 484.5 L 1215.5 501.5 L 1195.5 501.5 Z M 1090.5 484.5 L 1110.5 484.5 L 1110.5 501.5 L 1090.5 501.5 Z M 982.5 484.5 L 1002.5 484.5 L 1002.5 501.5 L 982.5 501.5 Z M 874.5 484.5 L 894.5 484.5 L 894.5 501.5 L 874.5 501.5 Z M 1514.5 484.5 L 1534.5 484.5 L 1534.5 501.5 L 1514.5 501.5 Z M 1408.5 484.5 L 1428.5 484.5 L 1428.5 501.5 L 1408.5 501.5 Z M 806.5 524.5 L 826.5 524.5 L 826.5 544.5 L 806.5 544.5 Z M 1561.5 524.5 L 1581.5 524.5 L 1581.5 544.5 L 1561.5 544.5 Z M 1452.5 524.5 L 1472.5 524.5 L 1472.5 544.5 L 1452.5 544.5 Z M 1341.5 524.5 L 1361.5 524.5 L 1361.5 544.5 L 1341.5 544.5 Z M 1234.5 524.5 L 1254.5 524.5 L 1254.5 544.5 L 1234.5 544.5 Z M 1126.5 524.5 L 1146.5 524.5 L 1146.5 544.5 L 1126.5 544.5 Z M 1020.5 524.5 L 1040.5 524.5 L 1040.5 544.5 L 1020.5 544.5 Z M 917.5 524.5 L 937.5 524.5 L 937.5 544.5 L 917.5 544.5 Z M 215.5 720.5 L 235.5 720.5 L 235.5 740.5 L 215.5 740.5 Z M 1683.5 720.5 L 1703.5 720.5 L 1703.5 740.5 L 1683.5 740.5 Z M 1627.5 720.5 L 1647.5 720.5 L 1647.5 740.5 L 1627.5 740.5 Z M 1570.5 720.5 L 1590.5 720.5 L 1590.5 740.5 L 1570.5 740.5 Z M 1514.5 720.5 L 1534.5 720.5 L 1534.5 740.5 L 1514.5 740.5 Z M 1457.5 720.5 L 1477.5 720.5 L 1477.5 740.5 L 1457.5 740.5 Z M 1401.5 720.5 L 1421.5 720.5 L 1421.5 740.5 L 1401.5 740.5 Z M 1344.5 720.5 L 1364.5 720.5 L 1364.5 740.5 L 1344.5 740.5 Z M 1288.5 720.5 L 1308.5 720.5 L 1308.5 740.5 L 1288.5 740.5 Z M 1231.5 720.5 L 1251.5 720.5 L 1251.5 740.5 L 1231.5 740.5 Z M 1175.5 720.5 L 1195.5 720.5 L 1195.5 740.5 L 1175.5 740.5 Z M 1118.5 720.5 L 1138.5 720.5 L 1138.5 740.5 L 1118.5 740.5 Z M 1062.5 720.5 L 1082.5 720.5 L 1082.5 740.5 L 1062.5 740.5 Z M 1005.5 720.5 L 1025.5 720.5 L 1025.5 740.5 L 1005.5 740.5 Z M 949.5 720.5 L 969.5 720.5 L 969.5 740.5 L 949.5 740.5 Z M 892.5 720.5 L 912.5 720.5 L 912.5 740.5 L 892.5 740.5 Z M 836.5 720.5 L 856.5 720.5 L 856.5 740.5 L 836.5 740.5 Z M 779.5 720.5 L 799.5 720.5 L 799.5 740.5 L 779.5 740.5 Z M 723.5 720.5 L 743.5 720.5 L 743.5 740.5 L 723.5 740.5 Z M 666.5 720.5 L 686.5 720.5 L 686.5 740.5 L 666.5 740.5 Z M 610.5 720.5 L 630.5 720.5 L 630.5 740.5 L 610.5 740.5 Z M 554.5 720.5 L 574.5 720.5 L 574.5 740.5 L 554.5 740.5 Z M 497.5 720.5 L 517.5 720.5 L 517.5 740.5 L 497.5 740.5 Z M 441.5 720.5 L 461.5 720.5 L 461.5 740.5 L 441.5 740.5 Z M 384.5 720.5 L 404.5 720.5 L 404.5 740.5 L 384.5 740.5 Z M 328.5 720.5 L 348.5 720.5 L 348.5 740.5 L 328.5 740.5 Z M 271.5 720.5 L 291.5 720.5 L 291.5 740.5 L 271.5 740.5 Z M 271.5 720.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface267">
+<g id="surface296">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,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 230.121094 539.820312 L 220.265625 539.820312 L 217.566406 547.5 L 214.097656 547.5 L 223.210938 521.9375 L 227.421875 521.9375 L 236.394531 547.5 L 232.75 547.5 Z M 229.207031 537.085938 L 225.28125 525.445312 L 221.074219 537.085938 Z M 229.207031 537.085938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 215 555 L 235 555 M 215 535 L 235 535 M 215 535 L 215 555 M 235 535 L 235 555 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 215 555 L 235 555 M 215 535 L 235 535 M 235 555 L 235 535 M 215 555 L 215 535 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 344 L 196 353 M 191 349 L 200 349 M 195 350 L 197 350 M 195 348 L 197 348 M 195 348 L 195 350 M 197 348 L 197 350 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.svg b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.svg
index d81d75b..69a8e1f 100644
--- a/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.svg
+++ b/cells/bufbuf/sky130_fd_sc_hs__bufbuf_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image270" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image270"/>
+  <use xlink:href="#image299"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image270"/>
+  <use xlink:href="#image299"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 301.5 651.5 L 332.5 651.5 L 332.5 765.5 L 301.5 765.5 Z M 1100.5 651.5 L 1131.5 651.5 L 1131.5 804.5 L 1100.5 804.5 Z M 421.5 651.5 L 452.5 651.5 L 452.5 804.5 L 421.5 804.5 Z M 626.5 651.5 L 657.5 651.5 L 657.5 804.5 L 626.5 804.5 Z M 715.5 651.5 L 746.5 651.5 L 746.5 804.5 L 715.5 804.5 Z M 804.5 651.5 L 835.5 651.5 L 835.5 804.5 L 804.5 804.5 Z M 907.5 651.5 L 939.5 651.5 L 939.5 804.5 L 907.5 804.5 Z M 997.5 651.5 L 1028.5 651.5 L 1028.5 804.5 L 997.5 804.5 Z M 1380.5 651.5 L 1411.5 651.5 L 1411.5 804.5 L 1380.5 804.5 Z M 1189.5 651.5 L 1220.5 651.5 L 1220.5 804.5 L 1189.5 804.5 Z M 1278.5 651.5 L 1309.5 651.5 L 1309.5 804.5 L 1278.5 804.5 Z M 1572.5 651.5 L 1603.5 651.5 L 1603.5 804.5 L 1572.5 804.5 Z M 1483.5 651.5 L 1514.5 651.5 L 1514.5 804.5 L 1483.5 804.5 Z M 1483.5 651.5 "/>
 </clipPath>
-<image id="image271" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image271"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1481.5 268.5 L 1512.5 268.5 L 1512.5 500.5 L 1481.5 500.5 Z M 303.5 326.5 L 334.5 326.5 L 334.5 500.5 L 303.5 500.5 Z M 1574.5 268.5 L 1605.5 268.5 L 1605.5 500.5 L 1574.5 500.5 Z M 1388.5 268.5 L 1419.5 268.5 L 1419.5 500.5 L 1388.5 500.5 Z M 1295.5 268.5 L 1326.5 268.5 L 1326.5 500.5 L 1295.5 500.5 Z M 1201.5 268.5 L 1232.5 268.5 L 1232.5 500.5 L 1201.5 500.5 Z M 1107.5 268.5 L 1138.5 268.5 L 1138.5 500.5 L 1107.5 500.5 Z M 1014.5 268.5 L 1045.5 268.5 L 1045.5 500.5 L 1014.5 500.5 Z M 911.5 268.5 L 942.5 268.5 L 942.5 500.5 L 911.5 500.5 Z M 807.5 268.5 L 838.5 268.5 L 838.5 500.5 L 807.5 500.5 Z M 714.5 268.5 L 745.5 268.5 L 745.5 500.5 L 714.5 500.5 Z M 621.5 268.5 L 652.5 268.5 L 652.5 500.5 L 621.5 500.5 Z M 412.5 268.5 L 443.5 268.5 L 443.5 500.5 L 412.5 500.5 Z M 412.5 268.5 "/>
 </clipPath>
-<image id="image272" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image272"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface267">
+<g id="surface296">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,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 1660.628906 535.421875 L 1676.550781 558.5 L 1669.453125 558.5 L 1657.171875 539.738281 L 1644.832031 558.5 L 1637.859375 558.5 L 1653.777344 535.421875 L 1638.84375 513.511719 L 1645.820312 513.511719 L 1657.359375 531.160156 L 1668.960938 513.511719 L 1675.808594 513.511719 Z M 1660.628906 535.421875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1637 560 L 1673 560 M 1637 525 L 1673 525 M 1637 525 L 1637 560 M 1673 525 L 1673 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1637 560 L 1673 560 M 1637 525 L 1673 525 M 1673 560 L 1673 525 M 1637 560 L 1637 525 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/bufinv/sky130_fd_sc_hs__bufinv_16.svg b/cells/bufinv/sky130_fd_sc_hs__bufinv_16.svg
index fc50496..62cd3da 100644
--- a/cells/bufinv/sky130_fd_sc_hs__bufinv_16.svg
+++ b/cells/bufinv/sky130_fd_sc_hs__bufinv_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 299.5 L 1744.5 299.5 L 1744.5 535.5 L 174.5 535.5 Z M 174.5 299.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 198.5 715.5 L 1719.5 715.5 L 1719.5 746.5 L 198.5 746.5 Z M 198.5 715.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1638.5 605.5 L 1657.5 605.5 L 1657.5 699.5 L 1638.5 699.5 Z M 252.5 605.5 L 271.5 605.5 L 271.5 699.5 L 252.5 699.5 Z M 314.5 605.5 L 333.5 605.5 L 333.5 699.5 L 314.5 699.5 Z M 368.5 605.5 L 387.5 605.5 L 387.5 699.5 L 368.5 699.5 Z M 423.5 605.5 L 442.5 605.5 L 442.5 699.5 L 423.5 699.5 Z M 477.5 605.5 L 496.5 605.5 L 496.5 699.5 L 477.5 699.5 Z M 532.5 605.5 L 551.5 605.5 L 551.5 699.5 L 532.5 699.5 Z M 586.5 605.5 L 605.5 605.5 L 605.5 699.5 L 586.5 699.5 Z M 650.5 605.5 L 669.5 605.5 L 669.5 699.5 L 650.5 699.5 Z M 704.5 605.5 L 723.5 605.5 L 723.5 699.5 L 704.5 699.5 Z M 767.5 605.5 L 786.5 605.5 L 786.5 699.5 L 767.5 699.5 Z M 822.5 605.5 L 841.5 605.5 L 841.5 699.5 L 822.5 699.5 Z M 876.5 605.5 L 896.5 605.5 L 896.5 699.5 L 876.5 699.5 Z M 931.5 605.5 L 950.5 605.5 L 950.5 699.5 L 931.5 699.5 Z M 994.5 605.5 L 1013.5 605.5 L 1013.5 699.5 L 994.5 699.5 Z M 1049.5 605.5 L 1068.5 605.5 L 1068.5 699.5 L 1049.5 699.5 Z M 1112.5 605.5 L 1131.5 605.5 L 1131.5 699.5 L 1112.5 699.5 Z M 1167.5 605.5 L 1186.5 605.5 L 1186.5 699.5 L 1167.5 699.5 Z M 1230.5 605.5 L 1249.5 605.5 L 1249.5 699.5 L 1230.5 699.5 Z M 1285.5 605.5 L 1304.5 605.5 L 1304.5 699.5 L 1285.5 699.5 Z M 1348.5 605.5 L 1367.5 605.5 L 1367.5 699.5 L 1348.5 699.5 Z M 1403.5 605.5 L 1422.5 605.5 L 1422.5 699.5 L 1403.5 699.5 Z M 1466.5 605.5 L 1485.5 605.5 L 1485.5 699.5 L 1466.5 699.5 Z M 1520.5 605.5 L 1539.5 605.5 L 1539.5 699.5 L 1520.5 699.5 Z M 1584.5 605.5 L 1603.5 605.5 L 1603.5 699.5 L 1584.5 699.5 Z M 1584.5 605.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1644.5 370.5 L 1663.5 370.5 L 1663.5 512.5 L 1644.5 512.5 Z M 253.5 370.5 L 272.5 370.5 L 272.5 512.5 L 253.5 512.5 Z M 310.5 370.5 L 329.5 370.5 L 329.5 512.5 L 310.5 512.5 Z M 368.5 370.5 L 387.5 370.5 L 387.5 512.5 L 368.5 512.5 Z M 425.5 370.5 L 444.5 370.5 L 444.5 512.5 L 425.5 512.5 Z M 484.5 370.5 L 503.5 370.5 L 503.5 512.5 L 484.5 512.5 Z M 541.5 370.5 L 560.5 370.5 L 560.5 512.5 L 541.5 512.5 Z M 598.5 370.5 L 617.5 370.5 L 617.5 512.5 L 598.5 512.5 Z M 655.5 370.5 L 674.5 370.5 L 674.5 512.5 L 655.5 512.5 Z M 712.5 370.5 L 731.5 370.5 L 731.5 512.5 L 712.5 512.5 Z M 769.5 370.5 L 788.5 370.5 L 788.5 512.5 L 769.5 512.5 Z M 826.5 370.5 L 845.5 370.5 L 845.5 512.5 L 826.5 512.5 Z M 883.5 370.5 L 902.5 370.5 L 902.5 512.5 L 883.5 512.5 Z M 941.5 370.5 L 960.5 370.5 L 960.5 512.5 L 941.5 512.5 Z M 998.5 370.5 L 1017.5 370.5 L 1017.5 512.5 L 998.5 512.5 Z M 1055.5 370.5 L 1074.5 370.5 L 1074.5 512.5 L 1055.5 512.5 Z M 1112.5 370.5 L 1131.5 370.5 L 1131.5 512.5 L 1112.5 512.5 Z M 1169.5 370.5 L 1188.5 370.5 L 1188.5 512.5 L 1169.5 512.5 Z M 1226.5 370.5 L 1245.5 370.5 L 1245.5 512.5 L 1226.5 512.5 Z M 1283.5 370.5 L 1302.5 370.5 L 1302.5 512.5 L 1283.5 512.5 Z M 1346.5 370.5 L 1365.5 370.5 L 1365.5 512.5 L 1346.5 512.5 Z M 1403.5 370.5 L 1422.5 370.5 L 1422.5 512.5 L 1403.5 512.5 Z M 1467.5 370.5 L 1486.5 370.5 L 1486.5 512.5 L 1467.5 512.5 Z M 1524.5 370.5 L 1543.5 370.5 L 1543.5 512.5 L 1524.5 512.5 Z M 1582.5 370.5 L 1601.5 370.5 L 1601.5 512.5 L 1582.5 512.5 Z M 1582.5 370.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 218.5 313.5 L 239.5 313.5 L 239.5 334.5 L 218.5 334.5 Z M 1678.5 313.5 L 1700.5 313.5 L 1700.5 334.5 L 1678.5 334.5 Z M 1617.5 313.5 L 1639.5 313.5 L 1639.5 334.5 L 1617.5 334.5 Z M 1557.5 313.5 L 1578.5 313.5 L 1578.5 334.5 L 1557.5 334.5 Z M 1496.5 313.5 L 1517.5 313.5 L 1517.5 334.5 L 1496.5 334.5 Z M 1435.5 313.5 L 1456.5 313.5 L 1456.5 334.5 L 1435.5 334.5 Z M 1374.5 313.5 L 1396.5 313.5 L 1396.5 334.5 L 1374.5 334.5 Z M 1313.5 313.5 L 1335.5 313.5 L 1335.5 334.5 L 1313.5 334.5 Z M 1252.5 313.5 L 1274.5 313.5 L 1274.5 334.5 L 1252.5 334.5 Z M 1192.5 313.5 L 1213.5 313.5 L 1213.5 334.5 L 1192.5 334.5 Z M 1131.5 313.5 L 1152.5 313.5 L 1152.5 334.5 L 1131.5 334.5 Z M 1070.5 313.5 L 1091.5 313.5 L 1091.5 334.5 L 1070.5 334.5 Z M 1009.5 313.5 L 1031.5 313.5 L 1031.5 334.5 L 1009.5 334.5 Z M 948.5 313.5 L 970.5 313.5 L 970.5 334.5 L 948.5 334.5 Z M 887.5 313.5 L 909.5 313.5 L 909.5 334.5 L 887.5 334.5 Z M 826.5 313.5 L 848.5 313.5 L 848.5 334.5 L 826.5 334.5 Z M 766.5 313.5 L 787.5 313.5 L 787.5 334.5 L 766.5 334.5 Z M 705.5 313.5 L 726.5 313.5 L 726.5 334.5 L 705.5 334.5 Z M 644.5 313.5 L 665.5 313.5 L 665.5 334.5 L 644.5 334.5 Z M 583.5 313.5 L 605.5 313.5 L 605.5 334.5 L 583.5 334.5 Z M 522.5 313.5 L 544.5 313.5 L 544.5 334.5 L 522.5 334.5 Z M 461.5 313.5 L 483.5 313.5 L 483.5 334.5 L 461.5 334.5 Z M 400.5 313.5 L 422.5 313.5 L 422.5 334.5 L 400.5 334.5 Z M 340.5 313.5 L 361.5 313.5 L 361.5 334.5 L 340.5 334.5 Z M 279.5 313.5 L 300.5 313.5 L 300.5 334.5 L 279.5 334.5 Z M 798.5 477.5 L 819.5 477.5 L 819.5 481.5 L 798.5 481.5 Z M 911.5 477.5 L 932.5 477.5 L 932.5 481.5 L 911.5 481.5 Z M 1494.5 477.5 L 1515.5 477.5 L 1515.5 481.5 L 1494.5 481.5 Z M 1025.5 477.5 L 1046.5 477.5 L 1046.5 481.5 L 1025.5 481.5 Z M 1139.5 477.5 L 1160.5 477.5 L 1160.5 481.5 L 1139.5 481.5 Z M 1614.5 477.5 L 1636.5 477.5 L 1636.5 483.5 L 1614.5 483.5 Z M 1373.5 477.5 L 1395.5 477.5 L 1395.5 483.5 L 1373.5 483.5 Z M 1253.5 477.5 L 1275.5 477.5 L 1275.5 483.5 L 1253.5 483.5 Z M 1253.5 483.5 L 1275.5 483.5 L 1275.5 498.5 L 1253.5 498.5 Z M 798.5 481.5 L 819.5 481.5 L 819.5 498.5 L 798.5 498.5 Z M 911.5 481.5 L 932.5 481.5 L 932.5 498.5 L 911.5 498.5 Z M 1139.5 481.5 L 1160.5 481.5 L 1160.5 498.5 L 1139.5 498.5 Z M 1494.5 481.5 L 1515.5 481.5 L 1515.5 498.5 L 1494.5 498.5 Z M 1025.5 481.5 L 1046.5 481.5 L 1046.5 498.5 L 1025.5 498.5 Z M 1373.5 483.5 L 1395.5 483.5 L 1395.5 498.5 L 1373.5 498.5 Z M 1614.5 483.5 L 1636.5 483.5 L 1636.5 498.5 L 1614.5 498.5 Z M 1076.5 524.5 L 1097.5 524.5 L 1097.5 545.5 L 1076.5 545.5 Z M 1545.5 524.5 L 1567.5 524.5 L 1567.5 545.5 L 1545.5 545.5 Z M 956.5 524.5 L 978.5 524.5 L 978.5 545.5 L 956.5 545.5 Z M 1427.5 524.5 L 1448.5 524.5 L 1448.5 545.5 L 1427.5 545.5 Z M 1309.5 524.5 L 1331.5 524.5 L 1331.5 545.5 L 1309.5 545.5 Z M 1192.5 524.5 L 1213.5 524.5 L 1213.5 545.5 L 1192.5 545.5 Z M 844.5 524.5 L 865.5 524.5 L 865.5 545.5 L 844.5 545.5 Z M 734.5 524.5 L 755.5 524.5 L 755.5 545.5 L 734.5 545.5 Z M 218.5 735.5 L 239.5 735.5 L 239.5 756.5 L 218.5 756.5 Z M 1678.5 735.5 L 1700.5 735.5 L 1700.5 756.5 L 1678.5 756.5 Z M 1617.5 735.5 L 1639.5 735.5 L 1639.5 756.5 L 1617.5 756.5 Z M 1557.5 735.5 L 1578.5 735.5 L 1578.5 756.5 L 1557.5 756.5 Z M 1496.5 735.5 L 1517.5 735.5 L 1517.5 756.5 L 1496.5 756.5 Z M 1435.5 735.5 L 1456.5 735.5 L 1456.5 756.5 L 1435.5 756.5 Z M 1374.5 735.5 L 1396.5 735.5 L 1396.5 756.5 L 1374.5 756.5 Z M 1313.5 735.5 L 1335.5 735.5 L 1335.5 756.5 L 1313.5 756.5 Z M 1252.5 735.5 L 1274.5 735.5 L 1274.5 756.5 L 1252.5 756.5 Z M 1192.5 735.5 L 1213.5 735.5 L 1213.5 756.5 L 1192.5 756.5 Z M 1131.5 735.5 L 1152.5 735.5 L 1152.5 756.5 L 1131.5 756.5 Z M 1070.5 735.5 L 1091.5 735.5 L 1091.5 756.5 L 1070.5 756.5 Z M 1009.5 735.5 L 1031.5 735.5 L 1031.5 756.5 L 1009.5 756.5 Z M 948.5 735.5 L 970.5 735.5 L 970.5 756.5 L 948.5 756.5 Z M 887.5 735.5 L 909.5 735.5 L 909.5 756.5 L 887.5 756.5 Z M 826.5 735.5 L 848.5 735.5 L 848.5 756.5 L 826.5 756.5 Z M 766.5 735.5 L 787.5 735.5 L 787.5 756.5 L 766.5 756.5 Z M 705.5 735.5 L 726.5 735.5 L 726.5 756.5 L 705.5 756.5 Z M 644.5 735.5 L 665.5 735.5 L 665.5 756.5 L 644.5 756.5 Z M 583.5 735.5 L 605.5 735.5 L 605.5 756.5 L 583.5 756.5 Z M 522.5 735.5 L 544.5 735.5 L 544.5 756.5 L 522.5 756.5 Z M 461.5 735.5 L 483.5 735.5 L 483.5 756.5 L 461.5 756.5 Z M 400.5 735.5 L 422.5 735.5 L 422.5 756.5 L 400.5 756.5 Z M 340.5 735.5 L 361.5 735.5 L 361.5 756.5 L 340.5 756.5 Z M 279.5 735.5 L 300.5 735.5 L 300.5 756.5 L 279.5 756.5 Z M 279.5 735.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface306">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 355.785156 540.515625 L 345.539062 540.515625 L 342.730469 548.5 L 339.121094 548.5 L 348.601562 521.917969 L 352.976562 521.917969 L 362.3125 548.5 L 358.519531 548.5 Z M 354.835938 537.667969 L 350.753906 525.5625 L 346.375 537.667969 Z M 354.835938 537.667969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 340 555 L 361 555 M 340 534 L 361 534 M 340 534 L 340 555 M 361 534 L 361 555 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 340 555 L 361 555 M 340 534 L 361 534 M 361 555 L 361 534 M 340 555 L 340 534 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 198 328 L 198 337 M 193 333 L 202 333 M 197 334 L 199 334 M 197 332 L 199 332 M 197 332 L 197 334 M 199 332 L 199 334 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/bufinv/sky130_fd_sc_hs__bufinv_8.svg b/cells/bufinv/sky130_fd_sc_hs__bufinv_8.svg
index 30a171a..863641a 100644
--- a/cells/bufinv/sky130_fd_sc_hs__bufinv_8.svg
+++ b/cells/bufinv/sky130_fd_sc_hs__bufinv_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 538.5 L 201.5 538.5 Z M 201.5 111.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 245.5 862.5 L 1675.5 862.5 L 1675.5 918.5 L 245.5 918.5 Z M 245.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1544.5 664.5 L 1578.5 664.5 L 1578.5 833.5 L 1544.5 833.5 Z M 344.5 664.5 L 379.5 664.5 L 379.5 833.5 L 344.5 833.5 Z M 454.5 664.5 L 489.5 664.5 L 489.5 833.5 L 454.5 833.5 Z M 557.5 664.5 L 592.5 664.5 L 592.5 833.5 L 557.5 833.5 Z M 672.5 664.5 L 706.5 664.5 L 706.5 833.5 L 672.5 833.5 Z M 771.5 664.5 L 805.5 664.5 L 805.5 833.5 L 771.5 833.5 Z M 885.5 664.5 L 920.5 664.5 L 920.5 833.5 L 885.5 833.5 Z M 984.5 664.5 L 1018.5 664.5 L 1018.5 833.5 L 984.5 833.5 Z M 1098.5 664.5 L 1133.5 664.5 L 1133.5 833.5 L 1098.5 833.5 Z M 1213.5 664.5 L 1247.5 664.5 L 1247.5 833.5 L 1213.5 833.5 Z M 1327.5 664.5 L 1362.5 664.5 L 1362.5 833.5 L 1327.5 833.5 Z M 1429.5 664.5 L 1464.5 664.5 L 1464.5 833.5 L 1429.5 833.5 Z M 1429.5 664.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1542.5 240.5 L 1576.5 240.5 L 1576.5 496.5 L 1542.5 496.5 Z M 343.5 240.5 L 377.5 240.5 L 377.5 496.5 L 343.5 496.5 Z M 458.5 240.5 L 492.5 240.5 L 492.5 496.5 L 458.5 496.5 Z M 561.5 240.5 L 595.5 240.5 L 595.5 496.5 L 561.5 496.5 Z M 664.5 240.5 L 698.5 240.5 L 698.5 496.5 L 664.5 496.5 Z M 767.5 240.5 L 801.5 240.5 L 801.5 496.5 L 767.5 496.5 Z M 870.5 240.5 L 905.5 240.5 L 905.5 496.5 L 870.5 496.5 Z M 973.5 240.5 L 1008.5 240.5 L 1008.5 496.5 L 973.5 496.5 Z M 1077.5 240.5 L 1111.5 240.5 L 1111.5 496.5 L 1077.5 496.5 Z M 1209.5 240.5 L 1244.5 240.5 L 1244.5 496.5 L 1209.5 496.5 Z M 1324.5 240.5 L 1358.5 240.5 L 1358.5 496.5 L 1324.5 496.5 Z M 1427.5 240.5 L 1462.5 240.5 L 1462.5 496.5 L 1427.5 496.5 Z M 1427.5 240.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 280.5 136.5 L 319.5 136.5 L 319.5 174.5 L 280.5 174.5 Z M 1600.5 136.5 L 1639.5 136.5 L 1639.5 174.5 L 1600.5 174.5 Z M 1490.5 136.5 L 1529.5 136.5 L 1529.5 174.5 L 1490.5 174.5 Z M 1380.5 136.5 L 1419.5 136.5 L 1419.5 174.5 L 1380.5 174.5 Z M 1270.5 136.5 L 1309.5 136.5 L 1309.5 174.5 L 1270.5 174.5 Z M 1160.5 136.5 L 1199.5 136.5 L 1199.5 174.5 L 1160.5 174.5 Z M 1050.5 136.5 L 1089.5 136.5 L 1089.5 174.5 L 1050.5 174.5 Z M 940.5 136.5 L 979.5 136.5 L 979.5 174.5 L 940.5 174.5 Z M 830.5 136.5 L 869.5 136.5 L 869.5 174.5 L 830.5 174.5 Z M 720.5 136.5 L 759.5 136.5 L 759.5 174.5 L 720.5 174.5 Z M 610.5 136.5 L 649.5 136.5 L 649.5 174.5 L 610.5 174.5 Z M 500.5 136.5 L 539.5 136.5 L 539.5 174.5 L 500.5 174.5 Z M 390.5 136.5 L 429.5 136.5 L 429.5 174.5 L 390.5 174.5 Z M 280.5 899.5 L 319.5 899.5 L 319.5 938.5 L 280.5 938.5 Z M 1600.5 899.5 L 1639.5 899.5 L 1639.5 938.5 L 1600.5 938.5 Z M 1490.5 899.5 L 1529.5 899.5 L 1529.5 938.5 L 1490.5 938.5 Z M 1380.5 899.5 L 1419.5 899.5 L 1419.5 938.5 L 1380.5 938.5 Z M 1270.5 899.5 L 1309.5 899.5 L 1309.5 938.5 L 1270.5 938.5 Z M 1160.5 899.5 L 1199.5 899.5 L 1199.5 938.5 L 1160.5 938.5 Z M 1050.5 899.5 L 1089.5 899.5 L 1089.5 938.5 L 1050.5 938.5 Z M 940.5 899.5 L 979.5 899.5 L 979.5 938.5 L 940.5 938.5 Z M 830.5 899.5 L 869.5 899.5 L 869.5 938.5 L 830.5 938.5 Z M 720.5 899.5 L 759.5 899.5 L 759.5 938.5 L 720.5 938.5 Z M 610.5 899.5 L 649.5 899.5 L 649.5 938.5 L 610.5 938.5 Z M 500.5 899.5 L 539.5 899.5 L 539.5 938.5 L 500.5 938.5 Z M 390.5 899.5 L 429.5 899.5 L 429.5 938.5 L 390.5 938.5 Z M 390.5 899.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface279">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 310.410156 546.757812 L 291.492188 546.757812 L 286.308594 561.5 L 279.644531 561.5 L 297.148438 512.421875 L 305.226562 512.421875 L 322.460938 561.5 L 315.460938 561.5 Z M 308.660156 541.503906 L 301.121094 519.15625 L 293.042969 541.503906 Z M 308.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 280 562 L 319 562 M 280 523 L 319 523 M 280 523 L 280 562 M 319 523 L 319 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 280 562 L 319 562 M 280 523 L 319 523 M 319 562 L 319 523 M 280 562 L 280 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 245 156 L 245 165 M 240 161 L 249 161 M 244 162 L 246 162 M 244 160 L 246 160 M 244 160 L 244 162 M 246 160 L 246 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.svg b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.svg
index e10bea8..9d1c48b 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.svg
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 538.5 L 701.5 538.5 Z M 701.5 111.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 744.5 862.5 L 1184.5 862.5 L 1184.5 918.5 L 744.5 918.5 Z M 744.5 862.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 1054.5 737.5 L 1088.5 737.5 L 1088.5 833.5 L 1054.5 833.5 Z M 840.5 737.5 L 875.5 737.5 L 875.5 833.5 L 840.5 833.5 Z M 840.5 737.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 1022.5 240.5 L 1056.5 240.5 L 1056.5 496.5 L 1022.5 496.5 Z M 895.5 240.5 L 930.5 240.5 L 930.5 496.5 L 895.5 496.5 Z M 895.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 780.5 136.5 L 819.5 136.5 L 819.5 174.5 L 780.5 174.5 Z M 1110.5 136.5 L 1149.5 136.5 L 1149.5 174.5 L 1110.5 174.5 Z M 1000.5 136.5 L 1039.5 136.5 L 1039.5 174.5 L 1000.5 174.5 Z M 890.5 136.5 L 929.5 136.5 L 929.5 174.5 L 890.5 174.5 Z M 780.5 899.5 L 819.5 899.5 L 819.5 938.5 L 780.5 938.5 Z M 1110.5 899.5 L 1149.5 899.5 L 1149.5 938.5 L 1110.5 938.5 Z M 1000.5 899.5 L 1039.5 899.5 L 1039.5 938.5 L 1000.5 938.5 Z M 890.5 899.5 L 929.5 899.5 L 929.5 938.5 L 890.5 938.5 Z M 890.5 899.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>
@@ -166,6 +166,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 1134.824219 282.320312 L 1152.191406 307.5 L 1144.449219 307.5 L 1131.050781 287.035156 L 1117.589844 307.5 L 1109.980469 307.5 L 1127.351562 282.320312 L 1111.058594 258.421875 L 1118.664062 258.421875 L 1131.253906 277.675781 L 1143.910156 258.421875 L 1151.382812 258.421875 Z M 1134.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1110 816 L 1149 816 M 1110 777 L 1149 777 M 1110 777 L 1110 816 M 1149 777 L 1149 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1110 816 L 1149 816 M 1110 777 L 1149 777 M 1149 816 L 1149 777 M 1110 816 L 1110 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 156 L 744 165 M 739 161 L 748 161 M 743 162 L 745 162 M 743 160 L 745 160 M 743 160 L 743 162 M 745 160 L 745 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.svg b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.svg
index e915897..a5ef9cb 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.svg
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 243.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 204.5 758.5 L 1714.5 758.5 L 1714.5 797.5 L 204.5 797.5 Z M 204.5 758.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1624.5 673.5 L 1647.5 673.5 L 1647.5 739.5 L 1624.5 739.5 Z M 270.5 673.5 L 293.5 673.5 L 293.5 739.5 L 270.5 739.5 Z M 337.5 673.5 L 361.5 673.5 L 361.5 739.5 L 337.5 739.5 Z M 408.5 673.5 L 432.5 673.5 L 432.5 739.5 L 408.5 739.5 Z M 476.5 673.5 L 499.5 673.5 L 499.5 739.5 L 476.5 739.5 Z M 554.5 673.5 L 578.5 673.5 L 578.5 739.5 L 554.5 739.5 Z M 622.5 673.5 L 646.5 673.5 L 646.5 739.5 L 622.5 739.5 Z M 690.5 673.5 L 713.5 673.5 L 713.5 739.5 L 690.5 739.5 Z M 757.5 673.5 L 781.5 673.5 L 781.5 739.5 L 757.5 739.5 Z M 825.5 673.5 L 849.5 673.5 L 849.5 739.5 L 825.5 739.5 Z M 893.5 673.5 L 916.5 673.5 L 916.5 739.5 L 893.5 739.5 Z M 971.5 673.5 L 995.5 673.5 L 995.5 739.5 L 971.5 739.5 Z M 1039.5 673.5 L 1062.5 673.5 L 1062.5 739.5 L 1039.5 739.5 Z M 1117.5 673.5 L 1141.5 673.5 L 1141.5 739.5 L 1117.5 739.5 Z M 1185.5 673.5 L 1209.5 673.5 L 1209.5 739.5 L 1185.5 739.5 Z M 1264.5 673.5 L 1287.5 673.5 L 1287.5 739.5 L 1264.5 739.5 Z M 1331.5 673.5 L 1355.5 673.5 L 1355.5 739.5 L 1331.5 739.5 Z M 1410.5 673.5 L 1434.5 673.5 L 1434.5 739.5 L 1410.5 739.5 Z M 1478.5 673.5 L 1501.5 673.5 L 1501.5 739.5 L 1478.5 739.5 Z M 1556.5 673.5 L 1580.5 673.5 L 1580.5 739.5 L 1556.5 739.5 Z M 1556.5 673.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1622.5 331.5 L 1645.5 331.5 L 1645.5 508.5 L 1622.5 508.5 Z M 272.5 331.5 L 296.5 331.5 L 296.5 508.5 L 272.5 508.5 Z M 343.5 331.5 L 367.5 331.5 L 367.5 508.5 L 343.5 508.5 Z M 414.5 331.5 L 437.5 331.5 L 437.5 508.5 L 414.5 508.5 Z M 484.5 331.5 L 508.5 331.5 L 508.5 508.5 L 484.5 508.5 Z M 557.5 331.5 L 580.5 331.5 L 580.5 508.5 L 557.5 508.5 Z M 628.5 331.5 L 651.5 331.5 L 651.5 508.5 L 628.5 508.5 Z M 698.5 331.5 L 722.5 331.5 L 722.5 508.5 L 698.5 508.5 Z M 769.5 331.5 L 793.5 331.5 L 793.5 508.5 L 769.5 508.5 Z M 840.5 331.5 L 863.5 331.5 L 863.5 508.5 L 840.5 508.5 Z M 911.5 331.5 L 934.5 331.5 L 934.5 508.5 L 911.5 508.5 Z M 981.5 331.5 L 1005.5 331.5 L 1005.5 508.5 L 981.5 508.5 Z M 1052.5 331.5 L 1076.5 331.5 L 1076.5 508.5 L 1052.5 508.5 Z M 1123.5 331.5 L 1147.5 331.5 L 1147.5 508.5 L 1123.5 508.5 Z M 1194.5 331.5 L 1217.5 331.5 L 1217.5 508.5 L 1194.5 508.5 Z M 1265.5 331.5 L 1288.5 331.5 L 1288.5 508.5 L 1265.5 508.5 Z M 1335.5 331.5 L 1359.5 331.5 L 1359.5 508.5 L 1335.5 508.5 Z M 1406.5 331.5 L 1430.5 331.5 L 1430.5 508.5 L 1406.5 508.5 Z M 1477.5 331.5 L 1500.5 331.5 L 1500.5 508.5 L 1477.5 508.5 Z M 1551.5 331.5 L 1574.5 331.5 L 1574.5 508.5 L 1551.5 508.5 Z M 1551.5 331.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 228.5 260.5 L 255.5 260.5 L 255.5 287.5 L 228.5 287.5 Z M 1662.5 260.5 L 1689.5 260.5 L 1689.5 287.5 L 1662.5 287.5 Z M 1587.5 260.5 L 1614.5 260.5 L 1614.5 287.5 L 1587.5 287.5 Z M 1511.5 260.5 L 1538.5 260.5 L 1538.5 287.5 L 1511.5 287.5 Z M 1436.5 260.5 L 1463.5 260.5 L 1463.5 287.5 L 1436.5 287.5 Z M 1360.5 260.5 L 1387.5 260.5 L 1387.5 287.5 L 1360.5 287.5 Z M 1285.5 260.5 L 1312.5 260.5 L 1312.5 287.5 L 1285.5 287.5 Z M 1209.5 260.5 L 1236.5 260.5 L 1236.5 287.5 L 1209.5 287.5 Z M 1134.5 260.5 L 1161.5 260.5 L 1161.5 287.5 L 1134.5 287.5 Z M 1059.5 260.5 L 1085.5 260.5 L 1085.5 287.5 L 1059.5 287.5 Z M 983.5 260.5 L 1010.5 260.5 L 1010.5 287.5 L 983.5 287.5 Z M 908.5 260.5 L 934.5 260.5 L 934.5 287.5 L 908.5 287.5 Z M 832.5 260.5 L 859.5 260.5 L 859.5 287.5 L 832.5 287.5 Z M 757.5 260.5 L 783.5 260.5 L 783.5 287.5 L 757.5 287.5 Z M 681.5 260.5 L 708.5 260.5 L 708.5 287.5 L 681.5 287.5 Z M 606.5 260.5 L 632.5 260.5 L 632.5 287.5 L 606.5 287.5 Z M 530.5 260.5 L 557.5 260.5 L 557.5 287.5 L 530.5 287.5 Z M 455.5 260.5 L 481.5 260.5 L 481.5 287.5 L 455.5 287.5 Z M 379.5 260.5 L 406.5 260.5 L 406.5 287.5 L 379.5 287.5 Z M 304.5 260.5 L 330.5 260.5 L 330.5 287.5 L 304.5 287.5 Z M 591.5 464.5 L 617.5 464.5 L 617.5 471.5 L 591.5 471.5 Z M 1440.5 464.5 L 1467.5 464.5 L 1467.5 471.5 L 1440.5 471.5 Z M 732.5 464.5 L 759.5 464.5 L 759.5 471.5 L 732.5 471.5 Z M 1015.5 464.5 L 1042.5 464.5 L 1042.5 471.5 L 1015.5 471.5 Z M 1298.5 464.5 L 1325.5 464.5 L 1325.5 471.5 L 1298.5 471.5 Z M 1157.5 464.5 L 1184.5 464.5 L 1184.5 471.5 L 1157.5 471.5 Z M 871.5 464.5 L 898.5 464.5 L 898.5 471.5 L 871.5 471.5 Z M 1585.5 464.5 L 1611.5 464.5 L 1611.5 471.5 L 1585.5 471.5 Z M 1015.5 471.5 L 1042.5 471.5 L 1042.5 490.5 L 1015.5 490.5 Z M 1440.5 471.5 L 1467.5 471.5 L 1467.5 490.5 L 1440.5 490.5 Z M 1157.5 471.5 L 1184.5 471.5 L 1184.5 490.5 L 1157.5 490.5 Z M 732.5 471.5 L 759.5 471.5 L 759.5 490.5 L 732.5 490.5 Z M 591.5 471.5 L 617.5 471.5 L 617.5 490.5 L 591.5 490.5 Z M 1585.5 471.5 L 1611.5 471.5 L 1611.5 490.5 L 1585.5 490.5 Z M 871.5 471.5 L 898.5 471.5 L 898.5 490.5 L 871.5 490.5 Z M 1298.5 471.5 L 1325.5 471.5 L 1325.5 490.5 L 1298.5 490.5 Z M 658.5 580.5 L 685.5 580.5 L 685.5 597.5 L 658.5 597.5 Z M 794.5 580.5 L 820.5 580.5 L 820.5 597.5 L 794.5 597.5 Z M 1364.5 580.5 L 1390.5 580.5 L 1390.5 597.5 L 1364.5 597.5 Z M 1070.5 580.5 L 1096.5 580.5 L 1096.5 597.5 L 1070.5 597.5 Z M 1510.5 580.5 L 1537.5 580.5 L 1537.5 597.5 L 1510.5 597.5 Z M 926.5 580.5 L 952.5 580.5 L 952.5 597.5 L 926.5 597.5 Z M 1217.5 580.5 L 1244.5 580.5 L 1244.5 597.5 L 1217.5 597.5 Z M 794.5 597.5 L 820.5 597.5 L 820.5 607.5 L 794.5 607.5 Z M 520.5 580.5 L 547.5 580.5 L 547.5 607.5 L 520.5 607.5 Z M 1217.5 597.5 L 1244.5 597.5 L 1244.5 607.5 L 1217.5 607.5 Z M 1070.5 597.5 L 1096.5 597.5 L 1096.5 607.5 L 1070.5 607.5 Z M 658.5 597.5 L 685.5 597.5 L 685.5 607.5 L 658.5 607.5 Z M 1510.5 597.5 L 1537.5 597.5 L 1537.5 607.5 L 1510.5 607.5 Z M 926.5 597.5 L 952.5 597.5 L 952.5 607.5 L 926.5 607.5 Z M 1364.5 597.5 L 1390.5 597.5 L 1390.5 607.5 L 1364.5 607.5 Z M 228.5 784.5 L 255.5 784.5 L 255.5 810.5 L 228.5 810.5 Z M 1662.5 784.5 L 1689.5 784.5 L 1689.5 810.5 L 1662.5 810.5 Z M 1587.5 784.5 L 1614.5 784.5 L 1614.5 810.5 L 1587.5 810.5 Z M 1511.5 784.5 L 1538.5 784.5 L 1538.5 810.5 L 1511.5 810.5 Z M 1436.5 784.5 L 1463.5 784.5 L 1463.5 810.5 L 1436.5 810.5 Z M 1360.5 784.5 L 1387.5 784.5 L 1387.5 810.5 L 1360.5 810.5 Z M 1285.5 784.5 L 1312.5 784.5 L 1312.5 810.5 L 1285.5 810.5 Z M 1209.5 784.5 L 1236.5 784.5 L 1236.5 810.5 L 1209.5 810.5 Z M 1134.5 784.5 L 1161.5 784.5 L 1161.5 810.5 L 1134.5 810.5 Z M 1059.5 784.5 L 1085.5 784.5 L 1085.5 810.5 L 1059.5 810.5 Z M 983.5 784.5 L 1010.5 784.5 L 1010.5 810.5 L 983.5 810.5 Z M 908.5 784.5 L 934.5 784.5 L 934.5 810.5 L 908.5 810.5 Z M 832.5 784.5 L 859.5 784.5 L 859.5 810.5 L 832.5 810.5 Z M 757.5 784.5 L 783.5 784.5 L 783.5 810.5 L 757.5 810.5 Z M 681.5 784.5 L 708.5 784.5 L 708.5 810.5 L 681.5 810.5 Z M 606.5 784.5 L 632.5 784.5 L 632.5 810.5 L 606.5 810.5 Z M 530.5 784.5 L 557.5 784.5 L 557.5 810.5 L 530.5 810.5 Z M 455.5 784.5 L 481.5 784.5 L 481.5 810.5 L 455.5 810.5 Z M 379.5 784.5 L 406.5 784.5 L 406.5 810.5 L 379.5 810.5 Z M 304.5 784.5 L 330.5 784.5 L 330.5 810.5 L 304.5 810.5 Z M 304.5 784.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface277">
+<g id="surface306">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 475.4375 542.363281 L 462.433594 542.363281 L 458.867188 552.5 L 454.285156 552.5 L 466.320312 518.757812 L 471.875 518.757812 L 483.722656 552.5 L 478.910156 552.5 Z M 474.234375 538.753906 L 469.050781 523.386719 L 463.496094 538.753906 Z M 474.234375 538.753906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 455 557 L 481 557 M 455 530 L 481 530 M 455 530 L 455 557 M 481 530 L 481 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 455 557 L 481 557 M 455 530 L 481 530 M 481 557 L 481 530 M 455 557 L 455 530 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204 277 L 204 286 M 199 282 L 208 282 M 203 283 L 205 283 M 203 281 L 205 281 M 203 281 L 203 283 M 205 281 L 205 283 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.svg b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.svg
index bbc9ad7..85a676a 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.svg
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 538.5 L 701.5 538.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 744.5 862.5 L 1184.5 862.5 L 1184.5 918.5 L 744.5 918.5 Z M 744.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1054.5 737.5 L 1088.5 737.5 L 1088.5 833.5 L 1054.5 833.5 Z M 840.5 737.5 L 875.5 737.5 L 875.5 833.5 L 840.5 833.5 Z M 939.5 737.5 L 973.5 737.5 L 973.5 833.5 L 939.5 833.5 Z M 939.5 737.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1047.5 240.5 L 1081.5 240.5 L 1081.5 496.5 L 1047.5 496.5 Z M 840.5 240.5 L 875.5 240.5 L 875.5 496.5 L 840.5 496.5 Z M 944.5 240.5 L 978.5 240.5 L 978.5 496.5 L 944.5 496.5 Z M 944.5 240.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 780.5 136.5 L 819.5 136.5 L 819.5 174.5 L 780.5 174.5 Z M 1110.5 136.5 L 1149.5 136.5 L 1149.5 174.5 L 1110.5 174.5 Z M 1000.5 136.5 L 1039.5 136.5 L 1039.5 174.5 L 1000.5 174.5 Z M 890.5 136.5 L 929.5 136.5 L 929.5 174.5 L 890.5 174.5 Z M 780.5 899.5 L 819.5 899.5 L 819.5 938.5 L 780.5 938.5 Z M 1110.5 899.5 L 1149.5 899.5 L 1149.5 938.5 L 1110.5 938.5 Z M 1000.5 899.5 L 1039.5 899.5 L 1039.5 938.5 L 1000.5 938.5 Z M 890.5 899.5 L 929.5 899.5 L 929.5 938.5 L 890.5 938.5 Z M 890.5 899.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface274">
+<g id="surface303">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1029.410156 461.757812 L 1010.492188 461.757812 L 1005.308594 476.5 L 998.644531 476.5 L 1016.148438 427.421875 L 1024.226562 427.421875 L 1041.460938 476.5 L 1034.460938 476.5 Z M 1027.660156 456.503906 L 1020.121094 434.15625 L 1012.042969 456.503906 Z M 1027.660156 456.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1000 647 L 1039 647 M 1000 608 L 1039 608 M 1000 608 L 1000 647 M 1039 608 L 1039 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1000 647 L 1039 647 M 1000 608 L 1039 608 M 1039 647 L 1039 608 M 1000 647 L 1000 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 156 L 744 165 M 739 161 L 748 161 M 743 162 L 745 162 M 743 160 L 745 160 M 743 160 L 743 162 M 745 160 L 745 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.svg b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.svg
index 9da366a..f943a98 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.svg
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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 1159.5 737.5 L 1193.5 737.5 L 1193.5 833.5 L 1159.5 833.5 Z M 733.5 737.5 L 767.5 737.5 L 767.5 833.5 L 733.5 833.5 Z M 831.5 737.5 L 866.5 737.5 L 866.5 833.5 L 831.5 833.5 Z M 930.5 737.5 L 964.5 737.5 L 964.5 833.5 L 930.5 833.5 Z M 1038.5 737.5 L 1072.5 737.5 L 1072.5 833.5 L 1038.5 833.5 Z M 1038.5 737.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 1156.5 240.5 L 1190.5 240.5 L 1190.5 496.5 L 1156.5 496.5 Z M 732.5 240.5 L 766.5 240.5 L 766.5 496.5 L 732.5 496.5 Z M 835.5 240.5 L 869.5 240.5 L 869.5 496.5 L 835.5 496.5 Z M 938.5 240.5 L 972.5 240.5 L 972.5 496.5 L 938.5 496.5 Z M 1041.5 240.5 L 1075.5 240.5 L 1075.5 496.5 L 1041.5 496.5 Z M 1041.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.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>
@@ -148,6 +148,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 802.824219 706.320312 L 820.191406 731.5 L 812.449219 731.5 L 799.050781 711.035156 L 785.589844 731.5 L 777.980469 731.5 L 795.351562 706.320312 L 779.058594 682.421875 L 786.664062 682.421875 L 799.253906 701.675781 L 811.910156 682.421875 L 819.382812 682.421875 Z M 802.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 779 392 L 818 392 M 779 353 L 818 353 M 779 353 L 779 392 M 818 353 L 818 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 779 392 L 818 392 M 779 353 L 818 353 M 818 392 L 818 353 M 779 392 L 779 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.svg b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.svg
index 9ea5ea6..534fc75 100644
--- a/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.svg
+++ b/cells/clkbuf/sky130_fd_sc_hs__clkbuf_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1435.5 737.5 L 1470.5 737.5 L 1470.5 833.5 L 1435.5 833.5 Z M 468.5 737.5 L 502.5 737.5 L 502.5 833.5 L 468.5 833.5 Z M 567.5 737.5 L 601.5 737.5 L 601.5 833.5 L 567.5 833.5 Z M 691.5 737.5 L 726.5 737.5 L 726.5 833.5 L 691.5 833.5 Z M 796.5 737.5 L 830.5 737.5 L 830.5 833.5 L 796.5 833.5 Z M 926.5 737.5 L 961.5 737.5 L 961.5 833.5 L 926.5 833.5 Z M 1025.5 737.5 L 1059.5 737.5 L 1059.5 833.5 L 1025.5 833.5 Z M 1123.5 737.5 L 1158.5 737.5 L 1158.5 833.5 L 1123.5 833.5 Z M 1222.5 737.5 L 1256.5 737.5 L 1256.5 833.5 L 1222.5 833.5 Z M 1337.5 737.5 L 1371.5 737.5 L 1371.5 833.5 L 1337.5 833.5 Z M 1337.5 737.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1432.5 240.5 L 1466.5 240.5 L 1466.5 496.5 L 1432.5 496.5 Z M 465.5 240.5 L 499.5 240.5 L 499.5 496.5 L 465.5 496.5 Z M 569.5 240.5 L 603.5 240.5 L 603.5 496.5 L 569.5 496.5 Z M 695.5 240.5 L 729.5 240.5 L 729.5 496.5 L 695.5 496.5 Z M 798.5 240.5 L 832.5 240.5 L 832.5 496.5 L 798.5 496.5 Z M 901.5 240.5 L 936.5 240.5 L 936.5 496.5 L 901.5 496.5 Z M 1004.5 240.5 L 1039.5 240.5 L 1039.5 496.5 L 1004.5 496.5 Z M 1107.5 240.5 L 1142.5 240.5 L 1142.5 496.5 L 1107.5 496.5 Z M 1211.5 240.5 L 1245.5 240.5 L 1245.5 496.5 L 1211.5 496.5 Z M 1325.5 240.5 L 1360.5 240.5 L 1360.5 496.5 L 1325.5 496.5 Z M 1325.5 240.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface274">
+<g id="surface303">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 531.410156 546.757812 L 512.492188 546.757812 L 507.308594 561.5 L 500.644531 561.5 L 518.148438 512.421875 L 526.226562 512.421875 L 543.460938 561.5 L 536.460938 561.5 Z M 529.660156 541.503906 L 522.121094 519.15625 L 514.042969 541.503906 Z M 529.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 501 562 L 540 562 M 501 523 L 540 523 M 501 523 L 501 562 M 540 523 L 540 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 501 562 L 540 562 M 501 523 L 540 523 M 540 562 L 540 523 M 501 562 L 501 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.svg b/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.svg
index 4d5db6e..151365e 100644
--- a/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.svg
+++ b/cells/clkdlyinv3sd1/sky130_fd_sc_hs__clkdlyinv3sd1_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image292" 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="#image292"/>
+  <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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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="#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 1146.5 737.5 L 1181.5 737.5 L 1181.5 833.5 L 1146.5 833.5 Z M 726.5 737.5 L 760.5 737.5 L 760.5 833.5 L 726.5 833.5 Z M 929.5 737.5 L 963.5 737.5 L 963.5 833.5 L 929.5 833.5 Z M 929.5 737.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <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 925.5 240.5 L 960.5 240.5 L 960.5 469.5 L 925.5 469.5 Z M 729.5 240.5 L 764.5 240.5 L 764.5 496.5 L 729.5 496.5 Z M 1149.5 240.5 L 1183.5 240.5 L 1183.5 496.5 L 1149.5 496.5 Z M 1149.5 240.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <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="surface289">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1240.699219 286.269531 L 1240.699219 297.5 L 1237.046875 297.5 L 1237.046875 286.269531 L 1226.011719 268.871094 L 1230.527344 268.871094 L 1238.929688 282.8125 L 1247.097656 268.871094 L 1251.457031 268.871094 Z M 1240.699219 286.269531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1219 816 L 1258 816 M 1219 777 L 1258 777 M 1219 777 L 1219 816 M 1258 777 L 1258 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1219 816 L 1258 816 M 1219 777 L 1258 777 M 1258 816 L 1258 777 M 1219 816 L 1219 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.svg b/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.svg
index 2c6f2c7..d667a5d 100644
--- a/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.svg
+++ b/cells/clkdlyinv3sd2/sky130_fd_sc_hs__clkdlyinv3sd2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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="#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 1146.5 737.5 L 1181.5 737.5 L 1181.5 833.5 L 1146.5 833.5 Z M 726.5 737.5 L 760.5 737.5 L 760.5 833.5 L 726.5 833.5 Z M 922.5 737.5 L 963.5 737.5 L 963.5 833.5 L 922.5 833.5 Z M 922.5 737.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <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 907.5 240.5 L 964.5 240.5 L 964.5 469.5 L 907.5 469.5 Z M 729.5 240.5 L 764.5 240.5 L 764.5 496.5 L 729.5 496.5 Z M 1149.5 240.5 L 1183.5 240.5 L 1183.5 496.5 L 1149.5 496.5 Z M 1149.5 240.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <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="surface290">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1240.699219 286.269531 L 1240.699219 297.5 L 1237.046875 297.5 L 1237.046875 286.269531 L 1226.011719 268.871094 L 1230.527344 268.871094 L 1238.929688 282.8125 L 1247.097656 268.871094 L 1251.457031 268.871094 Z M 1240.699219 286.269531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1219 816 L 1258 816 M 1219 777 L 1258 777 M 1219 777 L 1219 816 M 1258 777 L 1258 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1219 816 L 1258 816 M 1219 777 L 1258 777 M 1258 816 L 1258 777 M 1219 816 L 1219 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.svg b/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.svg
index 936f1a0..3e8808f 100644
--- a/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.svg
+++ b/cells/clkdlyinv3sd3/sky130_fd_sc_hs__clkdlyinv3sd3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image292" 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="#image292"/>
+  <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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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="#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 1146.5 737.5 L 1181.5 737.5 L 1181.5 833.5 L 1146.5 833.5 Z M 726.5 737.5 L 760.5 737.5 L 760.5 833.5 L 726.5 833.5 Z M 922.5 737.5 L 963.5 737.5 L 963.5 833.5 L 922.5 833.5 Z M 922.5 737.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <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 850.5 240.5 L 964.5 240.5 L 964.5 469.5 L 850.5 469.5 Z M 729.5 240.5 L 764.5 240.5 L 764.5 496.5 L 729.5 496.5 Z M 1149.5 240.5 L 1183.5 240.5 L 1183.5 496.5 L 1149.5 496.5 Z M 1149.5 240.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <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="surface289">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1240.699219 286.269531 L 1240.699219 297.5 L 1237.046875 297.5 L 1237.046875 286.269531 L 1226.011719 268.871094 L 1230.527344 268.871094 L 1238.929688 282.8125 L 1247.097656 268.871094 L 1251.457031 268.871094 Z M 1240.699219 286.269531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1219 816 L 1258 816 M 1219 777 L 1258 777 M 1219 777 L 1219 816 M 1258 777 L 1258 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1219 816 L 1258 816 M 1219 777 L 1258 777 M 1258 816 L 1258 777 M 1219 816 L 1219 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.svg b/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.svg
index fa63ca4..c9383f1 100644
--- a/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.svg
+++ b/cells/clkdlyinv5sd1/sky130_fd_sc_hs__clkdlyinv5sd1_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <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 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.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="#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 1418.5 737.5 L 1452.5 737.5 L 1452.5 833.5 L 1418.5 833.5 Z M 449.5 737.5 L 483.5 737.5 L 483.5 833.5 L 449.5 833.5 Z M 651.5 737.5 L 686.5 737.5 L 686.5 833.5 L 651.5 833.5 Z M 950.5 737.5 L 985.5 737.5 L 985.5 833.5 L 950.5 833.5 Z M 1278.5 737.5 L 1313.5 737.5 L 1313.5 833.5 L 1278.5 833.5 Z M 1278.5 737.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <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 1277.5 240.5 L 1311.5 240.5 L 1311.5 469.5 L 1277.5 469.5 Z M 653.5 240.5 L 687.5 240.5 L 687.5 469.5 L 653.5 469.5 Z M 950.5 240.5 L 985.5 240.5 L 985.5 469.5 L 950.5 469.5 Z M 1420.5 240.5 L 1455.5 240.5 L 1455.5 496.5 L 1420.5 496.5 Z M 452.5 240.5 L 486.5 240.5 L 486.5 496.5 L 452.5 496.5 Z M 452.5 240.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <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="surface290">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,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 1512.699219 286.269531 L 1512.699219 297.5 L 1509.046875 297.5 L 1509.046875 286.269531 L 1498.011719 268.871094 L 1502.527344 268.871094 L 1510.929688 282.8125 L 1519.097656 268.871094 L 1523.457031 268.871094 Z M 1512.699219 286.269531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1490 816 L 1529 816 M 1490 777 L 1529 777 M 1490 777 L 1490 816 M 1529 777 L 1529 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1490 816 L 1529 816 M 1490 777 L 1529 777 M 1529 816 L 1529 777 M 1490 816 L 1490 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.svg b/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.svg
index 3496c6c..6b4ac8a 100644
--- a/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.svg
+++ b/cells/clkdlyinv5sd2/sky130_fd_sc_hs__clkdlyinv5sd2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <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 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.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="#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 1418.5 737.5 L 1452.5 737.5 L 1452.5 833.5 L 1418.5 833.5 Z M 449.5 737.5 L 483.5 737.5 L 483.5 833.5 L 449.5 833.5 Z M 644.5 737.5 L 686.5 737.5 L 686.5 833.5 L 644.5 833.5 Z M 944.5 737.5 L 985.5 737.5 L 985.5 833.5 L 944.5 833.5 Z M 1271.5 737.5 L 1313.5 737.5 L 1313.5 833.5 L 1271.5 833.5 Z M 1271.5 737.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <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 1254.5 240.5 L 1311.5 240.5 L 1311.5 469.5 L 1254.5 469.5 Z M 630.5 240.5 L 687.5 240.5 L 687.5 469.5 L 630.5 469.5 Z M 928.5 240.5 L 985.5 240.5 L 985.5 469.5 L 928.5 469.5 Z M 1420.5 240.5 L 1455.5 240.5 L 1455.5 496.5 L 1420.5 496.5 Z M 452.5 240.5 L 486.5 240.5 L 486.5 496.5 L 452.5 496.5 Z M 452.5 240.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image297" 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="#image297"/>
+  <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="surface291">
+<g id="surface320">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,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 1512.699219 286.269531 L 1512.699219 297.5 L 1509.046875 297.5 L 1509.046875 286.269531 L 1498.011719 268.871094 L 1502.527344 268.871094 L 1510.929688 282.8125 L 1519.097656 268.871094 L 1523.457031 268.871094 Z M 1512.699219 286.269531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1490 816 L 1529 816 M 1490 777 L 1529 777 M 1490 777 L 1490 816 M 1529 777 L 1529 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1490 816 L 1529 816 M 1490 777 L 1529 777 M 1529 816 L 1529 777 M 1490 816 L 1490 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.svg b/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.svg
index efdf460..45ecff3 100644
--- a/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.svg
+++ b/cells/clkdlyinv5sd3/sky130_fd_sc_hs__clkdlyinv5sd3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <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 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.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="#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 1418.5 737.5 L 1452.5 737.5 L 1452.5 833.5 L 1418.5 833.5 Z M 449.5 737.5 L 483.5 737.5 L 483.5 833.5 L 449.5 833.5 Z M 644.5 737.5 L 686.5 737.5 L 686.5 833.5 L 644.5 833.5 Z M 944.5 737.5 L 985.5 737.5 L 985.5 833.5 L 944.5 833.5 Z M 1271.5 737.5 L 1313.5 737.5 L 1313.5 833.5 L 1271.5 833.5 Z M 1271.5 737.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <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 1197.5 240.5 L 1311.5 240.5 L 1311.5 469.5 L 1197.5 469.5 Z M 572.5 240.5 L 687.5 240.5 L 687.5 469.5 L 572.5 469.5 Z M 870.5 240.5 L 985.5 240.5 L 985.5 469.5 L 870.5 469.5 Z M 1420.5 240.5 L 1455.5 240.5 L 1455.5 496.5 L 1420.5 496.5 Z M 452.5 240.5 L 486.5 240.5 L 486.5 496.5 L 452.5 496.5 Z M 452.5 240.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <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="surface290">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,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 1512.699219 286.269531 L 1512.699219 297.5 L 1509.046875 297.5 L 1509.046875 286.269531 L 1498.011719 268.871094 L 1502.527344 268.871094 L 1510.929688 282.8125 L 1519.097656 268.871094 L 1523.457031 268.871094 Z M 1512.699219 286.269531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1490 816 L 1529 816 M 1490 777 L 1529 777 M 1490 777 L 1490 816 M 1529 777 L 1529 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1490 816 L 1529 816 M 1490 777 L 1529 777 M 1529 816 L 1529 777 M 1490 816 L 1490 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_1.svg b/cells/clkinv/sky130_fd_sc_hs__clkinv_1.svg
index f3270bb..6c3b83a 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_1.svg
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 538.5 L 756.5 538.5 Z M 756.5 111.5 "/>
 </clipPath>
-<image id="image286" 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="#image286"/>
+  <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 799.5 862.5 L 1129.5 862.5 L 1129.5 918.5 L 799.5 918.5 Z M 799.5 862.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="#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 911.5 737.5 L 946.5 737.5 L 946.5 833.5 L 911.5 833.5 Z M 911.5 737.5 "/>
 </clipPath>
-<image id="image287" 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="#image287"/>
+  <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 999.5 240.5 L 1033.5 240.5 L 1033.5 432.5 L 999.5 432.5 Z M 895.5 240.5 L 930.5 240.5 L 930.5 432.5 L 895.5 432.5 Z M 895.5 240.5 "/>
 </clipPath>
-<image id="image288" 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="#image288"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 835.5 136.5 L 874.5 136.5 L 874.5 174.5 L 835.5 174.5 Z M 1055.5 136.5 L 1094.5 136.5 L 1094.5 174.5 L 1055.5 174.5 Z M 945.5 136.5 L 984.5 136.5 L 984.5 174.5 L 945.5 174.5 Z M 835.5 899.5 L 874.5 899.5 L 874.5 938.5 L 835.5 938.5 Z M 1055.5 899.5 L 1094.5 899.5 L 1094.5 938.5 L 1055.5 938.5 Z M 945.5 899.5 L 984.5 899.5 L 984.5 938.5 L 945.5 938.5 Z M 945.5 899.5 "/>
 </clipPath>
-<image id="image289" 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="#image289"/>
+  <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="surface283">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,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 1078.554688 457.246094 L 1078.554688 476.5 L 1072.292969 476.5 L 1072.292969 457.246094 L 1053.375 427.421875 L 1061.117188 427.421875 L 1075.523438 451.320312 L 1089.527344 427.421875 L 1097 427.421875 Z M 1078.554688 457.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1055 647 L 1094 647 M 1055 608 L 1094 608 M 1055 608 L 1055 647 M 1094 608 L 1094 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1055 647 L 1094 647 M 1055 608 L 1094 608 M 1094 647 L 1094 608 M 1055 647 L 1055 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 799 156 L 799 165 M 794 161 L 803 161 M 798 162 L 800 162 M 798 160 L 800 160 M 798 160 L 798 162 M 800 160 L 800 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_16.svg b/cells/clkinv/sky130_fd_sc_hs__clkinv_16.svg
index 16c19a0..81eeccd 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_16.svg
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 290.5 L 1744.5 290.5 L 1744.5 535.5 L 175.5 535.5 Z M 175.5 290.5 "/>
 </clipPath>
-<image id="image272" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image272"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 200.5 722.5 L 1719.5 722.5 L 1719.5 754.5 L 200.5 754.5 Z M 200.5 722.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image272"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1161.5 646.5 L 1181.5 646.5 L 1181.5 701.5 L 1161.5 701.5 Z M 255.5 646.5 L 275.5 646.5 L 275.5 701.5 L 255.5 701.5 Z M 312.5 646.5 L 332.5 646.5 L 332.5 701.5 L 312.5 701.5 Z M 368.5 646.5 L 388.5 646.5 L 388.5 701.5 L 368.5 701.5 Z M 425.5 646.5 L 445.5 646.5 L 445.5 701.5 L 425.5 701.5 Z M 491.5 646.5 L 511.5 646.5 L 511.5 701.5 L 491.5 701.5 Z M 548.5 646.5 L 568.5 646.5 L 568.5 701.5 L 548.5 701.5 Z M 614.5 646.5 L 634.5 646.5 L 634.5 701.5 L 614.5 701.5 Z M 670.5 646.5 L 690.5 646.5 L 690.5 701.5 L 670.5 701.5 Z M 746.5 646.5 L 765.5 646.5 L 765.5 701.5 L 746.5 701.5 Z M 802.5 646.5 L 822.5 646.5 L 822.5 701.5 L 802.5 701.5 Z M 877.5 646.5 L 897.5 646.5 L 897.5 701.5 L 877.5 701.5 Z M 934.5 646.5 L 954.5 646.5 L 954.5 701.5 L 934.5 701.5 Z M 991.5 646.5 L 1011.5 646.5 L 1011.5 701.5 L 991.5 701.5 Z M 1048.5 646.5 L 1067.5 646.5 L 1067.5 701.5 L 1048.5 701.5 Z M 1104.5 646.5 L 1124.5 646.5 L 1124.5 701.5 L 1104.5 701.5 Z M 1104.5 646.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image273"/>
+  <use xlink:href="#image301"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1642.5 364.5 L 1662.5 364.5 L 1662.5 512.5 L 1642.5 512.5 Z M 256.5 364.5 L 276.5 364.5 L 276.5 512.5 L 256.5 512.5 Z M 316.5 364.5 L 335.5 364.5 L 335.5 512.5 L 316.5 512.5 Z M 375.5 364.5 L 395.5 364.5 L 395.5 512.5 L 375.5 512.5 Z M 434.5 364.5 L 454.5 364.5 L 454.5 512.5 L 434.5 512.5 Z M 494.5 364.5 L 514.5 364.5 L 514.5 512.5 L 494.5 512.5 Z M 553.5 364.5 L 573.5 364.5 L 573.5 512.5 L 553.5 512.5 Z M 612.5 364.5 L 632.5 364.5 L 632.5 512.5 L 612.5 512.5 Z M 672.5 364.5 L 692.5 364.5 L 692.5 512.5 L 672.5 512.5 Z M 731.5 364.5 L 751.5 364.5 L 751.5 512.5 L 731.5 512.5 Z M 790.5 364.5 L 810.5 364.5 L 810.5 512.5 L 790.5 512.5 Z M 850.5 364.5 L 870.5 364.5 L 870.5 512.5 L 850.5 512.5 Z M 909.5 364.5 L 929.5 364.5 L 929.5 512.5 L 909.5 512.5 Z M 975.5 364.5 L 995.5 364.5 L 995.5 512.5 L 975.5 512.5 Z M 1034.5 364.5 L 1054.5 364.5 L 1054.5 512.5 L 1034.5 512.5 Z M 1100.5 364.5 L 1120.5 364.5 L 1120.5 512.5 L 1100.5 512.5 Z M 1168.5 364.5 L 1187.5 364.5 L 1187.5 512.5 L 1168.5 512.5 Z M 1227.5 364.5 L 1247.5 364.5 L 1247.5 512.5 L 1227.5 512.5 Z M 1286.5 364.5 L 1306.5 364.5 L 1306.5 512.5 L 1286.5 512.5 Z M 1346.5 364.5 L 1365.5 364.5 L 1365.5 512.5 L 1346.5 512.5 Z M 1405.5 364.5 L 1425.5 364.5 L 1425.5 512.5 L 1405.5 512.5 Z M 1464.5 364.5 L 1484.5 364.5 L 1484.5 512.5 L 1464.5 512.5 Z M 1524.5 364.5 L 1543.5 364.5 L 1543.5 512.5 L 1524.5 512.5 Z M 1583.5 364.5 L 1603.5 364.5 L 1603.5 512.5 L 1583.5 512.5 Z M 1583.5 364.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 220.5 304.5 L 243.5 304.5 L 243.5 326.5 L 220.5 326.5 Z M 1676.5 304.5 L 1698.5 304.5 L 1698.5 326.5 L 1676.5 326.5 Z M 1613.5 304.5 L 1635.5 304.5 L 1635.5 326.5 L 1613.5 326.5 Z M 1549.5 304.5 L 1572.5 304.5 L 1572.5 326.5 L 1549.5 326.5 Z M 1486.5 304.5 L 1508.5 304.5 L 1508.5 326.5 L 1486.5 326.5 Z M 1423.5 304.5 L 1445.5 304.5 L 1445.5 326.5 L 1423.5 326.5 Z M 1359.5 304.5 L 1382.5 304.5 L 1382.5 326.5 L 1359.5 326.5 Z M 1296.5 304.5 L 1319.5 304.5 L 1319.5 326.5 L 1296.5 326.5 Z M 1233.5 304.5 L 1255.5 304.5 L 1255.5 326.5 L 1233.5 326.5 Z M 1170.5 304.5 L 1192.5 304.5 L 1192.5 326.5 L 1170.5 326.5 Z M 1106.5 304.5 L 1129.5 304.5 L 1129.5 326.5 L 1106.5 326.5 Z M 1043.5 304.5 L 1065.5 304.5 L 1065.5 326.5 L 1043.5 326.5 Z M 980.5 304.5 L 1002.5 304.5 L 1002.5 326.5 L 980.5 326.5 Z M 916.5 304.5 L 939.5 304.5 L 939.5 326.5 L 916.5 326.5 Z M 853.5 304.5 L 876.5 304.5 L 876.5 326.5 L 853.5 326.5 Z M 790.5 304.5 L 812.5 304.5 L 812.5 326.5 L 790.5 326.5 Z M 726.5 304.5 L 749.5 304.5 L 749.5 326.5 L 726.5 326.5 Z M 663.5 304.5 L 686.5 304.5 L 686.5 326.5 L 663.5 326.5 Z M 600.5 304.5 L 622.5 304.5 L 622.5 326.5 L 600.5 326.5 Z M 537.5 304.5 L 559.5 304.5 L 559.5 326.5 L 537.5 326.5 Z M 473.5 304.5 L 496.5 304.5 L 496.5 326.5 L 473.5 326.5 Z M 410.5 304.5 L 432.5 304.5 L 432.5 326.5 L 410.5 326.5 Z M 347.5 304.5 L 369.5 304.5 L 369.5 326.5 L 347.5 326.5 Z M 283.5 304.5 L 306.5 304.5 L 306.5 326.5 L 283.5 326.5 Z M 283.5 475.5 L 306.5 475.5 L 306.5 481.5 L 283.5 481.5 Z M 1611.5 475.5 L 1634.5 475.5 L 1634.5 481.5 L 1611.5 481.5 Z M 403.5 475.5 L 426.5 475.5 L 426.5 481.5 L 403.5 481.5 Z M 759.5 475.5 L 782.5 475.5 L 782.5 481.5 L 759.5 481.5 Z M 1133.5 475.5 L 1155.5 475.5 L 1155.5 481.5 L 1133.5 481.5 Z M 1374.5 475.5 L 1396.5 475.5 L 1396.5 481.5 L 1374.5 481.5 Z M 645.5 475.5 L 667.5 475.5 L 667.5 481.5 L 645.5 481.5 Z M 1493.5 475.5 L 1515.5 475.5 L 1515.5 481.5 L 1493.5 481.5 Z M 1255.5 475.5 L 1278.5 475.5 L 1278.5 481.5 L 1255.5 481.5 Z M 878.5 475.5 L 901.5 475.5 L 901.5 481.5 L 878.5 481.5 Z M 1003.5 475.5 L 1026.5 475.5 L 1026.5 481.5 L 1003.5 481.5 Z M 522.5 475.5 L 545.5 475.5 L 545.5 481.5 L 522.5 481.5 Z M 759.5 481.5 L 782.5 481.5 L 782.5 497.5 L 759.5 497.5 Z M 522.5 481.5 L 545.5 481.5 L 545.5 497.5 L 522.5 497.5 Z M 645.5 481.5 L 667.5 481.5 L 667.5 497.5 L 645.5 497.5 Z M 1255.5 481.5 L 1278.5 481.5 L 1278.5 497.5 L 1255.5 497.5 Z M 283.5 481.5 L 306.5 481.5 L 306.5 497.5 L 283.5 497.5 Z M 1133.5 481.5 L 1155.5 481.5 L 1155.5 497.5 L 1133.5 497.5 Z M 1493.5 481.5 L 1515.5 481.5 L 1515.5 497.5 L 1493.5 497.5 Z M 1374.5 481.5 L 1396.5 481.5 L 1396.5 497.5 L 1374.5 497.5 Z M 878.5 481.5 L 901.5 481.5 L 901.5 497.5 L 878.5 497.5 Z M 1003.5 481.5 L 1026.5 481.5 L 1026.5 497.5 L 1003.5 497.5 Z M 403.5 481.5 L 426.5 481.5 L 426.5 497.5 L 403.5 497.5 Z M 1611.5 481.5 L 1634.5 481.5 L 1634.5 497.5 L 1611.5 497.5 Z M 837.5 572.5 L 860.5 572.5 L 860.5 595.5 L 837.5 595.5 Z M 1601.5 572.5 L 1623.5 572.5 L 1623.5 595.5 L 1601.5 595.5 Z M 1553.5 572.5 L 1576.5 572.5 L 1576.5 595.5 L 1553.5 595.5 Z M 1506.5 572.5 L 1528.5 572.5 L 1528.5 595.5 L 1506.5 595.5 Z M 1458.5 572.5 L 1481.5 572.5 L 1481.5 595.5 L 1458.5 595.5 Z M 1411.5 572.5 L 1433.5 572.5 L 1433.5 595.5 L 1411.5 595.5 Z M 1363.5 572.5 L 1386.5 572.5 L 1386.5 595.5 L 1363.5 595.5 Z M 1316.5 572.5 L 1338.5 572.5 L 1338.5 595.5 L 1316.5 595.5 Z M 1268.5 572.5 L 1291.5 572.5 L 1291.5 595.5 L 1268.5 595.5 Z M 1221.5 572.5 L 1243.5 572.5 L 1243.5 595.5 L 1221.5 595.5 Z M 707.5 572.5 L 729.5 572.5 L 729.5 595.5 L 707.5 595.5 Z M 456.5 572.5 L 479.5 572.5 L 479.5 595.5 L 456.5 595.5 Z M 1073.5 572.5 L 1096.5 572.5 L 1096.5 595.5 L 1073.5 595.5 Z M 584.5 572.5 L 606.5 572.5 L 606.5 595.5 L 584.5 595.5 Z M 337.5 572.5 L 360.5 572.5 L 360.5 595.5 L 337.5 595.5 Z M 948.5 572.5 L 970.5 572.5 L 970.5 595.5 L 948.5 595.5 Z M 220.5 743.5 L 243.5 743.5 L 243.5 765.5 L 220.5 765.5 Z M 1676.5 743.5 L 1698.5 743.5 L 1698.5 765.5 L 1676.5 765.5 Z M 1613.5 743.5 L 1635.5 743.5 L 1635.5 765.5 L 1613.5 765.5 Z M 1549.5 743.5 L 1572.5 743.5 L 1572.5 765.5 L 1549.5 765.5 Z M 1486.5 743.5 L 1508.5 743.5 L 1508.5 765.5 L 1486.5 765.5 Z M 1423.5 743.5 L 1445.5 743.5 L 1445.5 765.5 L 1423.5 765.5 Z M 1359.5 743.5 L 1382.5 743.5 L 1382.5 765.5 L 1359.5 765.5 Z M 1296.5 743.5 L 1319.5 743.5 L 1319.5 765.5 L 1296.5 765.5 Z M 1233.5 743.5 L 1255.5 743.5 L 1255.5 765.5 L 1233.5 765.5 Z M 1170.5 743.5 L 1192.5 743.5 L 1192.5 765.5 L 1170.5 765.5 Z M 1106.5 743.5 L 1129.5 743.5 L 1129.5 765.5 L 1106.5 765.5 Z M 1043.5 743.5 L 1065.5 743.5 L 1065.5 765.5 L 1043.5 765.5 Z M 980.5 743.5 L 1002.5 743.5 L 1002.5 765.5 L 980.5 765.5 Z M 916.5 743.5 L 939.5 743.5 L 939.5 765.5 L 916.5 765.5 Z M 853.5 743.5 L 876.5 743.5 L 876.5 765.5 L 853.5 765.5 Z M 790.5 743.5 L 812.5 743.5 L 812.5 765.5 L 790.5 765.5 Z M 726.5 743.5 L 749.5 743.5 L 749.5 765.5 L 726.5 765.5 Z M 663.5 743.5 L 686.5 743.5 L 686.5 765.5 L 663.5 765.5 Z M 600.5 743.5 L 622.5 743.5 L 622.5 765.5 L 600.5 765.5 Z M 537.5 743.5 L 559.5 743.5 L 559.5 765.5 L 537.5 765.5 Z M 473.5 743.5 L 496.5 743.5 L 496.5 765.5 L 473.5 765.5 Z M 410.5 743.5 L 432.5 743.5 L 432.5 765.5 L 410.5 765.5 Z M 347.5 743.5 L 369.5 743.5 L 369.5 765.5 L 347.5 765.5 Z M 283.5 743.5 L 306.5 743.5 L 306.5 765.5 L 283.5 765.5 Z M 283.5 743.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface269">
+<g id="surface297">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,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 961.867188 489.664062 L 961.867188 502.5 L 957.695312 502.5 L 957.695312 489.664062 L 945.082031 469.78125 L 950.246094 469.78125 L 959.847656 485.714844 L 969.183594 469.78125 L 974.167969 469.78125 Z M 961.867188 489.664062 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 275 608 L 1642 608 M 275 578 L 1642 578 M 275 578 L 275 608 M 1642 578 L 1642 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 275 608 L 1642 608 M 275 578 L 1642 578 M 1642 608 L 1642 578 M 275 608 L 275 578 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 320 L 200 329 M 195 325 L 204 325 M 199 326 L 201 326 M 199 324 L 201 324 M 199 324 L 199 326 M 201 324 L 201 326 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_2.svg b/cells/clkinv/sky130_fd_sc_hs__clkinv_2.svg
index 5a6a291..dc03762 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_2.svg
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 538.5 L 701.5 538.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 744.5 862.5 L 1184.5 862.5 L 1184.5 918.5 L 744.5 918.5 Z M 744.5 862.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="#image306"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1054.5 730.5 L 1088.5 730.5 L 1088.5 827.5 L 1054.5 827.5 Z M 840.5 730.5 L 875.5 730.5 L 875.5 827.5 L 840.5 827.5 Z M 840.5 730.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1050.5 240.5 L 1085.5 240.5 L 1085.5 496.5 L 1050.5 496.5 Z M 844.5 240.5 L 878.5 240.5 L 878.5 496.5 L 844.5 496.5 Z M 947.5 240.5 L 981.5 240.5 L 981.5 496.5 L 947.5 496.5 Z M 947.5 240.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 780.5 136.5 L 819.5 136.5 L 819.5 174.5 L 780.5 174.5 Z M 1110.5 136.5 L 1149.5 136.5 L 1149.5 174.5 L 1110.5 174.5 Z M 1000.5 136.5 L 1039.5 136.5 L 1039.5 174.5 L 1000.5 174.5 Z M 890.5 136.5 L 929.5 136.5 L 929.5 174.5 L 890.5 174.5 Z M 780.5 899.5 L 819.5 899.5 L 819.5 938.5 L 780.5 938.5 Z M 1110.5 899.5 L 1149.5 899.5 L 1149.5 938.5 L 1110.5 938.5 Z M 1000.5 899.5 L 1039.5 899.5 L 1039.5 938.5 L 1000.5 938.5 Z M 890.5 899.5 L 929.5 899.5 L 929.5 938.5 L 890.5 938.5 Z M 890.5 899.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface275">
+<g id="surface303">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1029.410156 546.757812 L 1010.492188 546.757812 L 1005.308594 561.5 L 998.644531 561.5 L 1016.148438 512.421875 L 1024.226562 512.421875 L 1041.460938 561.5 L 1034.460938 561.5 Z M 1027.660156 541.503906 L 1020.121094 519.15625 L 1012.042969 541.503906 Z M 1027.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1000 562 L 1039 562 M 1000 523 L 1039 523 M 1000 523 L 1000 562 M 1039 523 L 1039 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1000 562 L 1039 562 M 1000 523 L 1039 523 M 1039 562 L 1039 523 M 1000 562 L 1000 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 156 L 744 165 M 739 161 L 748 161 M 743 162 L 745 162 M 743 160 L 745 160 M 743 160 L 743 162 M 745 160 L 745 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_4.svg b/cells/clkinv/sky130_fd_sc_hs__clkinv_4.svg
index a6943f7..ad8c7f8 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_4.svg
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1206.5 730.5 L 1240.5 730.5 L 1240.5 827.5 L 1206.5 827.5 Z M 775.5 730.5 L 810.5 730.5 L 810.5 827.5 L 775.5 827.5 Z M 971.5 730.5 L 1005.5 730.5 L 1005.5 827.5 L 971.5 827.5 Z M 1102.5 730.5 L 1136.5 730.5 L 1136.5 827.5 L 1102.5 827.5 Z M 1102.5 730.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1203.5 240.5 L 1237.5 240.5 L 1237.5 496.5 L 1203.5 496.5 Z M 675.5 240.5 L 710.5 240.5 L 710.5 496.5 L 675.5 496.5 Z M 779.5 240.5 L 813.5 240.5 L 813.5 496.5 L 779.5 496.5 Z M 882.5 240.5 L 916.5 240.5 L 916.5 496.5 L 882.5 496.5 Z M 985.5 240.5 L 1019.5 240.5 L 1019.5 496.5 L 985.5 496.5 Z M 1099.5 240.5 L 1134.5 240.5 L 1134.5 496.5 L 1099.5 496.5 Z M 1099.5 240.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,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 1192.410156 546.757812 L 1173.492188 546.757812 L 1168.308594 561.5 L 1161.644531 561.5 L 1179.148438 512.421875 L 1187.226562 512.421875 L 1204.460938 561.5 L 1197.460938 561.5 Z M 1190.660156 541.503906 L 1183.121094 519.15625 L 1175.042969 541.503906 Z M 1190.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1162 562 L 1201 562 M 1162 523 L 1201 523 M 1162 523 L 1162 562 M 1201 523 L 1201 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1162 562 L 1201 562 M 1162 523 L 1201 523 M 1201 562 L 1201 523 M 1162 562 L 1162 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/clkinv/sky130_fd_sc_hs__clkinv_8.svg b/cells/clkinv/sky130_fd_sc_hs__clkinv_8.svg
index e068b54..0ef0775 100644
--- a/cells/clkinv/sky130_fd_sc_hs__clkinv_8.svg
+++ b/cells/clkinv/sky130_fd_sc_hs__clkinv_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 538.5 L 201.5 538.5 Z M 201.5 111.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 245.5 862.5 L 1675.5 862.5 L 1675.5 918.5 L 245.5 918.5 Z M 245.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1544.5 730.5 L 1578.5 730.5 L 1578.5 827.5 L 1544.5 827.5 Z M 345.5 730.5 L 380.5 730.5 L 380.5 827.5 L 345.5 827.5 Z M 840.5 730.5 L 875.5 730.5 L 875.5 827.5 L 840.5 827.5 Z M 971.5 730.5 L 1005.5 730.5 L 1005.5 827.5 L 971.5 827.5 Z M 1070.5 730.5 L 1104.5 730.5 L 1104.5 827.5 L 1070.5 827.5 Z M 1200.5 730.5 L 1235.5 730.5 L 1235.5 827.5 L 1200.5 827.5 Z M 1299.5 730.5 L 1333.5 730.5 L 1333.5 827.5 L 1299.5 827.5 Z M 1429.5 730.5 L 1464.5 730.5 L 1464.5 827.5 L 1429.5 827.5 Z M 1429.5 730.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1541.5 240.5 L 1575.5 240.5 L 1575.5 496.5 L 1541.5 496.5 Z M 349.5 240.5 L 383.5 240.5 L 383.5 496.5 L 349.5 496.5 Z M 452.5 240.5 L 486.5 240.5 L 486.5 496.5 L 452.5 496.5 Z M 567.5 240.5 L 601.5 240.5 L 601.5 496.5 L 567.5 496.5 Z M 670.5 240.5 L 704.5 240.5 L 704.5 496.5 L 670.5 496.5 Z M 784.5 240.5 L 819.5 240.5 L 819.5 496.5 L 784.5 496.5 Z M 887.5 240.5 L 922.5 240.5 L 922.5 496.5 L 887.5 496.5 Z M 1002.5 240.5 L 1036.5 240.5 L 1036.5 496.5 L 1002.5 496.5 Z M 1105.5 240.5 L 1140.5 240.5 L 1140.5 496.5 L 1105.5 496.5 Z M 1220.5 240.5 L 1254.5 240.5 L 1254.5 496.5 L 1220.5 496.5 Z M 1323.5 240.5 L 1357.5 240.5 L 1357.5 496.5 L 1323.5 496.5 Z M 1437.5 240.5 L 1472.5 240.5 L 1472.5 496.5 L 1437.5 496.5 Z M 1437.5 240.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 280.5 136.5 L 319.5 136.5 L 319.5 174.5 L 280.5 174.5 Z M 1600.5 136.5 L 1639.5 136.5 L 1639.5 174.5 L 1600.5 174.5 Z M 1490.5 136.5 L 1529.5 136.5 L 1529.5 174.5 L 1490.5 174.5 Z M 1380.5 136.5 L 1419.5 136.5 L 1419.5 174.5 L 1380.5 174.5 Z M 1270.5 136.5 L 1309.5 136.5 L 1309.5 174.5 L 1270.5 174.5 Z M 1160.5 136.5 L 1199.5 136.5 L 1199.5 174.5 L 1160.5 174.5 Z M 1050.5 136.5 L 1089.5 136.5 L 1089.5 174.5 L 1050.5 174.5 Z M 940.5 136.5 L 979.5 136.5 L 979.5 174.5 L 940.5 174.5 Z M 830.5 136.5 L 869.5 136.5 L 869.5 174.5 L 830.5 174.5 Z M 720.5 136.5 L 759.5 136.5 L 759.5 174.5 L 720.5 174.5 Z M 610.5 136.5 L 649.5 136.5 L 649.5 174.5 L 610.5 174.5 Z M 500.5 136.5 L 539.5 136.5 L 539.5 174.5 L 500.5 174.5 Z M 390.5 136.5 L 429.5 136.5 L 429.5 174.5 L 390.5 174.5 Z M 280.5 899.5 L 319.5 899.5 L 319.5 938.5 L 280.5 938.5 Z M 1600.5 899.5 L 1639.5 899.5 L 1639.5 938.5 L 1600.5 938.5 Z M 1490.5 899.5 L 1529.5 899.5 L 1529.5 938.5 L 1490.5 938.5 Z M 1380.5 899.5 L 1419.5 899.5 L 1419.5 938.5 L 1380.5 938.5 Z M 1270.5 899.5 L 1309.5 899.5 L 1309.5 938.5 L 1270.5 938.5 Z M 1160.5 899.5 L 1199.5 899.5 L 1199.5 938.5 L 1160.5 938.5 Z M 1050.5 899.5 L 1089.5 899.5 L 1089.5 938.5 L 1050.5 938.5 Z M 940.5 899.5 L 979.5 899.5 L 979.5 938.5 L 940.5 938.5 Z M 830.5 899.5 L 869.5 899.5 L 869.5 938.5 L 830.5 938.5 Z M 720.5 899.5 L 759.5 899.5 L 759.5 938.5 L 720.5 938.5 Z M 610.5 899.5 L 649.5 899.5 L 649.5 938.5 L 610.5 938.5 Z M 500.5 899.5 L 539.5 899.5 L 539.5 938.5 L 500.5 938.5 Z M 390.5 899.5 L 429.5 899.5 L 429.5 938.5 L 390.5 938.5 Z M 390.5 899.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 1624.554688 627.246094 L 1624.554688 646.5 L 1618.292969 646.5 L 1618.292969 627.246094 L 1599.375 597.421875 L 1607.117188 597.421875 L 1621.523438 621.320312 L 1635.527344 597.421875 L 1643 597.421875 Z M 1624.554688 627.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1600 477 L 1639 477 M 1600 438 L 1639 438 M 1600 438 L 1600 477 M 1639 438 L 1639 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1600 477 L 1639 477 M 1600 438 L 1639 438 M 1639 477 L 1639 438 M 1600 477 L 1600 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 245 156 L 245 165 M 240 161 L 249 161 M 244 162 L 246 162 M 244 160 L 246 160 M 244 160 L 244 162 M 246 160 L 246 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/conb/sky130_fd_sc_hs__conb_1.svg b/cells/conb/sky130_fd_sc_hs__conb_1.svg
index 8202c4c..b2768bf 100644
--- a/cells/conb/sky130_fd_sc_hs__conb_1.svg
+++ b/cells/conb/sky130_fd_sc_hs__conb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 538.5 L 756.5 538.5 Z M 756.5 111.5 "/>
 </clipPath>
-<image id="image491" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image532" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image491"/>
+  <use xlink:href="#image532"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 799.5 862.5 L 1129.5 862.5 L 1129.5 918.5 L 799.5 918.5 Z M 799.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image491"/>
+  <use xlink:href="#image532"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -29,9 +29,9 @@
 <clipPath id="clip5">
   <path d="M 988.5 576.5 L 1105.5 576.5 L 1105.5 586.5 L 988.5 586.5 Z M 823.5 576.5 L 940.5 576.5 L 940.5 586.5 L 823.5 586.5 Z M 823.5 576.5 "/>
 </clipPath>
-<image id="image492" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
+<image id="image533" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAnSURBVDiNY2D4zwABuGjcMkNJxUDbP1hUDLT9g0XFQNs/WFQQ0gsAC4l/gTAl/I4AAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image492"/>
+  <use xlink:href="#image533"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,15 +45,15 @@
 <clipPath id="clip8">
   <path d="M 835.5 136.5 L 874.5 136.5 L 874.5 174.5 L 835.5 174.5 Z M 1055.5 136.5 L 1094.5 136.5 L 1094.5 174.5 L 1055.5 174.5 Z M 945.5 136.5 L 984.5 136.5 L 984.5 174.5 L 945.5 174.5 Z M 835.5 899.5 L 874.5 899.5 L 874.5 938.5 L 835.5 938.5 Z M 1055.5 899.5 L 1094.5 899.5 L 1094.5 938.5 L 1055.5 938.5 Z M 945.5 899.5 L 984.5 899.5 L 984.5 938.5 L 945.5 938.5 Z M 945.5 899.5 "/>
 </clipPath>
-<image id="image493" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image534" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image493"/>
+  <use xlink:href="#image534"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface488">
+<g id="surface529">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -208,6 +208,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1119.816406 622.1875 L 1119.613281 625.285156 L 1119.210938 628.246094 L 1118.535156 631.007812 L 1117.59375 633.632812 L 1116.382812 636.121094 L 1114.902344 638.410156 L 1113.152344 640.566406 L 1111.199219 642.382812 L 1109.113281 643.933594 L 1106.824219 645.210938 L 1104.332031 646.152344 L 1101.707031 646.894531 L 1100.765625 647.027344 L 1099.820312 647.230469 L 1098.945312 647.296875 L 1098.003906 647.433594 L 1097.0625 647.433594 L 1096.117188 647.5 L 1093.023438 647.296875 L 1090.125 646.828125 L 1087.433594 646.019531 L 1084.875 644.941406 L 1082.453125 643.527344 L 1080.296875 641.710938 L 1078.347656 639.757812 L 1076.664062 637.535156 L 1075.316406 635.113281 L 1074.171875 632.488281 L 1073.296875 629.660156 L 1072.757812 626.5625 L 1072.625 625.824219 L 1072.554688 625.015625 L 1072.488281 624.273438 L 1072.421875 623.464844 L 1072.421875 621.785156 L 1072.554688 618.417969 L 1073.027344 615.1875 L 1073.769531 612.222656 L 1074.84375 609.394531 L 1076.191406 606.769531 L 1077.941406 604.347656 L 1079.691406 602.394531 L 1081.710938 600.644531 L 1083.933594 599.164062 L 1086.289062 598.019531 L 1088.847656 597.078125 L 1091.609375 596.402344 L 1092.28125 596.335938 L 1093.023438 596.269531 L 1093.761719 596.203125 L 1094.503906 596.132812 L 1095.242188 596.132812 L 1096.050781 596.066406 L 1099.214844 596.269531 L 1102.246094 596.738281 L 1105.070312 597.613281 L 1107.699219 598.757812 L 1110.121094 600.308594 L 1112.34375 602.125 L 1114.226562 604.28125 L 1115.910156 606.636719 L 1117.257812 609.261719 L 1118.335938 612.089844 L 1119.140625 615.1875 L 1119.679688 618.484375 L 1119.679688 619.765625 L 1119.75 620.371094 L 1119.75 621.582031 Z M 1096.050781 601.585938 L 1093.628906 601.789062 L 1091.40625 602.191406 L 1089.25 602.867188 L 1087.300781 603.875 L 1085.480469 605.15625 L 1083.867188 606.636719 L 1082.316406 608.519531 L 1081.105469 610.539062 L 1080.097656 612.761719 L 1079.355469 615.1875 L 1078.882812 617.8125 L 1078.683594 620.570312 L 1078.683594 621.785156 L 1078.75 624.746094 L 1079.152344 627.4375 L 1079.828125 629.929688 L 1080.703125 632.21875 L 1081.914062 634.371094 L 1083.394531 636.257812 L 1084.941406 637.941406 L 1086.625 639.285156 L 1088.511719 640.363281 L 1090.53125 641.171875 L 1092.753906 641.710938 L 1095.109375 641.914062 L 1095.242188 641.980469 L 1096.117188 641.980469 L 1098.476562 641.84375 L 1100.695312 641.441406 L 1102.785156 640.769531 L 1104.667969 639.757812 L 1106.484375 638.546875 L 1108.167969 636.996094 L 1109.648438 635.316406 L 1110.863281 633.363281 L 1111.871094 631.207031 L 1112.613281 628.917969 L 1113.152344 626.429688 L 1113.488281 623.734375 L 1113.488281 622.390625 L 1113.554688 622.050781 L 1113.421875 619.089844 L 1113.015625 616.261719 L 1112.34375 613.636719 L 1111.402344 611.214844 L 1110.1875 609.058594 L 1108.707031 607.039062 L 1106.957031 605.425781 L 1105.070312 604.078125 L 1103.050781 603 L 1100.832031 602.261719 L 1098.476562 601.789062 Z M 1096.050781 601.585938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1055 477 L 1094 477 M 1055 438 L 1094 438 M 1055 438 L 1055 477 M 1094 438 L 1094 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1055 477 L 1094 477 M 1055 438 L 1094 438 M 1094 477 L 1094 438 M 1055 477 L 1055 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 799 156 L 799 165 M 794 161 L 803 161 M 798 162 L 800 162 M 798 160 L 800 160 M 798 160 L 798 162 M 800 160 L 800 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/decap/sky130_fd_sc_hs__decap_4.svg b/cells/decap/sky130_fd_sc_hs__decap_4.svg
index 93185cc..ffc9819 100644
--- a/cells/decap/sky130_fd_sc_hs__decap_4.svg
+++ b/cells/decap/sky130_fd_sc_hs__decap_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 538.5 L 701.5 538.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 744.5 862.5 L 1184.5 862.5 L 1184.5 918.5 L 744.5 918.5 Z M 744.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 853.5 725.5 L 1082.5 725.5 L 1082.5 821.5 L 853.5 821.5 Z M 853.5 725.5 "/>
 </clipPath>
-<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image266"/>
+  <use xlink:href="#image294"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 838.5 240.5 L 1067.5 240.5 L 1067.5 469.5 L 838.5 469.5 Z M 838.5 240.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 780.5 136.5 L 819.5 136.5 L 819.5 174.5 L 780.5 174.5 Z M 1110.5 136.5 L 1149.5 136.5 L 1149.5 174.5 L 1110.5 174.5 Z M 1000.5 136.5 L 1039.5 136.5 L 1039.5 174.5 L 1000.5 174.5 Z M 890.5 136.5 L 929.5 136.5 L 929.5 174.5 L 890.5 174.5 Z M 780.5 899.5 L 819.5 899.5 L 819.5 938.5 L 780.5 938.5 Z M 1110.5 899.5 L 1149.5 899.5 L 1149.5 938.5 L 1110.5 938.5 Z M 1000.5 899.5 L 1039.5 899.5 L 1039.5 938.5 L 1000.5 938.5 Z M 890.5 899.5 L 929.5 899.5 L 929.5 938.5 L 890.5 938.5 Z M 890.5 899.5 "/>
 </clipPath>
-<image id="image268" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image268"/>
+  <use xlink:href="#image296"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface262">
+<g id="surface290">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -139,6 +139,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 1055.738281 183.265625 L 1057.289062 184.140625 L 1058.703125 185.082031 L 1059.914062 186.160156 L 1060.855469 187.4375 L 1061.53125 188.785156 L 1062.066406 190.265625 L 1062.203125 191.074219 L 1062.335938 191.949219 L 1062.40625 192.957031 L 1062.472656 194.101562 L 1062.472656 196.796875 L 1062.40625 198.210938 L 1062.472656 199.421875 L 1062.539062 200.5 L 1062.675781 201.441406 L 1062.808594 202.25 L 1063.078125 202.921875 L 1063.28125 203.59375 L 1063.953125 204.671875 L 1064.355469 205.144531 L 1064.828125 205.613281 L 1065.367188 205.953125 L 1065.367188 207.5 L 1057.757812 207.5 L 1057.355469 206.421875 L 1057.019531 205.277344 L 1056.75 203.933594 L 1056.546875 202.585938 L 1056.414062 201.105469 L 1056.414062 195.113281 L 1056.277344 193.160156 L 1055.941406 191.410156 L 1055.402344 189.929688 L 1054.59375 188.71875 L 1053.585938 187.773438 L 1052.375 187.035156 L 1051.769531 186.832031 L 1051.160156 186.699219 L 1050.488281 186.5625 L 1049.816406 186.496094 L 1049.074219 186.429688 L 1048.335938 186.359375 L 1032.175781 186.359375 L 1032.175781 207.5 L 1025.917969 207.5 L 1025.917969 158.421875 L 1048.535156 158.421875 L 1051.566406 158.625 L 1054.324219 159.097656 L 1056.683594 159.972656 L 1058.703125 161.117188 L 1060.386719 162.597656 L 1061.730469 164.414062 L 1062.675781 166.570312 L 1063.011719 167.714844 L 1063.28125 168.925781 L 1063.414062 170.203125 L 1063.480469 171.550781 L 1063.347656 173.367188 L 1063.078125 175.050781 L 1062.605469 176.597656 L 1061.933594 178.011719 L 1061.125 179.292969 L 1060.117188 180.371094 L 1059.511719 180.90625 L 1058.835938 181.445312 L 1058.164062 181.917969 L 1057.421875 182.390625 L 1056.613281 182.859375 Z M 1056.953125 172.425781 L 1056.75 170.40625 L 1056.347656 168.65625 L 1055.539062 167.175781 L 1054.527344 165.960938 L 1053.113281 165.085938 L 1051.5 164.414062 L 1050.894531 164.28125 L 1050.21875 164.144531 L 1049.546875 164.078125 L 1048.804688 164.011719 L 1048.066406 164.011719 L 1047.324219 163.941406 L 1032.175781 163.941406 L 1032.175781 180.839844 L 1047.324219 180.839844 L 1049.546875 180.773438 L 1051.5 180.371094 L 1053.113281 179.765625 L 1054.460938 178.886719 L 1055.539062 177.8125 L 1056.277344 176.464844 L 1056.480469 175.925781 L 1056.613281 175.253906 L 1056.75 174.648438 L 1056.816406 173.90625 L 1056.882812 173.234375 Z M 1056.953125 172.425781 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 744 924 L 1184 924 M 744 868 L 1184 868 M 744 868 L 744 924 M 1184 868 L 1184 924 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 924 L 1184 924 M 744 868 L 1184 868 M 1184 924 L 1184 868 M 744 924 L 744 868 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 156 L 744 165 M 739 161 L 748 161 M 743 162 L 745 162 M 743 160 L 745 160 M 743 160 L 743 162 M 745 160 L 745 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/decap/sky130_fd_sc_hs__decap_8.svg b/cells/decap/sky130_fd_sc_hs__decap_8.svg
index fd27d52..888e22a 100644
--- a/cells/decap/sky130_fd_sc_hs__decap_8.svg
+++ b/cells/decap/sky130_fd_sc_hs__decap_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 923.5 725.5 L 1152.5 725.5 L 1152.5 821.5 L 923.5 821.5 Z M 631.5 725.5 L 860.5 725.5 L 860.5 821.5 L 631.5 821.5 Z M 631.5 725.5 "/>
 </clipPath>
-<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image266"/>
+  <use xlink:href="#image294"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 908.5 240.5 L 1137.5 240.5 L 1137.5 469.5 L 908.5 469.5 Z M 616.5 240.5 L 845.5 240.5 L 845.5 469.5 L 616.5 469.5 Z M 616.5 240.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image268" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image268"/>
+  <use xlink:href="#image296"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface262">
+<g id="surface290">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -139,6 +139,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 1052.738281 183.265625 L 1054.289062 184.140625 L 1055.703125 185.082031 L 1056.914062 186.160156 L 1057.855469 187.4375 L 1058.53125 188.785156 L 1059.066406 190.265625 L 1059.203125 191.074219 L 1059.335938 191.949219 L 1059.40625 192.957031 L 1059.472656 194.101562 L 1059.472656 196.796875 L 1059.40625 198.210938 L 1059.472656 199.421875 L 1059.539062 200.5 L 1059.675781 201.441406 L 1059.808594 202.25 L 1060.078125 202.921875 L 1060.28125 203.59375 L 1060.953125 204.671875 L 1061.355469 205.144531 L 1061.828125 205.613281 L 1062.367188 205.953125 L 1062.367188 207.5 L 1054.757812 207.5 L 1054.355469 206.421875 L 1054.019531 205.277344 L 1053.75 203.933594 L 1053.546875 202.585938 L 1053.414062 201.105469 L 1053.414062 195.113281 L 1053.277344 193.160156 L 1052.941406 191.410156 L 1052.402344 189.929688 L 1051.59375 188.71875 L 1050.585938 187.773438 L 1049.375 187.035156 L 1048.769531 186.832031 L 1048.160156 186.699219 L 1047.488281 186.5625 L 1046.816406 186.496094 L 1046.074219 186.429688 L 1045.335938 186.359375 L 1029.175781 186.359375 L 1029.175781 207.5 L 1022.917969 207.5 L 1022.917969 158.421875 L 1045.535156 158.421875 L 1048.566406 158.625 L 1051.324219 159.097656 L 1053.683594 159.972656 L 1055.703125 161.117188 L 1057.386719 162.597656 L 1058.730469 164.414062 L 1059.675781 166.570312 L 1060.011719 167.714844 L 1060.28125 168.925781 L 1060.414062 170.203125 L 1060.480469 171.550781 L 1060.347656 173.367188 L 1060.078125 175.050781 L 1059.605469 176.597656 L 1058.933594 178.011719 L 1058.125 179.292969 L 1057.117188 180.371094 L 1056.511719 180.90625 L 1055.835938 181.445312 L 1055.164062 181.917969 L 1054.421875 182.390625 L 1053.613281 182.859375 Z M 1053.953125 172.425781 L 1053.75 170.40625 L 1053.347656 168.65625 L 1052.539062 167.175781 L 1051.527344 165.960938 L 1050.113281 165.085938 L 1048.5 164.414062 L 1047.894531 164.28125 L 1047.21875 164.144531 L 1046.546875 164.078125 L 1045.804688 164.011719 L 1045.066406 164.011719 L 1044.324219 163.941406 L 1029.175781 163.941406 L 1029.175781 180.839844 L 1044.324219 180.839844 L 1046.546875 180.773438 L 1048.5 180.371094 L 1050.113281 179.765625 L 1051.460938 178.886719 L 1052.539062 177.8125 L 1053.277344 176.464844 L 1053.480469 175.925781 L 1053.613281 175.253906 L 1053.75 174.648438 L 1053.816406 173.90625 L 1053.882812 173.234375 Z M 1053.953125 172.425781 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 924 L 1402 924 M 522 868 L 1402 868 M 522 868 L 522 924 M 1402 868 L 1402 924 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 522 924 L 1402 924 M 522 868 L 1402 868 M 1402 924 L 1402 868 M 522 924 L 522 868 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.svg b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.svg
index e66ce03..e9de403 100644
--- a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.svg
+++ b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 324.5 L 1743.5 324.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 324.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 196.5 695.5 L 1722.5 695.5 L 1722.5 723.5 L 196.5 723.5 Z M 196.5 695.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1429.5 591.5 L 1446.5 591.5 L 1446.5 639.5 L 1429.5 639.5 Z M 1137.5 596.5 L 1154.5 596.5 L 1154.5 644.5 L 1137.5 644.5 Z M 1093.5 596.5 L 1110.5 596.5 L 1110.5 644.5 L 1093.5 644.5 Z M 890.5 593.5 L 907.5 593.5 L 907.5 656.5 L 890.5 656.5 Z M 475.5 608.5 L 492.5 608.5 L 492.5 656.5 L 475.5 656.5 Z M 565.5 608.5 L 582.5 608.5 L 582.5 656.5 L 565.5 656.5 Z M 404.5 608.5 L 422.5 608.5 L 422.5 656.5 L 404.5 656.5 Z M 777.5 593.5 L 794.5 593.5 L 794.5 656.5 L 777.5 656.5 Z M 516.5 608.5 L 533.5 608.5 L 533.5 656.5 L 516.5 656.5 Z M 834.5 593.5 L 851.5 593.5 L 851.5 656.5 L 834.5 656.5 Z M 720.5 593.5 L 737.5 593.5 L 737.5 656.5 L 720.5 656.5 Z M 944.5 596.5 L 961.5 596.5 L 961.5 659.5 L 944.5 659.5 Z M 1493.5 591.5 L 1510.5 591.5 L 1510.5 675.5 L 1493.5 675.5 Z M 1313.5 596.5 L 1330.5 596.5 L 1330.5 680.5 L 1313.5 680.5 Z M 1259.5 596.5 L 1276.5 596.5 L 1276.5 680.5 L 1259.5 680.5 Z M 1211.5 596.5 L 1228.5 596.5 L 1228.5 680.5 L 1211.5 680.5 Z M 292.5 597.5 L 309.5 597.5 L 309.5 681.5 L 292.5 681.5 Z M 1602.5 634.5 L 1619.5 634.5 L 1619.5 681.5 L 1602.5 681.5 Z M 1659.5 597.5 L 1676.5 597.5 L 1676.5 681.5 L 1659.5 681.5 Z M 243.5 597.5 L 260.5 597.5 L 260.5 681.5 L 243.5 681.5 Z M 243.5 597.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1020.5 387.5 L 1037.5 387.5 L 1037.5 435.5 L 1020.5 435.5 Z M 1068.5 387.5 L 1085.5 387.5 L 1085.5 435.5 L 1068.5 435.5 Z M 589.5 390.5 L 606.5 390.5 L 606.5 438.5 L 589.5 438.5 Z M 531.5 390.5 L 548.5 390.5 L 548.5 438.5 L 531.5 438.5 Z M 415.5 390.5 L 432.5 390.5 L 432.5 438.5 L 415.5 438.5 Z M 483.5 390.5 L 500.5 390.5 L 500.5 438.5 L 483.5 438.5 Z M 804.5 387.5 L 821.5 387.5 L 821.5 483.5 L 804.5 483.5 Z M 752.5 387.5 L 770.5 387.5 L 770.5 483.5 L 752.5 483.5 Z M 915.5 387.5 L 932.5 387.5 L 932.5 483.5 L 915.5 483.5 Z M 959.5 387.5 L 976.5 387.5 L 976.5 483.5 L 959.5 483.5 Z M 708.5 387.5 L 725.5 387.5 L 725.5 483.5 L 708.5 483.5 Z M 1597.5 395.5 L 1614.5 395.5 L 1614.5 491.5 L 1597.5 491.5 Z M 1315.5 387.5 L 1332.5 387.5 L 1332.5 501.5 L 1315.5 501.5 Z M 1267.5 387.5 L 1284.5 387.5 L 1284.5 501.5 L 1267.5 501.5 Z M 1196.5 387.5 L 1213.5 387.5 L 1213.5 501.5 L 1196.5 501.5 Z M 1657.5 387.5 L 1674.5 387.5 L 1674.5 514.5 L 1657.5 514.5 Z M 243.5 387.5 L 260.5 387.5 L 260.5 514.5 L 243.5 514.5 Z M 1485.5 387.5 L 1502.5 387.5 L 1502.5 514.5 L 1485.5 514.5 Z M 1426.5 442.5 L 1443.5 442.5 L 1443.5 514.5 L 1426.5 514.5 Z M 294.5 387.5 L 311.5 387.5 L 311.5 514.5 L 294.5 514.5 Z M 294.5 387.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 213.5 336.5 L 232.5 336.5 L 232.5 355.5 L 213.5 355.5 Z M 1685.5 336.5 L 1704.5 336.5 L 1704.5 355.5 L 1685.5 355.5 Z M 1630.5 336.5 L 1649.5 336.5 L 1649.5 355.5 L 1630.5 355.5 Z M 1576.5 336.5 L 1595.5 336.5 L 1595.5 355.5 L 1576.5 355.5 Z M 1521.5 336.5 L 1540.5 336.5 L 1540.5 355.5 L 1521.5 355.5 Z M 1467.5 336.5 L 1486.5 336.5 L 1486.5 355.5 L 1467.5 355.5 Z M 1412.5 336.5 L 1431.5 336.5 L 1431.5 355.5 L 1412.5 355.5 Z M 1358.5 336.5 L 1377.5 336.5 L 1377.5 355.5 L 1358.5 355.5 Z M 1303.5 336.5 L 1322.5 336.5 L 1322.5 355.5 L 1303.5 355.5 Z M 1249.5 336.5 L 1268.5 336.5 L 1268.5 355.5 L 1249.5 355.5 Z M 1194.5 336.5 L 1213.5 336.5 L 1213.5 355.5 L 1194.5 355.5 Z M 1140.5 336.5 L 1159.5 336.5 L 1159.5 355.5 L 1140.5 355.5 Z M 1085.5 336.5 L 1104.5 336.5 L 1104.5 355.5 L 1085.5 355.5 Z M 1031.5 336.5 L 1050.5 336.5 L 1050.5 355.5 L 1031.5 355.5 Z M 976.5 336.5 L 995.5 336.5 L 995.5 355.5 L 976.5 355.5 Z M 922.5 336.5 L 941.5 336.5 L 941.5 355.5 L 922.5 355.5 Z M 867.5 336.5 L 886.5 336.5 L 886.5 355.5 L 867.5 355.5 Z M 813.5 336.5 L 832.5 336.5 L 832.5 355.5 L 813.5 355.5 Z M 758.5 336.5 L 777.5 336.5 L 777.5 355.5 L 758.5 355.5 Z M 704.5 336.5 L 723.5 336.5 L 723.5 355.5 L 704.5 355.5 Z M 649.5 336.5 L 668.5 336.5 L 668.5 355.5 L 649.5 355.5 Z M 595.5 336.5 L 614.5 336.5 L 614.5 355.5 L 595.5 355.5 Z M 540.5 336.5 L 559.5 336.5 L 559.5 355.5 L 540.5 355.5 Z M 486.5 336.5 L 505.5 336.5 L 505.5 355.5 L 486.5 355.5 Z M 431.5 336.5 L 450.5 336.5 L 450.5 355.5 L 431.5 355.5 Z M 377.5 336.5 L 396.5 336.5 L 396.5 355.5 L 377.5 355.5 Z M 322.5 336.5 L 341.5 336.5 L 341.5 355.5 L 322.5 355.5 Z M 268.5 336.5 L 287.5 336.5 L 287.5 355.5 L 268.5 355.5 Z M 1194.5 483.5 L 1213.5 483.5 L 1213.5 502.5 L 1194.5 502.5 Z M 813.5 483.5 L 832.5 483.5 L 832.5 502.5 L 813.5 502.5 Z M 540.5 567.5 L 559.5 567.5 L 559.5 586.5 L 540.5 586.5 Z M 976.5 567.5 L 995.5 567.5 L 995.5 586.5 L 976.5 586.5 Z M 213.5 714.5 L 232.5 714.5 L 232.5 733.5 L 213.5 733.5 Z M 1685.5 714.5 L 1704.5 714.5 L 1704.5 733.5 L 1685.5 733.5 Z M 1630.5 714.5 L 1649.5 714.5 L 1649.5 733.5 L 1630.5 733.5 Z M 1576.5 714.5 L 1595.5 714.5 L 1595.5 733.5 L 1576.5 733.5 Z M 1521.5 714.5 L 1540.5 714.5 L 1540.5 733.5 L 1521.5 733.5 Z M 1467.5 714.5 L 1486.5 714.5 L 1486.5 733.5 L 1467.5 733.5 Z M 1412.5 714.5 L 1431.5 714.5 L 1431.5 733.5 L 1412.5 733.5 Z M 1358.5 714.5 L 1377.5 714.5 L 1377.5 733.5 L 1358.5 733.5 Z M 1303.5 714.5 L 1322.5 714.5 L 1322.5 733.5 L 1303.5 733.5 Z M 1249.5 714.5 L 1268.5 714.5 L 1268.5 733.5 L 1249.5 733.5 Z M 1194.5 714.5 L 1213.5 714.5 L 1213.5 733.5 L 1194.5 733.5 Z M 1140.5 714.5 L 1159.5 714.5 L 1159.5 733.5 L 1140.5 733.5 Z M 1085.5 714.5 L 1104.5 714.5 L 1104.5 733.5 L 1085.5 733.5 Z M 1031.5 714.5 L 1050.5 714.5 L 1050.5 733.5 L 1031.5 733.5 Z M 976.5 714.5 L 995.5 714.5 L 995.5 733.5 L 976.5 733.5 Z M 922.5 714.5 L 941.5 714.5 L 941.5 733.5 L 922.5 733.5 Z M 867.5 714.5 L 886.5 714.5 L 886.5 733.5 L 867.5 733.5 Z M 813.5 714.5 L 832.5 714.5 L 832.5 733.5 L 813.5 733.5 Z M 758.5 714.5 L 777.5 714.5 L 777.5 733.5 L 758.5 733.5 Z M 704.5 714.5 L 723.5 714.5 L 723.5 733.5 L 704.5 733.5 Z M 649.5 714.5 L 668.5 714.5 L 668.5 733.5 L 649.5 733.5 Z M 595.5 714.5 L 614.5 714.5 L 614.5 733.5 L 595.5 733.5 Z M 540.5 714.5 L 559.5 714.5 L 559.5 733.5 L 540.5 733.5 Z M 486.5 714.5 L 505.5 714.5 L 505.5 733.5 L 486.5 733.5 Z M 431.5 714.5 L 450.5 714.5 L 450.5 733.5 L 431.5 733.5 Z M 377.5 714.5 L 396.5 714.5 L 396.5 733.5 L 377.5 733.5 Z M 322.5 714.5 L 341.5 714.5 L 341.5 733.5 L 322.5 733.5 Z M 268.5 714.5 L 287.5 714.5 L 287.5 733.5 L 268.5 733.5 Z M 268.5 714.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface365">
+<g id="surface392">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -204,6 +204,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1566.082031 396.039062 L 1566.082031 420.574219 L 1562.546875 420.574219 L 1549.855469 400.683594 L 1549.855469 420.574219 L 1546.894531 420.574219 L 1546.894531 396.039062 L 1550.292969 396.039062 L 1563.117188 416.097656 L 1563.117188 396.039062 Z M 1566.082031 396.039062 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1521 680 L 1540 680 M 1521 661 L 1540 661 M 1521 661 L 1521 680 M 1540 661 L 1540 680 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1521 680 L 1540 680 M 1521 661 L 1540 661 M 1540 680 L 1540 661 M 1521 680 L 1521 661 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 351 L 196 360 M 191 356 L 200 356 M 195 357 L 197 357 M 195 355 L 197 355 M 195 355 L 195 357 M 197 355 L 197 357 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.svg b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.svg
index 16cf029..0ebec94 100644
--- a/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.svg
+++ b/cells/dfbbn/sky130_fd_sc_hs__dfbbn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1743.5 337.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 337.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 194.5 685.5 L 1723.5 685.5 L 1723.5 711.5 L 194.5 711.5 Z M 194.5 685.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#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 1358.5 579.5 L 1374.5 579.5 L 1374.5 624.5 L 1358.5 624.5 Z M 1049.5 593.5 L 1065.5 593.5 L 1065.5 638.5 L 1049.5 638.5 Z M 1090.5 593.5 L 1106.5 593.5 L 1106.5 638.5 L 1090.5 638.5 Z M 836.5 586.5 L 852.5 586.5 L 852.5 645.5 L 836.5 645.5 Z M 783.5 586.5 L 799.5 586.5 L 799.5 645.5 L 783.5 645.5 Z M 730.5 586.5 L 746.5 586.5 L 746.5 645.5 L 730.5 645.5 Z M 685.5 586.5 L 701.5 586.5 L 701.5 645.5 L 685.5 645.5 Z M 459.5 603.5 L 475.5 603.5 L 475.5 648.5 L 459.5 648.5 Z M 389.5 603.5 L 405.5 603.5 L 405.5 648.5 L 389.5 648.5 Z M 543.5 603.5 L 559.5 603.5 L 559.5 648.5 L 543.5 648.5 Z M 497.5 603.5 L 513.5 603.5 L 513.5 648.5 L 497.5 648.5 Z M 887.5 593.5 L 903.5 593.5 L 903.5 651.5 L 887.5 651.5 Z M 1416.5 579.5 L 1432.5 579.5 L 1432.5 658.5 L 1416.5 658.5 Z M 1461.5 579.5 L 1477.5 579.5 L 1477.5 658.5 L 1461.5 658.5 Z M 284.5 593.5 L 300.5 593.5 L 300.5 672.5 L 284.5 672.5 Z M 1664.5 593.5 L 1680.5 593.5 L 1680.5 672.5 L 1664.5 672.5 Z M 1618.5 593.5 L 1634.5 593.5 L 1634.5 672.5 L 1618.5 672.5 Z M 1568.5 604.5 L 1584.5 604.5 L 1584.5 672.5 L 1568.5 672.5 Z M 1151.5 593.5 L 1167.5 593.5 L 1167.5 672.5 L 1151.5 672.5 Z M 239.5 593.5 L 255.5 593.5 L 255.5 672.5 L 239.5 672.5 Z M 1246.5 593.5 L 1262.5 593.5 L 1262.5 672.5 L 1246.5 672.5 Z M 1196.5 593.5 L 1212.5 593.5 L 1212.5 672.5 L 1196.5 672.5 Z M 1196.5 593.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 977.5 397.5 L 993.5 397.5 L 993.5 441.5 L 977.5 441.5 Z M 1021.5 397.5 L 1037.5 397.5 L 1037.5 441.5 L 1021.5 441.5 Z M 507.5 399.5 L 523.5 399.5 L 523.5 444.5 L 507.5 444.5 Z M 463.5 399.5 L 479.5 399.5 L 479.5 444.5 L 463.5 444.5 Z M 400.5 399.5 L 415.5 399.5 L 415.5 444.5 L 400.5 444.5 Z M 561.5 399.5 L 577.5 399.5 L 577.5 444.5 L 561.5 444.5 Z M 771.5 397.5 L 787.5 397.5 L 787.5 486.5 L 771.5 486.5 Z M 716.5 397.5 L 732.5 397.5 L 732.5 486.5 L 716.5 486.5 Z M 875.5 397.5 L 891.5 397.5 L 891.5 486.5 L 875.5 486.5 Z M 919.5 397.5 L 935.5 397.5 L 935.5 486.5 L 919.5 486.5 Z M 672.5 397.5 L 688.5 397.5 L 688.5 486.5 L 672.5 486.5 Z M 1203.5 397.5 L 1219.5 397.5 L 1219.5 503.5 L 1203.5 503.5 Z M 1248.5 397.5 L 1264.5 397.5 L 1264.5 503.5 L 1248.5 503.5 Z M 1137.5 397.5 L 1153.5 397.5 L 1153.5 503.5 L 1137.5 503.5 Z M 286.5 397.5 L 302.5 397.5 L 302.5 516.5 L 286.5 516.5 Z M 1615.5 397.5 L 1631.5 397.5 L 1631.5 516.5 L 1615.5 516.5 Z M 1352.5 448.5 L 1368.5 448.5 L 1368.5 516.5 L 1352.5 516.5 Z M 1559.5 409.5 L 1575.5 409.5 L 1575.5 516.5 L 1559.5 516.5 Z M 1455.5 397.5 L 1471.5 397.5 L 1471.5 516.5 L 1455.5 516.5 Z M 1408.5 397.5 L 1424.5 397.5 L 1424.5 516.5 L 1408.5 516.5 Z M 239.5 397.5 L 255.5 397.5 L 255.5 516.5 L 239.5 516.5 Z M 1662.5 397.5 L 1678.5 397.5 L 1678.5 516.5 L 1662.5 516.5 Z M 1662.5 397.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 211.5 348.5 L 229.5 348.5 L 229.5 366.5 L 211.5 366.5 Z M 1689.5 348.5 L 1707.5 348.5 L 1707.5 366.5 L 1689.5 366.5 Z M 1638.5 348.5 L 1656.5 348.5 L 1656.5 366.5 L 1638.5 366.5 Z M 1587.5 348.5 L 1605.5 348.5 L 1605.5 366.5 L 1587.5 366.5 Z M 1536.5 348.5 L 1554.5 348.5 L 1554.5 366.5 L 1536.5 366.5 Z M 1485.5 348.5 L 1503.5 348.5 L 1503.5 366.5 L 1485.5 366.5 Z M 1434.5 348.5 L 1452.5 348.5 L 1452.5 366.5 L 1434.5 366.5 Z M 1383.5 348.5 L 1401.5 348.5 L 1401.5 366.5 L 1383.5 366.5 Z M 1332.5 348.5 L 1350.5 348.5 L 1350.5 366.5 L 1332.5 366.5 Z M 1281.5 348.5 L 1299.5 348.5 L 1299.5 366.5 L 1281.5 366.5 Z M 1230.5 348.5 L 1248.5 348.5 L 1248.5 366.5 L 1230.5 366.5 Z M 1179.5 348.5 L 1197.5 348.5 L 1197.5 366.5 L 1179.5 366.5 Z M 1128.5 348.5 L 1146.5 348.5 L 1146.5 366.5 L 1128.5 366.5 Z M 1077.5 348.5 L 1095.5 348.5 L 1095.5 366.5 L 1077.5 366.5 Z M 1026.5 348.5 L 1044.5 348.5 L 1044.5 366.5 L 1026.5 366.5 Z M 975.5 348.5 L 993.5 348.5 L 993.5 366.5 L 975.5 366.5 Z M 924.5 348.5 L 942.5 348.5 L 942.5 366.5 L 924.5 366.5 Z M 873.5 348.5 L 891.5 348.5 L 891.5 366.5 L 873.5 366.5 Z M 822.5 348.5 L 840.5 348.5 L 840.5 366.5 L 822.5 366.5 Z M 771.5 348.5 L 789.5 348.5 L 789.5 366.5 L 771.5 366.5 Z M 720.5 348.5 L 738.5 348.5 L 738.5 366.5 L 720.5 366.5 Z M 669.5 348.5 L 687.5 348.5 L 687.5 366.5 L 669.5 366.5 Z M 618.5 348.5 L 636.5 348.5 L 636.5 366.5 L 618.5 366.5 Z M 567.5 348.5 L 585.5 348.5 L 585.5 366.5 L 567.5 366.5 Z M 516.5 348.5 L 534.5 348.5 L 534.5 366.5 L 516.5 366.5 Z M 465.5 348.5 L 483.5 348.5 L 483.5 366.5 L 465.5 366.5 Z M 414.5 348.5 L 432.5 348.5 L 432.5 366.5 L 414.5 366.5 Z M 363.5 348.5 L 381.5 348.5 L 381.5 366.5 L 363.5 366.5 Z M 312.5 348.5 L 331.5 348.5 L 331.5 366.5 L 312.5 366.5 Z M 261.5 348.5 L 280.5 348.5 L 280.5 366.5 L 261.5 366.5 Z M 1128.5 486.5 L 1146.5 486.5 L 1146.5 504.5 L 1128.5 504.5 Z M 771.5 486.5 L 789.5 486.5 L 789.5 504.5 L 771.5 504.5 Z M 516.5 564.5 L 534.5 564.5 L 534.5 582.5 L 516.5 582.5 Z M 924.5 564.5 L 942.5 564.5 L 942.5 582.5 L 924.5 582.5 Z M 211.5 702.5 L 229.5 702.5 L 229.5 720.5 L 211.5 720.5 Z M 1689.5 702.5 L 1707.5 702.5 L 1707.5 720.5 L 1689.5 720.5 Z M 1638.5 702.5 L 1656.5 702.5 L 1656.5 720.5 L 1638.5 720.5 Z M 1587.5 702.5 L 1605.5 702.5 L 1605.5 720.5 L 1587.5 720.5 Z M 1536.5 702.5 L 1554.5 702.5 L 1554.5 720.5 L 1536.5 720.5 Z M 1485.5 702.5 L 1503.5 702.5 L 1503.5 720.5 L 1485.5 720.5 Z M 1434.5 702.5 L 1452.5 702.5 L 1452.5 720.5 L 1434.5 720.5 Z M 1383.5 702.5 L 1401.5 702.5 L 1401.5 720.5 L 1383.5 720.5 Z M 1332.5 702.5 L 1350.5 702.5 L 1350.5 720.5 L 1332.5 720.5 Z M 1281.5 702.5 L 1299.5 702.5 L 1299.5 720.5 L 1281.5 720.5 Z M 1230.5 702.5 L 1248.5 702.5 L 1248.5 720.5 L 1230.5 720.5 Z M 1179.5 702.5 L 1197.5 702.5 L 1197.5 720.5 L 1179.5 720.5 Z M 1128.5 702.5 L 1146.5 702.5 L 1146.5 720.5 L 1128.5 720.5 Z M 1077.5 702.5 L 1095.5 702.5 L 1095.5 720.5 L 1077.5 720.5 Z M 1026.5 702.5 L 1044.5 702.5 L 1044.5 720.5 L 1026.5 720.5 Z M 975.5 702.5 L 993.5 702.5 L 993.5 720.5 L 975.5 720.5 Z M 924.5 702.5 L 942.5 702.5 L 942.5 720.5 L 924.5 720.5 Z M 873.5 702.5 L 891.5 702.5 L 891.5 720.5 L 873.5 720.5 Z M 822.5 702.5 L 840.5 702.5 L 840.5 720.5 L 822.5 720.5 Z M 771.5 702.5 L 789.5 702.5 L 789.5 720.5 L 771.5 720.5 Z M 720.5 702.5 L 738.5 702.5 L 738.5 720.5 L 720.5 720.5 Z M 669.5 702.5 L 687.5 702.5 L 687.5 720.5 L 669.5 720.5 Z M 618.5 702.5 L 636.5 702.5 L 636.5 720.5 L 618.5 720.5 Z M 567.5 702.5 L 585.5 702.5 L 585.5 720.5 L 567.5 720.5 Z M 516.5 702.5 L 534.5 702.5 L 534.5 720.5 L 516.5 720.5 Z M 465.5 702.5 L 483.5 702.5 L 483.5 720.5 L 465.5 720.5 Z M 414.5 702.5 L 432.5 702.5 L 432.5 720.5 L 414.5 720.5 Z M 363.5 702.5 L 381.5 702.5 L 381.5 720.5 L 363.5 720.5 Z M 312.5 702.5 L 331.5 702.5 L 331.5 720.5 L 312.5 720.5 Z M 261.5 702.5 L 280.5 702.5 L 280.5 720.5 L 261.5 720.5 Z M 261.5 702.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>
@@ -187,6 +187,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1658.117188 427.710938 L 1656.667969 429.5 L 1653.425781 426.816406 L 1652.5 427.308594 L 1651.574219 427.679688 L 1650.621094 427.988281 L 1649.601562 428.203125 L 1648.582031 428.328125 L 1647.535156 428.390625 L 1646.113281 428.296875 L 1644.789062 428.082031 L 1643.554688 427.710938 L 1642.378906 427.214844 L 1641.269531 426.570312 L 1640.28125 425.734375 L 1639.386719 424.839844 L 1638.617188 423.824219 L 1638 422.710938 L 1637.476562 421.507812 L 1637.074219 420.210938 L 1636.828125 418.792969 L 1636.765625 418.453125 L 1636.734375 418.082031 L 1636.703125 417.742188 L 1636.671875 417.375 L 1636.671875 416.601562 L 1636.734375 415.058594 L 1636.949219 413.578125 L 1637.289062 412.222656 L 1637.785156 410.925781 L 1638.402344 409.722656 L 1639.203125 408.609375 L 1640.003906 407.714844 L 1640.929688 406.914062 L 1641.949219 406.234375 L 1643.027344 405.710938 L 1644.203125 405.277344 L 1645.496094 404.96875 L 1645.804688 404.9375 L 1646.144531 404.90625 L 1646.484375 404.878906 L 1646.824219 404.847656 L 1647.164062 404.847656 L 1647.535156 404.816406 L 1648.921875 404.90625 L 1650.25 405.125 L 1651.484375 405.496094 L 1652.65625 405.988281 L 1653.765625 406.636719 L 1654.785156 407.4375 L 1655.648438 408.363281 L 1656.421875 409.351562 L 1657.039062 410.429688 L 1657.5625 411.632812 L 1657.960938 412.929688 L 1658.242188 414.289062 L 1658.269531 414.6875 L 1658.363281 415.800781 L 1658.363281 416.171875 L 1658.394531 416.539062 L 1658.300781 418.269531 L 1658.023438 419.902344 L 1657.59375 421.414062 L 1656.976562 422.835938 L 1656.171875 424.132812 L 1655.214844 425.335938 Z M 1650.339844 421.355469 L 1653.085938 423.605469 L 1653.828125 422.679688 L 1654.445312 421.632812 L 1654.90625 420.488281 L 1655.246094 419.285156 L 1655.433594 417.992188 L 1655.523438 416.570312 L 1655.464844 415.277344 L 1655.277344 414.042969 L 1654.96875 412.898438 L 1654.570312 411.851562 L 1654.042969 410.863281 L 1653.394531 409.96875 L 1652.65625 409.226562 L 1651.882812 408.609375 L 1651.019531 408.117188 L 1650.09375 407.746094 L 1649.078125 407.5 L 1648.027344 407.347656 L 1647.535156 407.347656 L 1646.421875 407.4375 L 1645.375 407.625 L 1644.386719 407.933594 L 1643.492188 408.394531 L 1642.660156 408.980469 L 1641.917969 409.691406 L 1641.207031 410.523438 L 1640.652344 411.449219 L 1640.191406 412.46875 L 1639.851562 413.578125 L 1639.632812 414.78125 L 1639.542969 416.078125 L 1639.542969 416.601562 L 1639.574219 417.960938 L 1639.757812 419.195312 L 1640.066406 420.335938 L 1640.46875 421.414062 L 1641.023438 422.402344 L 1641.703125 423.265625 L 1642.410156 424.039062 L 1643.214844 424.65625 L 1644.078125 425.148438 L 1645.003906 425.488281 L 1646.023438 425.734375 L 1647.101562 425.828125 L 1647.164062 425.859375 L 1648.058594 425.859375 L 1648.644531 425.796875 L 1649.230469 425.675781 L 1649.785156 425.550781 L 1650.339844 425.367188 L 1650.929688 425.117188 L 1650.957031 425.117188 L 1651.019531 425.085938 L 1651.050781 425.058594 L 1651.113281 425.058594 L 1651.144531 425.027344 L 1651.207031 424.996094 L 1648.921875 423.082031 Z M 1650.339844 421.355469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1638 672 L 1656 672 M 1638 654 L 1656 654 M 1638 654 L 1638 672 M 1656 654 L 1656 672 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1638 672 L 1656 672 M 1638 654 L 1656 654 M 1656 672 L 1656 654 M 1638 672 L 1638 654 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 194 363 L 194 372 M 189 368 L 198 368 M 193 369 L 195 369 M 193 367 L 195 367 M 193 367 L 193 369 M 195 367 L 195 369 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.svg b/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.svg
index eb353d8..05322ee 100644
--- a/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.svg
+++ b/cells/dfbbp/sky130_fd_sc_hs__dfbbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 316.5 L 1744.5 316.5 L 1744.5 535.5 L 174.5 535.5 Z M 174.5 316.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 196.5 701.5 L 1721.5 701.5 L 1721.5 730.5 L 196.5 730.5 Z M 196.5 701.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 427.5 607.5 L 445.5 607.5 L 445.5 657.5 L 427.5 657.5 Z M 954.5 596.5 L 972.5 596.5 L 972.5 660.5 L 954.5 660.5 Z M 771.5 596.5 L 788.5 596.5 L 788.5 660.5 L 771.5 660.5 Z M 692.5 596.5 L 709.5 596.5 L 709.5 660.5 L 692.5 660.5 Z M 821.5 596.5 L 839.5 596.5 L 839.5 660.5 L 821.5 660.5 Z M 997.5 596.5 L 1014.5 596.5 L 1014.5 660.5 L 997.5 660.5 Z M 591.5 611.5 L 609.5 611.5 L 609.5 660.5 L 591.5 660.5 Z M 535.5 630.5 L 553.5 630.5 L 553.5 679.5 L 535.5 679.5 Z M 485.5 630.5 L 502.5 630.5 L 502.5 679.5 L 485.5 679.5 Z M 1294.5 600.5 L 1311.5 600.5 L 1311.5 687.5 L 1294.5 687.5 Z M 1484.5 600.5 L 1501.5 600.5 L 1501.5 687.5 L 1484.5 687.5 Z M 305.5 600.5 L 322.5 600.5 L 322.5 687.5 L 305.5 687.5 Z M 246.5 600.5 L 263.5 600.5 L 263.5 687.5 L 246.5 687.5 Z M 1060.5 637.5 L 1078.5 637.5 L 1078.5 687.5 L 1060.5 687.5 Z M 1242.5 600.5 L 1260.5 600.5 L 1260.5 687.5 L 1242.5 687.5 Z M 1415.5 637.5 L 1433.5 637.5 L 1433.5 687.5 L 1415.5 687.5 Z M 1600.5 637.5 L 1618.5 637.5 L 1618.5 687.5 L 1600.5 687.5 Z M 1124.5 637.5 L 1141.5 637.5 L 1141.5 687.5 L 1124.5 687.5 Z M 1184.5 600.5 L 1201.5 600.5 L 1201.5 687.5 L 1184.5 687.5 Z M 1656.5 600.5 L 1674.5 600.5 L 1674.5 687.5 L 1656.5 687.5 Z M 1656.5 600.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1065.5 382.5 L 1083.5 382.5 L 1083.5 431.5 L 1065.5 431.5 Z M 1013.5 382.5 L 1031.5 382.5 L 1031.5 431.5 L 1013.5 431.5 Z M 537.5 408.5 L 555.5 408.5 L 555.5 458.5 L 537.5 458.5 Z M 484.5 408.5 L 502.5 408.5 L 502.5 458.5 L 484.5 458.5 Z M 950.5 382.5 L 968.5 382.5 L 968.5 481.5 L 950.5 481.5 Z M 1594.5 390.5 L 1611.5 390.5 L 1611.5 489.5 L 1594.5 489.5 Z M 1295.5 382.5 L 1312.5 382.5 L 1312.5 500.5 L 1295.5 500.5 Z M 1246.5 382.5 L 1264.5 382.5 L 1264.5 500.5 L 1246.5 500.5 Z M 1185.5 382.5 L 1203.5 382.5 L 1203.5 500.5 L 1185.5 500.5 Z M 714.5 408.5 L 731.5 408.5 L 731.5 507.5 L 714.5 507.5 Z M 777.5 408.5 L 795.5 408.5 L 795.5 507.5 L 777.5 507.5 Z M 598.5 458.5 L 616.5 458.5 L 616.5 507.5 L 598.5 507.5 Z M 644.5 458.5 L 662.5 458.5 L 662.5 507.5 L 644.5 507.5 Z M 826.5 408.5 L 844.5 408.5 L 844.5 507.5 L 826.5 507.5 Z M 886.5 408.5 L 904.5 408.5 L 904.5 507.5 L 886.5 507.5 Z M 1419.5 438.5 L 1437.5 438.5 L 1437.5 514.5 L 1419.5 514.5 Z M 1654.5 382.5 L 1672.5 382.5 L 1672.5 514.5 L 1654.5 514.5 Z M 326.5 382.5 L 344.5 382.5 L 344.5 514.5 L 326.5 514.5 Z M 258.5 382.5 L 275.5 382.5 L 275.5 514.5 L 258.5 514.5 Z M 1479.5 382.5 L 1497.5 382.5 L 1497.5 514.5 L 1479.5 514.5 Z M 1479.5 382.5 "/>
 </clipPath>
-<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image406"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 215.5 328.5 L 235.5 328.5 L 235.5 348.5 L 215.5 348.5 Z M 1683.5 328.5 L 1703.5 328.5 L 1703.5 348.5 L 1683.5 348.5 Z M 1627.5 328.5 L 1647.5 328.5 L 1647.5 348.5 L 1627.5 348.5 Z M 1570.5 328.5 L 1590.5 328.5 L 1590.5 348.5 L 1570.5 348.5 Z M 1514.5 328.5 L 1534.5 328.5 L 1534.5 348.5 L 1514.5 348.5 Z M 1457.5 328.5 L 1477.5 328.5 L 1477.5 348.5 L 1457.5 348.5 Z M 1401.5 328.5 L 1421.5 328.5 L 1421.5 348.5 L 1401.5 348.5 Z M 1344.5 328.5 L 1364.5 328.5 L 1364.5 348.5 L 1344.5 348.5 Z M 1288.5 328.5 L 1308.5 328.5 L 1308.5 348.5 L 1288.5 348.5 Z M 1231.5 328.5 L 1251.5 328.5 L 1251.5 348.5 L 1231.5 348.5 Z M 1175.5 328.5 L 1195.5 328.5 L 1195.5 348.5 L 1175.5 348.5 Z M 1118.5 328.5 L 1138.5 328.5 L 1138.5 348.5 L 1118.5 348.5 Z M 1062.5 328.5 L 1082.5 328.5 L 1082.5 348.5 L 1062.5 348.5 Z M 1005.5 328.5 L 1025.5 328.5 L 1025.5 348.5 L 1005.5 348.5 Z M 949.5 328.5 L 969.5 328.5 L 969.5 348.5 L 949.5 348.5 Z M 892.5 328.5 L 912.5 328.5 L 912.5 348.5 L 892.5 348.5 Z M 836.5 328.5 L 856.5 328.5 L 856.5 348.5 L 836.5 348.5 Z M 779.5 328.5 L 799.5 328.5 L 799.5 348.5 L 779.5 348.5 Z M 723.5 328.5 L 743.5 328.5 L 743.5 348.5 L 723.5 348.5 Z M 666.5 328.5 L 686.5 328.5 L 686.5 348.5 L 666.5 348.5 Z M 610.5 328.5 L 630.5 328.5 L 630.5 348.5 L 610.5 348.5 Z M 554.5 328.5 L 574.5 328.5 L 574.5 348.5 L 554.5 348.5 Z M 497.5 328.5 L 517.5 328.5 L 517.5 348.5 L 497.5 348.5 Z M 441.5 328.5 L 461.5 328.5 L 461.5 348.5 L 441.5 348.5 Z M 384.5 328.5 L 404.5 328.5 L 404.5 348.5 L 384.5 348.5 Z M 328.5 328.5 L 348.5 328.5 L 348.5 348.5 L 328.5 348.5 Z M 271.5 328.5 L 291.5 328.5 L 291.5 348.5 L 271.5 348.5 Z M 836.5 568.5 L 856.5 568.5 L 856.5 573.5 L 836.5 573.5 Z M 1344.5 568.5 L 1364.5 568.5 L 1364.5 577.5 L 1344.5 577.5 Z M 1344.5 577.5 L 1364.5 577.5 L 1364.5 588.5 L 1344.5 588.5 Z M 836.5 573.5 L 856.5 573.5 L 856.5 588.5 L 836.5 588.5 Z M 215.5 720.5 L 235.5 720.5 L 235.5 740.5 L 215.5 740.5 Z M 1683.5 720.5 L 1703.5 720.5 L 1703.5 740.5 L 1683.5 740.5 Z M 1627.5 720.5 L 1647.5 720.5 L 1647.5 740.5 L 1627.5 740.5 Z M 1570.5 720.5 L 1590.5 720.5 L 1590.5 740.5 L 1570.5 740.5 Z M 1514.5 720.5 L 1534.5 720.5 L 1534.5 740.5 L 1514.5 740.5 Z M 1457.5 720.5 L 1477.5 720.5 L 1477.5 740.5 L 1457.5 740.5 Z M 1401.5 720.5 L 1421.5 720.5 L 1421.5 740.5 L 1401.5 740.5 Z M 1344.5 720.5 L 1364.5 720.5 L 1364.5 740.5 L 1344.5 740.5 Z M 1288.5 720.5 L 1308.5 720.5 L 1308.5 740.5 L 1288.5 740.5 Z M 1231.5 720.5 L 1251.5 720.5 L 1251.5 740.5 L 1231.5 740.5 Z M 1175.5 720.5 L 1195.5 720.5 L 1195.5 740.5 L 1175.5 740.5 Z M 1118.5 720.5 L 1138.5 720.5 L 1138.5 740.5 L 1118.5 740.5 Z M 1062.5 720.5 L 1082.5 720.5 L 1082.5 740.5 L 1062.5 740.5 Z M 1005.5 720.5 L 1025.5 720.5 L 1025.5 740.5 L 1005.5 740.5 Z M 949.5 720.5 L 969.5 720.5 L 969.5 740.5 L 949.5 740.5 Z M 892.5 720.5 L 912.5 720.5 L 912.5 740.5 L 892.5 740.5 Z M 836.5 720.5 L 856.5 720.5 L 856.5 740.5 L 836.5 740.5 Z M 779.5 720.5 L 799.5 720.5 L 799.5 740.5 L 779.5 740.5 Z M 723.5 720.5 L 743.5 720.5 L 743.5 740.5 L 723.5 740.5 Z M 666.5 720.5 L 686.5 720.5 L 686.5 740.5 L 666.5 740.5 Z M 610.5 720.5 L 630.5 720.5 L 630.5 740.5 L 610.5 740.5 Z M 554.5 720.5 L 574.5 720.5 L 574.5 740.5 L 554.5 740.5 Z M 497.5 720.5 L 517.5 720.5 L 517.5 740.5 L 497.5 740.5 Z M 441.5 720.5 L 461.5 720.5 L 461.5 740.5 L 441.5 740.5 Z M 384.5 720.5 L 404.5 720.5 L 404.5 740.5 L 384.5 740.5 Z M 328.5 720.5 L 348.5 720.5 L 348.5 740.5 L 328.5 740.5 Z M 271.5 720.5 L 291.5 720.5 L 291.5 740.5 L 271.5 740.5 Z M 271.5 720.5 "/>
 </clipPath>
-<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image407"/>
+  <use xlink:href="#image434"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface401">
+<g id="surface428">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -214,6 +214,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1241.898438 540.035156 L 1241.828125 541.15625 L 1241.652344 542.175781 L 1241.335938 543.121094 L 1240.914062 543.960938 L 1240.355469 544.769531 L 1239.6875 545.46875 L 1238.953125 546.066406 L 1238.179688 546.523438 L 1237.304688 546.875 L 1236.390625 547.152344 L 1235.410156 547.292969 L 1234.359375 547.328125 L 1222.824219 547.328125 L 1222.824219 521.769531 L 1233.203125 521.769531 L 1234.707031 521.875 L 1236.042969 522.117188 L 1237.234375 522.539062 L 1238.25 523.136719 L 1239.125 523.90625 L 1239.828125 524.851562 L 1240.109375 525.378906 L 1240.355469 525.941406 L 1240.53125 526.464844 L 1240.667969 527.0625 L 1240.738281 527.660156 L 1240.773438 528.253906 L 1240.667969 529.515625 L 1240.355469 530.605469 L 1239.863281 531.621094 L 1239.160156 532.460938 L 1238.285156 533.234375 L 1237.234375 533.828125 L 1238.25 534.285156 L 1239.125 534.777344 L 1239.898438 535.335938 L 1240.53125 535.96875 L 1241.019531 536.632812 L 1241.40625 537.335938 L 1241.546875 537.757812 L 1241.652344 538.175781 L 1241.757812 538.597656 L 1241.828125 539.089844 L 1241.863281 539.542969 Z M 1237.515625 528.710938 L 1237.410156 527.660156 L 1237.09375 526.78125 L 1236.601562 526.011719 L 1235.902344 525.449219 L 1235.023438 525.027344 L 1233.9375 524.75 L 1233.691406 524.75 L 1233.445312 524.714844 L 1233.203125 524.679688 L 1232.640625 524.679688 L 1232.394531 524.644531 L 1226.082031 524.644531 L 1226.082031 532.777344 L 1232.394531 532.777344 L 1233.691406 532.707031 L 1234.8125 532.496094 L 1235.761719 532.113281 L 1236.460938 531.585938 L 1237.023438 530.882812 L 1237.375 530.042969 L 1237.410156 529.867188 L 1237.480469 529.445312 L 1237.480469 528.957031 Z M 1234.042969 544.453125 L 1235.023438 544.417969 L 1235.902344 544.207031 L 1236.671875 543.859375 L 1237.304688 543.402344 L 1237.828125 542.804688 L 1238.25 542.070312 L 1238.355469 541.789062 L 1238.425781 541.472656 L 1238.53125 541.121094 L 1238.566406 540.808594 L 1238.601562 540.457031 L 1238.636719 540.070312 L 1238.566406 539.300781 L 1238.425781 538.5625 L 1238.179688 537.933594 L 1237.828125 537.335938 L 1237.375 536.84375 L 1236.847656 536.390625 L 1236.460938 536.179688 L 1236.042969 536.003906 L 1235.585938 535.863281 L 1235.09375 535.757812 L 1234.570312 535.6875 L 1234.042969 535.652344 L 1226.082031 535.652344 L 1226.082031 544.453125 Z M 1234.042969 544.453125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1175 555 L 1195 555 M 1175 535 L 1195 535 M 1175 535 L 1175 555 M 1195 535 L 1195 555 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1175 555 L 1195 555 M 1175 535 L 1195 535 M 1195 555 L 1195 535 M 1175 555 L 1175 535 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 344 L 196 353 M 191 349 L 200 349 M 195 350 L 197 350 M 195 348 L 197 348 M 195 348 L 195 350 M 197 348 L 197 350 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.svg b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.svg
index ba1f758..330650c 100644
--- a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.svg
+++ b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 290.5 L 1744.5 290.5 L 1744.5 535.5 L 175.5 535.5 Z M 386.5 535.5 L 1131.5 535.5 L 1131.5 541.5 L 386.5 541.5 Z M 930.5 541.5 L 1131.5 541.5 L 1131.5 549.5 L 930.5 549.5 Z M 930.5 541.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 200.5 722.5 L 1719.5 722.5 L 1719.5 754.5 L 200.5 754.5 Z M 200.5 722.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 663.5 621.5 L 682.5 621.5 L 682.5 676.5 L 663.5 676.5 Z M 831.5 621.5 L 851.5 621.5 L 851.5 676.5 L 831.5 676.5 Z M 728.5 621.5 L 748.5 621.5 L 748.5 676.5 L 728.5 676.5 Z M 780.5 621.5 L 800.5 621.5 L 800.5 676.5 L 780.5 676.5 Z M 262.5 647.5 L 282.5 647.5 L 282.5 703.5 L 262.5 703.5 Z M 314.5 647.5 L 334.5 647.5 L 334.5 703.5 L 314.5 703.5 Z M 909.5 621.5 L 929.5 621.5 L 929.5 705.5 L 909.5 705.5 Z M 1576.5 633.5 L 1596.5 633.5 L 1596.5 705.5 L 1576.5 705.5 Z M 987.5 621.5 L 1007.5 621.5 L 1007.5 705.5 L 987.5 705.5 Z M 525.5 608.5 L 545.5 608.5 L 545.5 705.5 L 525.5 705.5 Z M 1642.5 608.5 L 1662.5 608.5 L 1662.5 705.5 L 1642.5 705.5 Z M 450.5 608.5 L 469.5 608.5 L 469.5 705.5 L 450.5 705.5 Z M 1302.5 650.5 L 1322.5 650.5 L 1322.5 705.5 L 1302.5 705.5 Z M 1435.5 608.5 L 1454.5 608.5 L 1454.5 705.5 L 1435.5 705.5 Z M 1125.5 650.5 L 1145.5 650.5 L 1145.5 705.5 L 1125.5 705.5 Z M 1251.5 650.5 L 1270.5 650.5 L 1270.5 705.5 L 1251.5 705.5 Z M 1177.5 650.5 L 1197.5 650.5 L 1197.5 705.5 L 1177.5 705.5 Z M 1177.5 650.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 256.5 364.5 L 276.5 364.5 L 276.5 419.5 L 256.5 419.5 Z M 316.5 364.5 L 335.5 364.5 L 335.5 419.5 L 316.5 419.5 Z M 1328.5 388.5 L 1348.5 388.5 L 1348.5 444.5 L 1328.5 444.5 Z M 1268.5 388.5 L 1288.5 388.5 L 1288.5 444.5 L 1268.5 444.5 Z M 1201.5 388.5 L 1221.5 388.5 L 1221.5 444.5 L 1201.5 444.5 Z M 1146.5 388.5 L 1166.5 388.5 L 1166.5 444.5 L 1146.5 444.5 Z M 645.5 394.5 L 665.5 394.5 L 665.5 449.5 L 645.5 449.5 Z M 705.5 394.5 L 725.5 394.5 L 725.5 449.5 L 705.5 449.5 Z M 840.5 394.5 L 860.5 394.5 L 860.5 449.5 L 840.5 449.5 Z M 756.5 394.5 L 776.5 394.5 L 776.5 449.5 L 756.5 449.5 Z M 1574.5 364.5 L 1594.5 364.5 L 1594.5 475.5 L 1574.5 475.5 Z M 1642.5 364.5 L 1662.5 364.5 L 1662.5 512.5 L 1642.5 512.5 Z M 1396.5 364.5 L 1416.5 364.5 L 1416.5 512.5 L 1396.5 512.5 Z M 449.5 369.5 L 469.5 369.5 L 469.5 517.5 L 449.5 517.5 Z M 508.5 369.5 L 528.5 369.5 L 528.5 517.5 L 508.5 517.5 Z M 1052.5 394.5 L 1072.5 394.5 L 1072.5 525.5 L 1052.5 525.5 Z M 993.5 394.5 L 1013.5 394.5 L 1013.5 525.5 L 993.5 525.5 Z M 993.5 394.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 220.5 304.5 L 243.5 304.5 L 243.5 326.5 L 220.5 326.5 Z M 1676.5 304.5 L 1698.5 304.5 L 1698.5 326.5 L 1676.5 326.5 Z M 1613.5 304.5 L 1635.5 304.5 L 1635.5 326.5 L 1613.5 326.5 Z M 1549.5 304.5 L 1572.5 304.5 L 1572.5 326.5 L 1549.5 326.5 Z M 1486.5 304.5 L 1508.5 304.5 L 1508.5 326.5 L 1486.5 326.5 Z M 1423.5 304.5 L 1445.5 304.5 L 1445.5 326.5 L 1423.5 326.5 Z M 1359.5 304.5 L 1382.5 304.5 L 1382.5 326.5 L 1359.5 326.5 Z M 1296.5 304.5 L 1319.5 304.5 L 1319.5 326.5 L 1296.5 326.5 Z M 1233.5 304.5 L 1255.5 304.5 L 1255.5 326.5 L 1233.5 326.5 Z M 1170.5 304.5 L 1192.5 304.5 L 1192.5 326.5 L 1170.5 326.5 Z M 1106.5 304.5 L 1129.5 304.5 L 1129.5 326.5 L 1106.5 326.5 Z M 1043.5 304.5 L 1065.5 304.5 L 1065.5 326.5 L 1043.5 326.5 Z M 980.5 304.5 L 1002.5 304.5 L 1002.5 326.5 L 980.5 326.5 Z M 916.5 304.5 L 939.5 304.5 L 939.5 326.5 L 916.5 326.5 Z M 853.5 304.5 L 876.5 304.5 L 876.5 326.5 L 853.5 326.5 Z M 790.5 304.5 L 812.5 304.5 L 812.5 326.5 L 790.5 326.5 Z M 726.5 304.5 L 749.5 304.5 L 749.5 326.5 L 726.5 326.5 Z M 663.5 304.5 L 686.5 304.5 L 686.5 326.5 L 663.5 326.5 Z M 600.5 304.5 L 622.5 304.5 L 622.5 326.5 L 600.5 326.5 Z M 537.5 304.5 L 559.5 304.5 L 559.5 326.5 L 537.5 326.5 Z M 473.5 304.5 L 496.5 304.5 L 496.5 326.5 L 473.5 326.5 Z M 410.5 304.5 L 432.5 304.5 L 432.5 326.5 L 410.5 326.5 Z M 347.5 304.5 L 369.5 304.5 L 369.5 326.5 L 347.5 326.5 Z M 283.5 304.5 L 306.5 304.5 L 306.5 326.5 L 283.5 326.5 Z M 916.5 475.5 L 939.5 475.5 L 939.5 481.5 L 916.5 481.5 Z M 347.5 475.5 L 369.5 475.5 L 369.5 483.5 L 347.5 483.5 Z M 347.5 483.5 L 369.5 483.5 L 369.5 497.5 L 347.5 497.5 Z M 1233.5 475.5 L 1255.5 475.5 L 1255.5 497.5 L 1233.5 497.5 Z M 916.5 481.5 L 939.5 481.5 L 939.5 497.5 L 916.5 497.5 Z M 220.5 743.5 L 243.5 743.5 L 243.5 765.5 L 220.5 765.5 Z M 1676.5 743.5 L 1698.5 743.5 L 1698.5 765.5 L 1676.5 765.5 Z M 1613.5 743.5 L 1635.5 743.5 L 1635.5 765.5 L 1613.5 765.5 Z M 1549.5 743.5 L 1572.5 743.5 L 1572.5 765.5 L 1549.5 765.5 Z M 1486.5 743.5 L 1508.5 743.5 L 1508.5 765.5 L 1486.5 765.5 Z M 1423.5 743.5 L 1445.5 743.5 L 1445.5 765.5 L 1423.5 765.5 Z M 1359.5 743.5 L 1382.5 743.5 L 1382.5 765.5 L 1359.5 765.5 Z M 1296.5 743.5 L 1319.5 743.5 L 1319.5 765.5 L 1296.5 765.5 Z M 1233.5 743.5 L 1255.5 743.5 L 1255.5 765.5 L 1233.5 765.5 Z M 1170.5 743.5 L 1192.5 743.5 L 1192.5 765.5 L 1170.5 765.5 Z M 1106.5 743.5 L 1129.5 743.5 L 1129.5 765.5 L 1106.5 765.5 Z M 1043.5 743.5 L 1065.5 743.5 L 1065.5 765.5 L 1043.5 765.5 Z M 980.5 743.5 L 1002.5 743.5 L 1002.5 765.5 L 980.5 765.5 Z M 916.5 743.5 L 939.5 743.5 L 939.5 765.5 L 916.5 765.5 Z M 853.5 743.5 L 876.5 743.5 L 876.5 765.5 L 853.5 765.5 Z M 790.5 743.5 L 812.5 743.5 L 812.5 765.5 L 790.5 765.5 Z M 726.5 743.5 L 749.5 743.5 L 749.5 765.5 L 726.5 765.5 Z M 663.5 743.5 L 686.5 743.5 L 686.5 765.5 L 663.5 765.5 Z M 600.5 743.5 L 622.5 743.5 L 622.5 765.5 L 600.5 765.5 Z M 537.5 743.5 L 559.5 743.5 L 559.5 765.5 L 537.5 765.5 Z M 473.5 743.5 L 496.5 743.5 L 496.5 765.5 L 473.5 765.5 Z M 410.5 743.5 L 432.5 743.5 L 432.5 765.5 L 410.5 765.5 Z M 347.5 743.5 L 369.5 743.5 L 369.5 765.5 L 347.5 765.5 Z M 283.5 743.5 L 306.5 743.5 L 306.5 765.5 L 283.5 765.5 Z M 283.5 743.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="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>
@@ -186,6 +186,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1538.175781 373.960938 L 1538.175781 402.589844 L 1534.054688 402.589844 L 1519.25 379.378906 L 1519.25 402.589844 L 1515.792969 402.589844 L 1515.792969 373.960938 L 1519.757812 373.960938 L 1534.722656 397.367188 L 1534.722656 373.960938 Z M 1538.175781 373.960938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1486 702 L 1508 702 M 1486 680 L 1508 680 M 1486 680 L 1486 702 M 1508 680 L 1508 702 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1486 702 L 1508 702 M 1486 680 L 1508 680 M 1508 702 L 1508 680 M 1486 702 L 1486 680 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 320 L 200 329 M 195 325 L 204 325 M 199 326 L 201 326 M 199 324 L 201 324 M 199 324 L 199 326 M 201 324 L 201 326 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.svg b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.svg
index 1d6d2d7..b261448 100644
--- a/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.svg
+++ b/cells/dfrbp/sky130_fd_sc_hs__dfrbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 331.5 L 1743.5 331.5 L 1743.5 471.5 L 174.5 471.5 Z M 766.5 471.5 L 1743.5 471.5 L 1743.5 535.5 L 766.5 535.5 Z M 174.5 471.5 L 527.5 471.5 L 527.5 535.5 L 174.5 535.5 Z M 1318.5 535.5 L 1554.5 535.5 L 1554.5 544.5 L 1318.5 544.5 Z M 1318.5 535.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 195.5 690.5 L 1723.5 690.5 L 1723.5 717.5 L 195.5 717.5 Z M 195.5 690.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 655.5 544.5 L 671.5 544.5 L 671.5 590.5 L 655.5 590.5 Z M 608.5 544.5 L 624.5 544.5 L 624.5 590.5 L 608.5 590.5 Z M 1049.5 589.5 L 1065.5 589.5 L 1065.5 635.5 L 1049.5 635.5 Z M 909.5 582.5 L 925.5 582.5 L 925.5 663.5 L 909.5 663.5 Z M 788.5 582.5 L 804.5 582.5 L 804.5 663.5 L 788.5 663.5 Z M 1101.5 589.5 L 1117.5 589.5 L 1117.5 670.5 L 1101.5 670.5 Z M 515.5 626.5 L 532.5 626.5 L 532.5 672.5 L 515.5 672.5 Z M 473.5 626.5 L 489.5 626.5 L 489.5 672.5 L 473.5 672.5 Z M 1457.5 595.5 L 1473.5 595.5 L 1473.5 676.5 L 1457.5 676.5 Z M 1614.5 595.5 L 1631.5 595.5 L 1631.5 676.5 L 1614.5 676.5 Z M 1509.5 606.5 L 1526.5 606.5 L 1526.5 676.5 L 1509.5 676.5 Z M 362.5 595.5 L 378.5 595.5 L 378.5 676.5 L 362.5 676.5 Z M 1662.5 595.5 L 1678.5 595.5 L 1678.5 676.5 L 1662.5 676.5 Z M 1410.5 595.5 L 1426.5 595.5 L 1426.5 676.5 L 1410.5 676.5 Z M 1301.5 630.5 L 1318.5 630.5 L 1318.5 676.5 L 1301.5 676.5 Z M 1215.5 630.5 L 1231.5 630.5 L 1231.5 676.5 L 1215.5 676.5 Z M 1262.5 630.5 L 1278.5 630.5 L 1278.5 676.5 L 1262.5 676.5 Z M 264.5 630.5 L 281.5 630.5 L 281.5 676.5 L 264.5 676.5 Z M 307.5 630.5 L 323.5 630.5 L 323.5 676.5 L 307.5 676.5 Z M 307.5 630.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 646.5 405.5 L 662.5 405.5 L 662.5 451.5 L 646.5 451.5 Z M 596.5 405.5 L 613.5 405.5 L 613.5 451.5 L 596.5 451.5 Z M 553.5 405.5 L 570.5 405.5 L 570.5 451.5 L 553.5 451.5 Z M 469.5 405.5 L 486.5 405.5 L 486.5 451.5 L 469.5 451.5 Z M 360.5 392.5 L 377.5 392.5 L 377.5 502.5 L 360.5 502.5 Z M 304.5 456.5 L 321.5 456.5 L 321.5 502.5 L 304.5 502.5 Z M 255.5 456.5 L 271.5 456.5 L 271.5 502.5 L 255.5 502.5 Z M 1259.5 457.5 L 1275.5 457.5 L 1275.5 503.5 L 1259.5 503.5 Z M 1142.5 457.5 L 1158.5 457.5 L 1158.5 503.5 L 1142.5 503.5 Z M 1067.5 394.5 L 1083.5 394.5 L 1083.5 503.5 L 1067.5 503.5 Z M 1308.5 457.5 L 1325.5 457.5 L 1325.5 503.5 L 1308.5 503.5 Z M 1188.5 457.5 L 1204.5 457.5 L 1204.5 503.5 L 1188.5 503.5 Z M 828.5 392.5 L 845.5 392.5 L 845.5 515.5 L 828.5 515.5 Z M 1604.5 392.5 L 1621.5 392.5 L 1621.5 515.5 L 1604.5 515.5 Z M 916.5 392.5 L 932.5 392.5 L 932.5 515.5 L 916.5 515.5 Z M 1653.5 392.5 L 1670.5 392.5 L 1670.5 515.5 L 1653.5 515.5 Z M 1416.5 401.5 L 1433.5 401.5 L 1433.5 524.5 L 1416.5 524.5 Z M 1367.5 401.5 L 1383.5 401.5 L 1383.5 524.5 L 1367.5 524.5 Z M 1475.5 414.5 L 1492.5 414.5 L 1492.5 524.5 L 1475.5 524.5 Z M 1475.5 414.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 212.5 342.5 L 231.5 342.5 L 231.5 361.5 L 212.5 361.5 Z M 1687.5 342.5 L 1706.5 342.5 L 1706.5 361.5 L 1687.5 361.5 Z M 1634.5 342.5 L 1653.5 342.5 L 1653.5 361.5 L 1634.5 361.5 Z M 1582.5 342.5 L 1600.5 342.5 L 1600.5 361.5 L 1582.5 361.5 Z M 1529.5 342.5 L 1548.5 342.5 L 1548.5 361.5 L 1529.5 361.5 Z M 1476.5 342.5 L 1495.5 342.5 L 1495.5 361.5 L 1476.5 361.5 Z M 1424.5 342.5 L 1442.5 342.5 L 1442.5 361.5 L 1424.5 361.5 Z M 1371.5 342.5 L 1390.5 342.5 L 1390.5 361.5 L 1371.5 361.5 Z M 1318.5 342.5 L 1337.5 342.5 L 1337.5 361.5 L 1318.5 361.5 Z M 1266.5 342.5 L 1284.5 342.5 L 1284.5 361.5 L 1266.5 361.5 Z M 1213.5 342.5 L 1232.5 342.5 L 1232.5 361.5 L 1213.5 361.5 Z M 1160.5 342.5 L 1179.5 342.5 L 1179.5 361.5 L 1160.5 361.5 Z M 1108.5 342.5 L 1126.5 342.5 L 1126.5 361.5 L 1108.5 361.5 Z M 1055.5 342.5 L 1073.5 342.5 L 1073.5 361.5 L 1055.5 361.5 Z M 1002.5 342.5 L 1021.5 342.5 L 1021.5 361.5 L 1002.5 361.5 Z M 949.5 342.5 L 968.5 342.5 L 968.5 361.5 L 949.5 361.5 Z M 897.5 342.5 L 915.5 342.5 L 915.5 361.5 L 897.5 361.5 Z M 844.5 342.5 L 863.5 342.5 L 863.5 361.5 L 844.5 361.5 Z M 791.5 342.5 L 810.5 342.5 L 810.5 361.5 L 791.5 361.5 Z M 739.5 342.5 L 757.5 342.5 L 757.5 361.5 L 739.5 361.5 Z M 686.5 342.5 L 705.5 342.5 L 705.5 361.5 L 686.5 361.5 Z M 633.5 342.5 L 652.5 342.5 L 652.5 361.5 L 633.5 361.5 Z M 581.5 342.5 L 599.5 342.5 L 599.5 361.5 L 581.5 361.5 Z M 528.5 342.5 L 547.5 342.5 L 547.5 361.5 L 528.5 361.5 Z M 475.5 342.5 L 494.5 342.5 L 494.5 361.5 L 475.5 361.5 Z M 423.5 342.5 L 441.5 342.5 L 441.5 361.5 L 423.5 361.5 Z M 370.5 342.5 L 389.5 342.5 L 389.5 361.5 L 370.5 361.5 Z M 317.5 342.5 L 336.5 342.5 L 336.5 361.5 L 317.5 361.5 Z M 265.5 342.5 L 283.5 342.5 L 283.5 361.5 L 265.5 361.5 Z M 317.5 525.5 L 336.5 525.5 L 336.5 530.5 L 317.5 530.5 Z M 1266.5 525.5 L 1284.5 525.5 L 1284.5 530.5 L 1266.5 530.5 Z M 475.5 525.5 L 494.5 525.5 L 494.5 531.5 L 475.5 531.5 Z M 475.5 531.5 L 494.5 531.5 L 494.5 544.5 L 475.5 544.5 Z M 317.5 530.5 L 336.5 530.5 L 336.5 544.5 L 317.5 544.5 Z M 1266.5 530.5 L 1284.5 530.5 L 1284.5 544.5 L 1266.5 544.5 Z M 212.5 708.5 L 231.5 708.5 L 231.5 726.5 L 212.5 726.5 Z M 1687.5 708.5 L 1706.5 708.5 L 1706.5 726.5 L 1687.5 726.5 Z M 1634.5 708.5 L 1653.5 708.5 L 1653.5 726.5 L 1634.5 726.5 Z M 1582.5 708.5 L 1600.5 708.5 L 1600.5 726.5 L 1582.5 726.5 Z M 1529.5 708.5 L 1548.5 708.5 L 1548.5 726.5 L 1529.5 726.5 Z M 1476.5 708.5 L 1495.5 708.5 L 1495.5 726.5 L 1476.5 726.5 Z M 1424.5 708.5 L 1442.5 708.5 L 1442.5 726.5 L 1424.5 726.5 Z M 1371.5 708.5 L 1390.5 708.5 L 1390.5 726.5 L 1371.5 726.5 Z M 1318.5 708.5 L 1337.5 708.5 L 1337.5 726.5 L 1318.5 726.5 Z M 1266.5 708.5 L 1284.5 708.5 L 1284.5 726.5 L 1266.5 726.5 Z M 1213.5 708.5 L 1232.5 708.5 L 1232.5 726.5 L 1213.5 726.5 Z M 1160.5 708.5 L 1179.5 708.5 L 1179.5 726.5 L 1160.5 726.5 Z M 1108.5 708.5 L 1126.5 708.5 L 1126.5 726.5 L 1108.5 726.5 Z M 1055.5 708.5 L 1073.5 708.5 L 1073.5 726.5 L 1055.5 726.5 Z M 1002.5 708.5 L 1021.5 708.5 L 1021.5 726.5 L 1002.5 726.5 Z M 949.5 708.5 L 968.5 708.5 L 968.5 726.5 L 949.5 726.5 Z M 897.5 708.5 L 915.5 708.5 L 915.5 726.5 L 897.5 726.5 Z M 844.5 708.5 L 863.5 708.5 L 863.5 726.5 L 844.5 726.5 Z M 791.5 708.5 L 810.5 708.5 L 810.5 726.5 L 791.5 726.5 Z M 739.5 708.5 L 757.5 708.5 L 757.5 726.5 L 739.5 726.5 Z M 686.5 708.5 L 705.5 708.5 L 705.5 726.5 L 686.5 726.5 Z M 633.5 708.5 L 652.5 708.5 L 652.5 726.5 L 633.5 726.5 Z M 581.5 708.5 L 599.5 708.5 L 599.5 726.5 L 581.5 726.5 Z M 528.5 708.5 L 547.5 708.5 L 547.5 726.5 L 528.5 726.5 Z M 475.5 708.5 L 494.5 708.5 L 494.5 726.5 L 475.5 726.5 Z M 423.5 708.5 L 441.5 708.5 L 441.5 726.5 L 423.5 726.5 Z M 370.5 708.5 L 389.5 708.5 L 389.5 726.5 L 370.5 726.5 Z M 317.5 708.5 L 336.5 708.5 L 336.5 726.5 L 317.5 726.5 Z M 265.5 708.5 L 283.5 708.5 L 283.5 726.5 L 265.5 726.5 Z M 265.5 708.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface348">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,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 975.210938 578.53125 L 975.210938 586.757812 L 972.210938 586.757812 L 972.210938 563.242188 L 975.210938 563.242188 L 975.210938 575.144531 L 986.917969 563.242188 L 990.789062 563.242188 L 981.210938 572.824219 L 990.886719 586.757812 L 987.339844 586.757812 L 979.046875 574.695312 Z M 975.210938 578.53125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 949 514 L 968 514 M 949 495 L 968 495 M 949 495 L 949 514 M 968 495 L 968 514 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 949 514 L 968 514 M 949 495 L 968 495 M 968 514 L 968 495 M 949 514 L 949 495 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 195 357 L 195 366 M 190 362 L 199 362 M 194 363 L 196 363 M 194 361 L 196 361 M 194 361 L 194 363 M 196 361 L 196 363 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.svg b/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.svg
index ad8eec3..c2f9e34 100644
--- a/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.svg
+++ b/cells/dfrtn/sky130_fd_sc_hs__dfrtn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 533.5 L 174.5 533.5 Z M 1151.5 533.5 L 1744.5 533.5 L 1744.5 535.5 L 1151.5 535.5 Z M 174.5 533.5 L 644.5 533.5 L 644.5 535.5 L 174.5 535.5 Z M 174.5 533.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 200.5 730.5 L 1717.5 730.5 L 1717.5 764.5 L 200.5 764.5 Z M 200.5 730.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 764.5 619.5 L 784.5 619.5 L 784.5 676.5 L 764.5 676.5 Z M 863.5 619.5 L 883.5 619.5 L 883.5 676.5 L 863.5 676.5 Z M 670.5 619.5 L 691.5 619.5 L 691.5 676.5 L 670.5 676.5 Z M 813.5 619.5 L 834.5 619.5 L 834.5 676.5 L 813.5 676.5 Z M 1426.5 624.5 L 1447.5 624.5 L 1447.5 682.5 L 1426.5 682.5 Z M 1050.5 580.5 L 1070.5 580.5 L 1070.5 682.5 L 1050.5 682.5 Z M 1245.5 624.5 L 1265.5 624.5 L 1265.5 682.5 L 1245.5 682.5 Z M 1373.5 624.5 L 1393.5 624.5 L 1393.5 682.5 L 1373.5 682.5 Z M 1298.5 624.5 L 1319.5 624.5 L 1319.5 682.5 L 1298.5 682.5 Z M 989.5 580.5 L 1010.5 580.5 L 1010.5 682.5 L 989.5 682.5 Z M 530.5 593.5 L 551.5 593.5 L 551.5 695.5 L 530.5 695.5 Z M 1638.5 597.5 L 1659.5 597.5 L 1659.5 699.5 L 1638.5 699.5 Z M 1568.5 623.5 L 1589.5 623.5 L 1589.5 699.5 L 1568.5 699.5 Z M 262.5 655.5 L 283.5 655.5 L 283.5 713.5 L 262.5 713.5 Z M 316.5 655.5 L 336.5 655.5 L 336.5 713.5 L 316.5 713.5 Z M 386.5 611.5 L 407.5 611.5 L 407.5 713.5 L 386.5 713.5 Z M 386.5 611.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image364"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1436.5 357.5 L 1457.5 357.5 L 1457.5 415.5 L 1436.5 415.5 Z M 1375.5 357.5 L 1395.5 357.5 L 1395.5 415.5 L 1375.5 415.5 Z M 865.5 357.5 L 885.5 357.5 L 885.5 415.5 L 865.5 415.5 Z M 259.5 357.5 L 279.5 357.5 L 279.5 415.5 L 259.5 415.5 Z M 1300.5 357.5 L 1321.5 357.5 L 1321.5 415.5 L 1300.5 415.5 Z M 795.5 357.5 L 815.5 357.5 L 815.5 415.5 L 795.5 415.5 Z M 741.5 357.5 L 762.5 357.5 L 762.5 415.5 L 741.5 415.5 Z M 1243.5 357.5 L 1263.5 357.5 L 1263.5 415.5 L 1243.5 415.5 Z M 679.5 357.5 L 700.5 357.5 L 700.5 415.5 L 679.5 415.5 Z M 321.5 357.5 L 341.5 357.5 L 341.5 415.5 L 321.5 415.5 Z M 1570.5 357.5 L 1590.5 357.5 L 1590.5 472.5 L 1570.5 472.5 Z M 1126.5 357.5 L 1147.5 357.5 L 1147.5 494.5 L 1126.5 494.5 Z M 998.5 357.5 L 1019.5 357.5 L 1019.5 494.5 L 998.5 494.5 Z M 1639.5 357.5 L 1660.5 357.5 L 1660.5 511.5 L 1639.5 511.5 Z M 528.5 357.5 L 549.5 357.5 L 549.5 511.5 L 528.5 511.5 Z M 390.5 357.5 L 411.5 357.5 L 411.5 511.5 L 390.5 511.5 Z M 390.5 357.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 222.5 294.5 L 245.5 294.5 L 245.5 318.5 L 222.5 318.5 Z M 1673.5 294.5 L 1696.5 294.5 L 1696.5 318.5 L 1673.5 318.5 Z M 1607.5 294.5 L 1630.5 294.5 L 1630.5 318.5 L 1607.5 318.5 Z M 1541.5 294.5 L 1564.5 294.5 L 1564.5 318.5 L 1541.5 318.5 Z M 1475.5 294.5 L 1498.5 294.5 L 1498.5 318.5 L 1475.5 318.5 Z M 1409.5 294.5 L 1432.5 294.5 L 1432.5 318.5 L 1409.5 318.5 Z M 1343.5 294.5 L 1366.5 294.5 L 1366.5 318.5 L 1343.5 318.5 Z M 1277.5 294.5 L 1300.5 294.5 L 1300.5 318.5 L 1277.5 318.5 Z M 1211.5 294.5 L 1234.5 294.5 L 1234.5 318.5 L 1211.5 318.5 Z M 1145.5 294.5 L 1168.5 294.5 L 1168.5 318.5 L 1145.5 318.5 Z M 1079.5 294.5 L 1103.5 294.5 L 1103.5 318.5 L 1079.5 318.5 Z M 1013.5 294.5 L 1037.5 294.5 L 1037.5 318.5 L 1013.5 318.5 Z M 947.5 294.5 L 971.5 294.5 L 971.5 318.5 L 947.5 318.5 Z M 881.5 294.5 L 905.5 294.5 L 905.5 318.5 L 881.5 318.5 Z M 815.5 294.5 L 839.5 294.5 L 839.5 318.5 L 815.5 318.5 Z M 749.5 294.5 L 773.5 294.5 L 773.5 318.5 L 749.5 318.5 Z M 683.5 294.5 L 707.5 294.5 L 707.5 318.5 L 683.5 318.5 Z M 617.5 294.5 L 641.5 294.5 L 641.5 318.5 L 617.5 318.5 Z M 552.5 294.5 L 575.5 294.5 L 575.5 318.5 L 552.5 318.5 Z M 486.5 294.5 L 509.5 294.5 L 509.5 318.5 L 486.5 318.5 Z M 420.5 294.5 L 443.5 294.5 L 443.5 318.5 L 420.5 318.5 Z M 354.5 294.5 L 377.5 294.5 L 377.5 318.5 L 354.5 318.5 Z M 288.5 294.5 L 311.5 294.5 L 311.5 318.5 L 288.5 318.5 Z M 881.5 523.5 L 905.5 523.5 L 905.5 527.5 L 881.5 527.5 Z M 1343.5 523.5 L 1366.5 523.5 L 1366.5 528.5 L 1343.5 528.5 Z M 1343.5 528.5 L 1366.5 528.5 L 1366.5 546.5 L 1343.5 546.5 Z M 881.5 527.5 L 905.5 527.5 L 905.5 546.5 L 881.5 546.5 Z M 354.5 523.5 L 377.5 523.5 L 377.5 546.5 L 354.5 546.5 Z M 222.5 752.5 L 245.5 752.5 L 245.5 775.5 L 222.5 775.5 Z M 1673.5 752.5 L 1696.5 752.5 L 1696.5 775.5 L 1673.5 775.5 Z M 1607.5 752.5 L 1630.5 752.5 L 1630.5 775.5 L 1607.5 775.5 Z M 1541.5 752.5 L 1564.5 752.5 L 1564.5 775.5 L 1541.5 775.5 Z M 1475.5 752.5 L 1498.5 752.5 L 1498.5 775.5 L 1475.5 775.5 Z M 1409.5 752.5 L 1432.5 752.5 L 1432.5 775.5 L 1409.5 775.5 Z M 1343.5 752.5 L 1366.5 752.5 L 1366.5 775.5 L 1343.5 775.5 Z M 1277.5 752.5 L 1300.5 752.5 L 1300.5 775.5 L 1277.5 775.5 Z M 1211.5 752.5 L 1234.5 752.5 L 1234.5 775.5 L 1211.5 775.5 Z M 1145.5 752.5 L 1168.5 752.5 L 1168.5 775.5 L 1145.5 775.5 Z M 1079.5 752.5 L 1103.5 752.5 L 1103.5 775.5 L 1079.5 775.5 Z M 1013.5 752.5 L 1037.5 752.5 L 1037.5 775.5 L 1013.5 775.5 Z M 947.5 752.5 L 971.5 752.5 L 971.5 775.5 L 947.5 775.5 Z M 881.5 752.5 L 905.5 752.5 L 905.5 775.5 L 881.5 775.5 Z M 815.5 752.5 L 839.5 752.5 L 839.5 775.5 L 815.5 775.5 Z M 749.5 752.5 L 773.5 752.5 L 773.5 775.5 L 749.5 775.5 Z M 683.5 752.5 L 707.5 752.5 L 707.5 775.5 L 683.5 775.5 Z M 617.5 752.5 L 641.5 752.5 L 641.5 775.5 L 617.5 775.5 Z M 552.5 752.5 L 575.5 752.5 L 575.5 775.5 L 552.5 775.5 Z M 486.5 752.5 L 509.5 752.5 L 509.5 775.5 L 486.5 775.5 Z M 420.5 752.5 L 443.5 752.5 L 443.5 775.5 L 420.5 775.5 Z M 354.5 752.5 L 377.5 752.5 L 377.5 775.5 L 354.5 775.5 Z M 288.5 752.5 L 311.5 752.5 L 311.5 775.5 L 288.5 775.5 Z M 288.5 752.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface360">
+<g id="surface387">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 224.121094 499.5 L 224.121094 469.847656 L 235.550781 469.847656 L 237.339844 469.972656 L 239.007812 470.296875 L 240.550781 470.867188 L 241.976562 471.597656 L 243.234375 472.613281 L 244.414062 473.792969 L 245.390625 475.21875 L 246.207031 476.765625 L 246.816406 478.511719 L 247.261719 480.382812 L 247.507812 482.457031 L 247.628906 484.652344 L 247.507812 486.972656 L 247.222656 489.128906 L 246.734375 491.082031 L 246.082031 492.871094 L 245.230469 494.457031 L 244.171875 495.839844 L 243.03125 496.976562 L 241.773438 497.875 L 240.390625 498.605469 L 238.882812 499.09375 L 237.257812 499.417969 L 235.550781 499.5 Z M 227.902344 496.164062 L 234.898438 496.164062 L 236.769531 496.042969 L 238.4375 495.59375 L 239.902344 494.824219 L 241.121094 493.804688 L 242.097656 492.421875 L 242.910156 490.753906 L 243.15625 489.902344 L 243.398438 489.007812 L 243.601562 488.03125 L 243.722656 486.972656 L 243.804688 485.875 L 243.847656 484.695312 L 243.683594 482.050781 L 243.277344 479.734375 L 242.542969 477.738281 L 241.570312 476.152344 L 240.308594 474.851562 L 238.761719 473.917969 L 238.191406 473.714844 L 237.582031 473.511719 L 236.933594 473.386719 L 236.28125 473.265625 L 235.589844 473.226562 L 234.898438 473.183594 L 227.902344 473.183594 Z M 227.902344 496.164062 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 607 L 245 607 M 222 583 L 245 583 M 222 583 L 222 607 M 245 583 L 245 607 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 222 607 L 245 607 M 222 583 L 245 583 M 245 607 L 245 583 M 222 607 L 222 583 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 310 L 200 319 M 195 315 L 204 315 M 199 316 L 201 316 M 199 314 L 201 314 M 199 314 L 199 316 M 201 314 L 201 316 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.svg b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.svg
index a879a9b..017d07c 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.svg
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 535.5 L 174.5 535.5 Z M 391.5 535.5 L 1080.5 535.5 L 1080.5 537.5 L 391.5 537.5 Z M 931.5 537.5 L 1080.5 537.5 L 1080.5 550.5 L 931.5 550.5 Z M 931.5 537.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 200.5 730.5 L 1717.5 730.5 L 1717.5 764.5 L 200.5 764.5 Z M 200.5 730.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="#image339"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 672.5 611.5 L 692.5 611.5 L 692.5 669.5 L 672.5 669.5 Z M 848.5 611.5 L 868.5 611.5 L 868.5 669.5 L 848.5 669.5 Z M 740.5 611.5 L 761.5 611.5 L 761.5 669.5 L 740.5 669.5 Z M 794.5 611.5 L 815.5 611.5 L 815.5 669.5 L 794.5 669.5 Z M 1194.5 650.5 L 1215.5 650.5 L 1215.5 708.5 L 1194.5 708.5 Z M 1248.5 650.5 L 1268.5 650.5 L 1268.5 708.5 L 1248.5 708.5 Z M 1367.5 650.5 L 1388.5 650.5 L 1388.5 708.5 L 1367.5 708.5 Z M 1318.5 650.5 L 1338.5 650.5 L 1338.5 708.5 L 1318.5 708.5 Z M 314.5 652.5 L 334.5 652.5 L 334.5 710.5 L 314.5 710.5 Z M 260.5 652.5 L 281.5 652.5 L 281.5 710.5 L 260.5 710.5 Z M 1050.5 611.5 L 1070.5 611.5 L 1070.5 713.5 L 1050.5 713.5 Z M 450.5 611.5 L 470.5 611.5 L 470.5 713.5 L 450.5 713.5 Z M 519.5 611.5 L 539.5 611.5 L 539.5 713.5 L 519.5 713.5 Z M 1639.5 611.5 L 1660.5 611.5 L 1660.5 713.5 L 1639.5 713.5 Z M 1503.5 637.5 L 1524.5 637.5 L 1524.5 713.5 L 1503.5 713.5 Z M 938.5 611.5 L 958.5 611.5 L 958.5 713.5 L 938.5 713.5 Z M 938.5 611.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 258.5 357.5 L 279.5 357.5 L 279.5 415.5 L 258.5 415.5 Z M 320.5 357.5 L 341.5 357.5 L 341.5 415.5 L 320.5 415.5 Z M 1246.5 367.5 L 1267.5 367.5 L 1267.5 425.5 L 1246.5 425.5 Z M 1325.5 367.5 L 1346.5 367.5 L 1346.5 425.5 L 1325.5 425.5 Z M 1188.5 367.5 L 1209.5 367.5 L 1209.5 425.5 L 1188.5 425.5 Z M 1387.5 367.5 L 1408.5 367.5 L 1408.5 425.5 L 1387.5 425.5 Z M 773.5 392.5 L 793.5 392.5 L 793.5 450.5 L 773.5 450.5 Z M 657.5 392.5 L 678.5 392.5 L 678.5 450.5 L 657.5 450.5 Z M 858.5 392.5 L 879.5 392.5 L 879.5 450.5 L 858.5 450.5 Z M 719.5 392.5 L 740.5 392.5 L 740.5 450.5 L 719.5 450.5 Z M 1460.5 367.5 L 1481.5 367.5 L 1481.5 483.5 L 1460.5 483.5 Z M 1067.5 367.5 L 1088.5 367.5 L 1088.5 505.5 L 1067.5 505.5 Z M 1637.5 357.5 L 1658.5 357.5 L 1658.5 511.5 L 1637.5 511.5 Z M 455.5 358.5 L 475.5 358.5 L 475.5 512.5 L 455.5 512.5 Z M 516.5 358.5 L 537.5 358.5 L 537.5 512.5 L 516.5 512.5 Z M 998.5 388.5 L 1019.5 388.5 L 1019.5 525.5 L 998.5 525.5 Z M 998.5 388.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 222.5 294.5 L 245.5 294.5 L 245.5 318.5 L 222.5 318.5 Z M 1673.5 294.5 L 1696.5 294.5 L 1696.5 318.5 L 1673.5 318.5 Z M 1607.5 294.5 L 1630.5 294.5 L 1630.5 318.5 L 1607.5 318.5 Z M 1541.5 294.5 L 1564.5 294.5 L 1564.5 318.5 L 1541.5 318.5 Z M 1475.5 294.5 L 1498.5 294.5 L 1498.5 318.5 L 1475.5 318.5 Z M 1409.5 294.5 L 1432.5 294.5 L 1432.5 318.5 L 1409.5 318.5 Z M 1343.5 294.5 L 1366.5 294.5 L 1366.5 318.5 L 1343.5 318.5 Z M 1277.5 294.5 L 1300.5 294.5 L 1300.5 318.5 L 1277.5 318.5 Z M 1211.5 294.5 L 1234.5 294.5 L 1234.5 318.5 L 1211.5 318.5 Z M 1145.5 294.5 L 1168.5 294.5 L 1168.5 318.5 L 1145.5 318.5 Z M 1079.5 294.5 L 1103.5 294.5 L 1103.5 318.5 L 1079.5 318.5 Z M 1013.5 294.5 L 1037.5 294.5 L 1037.5 318.5 L 1013.5 318.5 Z M 947.5 294.5 L 971.5 294.5 L 971.5 318.5 L 947.5 318.5 Z M 881.5 294.5 L 905.5 294.5 L 905.5 318.5 L 881.5 318.5 Z M 815.5 294.5 L 839.5 294.5 L 839.5 318.5 L 815.5 318.5 Z M 749.5 294.5 L 773.5 294.5 L 773.5 318.5 L 749.5 318.5 Z M 683.5 294.5 L 707.5 294.5 L 707.5 318.5 L 683.5 318.5 Z M 617.5 294.5 L 641.5 294.5 L 641.5 318.5 L 617.5 318.5 Z M 552.5 294.5 L 575.5 294.5 L 575.5 318.5 L 552.5 318.5 Z M 486.5 294.5 L 509.5 294.5 L 509.5 318.5 L 486.5 318.5 Z M 420.5 294.5 L 443.5 294.5 L 443.5 318.5 L 420.5 318.5 Z M 354.5 294.5 L 377.5 294.5 L 377.5 318.5 L 354.5 318.5 Z M 288.5 294.5 L 311.5 294.5 L 311.5 318.5 L 288.5 318.5 Z M 354.5 472.5 L 377.5 472.5 L 377.5 480.5 L 354.5 480.5 Z M 881.5 472.5 L 905.5 472.5 L 905.5 483.5 L 881.5 483.5 Z M 881.5 483.5 L 905.5 483.5 L 905.5 496.5 L 881.5 496.5 Z M 354.5 480.5 L 377.5 480.5 L 377.5 496.5 L 354.5 496.5 Z M 1277.5 472.5 L 1300.5 472.5 L 1300.5 496.5 L 1277.5 496.5 Z M 222.5 752.5 L 245.5 752.5 L 245.5 775.5 L 222.5 775.5 Z M 1673.5 752.5 L 1696.5 752.5 L 1696.5 775.5 L 1673.5 775.5 Z M 1607.5 752.5 L 1630.5 752.5 L 1630.5 775.5 L 1607.5 775.5 Z M 1541.5 752.5 L 1564.5 752.5 L 1564.5 775.5 L 1541.5 775.5 Z M 1475.5 752.5 L 1498.5 752.5 L 1498.5 775.5 L 1475.5 775.5 Z M 1409.5 752.5 L 1432.5 752.5 L 1432.5 775.5 L 1409.5 775.5 Z M 1343.5 752.5 L 1366.5 752.5 L 1366.5 775.5 L 1343.5 775.5 Z M 1277.5 752.5 L 1300.5 752.5 L 1300.5 775.5 L 1277.5 775.5 Z M 1211.5 752.5 L 1234.5 752.5 L 1234.5 775.5 L 1211.5 775.5 Z M 1145.5 752.5 L 1168.5 752.5 L 1168.5 775.5 L 1145.5 775.5 Z M 1079.5 752.5 L 1103.5 752.5 L 1103.5 775.5 L 1079.5 775.5 Z M 1013.5 752.5 L 1037.5 752.5 L 1037.5 775.5 L 1013.5 775.5 Z M 947.5 752.5 L 971.5 752.5 L 971.5 775.5 L 947.5 775.5 Z M 881.5 752.5 L 905.5 752.5 L 905.5 775.5 L 881.5 775.5 Z M 815.5 752.5 L 839.5 752.5 L 839.5 775.5 L 815.5 775.5 Z M 749.5 752.5 L 773.5 752.5 L 773.5 775.5 L 749.5 775.5 Z M 683.5 752.5 L 707.5 752.5 L 707.5 775.5 L 683.5 775.5 Z M 617.5 752.5 L 641.5 752.5 L 641.5 775.5 L 617.5 775.5 Z M 552.5 752.5 L 575.5 752.5 L 575.5 775.5 L 552.5 775.5 Z M 486.5 752.5 L 509.5 752.5 L 509.5 775.5 L 486.5 775.5 Z M 420.5 752.5 L 443.5 752.5 L 443.5 775.5 L 420.5 775.5 Z M 354.5 752.5 L 377.5 752.5 L 377.5 775.5 L 354.5 775.5 Z M 288.5 752.5 L 311.5 752.5 L 311.5 775.5 L 288.5 775.5 Z M 288.5 752.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface309">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 224.121094 499.5 L 224.121094 469.847656 L 235.550781 469.847656 L 237.339844 469.972656 L 239.007812 470.296875 L 240.550781 470.867188 L 241.976562 471.597656 L 243.234375 472.613281 L 244.414062 473.792969 L 245.390625 475.21875 L 246.207031 476.765625 L 246.816406 478.511719 L 247.261719 480.382812 L 247.507812 482.457031 L 247.628906 484.652344 L 247.507812 486.972656 L 247.222656 489.128906 L 246.734375 491.082031 L 246.082031 492.871094 L 245.230469 494.457031 L 244.171875 495.839844 L 243.03125 496.976562 L 241.773438 497.875 L 240.390625 498.605469 L 238.882812 499.09375 L 237.257812 499.417969 L 235.550781 499.5 Z M 227.902344 496.164062 L 234.898438 496.164062 L 236.769531 496.042969 L 238.4375 495.59375 L 239.902344 494.824219 L 241.121094 493.804688 L 242.097656 492.421875 L 242.910156 490.753906 L 243.15625 489.902344 L 243.398438 489.007812 L 243.601562 488.03125 L 243.722656 486.972656 L 243.804688 485.875 L 243.847656 484.695312 L 243.683594 482.050781 L 243.277344 479.734375 L 242.542969 477.738281 L 241.570312 476.152344 L 240.308594 474.851562 L 238.761719 473.917969 L 238.191406 473.714844 L 237.582031 473.511719 L 236.933594 473.386719 L 236.28125 473.265625 L 235.589844 473.226562 L 234.898438 473.183594 L 227.902344 473.183594 Z M 227.902344 496.164062 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 222 607 L 245 607 M 222 583 L 245 583 M 222 583 L 222 607 M 245 583 L 245 607 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 222 607 L 245 607 M 222 583 L 245 583 M 245 607 L 245 583 M 222 607 L 222 583 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 310 L 200 319 M 195 315 L 204 315 M 199 316 L 201 316 M 199 314 L 201 314 M 199 314 L 199 316 M 201 314 L 201 316 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.svg b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.svg
index 8c57499..b50f95a 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.svg
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 290.5 L 1744.5 290.5 L 1744.5 535.5 L 175.5 535.5 Z M 383.5 535.5 L 1114.5 535.5 L 1114.5 549.5 L 383.5 549.5 Z M 383.5 535.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image353"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 200.5 722.5 L 1719.5 722.5 L 1719.5 754.5 L 200.5 754.5 Z M 200.5 722.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="#image353"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 653.5 608.5 L 672.5 608.5 L 672.5 663.5 L 653.5 663.5 Z M 821.5 608.5 L 841.5 608.5 L 841.5 663.5 L 821.5 663.5 Z M 719.5 608.5 L 738.5 608.5 L 738.5 663.5 L 719.5 663.5 Z M 770.5 608.5 L 790.5 608.5 L 790.5 663.5 L 770.5 663.5 Z M 1208.5 645.5 L 1228.5 645.5 L 1228.5 701.5 L 1208.5 701.5 Z M 1156.5 645.5 L 1176.5 645.5 L 1176.5 701.5 L 1156.5 701.5 Z M 1276.5 645.5 L 1296.5 645.5 L 1296.5 701.5 L 1276.5 701.5 Z M 1328.5 645.5 L 1348.5 645.5 L 1348.5 701.5 L 1328.5 701.5 Z M 308.5 647.5 L 328.5 647.5 L 328.5 703.5 L 308.5 703.5 Z M 257.5 647.5 L 277.5 647.5 L 277.5 703.5 L 257.5 703.5 Z M 955.5 608.5 L 975.5 608.5 L 975.5 705.5 L 955.5 705.5 Z M 439.5 608.5 L 459.5 608.5 L 459.5 705.5 L 439.5 705.5 Z M 514.5 608.5 L 534.5 608.5 L 534.5 705.5 L 514.5 705.5 Z M 1457.5 608.5 L 1477.5 608.5 L 1477.5 705.5 L 1457.5 705.5 Z M 1018.5 608.5 L 1038.5 608.5 L 1038.5 705.5 L 1018.5 705.5 Z M 1588.5 608.5 L 1607.5 608.5 L 1607.5 705.5 L 1588.5 705.5 Z M 1644.5 608.5 L 1664.5 608.5 L 1664.5 705.5 L 1644.5 705.5 Z M 1644.5 608.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 255.5 364.5 L 275.5 364.5 L 275.5 419.5 L 255.5 419.5 Z M 314.5 364.5 L 334.5 364.5 L 334.5 419.5 L 314.5 419.5 Z M 1369.5 374.5 L 1389.5 374.5 L 1389.5 429.5 L 1369.5 429.5 Z M 1276.5 374.5 L 1296.5 374.5 L 1296.5 429.5 L 1276.5 429.5 Z M 1210.5 374.5 L 1230.5 374.5 L 1230.5 429.5 L 1210.5 429.5 Z M 1154.5 374.5 L 1174.5 374.5 L 1174.5 429.5 L 1154.5 429.5 Z M 639.5 397.5 L 659.5 397.5 L 659.5 453.5 L 639.5 453.5 Z M 698.5 397.5 L 718.5 397.5 L 718.5 453.5 L 698.5 453.5 Z M 835.5 397.5 L 855.5 397.5 L 855.5 453.5 L 835.5 453.5 Z M 754.5 397.5 L 773.5 397.5 L 773.5 453.5 L 754.5 453.5 Z M 1447.5 374.5 L 1466.5 374.5 L 1466.5 485.5 L 1447.5 485.5 Z M 1642.5 364.5 L 1662.5 364.5 L 1662.5 512.5 L 1642.5 512.5 Z M 1583.5 364.5 L 1603.5 364.5 L 1603.5 512.5 L 1583.5 512.5 Z M 444.5 368.5 L 463.5 368.5 L 463.5 516.5 L 444.5 516.5 Z M 1035.5 384.5 L 1055.5 384.5 L 1055.5 516.5 L 1035.5 516.5 Z M 503.5 368.5 L 523.5 368.5 L 523.5 516.5 L 503.5 516.5 Z M 968.5 394.5 L 988.5 394.5 L 988.5 525.5 L 968.5 525.5 Z M 968.5 394.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 220.5 304.5 L 243.5 304.5 L 243.5 326.5 L 220.5 326.5 Z M 1676.5 304.5 L 1698.5 304.5 L 1698.5 326.5 L 1676.5 326.5 Z M 1613.5 304.5 L 1635.5 304.5 L 1635.5 326.5 L 1613.5 326.5 Z M 1549.5 304.5 L 1572.5 304.5 L 1572.5 326.5 L 1549.5 326.5 Z M 1486.5 304.5 L 1508.5 304.5 L 1508.5 326.5 L 1486.5 326.5 Z M 1423.5 304.5 L 1445.5 304.5 L 1445.5 326.5 L 1423.5 326.5 Z M 1359.5 304.5 L 1382.5 304.5 L 1382.5 326.5 L 1359.5 326.5 Z M 1296.5 304.5 L 1319.5 304.5 L 1319.5 326.5 L 1296.5 326.5 Z M 1233.5 304.5 L 1255.5 304.5 L 1255.5 326.5 L 1233.5 326.5 Z M 1170.5 304.5 L 1192.5 304.5 L 1192.5 326.5 L 1170.5 326.5 Z M 1106.5 304.5 L 1129.5 304.5 L 1129.5 326.5 L 1106.5 326.5 Z M 1043.5 304.5 L 1065.5 304.5 L 1065.5 326.5 L 1043.5 326.5 Z M 980.5 304.5 L 1002.5 304.5 L 1002.5 326.5 L 980.5 326.5 Z M 916.5 304.5 L 939.5 304.5 L 939.5 326.5 L 916.5 326.5 Z M 853.5 304.5 L 876.5 304.5 L 876.5 326.5 L 853.5 326.5 Z M 790.5 304.5 L 812.5 304.5 L 812.5 326.5 L 790.5 326.5 Z M 726.5 304.5 L 749.5 304.5 L 749.5 326.5 L 726.5 326.5 Z M 663.5 304.5 L 686.5 304.5 L 686.5 326.5 L 663.5 326.5 Z M 600.5 304.5 L 622.5 304.5 L 622.5 326.5 L 600.5 326.5 Z M 537.5 304.5 L 559.5 304.5 L 559.5 326.5 L 537.5 326.5 Z M 473.5 304.5 L 496.5 304.5 L 496.5 326.5 L 473.5 326.5 Z M 410.5 304.5 L 432.5 304.5 L 432.5 326.5 L 410.5 326.5 Z M 347.5 304.5 L 369.5 304.5 L 369.5 326.5 L 347.5 326.5 Z M 283.5 304.5 L 306.5 304.5 L 306.5 326.5 L 283.5 326.5 Z M 347.5 475.5 L 369.5 475.5 L 369.5 481.5 L 347.5 481.5 Z M 853.5 475.5 L 876.5 475.5 L 876.5 485.5 L 853.5 485.5 Z M 853.5 485.5 L 876.5 485.5 L 876.5 497.5 L 853.5 497.5 Z M 347.5 481.5 L 369.5 481.5 L 369.5 497.5 L 347.5 497.5 Z M 1233.5 475.5 L 1255.5 475.5 L 1255.5 497.5 L 1233.5 497.5 Z M 220.5 743.5 L 243.5 743.5 L 243.5 765.5 L 220.5 765.5 Z M 1676.5 743.5 L 1698.5 743.5 L 1698.5 765.5 L 1676.5 765.5 Z M 1613.5 743.5 L 1635.5 743.5 L 1635.5 765.5 L 1613.5 765.5 Z M 1549.5 743.5 L 1572.5 743.5 L 1572.5 765.5 L 1549.5 765.5 Z M 1486.5 743.5 L 1508.5 743.5 L 1508.5 765.5 L 1486.5 765.5 Z M 1423.5 743.5 L 1445.5 743.5 L 1445.5 765.5 L 1423.5 765.5 Z M 1359.5 743.5 L 1382.5 743.5 L 1382.5 765.5 L 1359.5 765.5 Z M 1296.5 743.5 L 1319.5 743.5 L 1319.5 765.5 L 1296.5 765.5 Z M 1233.5 743.5 L 1255.5 743.5 L 1255.5 765.5 L 1233.5 765.5 Z M 1170.5 743.5 L 1192.5 743.5 L 1192.5 765.5 L 1170.5 765.5 Z M 1106.5 743.5 L 1129.5 743.5 L 1129.5 765.5 L 1106.5 765.5 Z M 1043.5 743.5 L 1065.5 743.5 L 1065.5 765.5 L 1043.5 765.5 Z M 980.5 743.5 L 1002.5 743.5 L 1002.5 765.5 L 980.5 765.5 Z M 916.5 743.5 L 939.5 743.5 L 939.5 765.5 L 916.5 765.5 Z M 853.5 743.5 L 876.5 743.5 L 876.5 765.5 L 853.5 765.5 Z M 790.5 743.5 L 812.5 743.5 L 812.5 765.5 L 790.5 765.5 Z M 726.5 743.5 L 749.5 743.5 L 749.5 765.5 L 726.5 765.5 Z M 663.5 743.5 L 686.5 743.5 L 686.5 765.5 L 663.5 765.5 Z M 600.5 743.5 L 622.5 743.5 L 622.5 765.5 L 600.5 765.5 Z M 537.5 743.5 L 559.5 743.5 L 559.5 765.5 L 537.5 765.5 Z M 473.5 743.5 L 496.5 743.5 L 496.5 765.5 L 473.5 765.5 Z M 410.5 743.5 L 432.5 743.5 L 432.5 765.5 L 410.5 765.5 Z M 347.5 743.5 L 369.5 743.5 L 369.5 765.5 L 347.5 765.5 Z M 283.5 743.5 L 306.5 743.5 L 306.5 765.5 L 283.5 765.5 Z M 283.5 743.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface322">
+<g id="surface350">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1639.285156 402.222656 L 1637.441406 404.5 L 1633.316406 401.082031 L 1632.136719 401.710938 L 1630.960938 402.183594 L 1629.742188 402.574219 L 1628.445312 402.851562 L 1627.152344 403.007812 L 1625.816406 403.085938 L 1624.007812 402.96875 L 1622.320312 402.695312 L 1620.75 402.222656 L 1619.257812 401.59375 L 1617.84375 400.769531 L 1616.585938 399.707031 L 1615.449219 398.570312 L 1614.464844 397.273438 L 1613.679688 395.859375 L 1613.011719 394.328125 L 1612.503906 392.679688 L 1612.1875 390.875 L 1612.109375 390.441406 L 1612.070312 389.96875 L 1612.03125 389.539062 L 1611.992188 389.066406 L 1611.992188 388.085938 L 1612.070312 386.121094 L 1612.347656 384.234375 L 1612.777344 382.507812 L 1613.40625 380.859375 L 1614.191406 379.328125 L 1615.210938 377.914062 L 1616.234375 376.773438 L 1617.410156 375.753906 L 1618.707031 374.890625 L 1620.082031 374.222656 L 1621.574219 373.671875 L 1623.222656 373.28125 L 1623.617188 373.242188 L 1624.046875 373.203125 L 1624.480469 373.160156 L 1624.914062 373.121094 L 1625.34375 373.121094 L 1625.816406 373.082031 L 1627.582031 373.203125 L 1629.269531 373.476562 L 1630.84375 373.949219 L 1632.335938 374.574219 L 1633.75 375.402344 L 1635.042969 376.421875 L 1636.144531 377.597656 L 1637.125 378.855469 L 1637.910156 380.230469 L 1638.578125 381.761719 L 1639.089844 383.410156 L 1639.441406 385.140625 L 1639.480469 385.648438 L 1639.558594 386.59375 L 1639.597656 387.0625 L 1639.597656 387.535156 L 1639.640625 388.007812 L 1639.519531 390.207031 L 1639.167969 392.285156 L 1638.617188 394.210938 L 1637.832031 396.015625 L 1636.8125 397.667969 L 1635.59375 399.199219 Z M 1629.390625 394.132812 L 1632.882812 397 L 1633.828125 395.820312 L 1634.613281 394.484375 L 1635.203125 393.03125 L 1635.632812 391.5 L 1635.867188 389.851562 L 1635.988281 388.046875 L 1635.90625 386.394531 L 1635.671875 384.824219 L 1635.28125 383.371094 L 1634.769531 382.039062 L 1634.101562 380.78125 L 1633.277344 379.640625 L 1632.335938 378.699219 L 1631.351562 377.914062 L 1630.253906 377.285156 L 1629.074219 376.8125 L 1627.777344 376.5 L 1626.445312 376.304688 L 1625.816406 376.304688 L 1624.402344 376.421875 L 1623.066406 376.65625 L 1621.808594 377.050781 L 1620.671875 377.640625 L 1619.609375 378.386719 L 1618.667969 379.289062 L 1617.765625 380.347656 L 1617.058594 381.527344 L 1616.46875 382.824219 L 1616.039062 384.234375 L 1615.761719 385.769531 L 1615.644531 387.417969 L 1615.644531 388.085938 L 1615.683594 389.8125 L 1615.917969 391.382812 L 1616.3125 392.835938 L 1616.824219 394.210938 L 1617.53125 395.46875 L 1618.394531 396.566406 L 1619.296875 397.550781 L 1620.316406 398.335938 L 1621.417969 398.960938 L 1622.59375 399.394531 L 1623.890625 399.707031 L 1625.265625 399.828125 L 1625.34375 399.867188 L 1626.484375 399.867188 L 1627.230469 399.789062 L 1627.976562 399.628906 L 1628.683594 399.472656 L 1629.390625 399.238281 L 1630.136719 398.921875 L 1630.175781 398.921875 L 1630.253906 398.882812 L 1630.292969 398.84375 L 1630.371094 398.84375 L 1630.410156 398.804688 L 1630.488281 398.765625 L 1627.582031 396.332031 Z M 1629.390625 394.132812 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1613 702 L 1635 702 M 1613 680 L 1635 680 M 1613 680 L 1613 702 M 1635 680 L 1635 702 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1613 702 L 1635 702 M 1613 680 L 1635 680 M 1635 702 L 1635 680 M 1613 702 L 1613 680 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 320 L 200 329 M 195 325 L 204 325 M 199 326 L 201 326 M 199 324 L 201 324 M 199 324 L 199 326 M 201 324 L 201 326 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.svg b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.svg
index 2f4e4b4..9c01a52 100644
--- a/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.svg
+++ b/cells/dfrtp/sky130_fd_sc_hs__dfrtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 324.5 L 1743.5 324.5 L 1743.5 535.5 L 174.5 535.5 Z M 355.5 535.5 L 529.5 535.5 L 529.5 536.5 L 355.5 536.5 Z M 355.5 535.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 196.5 695.5 L 1722.5 695.5 L 1722.5 723.5 L 196.5 723.5 Z M 196.5 695.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 583.5 597.5 L 600.5 597.5 L 600.5 645.5 L 583.5 645.5 Z M 728.5 597.5 L 745.5 597.5 L 745.5 645.5 L 728.5 645.5 Z M 640.5 597.5 L 657.5 597.5 L 657.5 645.5 L 640.5 645.5 Z M 684.5 597.5 L 701.5 597.5 L 701.5 645.5 L 684.5 645.5 Z M 1158.5 630.5 L 1175.5 630.5 L 1175.5 677.5 L 1158.5 677.5 Z M 1216.5 630.5 L 1233.5 630.5 L 1233.5 677.5 L 1216.5 677.5 Z M 1260.5 630.5 L 1277.5 630.5 L 1277.5 677.5 L 1260.5 677.5 Z M 1114.5 630.5 L 1131.5 630.5 L 1131.5 677.5 L 1114.5 677.5 Z M 249.5 631.5 L 266.5 631.5 L 266.5 679.5 L 249.5 679.5 Z M 293.5 631.5 L 310.5 631.5 L 310.5 679.5 L 293.5 679.5 Z M 994.5 597.5 L 1011.5 597.5 L 1011.5 681.5 L 994.5 681.5 Z M 1380.5 597.5 L 1397.5 597.5 L 1397.5 681.5 L 1380.5 681.5 Z M 470.5 597.5 L 487.5 597.5 L 487.5 681.5 L 470.5 681.5 Z M 833.5 597.5 L 850.5 597.5 L 850.5 681.5 L 833.5 681.5 Z M 406.5 597.5 L 423.5 597.5 L 423.5 681.5 L 406.5 681.5 Z M 1493.5 597.5 L 1510.5 597.5 L 1510.5 681.5 L 1493.5 681.5 Z M 1609.5 597.5 L 1626.5 597.5 L 1626.5 681.5 L 1609.5 681.5 Z M 1552.5 597.5 L 1569.5 597.5 L 1569.5 681.5 L 1552.5 681.5 Z M 1658.5 597.5 L 1675.5 597.5 L 1675.5 681.5 L 1658.5 681.5 Z M 1658.5 597.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 244.5 387.5 L 261.5 387.5 L 261.5 435.5 L 244.5 435.5 Z M 295.5 387.5 L 312.5 387.5 L 312.5 435.5 L 295.5 435.5 Z M 1102.5 396.5 L 1119.5 396.5 L 1119.5 443.5 L 1102.5 443.5 Z M 1150.5 396.5 L 1167.5 396.5 L 1167.5 443.5 L 1150.5 443.5 Z M 1211.5 396.5 L 1228.5 396.5 L 1228.5 443.5 L 1211.5 443.5 Z M 1262.5 396.5 L 1279.5 396.5 L 1279.5 443.5 L 1262.5 443.5 Z M 740.5 413.5 L 757.5 413.5 L 757.5 460.5 L 740.5 460.5 Z M 626.5 413.5 L 643.5 413.5 L 643.5 460.5 L 626.5 460.5 Z M 671.5 413.5 L 688.5 413.5 L 688.5 460.5 L 671.5 460.5 Z M 575.5 413.5 L 592.5 413.5 L 592.5 460.5 L 575.5 460.5 Z M 1371.5 396.5 L 1388.5 396.5 L 1388.5 491.5 L 1371.5 491.5 Z M 1320.5 396.5 L 1337.5 396.5 L 1337.5 491.5 L 1320.5 491.5 Z M 945.5 387.5 L 962.5 387.5 L 962.5 501.5 L 945.5 501.5 Z M 894.5 387.5 L 911.5 387.5 L 911.5 501.5 L 894.5 501.5 Z M 1428.5 387.5 L 1445.5 387.5 L 1445.5 514.5 L 1428.5 514.5 Z M 1484.5 387.5 L 1501.5 387.5 L 1501.5 514.5 L 1484.5 514.5 Z M 1640.5 387.5 L 1657.5 387.5 L 1657.5 514.5 L 1640.5 514.5 Z M 1589.5 387.5 L 1606.5 387.5 L 1606.5 514.5 L 1589.5 514.5 Z M 459.5 388.5 L 476.5 388.5 L 476.5 516.5 L 459.5 516.5 Z M 408.5 388.5 L 425.5 388.5 L 425.5 516.5 L 408.5 516.5 Z M 408.5 388.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 213.5 336.5 L 232.5 336.5 L 232.5 355.5 L 213.5 355.5 Z M 1685.5 336.5 L 1704.5 336.5 L 1704.5 355.5 L 1685.5 355.5 Z M 1630.5 336.5 L 1649.5 336.5 L 1649.5 355.5 L 1630.5 355.5 Z M 1576.5 336.5 L 1595.5 336.5 L 1595.5 355.5 L 1576.5 355.5 Z M 1521.5 336.5 L 1540.5 336.5 L 1540.5 355.5 L 1521.5 355.5 Z M 1467.5 336.5 L 1486.5 336.5 L 1486.5 355.5 L 1467.5 355.5 Z M 1412.5 336.5 L 1431.5 336.5 L 1431.5 355.5 L 1412.5 355.5 Z M 1358.5 336.5 L 1377.5 336.5 L 1377.5 355.5 L 1358.5 355.5 Z M 1303.5 336.5 L 1322.5 336.5 L 1322.5 355.5 L 1303.5 355.5 Z M 1249.5 336.5 L 1268.5 336.5 L 1268.5 355.5 L 1249.5 355.5 Z M 1194.5 336.5 L 1213.5 336.5 L 1213.5 355.5 L 1194.5 355.5 Z M 1140.5 336.5 L 1159.5 336.5 L 1159.5 355.5 L 1140.5 355.5 Z M 1085.5 336.5 L 1104.5 336.5 L 1104.5 355.5 L 1085.5 355.5 Z M 1031.5 336.5 L 1050.5 336.5 L 1050.5 355.5 L 1031.5 355.5 Z M 976.5 336.5 L 995.5 336.5 L 995.5 355.5 L 976.5 355.5 Z M 922.5 336.5 L 941.5 336.5 L 941.5 355.5 L 922.5 355.5 Z M 867.5 336.5 L 886.5 336.5 L 886.5 355.5 L 867.5 355.5 Z M 813.5 336.5 L 832.5 336.5 L 832.5 355.5 L 813.5 355.5 Z M 758.5 336.5 L 777.5 336.5 L 777.5 355.5 L 758.5 355.5 Z M 704.5 336.5 L 723.5 336.5 L 723.5 355.5 L 704.5 355.5 Z M 649.5 336.5 L 668.5 336.5 L 668.5 355.5 L 649.5 355.5 Z M 595.5 336.5 L 614.5 336.5 L 614.5 355.5 L 595.5 355.5 Z M 540.5 336.5 L 559.5 336.5 L 559.5 355.5 L 540.5 355.5 Z M 486.5 336.5 L 505.5 336.5 L 505.5 355.5 L 486.5 355.5 Z M 431.5 336.5 L 450.5 336.5 L 450.5 355.5 L 431.5 355.5 Z M 377.5 336.5 L 396.5 336.5 L 396.5 355.5 L 377.5 355.5 Z M 322.5 336.5 L 341.5 336.5 L 341.5 355.5 L 322.5 355.5 Z M 268.5 336.5 L 287.5 336.5 L 287.5 355.5 L 268.5 355.5 Z M 322.5 483.5 L 341.5 483.5 L 341.5 489.5 L 322.5 489.5 Z M 1194.5 483.5 L 1213.5 483.5 L 1213.5 493.5 L 1194.5 493.5 Z M 813.5 483.5 L 832.5 483.5 L 832.5 502.5 L 813.5 502.5 Z M 1194.5 493.5 L 1213.5 493.5 L 1213.5 502.5 L 1194.5 502.5 Z M 322.5 489.5 L 341.5 489.5 L 341.5 502.5 L 322.5 502.5 Z M 213.5 714.5 L 232.5 714.5 L 232.5 733.5 L 213.5 733.5 Z M 1685.5 714.5 L 1704.5 714.5 L 1704.5 733.5 L 1685.5 733.5 Z M 1630.5 714.5 L 1649.5 714.5 L 1649.5 733.5 L 1630.5 733.5 Z M 1576.5 714.5 L 1595.5 714.5 L 1595.5 733.5 L 1576.5 733.5 Z M 1521.5 714.5 L 1540.5 714.5 L 1540.5 733.5 L 1521.5 733.5 Z M 1467.5 714.5 L 1486.5 714.5 L 1486.5 733.5 L 1467.5 733.5 Z M 1412.5 714.5 L 1431.5 714.5 L 1431.5 733.5 L 1412.5 733.5 Z M 1358.5 714.5 L 1377.5 714.5 L 1377.5 733.5 L 1358.5 733.5 Z M 1303.5 714.5 L 1322.5 714.5 L 1322.5 733.5 L 1303.5 733.5 Z M 1249.5 714.5 L 1268.5 714.5 L 1268.5 733.5 L 1249.5 733.5 Z M 1194.5 714.5 L 1213.5 714.5 L 1213.5 733.5 L 1194.5 733.5 Z M 1140.5 714.5 L 1159.5 714.5 L 1159.5 733.5 L 1140.5 733.5 Z M 1085.5 714.5 L 1104.5 714.5 L 1104.5 733.5 L 1085.5 733.5 Z M 1031.5 714.5 L 1050.5 714.5 L 1050.5 733.5 L 1031.5 733.5 Z M 976.5 714.5 L 995.5 714.5 L 995.5 733.5 L 976.5 733.5 Z M 922.5 714.5 L 941.5 714.5 L 941.5 733.5 L 922.5 733.5 Z M 867.5 714.5 L 886.5 714.5 L 886.5 733.5 L 867.5 733.5 Z M 813.5 714.5 L 832.5 714.5 L 832.5 733.5 L 813.5 733.5 Z M 758.5 714.5 L 777.5 714.5 L 777.5 733.5 L 758.5 733.5 Z M 704.5 714.5 L 723.5 714.5 L 723.5 733.5 L 704.5 733.5 Z M 649.5 714.5 L 668.5 714.5 L 668.5 733.5 L 649.5 733.5 Z M 595.5 714.5 L 614.5 714.5 L 614.5 733.5 L 595.5 733.5 Z M 540.5 714.5 L 559.5 714.5 L 559.5 733.5 L 540.5 733.5 Z M 486.5 714.5 L 505.5 714.5 L 505.5 733.5 L 486.5 733.5 Z M 431.5 714.5 L 450.5 714.5 L 450.5 733.5 L 431.5 733.5 Z M 377.5 714.5 L 396.5 714.5 L 396.5 733.5 L 377.5 733.5 Z M 322.5 714.5 L 341.5 714.5 L 341.5 733.5 L 322.5 733.5 Z M 268.5 714.5 L 287.5 714.5 L 287.5 733.5 L 268.5 733.5 Z M 268.5 714.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface349">
+<g id="surface377">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1707.171875 546.546875 L 1705.589844 548.5 L 1702.058594 545.570312 L 1701.046875 546.109375 L 1700.039062 546.515625 L 1698.992188 546.851562 L 1697.882812 547.085938 L 1696.773438 547.222656 L 1695.628906 547.289062 L 1694.078125 547.1875 L 1692.632812 546.953125 L 1691.285156 546.546875 L 1690.007812 546.007812 L 1688.792969 545.300781 L 1687.71875 544.394531 L 1686.742188 543.417969 L 1685.898438 542.304688 L 1685.226562 541.09375 L 1684.652344 539.78125 L 1684.214844 538.367188 L 1683.949219 536.820312 L 1683.878906 536.449219 L 1683.847656 536.046875 L 1683.8125 535.675781 L 1683.777344 535.269531 L 1683.777344 534.429688 L 1683.847656 532.746094 L 1684.082031 531.132812 L 1684.453125 529.648438 L 1684.992188 528.234375 L 1685.664062 526.921875 L 1686.539062 525.710938 L 1687.414062 524.734375 L 1688.425781 523.859375 L 1689.535156 523.121094 L 1690.714844 522.546875 L 1691.992188 522.078125 L 1693.40625 521.738281 L 1693.742188 521.707031 L 1694.113281 521.671875 L 1694.484375 521.640625 L 1694.851562 521.605469 L 1695.222656 521.605469 L 1695.628906 521.570312 L 1697.140625 521.671875 L 1698.589844 521.90625 L 1699.9375 522.3125 L 1701.214844 522.851562 L 1702.425781 523.558594 L 1703.539062 524.433594 L 1704.480469 525.441406 L 1705.320312 526.519531 L 1705.996094 527.699219 L 1706.566406 529.011719 L 1707.003906 530.425781 L 1707.308594 531.90625 L 1707.339844 532.34375 L 1707.375 532.746094 L 1707.410156 533.152344 L 1707.441406 533.554688 L 1707.441406 533.957031 L 1707.476562 534.363281 L 1707.375 536.246094 L 1707.070312 538.03125 L 1706.601562 539.679688 L 1705.929688 541.230469 L 1705.050781 542.644531 L 1704.007812 543.957031 Z M 1698.691406 539.613281 L 1701.6875 542.070312 L 1702.496094 541.0625 L 1703.167969 539.917969 L 1703.671875 538.671875 L 1704.042969 537.359375 L 1704.246094 535.945312 L 1704.347656 534.394531 L 1704.277344 532.984375 L 1704.078125 531.636719 L 1703.738281 530.390625 L 1703.300781 529.246094 L 1702.730469 528.167969 L 1702.023438 527.191406 L 1701.214844 526.386719 L 1700.375 525.710938 L 1699.429688 525.171875 L 1698.421875 524.769531 L 1697.3125 524.5 L 1696.167969 524.332031 L 1695.628906 524.332031 L 1694.414062 524.433594 L 1693.269531 524.632812 L 1692.195312 524.972656 L 1691.21875 525.476562 L 1690.308594 526.117188 L 1689.5 526.890625 L 1688.726562 527.796875 L 1688.121094 528.808594 L 1687.617188 529.917969 L 1687.246094 531.132812 L 1687.011719 532.445312 L 1686.910156 533.859375 L 1686.910156 534.429688 L 1686.941406 535.910156 L 1687.144531 537.257812 L 1687.480469 538.503906 L 1687.917969 539.679688 L 1688.523438 540.757812 L 1689.265625 541.699219 L 1690.039062 542.542969 L 1690.914062 543.214844 L 1691.859375 543.753906 L 1692.867188 544.125 L 1693.976562 544.394531 L 1695.15625 544.496094 L 1695.222656 544.527344 L 1696.199219 544.527344 L 1696.839844 544.460938 L 1697.480469 544.324219 L 1698.085938 544.191406 L 1698.691406 543.988281 L 1699.332031 543.71875 L 1699.363281 543.71875 L 1699.429688 543.6875 L 1699.464844 543.652344 L 1699.53125 543.652344 L 1699.566406 543.621094 L 1699.632812 543.585938 L 1697.140625 541.5 Z M 1698.691406 539.613281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1685 554 L 1704 554 M 1685 535 L 1704 535 M 1685 535 L 1685 554 M 1704 535 L 1704 554 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1685 554 L 1704 554 M 1685 535 L 1704 535 M 1704 554 L 1704 535 M 1685 554 L 1685 535 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 351 L 196 360 M 191 356 L 200 356 M 195 357 L 197 357 M 195 355 L 197 355 M 195 355 L 195 357 M 197 355 L 197 357 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.svg b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.svg
index fc4b563..6b420ef 100644
--- a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.svg
+++ b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 299.5 L 1744.5 299.5 L 1744.5 535.5 L 174.5 535.5 Z M 321.5 535.5 L 1050.5 535.5 L 1050.5 542.5 L 321.5 542.5 Z M 918.5 542.5 L 1050.5 542.5 L 1050.5 552.5 L 918.5 552.5 Z M 918.5 542.5 "/>
 </clipPath>
-<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image464" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image437"/>
+  <use xlink:href="#image464"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 198.5 715.5 L 1719.5 715.5 L 1719.5 746.5 L 198.5 746.5 Z M 198.5 715.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image437"/>
+  <use xlink:href="#image464"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 653.5 641.5 L 672.5 641.5 L 672.5 694.5 L 653.5 694.5 Z M 557.5 641.5 L 576.5 641.5 L 576.5 694.5 L 557.5 694.5 Z M 703.5 641.5 L 722.5 641.5 L 722.5 694.5 L 703.5 694.5 Z M 252.5 642.5 L 271.5 642.5 L 271.5 695.5 L 252.5 695.5 Z M 1314.5 645.5 L 1333.5 645.5 L 1333.5 699.5 L 1314.5 699.5 Z M 1205.5 645.5 L 1224.5 645.5 L 1224.5 699.5 L 1205.5 699.5 Z M 1155.5 645.5 L 1174.5 645.5 L 1174.5 699.5 L 1155.5 699.5 Z M 1106.5 645.5 L 1125.5 645.5 L 1125.5 699.5 L 1106.5 699.5 Z M 979.5 618.5 L 998.5 618.5 L 998.5 699.5 L 979.5 699.5 Z M 377.5 605.5 L 396.5 605.5 L 396.5 699.5 L 377.5 699.5 Z M 1647.5 605.5 L 1666.5 605.5 L 1666.5 699.5 L 1647.5 699.5 Z M 1574.5 629.5 L 1593.5 629.5 L 1593.5 699.5 L 1574.5 699.5 Z M 1041.5 618.5 L 1060.5 618.5 L 1060.5 699.5 L 1041.5 699.5 Z M 901.5 645.5 L 920.5 645.5 L 920.5 699.5 L 901.5 699.5 Z M 1448.5 605.5 L 1467.5 605.5 L 1467.5 699.5 L 1448.5 699.5 Z M 432.5 605.5 L 451.5 605.5 L 451.5 699.5 L 432.5 699.5 Z M 852.5 645.5 L 871.5 645.5 L 871.5 699.5 L 852.5 699.5 Z M 852.5 645.5 "/>
 </clipPath>
-<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image465" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image438"/>
+  <use xlink:href="#image465"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 253.5 370.5 L 272.5 370.5 L 272.5 424.5 L 253.5 424.5 Z M 1251.5 370.5 L 1270.5 370.5 L 1270.5 424.5 L 1251.5 424.5 Z M 1390.5 370.5 L 1409.5 370.5 L 1409.5 424.5 L 1390.5 424.5 Z M 1194.5 370.5 L 1213.5 370.5 L 1213.5 424.5 L 1194.5 424.5 Z M 1141.5 370.5 L 1160.5 370.5 L 1160.5 424.5 L 1141.5 424.5 Z M 577.5 399.5 L 596.5 399.5 L 596.5 452.5 L 577.5 452.5 Z M 641.5 399.5 L 660.5 399.5 L 660.5 452.5 L 641.5 452.5 Z M 694.5 399.5 L 713.5 399.5 L 713.5 452.5 L 694.5 452.5 Z M 873.5 399.5 L 892.5 399.5 L 892.5 452.5 L 873.5 452.5 Z M 809.5 399.5 L 828.5 399.5 L 828.5 452.5 L 809.5 452.5 Z M 1582.5 384.5 L 1601.5 384.5 L 1601.5 490.5 L 1582.5 490.5 Z M 1038.5 380.5 L 1057.5 380.5 L 1057.5 507.5 L 1038.5 507.5 Z M 1646.5 370.5 L 1665.5 370.5 L 1665.5 512.5 L 1646.5 512.5 Z M 1454.5 370.5 L 1473.5 370.5 L 1473.5 512.5 L 1454.5 512.5 Z M 381.5 377.5 L 400.5 377.5 L 400.5 519.5 L 381.5 519.5 Z M 438.5 377.5 L 457.5 377.5 L 457.5 519.5 L 438.5 519.5 Z M 974.5 403.5 L 993.5 403.5 L 993.5 529.5 L 974.5 529.5 Z M 974.5 403.5 "/>
 </clipPath>
-<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image466" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image439"/>
+  <use xlink:href="#image466"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 218.5 313.5 L 239.5 313.5 L 239.5 334.5 L 218.5 334.5 Z M 1678.5 313.5 L 1700.5 313.5 L 1700.5 334.5 L 1678.5 334.5 Z M 1617.5 313.5 L 1639.5 313.5 L 1639.5 334.5 L 1617.5 334.5 Z M 1557.5 313.5 L 1578.5 313.5 L 1578.5 334.5 L 1557.5 334.5 Z M 1496.5 313.5 L 1517.5 313.5 L 1517.5 334.5 L 1496.5 334.5 Z M 1435.5 313.5 L 1456.5 313.5 L 1456.5 334.5 L 1435.5 334.5 Z M 1374.5 313.5 L 1396.5 313.5 L 1396.5 334.5 L 1374.5 334.5 Z M 1313.5 313.5 L 1335.5 313.5 L 1335.5 334.5 L 1313.5 334.5 Z M 1252.5 313.5 L 1274.5 313.5 L 1274.5 334.5 L 1252.5 334.5 Z M 1192.5 313.5 L 1213.5 313.5 L 1213.5 334.5 L 1192.5 334.5 Z M 1131.5 313.5 L 1152.5 313.5 L 1152.5 334.5 L 1131.5 334.5 Z M 1070.5 313.5 L 1091.5 313.5 L 1091.5 334.5 L 1070.5 334.5 Z M 1009.5 313.5 L 1031.5 313.5 L 1031.5 334.5 L 1009.5 334.5 Z M 948.5 313.5 L 970.5 313.5 L 970.5 334.5 L 948.5 334.5 Z M 887.5 313.5 L 909.5 313.5 L 909.5 334.5 L 887.5 334.5 Z M 826.5 313.5 L 848.5 313.5 L 848.5 334.5 L 826.5 334.5 Z M 766.5 313.5 L 787.5 313.5 L 787.5 334.5 L 766.5 334.5 Z M 705.5 313.5 L 726.5 313.5 L 726.5 334.5 L 705.5 334.5 Z M 644.5 313.5 L 665.5 313.5 L 665.5 334.5 L 644.5 334.5 Z M 583.5 313.5 L 605.5 313.5 L 605.5 334.5 L 583.5 334.5 Z M 522.5 313.5 L 544.5 313.5 L 544.5 334.5 L 522.5 334.5 Z M 461.5 313.5 L 483.5 313.5 L 483.5 334.5 L 461.5 334.5 Z M 400.5 313.5 L 422.5 313.5 L 422.5 334.5 L 400.5 334.5 Z M 340.5 313.5 L 361.5 313.5 L 361.5 334.5 L 340.5 334.5 Z M 279.5 313.5 L 300.5 313.5 L 300.5 334.5 L 279.5 334.5 Z M 887.5 524.5 L 909.5 524.5 L 909.5 529.5 L 887.5 529.5 Z M 1252.5 524.5 L 1274.5 524.5 L 1274.5 545.5 L 1252.5 545.5 Z M 887.5 529.5 L 909.5 529.5 L 909.5 545.5 L 887.5 545.5 Z M 218.5 735.5 L 239.5 735.5 L 239.5 756.5 L 218.5 756.5 Z M 1678.5 735.5 L 1700.5 735.5 L 1700.5 756.5 L 1678.5 756.5 Z M 1617.5 735.5 L 1639.5 735.5 L 1639.5 756.5 L 1617.5 756.5 Z M 1557.5 735.5 L 1578.5 735.5 L 1578.5 756.5 L 1557.5 756.5 Z M 1496.5 735.5 L 1517.5 735.5 L 1517.5 756.5 L 1496.5 756.5 Z M 1435.5 735.5 L 1456.5 735.5 L 1456.5 756.5 L 1435.5 756.5 Z M 1374.5 735.5 L 1396.5 735.5 L 1396.5 756.5 L 1374.5 756.5 Z M 1313.5 735.5 L 1335.5 735.5 L 1335.5 756.5 L 1313.5 756.5 Z M 1252.5 735.5 L 1274.5 735.5 L 1274.5 756.5 L 1252.5 756.5 Z M 1192.5 735.5 L 1213.5 735.5 L 1213.5 756.5 L 1192.5 756.5 Z M 1131.5 735.5 L 1152.5 735.5 L 1152.5 756.5 L 1131.5 756.5 Z M 1070.5 735.5 L 1091.5 735.5 L 1091.5 756.5 L 1070.5 756.5 Z M 1009.5 735.5 L 1031.5 735.5 L 1031.5 756.5 L 1009.5 756.5 Z M 948.5 735.5 L 970.5 735.5 L 970.5 756.5 L 948.5 756.5 Z M 887.5 735.5 L 909.5 735.5 L 909.5 756.5 L 887.5 756.5 Z M 826.5 735.5 L 848.5 735.5 L 848.5 756.5 L 826.5 756.5 Z M 766.5 735.5 L 787.5 735.5 L 787.5 756.5 L 766.5 756.5 Z M 705.5 735.5 L 726.5 735.5 L 726.5 756.5 L 705.5 756.5 Z M 644.5 735.5 L 665.5 735.5 L 665.5 756.5 L 644.5 756.5 Z M 583.5 735.5 L 605.5 735.5 L 605.5 756.5 L 583.5 756.5 Z M 522.5 735.5 L 544.5 735.5 L 544.5 756.5 L 522.5 756.5 Z M 461.5 735.5 L 483.5 735.5 L 483.5 756.5 L 461.5 756.5 Z M 400.5 735.5 L 422.5 735.5 L 422.5 756.5 L 400.5 756.5 Z M 340.5 735.5 L 361.5 735.5 L 361.5 756.5 L 340.5 756.5 Z M 279.5 735.5 L 300.5 735.5 L 300.5 756.5 L 279.5 756.5 Z M 279.5 735.5 "/>
 </clipPath>
-<image id="image440" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image467" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image440"/>
+  <use xlink:href="#image467"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface434">
+<g id="surface461">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -221,6 +221,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 429.300781 586.363281 L 429.300781 595.660156 L 425.910156 595.660156 L 425.910156 569.078125 L 429.300781 569.078125 L 429.300781 582.535156 L 442.539062 569.078125 L 446.914062 569.078125 L 436.085938 579.90625 L 447.023438 595.660156 L 443.011719 595.660156 L 433.640625 582.023438 Z M 429.300781 586.363281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 400 508 L 422 508 M 400 487 L 422 487 M 400 487 L 400 508 M 422 487 L 422 508 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 400 508 L 422 508 M 400 487 L 422 487 M 422 508 L 422 487 M 400 508 L 400 487 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 198 328 L 198 337 M 193 333 L 202 333 M 197 334 L 199 334 M 197 332 L 199 332 M 197 332 L 197 334 M 199 332 L 199 334 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.svg b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.svg
index 9fc22e5..d678618 100644
--- a/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.svg
+++ b/cells/dfsbp/sky130_fd_sc_hs__dfsbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 316.5 L 1744.5 316.5 L 1744.5 535.5 L 174.5 535.5 Z M 310.5 535.5 L 989.5 535.5 L 989.5 541.5 L 310.5 541.5 Z M 866.5 541.5 L 989.5 541.5 L 989.5 551.5 L 866.5 551.5 Z M 866.5 541.5 "/>
 </clipPath>
-<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image463" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image435"/>
+  <use xlink:href="#image463"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 196.5 701.5 L 1721.5 701.5 L 1721.5 730.5 L 196.5 730.5 Z M 196.5 701.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image435"/>
+  <use xlink:href="#image463"/>
 </pattern>
 <mask id="mask1">
 <rect 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 611.5 L 1143.5 611.5 L 1143.5 661.5 L 1125.5 661.5 Z M 1034.5 611.5 L 1051.5 611.5 L 1051.5 661.5 L 1034.5 661.5 Z M 1079.5 611.5 L 1097.5 611.5 L 1097.5 661.5 L 1079.5 661.5 Z M 1244.5 611.5 L 1261.5 611.5 L 1261.5 661.5 L 1244.5 661.5 Z M 609.5 624.5 L 626.5 624.5 L 626.5 673.5 L 609.5 673.5 Z M 529.5 624.5 L 546.5 624.5 L 546.5 673.5 L 529.5 673.5 Z M 651.5 624.5 L 669.5 624.5 L 669.5 673.5 L 651.5 673.5 Z M 1369.5 600.5 L 1387.5 600.5 L 1387.5 687.5 L 1369.5 687.5 Z M 1420.5 600.5 L 1438.5 600.5 L 1438.5 687.5 L 1420.5 687.5 Z M 1654.5 600.5 L 1672.5 600.5 L 1672.5 687.5 L 1654.5 687.5 Z M 967.5 611.5 L 984.5 611.5 L 984.5 687.5 L 967.5 687.5 Z M 921.5 611.5 L 938.5 611.5 L 938.5 687.5 L 921.5 687.5 Z M 1604.5 600.5 L 1621.5 600.5 L 1621.5 687.5 L 1604.5 687.5 Z M 246.5 637.5 L 263.5 637.5 L 263.5 687.5 L 246.5 687.5 Z M 768.5 637.5 L 785.5 637.5 L 785.5 687.5 L 768.5 687.5 Z M 362.5 600.5 L 380.5 600.5 L 380.5 687.5 L 362.5 687.5 Z M 810.5 637.5 L 828.5 637.5 L 828.5 687.5 L 810.5 687.5 Z M 413.5 600.5 L 431.5 600.5 L 431.5 687.5 L 413.5 687.5 Z M 1537.5 611.5 L 1554.5 611.5 L 1554.5 687.5 L 1537.5 687.5 Z M 1537.5 611.5 "/>
 </clipPath>
-<image id="image436" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image464" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image436"/>
+  <use xlink:href="#image464"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 247.5 382.5 L 265.5 382.5 L 265.5 431.5 L 247.5 431.5 Z M 1176.5 382.5 L 1194.5 382.5 L 1194.5 431.5 L 1176.5 431.5 Z M 1074.5 382.5 L 1091.5 382.5 L 1091.5 431.5 L 1074.5 431.5 Z M 1123.5 382.5 L 1141.5 382.5 L 1141.5 431.5 L 1123.5 431.5 Z M 752.5 408.5 L 770.5 408.5 L 770.5 458.5 L 752.5 458.5 Z M 813.5 408.5 L 831.5 408.5 L 831.5 458.5 L 813.5 458.5 Z M 594.5 408.5 L 612.5 408.5 L 612.5 458.5 L 594.5 458.5 Z M 644.5 408.5 L 661.5 408.5 L 661.5 458.5 L 644.5 458.5 Z M 541.5 408.5 L 559.5 408.5 L 559.5 458.5 L 541.5 458.5 Z M 978.5 382.5 L 996.5 382.5 L 996.5 500.5 L 978.5 500.5 Z M 1304.5 464.5 L 1321.5 464.5 L 1321.5 514.5 L 1304.5 514.5 Z M 1367.5 382.5 L 1384.5 382.5 L 1384.5 514.5 L 1367.5 514.5 Z M 1419.5 382.5 L 1437.5 382.5 L 1437.5 514.5 L 1419.5 514.5 Z M 1538.5 396.5 L 1555.5 396.5 L 1555.5 514.5 L 1538.5 514.5 Z M 1653.5 382.5 L 1671.5 382.5 L 1671.5 514.5 L 1653.5 514.5 Z M 1600.5 382.5 L 1618.5 382.5 L 1618.5 514.5 L 1600.5 514.5 Z M 366.5 388.5 L 384.5 388.5 L 384.5 520.5 L 366.5 520.5 Z M 419.5 388.5 L 436.5 388.5 L 436.5 520.5 L 419.5 520.5 Z M 919.5 412.5 L 936.5 412.5 L 936.5 530.5 L 919.5 530.5 Z M 919.5 412.5 "/>
 </clipPath>
-<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image465" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image437"/>
+  <use xlink:href="#image465"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 215.5 328.5 L 235.5 328.5 L 235.5 348.5 L 215.5 348.5 Z M 1683.5 328.5 L 1703.5 328.5 L 1703.5 348.5 L 1683.5 348.5 Z M 1627.5 328.5 L 1647.5 328.5 L 1647.5 348.5 L 1627.5 348.5 Z M 1570.5 328.5 L 1590.5 328.5 L 1590.5 348.5 L 1570.5 348.5 Z M 1514.5 328.5 L 1534.5 328.5 L 1534.5 348.5 L 1514.5 348.5 Z M 1457.5 328.5 L 1477.5 328.5 L 1477.5 348.5 L 1457.5 348.5 Z M 1401.5 328.5 L 1421.5 328.5 L 1421.5 348.5 L 1401.5 348.5 Z M 1344.5 328.5 L 1364.5 328.5 L 1364.5 348.5 L 1344.5 348.5 Z M 1288.5 328.5 L 1308.5 328.5 L 1308.5 348.5 L 1288.5 348.5 Z M 1231.5 328.5 L 1251.5 328.5 L 1251.5 348.5 L 1231.5 348.5 Z M 1175.5 328.5 L 1195.5 328.5 L 1195.5 348.5 L 1175.5 348.5 Z M 1118.5 328.5 L 1138.5 328.5 L 1138.5 348.5 L 1118.5 348.5 Z M 1062.5 328.5 L 1082.5 328.5 L 1082.5 348.5 L 1062.5 348.5 Z M 1005.5 328.5 L 1025.5 328.5 L 1025.5 348.5 L 1005.5 348.5 Z M 949.5 328.5 L 969.5 328.5 L 969.5 348.5 L 949.5 348.5 Z M 892.5 328.5 L 912.5 328.5 L 912.5 348.5 L 892.5 348.5 Z M 836.5 328.5 L 856.5 328.5 L 856.5 348.5 L 836.5 348.5 Z M 779.5 328.5 L 799.5 328.5 L 799.5 348.5 L 779.5 348.5 Z M 723.5 328.5 L 743.5 328.5 L 743.5 348.5 L 723.5 348.5 Z M 666.5 328.5 L 686.5 328.5 L 686.5 348.5 L 666.5 348.5 Z M 610.5 328.5 L 630.5 328.5 L 630.5 348.5 L 610.5 348.5 Z M 554.5 328.5 L 574.5 328.5 L 574.5 348.5 L 554.5 348.5 Z M 497.5 328.5 L 517.5 328.5 L 517.5 348.5 L 497.5 348.5 Z M 441.5 328.5 L 461.5 328.5 L 461.5 348.5 L 441.5 348.5 Z M 384.5 328.5 L 404.5 328.5 L 404.5 348.5 L 384.5 348.5 Z M 328.5 328.5 L 348.5 328.5 L 348.5 348.5 L 328.5 348.5 Z M 271.5 328.5 L 291.5 328.5 L 291.5 348.5 L 271.5 348.5 Z M 836.5 524.5 L 856.5 524.5 L 856.5 544.5 L 836.5 544.5 Z M 1175.5 524.5 L 1195.5 524.5 L 1195.5 544.5 L 1175.5 544.5 Z M 215.5 720.5 L 235.5 720.5 L 235.5 740.5 L 215.5 740.5 Z M 1683.5 720.5 L 1703.5 720.5 L 1703.5 740.5 L 1683.5 740.5 Z M 1627.5 720.5 L 1647.5 720.5 L 1647.5 740.5 L 1627.5 740.5 Z M 1570.5 720.5 L 1590.5 720.5 L 1590.5 740.5 L 1570.5 740.5 Z M 1514.5 720.5 L 1534.5 720.5 L 1534.5 740.5 L 1514.5 740.5 Z M 1457.5 720.5 L 1477.5 720.5 L 1477.5 740.5 L 1457.5 740.5 Z M 1401.5 720.5 L 1421.5 720.5 L 1421.5 740.5 L 1401.5 740.5 Z M 1344.5 720.5 L 1364.5 720.5 L 1364.5 740.5 L 1344.5 740.5 Z M 1288.5 720.5 L 1308.5 720.5 L 1308.5 740.5 L 1288.5 740.5 Z M 1231.5 720.5 L 1251.5 720.5 L 1251.5 740.5 L 1231.5 740.5 Z M 1175.5 720.5 L 1195.5 720.5 L 1195.5 740.5 L 1175.5 740.5 Z M 1118.5 720.5 L 1138.5 720.5 L 1138.5 740.5 L 1118.5 740.5 Z M 1062.5 720.5 L 1082.5 720.5 L 1082.5 740.5 L 1062.5 740.5 Z M 1005.5 720.5 L 1025.5 720.5 L 1025.5 740.5 L 1005.5 740.5 Z M 949.5 720.5 L 969.5 720.5 L 969.5 740.5 L 949.5 740.5 Z M 892.5 720.5 L 912.5 720.5 L 912.5 740.5 L 892.5 740.5 Z M 836.5 720.5 L 856.5 720.5 L 856.5 740.5 L 836.5 740.5 Z M 779.5 720.5 L 799.5 720.5 L 799.5 740.5 L 779.5 740.5 Z M 723.5 720.5 L 743.5 720.5 L 743.5 740.5 L 723.5 740.5 Z M 666.5 720.5 L 686.5 720.5 L 686.5 740.5 L 666.5 740.5 Z M 610.5 720.5 L 630.5 720.5 L 630.5 740.5 L 610.5 740.5 Z M 554.5 720.5 L 574.5 720.5 L 574.5 740.5 L 554.5 740.5 Z M 497.5 720.5 L 517.5 720.5 L 517.5 740.5 L 497.5 740.5 Z M 441.5 720.5 L 461.5 720.5 L 461.5 740.5 L 441.5 740.5 Z M 384.5 720.5 L 404.5 720.5 L 404.5 740.5 L 384.5 740.5 Z M 328.5 720.5 L 348.5 720.5 L 348.5 740.5 L 328.5 740.5 Z M 271.5 720.5 L 291.5 720.5 L 291.5 740.5 L 271.5 740.5 Z M 271.5 720.5 "/>
 </clipPath>
-<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image466" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image438"/>
+  <use xlink:href="#image466"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface432">
+<g id="surface460">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -218,6 +218,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1650.203125 634.464844 L 1648.554688 636.5 L 1644.871094 633.449219 L 1643.820312 634.011719 L 1642.769531 634.429688 L 1641.679688 634.78125 L 1640.523438 635.027344 L 1639.367188 635.167969 L 1638.175781 635.238281 L 1636.5625 635.132812 L 1635.054688 634.886719 L 1633.652344 634.464844 L 1632.320312 633.90625 L 1631.058594 633.167969 L 1629.933594 632.222656 L 1628.917969 631.207031 L 1628.042969 630.046875 L 1627.339844 628.785156 L 1626.742188 627.417969 L 1626.289062 625.945312 L 1626.007812 624.332031 L 1625.9375 623.949219 L 1625.902344 623.527344 L 1625.867188 623.140625 L 1625.832031 622.71875 L 1625.832031 621.84375 L 1625.902344 620.089844 L 1626.148438 618.40625 L 1626.535156 616.863281 L 1627.09375 615.390625 L 1627.796875 614.023438 L 1628.707031 612.761719 L 1629.621094 611.746094 L 1630.671875 610.832031 L 1631.828125 610.0625 L 1633.054688 609.464844 L 1634.386719 608.976562 L 1635.859375 608.625 L 1636.210938 608.589844 L 1636.984375 608.519531 L 1637.367188 608.484375 L 1637.753906 608.484375 L 1638.175781 608.449219 L 1639.753906 608.554688 L 1641.261719 608.800781 L 1642.664062 609.222656 L 1643.996094 609.78125 L 1645.257812 610.519531 L 1646.414062 611.429688 L 1647.394531 612.480469 L 1648.273438 613.605469 L 1648.972656 614.832031 L 1649.570312 616.199219 L 1650.027344 617.671875 L 1650.339844 619.214844 L 1650.375 619.667969 L 1650.480469 620.933594 L 1650.480469 621.351562 L 1650.515625 621.773438 L 1650.410156 623.738281 L 1650.097656 625.59375 L 1649.605469 627.3125 L 1648.902344 628.925781 L 1647.992188 630.398438 L 1646.90625 631.765625 Z M 1641.367188 627.242188 L 1644.484375 629.804688 L 1645.328125 628.75 L 1646.027344 627.558594 L 1646.554688 626.261719 L 1646.941406 624.894531 L 1647.152344 623.421875 L 1647.257812 621.808594 L 1647.1875 620.335938 L 1646.976562 618.933594 L 1646.625 617.636719 L 1646.167969 616.445312 L 1645.574219 615.320312 L 1644.835938 614.304688 L 1643.996094 613.464844 L 1643.117188 612.761719 L 1642.136719 612.203125 L 1641.085938 611.78125 L 1639.929688 611.5 L 1638.734375 611.324219 L 1638.175781 611.324219 L 1636.914062 611.429688 L 1635.71875 611.640625 L 1634.597656 611.992188 L 1633.582031 612.515625 L 1632.632812 613.183594 L 1631.792969 613.988281 L 1630.988281 614.9375 L 1630.355469 615.988281 L 1629.828125 617.144531 L 1629.445312 618.40625 L 1629.199219 619.773438 L 1629.09375 621.246094 L 1629.09375 621.84375 L 1629.128906 623.386719 L 1629.339844 624.789062 L 1629.6875 626.085938 L 1630.144531 627.3125 L 1630.777344 628.433594 L 1631.546875 629.417969 L 1632.355469 630.292969 L 1633.265625 630.996094 L 1634.246094 631.554688 L 1635.300781 631.941406 L 1636.457031 632.222656 L 1637.683594 632.328125 L 1637.753906 632.363281 L 1638.769531 632.363281 L 1639.4375 632.292969 L 1640.101562 632.152344 L 1640.734375 632.011719 L 1641.367188 631.800781 L 1642.03125 631.519531 L 1642.066406 631.519531 L 1642.136719 631.484375 L 1642.171875 631.449219 L 1642.242188 631.449219 L 1642.277344 631.414062 L 1642.347656 631.378906 L 1639.753906 629.207031 Z M 1641.367188 627.242188 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1627 468 L 1647 468 M 1627 448 L 1647 448 M 1627 448 L 1627 468 M 1647 448 L 1647 468 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1627 468 L 1647 468 M 1627 448 L 1647 448 M 1647 468 L 1647 448 M 1627 468 L 1627 448 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 344 L 196 353 M 191 349 L 200 349 M 195 350 L 197 350 M 195 348 L 197 348 M 195 348 L 195 350 M 197 348 L 197 350 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_1.svg b/cells/dfstp/sky130_fd_sc_hs__dfstp_1.svg
index b5ae630..41b34d7 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_1.svg
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 535.5 L 174.5 535.5 Z M 330.5 535.5 L 1084.5 535.5 L 1084.5 548.5 L 330.5 548.5 Z M 941.5 548.5 L 1084.5 548.5 L 1084.5 554.5 L 941.5 554.5 Z M 941.5 548.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 200.5 730.5 L 1717.5 730.5 L 1717.5 764.5 L 200.5 764.5 Z M 200.5 730.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 935.5 625.5 L 956.5 625.5 L 956.5 682.5 L 935.5 682.5 Z M 885.5 625.5 L 906.5 625.5 L 906.5 682.5 L 885.5 682.5 Z M 258.5 655.5 L 279.5 655.5 L 279.5 713.5 L 258.5 713.5 Z M 1410.5 655.5 L 1431.5 655.5 L 1431.5 713.5 L 1410.5 713.5 Z M 1264.5 655.5 L 1285.5 655.5 L 1285.5 713.5 L 1264.5 713.5 Z M 1210.5 655.5 L 1231.5 655.5 L 1231.5 713.5 L 1210.5 713.5 Z M 1157.5 655.5 L 1177.5 655.5 L 1177.5 713.5 L 1157.5 713.5 Z M 742.5 655.5 L 762.5 655.5 L 762.5 713.5 L 742.5 713.5 Z M 688.5 655.5 L 709.5 655.5 L 709.5 713.5 L 688.5 713.5 Z M 1546.5 637.5 L 1567.5 637.5 L 1567.5 713.5 L 1546.5 713.5 Z M 453.5 611.5 L 474.5 611.5 L 474.5 713.5 L 453.5 713.5 Z M 1087.5 625.5 L 1107.5 625.5 L 1107.5 713.5 L 1087.5 713.5 Z M 394.5 611.5 L 415.5 611.5 L 415.5 713.5 L 394.5 713.5 Z M 1015.5 625.5 L 1035.5 625.5 L 1035.5 713.5 L 1015.5 713.5 Z M 595.5 655.5 L 615.5 655.5 L 615.5 713.5 L 595.5 713.5 Z M 1626.5 611.5 L 1647.5 611.5 L 1647.5 713.5 L 1626.5 713.5 Z M 1626.5 611.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 258.5 357.5 L 279.5 357.5 L 279.5 415.5 L 258.5 415.5 Z M 1434.5 357.5 L 1455.5 357.5 L 1455.5 415.5 L 1434.5 415.5 Z M 1300.5 357.5 L 1321.5 357.5 L 1321.5 415.5 L 1300.5 415.5 Z M 1181.5 357.5 L 1201.5 357.5 L 1201.5 415.5 L 1181.5 415.5 Z M 1239.5 357.5 L 1259.5 357.5 L 1259.5 415.5 L 1239.5 415.5 Z M 598.5 388.5 L 619.5 388.5 L 619.5 445.5 L 598.5 445.5 Z M 838.5 388.5 L 859.5 388.5 L 859.5 445.5 L 838.5 445.5 Z M 667.5 388.5 L 688.5 388.5 L 688.5 445.5 L 667.5 445.5 Z M 900.5 388.5 L 920.5 388.5 L 920.5 445.5 L 900.5 445.5 Z M 725.5 388.5 L 745.5 388.5 L 745.5 445.5 L 725.5 445.5 Z M 1568.5 371.5 L 1588.5 371.5 L 1588.5 487.5 L 1568.5 487.5 Z M 1072.5 357.5 L 1092.5 357.5 L 1092.5 494.5 L 1072.5 494.5 Z M 1639.5 357.5 L 1660.5 357.5 L 1660.5 511.5 L 1639.5 511.5 Z M 455.5 369.5 L 476.5 369.5 L 476.5 523.5 L 455.5 523.5 Z M 394.5 369.5 L 414.5 369.5 L 414.5 523.5 L 394.5 523.5 Z M 1002.5 392.5 L 1023.5 392.5 L 1023.5 529.5 L 1002.5 529.5 Z M 1002.5 392.5 "/>
 </clipPath>
-<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image406"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 222.5 294.5 L 245.5 294.5 L 245.5 318.5 L 222.5 318.5 Z M 1673.5 294.5 L 1696.5 294.5 L 1696.5 318.5 L 1673.5 318.5 Z M 1607.5 294.5 L 1630.5 294.5 L 1630.5 318.5 L 1607.5 318.5 Z M 1541.5 294.5 L 1564.5 294.5 L 1564.5 318.5 L 1541.5 318.5 Z M 1475.5 294.5 L 1498.5 294.5 L 1498.5 318.5 L 1475.5 318.5 Z M 1409.5 294.5 L 1432.5 294.5 L 1432.5 318.5 L 1409.5 318.5 Z M 1343.5 294.5 L 1366.5 294.5 L 1366.5 318.5 L 1343.5 318.5 Z M 1277.5 294.5 L 1300.5 294.5 L 1300.5 318.5 L 1277.5 318.5 Z M 1211.5 294.5 L 1234.5 294.5 L 1234.5 318.5 L 1211.5 318.5 Z M 1145.5 294.5 L 1168.5 294.5 L 1168.5 318.5 L 1145.5 318.5 Z M 1079.5 294.5 L 1103.5 294.5 L 1103.5 318.5 L 1079.5 318.5 Z M 1013.5 294.5 L 1037.5 294.5 L 1037.5 318.5 L 1013.5 318.5 Z M 947.5 294.5 L 971.5 294.5 L 971.5 318.5 L 947.5 318.5 Z M 881.5 294.5 L 905.5 294.5 L 905.5 318.5 L 881.5 318.5 Z M 815.5 294.5 L 839.5 294.5 L 839.5 318.5 L 815.5 318.5 Z M 749.5 294.5 L 773.5 294.5 L 773.5 318.5 L 749.5 318.5 Z M 683.5 294.5 L 707.5 294.5 L 707.5 318.5 L 683.5 318.5 Z M 617.5 294.5 L 641.5 294.5 L 641.5 318.5 L 617.5 318.5 Z M 552.5 294.5 L 575.5 294.5 L 575.5 318.5 L 552.5 318.5 Z M 486.5 294.5 L 509.5 294.5 L 509.5 318.5 L 486.5 318.5 Z M 420.5 294.5 L 443.5 294.5 L 443.5 318.5 L 420.5 318.5 Z M 354.5 294.5 L 377.5 294.5 L 377.5 318.5 L 354.5 318.5 Z M 288.5 294.5 L 311.5 294.5 L 311.5 318.5 L 288.5 318.5 Z M 1343.5 472.5 L 1366.5 472.5 L 1366.5 480.5 L 1343.5 480.5 Z M 1343.5 480.5 L 1366.5 480.5 L 1366.5 496.5 L 1343.5 496.5 Z M 947.5 472.5 L 971.5 472.5 L 971.5 496.5 L 947.5 496.5 Z M 222.5 752.5 L 245.5 752.5 L 245.5 775.5 L 222.5 775.5 Z M 1673.5 752.5 L 1696.5 752.5 L 1696.5 775.5 L 1673.5 775.5 Z M 1607.5 752.5 L 1630.5 752.5 L 1630.5 775.5 L 1607.5 775.5 Z M 1541.5 752.5 L 1564.5 752.5 L 1564.5 775.5 L 1541.5 775.5 Z M 1475.5 752.5 L 1498.5 752.5 L 1498.5 775.5 L 1475.5 775.5 Z M 1409.5 752.5 L 1432.5 752.5 L 1432.5 775.5 L 1409.5 775.5 Z M 1343.5 752.5 L 1366.5 752.5 L 1366.5 775.5 L 1343.5 775.5 Z M 1277.5 752.5 L 1300.5 752.5 L 1300.5 775.5 L 1277.5 775.5 Z M 1211.5 752.5 L 1234.5 752.5 L 1234.5 775.5 L 1211.5 775.5 Z M 1145.5 752.5 L 1168.5 752.5 L 1168.5 775.5 L 1145.5 775.5 Z M 1079.5 752.5 L 1103.5 752.5 L 1103.5 775.5 L 1079.5 775.5 Z M 1013.5 752.5 L 1037.5 752.5 L 1037.5 775.5 L 1013.5 775.5 Z M 947.5 752.5 L 971.5 752.5 L 971.5 775.5 L 947.5 775.5 Z M 881.5 752.5 L 905.5 752.5 L 905.5 775.5 L 881.5 775.5 Z M 815.5 752.5 L 839.5 752.5 L 839.5 775.5 L 815.5 775.5 Z M 749.5 752.5 L 773.5 752.5 L 773.5 775.5 L 749.5 775.5 Z M 683.5 752.5 L 707.5 752.5 L 707.5 775.5 L 683.5 775.5 Z M 617.5 752.5 L 641.5 752.5 L 641.5 775.5 L 617.5 775.5 Z M 552.5 752.5 L 575.5 752.5 L 575.5 775.5 L 552.5 775.5 Z M 486.5 752.5 L 509.5 752.5 L 509.5 775.5 L 486.5 775.5 Z M 420.5 752.5 L 443.5 752.5 L 443.5 775.5 L 420.5 775.5 Z M 354.5 752.5 L 377.5 752.5 L 377.5 775.5 L 354.5 775.5 Z M 288.5 752.5 L 311.5 752.5 L 311.5 775.5 L 288.5 775.5 Z M 288.5 752.5 "/>
 </clipPath>
-<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image407"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface401">
+<g id="surface427">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -208,6 +208,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 452.394531 590.191406 L 452.394531 600.566406 L 448.613281 600.566406 L 448.613281 570.914062 L 452.394531 570.914062 L 452.394531 585.921875 L 467.160156 570.914062 L 472.039062 570.914062 L 459.960938 582.992188 L 472.160156 600.566406 L 467.6875 600.566406 L 457.234375 585.351562 Z M 452.394531 590.191406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 420 505 L 443 505 M 420 482 L 443 482 M 420 482 L 420 505 M 443 482 L 443 505 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 420 505 L 443 505 M 420 482 L 443 482 M 443 505 L 443 482 M 420 505 L 420 482 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 310 L 200 319 M 195 315 L 204 315 M 199 316 L 201 316 M 199 314 L 201 314 M 199 314 L 199 316 M 201 314 L 201 316 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_2.svg b/cells/dfstp/sky130_fd_sc_hs__dfstp_2.svg
index deb6d1e..b9a5ec2 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_2.svg
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 299.5 L 1744.5 299.5 L 1744.5 535.5 L 174.5 535.5 Z M 321.5 535.5 L 1057.5 535.5 L 1057.5 542.5 L 321.5 542.5 Z M 925.5 542.5 L 1057.5 542.5 L 1057.5 552.5 L 925.5 552.5 Z M 925.5 542.5 "/>
 </clipPath>
-<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image390"/>
+  <use xlink:href="#image417"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 198.5 715.5 L 1719.5 715.5 L 1719.5 746.5 L 198.5 746.5 Z M 198.5 715.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image390"/>
+  <use xlink:href="#image417"/>
 </pattern>
 <mask id="mask1">
 <rect 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 618.5 L 1210.5 618.5 L 1210.5 671.5 L 1191.5 671.5 Z M 899.5 618.5 L 918.5 618.5 L 918.5 671.5 L 899.5 671.5 Z M 1123.5 618.5 L 1142.5 618.5 L 1142.5 671.5 L 1123.5 671.5 Z M 1391.5 618.5 L 1410.5 618.5 L 1410.5 671.5 L 1391.5 671.5 Z M 849.5 618.5 L 868.5 618.5 L 868.5 671.5 L 849.5 671.5 Z M 1263.5 618.5 L 1282.5 618.5 L 1282.5 671.5 L 1263.5 671.5 Z M 1516.5 605.5 L 1535.5 605.5 L 1535.5 686.5 L 1516.5 686.5 Z M 1590.5 605.5 L 1609.5 605.5 L 1609.5 699.5 L 1590.5 699.5 Z M 1039.5 618.5 L 1058.5 618.5 L 1058.5 699.5 L 1039.5 699.5 Z M 989.5 618.5 L 1008.5 618.5 L 1008.5 699.5 L 989.5 699.5 Z M 1644.5 605.5 L 1663.5 605.5 L 1663.5 699.5 L 1644.5 699.5 Z M 724.5 645.5 L 743.5 645.5 L 743.5 699.5 L 724.5 699.5 Z M 252.5 645.5 L 271.5 645.5 L 271.5 699.5 L 252.5 699.5 Z M 567.5 645.5 L 586.5 645.5 L 586.5 699.5 L 567.5 699.5 Z M 377.5 605.5 L 396.5 605.5 L 396.5 699.5 L 377.5 699.5 Z M 432.5 605.5 L 451.5 605.5 L 451.5 699.5 L 432.5 699.5 Z M 674.5 645.5 L 693.5 645.5 L 693.5 699.5 L 674.5 699.5 Z M 674.5 645.5 "/>
 </clipPath>
-<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image418" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 253.5 370.5 L 272.5 370.5 L 272.5 424.5 L 253.5 424.5 Z M 1265.5 370.5 L 1284.5 370.5 L 1284.5 424.5 L 1265.5 424.5 Z M 1197.5 370.5 L 1216.5 370.5 L 1216.5 424.5 L 1197.5 424.5 Z M 1143.5 370.5 L 1162.5 370.5 L 1162.5 424.5 L 1143.5 424.5 Z M 1393.5 370.5 L 1412.5 370.5 L 1412.5 424.5 L 1393.5 424.5 Z M 828.5 403.5 L 847.5 403.5 L 847.5 457.5 L 828.5 457.5 Z M 570.5 403.5 L 589.5 403.5 L 589.5 457.5 L 570.5 457.5 Z M 633.5 403.5 L 652.5 403.5 L 652.5 457.5 L 633.5 457.5 Z M 885.5 403.5 L 904.5 403.5 L 904.5 457.5 L 885.5 457.5 Z M 686.5 403.5 L 705.5 403.5 L 705.5 457.5 L 686.5 457.5 Z M 1046.5 370.5 L 1065.5 370.5 L 1065.5 497.5 L 1046.5 497.5 Z M 1521.5 386.5 L 1540.5 386.5 L 1540.5 512.5 L 1521.5 512.5 Z M 1589.5 370.5 L 1608.5 370.5 L 1608.5 512.5 L 1589.5 512.5 Z M 1646.5 370.5 L 1665.5 370.5 L 1665.5 512.5 L 1646.5 512.5 Z M 381.5 377.5 L 400.5 377.5 L 400.5 519.5 L 381.5 519.5 Z M 438.5 377.5 L 457.5 377.5 L 457.5 519.5 L 438.5 519.5 Z M 982.5 403.5 L 1001.5 403.5 L 1001.5 529.5 L 982.5 529.5 Z M 982.5 403.5 "/>
 </clipPath>
-<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image392"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 218.5 313.5 L 239.5 313.5 L 239.5 334.5 L 218.5 334.5 Z M 1678.5 313.5 L 1700.5 313.5 L 1700.5 334.5 L 1678.5 334.5 Z M 1617.5 313.5 L 1639.5 313.5 L 1639.5 334.5 L 1617.5 334.5 Z M 1557.5 313.5 L 1578.5 313.5 L 1578.5 334.5 L 1557.5 334.5 Z M 1496.5 313.5 L 1517.5 313.5 L 1517.5 334.5 L 1496.5 334.5 Z M 1435.5 313.5 L 1456.5 313.5 L 1456.5 334.5 L 1435.5 334.5 Z M 1374.5 313.5 L 1396.5 313.5 L 1396.5 334.5 L 1374.5 334.5 Z M 1313.5 313.5 L 1335.5 313.5 L 1335.5 334.5 L 1313.5 334.5 Z M 1252.5 313.5 L 1274.5 313.5 L 1274.5 334.5 L 1252.5 334.5 Z M 1192.5 313.5 L 1213.5 313.5 L 1213.5 334.5 L 1192.5 334.5 Z M 1131.5 313.5 L 1152.5 313.5 L 1152.5 334.5 L 1131.5 334.5 Z M 1070.5 313.5 L 1091.5 313.5 L 1091.5 334.5 L 1070.5 334.5 Z M 1009.5 313.5 L 1031.5 313.5 L 1031.5 334.5 L 1009.5 334.5 Z M 948.5 313.5 L 970.5 313.5 L 970.5 334.5 L 948.5 334.5 Z M 887.5 313.5 L 909.5 313.5 L 909.5 334.5 L 887.5 334.5 Z M 826.5 313.5 L 848.5 313.5 L 848.5 334.5 L 826.5 334.5 Z M 766.5 313.5 L 787.5 313.5 L 787.5 334.5 L 766.5 334.5 Z M 705.5 313.5 L 726.5 313.5 L 726.5 334.5 L 705.5 334.5 Z M 644.5 313.5 L 665.5 313.5 L 665.5 334.5 L 644.5 334.5 Z M 583.5 313.5 L 605.5 313.5 L 605.5 334.5 L 583.5 334.5 Z M 522.5 313.5 L 544.5 313.5 L 544.5 334.5 L 522.5 334.5 Z M 461.5 313.5 L 483.5 313.5 L 483.5 334.5 L 461.5 334.5 Z M 400.5 313.5 L 422.5 313.5 L 422.5 334.5 L 400.5 334.5 Z M 340.5 313.5 L 361.5 313.5 L 361.5 334.5 L 340.5 334.5 Z M 279.5 313.5 L 300.5 313.5 L 300.5 334.5 L 279.5 334.5 Z M 1252.5 477.5 L 1274.5 477.5 L 1274.5 483.5 L 1252.5 483.5 Z M 1252.5 483.5 L 1274.5 483.5 L 1274.5 498.5 L 1252.5 498.5 Z M 948.5 477.5 L 970.5 477.5 L 970.5 498.5 L 948.5 498.5 Z M 218.5 735.5 L 239.5 735.5 L 239.5 756.5 L 218.5 756.5 Z M 1678.5 735.5 L 1700.5 735.5 L 1700.5 756.5 L 1678.5 756.5 Z M 1617.5 735.5 L 1639.5 735.5 L 1639.5 756.5 L 1617.5 756.5 Z M 1557.5 735.5 L 1578.5 735.5 L 1578.5 756.5 L 1557.5 756.5 Z M 1496.5 735.5 L 1517.5 735.5 L 1517.5 756.5 L 1496.5 756.5 Z M 1435.5 735.5 L 1456.5 735.5 L 1456.5 756.5 L 1435.5 756.5 Z M 1374.5 735.5 L 1396.5 735.5 L 1396.5 756.5 L 1374.5 756.5 Z M 1313.5 735.5 L 1335.5 735.5 L 1335.5 756.5 L 1313.5 756.5 Z M 1252.5 735.5 L 1274.5 735.5 L 1274.5 756.5 L 1252.5 756.5 Z M 1192.5 735.5 L 1213.5 735.5 L 1213.5 756.5 L 1192.5 756.5 Z M 1131.5 735.5 L 1152.5 735.5 L 1152.5 756.5 L 1131.5 756.5 Z M 1070.5 735.5 L 1091.5 735.5 L 1091.5 756.5 L 1070.5 756.5 Z M 1009.5 735.5 L 1031.5 735.5 L 1031.5 756.5 L 1009.5 756.5 Z M 948.5 735.5 L 970.5 735.5 L 970.5 756.5 L 948.5 756.5 Z M 887.5 735.5 L 909.5 735.5 L 909.5 756.5 L 887.5 756.5 Z M 826.5 735.5 L 848.5 735.5 L 848.5 756.5 L 826.5 756.5 Z M 766.5 735.5 L 787.5 735.5 L 787.5 756.5 L 766.5 756.5 Z M 705.5 735.5 L 726.5 735.5 L 726.5 756.5 L 705.5 756.5 Z M 644.5 735.5 L 665.5 735.5 L 665.5 756.5 L 644.5 756.5 Z M 583.5 735.5 L 605.5 735.5 L 605.5 756.5 L 583.5 756.5 Z M 522.5 735.5 L 544.5 735.5 L 544.5 756.5 L 522.5 756.5 Z M 461.5 735.5 L 483.5 735.5 L 483.5 756.5 L 461.5 756.5 Z M 400.5 735.5 L 422.5 735.5 L 422.5 756.5 L 400.5 756.5 Z M 340.5 735.5 L 361.5 735.5 L 361.5 756.5 L 340.5 756.5 Z M 279.5 735.5 L 300.5 735.5 L 300.5 756.5 L 279.5 756.5 Z M 279.5 735.5 "/>
 </clipPath>
-<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image393"/>
+  <use xlink:href="#image420"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface387">
+<g id="surface414">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -193,6 +193,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 1642.230469 501.386719 L 1640.515625 503.5 L 1636.6875 500.328125 L 1635.59375 500.910156 L 1634.5 501.347656 L 1633.367188 501.714844 L 1632.164062 501.96875 L 1630.960938 502.113281 L 1629.722656 502.1875 L 1628.042969 502.078125 L 1626.476562 501.824219 L 1625.015625 501.386719 L 1623.632812 500.800781 L 1622.320312 500.035156 L 1621.152344 499.050781 L 1620.09375 497.992188 L 1619.183594 496.789062 L 1618.453125 495.476562 L 1617.832031 494.054688 L 1617.359375 492.523438 L 1617.066406 490.847656 L 1616.996094 490.445312 L 1616.957031 490.007812 L 1616.921875 489.605469 L 1616.886719 489.167969 L 1616.886719 488.257812 L 1616.957031 486.433594 L 1617.214844 484.683594 L 1617.613281 483.078125 L 1618.199219 481.546875 L 1618.929688 480.125 L 1619.875 478.8125 L 1620.824219 477.753906 L 1621.917969 476.808594 L 1623.121094 476.003906 L 1624.398438 475.386719 L 1625.785156 474.875 L 1627.316406 474.511719 L 1627.679688 474.472656 L 1628.082031 474.4375 L 1628.480469 474.402344 L 1628.882812 474.363281 L 1629.285156 474.363281 L 1629.722656 474.328125 L 1631.363281 474.4375 L 1632.929688 474.691406 L 1634.390625 475.128906 L 1635.773438 475.714844 L 1637.085938 476.480469 L 1638.292969 477.425781 L 1639.3125 478.519531 L 1640.222656 479.6875 L 1640.953125 480.964844 L 1641.574219 482.386719 L 1642.046875 483.917969 L 1642.375 485.523438 L 1642.410156 485.996094 L 1642.449219 486.433594 L 1642.519531 487.308594 L 1642.519531 487.746094 L 1642.558594 488.183594 L 1642.449219 490.226562 L 1642.121094 492.160156 L 1641.609375 493.945312 L 1640.878906 495.625 L 1639.933594 497.15625 L 1638.800781 498.578125 Z M 1633.039062 493.875 L 1636.285156 496.535156 L 1637.160156 495.441406 L 1637.890625 494.203125 L 1638.4375 492.851562 L 1638.839844 491.429688 L 1639.058594 489.898438 L 1639.167969 488.222656 L 1639.09375 486.6875 L 1638.875 485.230469 L 1638.511719 483.882812 L 1638.035156 482.640625 L 1637.414062 481.476562 L 1636.648438 480.417969 L 1635.773438 479.542969 L 1634.863281 478.8125 L 1633.84375 478.230469 L 1632.75 477.792969 L 1631.542969 477.5 L 1630.304688 477.316406 L 1629.722656 477.316406 L 1628.410156 477.425781 L 1627.167969 477.644531 L 1626.003906 478.011719 L 1624.945312 478.558594 L 1623.960938 479.25 L 1623.085938 480.089844 L 1622.246094 481.074219 L 1621.589844 482.167969 L 1621.042969 483.371094 L 1620.640625 484.683594 L 1620.386719 486.105469 L 1620.277344 487.636719 L 1620.277344 488.257812 L 1620.3125 489.863281 L 1620.53125 491.320312 L 1620.898438 492.667969 L 1621.371094 493.945312 L 1622.027344 495.113281 L 1622.828125 496.132812 L 1623.667969 497.046875 L 1624.617188 497.773438 L 1625.636719 498.359375 L 1626.730469 498.757812 L 1627.933594 499.050781 L 1629.210938 499.160156 L 1629.285156 499.195312 L 1630.339844 499.195312 L 1631.035156 499.125 L 1631.726562 498.976562 L 1632.382812 498.832031 L 1633.039062 498.613281 L 1633.734375 498.320312 L 1633.769531 498.320312 L 1633.84375 498.285156 L 1633.878906 498.25 L 1633.953125 498.25 L 1633.988281 498.210938 L 1634.0625 498.175781 L 1631.363281 495.914062 Z M 1633.039062 493.875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1617 602 L 1639 602 M 1617 581 L 1639 581 M 1617 581 L 1617 602 M 1639 581 L 1639 602 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1617 602 L 1639 602 M 1617 581 L 1639 581 M 1639 602 L 1639 581 M 1617 602 L 1617 581 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 198 328 L 198 337 M 193 333 L 202 333 M 197 334 L 199 334 M 197 332 L 199 332 M 197 332 L 197 334 M 199 332 L 199 334 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfstp/sky130_fd_sc_hs__dfstp_4.svg b/cells/dfstp/sky130_fd_sc_hs__dfstp_4.svg
index 547d8d9..a2f05b0 100644
--- a/cells/dfstp/sky130_fd_sc_hs__dfstp_4.svg
+++ b/cells/dfstp/sky130_fd_sc_hs__dfstp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 316.5 L 1744.5 316.5 L 1744.5 535.5 L 174.5 535.5 Z M 844.5 535.5 L 967.5 535.5 L 967.5 547.5 L 844.5 547.5 Z M 844.5 535.5 "/>
 </clipPath>
-<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image393"/>
+  <use xlink:href="#image420"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 196.5 701.5 L 1721.5 701.5 L 1721.5 730.5 L 196.5 730.5 Z M 196.5 701.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image393"/>
+  <use xlink:href="#image420"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 788.5 611.5 L 805.5 611.5 L 805.5 661.5 L 788.5 661.5 Z M 834.5 611.5 L 851.5 611.5 L 851.5 661.5 L 834.5 661.5 Z M 1024.5 629.5 L 1041.5 629.5 L 1041.5 678.5 L 1024.5 678.5 Z M 1115.5 629.5 L 1133.5 629.5 L 1133.5 678.5 L 1115.5 678.5 Z M 1255.5 629.5 L 1272.5 629.5 L 1272.5 678.5 L 1255.5 678.5 Z M 1069.5 629.5 L 1087.5 629.5 L 1087.5 678.5 L 1069.5 678.5 Z M 1438.5 600.5 L 1456.5 600.5 L 1456.5 687.5 L 1438.5 687.5 Z M 413.5 600.5 L 431.5 600.5 L 431.5 687.5 L 413.5 687.5 Z M 1489.5 600.5 L 1507.5 600.5 L 1507.5 687.5 L 1489.5 687.5 Z M 1646.5 600.5 L 1664.5 600.5 L 1664.5 687.5 L 1646.5 687.5 Z M 964.5 611.5 L 981.5 611.5 L 981.5 687.5 L 964.5 687.5 Z M 899.5 611.5 L 917.5 611.5 L 917.5 687.5 L 899.5 687.5 Z M 1590.5 600.5 L 1608.5 600.5 L 1608.5 687.5 L 1590.5 687.5 Z M 246.5 637.5 L 263.5 637.5 L 263.5 687.5 L 246.5 687.5 Z M 539.5 637.5 L 556.5 637.5 L 556.5 687.5 L 539.5 687.5 Z M 1379.5 600.5 L 1397.5 600.5 L 1397.5 687.5 L 1379.5 687.5 Z M 362.5 600.5 L 380.5 600.5 L 380.5 687.5 L 362.5 687.5 Z M 655.5 637.5 L 673.5 637.5 L 673.5 687.5 L 655.5 687.5 Z M 609.5 637.5 L 627.5 637.5 L 627.5 687.5 L 609.5 687.5 Z M 609.5 637.5 "/>
 </clipPath>
-<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image394"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1099.5 382.5 L 1117.5 382.5 L 1117.5 431.5 L 1099.5 431.5 Z M 1267.5 382.5 L 1284.5 382.5 L 1284.5 431.5 L 1267.5 431.5 Z M 1152.5 382.5 L 1169.5 382.5 L 1169.5 431.5 L 1152.5 431.5 Z M 1049.5 382.5 L 1067.5 382.5 L 1067.5 431.5 L 1049.5 431.5 Z M 247.5 384.5 L 265.5 384.5 L 265.5 434.5 L 247.5 434.5 Z M 600.5 408.5 L 618.5 408.5 L 618.5 458.5 L 600.5 458.5 Z M 649.5 408.5 L 667.5 408.5 L 667.5 458.5 L 649.5 458.5 Z M 759.5 408.5 L 777.5 408.5 L 777.5 458.5 L 759.5 458.5 Z M 812.5 408.5 L 830.5 408.5 L 830.5 458.5 L 812.5 458.5 Z M 541.5 408.5 L 559.5 408.5 L 559.5 458.5 L 541.5 458.5 Z M 956.5 382.5 L 974.5 382.5 L 974.5 500.5 L 956.5 500.5 Z M 1654.5 382.5 L 1672.5 382.5 L 1672.5 514.5 L 1654.5 514.5 Z M 1601.5 382.5 L 1619.5 382.5 L 1619.5 514.5 L 1601.5 514.5 Z M 366.5 382.5 L 384.5 382.5 L 384.5 514.5 L 366.5 514.5 Z M 1381.5 415.5 L 1399.5 415.5 L 1399.5 514.5 L 1381.5 514.5 Z M 419.5 382.5 L 436.5 382.5 L 436.5 514.5 L 419.5 514.5 Z M 1548.5 382.5 L 1566.5 382.5 L 1566.5 514.5 L 1548.5 514.5 Z M 1434.5 415.5 L 1452.5 415.5 L 1452.5 514.5 L 1434.5 514.5 Z M 1495.5 382.5 L 1513.5 382.5 L 1513.5 514.5 L 1495.5 514.5 Z M 896.5 408.5 L 914.5 408.5 L 914.5 526.5 L 896.5 526.5 Z M 896.5 408.5 "/>
 </clipPath>
-<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image422"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 215.5 328.5 L 235.5 328.5 L 235.5 348.5 L 215.5 348.5 Z M 1683.5 328.5 L 1703.5 328.5 L 1703.5 348.5 L 1683.5 348.5 Z M 1627.5 328.5 L 1647.5 328.5 L 1647.5 348.5 L 1627.5 348.5 Z M 1570.5 328.5 L 1590.5 328.5 L 1590.5 348.5 L 1570.5 348.5 Z M 1514.5 328.5 L 1534.5 328.5 L 1534.5 348.5 L 1514.5 348.5 Z M 1457.5 328.5 L 1477.5 328.5 L 1477.5 348.5 L 1457.5 348.5 Z M 1401.5 328.5 L 1421.5 328.5 L 1421.5 348.5 L 1401.5 348.5 Z M 1344.5 328.5 L 1364.5 328.5 L 1364.5 348.5 L 1344.5 348.5 Z M 1288.5 328.5 L 1308.5 328.5 L 1308.5 348.5 L 1288.5 348.5 Z M 1231.5 328.5 L 1251.5 328.5 L 1251.5 348.5 L 1231.5 348.5 Z M 1175.5 328.5 L 1195.5 328.5 L 1195.5 348.5 L 1175.5 348.5 Z M 1118.5 328.5 L 1138.5 328.5 L 1138.5 348.5 L 1118.5 348.5 Z M 1062.5 328.5 L 1082.5 328.5 L 1082.5 348.5 L 1062.5 348.5 Z M 1005.5 328.5 L 1025.5 328.5 L 1025.5 348.5 L 1005.5 348.5 Z M 949.5 328.5 L 969.5 328.5 L 969.5 348.5 L 949.5 348.5 Z M 892.5 328.5 L 912.5 328.5 L 912.5 348.5 L 892.5 348.5 Z M 836.5 328.5 L 856.5 328.5 L 856.5 348.5 L 836.5 348.5 Z M 779.5 328.5 L 799.5 328.5 L 799.5 348.5 L 779.5 348.5 Z M 723.5 328.5 L 743.5 328.5 L 743.5 348.5 L 723.5 348.5 Z M 666.5 328.5 L 686.5 328.5 L 686.5 348.5 L 666.5 348.5 Z M 610.5 328.5 L 630.5 328.5 L 630.5 348.5 L 610.5 348.5 Z M 554.5 328.5 L 574.5 328.5 L 574.5 348.5 L 554.5 348.5 Z M 497.5 328.5 L 517.5 328.5 L 517.5 348.5 L 497.5 348.5 Z M 441.5 328.5 L 461.5 328.5 L 461.5 348.5 L 441.5 348.5 Z M 384.5 328.5 L 404.5 328.5 L 404.5 348.5 L 384.5 348.5 Z M 328.5 328.5 L 348.5 328.5 L 348.5 348.5 L 328.5 348.5 Z M 271.5 328.5 L 291.5 328.5 L 291.5 348.5 L 271.5 348.5 Z M 836.5 524.5 L 856.5 524.5 L 856.5 526.5 L 836.5 526.5 Z M 1175.5 524.5 L 1195.5 524.5 L 1195.5 542.5 L 1175.5 542.5 Z M 1175.5 542.5 L 1195.5 542.5 L 1195.5 544.5 L 1175.5 544.5 Z M 836.5 526.5 L 856.5 526.5 L 856.5 544.5 L 836.5 544.5 Z M 215.5 720.5 L 235.5 720.5 L 235.5 740.5 L 215.5 740.5 Z M 1683.5 720.5 L 1703.5 720.5 L 1703.5 740.5 L 1683.5 740.5 Z M 1627.5 720.5 L 1647.5 720.5 L 1647.5 740.5 L 1627.5 740.5 Z M 1570.5 720.5 L 1590.5 720.5 L 1590.5 740.5 L 1570.5 740.5 Z M 1514.5 720.5 L 1534.5 720.5 L 1534.5 740.5 L 1514.5 740.5 Z M 1457.5 720.5 L 1477.5 720.5 L 1477.5 740.5 L 1457.5 740.5 Z M 1401.5 720.5 L 1421.5 720.5 L 1421.5 740.5 L 1401.5 740.5 Z M 1344.5 720.5 L 1364.5 720.5 L 1364.5 740.5 L 1344.5 740.5 Z M 1288.5 720.5 L 1308.5 720.5 L 1308.5 740.5 L 1288.5 740.5 Z M 1231.5 720.5 L 1251.5 720.5 L 1251.5 740.5 L 1231.5 740.5 Z M 1175.5 720.5 L 1195.5 720.5 L 1195.5 740.5 L 1175.5 740.5 Z M 1118.5 720.5 L 1138.5 720.5 L 1138.5 740.5 L 1118.5 740.5 Z M 1062.5 720.5 L 1082.5 720.5 L 1082.5 740.5 L 1062.5 740.5 Z M 1005.5 720.5 L 1025.5 720.5 L 1025.5 740.5 L 1005.5 740.5 Z M 949.5 720.5 L 969.5 720.5 L 969.5 740.5 L 949.5 740.5 Z M 892.5 720.5 L 912.5 720.5 L 912.5 740.5 L 892.5 740.5 Z M 836.5 720.5 L 856.5 720.5 L 856.5 740.5 L 836.5 740.5 Z M 779.5 720.5 L 799.5 720.5 L 799.5 740.5 L 779.5 740.5 Z M 723.5 720.5 L 743.5 720.5 L 743.5 740.5 L 723.5 740.5 Z M 666.5 720.5 L 686.5 720.5 L 686.5 740.5 L 666.5 740.5 Z M 610.5 720.5 L 630.5 720.5 L 630.5 740.5 L 610.5 740.5 Z M 554.5 720.5 L 574.5 720.5 L 574.5 740.5 L 554.5 740.5 Z M 497.5 720.5 L 517.5 720.5 L 517.5 740.5 L 497.5 740.5 Z M 441.5 720.5 L 461.5 720.5 L 461.5 740.5 L 441.5 740.5 Z M 384.5 720.5 L 404.5 720.5 L 404.5 740.5 L 384.5 740.5 Z M 328.5 720.5 L 348.5 720.5 L 348.5 740.5 L 328.5 740.5 Z M 271.5 720.5 L 291.5 720.5 L 291.5 740.5 L 271.5 740.5 Z M 271.5 720.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image396"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface390">
+<g id="surface417">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -196,6 +196,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 1707.203125 503.464844 L 1705.554688 505.5 L 1701.871094 502.449219 L 1700.820312 503.011719 L 1699.769531 503.429688 L 1698.679688 503.78125 L 1697.523438 504.027344 L 1696.367188 504.167969 L 1695.175781 504.238281 L 1693.5625 504.132812 L 1692.054688 503.886719 L 1690.652344 503.464844 L 1689.320312 502.90625 L 1688.058594 502.167969 L 1686.933594 501.222656 L 1685.917969 500.207031 L 1685.042969 499.046875 L 1684.339844 497.785156 L 1683.742188 496.417969 L 1683.289062 494.945312 L 1683.007812 493.332031 L 1682.9375 492.949219 L 1682.902344 492.527344 L 1682.867188 492.140625 L 1682.832031 491.71875 L 1682.832031 490.84375 L 1682.902344 489.089844 L 1683.148438 487.40625 L 1683.535156 485.863281 L 1684.09375 484.390625 L 1684.796875 483.023438 L 1685.707031 481.761719 L 1686.621094 480.746094 L 1687.671875 479.832031 L 1688.828125 479.0625 L 1690.054688 478.464844 L 1691.386719 477.976562 L 1692.859375 477.625 L 1693.210938 477.589844 L 1693.984375 477.519531 L 1694.367188 477.484375 L 1694.753906 477.484375 L 1695.175781 477.449219 L 1696.753906 477.554688 L 1698.261719 477.800781 L 1699.664062 478.222656 L 1700.996094 478.78125 L 1702.257812 479.519531 L 1703.414062 480.429688 L 1704.394531 481.480469 L 1705.273438 482.605469 L 1705.972656 483.832031 L 1706.570312 485.199219 L 1707.027344 486.671875 L 1707.339844 488.214844 L 1707.375 488.667969 L 1707.480469 489.933594 L 1707.480469 490.351562 L 1707.515625 490.773438 L 1707.410156 492.738281 L 1707.097656 494.59375 L 1706.605469 496.3125 L 1705.902344 497.925781 L 1704.992188 499.398438 L 1703.90625 500.765625 Z M 1698.367188 496.242188 L 1701.484375 498.804688 L 1702.328125 497.75 L 1703.027344 496.558594 L 1703.554688 495.261719 L 1703.941406 493.894531 L 1704.152344 492.421875 L 1704.257812 490.808594 L 1704.1875 489.335938 L 1703.976562 487.933594 L 1703.625 486.636719 L 1703.167969 485.445312 L 1702.574219 484.320312 L 1701.835938 483.304688 L 1700.996094 482.464844 L 1700.117188 481.761719 L 1699.136719 481.203125 L 1698.085938 480.78125 L 1696.929688 480.5 L 1695.734375 480.324219 L 1695.175781 480.324219 L 1693.914062 480.429688 L 1692.71875 480.640625 L 1691.597656 480.992188 L 1690.582031 481.515625 L 1689.632812 482.183594 L 1688.792969 482.988281 L 1687.988281 483.9375 L 1687.355469 484.988281 L 1686.828125 486.144531 L 1686.445312 487.40625 L 1686.199219 488.773438 L 1686.09375 490.246094 L 1686.09375 490.84375 L 1686.128906 492.386719 L 1686.339844 493.789062 L 1686.6875 495.085938 L 1687.144531 496.3125 L 1687.777344 497.433594 L 1688.546875 498.417969 L 1689.355469 499.292969 L 1690.265625 499.996094 L 1691.246094 500.554688 L 1692.300781 500.941406 L 1693.457031 501.222656 L 1694.683594 501.328125 L 1694.753906 501.363281 L 1695.769531 501.363281 L 1696.4375 501.292969 L 1697.101562 501.152344 L 1697.734375 501.011719 L 1698.367188 500.800781 L 1699.03125 500.519531 L 1699.066406 500.519531 L 1699.136719 500.484375 L 1699.171875 500.449219 L 1699.242188 500.449219 L 1699.277344 500.414062 L 1699.347656 500.378906 L 1696.753906 498.207031 Z M 1698.367188 496.242188 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1683 598 L 1703 598 M 1683 578 L 1703 578 M 1683 578 L 1683 598 M 1703 578 L 1703 598 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1683 598 L 1703 598 M 1683 578 L 1703 578 M 1703 598 L 1703 578 M 1683 598 L 1683 578 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 344 L 196 353 M 191 349 L 200 349 M 195 350 L 197 350 M 195 348 L 197 348 M 195 348 L 195 350 M 197 348 L 197 350 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.svg b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.svg
index 2eba5a7..8b9c1b1 100644
--- a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.svg
+++ b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 243.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 204.5 758.5 L 1714.5 758.5 L 1714.5 797.5 L 204.5 797.5 Z M 204.5 758.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 1079.5 616.5 L 1103.5 616.5 L 1103.5 682.5 L 1079.5 682.5 Z M 1140.5 616.5 L 1164.5 616.5 L 1164.5 682.5 L 1140.5 682.5 Z M 598.5 637.5 L 622.5 637.5 L 622.5 703.5 L 598.5 703.5 Z M 666.5 637.5 L 690.5 637.5 L 690.5 703.5 L 666.5 703.5 Z M 970.5 616.5 L 994.5 616.5 L 994.5 703.5 L 970.5 703.5 Z M 741.5 651.5 L 764.5 651.5 L 764.5 717.5 L 741.5 717.5 Z M 797.5 651.5 L 821.5 651.5 L 821.5 717.5 L 797.5 717.5 Z M 1541.5 622.5 L 1565.5 622.5 L 1565.5 723.5 L 1541.5 723.5 Z M 890.5 651.5 L 914.5 651.5 L 914.5 737.5 L 890.5 737.5 Z M 1296.5 638.5 L 1320.5 638.5 L 1320.5 739.5 L 1296.5 739.5 Z M 1386.5 622.5 L 1409.5 622.5 L 1409.5 739.5 L 1386.5 739.5 Z M 270.5 622.5 L 293.5 622.5 L 293.5 739.5 L 270.5 739.5 Z M 1622.5 622.5 L 1645.5 622.5 L 1645.5 739.5 L 1622.5 739.5 Z M 370.5 622.5 L 394.5 622.5 L 394.5 739.5 L 370.5 739.5 Z M 370.5 622.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 691.5 331.5 L 715.5 331.5 L 715.5 398.5 L 691.5 398.5 Z M 757.5 331.5 L 781.5 331.5 L 781.5 398.5 L 757.5 398.5 Z M 510.5 335.5 L 534.5 335.5 L 534.5 401.5 L 510.5 401.5 Z M 1091.5 352.5 L 1114.5 352.5 L 1114.5 418.5 L 1091.5 418.5 Z M 1152.5 352.5 L 1176.5 352.5 L 1176.5 418.5 L 1152.5 418.5 Z M 607.5 379.5 L 631.5 379.5 L 631.5 446.5 L 607.5 446.5 Z M 1007.5 331.5 L 1030.5 331.5 L 1030.5 464.5 L 1007.5 464.5 Z M 888.5 331.5 L 911.5 331.5 L 911.5 464.5 L 888.5 464.5 Z M 341.5 331.5 L 365.5 331.5 L 365.5 508.5 L 341.5 508.5 Z M 1309.5 350.5 L 1332.5 350.5 L 1332.5 508.5 L 1309.5 508.5 Z M 1544.5 376.5 L 1567.5 376.5 L 1567.5 508.5 L 1544.5 508.5 Z M 1623.5 331.5 L 1647.5 331.5 L 1647.5 508.5 L 1623.5 508.5 Z M 1388.5 331.5 L 1412.5 331.5 L 1412.5 508.5 L 1388.5 508.5 Z M 271.5 331.5 L 294.5 331.5 L 294.5 508.5 L 271.5 508.5 Z M 271.5 331.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 228.5 260.5 L 255.5 260.5 L 255.5 287.5 L 228.5 287.5 Z M 1662.5 260.5 L 1689.5 260.5 L 1689.5 287.5 L 1662.5 287.5 Z M 1587.5 260.5 L 1614.5 260.5 L 1614.5 287.5 L 1587.5 287.5 Z M 1511.5 260.5 L 1538.5 260.5 L 1538.5 287.5 L 1511.5 287.5 Z M 1436.5 260.5 L 1463.5 260.5 L 1463.5 287.5 L 1436.5 287.5 Z M 1360.5 260.5 L 1387.5 260.5 L 1387.5 287.5 L 1360.5 287.5 Z M 1285.5 260.5 L 1312.5 260.5 L 1312.5 287.5 L 1285.5 287.5 Z M 1209.5 260.5 L 1236.5 260.5 L 1236.5 287.5 L 1209.5 287.5 Z M 1134.5 260.5 L 1161.5 260.5 L 1161.5 287.5 L 1134.5 287.5 Z M 1059.5 260.5 L 1085.5 260.5 L 1085.5 287.5 L 1059.5 287.5 Z M 983.5 260.5 L 1010.5 260.5 L 1010.5 287.5 L 983.5 287.5 Z M 908.5 260.5 L 934.5 260.5 L 934.5 287.5 L 908.5 287.5 Z M 832.5 260.5 L 859.5 260.5 L 859.5 287.5 L 832.5 287.5 Z M 757.5 260.5 L 783.5 260.5 L 783.5 287.5 L 757.5 287.5 Z M 681.5 260.5 L 708.5 260.5 L 708.5 287.5 L 681.5 287.5 Z M 606.5 260.5 L 632.5 260.5 L 632.5 287.5 L 606.5 287.5 Z M 530.5 260.5 L 557.5 260.5 L 557.5 287.5 L 530.5 287.5 Z M 455.5 260.5 L 481.5 260.5 L 481.5 287.5 L 455.5 287.5 Z M 379.5 260.5 L 406.5 260.5 L 406.5 287.5 L 379.5 287.5 Z M 304.5 260.5 L 330.5 260.5 L 330.5 287.5 L 304.5 287.5 Z M 228.5 784.5 L 255.5 784.5 L 255.5 810.5 L 228.5 810.5 Z M 1662.5 784.5 L 1689.5 784.5 L 1689.5 810.5 L 1662.5 810.5 Z M 1587.5 784.5 L 1614.5 784.5 L 1614.5 810.5 L 1587.5 810.5 Z M 1511.5 784.5 L 1538.5 784.5 L 1538.5 810.5 L 1511.5 810.5 Z M 1436.5 784.5 L 1463.5 784.5 L 1463.5 810.5 L 1436.5 810.5 Z M 1360.5 784.5 L 1387.5 784.5 L 1387.5 810.5 L 1360.5 810.5 Z M 1285.5 784.5 L 1312.5 784.5 L 1312.5 810.5 L 1285.5 810.5 Z M 1209.5 784.5 L 1236.5 784.5 L 1236.5 810.5 L 1209.5 810.5 Z M 1134.5 784.5 L 1161.5 784.5 L 1161.5 810.5 L 1134.5 810.5 Z M 1059.5 784.5 L 1085.5 784.5 L 1085.5 810.5 L 1059.5 810.5 Z M 983.5 784.5 L 1010.5 784.5 L 1010.5 810.5 L 983.5 810.5 Z M 908.5 784.5 L 934.5 784.5 L 934.5 810.5 L 908.5 810.5 Z M 832.5 784.5 L 859.5 784.5 L 859.5 810.5 L 832.5 810.5 Z M 757.5 784.5 L 783.5 784.5 L 783.5 810.5 L 757.5 810.5 Z M 681.5 784.5 L 708.5 784.5 L 708.5 810.5 L 681.5 810.5 Z M 606.5 784.5 L 632.5 784.5 L 632.5 810.5 L 606.5 810.5 Z M 530.5 784.5 L 557.5 784.5 L 557.5 810.5 L 530.5 810.5 Z M 455.5 784.5 L 481.5 784.5 L 481.5 810.5 L 455.5 810.5 Z M 379.5 784.5 L 406.5 784.5 L 406.5 810.5 L 379.5 810.5 Z M 304.5 784.5 L 330.5 784.5 L 330.5 810.5 L 304.5 810.5 Z M 304.5 784.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>
@@ -171,6 +171,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1723.046875 343.613281 L 1723.046875 377.355469 L 1718.1875 377.355469 L 1700.738281 350 L 1700.738281 377.355469 L 1696.667969 377.355469 L 1696.667969 343.613281 L 1701.339844 343.613281 L 1718.976562 371.199219 L 1718.976562 343.613281 Z M 1723.046875 343.613281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1662 732 L 1689 732 M 1662 705 L 1689 705 M 1662 705 L 1662 732 M 1689 705 L 1689 732 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1662 732 L 1689 732 M 1662 705 L 1689 705 M 1689 732 L 1689 705 M 1662 732 L 1662 705 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204 277 L 204 286 M 199 282 L 208 282 M 203 283 L 205 283 M 203 281 L 205 281 M 203 281 L 203 283 M 205 281 L 205 283 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.svg b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.svg
index 7510de8..6401904 100644
--- a/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.svg
+++ b/cells/dfxbp/sky130_fd_sc_hs__dfxbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 497.5 L 174.5 497.5 Z M 916.5 497.5 L 1744.5 497.5 L 1744.5 535.5 L 916.5 535.5 Z M 174.5 497.5 L 709.5 497.5 L 709.5 535.5 L 174.5 535.5 Z M 174.5 497.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 200.5 730.5 L 1717.5 730.5 L 1717.5 764.5 L 200.5 764.5 Z M 200.5 730.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1037.5 618.5 L 1058.5 618.5 L 1058.5 676.5 L 1037.5 676.5 Z M 1087.5 618.5 L 1107.5 618.5 L 1107.5 676.5 L 1087.5 676.5 Z M 543.5 624.5 L 564.5 624.5 L 564.5 682.5 L 543.5 682.5 Z M 602.5 624.5 L 623.5 624.5 L 623.5 682.5 L 602.5 682.5 Z M 672.5 636.5 L 693.5 636.5 L 693.5 693.5 L 672.5 693.5 Z M 726.5 636.5 L 747.5 636.5 L 747.5 693.5 L 726.5 693.5 Z M 1504.5 611.5 L 1524.5 611.5 L 1524.5 699.5 L 1504.5 699.5 Z M 1299.5 608.5 L 1320.5 608.5 L 1320.5 710.5 L 1299.5 710.5 Z M 1234.5 608.5 L 1254.5 608.5 L 1254.5 710.5 L 1234.5 710.5 Z M 1358.5 608.5 L 1379.5 608.5 L 1379.5 710.5 L 1358.5 710.5 Z M 798.5 636.5 L 819.5 636.5 L 819.5 711.5 L 798.5 711.5 Z M 879.5 636.5 L 900.5 636.5 L 900.5 711.5 L 879.5 711.5 Z M 1580.5 611.5 L 1601.5 611.5 L 1601.5 713.5 L 1580.5 713.5 Z M 258.5 611.5 L 279.5 611.5 L 279.5 713.5 L 258.5 713.5 Z M 1639.5 611.5 L 1660.5 611.5 L 1660.5 713.5 L 1639.5 713.5 Z M 347.5 611.5 L 367.5 611.5 L 367.5 713.5 L 347.5 713.5 Z M 347.5 611.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 490.5 360.5 L 510.5 360.5 L 510.5 418.5 L 490.5 418.5 Z M 1089.5 377.5 L 1109.5 377.5 L 1109.5 434.5 L 1089.5 434.5 Z M 1010.5 377.5 L 1030.5 377.5 L 1030.5 434.5 L 1010.5 434.5 Z M 662.5 400.5 L 683.5 400.5 L 683.5 458.5 L 662.5 458.5 Z M 563.5 400.5 L 584.5 400.5 L 584.5 458.5 L 563.5 458.5 Z M 720.5 400.5 L 740.5 400.5 L 740.5 458.5 L 720.5 458.5 Z M 805.5 357.5 L 826.5 357.5 L 826.5 472.5 L 805.5 472.5 Z M 867.5 357.5 L 887.5 357.5 L 887.5 472.5 L 867.5 472.5 Z M 1166.5 357.5 L 1186.5 357.5 L 1186.5 472.5 L 1166.5 472.5 Z M 1228.5 357.5 L 1248.5 357.5 L 1248.5 472.5 L 1228.5 472.5 Z M 1637.5 357.5 L 1658.5 357.5 L 1658.5 511.5 L 1637.5 511.5 Z M 1363.5 357.5 L 1384.5 357.5 L 1384.5 511.5 L 1363.5 511.5 Z M 260.5 357.5 L 280.5 357.5 L 280.5 511.5 L 260.5 511.5 Z M 1502.5 373.5 L 1522.5 373.5 L 1522.5 511.5 L 1502.5 511.5 Z M 1575.5 357.5 L 1596.5 357.5 L 1596.5 511.5 L 1575.5 511.5 Z M 321.5 357.5 L 342.5 357.5 L 342.5 511.5 L 321.5 511.5 Z M 1301.5 357.5 L 1322.5 357.5 L 1322.5 511.5 L 1301.5 511.5 Z M 1301.5 357.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 222.5 294.5 L 245.5 294.5 L 245.5 318.5 L 222.5 318.5 Z M 1673.5 294.5 L 1696.5 294.5 L 1696.5 318.5 L 1673.5 318.5 Z M 1607.5 294.5 L 1630.5 294.5 L 1630.5 318.5 L 1607.5 318.5 Z M 1541.5 294.5 L 1564.5 294.5 L 1564.5 318.5 L 1541.5 318.5 Z M 1475.5 294.5 L 1498.5 294.5 L 1498.5 318.5 L 1475.5 318.5 Z M 1409.5 294.5 L 1432.5 294.5 L 1432.5 318.5 L 1409.5 318.5 Z M 1343.5 294.5 L 1366.5 294.5 L 1366.5 318.5 L 1343.5 318.5 Z M 1277.5 294.5 L 1300.5 294.5 L 1300.5 318.5 L 1277.5 318.5 Z M 1211.5 294.5 L 1234.5 294.5 L 1234.5 318.5 L 1211.5 318.5 Z M 1145.5 294.5 L 1168.5 294.5 L 1168.5 318.5 L 1145.5 318.5 Z M 1079.5 294.5 L 1103.5 294.5 L 1103.5 318.5 L 1079.5 318.5 Z M 1013.5 294.5 L 1037.5 294.5 L 1037.5 318.5 L 1013.5 318.5 Z M 947.5 294.5 L 971.5 294.5 L 971.5 318.5 L 947.5 318.5 Z M 881.5 294.5 L 905.5 294.5 L 905.5 318.5 L 881.5 318.5 Z M 815.5 294.5 L 839.5 294.5 L 839.5 318.5 L 815.5 318.5 Z M 749.5 294.5 L 773.5 294.5 L 773.5 318.5 L 749.5 318.5 Z M 683.5 294.5 L 707.5 294.5 L 707.5 318.5 L 683.5 318.5 Z M 617.5 294.5 L 641.5 294.5 L 641.5 318.5 L 617.5 318.5 Z M 552.5 294.5 L 575.5 294.5 L 575.5 318.5 L 552.5 318.5 Z M 486.5 294.5 L 509.5 294.5 L 509.5 318.5 L 486.5 318.5 Z M 420.5 294.5 L 443.5 294.5 L 443.5 318.5 L 420.5 318.5 Z M 354.5 294.5 L 377.5 294.5 L 377.5 318.5 L 354.5 318.5 Z M 288.5 294.5 L 311.5 294.5 L 311.5 318.5 L 288.5 318.5 Z M 222.5 752.5 L 245.5 752.5 L 245.5 775.5 L 222.5 775.5 Z M 1673.5 752.5 L 1696.5 752.5 L 1696.5 775.5 L 1673.5 775.5 Z M 1607.5 752.5 L 1630.5 752.5 L 1630.5 775.5 L 1607.5 775.5 Z M 1541.5 752.5 L 1564.5 752.5 L 1564.5 775.5 L 1541.5 775.5 Z M 1475.5 752.5 L 1498.5 752.5 L 1498.5 775.5 L 1475.5 775.5 Z M 1409.5 752.5 L 1432.5 752.5 L 1432.5 775.5 L 1409.5 775.5 Z M 1343.5 752.5 L 1366.5 752.5 L 1366.5 775.5 L 1343.5 775.5 Z M 1277.5 752.5 L 1300.5 752.5 L 1300.5 775.5 L 1277.5 775.5 Z M 1211.5 752.5 L 1234.5 752.5 L 1234.5 775.5 L 1211.5 775.5 Z M 1145.5 752.5 L 1168.5 752.5 L 1168.5 775.5 L 1145.5 775.5 Z M 1079.5 752.5 L 1103.5 752.5 L 1103.5 775.5 L 1079.5 775.5 Z M 1013.5 752.5 L 1037.5 752.5 L 1037.5 775.5 L 1013.5 775.5 Z M 947.5 752.5 L 971.5 752.5 L 971.5 775.5 L 947.5 775.5 Z M 881.5 752.5 L 905.5 752.5 L 905.5 775.5 L 881.5 775.5 Z M 815.5 752.5 L 839.5 752.5 L 839.5 775.5 L 815.5 775.5 Z M 749.5 752.5 L 773.5 752.5 L 773.5 775.5 L 749.5 775.5 Z M 683.5 752.5 L 707.5 752.5 L 707.5 775.5 L 683.5 775.5 Z M 617.5 752.5 L 641.5 752.5 L 641.5 775.5 L 617.5 775.5 Z M 552.5 752.5 L 575.5 752.5 L 575.5 775.5 L 552.5 775.5 Z M 486.5 752.5 L 509.5 752.5 L 509.5 775.5 L 486.5 775.5 Z M 420.5 752.5 L 443.5 752.5 L 443.5 775.5 L 420.5 775.5 Z M 354.5 752.5 L 377.5 752.5 L 377.5 775.5 L 354.5 775.5 Z M 288.5 752.5 L 311.5 752.5 L 311.5 775.5 L 288.5 775.5 Z M 288.5 752.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface307">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,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 1660.953125 367.691406 L 1660.953125 397.339844 L 1656.679688 397.339844 L 1641.347656 373.304688 L 1641.347656 397.339844 L 1637.769531 397.339844 L 1637.769531 367.691406 L 1641.875 367.691406 L 1657.371094 391.933594 L 1657.371094 367.691406 Z M 1660.953125 367.691406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1607 708 L 1630 708 M 1607 685 L 1630 685 M 1607 685 L 1607 708 M 1630 685 L 1630 708 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1607 708 L 1630 708 M 1607 685 L 1630 685 M 1630 708 L 1630 685 M 1607 708 L 1607 685 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 310 L 200 319 M 195 315 L 204 315 M 199 316 L 201 316 M 199 314 L 201 314 M 199 314 L 199 316 M 201 314 L 201 316 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.svg b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.svg
index 4ef7ea1..5e67cfe 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.svg
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 766.5 650.5 L 794.5 650.5 L 794.5 727.5 L 766.5 727.5 Z M 1255.5 651.5 L 1283.5 651.5 L 1283.5 728.5 L 1255.5 728.5 Z M 1331.5 651.5 L 1359.5 651.5 L 1359.5 728.5 L 1331.5 728.5 Z M 645.5 655.5 L 672.5 655.5 L 672.5 732.5 L 645.5 732.5 Z M 853.5 672.5 L 881.5 672.5 L 881.5 749.5 L 853.5 749.5 Z M 920.5 672.5 L 947.5 672.5 L 947.5 749.5 L 920.5 749.5 Z M 1138.5 651.5 L 1166.5 651.5 L 1166.5 752.5 L 1138.5 752.5 Z M 1045.5 672.5 L 1072.5 672.5 L 1072.5 773.5 L 1045.5 773.5 Z M 286.5 638.5 L 314.5 638.5 L 314.5 774.5 L 286.5 774.5 Z M 1513.5 656.5 L 1541.5 656.5 L 1541.5 774.5 L 1513.5 774.5 Z M 400.5 638.5 L 428.5 638.5 L 428.5 774.5 L 400.5 774.5 Z M 1604.5 638.5 L 1632.5 638.5 L 1632.5 774.5 L 1604.5 774.5 Z M 1604.5 638.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1209.5 298.5 L 1237.5 298.5 L 1237.5 375.5 L 1209.5 375.5 Z M 1324.5 298.5 L 1352.5 298.5 L 1352.5 375.5 L 1324.5 375.5 Z M 796.5 302.5 L 823.5 302.5 L 823.5 379.5 L 796.5 379.5 Z M 599.5 302.5 L 626.5 302.5 L 626.5 379.5 L 599.5 379.5 Z M 867.5 302.5 L 895.5 302.5 L 895.5 379.5 L 867.5 379.5 Z M 697.5 339.5 L 725.5 339.5 L 725.5 416.5 L 697.5 416.5 Z M 1111.5 298.5 L 1138.5 298.5 L 1138.5 452.5 L 1111.5 452.5 Z M 981.5 298.5 L 1009.5 298.5 L 1009.5 452.5 L 981.5 452.5 Z M 371.5 298.5 L 398.5 298.5 L 398.5 504.5 L 371.5 504.5 Z M 1603.5 298.5 L 1630.5 298.5 L 1630.5 504.5 L 1603.5 504.5 Z M 288.5 298.5 L 316.5 298.5 L 316.5 504.5 L 288.5 504.5 Z M 1510.5 349.5 L 1537.5 349.5 L 1537.5 504.5 L 1510.5 504.5 Z M 1510.5 349.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface279">
+<g id="surface306">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,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 593.367188 487.5 L 593.367188 447.625 L 608.738281 447.625 L 611.144531 447.789062 L 613.386719 448.226562 L 615.464844 448.992188 L 617.378906 449.976562 L 619.078125 451.34375 L 620.664062 452.929688 L 621.976562 454.84375 L 623.070312 456.921875 L 623.890625 459.277344 L 624.492188 461.792969 L 624.820312 464.582031 L 624.984375 467.535156 L 624.820312 470.652344 L 624.4375 473.550781 L 623.78125 476.175781 L 622.90625 478.585938 L 621.757812 480.71875 L 620.335938 482.578125 L 618.804688 484.109375 L 617.105469 485.3125 L 615.246094 486.296875 L 613.222656 486.953125 L 611.035156 487.390625 L 608.738281 487.5 Z M 598.457031 483.015625 L 607.863281 483.015625 L 610.378906 482.851562 L 612.621094 482.25 L 614.589844 481.210938 L 616.230469 479.84375 L 617.542969 477.984375 L 618.640625 475.738281 L 618.96875 474.589844 L 619.296875 473.386719 L 619.570312 472.074219 L 619.734375 470.652344 L 619.84375 469.175781 L 619.898438 467.589844 L 619.679688 464.035156 L 619.132812 460.917969 L 618.148438 458.234375 L 616.832031 456.101562 L 615.136719 454.351562 L 613.058594 453.09375 L 612.292969 452.820312 L 611.472656 452.546875 L 609.722656 452.21875 L 607.863281 452.109375 L 598.457031 452.109375 Z M 598.457031 483.015625 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 591 627 L 622 627 M 591 596 L 622 596 M 591 596 L 591 627 M 622 596 L 622 627 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 591 627 L 622 627 M 591 596 L 622 596 M 622 627 L 622 596 M 591 627 L 591 596 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.svg b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.svg
index 6872c53..32cb477 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.svg
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1201.5 644.5 L 1227.5 644.5 L 1227.5 717.5 L 1201.5 717.5 Z M 1268.5 644.5 L 1294.5 644.5 L 1294.5 717.5 L 1268.5 717.5 Z M 714.5 649.5 L 740.5 649.5 L 740.5 722.5 L 714.5 722.5 Z M 639.5 649.5 L 666.5 649.5 L 666.5 722.5 L 639.5 722.5 Z M 797.5 664.5 L 823.5 664.5 L 823.5 737.5 L 797.5 737.5 Z M 865.5 664.5 L 891.5 664.5 L 891.5 737.5 L 865.5 737.5 Z M 1011.5 664.5 L 1037.5 664.5 L 1037.5 760.5 L 1011.5 760.5 Z M 1086.5 664.5 L 1112.5 664.5 L 1112.5 760.5 L 1086.5 760.5 Z M 383.5 632.5 L 409.5 632.5 L 409.5 761.5 L 383.5 761.5 Z M 1536.5 632.5 L 1562.5 632.5 L 1562.5 761.5 L 1536.5 761.5 Z M 1611.5 632.5 L 1637.5 632.5 L 1637.5 761.5 L 1611.5 761.5 Z M 280.5 632.5 L 306.5 632.5 L 306.5 761.5 L 280.5 761.5 Z M 1441.5 649.5 L 1467.5 649.5 L 1467.5 761.5 L 1441.5 761.5 Z M 1441.5 649.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 556.5 310.5 L 582.5 310.5 L 582.5 383.5 L 556.5 383.5 Z M 1160.5 310.5 L 1186.5 310.5 L 1186.5 383.5 L 1160.5 383.5 Z M 1268.5 310.5 L 1294.5 310.5 L 1294.5 383.5 L 1268.5 383.5 Z M 814.5 314.5 L 840.5 314.5 L 840.5 387.5 L 814.5 387.5 Z M 741.5 314.5 L 767.5 314.5 L 767.5 387.5 L 741.5 387.5 Z M 649.5 379.5 L 675.5 379.5 L 675.5 452.5 L 649.5 452.5 Z M 1067.5 310.5 L 1094.5 310.5 L 1094.5 456.5 L 1067.5 456.5 Z M 933.5 310.5 L 959.5 310.5 L 959.5 456.5 L 933.5 456.5 Z M 1443.5 331.5 L 1469.5 331.5 L 1469.5 505.5 L 1443.5 505.5 Z M 282.5 310.5 L 308.5 310.5 L 308.5 505.5 L 282.5 505.5 Z M 1609.5 310.5 L 1635.5 310.5 L 1635.5 505.5 L 1609.5 505.5 Z M 360.5 310.5 L 386.5 310.5 L 386.5 505.5 L 360.5 505.5 Z M 1531.5 310.5 L 1557.5 310.5 L 1557.5 505.5 L 1531.5 505.5 Z M 1531.5 310.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,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 570.992188 618.5 L 570.992188 581.691406 L 585.179688 581.691406 L 587.402344 581.84375 L 589.472656 582.246094 L 591.390625 582.953125 L 593.160156 583.863281 L 594.722656 585.125 L 596.1875 586.589844 L 597.402344 588.355469 L 598.410156 590.277344 L 599.167969 592.445312 L 599.722656 594.769531 L 600.027344 597.34375 L 600.175781 600.070312 L 600.027344 602.949219 L 599.671875 605.625 L 599.066406 608.046875 L 598.257812 610.269531 L 597.199219 612.238281 L 595.886719 613.957031 L 594.472656 615.371094 L 592.90625 616.480469 L 591.191406 617.390625 L 589.320312 617.996094 L 587.300781 618.398438 L 585.179688 618.5 Z M 575.6875 614.359375 L 584.375 614.359375 L 586.695312 614.207031 L 588.765625 613.652344 L 590.585938 612.695312 L 592.097656 611.429688 L 593.3125 609.714844 L 594.320312 607.644531 L 594.625 606.585938 L 594.925781 605.472656 L 595.179688 604.261719 L 595.332031 602.949219 L 595.429688 601.585938 L 595.480469 600.121094 L 595.28125 596.839844 L 594.773438 593.960938 L 593.867188 591.488281 L 592.652344 589.519531 L 591.089844 587.902344 L 589.171875 586.742188 L 588.464844 586.488281 L 587.707031 586.234375 L 586.898438 586.085938 L 586.089844 585.933594 L 585.230469 585.882812 L 584.375 585.832031 L 575.6875 585.832031 Z M 575.6875 614.359375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 568 494 L 598 494 M 568 464 L 598 464 M 568 464 L 568 494 M 598 464 L 598 494 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 568 494 L 598 494 M 568 464 L 598 464 M 598 494 L 598 464 M 568 494 L 568 464 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.svg b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.svg
index 2a45af1..c1c8e3e 100644
--- a/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.svg
+++ b/cells/dfxtp/sky130_fd_sc_hs__dfxtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 243.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 204.5 758.5 L 1714.5 758.5 L 1714.5 797.5 L 204.5 797.5 Z M 204.5 758.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1106.5 633.5 L 1130.5 633.5 L 1130.5 699.5 L 1106.5 699.5 Z M 1180.5 633.5 L 1203.5 633.5 L 1203.5 699.5 L 1180.5 699.5 Z M 683.5 637.5 L 707.5 637.5 L 707.5 703.5 L 683.5 703.5 Z M 616.5 637.5 L 639.5 637.5 L 639.5 703.5 L 616.5 703.5 Z M 758.5 651.5 L 782.5 651.5 L 782.5 717.5 L 758.5 717.5 Z M 815.5 651.5 L 838.5 651.5 L 838.5 717.5 L 815.5 717.5 Z M 1014.5 633.5 L 1038.5 633.5 L 1038.5 720.5 L 1014.5 720.5 Z M 940.5 651.5 L 963.5 651.5 L 963.5 737.5 L 940.5 737.5 Z M 1620.5 622.5 L 1644.5 622.5 L 1644.5 739.5 L 1620.5 739.5 Z M 1408.5 622.5 L 1431.5 622.5 L 1431.5 739.5 L 1408.5 739.5 Z M 1552.5 622.5 L 1576.5 622.5 L 1576.5 739.5 L 1552.5 739.5 Z M 1482.5 622.5 L 1505.5 622.5 L 1505.5 739.5 L 1482.5 739.5 Z M 270.5 622.5 L 293.5 622.5 L 293.5 739.5 L 270.5 739.5 Z M 1335.5 622.5 L 1359.5 622.5 L 1359.5 739.5 L 1335.5 739.5 Z M 368.5 622.5 L 392.5 622.5 L 392.5 739.5 L 368.5 739.5 Z M 368.5 622.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1077.5 331.5 L 1101.5 331.5 L 1101.5 398.5 L 1077.5 398.5 Z M 1176.5 331.5 L 1199.5 331.5 L 1199.5 398.5 L 1176.5 398.5 Z M 524.5 335.5 L 547.5 335.5 L 547.5 401.5 L 524.5 401.5 Z M 692.5 335.5 L 716.5 335.5 L 716.5 401.5 L 692.5 401.5 Z M 753.5 335.5 L 777.5 335.5 L 777.5 401.5 L 753.5 401.5 Z M 608.5 350.5 L 632.5 350.5 L 632.5 416.5 L 608.5 416.5 Z M 1255.5 331.5 L 1279.5 331.5 L 1279.5 464.5 L 1255.5 464.5 Z M 993.5 331.5 L 1017.5 331.5 L 1017.5 464.5 L 993.5 464.5 Z M 886.5 331.5 L 910.5 331.5 L 910.5 464.5 L 886.5 464.5 Z M 1326.5 331.5 L 1349.5 331.5 L 1349.5 464.5 L 1326.5 464.5 Z M 1552.5 331.5 L 1575.5 331.5 L 1575.5 508.5 L 1552.5 508.5 Z M 271.5 331.5 L 295.5 331.5 L 295.5 508.5 L 271.5 508.5 Z M 1410.5 331.5 L 1434.5 331.5 L 1434.5 508.5 L 1410.5 508.5 Z M 1481.5 331.5 L 1504.5 331.5 L 1504.5 508.5 L 1481.5 508.5 Z M 1622.5 331.5 L 1646.5 331.5 L 1646.5 508.5 L 1622.5 508.5 Z M 342.5 331.5 L 366.5 331.5 L 366.5 508.5 L 342.5 508.5 Z M 342.5 331.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 228.5 260.5 L 255.5 260.5 L 255.5 287.5 L 228.5 287.5 Z M 1662.5 260.5 L 1689.5 260.5 L 1689.5 287.5 L 1662.5 287.5 Z M 1587.5 260.5 L 1614.5 260.5 L 1614.5 287.5 L 1587.5 287.5 Z M 1511.5 260.5 L 1538.5 260.5 L 1538.5 287.5 L 1511.5 287.5 Z M 1436.5 260.5 L 1463.5 260.5 L 1463.5 287.5 L 1436.5 287.5 Z M 1360.5 260.5 L 1387.5 260.5 L 1387.5 287.5 L 1360.5 287.5 Z M 1285.5 260.5 L 1312.5 260.5 L 1312.5 287.5 L 1285.5 287.5 Z M 1209.5 260.5 L 1236.5 260.5 L 1236.5 287.5 L 1209.5 287.5 Z M 1134.5 260.5 L 1161.5 260.5 L 1161.5 287.5 L 1134.5 287.5 Z M 1059.5 260.5 L 1085.5 260.5 L 1085.5 287.5 L 1059.5 287.5 Z M 983.5 260.5 L 1010.5 260.5 L 1010.5 287.5 L 983.5 287.5 Z M 908.5 260.5 L 934.5 260.5 L 934.5 287.5 L 908.5 287.5 Z M 832.5 260.5 L 859.5 260.5 L 859.5 287.5 L 832.5 287.5 Z M 757.5 260.5 L 783.5 260.5 L 783.5 287.5 L 757.5 287.5 Z M 681.5 260.5 L 708.5 260.5 L 708.5 287.5 L 681.5 287.5 Z M 606.5 260.5 L 632.5 260.5 L 632.5 287.5 L 606.5 287.5 Z M 530.5 260.5 L 557.5 260.5 L 557.5 287.5 L 530.5 287.5 Z M 455.5 260.5 L 481.5 260.5 L 481.5 287.5 L 455.5 287.5 Z M 379.5 260.5 L 406.5 260.5 L 406.5 287.5 L 379.5 287.5 Z M 304.5 260.5 L 330.5 260.5 L 330.5 287.5 L 304.5 287.5 Z M 228.5 784.5 L 255.5 784.5 L 255.5 810.5 L 228.5 810.5 Z M 1662.5 784.5 L 1689.5 784.5 L 1689.5 810.5 L 1662.5 810.5 Z M 1587.5 784.5 L 1614.5 784.5 L 1614.5 810.5 L 1587.5 810.5 Z M 1511.5 784.5 L 1538.5 784.5 L 1538.5 810.5 L 1511.5 810.5 Z M 1436.5 784.5 L 1463.5 784.5 L 1463.5 810.5 L 1436.5 810.5 Z M 1360.5 784.5 L 1387.5 784.5 L 1387.5 810.5 L 1360.5 810.5 Z M 1285.5 784.5 L 1312.5 784.5 L 1312.5 810.5 L 1285.5 810.5 Z M 1209.5 784.5 L 1236.5 784.5 L 1236.5 810.5 L 1209.5 810.5 Z M 1134.5 784.5 L 1161.5 784.5 L 1161.5 810.5 L 1134.5 810.5 Z M 1059.5 784.5 L 1085.5 784.5 L 1085.5 810.5 L 1059.5 810.5 Z M 983.5 784.5 L 1010.5 784.5 L 1010.5 810.5 L 983.5 810.5 Z M 908.5 784.5 L 934.5 784.5 L 934.5 810.5 L 908.5 810.5 Z M 832.5 784.5 L 859.5 784.5 L 859.5 810.5 L 832.5 810.5 Z M 757.5 784.5 L 783.5 784.5 L 783.5 810.5 L 757.5 810.5 Z M 681.5 784.5 L 708.5 784.5 L 708.5 810.5 L 681.5 810.5 Z M 606.5 784.5 L 632.5 784.5 L 632.5 810.5 L 606.5 810.5 Z M 530.5 784.5 L 557.5 784.5 L 557.5 810.5 L 530.5 810.5 Z M 455.5 784.5 L 481.5 784.5 L 481.5 810.5 L 455.5 810.5 Z M 379.5 784.5 L 406.5 784.5 L 406.5 810.5 L 379.5 810.5 Z M 304.5 784.5 L 330.5 784.5 L 330.5 810.5 L 304.5 810.5 Z M 304.5 784.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -159,6 +159,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 265.519531 540.632812 L 265.519531 552.433594 L 261.214844 552.433594 L 261.214844 518.695312 L 265.519531 518.695312 L 265.519531 535.773438 L 282.320312 518.695312 L 287.875 518.695312 L 274.125 532.441406 L 288.011719 552.433594 L 282.921875 552.433594 L 271.027344 535.125 Z M 265.519531 540.632812 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 228 557 L 255 557 M 228 530 L 255 530 M 228 530 L 228 557 M 255 530 L 255 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 228 557 L 255 557 M 228 530 L 255 530 M 255 557 L 255 530 M 228 557 L 228 530 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204 277 L 204 286 M 199 282 L 208 282 M 203 283 L 205 283 M 203 281 L 205 281 M 203 281 L 203 283 M 205 281 L 205 283 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/diode/sky130_fd_sc_hs__diode_2.svg b/cells/diode/sky130_fd_sc_hs__diode_2.svg
index 433220b..6ed28ec 100644
--- a/cells/diode/sky130_fd_sc_hs__diode_2.svg
+++ b/cells/diode/sky130_fd_sc_hs__diode_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 538.5 L 812.5 538.5 Z M 812.5 111.5 "/>
 </clipPath>
-<image id="image456" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image490" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image456"/>
+  <use xlink:href="#image490"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 855.5 862.5 L 1075.5 862.5 L 1075.5 918.5 L 855.5 918.5 Z M 855.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image456"/>
+  <use xlink:href="#image490"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -26,9 +26,9 @@
 <clipPath id="clip4">
   <path d="M 886.5 632.5 L 1044.5 632.5 L 1044.5 641.5 L 886.5 641.5 Z M 886.5 641.5 L 1044.5 641.5 L 1044.5 680.5 L 886.5 680.5 Z M 886.5 680.5 L 1044.5 680.5 L 1044.5 719.5 L 886.5 719.5 Z M 886.5 719.5 L 1044.5 719.5 L 1044.5 758.5 L 886.5 758.5 Z M 886.5 758.5 L 1044.5 758.5 L 1044.5 797.5 L 886.5 797.5 Z M 886.5 797.5 L 1044.5 797.5 L 1044.5 836.5 L 886.5 836.5 Z M 886.5 836.5 L 1044.5 836.5 L 1044.5 845.5 L 886.5 845.5 Z M 886.5 836.5 "/>
 </clipPath>
-<image id="image457" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAlSURBVDiN3cohAQAwDASx+De9SejjQyEBPG2Nr67x1TW+uq73AQuJf4EmKJrNAAAAAElFTkSuQmCC"/>
+<image id="image491" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAlSURBVDiN3cohAQAwDASx+De9SejjQyEBPG2Nr67x1TW+uq73AQuJf4EmKJrNAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image457"/>
+  <use xlink:href="#image491"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -42,15 +42,15 @@
 <clipPath id="clip7">
   <path d="M 891.5 136.5 L 930.5 136.5 L 930.5 174.5 L 891.5 174.5 Z M 1001.5 136.5 L 1040.5 136.5 L 1040.5 174.5 L 1001.5 174.5 Z M 891.5 899.5 L 930.5 899.5 L 930.5 938.5 L 891.5 938.5 Z M 1001.5 899.5 L 1040.5 899.5 L 1040.5 938.5 L 1001.5 938.5 Z M 1001.5 899.5 "/>
 </clipPath>
-<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image492" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image458"/>
+  <use xlink:href="#image492"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface453">
+<g id="surface487">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -199,6 +199,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 999.976562 904.597656 L 999.976562 875.96875 L 1011.011719 875.96875 L 1012.738281 876.085938 L 1014.351562 876.402344 L 1015.84375 876.949219 L 1017.214844 877.65625 L 1018.433594 878.640625 L 1019.574219 879.777344 L 1020.515625 881.152344 L 1021.300781 882.644531 L 1021.890625 884.332031 L 1022.320312 886.140625 L 1022.558594 888.140625 L 1022.675781 890.261719 L 1022.558594 892.5 L 1022.28125 894.582031 L 1021.8125 896.46875 L 1021.183594 898.195312 L 1020.359375 899.726562 L 1019.335938 901.0625 L 1018.238281 902.160156 L 1017.019531 903.027344 L 1015.683594 903.734375 L 1014.230469 904.203125 L 1012.660156 904.519531 L 1011.011719 904.597656 Z M 1003.628906 901.375 L 1010.382812 901.375 L 1012.191406 901.257812 L 1013.800781 900.828125 L 1015.214844 900.082031 L 1016.390625 899.097656 L 1017.335938 897.765625 L 1018.121094 896.152344 L 1018.355469 895.328125 L 1018.589844 894.464844 L 1018.789062 893.523438 L 1018.90625 892.5 L 1018.984375 891.441406 L 1019.023438 890.300781 L 1018.867188 887.75 L 1018.472656 885.511719 L 1017.765625 883.585938 L 1016.824219 882.054688 L 1015.605469 880.796875 L 1014.113281 879.894531 L 1013.566406 879.699219 L 1012.976562 879.503906 L 1012.347656 879.386719 L 1011.71875 879.265625 L 1010.382812 879.1875 L 1003.628906 879.1875 Z M 1003.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 855 217 L 1075 217 M 855 161 L 1075 161 M 855 161 L 855 217 M 1075 161 L 1075 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 217 L 1075 217 M 855 161 L 1075 161 M 1075 217 L 1075 161 M 855 217 L 855 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 156 L 855 165 M 850 161 L 859 161 M 854 162 L 856 162 M 854 160 L 856 160 M 854 160 L 854 162 M 856 160 L 856 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.svg b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.svg
index 1b23e00..8038f62 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.svg
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 510.5 L 174.5 510.5 Z M 1329.5 510.5 L 1743.5 510.5 L 1743.5 538.5 L 1329.5 538.5 Z M 174.5 510.5 L 806.5 510.5 L 806.5 538.5 L 174.5 538.5 Z M 174.5 510.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#image341"/>
+  <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 937.5 603.5 L 970.5 603.5 L 970.5 766.5 L 937.5 766.5 Z M 1158.5 603.5 L 1191.5 603.5 L 1191.5 766.5 L 1158.5 766.5 Z M 1356.5 625.5 L 1390.5 625.5 L 1390.5 766.5 L 1356.5 766.5 Z M 1270.5 625.5 L 1303.5 625.5 L 1303.5 766.5 L 1270.5 766.5 Z M 796.5 675.5 L 830.5 675.5 L 830.5 767.5 L 796.5 767.5 Z M 710.5 675.5 L 743.5 675.5 L 743.5 767.5 L 710.5 767.5 Z M 564.5 675.5 L 598.5 675.5 L 598.5 816.5 L 564.5 816.5 Z M 478.5 675.5 L 511.5 675.5 L 511.5 816.5 L 478.5 816.5 Z M 1575.5 659.5 L 1608.5 659.5 L 1608.5 823.5 L 1575.5 823.5 Z M 309.5 659.5 L 342.5 659.5 L 342.5 823.5 L 309.5 823.5 Z M 309.5 659.5 "/>
 </clipPath>
-<image id="image342" 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="#image342"/>
+  <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 718.5 250.5 L 751.5 250.5 L 751.5 343.5 L 718.5 343.5 Z M 811.5 250.5 L 844.5 250.5 L 844.5 343.5 L 811.5 343.5 Z M 931.5 279.5 L 964.5 279.5 L 964.5 465.5 L 931.5 465.5 Z M 1274.5 285.5 L 1307.5 285.5 L 1307.5 470.5 L 1274.5 470.5 Z M 1375.5 285.5 L 1408.5 285.5 L 1408.5 470.5 L 1375.5 470.5 Z M 1154.5 285.5 L 1187.5 285.5 L 1187.5 470.5 L 1154.5 470.5 Z M 561.5 250.5 L 594.5 250.5 L 594.5 471.5 L 561.5 471.5 Z M 468.5 250.5 L 501.5 250.5 L 501.5 471.5 L 468.5 471.5 Z M 311.5 250.5 L 345.5 250.5 L 345.5 498.5 L 311.5 498.5 Z M 1558.5 250.5 L 1591.5 250.5 L 1591.5 498.5 L 1558.5 498.5 Z M 1558.5 250.5 "/>
 </clipPath>
-<image id="image343" 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="#image343"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.5 "/>
 </clipPath>
-<image id="image344" 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="#image344"/>
+  <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="surface338">
+<g id="surface364">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1362.917969 543.566406 L 1362.917969 560.015625 L 1356.917969 560.015625 L 1356.917969 512.984375 L 1362.917969 512.984375 L 1362.917969 536.789062 L 1386.339844 512.984375 L 1394.082031 512.984375 L 1374.917969 532.144531 L 1394.273438 560.015625 L 1387.175781 560.015625 L 1370.597656 535.886719 Z M 1362.917969 543.566406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1311 561 L 1349 561 M 1311 524 L 1349 524 M 1311 524 L 1311 561 M 1349 524 L 1349 561 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1311 561 L 1349 561 M 1311 524 L 1349 524 M 1349 561 L 1349 524 M 1311 561 L 1311 524 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.svg b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.svg
index 716070f..e5b2961 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.svg
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 514.5 L 174.5 514.5 Z M 1059.5 514.5 L 1743.5 514.5 L 1743.5 518.5 L 1059.5 518.5 Z M 1419.5 518.5 L 1743.5 518.5 L 1743.5 537.5 L 1419.5 537.5 Z M 174.5 514.5 L 437.5 514.5 L 437.5 537.5 L 174.5 537.5 Z M 174.5 514.5 "/>
 </clipPath>
-<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image441" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image414"/>
+  <use xlink:href="#image441"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 211.5 812.5 L 1706.5 812.5 L 1706.5 860.5 L 211.5 860.5 Z M 211.5 812.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image414"/>
+  <use xlink:href="#image441"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 755.5 643.5 L 784.5 643.5 L 784.5 725.5 L 755.5 725.5 Z M 908.5 594.5 L 937.5 594.5 L 937.5 738.5 L 908.5 738.5 Z M 1268.5 600.5 L 1297.5 600.5 L 1297.5 744.5 L 1268.5 744.5 Z M 1198.5 600.5 L 1227.5 600.5 L 1227.5 744.5 L 1198.5 744.5 Z M 1101.5 600.5 L 1130.5 600.5 L 1130.5 744.5 L 1101.5 744.5 Z M 663.5 663.5 L 692.5 663.5 L 692.5 745.5 L 663.5 745.5 Z M 1595.5 626.5 L 1624.5 626.5 L 1624.5 770.5 L 1595.5 770.5 Z M 1512.5 626.5 L 1541.5 626.5 L 1541.5 770.5 L 1512.5 770.5 Z M 442.5 663.5 L 471.5 663.5 L 471.5 788.5 L 442.5 788.5 Z M 518.5 663.5 L 547.5 663.5 L 547.5 788.5 L 518.5 788.5 Z M 293.5 644.5 L 322.5 644.5 L 322.5 788.5 L 293.5 788.5 Z M 293.5 644.5 "/>
 </clipPath>
-<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image442" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image415"/>
+  <use xlink:href="#image442"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 758.5 284.5 L 787.5 284.5 L 787.5 366.5 L 758.5 366.5 Z M 676.5 284.5 L 706.5 284.5 L 706.5 366.5 L 676.5 366.5 Z M 896.5 284.5 L 926.5 284.5 L 926.5 447.5 L 896.5 447.5 Z M 1097.5 289.5 L 1126.5 289.5 L 1126.5 452.5 L 1097.5 452.5 Z M 521.5 284.5 L 550.5 284.5 L 550.5 478.5 L 521.5 478.5 Z M 439.5 284.5 L 468.5 284.5 L 468.5 478.5 L 439.5 478.5 Z M 1288.5 289.5 L 1317.5 289.5 L 1317.5 483.5 L 1288.5 483.5 Z M 1195.5 289.5 L 1224.5 289.5 L 1224.5 483.5 L 1195.5 483.5 Z M 1506.5 284.5 L 1535.5 284.5 L 1535.5 502.5 L 1506.5 502.5 Z M 295.5 284.5 L 324.5 284.5 L 324.5 502.5 L 295.5 502.5 Z M 1593.5 284.5 L 1623.5 284.5 L 1623.5 502.5 L 1593.5 502.5 Z M 1593.5 284.5 "/>
 </clipPath>
-<image id="image416" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image443" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image416"/>
+  <use xlink:href="#image443"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 241.5 195.5 L 274.5 195.5 L 274.5 228.5 L 241.5 228.5 Z M 1643.5 195.5 L 1676.5 195.5 L 1676.5 228.5 L 1643.5 228.5 Z M 1550.5 195.5 L 1583.5 195.5 L 1583.5 228.5 L 1550.5 228.5 Z M 1456.5 195.5 L 1489.5 195.5 L 1489.5 228.5 L 1456.5 228.5 Z M 1363.5 195.5 L 1396.5 195.5 L 1396.5 228.5 L 1363.5 228.5 Z M 1269.5 195.5 L 1302.5 195.5 L 1302.5 228.5 L 1269.5 228.5 Z M 1176.5 195.5 L 1209.5 195.5 L 1209.5 228.5 L 1176.5 228.5 Z M 1082.5 195.5 L 1115.5 195.5 L 1115.5 228.5 L 1082.5 228.5 Z M 989.5 195.5 L 1022.5 195.5 L 1022.5 228.5 L 989.5 228.5 Z M 895.5 195.5 L 929.5 195.5 L 929.5 228.5 L 895.5 228.5 Z M 802.5 195.5 L 835.5 195.5 L 835.5 228.5 L 802.5 228.5 Z M 709.5 195.5 L 742.5 195.5 L 742.5 228.5 L 709.5 228.5 Z M 615.5 195.5 L 648.5 195.5 L 648.5 228.5 L 615.5 228.5 Z M 522.5 195.5 L 555.5 195.5 L 555.5 228.5 L 522.5 228.5 Z M 428.5 195.5 L 461.5 195.5 L 461.5 228.5 L 428.5 228.5 Z M 335.5 195.5 L 368.5 195.5 L 368.5 228.5 L 335.5 228.5 Z M 241.5 843.5 L 274.5 843.5 L 274.5 877.5 L 241.5 877.5 Z M 1643.5 843.5 L 1676.5 843.5 L 1676.5 877.5 L 1643.5 877.5 Z M 1550.5 843.5 L 1583.5 843.5 L 1583.5 877.5 L 1550.5 877.5 Z M 1456.5 843.5 L 1489.5 843.5 L 1489.5 877.5 L 1456.5 877.5 Z M 1363.5 843.5 L 1396.5 843.5 L 1396.5 877.5 L 1363.5 877.5 Z M 1269.5 843.5 L 1302.5 843.5 L 1302.5 877.5 L 1269.5 877.5 Z M 1176.5 843.5 L 1209.5 843.5 L 1209.5 877.5 L 1176.5 877.5 Z M 1082.5 843.5 L 1115.5 843.5 L 1115.5 877.5 L 1082.5 877.5 Z M 989.5 843.5 L 1022.5 843.5 L 1022.5 877.5 L 989.5 877.5 Z M 895.5 843.5 L 929.5 843.5 L 929.5 877.5 L 895.5 877.5 Z M 802.5 843.5 L 835.5 843.5 L 835.5 877.5 L 802.5 877.5 Z M 709.5 843.5 L 742.5 843.5 L 742.5 877.5 L 709.5 877.5 Z M 615.5 843.5 L 648.5 843.5 L 648.5 877.5 L 615.5 877.5 Z M 522.5 843.5 L 555.5 843.5 L 555.5 877.5 L 522.5 877.5 Z M 428.5 843.5 L 461.5 843.5 L 461.5 877.5 L 428.5 877.5 Z M 335.5 843.5 L 368.5 843.5 L 368.5 877.5 L 335.5 877.5 Z M 335.5 843.5 "/>
 </clipPath>
-<image id="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image444" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image417"/>
+  <use xlink:href="#image444"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface411">
+<g id="surface438">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -207,6 +207,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1619.445312 326.515625 L 1619.445312 341.175781 L 1614.097656 341.175781 L 1614.097656 299.257812 L 1619.445312 299.257812 L 1619.445312 320.476562 L 1640.320312 299.257812 L 1647.21875 299.257812 L 1630.140625 316.335938 L 1647.390625 341.175781 L 1641.066406 341.175781 L 1626.289062 319.671875 Z M 1619.445312 326.515625 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1550 776 L 1583 776 M 1550 743 L 1583 743 M 1550 743 L 1550 776 M 1583 743 L 1583 776 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1550 776 L 1583 776 M 1550 743 L 1583 743 M 1583 776 L 1583 743 M 1550 776 L 1550 743 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 211 214 L 211 223 M 206 219 L 215 219 M 210 220 L 212 220 M 210 218 L 212 218 M 210 218 L 210 220 M 212 218 L 212 220 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.svg b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.svg
index e3f4f85..493bd39 100644
--- a/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.svg
+++ b/cells/dlclkp/sky130_fd_sc_hs__dlclkp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 489.5 L 174.5 489.5 Z M 174.5 489.5 L 765.5 489.5 L 765.5 529.5 L 174.5 529.5 Z M 174.5 529.5 L 592.5 529.5 L 592.5 536.5 L 174.5 536.5 Z M 986.5 489.5 L 1743.5 489.5 L 1743.5 536.5 L 986.5 536.5 Z M 986.5 489.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 712.5 588.5 L 739.5 588.5 L 739.5 661.5 L 712.5 661.5 Z M 837.5 588.5 L 863.5 588.5 L 863.5 716.5 L 837.5 716.5 Z M 608.5 644.5 L 634.5 644.5 L 634.5 717.5 L 608.5 717.5 Z M 498.5 644.5 L 524.5 644.5 L 524.5 756.5 L 498.5 756.5 Z M 430.5 644.5 L 456.5 644.5 L 456.5 756.5 L 430.5 756.5 Z M 1160.5 632.5 L 1186.5 632.5 L 1186.5 761.5 L 1160.5 761.5 Z M 1092.5 632.5 L 1118.5 632.5 L 1118.5 761.5 L 1092.5 761.5 Z M 1017.5 632.5 L 1043.5 632.5 L 1043.5 761.5 L 1017.5 761.5 Z M 1611.5 632.5 L 1637.5 632.5 L 1637.5 761.5 L 1611.5 761.5 Z M 1449.5 632.5 L 1475.5 632.5 L 1475.5 761.5 L 1449.5 761.5 Z M 1536.5 632.5 L 1562.5 632.5 L 1562.5 761.5 L 1536.5 761.5 Z M 1374.5 632.5 L 1401.5 632.5 L 1401.5 761.5 L 1374.5 761.5 Z M 280.5 632.5 L 306.5 632.5 L 306.5 761.5 L 280.5 761.5 Z M 280.5 632.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 710.5 310.5 L 736.5 310.5 L 736.5 383.5 L 710.5 383.5 Z M 637.5 310.5 L 663.5 310.5 L 663.5 383.5 L 637.5 383.5 Z M 818.5 310.5 L 844.5 310.5 L 844.5 456.5 L 818.5 456.5 Z M 993.5 312.5 L 1020.5 312.5 L 1020.5 458.5 L 993.5 458.5 Z M 500.5 310.5 L 526.5 310.5 L 526.5 484.5 L 500.5 484.5 Z M 427.5 310.5 L 453.5 310.5 L 453.5 484.5 L 427.5 484.5 Z M 1366.5 310.5 L 1392.5 310.5 L 1392.5 505.5 L 1366.5 505.5 Z M 1447.5 310.5 L 1473.5 310.5 L 1473.5 505.5 L 1447.5 505.5 Z M 1609.5 310.5 L 1635.5 310.5 L 1635.5 505.5 L 1609.5 505.5 Z M 1174.5 310.5 L 1200.5 310.5 L 1200.5 505.5 L 1174.5 505.5 Z M 1089.5 310.5 L 1115.5 310.5 L 1115.5 505.5 L 1089.5 505.5 Z M 298.5 310.5 L 325.5 310.5 L 325.5 505.5 L 298.5 505.5 Z M 1531.5 310.5 L 1557.5 310.5 L 1557.5 505.5 L 1531.5 505.5 Z M 1531.5 310.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface351">
+<g id="surface378">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,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 1713.84375 541.464844 L 1713.84375 554.339844 L 1709.148438 554.339844 L 1709.148438 517.53125 L 1713.84375 517.53125 L 1713.84375 536.160156 L 1732.171875 517.53125 L 1738.230469 517.53125 L 1723.234375 532.527344 L 1738.378906 554.339844 L 1732.828125 554.339844 L 1719.851562 535.457031 Z M 1713.84375 541.464844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1654 558 L 1683 558 M 1654 529 L 1683 529 M 1654 529 L 1654 558 M 1683 529 L 1683 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1654 558 L 1683 558 M 1654 529 L 1683 529 M 1683 558 L 1683 529 M 1654 558 L 1654 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.svg b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.svg
index 7805aa1..2fb214f 100644
--- a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.svg
+++ b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 474.5 536.5 L 1439.5 536.5 L 1439.5 554.5 L 474.5 554.5 Z M 1081.5 554.5 L 1439.5 554.5 L 1439.5 559.5 L 1081.5 559.5 Z M 1081.5 554.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 980.5 649.5 L 1007.5 649.5 L 1007.5 723.5 L 980.5 723.5 Z M 913.5 649.5 L 939.5 649.5 L 939.5 723.5 L 913.5 723.5 Z M 1518.5 632.5 L 1544.5 632.5 L 1544.5 728.5 L 1518.5 728.5 Z M 281.5 632.5 L 307.5 632.5 L 307.5 728.5 L 281.5 728.5 Z M 1608.5 632.5 L 1634.5 632.5 L 1634.5 761.5 L 1608.5 761.5 Z M 1167.5 632.5 L 1193.5 632.5 L 1193.5 761.5 L 1167.5 761.5 Z M 1234.5 632.5 L 1261.5 632.5 L 1261.5 761.5 L 1234.5 761.5 Z M 1328.5 632.5 L 1354.5 632.5 L 1354.5 761.5 L 1328.5 761.5 Z M 778.5 649.5 L 804.5 649.5 L 804.5 761.5 L 778.5 761.5 Z M 710.5 649.5 L 736.5 649.5 L 736.5 761.5 L 710.5 761.5 Z M 581.5 632.5 L 607.5 632.5 L 607.5 761.5 L 581.5 761.5 Z M 382.5 632.5 L 408.5 632.5 L 408.5 761.5 L 382.5 761.5 Z M 382.5 632.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 998.5 310.5 L 1024.5 310.5 L 1024.5 383.5 L 998.5 383.5 Z M 879.5 310.5 L 905.5 310.5 L 905.5 383.5 L 879.5 383.5 Z M 414.5 310.5 L 440.5 310.5 L 440.5 456.5 L 414.5 456.5 Z M 282.5 310.5 L 308.5 310.5 L 308.5 456.5 L 282.5 456.5 Z M 605.5 338.5 L 631.5 338.5 L 631.5 484.5 L 605.5 484.5 Z M 712.5 310.5 L 739.5 310.5 L 739.5 484.5 L 712.5 484.5 Z M 786.5 310.5 L 812.5 310.5 L 812.5 484.5 L 786.5 484.5 Z M 1515.5 345.5 L 1542.5 345.5 L 1542.5 491.5 L 1515.5 491.5 Z M 1609.5 310.5 L 1635.5 310.5 L 1635.5 505.5 L 1609.5 505.5 Z M 1159.5 333.5 L 1185.5 333.5 L 1185.5 528.5 L 1159.5 528.5 Z M 1331.5 333.5 L 1357.5 333.5 L 1357.5 528.5 L 1331.5 528.5 Z M 1239.5 333.5 L 1265.5 333.5 L 1265.5 528.5 L 1239.5 528.5 Z M 1239.5 333.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface343">
+<g id="surface371">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -186,6 +186,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 319.992188 554.5 L 319.992188 517.691406 L 334.179688 517.691406 L 336.402344 517.84375 L 338.472656 518.246094 L 340.390625 518.953125 L 342.160156 519.863281 L 343.722656 521.125 L 345.1875 522.589844 L 346.402344 524.355469 L 347.410156 526.277344 L 348.167969 528.445312 L 348.722656 530.769531 L 349.027344 533.34375 L 349.175781 536.070312 L 349.027344 538.949219 L 348.671875 541.625 L 348.066406 544.046875 L 347.257812 546.269531 L 346.199219 548.238281 L 344.886719 549.957031 L 343.472656 551.371094 L 341.90625 552.480469 L 340.191406 553.390625 L 338.320312 553.996094 L 336.300781 554.398438 L 334.179688 554.5 Z M 324.6875 550.359375 L 333.375 550.359375 L 335.695312 550.207031 L 337.765625 549.652344 L 339.585938 548.695312 L 341.097656 547.429688 L 342.3125 545.714844 L 343.320312 543.644531 L 343.625 542.585938 L 343.925781 541.472656 L 344.179688 540.261719 L 344.332031 538.949219 L 344.429688 537.585938 L 344.480469 536.121094 L 344.28125 532.839844 L 343.773438 529.960938 L 342.867188 527.488281 L 341.652344 525.519531 L 340.089844 523.902344 L 338.171875 522.742188 L 337.464844 522.488281 L 336.707031 522.234375 L 335.898438 522.085938 L 335.089844 521.933594 L 334.230469 521.882812 L 333.375 521.832031 L 324.6875 521.832031 Z M 324.6875 550.359375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 318 558 L 347 558 M 318 529 L 347 529 M 318 529 L 318 558 M 347 529 L 347 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 318 558 L 347 558 M 318 529 L 347 529 M 347 558 L 347 529 M 318 558 L 318 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.svg b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.svg
index 699d5c6..7ee212e 100644
--- a/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.svg
+++ b/cells/dlrbn/sky130_fd_sc_hs__dlrbn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 536.5 L 175.5 536.5 Z M 446.5 536.5 L 585.5 536.5 L 585.5 553.5 L 446.5 553.5 Z M 446.5 536.5 "/>
 </clipPath>
-<image id="image338" 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="#image338"/>
+  <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 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 275.5 627.5 L 300.5 627.5 L 300.5 718.5 L 275.5 718.5 Z M 834.5 680.5 L 858.5 680.5 L 858.5 749.5 L 834.5 749.5 Z M 898.5 680.5 L 923.5 680.5 L 923.5 749.5 L 898.5 749.5 Z M 1377.5 643.5 L 1402.5 643.5 L 1402.5 749.5 L 1377.5 749.5 Z M 734.5 643.5 L 759.5 643.5 L 759.5 749.5 L 734.5 749.5 Z M 670.5 643.5 L 695.5 643.5 L 695.5 749.5 L 670.5 749.5 Z M 1126.5 627.5 L 1151.5 627.5 L 1151.5 749.5 L 1126.5 749.5 Z M 1061.5 627.5 L 1086.5 627.5 L 1086.5 749.5 L 1061.5 749.5 Z M 1294.5 627.5 L 1319.5 627.5 L 1319.5 749.5 L 1294.5 749.5 Z M 1618.5 627.5 L 1643.5 627.5 L 1643.5 749.5 L 1618.5 749.5 Z M 1540.5 627.5 L 1565.5 627.5 L 1565.5 749.5 L 1540.5 749.5 Z M 1223.5 627.5 L 1248.5 627.5 L 1248.5 749.5 L 1223.5 749.5 Z M 553.5 627.5 L 578.5 627.5 L 578.5 749.5 L 553.5 749.5 Z M 371.5 627.5 L 396.5 627.5 L 396.5 749.5 L 371.5 749.5 Z M 371.5 627.5 "/>
 </clipPath>
-<image id="image339" 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="#image339"/>
+  <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 828.5 321.5 L 853.5 321.5 L 853.5 391.5 L 828.5 391.5 Z M 931.5 321.5 L 956.5 321.5 L 956.5 391.5 L 931.5 391.5 Z M 389.5 321.5 L 414.5 321.5 L 414.5 460.5 L 389.5 460.5 Z M 277.5 321.5 L 302.5 321.5 L 302.5 460.5 L 277.5 460.5 Z M 673.5 321.5 L 697.5 321.5 L 697.5 487.5 L 673.5 487.5 Z M 737.5 321.5 L 762.5 321.5 L 762.5 487.5 L 737.5 487.5 Z M 570.5 348.5 L 595.5 348.5 L 595.5 487.5 L 570.5 487.5 Z M 1059.5 321.5 L 1084.5 321.5 L 1084.5 506.5 L 1059.5 506.5 Z M 1542.5 321.5 L 1567.5 321.5 L 1567.5 506.5 L 1542.5 506.5 Z M 1616.5 321.5 L 1641.5 321.5 L 1641.5 506.5 L 1616.5 506.5 Z M 1292.5 321.5 L 1317.5 321.5 L 1317.5 506.5 L 1292.5 506.5 Z M 1375.5 341.5 L 1400.5 341.5 L 1400.5 506.5 L 1375.5 506.5 Z M 1135.5 321.5 L 1160.5 321.5 L 1160.5 506.5 L 1135.5 506.5 Z M 1217.5 321.5 L 1242.5 321.5 L 1242.5 506.5 L 1217.5 506.5 Z M 1217.5 321.5 "/>
 </clipPath>
-<image id="image340" 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="#image340"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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="surface335">
+<g id="surface364">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,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 1643.597656 334.074219 L 1643.597656 369.859375 L 1638.441406 369.859375 L 1619.9375 340.847656 L 1619.9375 369.859375 L 1615.617188 369.859375 L 1615.617188 334.074219 L 1620.574219 334.074219 L 1639.277344 363.332031 L 1639.277344 334.074219 Z M 1643.597656 334.074219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1579 741 L 1607 741 M 1579 713 L 1607 713 M 1579 713 L 1579 741 M 1607 713 L 1607 741 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1579 741 L 1607 741 M 1579 713 L 1607 713 M 1607 741 L 1607 713 M 1579 741 L 1579 713 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.svg b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.svg
index 657e83a..17e9be0 100644
--- a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.svg
+++ b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image353"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.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="#image353"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 286.5 610.5 L 314.5 610.5 L 314.5 711.5 L 286.5 711.5 Z M 966.5 651.5 L 993.5 651.5 L 993.5 728.5 L 966.5 728.5 Z M 894.5 651.5 L 921.5 651.5 L 921.5 728.5 L 894.5 728.5 Z M 389.5 610.5 L 417.5 610.5 L 417.5 746.5 L 389.5 746.5 Z M 598.5 616.5 L 625.5 616.5 L 625.5 752.5 L 598.5 752.5 Z M 773.5 651.5 L 800.5 651.5 L 800.5 768.5 L 773.5 768.5 Z M 706.5 651.5 L 734.5 651.5 L 734.5 768.5 L 706.5 768.5 Z M 1313.5 638.5 L 1341.5 638.5 L 1341.5 774.5 L 1313.5 774.5 Z M 1589.5 638.5 L 1616.5 638.5 L 1616.5 774.5 L 1589.5 774.5 Z M 1219.5 638.5 L 1247.5 638.5 L 1247.5 774.5 L 1219.5 774.5 Z M 1495.5 673.5 L 1523.5 673.5 L 1523.5 774.5 L 1495.5 774.5 Z M 1148.5 638.5 L 1175.5 638.5 L 1175.5 774.5 L 1148.5 774.5 Z M 1148.5 638.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 874.5 298.5 L 901.5 298.5 L 901.5 375.5 L 874.5 375.5 Z M 994.5 298.5 L 1022.5 298.5 L 1022.5 375.5 L 994.5 375.5 Z M 1510.5 298.5 L 1537.5 298.5 L 1537.5 452.5 L 1510.5 452.5 Z M 402.5 322.5 L 430.5 322.5 L 430.5 476.5 L 402.5 476.5 Z M 288.5 322.5 L 316.5 322.5 L 316.5 476.5 L 288.5 476.5 Z M 772.5 298.5 L 799.5 298.5 L 799.5 481.5 L 772.5 481.5 Z M 700.5 298.5 L 728.5 298.5 L 728.5 481.5 L 700.5 481.5 Z M 601.5 327.5 L 628.5 327.5 L 628.5 481.5 L 601.5 481.5 Z M 1232.5 298.5 L 1260.5 298.5 L 1260.5 504.5 L 1232.5 504.5 Z M 1324.5 298.5 L 1352.5 298.5 L 1352.5 504.5 L 1324.5 504.5 Z M 1603.5 298.5 L 1630.5 298.5 L 1630.5 504.5 L 1603.5 504.5 Z M 1145.5 298.5 L 1172.5 298.5 L 1172.5 504.5 L 1145.5 504.5 Z M 1145.5 298.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface322">
+<g id="surface350">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,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 1352.027344 611.496094 L 1351.917969 613.246094 L 1351.644531 614.832031 L 1351.152344 616.308594 L 1350.496094 617.621094 L 1349.621094 618.878906 L 1348.578125 619.972656 L 1347.429688 620.902344 L 1346.226562 621.613281 L 1344.859375 622.160156 L 1343.4375 622.597656 L 1341.90625 622.820312 L 1340.265625 622.875 L 1322.269531 622.875 L 1322.269531 582.996094 L 1338.460938 582.996094 L 1340.8125 583.160156 L 1342.890625 583.542969 L 1344.75 584.203125 L 1346.335938 585.132812 L 1347.703125 586.335938 L 1348.796875 587.8125 L 1349.234375 588.632812 L 1349.621094 589.507812 L 1349.894531 590.328125 L 1350.113281 591.257812 L 1350.222656 592.1875 L 1350.277344 593.117188 L 1350.113281 595.085938 L 1349.621094 596.78125 L 1348.851562 598.367188 L 1347.757812 599.679688 L 1346.390625 600.882812 L 1344.75 601.8125 L 1346.335938 602.523438 L 1347.703125 603.292969 L 1348.90625 604.167969 L 1349.894531 605.152344 L 1350.660156 606.191406 L 1351.261719 607.285156 L 1351.480469 607.941406 L 1351.808594 609.253906 L 1351.917969 610.019531 L 1351.972656 610.730469 Z M 1345.1875 593.828125 L 1345.023438 592.1875 L 1344.53125 590.820312 L 1343.765625 589.617188 L 1342.671875 588.742188 L 1341.304688 588.085938 L 1339.609375 587.648438 L 1339.226562 587.648438 L 1338.460938 587.539062 L 1337.585938 587.539062 L 1337.203125 587.484375 L 1327.355469 587.484375 L 1327.355469 600.171875 L 1337.203125 600.171875 L 1339.226562 600.0625 L 1340.976562 599.734375 L 1342.453125 599.132812 L 1343.546875 598.3125 L 1344.421875 597.21875 L 1344.96875 595.90625 L 1345.023438 595.632812 L 1345.132812 594.976562 L 1345.132812 594.210938 Z M 1339.773438 618.386719 L 1341.304688 618.332031 L 1342.671875 618.003906 L 1343.875 617.457031 L 1344.859375 616.746094 L 1345.679688 615.816406 L 1346.335938 614.667969 L 1346.5 614.230469 L 1346.609375 613.738281 L 1346.773438 613.191406 L 1346.828125 612.699219 L 1346.882812 612.152344 L 1346.9375 611.550781 L 1346.828125 610.347656 L 1346.609375 609.199219 L 1346.226562 608.214844 L 1345.679688 607.285156 L 1344.96875 606.519531 L 1344.148438 605.808594 L 1343.546875 605.480469 L 1342.890625 605.207031 L 1342.179688 604.988281 L 1341.414062 604.824219 L 1340.59375 604.714844 L 1339.773438 604.660156 L 1327.355469 604.660156 L 1327.355469 618.386719 Z M 1339.773438 618.386719 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1208 491 L 1239 491 M 1208 460 L 1239 460 M 1208 460 L 1208 491 M 1239 460 L 1239 491 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1208 491 L 1239 491 M 1208 460 L 1239 460 M 1239 491 L 1239 460 M 1208 491 L 1208 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.svg b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.svg
index b13ad2d..2414460 100644
--- a/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.svg
+++ b/cells/dlrbp/sky130_fd_sc_hs__dlrbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 536.5 L 175.5 536.5 Z M 175.5 229.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 884.5 639.5 L 909.5 639.5 L 909.5 708.5 L 884.5 708.5 Z M 820.5 639.5 L 844.5 639.5 L 844.5 708.5 L 820.5 708.5 Z M 275.5 627.5 L 300.5 627.5 L 300.5 718.5 L 275.5 718.5 Z M 1453.5 627.5 L 1478.5 627.5 L 1478.5 733.5 L 1453.5 733.5 Z M 553.5 620.5 L 578.5 620.5 L 578.5 743.5 L 553.5 743.5 Z M 711.5 639.5 L 735.5 639.5 L 735.5 744.5 L 711.5 744.5 Z M 651.5 639.5 L 676.5 639.5 L 676.5 744.5 L 651.5 744.5 Z M 1047.5 627.5 L 1072.5 627.5 L 1072.5 749.5 L 1047.5 749.5 Z M 1272.5 627.5 L 1297.5 627.5 L 1297.5 749.5 L 1272.5 749.5 Z M 1547.5 627.5 L 1572.5 627.5 L 1572.5 749.5 L 1547.5 749.5 Z M 1618.5 627.5 L 1643.5 627.5 L 1643.5 749.5 L 1618.5 749.5 Z M 371.5 627.5 L 396.5 627.5 L 396.5 749.5 L 371.5 749.5 Z M 1112.5 627.5 L 1137.5 627.5 L 1137.5 749.5 L 1112.5 749.5 Z M 1201.5 627.5 L 1226.5 627.5 L 1226.5 749.5 L 1201.5 749.5 Z M 1201.5 627.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 806.5 321.5 L 831.5 321.5 L 831.5 391.5 L 806.5 391.5 Z M 914.5 321.5 L 939.5 321.5 L 939.5 391.5 L 914.5 391.5 Z M 379.5 348.5 L 404.5 348.5 L 404.5 487.5 L 379.5 487.5 Z M 718.5 321.5 L 743.5 321.5 L 743.5 487.5 L 718.5 487.5 Z M 555.5 348.5 L 579.5 348.5 L 579.5 487.5 L 555.5 487.5 Z M 277.5 348.5 L 302.5 348.5 L 302.5 487.5 L 277.5 487.5 Z M 649.5 321.5 L 673.5 321.5 L 673.5 487.5 L 649.5 487.5 Z M 1040.5 321.5 L 1065.5 321.5 L 1065.5 506.5 L 1040.5 506.5 Z M 1210.5 321.5 L 1235.5 321.5 L 1235.5 506.5 L 1210.5 506.5 Z M 1451.5 341.5 L 1476.5 341.5 L 1476.5 506.5 L 1451.5 506.5 Z M 1123.5 321.5 L 1147.5 321.5 L 1147.5 506.5 L 1123.5 506.5 Z M 1542.5 321.5 L 1567.5 321.5 L 1567.5 506.5 L 1542.5 506.5 Z M 1284.5 321.5 L 1309.5 321.5 L 1309.5 506.5 L 1284.5 506.5 Z M 1616.5 321.5 L 1641.5 321.5 L 1641.5 506.5 L 1616.5 506.5 Z M 1616.5 321.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface340">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,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 1374.480469 614.652344 L 1372.175781 617.5 L 1367.019531 613.230469 L 1365.546875 614.015625 L 1364.074219 614.605469 L 1362.554688 615.09375 L 1360.933594 615.4375 L 1359.3125 615.632812 L 1357.644531 615.734375 L 1355.386719 615.585938 L 1353.277344 615.242188 L 1351.3125 614.652344 L 1349.445312 613.867188 L 1347.679688 612.835938 L 1346.109375 611.511719 L 1344.683594 610.085938 L 1343.457031 608.46875 L 1342.476562 606.699219 L 1341.640625 604.785156 L 1341.003906 602.722656 L 1340.609375 600.464844 L 1340.511719 599.925781 L 1340.464844 599.335938 L 1340.414062 598.796875 L 1340.367188 598.207031 L 1340.367188 596.980469 L 1340.464844 594.527344 L 1340.808594 592.171875 L 1341.347656 590.011719 L 1342.132812 587.949219 L 1343.113281 586.035156 L 1344.390625 584.265625 L 1345.667969 582.84375 L 1347.140625 581.566406 L 1348.757812 580.488281 L 1350.476562 579.652344 L 1352.34375 578.964844 L 1354.40625 578.476562 L 1354.894531 578.425781 L 1355.433594 578.375 L 1355.976562 578.328125 L 1356.515625 578.277344 L 1357.054688 578.277344 L 1357.644531 578.230469 L 1359.851562 578.375 L 1361.964844 578.71875 L 1363.929688 579.308594 L 1365.792969 580.09375 L 1367.558594 581.125 L 1369.179688 582.402344 L 1370.554688 583.875 L 1371.78125 585.445312 L 1372.765625 587.164062 L 1373.597656 589.078125 L 1374.234375 591.140625 L 1374.679688 593.300781 L 1374.726562 593.9375 L 1374.777344 594.527344 L 1374.824219 595.117188 L 1374.875 595.703125 L 1374.875 596.292969 L 1374.921875 596.882812 L 1374.777344 599.632812 L 1374.335938 602.234375 L 1373.648438 604.640625 L 1372.664062 606.898438 L 1371.390625 608.957031 L 1369.867188 610.875 Z M 1362.113281 604.539062 L 1366.480469 608.125 L 1367.660156 606.652344 L 1368.640625 604.984375 L 1369.375 603.167969 L 1369.917969 601.25 L 1370.210938 599.191406 L 1370.359375 596.933594 L 1370.261719 594.871094 L 1369.964844 592.90625 L 1369.476562 591.089844 L 1368.835938 589.421875 L 1368.003906 587.851562 L 1366.972656 586.425781 L 1365.792969 585.25 L 1364.566406 584.265625 L 1363.191406 583.480469 L 1361.71875 582.894531 L 1360.097656 582.5 L 1358.429688 582.253906 L 1357.644531 582.253906 L 1355.878906 582.402344 L 1354.207031 582.695312 L 1352.636719 583.1875 L 1351.214844 583.921875 L 1349.886719 584.855469 L 1348.710938 585.984375 L 1347.582031 587.3125 L 1346.699219 588.785156 L 1345.960938 590.402344 L 1345.421875 592.171875 L 1345.078125 594.085938 L 1344.929688 596.148438 L 1344.929688 596.980469 L 1344.980469 599.140625 L 1345.273438 601.105469 L 1345.765625 602.921875 L 1346.402344 604.640625 L 1347.285156 606.210938 L 1348.367188 607.585938 L 1349.496094 608.8125 L 1350.773438 609.792969 L 1352.148438 610.578125 L 1353.621094 611.117188 L 1355.238281 611.511719 L 1356.957031 611.660156 L 1357.054688 611.707031 L 1358.480469 611.707031 L 1359.410156 611.609375 L 1360.34375 611.414062 L 1361.226562 611.214844 L 1362.113281 610.921875 L 1363.042969 610.53125 L 1363.09375 610.53125 L 1363.191406 610.480469 L 1363.242188 610.429688 L 1363.339844 610.429688 L 1363.386719 610.382812 L 1363.484375 610.332031 L 1359.851562 607.289062 Z M 1362.113281 604.539062 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1341 497 L 1369 497 M 1341 469 L 1369 469 M 1341 469 L 1341 497 M 1369 469 L 1369 497 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1341 497 L 1369 497 M 1341 469 L 1369 469 M 1369 497 L 1369 469 M 1341 497 L 1341 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 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.svg b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.svg
index 2902e19..55780df 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.svg
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.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="#image343"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 301.5 626.5 L 332.5 626.5 L 332.5 740.5 L 301.5 740.5 Z M 423.5 626.5 L 454.5 626.5 L 454.5 779.5 L 423.5 779.5 Z M 659.5 643.5 L 690.5 643.5 L 690.5 796.5 L 659.5 796.5 Z M 888.5 672.5 L 919.5 672.5 L 919.5 804.5 L 888.5 804.5 Z M 969.5 672.5 L 1000.5 672.5 L 1000.5 804.5 L 969.5 804.5 Z M 1362.5 651.5 L 1393.5 651.5 L 1393.5 804.5 L 1362.5 804.5 Z M 1565.5 651.5 L 1596.5 651.5 L 1596.5 804.5 L 1565.5 804.5 Z M 1443.5 651.5 L 1474.5 651.5 L 1474.5 804.5 L 1443.5 804.5 Z M 1067.5 717.5 L 1098.5 717.5 L 1098.5 804.5 L 1067.5 804.5 Z M 1155.5 717.5 L 1186.5 717.5 L 1186.5 804.5 L 1155.5 804.5 Z M 1155.5 717.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1004.5 268.5 L 1035.5 268.5 L 1035.5 355.5 L 1004.5 355.5 Z M 1146.5 268.5 L 1177.5 268.5 L 1177.5 355.5 L 1146.5 355.5 Z M 304.5 299.5 L 335.5 299.5 L 335.5 473.5 L 304.5 473.5 Z M 432.5 299.5 L 463.5 299.5 L 463.5 473.5 L 432.5 473.5 Z M 773.5 268.5 L 804.5 268.5 L 804.5 475.5 L 773.5 475.5 Z M 644.5 301.5 L 676.5 301.5 L 676.5 475.5 L 644.5 475.5 Z M 860.5 268.5 L 891.5 268.5 L 891.5 475.5 L 860.5 475.5 Z M 1464.5 293.5 L 1495.5 293.5 L 1495.5 500.5 L 1464.5 500.5 Z M 1585.5 268.5 L 1616.5 268.5 L 1616.5 500.5 L 1585.5 500.5 Z M 1335.5 293.5 L 1366.5 293.5 L 1366.5 500.5 L 1335.5 500.5 Z M 1335.5 293.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface340">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,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 1678.734375 328.921875 L 1675.832031 332.5 L 1669.355469 327.132812 L 1667.503906 328.117188 L 1665.652344 328.859375 L 1663.738281 329.476562 L 1661.703125 329.90625 L 1659.664062 330.15625 L 1657.566406 330.277344 L 1654.730469 330.09375 L 1652.074219 329.660156 L 1649.605469 328.921875 L 1647.261719 327.933594 L 1645.039062 326.636719 L 1643.066406 324.972656 L 1641.277344 323.179688 L 1639.734375 321.144531 L 1638.5 318.921875 L 1637.449219 316.515625 L 1636.648438 313.925781 L 1636.152344 311.085938 L 1636.03125 310.40625 L 1635.96875 309.667969 L 1635.90625 308.988281 L 1635.84375 308.246094 L 1635.84375 306.703125 L 1635.96875 303.621094 L 1636.402344 300.65625 L 1637.078125 297.941406 L 1638.066406 295.351562 L 1639.300781 292.941406 L 1640.90625 290.722656 L 1642.511719 288.933594 L 1644.359375 287.328125 L 1646.398438 285.96875 L 1648.558594 284.921875 L 1650.902344 284.058594 L 1653.496094 283.441406 L 1654.113281 283.378906 L 1654.789062 283.316406 L 1656.148438 283.191406 L 1656.828125 283.191406 L 1657.566406 283.132812 L 1660.34375 283.316406 L 1662.996094 283.75 L 1665.464844 284.488281 L 1667.8125 285.476562 L 1670.03125 286.773438 L 1672.070312 288.375 L 1673.796875 290.226562 L 1675.339844 292.203125 L 1676.574219 294.363281 L 1677.625 296.769531 L 1678.425781 299.359375 L 1678.980469 302.078125 L 1679.042969 302.878906 L 1679.105469 303.621094 L 1679.167969 304.359375 L 1679.226562 305.101562 L 1679.226562 305.839844 L 1679.289062 306.582031 L 1679.105469 310.039062 L 1678.550781 313.308594 L 1677.683594 316.332031 L 1676.449219 319.171875 L 1674.847656 321.761719 L 1672.933594 324.167969 Z M 1663.183594 316.207031 L 1668.675781 320.714844 L 1670.15625 318.863281 L 1671.390625 316.765625 L 1672.316406 314.480469 L 1672.996094 312.074219 L 1673.367188 309.480469 L 1673.550781 306.644531 L 1673.425781 304.050781 L 1673.058594 301.582031 L 1672.441406 299.300781 L 1671.636719 297.203125 L 1670.589844 295.226562 L 1669.292969 293.4375 L 1667.8125 291.957031 L 1666.269531 290.722656 L 1664.539062 289.734375 L 1662.6875 288.992188 L 1660.652344 288.5 L 1658.554688 288.191406 L 1657.566406 288.191406 L 1655.347656 288.375 L 1653.246094 288.746094 L 1651.273438 289.363281 L 1649.484375 290.289062 L 1647.816406 291.460938 L 1646.335938 292.882812 L 1644.917969 294.546875 L 1643.804688 296.398438 L 1642.878906 298.433594 L 1642.203125 300.65625 L 1641.769531 303.0625 L 1641.585938 305.65625 L 1641.585938 306.703125 L 1641.644531 309.421875 L 1642.015625 311.886719 L 1642.632812 314.171875 L 1643.433594 316.332031 L 1644.546875 318.304688 L 1645.902344 320.035156 L 1647.324219 321.578125 L 1648.929688 322.8125 L 1650.65625 323.796875 L 1652.507812 324.476562 L 1654.542969 324.972656 L 1656.703125 325.15625 L 1656.828125 325.21875 L 1658.617188 325.21875 L 1659.789062 325.09375 L 1660.960938 324.847656 L 1662.070312 324.601562 L 1663.183594 324.230469 L 1664.355469 323.738281 L 1664.417969 323.738281 L 1664.539062 323.675781 L 1664.601562 323.613281 L 1664.726562 323.613281 L 1664.789062 323.550781 L 1664.910156 323.488281 L 1660.34375 319.664062 Z M 1663.183594 316.207031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1637 790 L 1673 790 M 1637 755 L 1673 755 M 1637 755 L 1637 790 M 1673 755 L 1673 790 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1637 790 L 1673 790 M 1637 755 L 1673 755 M 1673 790 L 1673 755 M 1637 790 L 1637 755 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.svg b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.svg
index c563d18..4a79d33 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.svg
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 286.5 616.5 L 314.5 616.5 L 314.5 717.5 L 286.5 717.5 Z M 395.5 616.5 L 422.5 616.5 L 422.5 752.5 L 395.5 752.5 Z M 609.5 630.5 L 637.5 630.5 L 637.5 766.5 L 609.5 766.5 Z M 822.5 656.5 L 850.5 656.5 L 850.5 774.5 L 822.5 774.5 Z M 894.5 656.5 L 921.5 656.5 L 921.5 774.5 L 894.5 774.5 Z M 1241.5 638.5 L 1269.5 638.5 L 1269.5 774.5 L 1241.5 774.5 Z M 1313.5 638.5 L 1341.5 638.5 L 1341.5 774.5 L 1313.5 774.5 Z M 1590.5 638.5 L 1617.5 638.5 L 1617.5 774.5 L 1590.5 774.5 Z M 1511.5 638.5 L 1538.5 638.5 L 1538.5 774.5 L 1511.5 774.5 Z M 981.5 697.5 L 1009.5 697.5 L 1009.5 774.5 L 981.5 774.5 Z M 1059.5 697.5 L 1087.5 697.5 L 1087.5 774.5 L 1059.5 774.5 Z M 1059.5 697.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1051.5 301.5 L 1079.5 301.5 L 1079.5 379.5 L 1051.5 379.5 Z M 897.5 301.5 L 924.5 301.5 L 924.5 379.5 L 897.5 379.5 Z M 319.5 325.5 L 347.5 325.5 L 347.5 480.5 L 319.5 480.5 Z M 421.5 325.5 L 448.5 325.5 L 448.5 480.5 L 421.5 480.5 Z M 797.5 298.5 L 825.5 298.5 L 825.5 481.5 L 797.5 481.5 Z M 606.5 327.5 L 634.5 327.5 L 634.5 481.5 L 606.5 481.5 Z M 720.5 298.5 L 748.5 298.5 L 748.5 481.5 L 720.5 481.5 Z M 1318.5 298.5 L 1345.5 298.5 L 1345.5 504.5 L 1318.5 504.5 Z M 1509.5 298.5 L 1536.5 298.5 L 1536.5 504.5 L 1509.5 504.5 Z M 1233.5 298.5 L 1261.5 298.5 L 1261.5 504.5 L 1233.5 504.5 Z M 1592.5 298.5 L 1619.5 298.5 L 1619.5 504.5 L 1592.5 504.5 Z M 1592.5 298.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface314">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,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 1509.59375 351.328125 L 1507.023438 354.5 L 1501.28125 349.742188 L 1499.640625 350.617188 L 1497.996094 351.273438 L 1496.300781 351.820312 L 1494.496094 352.203125 L 1492.691406 352.421875 L 1490.832031 352.53125 L 1488.316406 352.367188 L 1485.964844 351.984375 L 1483.777344 351.328125 L 1481.699219 350.453125 L 1479.730469 349.304688 L 1477.976562 347.828125 L 1476.390625 346.242188 L 1475.023438 344.433594 L 1473.929688 342.464844 L 1473 340.332031 L 1472.289062 338.035156 L 1471.851562 335.519531 L 1471.742188 334.917969 L 1471.6875 334.261719 L 1471.632812 333.660156 L 1471.578125 333.003906 L 1471.578125 331.636719 L 1471.6875 328.902344 L 1472.070312 326.277344 L 1472.671875 323.867188 L 1473.546875 321.570312 L 1474.640625 319.4375 L 1476.0625 317.46875 L 1477.484375 315.882812 L 1479.125 314.460938 L 1480.933594 313.257812 L 1482.847656 312.328125 L 1484.925781 311.5625 L 1487.222656 311.015625 L 1487.769531 310.960938 L 1489.574219 310.796875 L 1490.175781 310.796875 L 1490.832031 310.742188 L 1493.292969 310.90625 L 1495.644531 311.289062 L 1497.832031 311.945312 L 1499.914062 312.820312 L 1501.882812 313.96875 L 1503.6875 315.390625 L 1505.21875 317.03125 L 1506.585938 318.78125 L 1507.679688 320.695312 L 1508.609375 322.828125 L 1509.320312 325.125 L 1509.8125 327.535156 L 1509.867188 328.246094 L 1510.03125 330.214844 L 1510.03125 330.871094 L 1510.085938 331.527344 L 1509.921875 334.589844 L 1509.429688 337.488281 L 1508.664062 340.167969 L 1507.570312 342.683594 L 1506.148438 344.984375 L 1504.453125 347.117188 Z M 1495.808594 340.058594 L 1500.679688 344.050781 L 1501.992188 342.410156 L 1503.085938 340.550781 L 1503.90625 338.527344 L 1504.507812 336.394531 L 1504.835938 334.097656 L 1505 331.582031 L 1504.890625 329.285156 L 1504.5625 327.097656 L 1504.015625 325.070312 L 1503.304688 323.210938 L 1502.375 321.460938 L 1501.226562 319.875 L 1499.914062 318.5625 L 1498.542969 317.46875 L 1497.011719 316.59375 L 1495.371094 315.9375 L 1493.566406 315.5 L 1491.707031 315.226562 L 1490.832031 315.226562 L 1488.863281 315.390625 L 1487.003906 315.71875 L 1485.253906 316.265625 L 1483.667969 317.085938 L 1482.191406 318.125 L 1480.878906 319.382812 L 1479.621094 320.859375 L 1478.632812 322.5 L 1477.8125 324.304688 L 1477.210938 326.277344 L 1476.828125 328.410156 L 1476.664062 330.707031 L 1476.664062 331.636719 L 1476.71875 334.042969 L 1477.046875 336.230469 L 1477.59375 338.253906 L 1478.304688 340.167969 L 1479.292969 341.917969 L 1480.496094 343.449219 L 1481.753906 344.820312 L 1483.175781 345.914062 L 1484.707031 346.789062 L 1486.347656 347.390625 L 1488.152344 347.828125 L 1490.066406 347.992188 L 1490.175781 348.046875 L 1491.761719 348.046875 L 1492.800781 347.9375 L 1493.839844 347.71875 L 1494.824219 347.5 L 1495.808594 347.171875 L 1496.847656 346.734375 L 1496.902344 346.734375 L 1497.011719 346.679688 L 1497.066406 346.625 L 1497.175781 346.625 L 1497.230469 346.570312 L 1497.339844 346.515625 L 1493.292969 343.121094 Z M 1495.808594 340.058594 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1473 763 L 1504 763 M 1473 732 L 1504 732 M 1473 732 L 1473 763 M 1504 732 L 1504 763 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1473 763 L 1504 763 M 1473 732 L 1504 732 M 1504 763 L 1504 732 M 1473 763 L 1473 732 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.svg b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.svg
index cec837c..21dfcaa 100644
--- a/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.svg
+++ b/cells/dlrtn/sky130_fd_sc_hs__dlrtn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 243.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <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 204.5 758.5 L 1714.5 758.5 L 1714.5 797.5 L 204.5 797.5 Z M 204.5 758.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#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 270.5 604.5 L 293.5 604.5 L 293.5 690.5 L 270.5 690.5 Z M 363.5 604.5 L 386.5 604.5 L 386.5 720.5 L 363.5 720.5 Z M 535.5 604.5 L 558.5 604.5 L 558.5 720.5 L 535.5 720.5 Z M 765.5 638.5 L 789.5 638.5 L 789.5 739.5 L 765.5 739.5 Z M 1062.5 638.5 L 1086.5 638.5 L 1086.5 739.5 L 1062.5 739.5 Z M 1265.5 638.5 L 1289.5 638.5 L 1289.5 739.5 L 1265.5 739.5 Z M 1198.5 638.5 L 1221.5 638.5 L 1221.5 739.5 L 1198.5 739.5 Z M 1130.5 638.5 L 1154.5 638.5 L 1154.5 739.5 L 1130.5 739.5 Z M 704.5 638.5 L 727.5 638.5 L 727.5 739.5 L 704.5 739.5 Z M 1421.5 622.5 L 1445.5 622.5 L 1445.5 739.5 L 1421.5 739.5 Z M 1556.5 622.5 L 1580.5 622.5 L 1580.5 739.5 L 1556.5 739.5 Z M 1489.5 622.5 L 1512.5 622.5 L 1512.5 739.5 L 1489.5 739.5 Z M 1624.5 622.5 L 1647.5 622.5 L 1647.5 739.5 L 1624.5 739.5 Z M 840.5 673.5 L 863.5 673.5 L 863.5 739.5 L 840.5 739.5 Z M 907.5 673.5 L 930.5 673.5 L 930.5 739.5 L 907.5 739.5 Z M 907.5 673.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <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 768.5 335.5 L 791.5 335.5 L 791.5 401.5 L 768.5 401.5 Z M 904.5 335.5 L 928.5 335.5 L 928.5 401.5 L 904.5 401.5 Z M 1046.5 335.5 L 1070.5 335.5 L 1070.5 467.5 L 1046.5 467.5 Z M 1117.5 335.5 L 1140.5 335.5 L 1140.5 467.5 L 1117.5 467.5 Z M 1195.5 335.5 L 1219.5 335.5 L 1219.5 467.5 L 1195.5 467.5 Z M 1277.5 335.5 L 1301.5 335.5 L 1301.5 467.5 L 1277.5 467.5 Z M 363.5 355.5 L 386.5 355.5 L 386.5 487.5 L 363.5 487.5 Z M 276.5 355.5 L 300.5 355.5 L 300.5 487.5 L 276.5 487.5 Z M 683.5 331.5 L 706.5 331.5 L 706.5 489.5 L 683.5 489.5 Z M 621.5 331.5 L 645.5 331.5 L 645.5 489.5 L 621.5 489.5 Z M 524.5 357.5 L 547.5 357.5 L 547.5 489.5 L 524.5 489.5 Z M 1440.5 331.5 L 1463.5 331.5 L 1463.5 508.5 L 1440.5 508.5 Z M 1605.5 331.5 L 1629.5 331.5 L 1629.5 508.5 L 1605.5 508.5 Z M 1519.5 331.5 L 1542.5 331.5 L 1542.5 508.5 L 1519.5 508.5 Z M 1369.5 331.5 L 1393.5 331.5 L 1393.5 508.5 L 1369.5 508.5 Z M 1369.5 331.5 "/>
 </clipPath>
-<image id="image361" 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="#image361"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 228.5 260.5 L 255.5 260.5 L 255.5 287.5 L 228.5 287.5 Z M 1662.5 260.5 L 1689.5 260.5 L 1689.5 287.5 L 1662.5 287.5 Z M 1587.5 260.5 L 1614.5 260.5 L 1614.5 287.5 L 1587.5 287.5 Z M 1511.5 260.5 L 1538.5 260.5 L 1538.5 287.5 L 1511.5 287.5 Z M 1436.5 260.5 L 1463.5 260.5 L 1463.5 287.5 L 1436.5 287.5 Z M 1360.5 260.5 L 1387.5 260.5 L 1387.5 287.5 L 1360.5 287.5 Z M 1285.5 260.5 L 1312.5 260.5 L 1312.5 287.5 L 1285.5 287.5 Z M 1209.5 260.5 L 1236.5 260.5 L 1236.5 287.5 L 1209.5 287.5 Z M 1134.5 260.5 L 1161.5 260.5 L 1161.5 287.5 L 1134.5 287.5 Z M 1059.5 260.5 L 1085.5 260.5 L 1085.5 287.5 L 1059.5 287.5 Z M 983.5 260.5 L 1010.5 260.5 L 1010.5 287.5 L 983.5 287.5 Z M 908.5 260.5 L 934.5 260.5 L 934.5 287.5 L 908.5 287.5 Z M 832.5 260.5 L 859.5 260.5 L 859.5 287.5 L 832.5 287.5 Z M 757.5 260.5 L 783.5 260.5 L 783.5 287.5 L 757.5 287.5 Z M 681.5 260.5 L 708.5 260.5 L 708.5 287.5 L 681.5 287.5 Z M 606.5 260.5 L 632.5 260.5 L 632.5 287.5 L 606.5 287.5 Z M 530.5 260.5 L 557.5 260.5 L 557.5 287.5 L 530.5 287.5 Z M 455.5 260.5 L 481.5 260.5 L 481.5 287.5 L 455.5 287.5 Z M 379.5 260.5 L 406.5 260.5 L 406.5 287.5 L 379.5 287.5 Z M 304.5 260.5 L 330.5 260.5 L 330.5 287.5 L 304.5 287.5 Z M 228.5 784.5 L 255.5 784.5 L 255.5 810.5 L 228.5 810.5 Z M 1662.5 784.5 L 1689.5 784.5 L 1689.5 810.5 L 1662.5 810.5 Z M 1587.5 784.5 L 1614.5 784.5 L 1614.5 810.5 L 1587.5 810.5 Z M 1511.5 784.5 L 1538.5 784.5 L 1538.5 810.5 L 1511.5 810.5 Z M 1436.5 784.5 L 1463.5 784.5 L 1463.5 810.5 L 1436.5 810.5 Z M 1360.5 784.5 L 1387.5 784.5 L 1387.5 810.5 L 1360.5 810.5 Z M 1285.5 784.5 L 1312.5 784.5 L 1312.5 810.5 L 1285.5 810.5 Z M 1209.5 784.5 L 1236.5 784.5 L 1236.5 810.5 L 1209.5 810.5 Z M 1134.5 784.5 L 1161.5 784.5 L 1161.5 810.5 L 1134.5 810.5 Z M 1059.5 784.5 L 1085.5 784.5 L 1085.5 810.5 L 1059.5 810.5 Z M 983.5 784.5 L 1010.5 784.5 L 1010.5 810.5 L 983.5 810.5 Z M 908.5 784.5 L 934.5 784.5 L 934.5 810.5 L 908.5 810.5 Z M 832.5 784.5 L 859.5 784.5 L 859.5 810.5 L 832.5 810.5 Z M 757.5 784.5 L 783.5 784.5 L 783.5 810.5 L 757.5 810.5 Z M 681.5 784.5 L 708.5 784.5 L 708.5 810.5 L 681.5 810.5 Z M 606.5 784.5 L 632.5 784.5 L 632.5 810.5 L 606.5 810.5 Z M 530.5 784.5 L 557.5 784.5 L 557.5 810.5 L 530.5 810.5 Z M 455.5 784.5 L 481.5 784.5 L 481.5 810.5 L 455.5 810.5 Z M 379.5 784.5 L 406.5 784.5 L 406.5 810.5 L 379.5 810.5 Z M 304.5 784.5 L 330.5 784.5 L 330.5 810.5 L 304.5 810.5 Z M 304.5 784.5 "/>
 </clipPath>
-<image id="image362" 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="#image362"/>
+  <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="surface356">
+<g id="surface384">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -186,6 +186,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1693.425781 552.816406 L 1691.25 555.5 L 1686.390625 551.472656 L 1685.003906 552.214844 L 1683.613281 552.769531 L 1682.179688 553.230469 L 1680.652344 553.554688 L 1679.125 553.742188 L 1677.550781 553.832031 L 1675.421875 553.695312 L 1673.429688 553.371094 L 1671.578125 552.816406 L 1669.820312 552.074219 L 1668.15625 551.101562 L 1666.675781 549.851562 L 1665.332031 548.511719 L 1664.175781 546.984375 L 1663.25 545.316406 L 1662.460938 543.511719 L 1661.859375 541.570312 L 1661.488281 539.441406 L 1661.398438 538.929688 L 1661.351562 538.375 L 1661.304688 537.867188 L 1661.257812 537.3125 L 1661.257812 536.152344 L 1661.351562 533.839844 L 1661.675781 531.617188 L 1662.183594 529.582031 L 1662.925781 527.636719 L 1663.851562 525.832031 L 1665.054688 524.167969 L 1666.257812 522.824219 L 1667.644531 521.621094 L 1669.171875 520.601562 L 1670.792969 519.816406 L 1672.550781 519.167969 L 1674.496094 518.703125 L 1674.957031 518.660156 L 1675.46875 518.613281 L 1676.484375 518.519531 L 1676.996094 518.519531 L 1677.550781 518.472656 L 1679.632812 518.613281 L 1681.625 518.9375 L 1683.476562 519.492188 L 1685.234375 520.230469 L 1686.898438 521.203125 L 1688.425781 522.40625 L 1689.722656 523.796875 L 1690.878906 525.277344 L 1691.804688 526.898438 L 1692.59375 528.703125 L 1693.195312 530.644531 L 1693.609375 532.683594 L 1693.65625 533.285156 L 1693.796875 534.949219 L 1693.796875 535.503906 L 1693.84375 536.0625 L 1693.703125 538.652344 L 1693.285156 541.105469 L 1692.640625 543.375 L 1691.714844 545.503906 L 1690.511719 547.445312 L 1689.074219 549.25 Z M 1681.761719 543.28125 L 1685.882812 546.660156 L 1686.992188 545.269531 L 1687.917969 543.699219 L 1688.613281 541.984375 L 1689.121094 540.179688 L 1689.398438 538.234375 L 1689.539062 536.105469 L 1689.445312 534.164062 L 1689.167969 532.3125 L 1688.703125 530.597656 L 1688.101562 529.027344 L 1687.316406 527.542969 L 1686.34375 526.203125 L 1685.234375 525.09375 L 1684.078125 524.167969 L 1682.78125 523.425781 L 1681.390625 522.871094 L 1679.863281 522.5 L 1678.292969 522.269531 L 1677.550781 522.269531 L 1675.882812 522.40625 L 1674.3125 522.683594 L 1672.828125 523.148438 L 1671.488281 523.84375 L 1670.238281 524.722656 L 1669.125 525.785156 L 1668.0625 527.035156 L 1667.230469 528.425781 L 1666.535156 529.953125 L 1666.027344 531.617188 L 1665.703125 533.421875 L 1665.5625 535.367188 L 1665.5625 536.152344 L 1665.609375 538.191406 L 1665.886719 540.042969 L 1666.351562 541.753906 L 1666.953125 543.375 L 1667.785156 544.855469 L 1668.804688 546.152344 L 1669.867188 547.308594 L 1671.070312 548.234375 L 1672.367188 548.972656 L 1673.753906 549.484375 L 1675.28125 549.851562 L 1676.902344 549.992188 L 1676.996094 550.039062 L 1678.335938 550.039062 L 1679.214844 549.945312 L 1680.097656 549.761719 L 1680.929688 549.574219 L 1681.761719 549.296875 L 1682.640625 548.929688 L 1682.6875 548.929688 L 1682.78125 548.882812 L 1682.828125 548.835938 L 1682.917969 548.835938 L 1682.964844 548.789062 L 1683.058594 548.742188 L 1679.632812 545.875 Z M 1681.761719 543.28125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1662 557 L 1689 557 M 1662 530 L 1689 530 M 1662 530 L 1662 557 M 1689 530 L 1689 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1662 557 L 1689 557 M 1662 530 L 1689 530 M 1689 557 L 1689 530 M 1662 557 L 1662 530 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204 277 L 204 286 M 199 282 L 208 282 M 203 283 L 205 283 M 203 281 L 205 281 M 203 281 L 203 283 M 205 281 L 205 283 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.svg b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.svg
index 94c6193..02bb04d 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.svg
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 511.5 L 174.5 511.5 Z M 858.5 511.5 L 1743.5 511.5 L 1743.5 538.5 L 858.5 538.5 Z M 174.5 511.5 L 473.5 511.5 L 473.5 538.5 L 174.5 538.5 Z M 174.5 511.5 "/>
 </clipPath>
-<image id="image304" 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="#image304"/>
+  <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 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#image304"/>
+  <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 332.5 659.5 L 366.5 659.5 L 366.5 781.5 L 332.5 781.5 Z M 1119.5 730.5 L 1152.5 730.5 L 1152.5 823.5 L 1119.5 823.5 Z M 1033.5 730.5 L 1066.5 730.5 L 1066.5 823.5 L 1033.5 823.5 Z M 807.5 681.5 L 841.5 681.5 L 841.5 823.5 L 807.5 823.5 Z M 894.5 681.5 L 927.5 681.5 L 927.5 823.5 L 894.5 823.5 Z M 1338.5 659.5 L 1371.5 659.5 L 1371.5 823.5 L 1338.5 823.5 Z M 1537.5 659.5 L 1570.5 659.5 L 1570.5 823.5 L 1537.5 823.5 Z M 1424.5 659.5 L 1457.5 659.5 L 1457.5 823.5 L 1424.5 823.5 Z M 695.5 659.5 L 728.5 659.5 L 728.5 823.5 L 695.5 823.5 Z M 462.5 659.5 L 495.5 659.5 L 495.5 823.5 L 462.5 823.5 Z M 462.5 659.5 "/>
 </clipPath>
-<image id="image305" 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="#image305"/>
+  <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 1022.5 250.5 L 1055.5 250.5 L 1055.5 343.5 L 1022.5 343.5 Z M 1166.5 250.5 L 1200.5 250.5 L 1200.5 343.5 L 1166.5 343.5 Z M 422.5 250.5 L 455.5 250.5 L 455.5 436.5 L 422.5 436.5 Z M 311.5 250.5 L 345.5 250.5 L 345.5 436.5 L 311.5 436.5 Z M 683.5 286.5 L 716.5 286.5 L 716.5 471.5 L 683.5 471.5 Z M 1445.5 250.5 L 1478.5 250.5 L 1478.5 471.5 L 1445.5 471.5 Z M 904.5 250.5 L 937.5 250.5 L 937.5 471.5 L 904.5 471.5 Z M 811.5 250.5 L 844.5 250.5 L 844.5 471.5 L 811.5 471.5 Z M 1334.5 250.5 L 1368.5 250.5 L 1368.5 471.5 L 1334.5 471.5 Z M 1573.5 250.5 L 1606.5 250.5 L 1606.5 498.5 L 1573.5 498.5 Z M 1573.5 250.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <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="surface301">
+<g id="surface328">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,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 254.242188 560.5 L 254.242188 513.46875 L 272.371094 513.46875 L 275.210938 513.660156 L 277.855469 514.175781 L 280.304688 515.082031 L 282.566406 516.242188 L 284.566406 517.855469 L 286.433594 519.726562 L 287.984375 521.984375 L 289.273438 524.433594 L 290.242188 527.210938 L 290.953125 530.175781 L 291.339844 533.46875 L 291.53125 536.953125 L 291.339844 540.628906 L 290.886719 544.046875 L 290.113281 547.144531 L 289.082031 549.984375 L 287.726562 552.5 L 286.046875 554.695312 L 284.242188 556.5 L 282.242188 557.917969 L 280.046875 559.082031 L 277.660156 559.855469 L 275.082031 560.371094 L 272.371094 560.5 Z M 260.242188 555.210938 L 271.339844 555.210938 L 274.304688 555.015625 L 276.953125 554.304688 L 279.273438 553.082031 L 281.210938 551.46875 L 282.757812 549.273438 L 284.046875 546.628906 L 284.433594 545.273438 L 284.824219 543.855469 L 285.144531 542.304688 L 285.339844 540.628906 L 285.46875 538.886719 L 285.53125 537.015625 L 285.273438 532.824219 L 284.628906 529.144531 L 283.46875 525.984375 L 281.917969 523.46875 L 279.917969 521.402344 L 277.46875 519.917969 L 276.566406 519.597656 L 275.597656 519.273438 L 274.566406 519.082031 L 273.53125 518.886719 L 272.433594 518.824219 L 271.339844 518.757812 L 260.242188 518.757812 Z M 260.242188 555.210938 "/>
 <path style="fill:none;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 561 L 288 561 M 251 524 L 288 524 M 251 524 L 251 561 M 288 524 L 288 561 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 561 L 288 561 M 251 524 L 288 524 M 288 561 L 288 524 M 251 561 L 251 524 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.svg b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.svg
index bb134ac..2650128 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.svg
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image305" 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="#image305"/>
+  <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 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.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="#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 306.5 651.5 L 337.5 651.5 L 337.5 765.5 L 306.5 765.5 Z M 649.5 626.5 L 680.5 626.5 L 680.5 779.5 L 649.5 779.5 Z M 994.5 710.5 L 1026.5 710.5 L 1026.5 797.5 L 994.5 797.5 Z M 1075.5 710.5 L 1106.5 710.5 L 1106.5 797.5 L 1075.5 797.5 Z M 852.5 672.5 L 883.5 672.5 L 883.5 804.5 L 852.5 804.5 Z M 1280.5 651.5 L 1311.5 651.5 L 1311.5 804.5 L 1280.5 804.5 Z M 1361.5 651.5 L 1392.5 651.5 L 1392.5 804.5 L 1361.5 804.5 Z M 1574.5 651.5 L 1605.5 651.5 L 1605.5 804.5 L 1574.5 804.5 Z M 1483.5 651.5 L 1514.5 651.5 L 1514.5 804.5 L 1483.5 804.5 Z M 426.5 651.5 L 457.5 651.5 L 457.5 804.5 L 426.5 804.5 Z M 771.5 672.5 L 802.5 672.5 L 802.5 804.5 L 771.5 804.5 Z M 771.5 672.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <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 965.5 268.5 L 997.5 268.5 L 997.5 355.5 L 965.5 355.5 Z M 1107.5 268.5 L 1138.5 268.5 L 1138.5 355.5 L 1107.5 355.5 Z M 855.5 268.5 L 886.5 268.5 L 886.5 475.5 L 855.5 475.5 Z M 303.5 301.5 L 334.5 301.5 L 334.5 475.5 L 303.5 475.5 Z M 431.5 301.5 L 462.5 301.5 L 462.5 475.5 L 431.5 475.5 Z M 768.5 268.5 L 799.5 268.5 L 799.5 475.5 L 768.5 475.5 Z M 640.5 301.5 L 671.5 301.5 L 671.5 475.5 L 640.5 475.5 Z M 1481.5 268.5 L 1512.5 268.5 L 1512.5 500.5 L 1481.5 500.5 Z M 1367.5 268.5 L 1398.5 268.5 L 1398.5 500.5 L 1367.5 500.5 Z M 1577.5 268.5 L 1608.5 268.5 L 1608.5 500.5 L 1577.5 500.5 Z M 1274.5 268.5 L 1305.5 268.5 L 1305.5 500.5 L 1274.5 500.5 Z M 1274.5 268.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.5 "/>
 </clipPath>
-<image id="image308" 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="#image308"/>
+  <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="surface302">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,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 1678.734375 634.921875 L 1675.832031 638.5 L 1669.355469 633.132812 L 1667.503906 634.117188 L 1665.652344 634.859375 L 1663.738281 635.476562 L 1661.703125 635.90625 L 1659.664062 636.15625 L 1657.566406 636.277344 L 1654.730469 636.09375 L 1652.074219 635.660156 L 1649.605469 634.921875 L 1647.261719 633.933594 L 1645.039062 632.636719 L 1643.066406 630.972656 L 1641.277344 629.179688 L 1639.734375 627.144531 L 1638.5 624.921875 L 1637.449219 622.515625 L 1636.648438 619.925781 L 1636.152344 617.085938 L 1636.03125 616.40625 L 1635.96875 615.667969 L 1635.90625 614.988281 L 1635.84375 614.246094 L 1635.84375 612.703125 L 1635.96875 609.621094 L 1636.402344 606.65625 L 1637.078125 603.941406 L 1638.066406 601.351562 L 1639.300781 598.941406 L 1640.90625 596.722656 L 1642.511719 594.933594 L 1644.359375 593.328125 L 1646.398438 591.96875 L 1648.558594 590.921875 L 1650.902344 590.058594 L 1653.496094 589.441406 L 1654.113281 589.378906 L 1654.789062 589.316406 L 1656.148438 589.191406 L 1656.828125 589.191406 L 1657.566406 589.132812 L 1660.34375 589.316406 L 1662.996094 589.75 L 1665.464844 590.488281 L 1667.8125 591.476562 L 1670.03125 592.773438 L 1672.070312 594.375 L 1673.796875 596.226562 L 1675.339844 598.203125 L 1676.574219 600.363281 L 1677.625 602.769531 L 1678.425781 605.359375 L 1678.980469 608.078125 L 1679.042969 608.878906 L 1679.105469 609.621094 L 1679.167969 610.359375 L 1679.226562 611.101562 L 1679.226562 611.839844 L 1679.289062 612.582031 L 1679.105469 616.039062 L 1678.550781 619.308594 L 1677.683594 622.332031 L 1676.449219 625.171875 L 1674.847656 627.761719 L 1672.933594 630.167969 Z M 1663.183594 622.207031 L 1668.675781 626.714844 L 1670.15625 624.863281 L 1671.390625 622.765625 L 1672.316406 620.480469 L 1672.996094 618.074219 L 1673.367188 615.480469 L 1673.550781 612.644531 L 1673.425781 610.050781 L 1673.058594 607.582031 L 1672.441406 605.300781 L 1671.636719 603.203125 L 1670.589844 601.226562 L 1669.292969 599.4375 L 1667.8125 597.957031 L 1666.269531 596.722656 L 1664.539062 595.734375 L 1662.6875 594.992188 L 1660.652344 594.5 L 1658.554688 594.191406 L 1657.566406 594.191406 L 1655.347656 594.375 L 1653.246094 594.746094 L 1651.273438 595.363281 L 1649.484375 596.289062 L 1647.816406 597.460938 L 1646.335938 598.882812 L 1644.917969 600.546875 L 1643.804688 602.398438 L 1642.878906 604.433594 L 1642.203125 606.65625 L 1641.769531 609.0625 L 1641.585938 611.65625 L 1641.585938 612.703125 L 1641.644531 615.421875 L 1642.015625 617.886719 L 1642.632812 620.171875 L 1643.433594 622.332031 L 1644.546875 624.304688 L 1645.902344 626.035156 L 1647.324219 627.578125 L 1648.929688 628.8125 L 1650.65625 629.796875 L 1652.507812 630.476562 L 1654.542969 630.972656 L 1656.703125 631.15625 L 1656.828125 631.21875 L 1658.617188 631.21875 L 1659.789062 631.09375 L 1660.960938 630.847656 L 1662.070312 630.601562 L 1663.183594 630.230469 L 1664.355469 629.738281 L 1664.417969 629.738281 L 1664.539062 629.675781 L 1664.601562 629.613281 L 1664.726562 629.613281 L 1664.789062 629.550781 L 1664.910156 629.488281 L 1660.34375 625.664062 Z M 1663.183594 622.207031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1637 484 L 1673 484 M 1637 449 L 1673 449 M 1637 449 L 1637 484 M 1673 449 L 1673 484 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1637 484 L 1673 484 M 1637 449 L 1673 449 M 1673 484 L 1673 449 M 1637 484 L 1637 449 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.svg b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.svg
index b355275..50bb195 100644
--- a/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.svg
+++ b/cells/dlrtp/sky130_fd_sc_hs__dlrtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 516.5 L 175.5 516.5 Z M 680.5 516.5 L 1743.5 516.5 L 1743.5 536.5 L 680.5 536.5 Z M 175.5 516.5 L 450.5 516.5 L 450.5 536.5 L 175.5 536.5 Z M 175.5 516.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.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="#image357"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 275.5 615.5 L 300.5 615.5 L 300.5 706.5 L 275.5 706.5 Z M 558.5 589.5 L 583.5 589.5 L 583.5 711.5 L 558.5 711.5 Z M 390.5 615.5 L 415.5 615.5 L 415.5 738.5 L 390.5 738.5 Z M 710.5 643.5 L 734.5 643.5 L 734.5 749.5 L 710.5 749.5 Z M 1028.5 643.5 L 1052.5 643.5 L 1052.5 749.5 L 1028.5 749.5 Z M 1241.5 643.5 L 1266.5 643.5 L 1266.5 749.5 L 1241.5 749.5 Z M 1170.5 643.5 L 1195.5 643.5 L 1195.5 749.5 L 1170.5 749.5 Z M 1099.5 643.5 L 1124.5 643.5 L 1124.5 749.5 L 1099.5 749.5 Z M 643.5 643.5 L 668.5 643.5 L 668.5 749.5 L 643.5 749.5 Z M 1405.5 627.5 L 1430.5 627.5 L 1430.5 749.5 L 1405.5 749.5 Z M 1547.5 627.5 L 1572.5 627.5 L 1572.5 749.5 L 1547.5 749.5 Z M 1476.5 627.5 L 1501.5 627.5 L 1501.5 749.5 L 1476.5 749.5 Z M 1618.5 627.5 L 1643.5 627.5 L 1643.5 749.5 L 1618.5 749.5 Z M 864.5 680.5 L 889.5 680.5 L 889.5 749.5 L 864.5 749.5 Z M 805.5 680.5 L 829.5 680.5 L 829.5 749.5 L 805.5 749.5 Z M 805.5 680.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 798.5 321.5 L 823.5 321.5 L 823.5 391.5 L 798.5 391.5 Z M 901.5 321.5 L 926.5 321.5 L 926.5 391.5 L 901.5 391.5 Z M 277.5 346.5 L 302.5 346.5 L 302.5 485.5 L 277.5 485.5 Z M 379.5 346.5 L 404.5 346.5 L 404.5 485.5 L 379.5 485.5 Z M 710.5 321.5 L 734.5 321.5 L 734.5 487.5 L 710.5 487.5 Z M 555.5 348.5 L 580.5 348.5 L 580.5 487.5 L 555.5 487.5 Z M 645.5 321.5 L 670.5 321.5 L 670.5 487.5 L 645.5 487.5 Z M 1430.5 321.5 L 1454.5 321.5 L 1454.5 506.5 L 1430.5 506.5 Z M 1598.5 321.5 L 1623.5 321.5 L 1623.5 506.5 L 1598.5 506.5 Z M 1102.5 368.5 L 1127.5 368.5 L 1127.5 506.5 L 1102.5 506.5 Z M 1512.5 321.5 L 1537.5 321.5 L 1537.5 506.5 L 1512.5 506.5 Z M 1267.5 368.5 L 1292.5 368.5 L 1292.5 506.5 L 1267.5 506.5 Z M 1184.5 368.5 L 1209.5 368.5 L 1209.5 506.5 L 1184.5 506.5 Z M 1355.5 321.5 L 1380.5 321.5 L 1380.5 506.5 L 1355.5 506.5 Z M 1028.5 368.5 L 1052.5 368.5 L 1052.5 506.5 L 1028.5 506.5 Z M 1028.5 368.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface326">
+<g id="surface354">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,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 1691.480469 553.652344 L 1689.175781 556.5 L 1684.019531 552.230469 L 1682.546875 553.015625 L 1681.074219 553.605469 L 1679.554688 554.09375 L 1677.933594 554.4375 L 1676.3125 554.632812 L 1674.644531 554.734375 L 1672.386719 554.585938 L 1670.277344 554.242188 L 1668.3125 553.652344 L 1666.445312 552.867188 L 1664.679688 551.835938 L 1663.109375 550.511719 L 1661.683594 549.085938 L 1660.457031 547.46875 L 1659.476562 545.699219 L 1658.640625 543.785156 L 1658.003906 541.722656 L 1657.609375 539.464844 L 1657.511719 538.925781 L 1657.464844 538.335938 L 1657.414062 537.796875 L 1657.367188 537.207031 L 1657.367188 535.980469 L 1657.464844 533.527344 L 1657.808594 531.171875 L 1658.347656 529.011719 L 1659.132812 526.949219 L 1660.113281 525.035156 L 1661.390625 523.265625 L 1662.667969 521.84375 L 1664.140625 520.566406 L 1665.757812 519.488281 L 1667.476562 518.652344 L 1669.34375 517.964844 L 1671.40625 517.476562 L 1671.894531 517.425781 L 1672.433594 517.375 L 1672.976562 517.328125 L 1673.515625 517.277344 L 1674.054688 517.277344 L 1674.644531 517.230469 L 1676.851562 517.375 L 1678.964844 517.71875 L 1680.929688 518.308594 L 1682.792969 519.09375 L 1684.558594 520.125 L 1686.179688 521.402344 L 1687.554688 522.875 L 1688.78125 524.445312 L 1689.765625 526.164062 L 1690.597656 528.078125 L 1691.234375 530.140625 L 1691.679688 532.300781 L 1691.726562 532.9375 L 1691.777344 533.527344 L 1691.824219 534.117188 L 1691.875 534.703125 L 1691.875 535.292969 L 1691.921875 535.882812 L 1691.777344 538.632812 L 1691.335938 541.234375 L 1690.648438 543.640625 L 1689.664062 545.898438 L 1688.390625 547.957031 L 1686.867188 549.875 Z M 1679.113281 543.539062 L 1683.480469 547.125 L 1684.660156 545.652344 L 1685.640625 543.984375 L 1686.375 542.167969 L 1686.917969 540.25 L 1687.210938 538.191406 L 1687.359375 535.933594 L 1687.261719 533.871094 L 1686.964844 531.90625 L 1686.476562 530.089844 L 1685.835938 528.421875 L 1685.003906 526.851562 L 1683.972656 525.425781 L 1682.792969 524.25 L 1681.566406 523.265625 L 1680.191406 522.480469 L 1678.71875 521.894531 L 1677.097656 521.5 L 1675.429688 521.253906 L 1674.644531 521.253906 L 1672.878906 521.402344 L 1671.207031 521.695312 L 1669.636719 522.1875 L 1668.214844 522.921875 L 1666.886719 523.855469 L 1665.710938 524.984375 L 1664.582031 526.3125 L 1663.699219 527.785156 L 1662.960938 529.402344 L 1662.421875 531.171875 L 1662.078125 533.085938 L 1661.929688 535.148438 L 1661.929688 535.980469 L 1661.980469 538.140625 L 1662.273438 540.105469 L 1662.765625 541.921875 L 1663.402344 543.640625 L 1664.285156 545.210938 L 1665.367188 546.585938 L 1666.496094 547.8125 L 1667.773438 548.792969 L 1669.148438 549.578125 L 1670.621094 550.117188 L 1672.238281 550.511719 L 1673.957031 550.660156 L 1674.054688 550.707031 L 1675.480469 550.707031 L 1676.410156 550.609375 L 1677.34375 550.414062 L 1678.226562 550.214844 L 1679.113281 549.921875 L 1680.042969 549.53125 L 1680.09375 549.53125 L 1680.191406 549.480469 L 1680.242188 549.429688 L 1680.339844 549.429688 L 1680.386719 549.382812 L 1680.484375 549.332031 L 1676.851562 546.289062 Z M 1679.113281 543.539062 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1658 558 L 1686 558 M 1658 530 L 1686 530 M 1658 530 L 1658 558 M 1686 530 L 1686 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1658 558 L 1686 558 M 1658 530 L 1686 530 M 1686 558 L 1686 530 M 1658 558 L 1658 530 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.svg b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.svg
index 0cb0001..ff7c336 100644
--- a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.svg
+++ b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 1059.5 537.5 L 1256.5 537.5 L 1256.5 551.5 L 1059.5 551.5 Z M 1059.5 537.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.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="#image383"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1036.5 651.5 L 1064.5 651.5 L 1064.5 729.5 L 1036.5 729.5 Z M 965.5 651.5 L 992.5 651.5 L 992.5 729.5 L 965.5 729.5 Z M 286.5 630.5 L 314.5 630.5 L 314.5 731.5 L 286.5 731.5 Z M 1423.5 638.5 L 1451.5 638.5 L 1451.5 739.5 L 1423.5 739.5 Z M 395.5 630.5 L 422.5 630.5 L 422.5 766.5 L 395.5 766.5 Z M 603.5 632.5 L 631.5 632.5 L 631.5 768.5 L 603.5 768.5 Z M 782.5 651.5 L 809.5 651.5 L 809.5 769.5 L 782.5 769.5 Z M 710.5 651.5 L 738.5 651.5 L 738.5 769.5 L 710.5 769.5 Z M 1605.5 638.5 L 1633.5 638.5 L 1633.5 774.5 L 1605.5 774.5 Z M 1141.5 638.5 L 1169.5 638.5 L 1169.5 774.5 L 1141.5 774.5 Z M 1330.5 638.5 L 1357.5 638.5 L 1357.5 774.5 L 1330.5 774.5 Z M 1330.5 638.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image384"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 319.5 298.5 L 347.5 298.5 L 347.5 452.5 L 319.5 452.5 Z M 411.5 298.5 L 439.5 298.5 L 439.5 452.5 L 411.5 452.5 Z M 1420.5 298.5 L 1447.5 298.5 L 1447.5 452.5 L 1420.5 452.5 Z M 606.5 327.5 L 634.5 327.5 L 634.5 481.5 L 606.5 481.5 Z M 1011.5 404.5 L 1038.5 404.5 L 1038.5 481.5 L 1011.5 481.5 Z M 706.5 298.5 L 734.5 298.5 L 734.5 481.5 L 706.5 481.5 Z M 784.5 298.5 L 811.5 298.5 L 811.5 481.5 L 784.5 481.5 Z M 921.5 404.5 L 949.5 404.5 L 949.5 481.5 L 921.5 481.5 Z M 1603.5 298.5 L 1630.5 298.5 L 1630.5 504.5 L 1603.5 504.5 Z M 1327.5 298.5 L 1354.5 298.5 L 1354.5 504.5 L 1327.5 504.5 Z M 1144.5 312.5 L 1171.5 312.5 L 1171.5 518.5 L 1144.5 518.5 Z M 1144.5 312.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image385"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image386"/>
 </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="surface380">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -191,6 +191,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 540.917969 446.996094 L 540.917969 486.875 L 535.175781 486.875 L 514.554688 454.546875 L 514.554688 486.875 L 509.738281 486.875 L 509.738281 446.996094 L 515.265625 446.996094 L 536.105469 479.597656 L 536.105469 446.996094 Z M 540.917969 446.996094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 414 627 L 445 627 M 414 596 L 445 596 M 414 596 L 414 627 M 445 596 L 445 627 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 414 627 L 445 627 M 414 596 L 445 596 M 445 627 L 445 596 M 414 627 L 414 596 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.svg b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.svg
index 43e0545..89333d2 100644
--- a/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.svg
+++ b/cells/dlxbn/sky130_fd_sc_hs__dlxbn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 536.5 L 175.5 536.5 Z M 175.5 229.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.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="#image349"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 275.5 607.5 L 300.5 607.5 L 300.5 698.5 L 275.5 698.5 Z M 874.5 639.5 L 899.5 639.5 L 899.5 709.5 L 874.5 709.5 Z M 950.5 639.5 L 975.5 639.5 L 975.5 709.5 L 950.5 709.5 Z M 373.5 607.5 L 398.5 607.5 L 398.5 729.5 L 373.5 729.5 Z M 1372.5 627.5 L 1397.5 627.5 L 1397.5 733.5 L 1372.5 733.5 Z M 716.5 639.5 L 740.5 639.5 L 740.5 745.5 L 716.5 745.5 Z M 651.5 639.5 L 676.5 639.5 L 676.5 745.5 L 651.5 745.5 Z M 550.5 627.5 L 574.5 627.5 L 574.5 749.5 L 550.5 749.5 Z M 1618.5 627.5 L 1643.5 627.5 L 1643.5 749.5 L 1618.5 749.5 Z M 1276.5 627.5 L 1301.5 627.5 L 1301.5 749.5 L 1276.5 749.5 Z M 1547.5 627.5 L 1572.5 627.5 L 1572.5 749.5 L 1547.5 749.5 Z M 1042.5 627.5 L 1066.5 627.5 L 1066.5 749.5 L 1042.5 749.5 Z M 1205.5 627.5 L 1230.5 627.5 L 1230.5 749.5 L 1205.5 749.5 Z M 1205.5 627.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 291.5 321.5 L 316.5 321.5 L 316.5 460.5 L 291.5 460.5 Z M 374.5 321.5 L 398.5 321.5 L 398.5 460.5 L 374.5 460.5 Z M 941.5 417.5 L 966.5 417.5 L 966.5 487.5 L 941.5 487.5 Z M 559.5 348.5 L 584.5 348.5 L 584.5 487.5 L 559.5 487.5 Z M 648.5 321.5 L 673.5 321.5 L 673.5 487.5 L 648.5 487.5 Z M 717.5 321.5 L 742.5 321.5 L 742.5 487.5 L 717.5 487.5 Z M 1375.5 321.5 L 1400.5 321.5 L 1400.5 487.5 L 1375.5 487.5 Z M 853.5 417.5 L 878.5 417.5 L 878.5 487.5 L 853.5 487.5 Z M 1051.5 321.5 L 1075.5 321.5 L 1075.5 506.5 L 1051.5 506.5 Z M 1292.5 321.5 L 1317.5 321.5 L 1317.5 506.5 L 1292.5 506.5 Z M 1542.5 321.5 L 1567.5 321.5 L 1567.5 506.5 L 1542.5 506.5 Z M 1616.5 321.5 L 1641.5 321.5 L 1641.5 506.5 L 1616.5 506.5 Z M 1217.5 321.5 L 1242.5 321.5 L 1242.5 506.5 L 1217.5 506.5 Z M 1217.5 321.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface346">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1643.597656 334.074219 L 1643.597656 369.859375 L 1638.441406 369.859375 L 1619.9375 340.847656 L 1619.9375 369.859375 L 1615.617188 369.859375 L 1615.617188 334.074219 L 1620.574219 334.074219 L 1639.277344 363.332031 L 1639.277344 334.074219 Z M 1643.597656 334.074219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1579 741 L 1607 741 M 1579 713 L 1607 713 M 1579 713 L 1579 741 M 1607 713 L 1607 741 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1579 741 L 1607 741 M 1579 713 L 1607 713 M 1607 741 L 1607 713 M 1579 741 L 1579 713 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.svg b/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.svg
index a93f243..830f53e 100644
--- a/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.svg
+++ b/cells/dlxbp/sky130_fd_sc_hs__dlxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.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 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.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 1002.5 651.5 L 1030.5 651.5 L 1030.5 728.5 L 1002.5 728.5 Z M 931.5 651.5 L 958.5 651.5 L 958.5 728.5 L 931.5 728.5 Z M 1422.5 634.5 L 1450.5 634.5 L 1450.5 735.5 L 1422.5 735.5 Z M 287.5 638.5 L 315.5 638.5 L 315.5 739.5 L 287.5 739.5 Z M 604.5 630.5 L 632.5 630.5 L 632.5 766.5 L 604.5 766.5 Z M 795.5 651.5 L 822.5 651.5 L 822.5 768.5 L 795.5 768.5 Z M 723.5 651.5 L 750.5 651.5 L 750.5 768.5 L 723.5 768.5 Z M 1330.5 634.5 L 1358.5 634.5 L 1358.5 770.5 L 1330.5 770.5 Z M 394.5 638.5 L 421.5 638.5 L 421.5 774.5 L 394.5 774.5 Z M 1109.5 638.5 L 1137.5 638.5 L 1137.5 774.5 L 1109.5 774.5 Z M 1604.5 638.5 L 1632.5 638.5 L 1632.5 774.5 L 1604.5 774.5 Z M 1604.5 638.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 889.5 298.5 L 917.5 298.5 L 917.5 375.5 L 889.5 375.5 Z M 1010.5 298.5 L 1037.5 298.5 L 1037.5 375.5 L 1010.5 375.5 Z M 1420.5 298.5 L 1447.5 298.5 L 1447.5 452.5 L 1420.5 452.5 Z M 287.5 308.5 L 315.5 308.5 L 315.5 462.5 L 287.5 462.5 Z M 399.5 308.5 L 427.5 308.5 L 427.5 462.5 L 399.5 462.5 Z M 607.5 327.5 L 635.5 327.5 L 635.5 481.5 L 607.5 481.5 Z M 720.5 298.5 L 748.5 298.5 L 748.5 481.5 L 720.5 481.5 Z M 792.5 298.5 L 819.5 298.5 L 819.5 481.5 L 792.5 481.5 Z M 1141.5 298.5 L 1169.5 298.5 L 1169.5 504.5 L 1141.5 504.5 Z M 1327.5 298.5 L 1354.5 298.5 L 1354.5 504.5 L 1327.5 504.5 Z M 1603.5 298.5 L 1631.5 298.5 L 1631.5 504.5 L 1603.5 504.5 Z M 1603.5 298.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.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>
@@ -189,6 +189,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 329.367188 555.5 L 329.367188 515.625 L 344.738281 515.625 L 347.144531 515.789062 L 349.386719 516.226562 L 351.464844 516.992188 L 353.378906 517.976562 L 355.078125 519.34375 L 356.664062 520.929688 L 357.976562 522.84375 L 359.070312 524.921875 L 359.890625 527.277344 L 360.492188 529.792969 L 360.820312 532.582031 L 360.984375 535.535156 L 360.820312 538.652344 L 360.4375 541.550781 L 359.78125 544.175781 L 358.90625 546.585938 L 357.757812 548.71875 L 356.335938 550.578125 L 354.804688 552.109375 L 353.105469 553.3125 L 351.246094 554.296875 L 349.222656 554.953125 L 347.035156 555.390625 L 344.738281 555.5 Z M 334.457031 551.015625 L 343.863281 551.015625 L 346.378906 550.851562 L 348.621094 550.25 L 350.589844 549.210938 L 352.230469 547.84375 L 353.542969 545.984375 L 354.640625 543.738281 L 354.96875 542.589844 L 355.296875 541.386719 L 355.570312 540.074219 L 355.734375 538.652344 L 355.84375 537.175781 L 355.898438 535.589844 L 355.679688 532.035156 L 355.132812 528.917969 L 354.148438 526.234375 L 352.832031 524.101562 L 351.136719 522.351562 L 349.058594 521.09375 L 348.292969 520.820312 L 347.472656 520.546875 L 345.722656 520.21875 L 343.863281 520.109375 L 334.457031 520.109375 Z M 334.457031 551.015625 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 326 559 L 357 559 M 326 528 L 357 528 M 326 528 L 326 559 M 357 528 L 357 559 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 326 559 L 357 559 M 326 528 L 357 528 M 357 559 L 357 528 M 326 559 L 326 528 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.svg b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.svg
index b41f977..d50f7e6 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.svg
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#image307"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1232.5 658.5 L 1265.5 658.5 L 1265.5 751.5 L 1232.5 751.5 Z M 1145.5 658.5 L 1179.5 658.5 L 1179.5 751.5 L 1145.5 751.5 Z M 309.5 656.5 L 342.5 656.5 L 342.5 777.5 L 309.5 777.5 Z M 440.5 615.5 L 473.5 615.5 L 473.5 778.5 L 440.5 778.5 Z M 1355.5 658.5 L 1388.5 658.5 L 1388.5 799.5 L 1355.5 799.5 Z M 993.5 676.5 L 1026.5 676.5 L 1026.5 817.5 L 993.5 817.5 Z M 907.5 676.5 L 940.5 676.5 L 940.5 817.5 L 907.5 817.5 Z M 720.5 659.5 L 753.5 659.5 L 753.5 823.5 L 720.5 823.5 Z M 1574.5 659.5 L 1607.5 659.5 L 1607.5 823.5 L 1574.5 823.5 Z M 1574.5 659.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1173.5 250.5 L 1206.5 250.5 L 1206.5 343.5 L 1173.5 343.5 Z M 1080.5 250.5 L 1113.5 250.5 L 1113.5 343.5 L 1080.5 343.5 Z M 423.5 256.5 L 456.5 256.5 L 456.5 441.5 L 423.5 441.5 Z M 313.5 256.5 L 346.5 256.5 L 346.5 441.5 L 313.5 441.5 Z M 830.5 250.5 L 863.5 250.5 L 863.5 471.5 L 830.5 471.5 Z M 922.5 250.5 L 955.5 250.5 L 955.5 471.5 L 922.5 471.5 Z M 1350.5 250.5 L 1383.5 250.5 L 1383.5 471.5 L 1350.5 471.5 Z M 689.5 286.5 L 722.5 286.5 L 722.5 471.5 L 689.5 471.5 Z M 1573.5 250.5 L 1606.5 250.5 L 1606.5 498.5 L 1573.5 498.5 Z M 1573.5 250.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface304">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 254.242188 642.5 L 254.242188 595.46875 L 272.371094 595.46875 L 275.210938 595.660156 L 277.855469 596.175781 L 280.304688 597.082031 L 282.566406 598.242188 L 284.566406 599.855469 L 286.433594 601.726562 L 287.984375 603.984375 L 289.273438 606.433594 L 290.242188 609.210938 L 290.953125 612.175781 L 291.339844 615.46875 L 291.53125 618.953125 L 291.339844 622.628906 L 290.886719 626.046875 L 290.113281 629.144531 L 289.082031 631.984375 L 287.726562 634.5 L 286.046875 636.695312 L 284.242188 638.5 L 282.242188 639.917969 L 280.046875 641.082031 L 277.660156 641.855469 L 275.082031 642.371094 L 272.371094 642.5 Z M 260.242188 637.210938 L 271.339844 637.210938 L 274.304688 637.015625 L 276.953125 636.304688 L 279.273438 635.082031 L 281.210938 633.46875 L 282.757812 631.273438 L 284.046875 628.628906 L 284.433594 627.273438 L 284.824219 625.855469 L 285.144531 624.304688 L 285.339844 622.628906 L 285.46875 620.886719 L 285.53125 619.015625 L 285.273438 614.824219 L 284.628906 611.144531 L 283.46875 607.984375 L 281.917969 605.46875 L 279.917969 603.402344 L 277.46875 601.917969 L 276.566406 601.597656 L 275.597656 601.273438 L 274.566406 601.082031 L 273.53125 600.886719 L 272.433594 600.824219 L 271.339844 600.757812 L 260.242188 600.757812 Z M 260.242188 637.210938 "/>
 <path style="fill:none;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 480 L 288 480 M 251 442 L 288 442 M 251 442 L 251 480 M 288 442 L 288 480 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 480 L 288 480 M 251 442 L 288 442 M 288 480 L 288 442 M 251 480 L 251 442 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.svg b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.svg
index 8783369..3800cf4 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.svg
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 1181.5 537.5 L 1402.5 537.5 L 1402.5 542.5 L 1181.5 542.5 Z M 1181.5 537.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1169.5 650.5 L 1201.5 650.5 L 1201.5 737.5 L 1169.5 737.5 Z M 1089.5 650.5 L 1120.5 650.5 L 1120.5 737.5 L 1089.5 737.5 Z M 301.5 643.5 L 332.5 643.5 L 332.5 757.5 L 301.5 757.5 Z M 423.5 643.5 L 454.5 643.5 L 454.5 796.5 L 423.5 796.5 Z M 864.5 667.5 L 895.5 667.5 L 895.5 799.5 L 864.5 799.5 Z M 945.5 667.5 L 976.5 667.5 L 976.5 799.5 L 945.5 799.5 Z M 1275.5 650.5 L 1306.5 650.5 L 1306.5 803.5 L 1275.5 803.5 Z M 686.5 651.5 L 717.5 651.5 L 717.5 804.5 L 686.5 804.5 Z M 1480.5 651.5 L 1511.5 651.5 L 1511.5 804.5 L 1480.5 804.5 Z M 1582.5 651.5 L 1613.5 651.5 L 1613.5 804.5 L 1582.5 804.5 Z M 1582.5 651.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1089.5 273.5 L 1120.5 273.5 L 1120.5 360.5 L 1089.5 360.5 Z M 1002.5 273.5 L 1033.5 273.5 L 1033.5 360.5 L 1002.5 360.5 Z M 448.5 268.5 L 479.5 268.5 L 479.5 442.5 L 448.5 442.5 Z M 334.5 268.5 L 365.5 268.5 L 365.5 442.5 L 334.5 442.5 Z M 788.5 268.5 L 819.5 268.5 L 819.5 475.5 L 788.5 475.5 Z M 657.5 301.5 L 688.5 301.5 L 688.5 475.5 L 657.5 475.5 Z M 875.5 268.5 L 906.5 268.5 L 906.5 475.5 L 875.5 475.5 Z M 1585.5 268.5 L 1616.5 268.5 L 1616.5 500.5 L 1585.5 500.5 Z M 1482.5 268.5 L 1513.5 268.5 L 1513.5 500.5 L 1482.5 500.5 Z M 1273.5 273.5 L 1304.5 273.5 L 1304.5 505.5 L 1273.5 505.5 Z M 1273.5 273.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -159,6 +159,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 1579.734375 328.921875 L 1576.832031 332.5 L 1570.355469 327.132812 L 1568.503906 328.117188 L 1566.652344 328.859375 L 1564.738281 329.476562 L 1562.703125 329.90625 L 1560.664062 330.15625 L 1558.566406 330.277344 L 1555.730469 330.09375 L 1553.074219 329.660156 L 1550.605469 328.921875 L 1548.261719 327.933594 L 1546.039062 326.636719 L 1544.066406 324.972656 L 1542.277344 323.179688 L 1540.734375 321.144531 L 1539.5 318.921875 L 1538.449219 316.515625 L 1537.648438 313.925781 L 1537.152344 311.085938 L 1537.03125 310.40625 L 1536.96875 309.667969 L 1536.90625 308.988281 L 1536.84375 308.246094 L 1536.84375 306.703125 L 1536.96875 303.621094 L 1537.402344 300.65625 L 1538.078125 297.941406 L 1539.066406 295.351562 L 1540.300781 292.941406 L 1541.90625 290.722656 L 1543.511719 288.933594 L 1545.359375 287.328125 L 1547.398438 285.96875 L 1549.558594 284.921875 L 1551.902344 284.058594 L 1554.496094 283.441406 L 1555.113281 283.378906 L 1555.789062 283.316406 L 1557.148438 283.191406 L 1557.828125 283.191406 L 1558.566406 283.132812 L 1561.34375 283.316406 L 1563.996094 283.75 L 1566.464844 284.488281 L 1568.8125 285.476562 L 1571.03125 286.773438 L 1573.070312 288.375 L 1574.796875 290.226562 L 1576.339844 292.203125 L 1577.574219 294.363281 L 1578.625 296.769531 L 1579.425781 299.359375 L 1579.980469 302.078125 L 1580.042969 302.878906 L 1580.105469 303.621094 L 1580.167969 304.359375 L 1580.226562 305.101562 L 1580.226562 305.839844 L 1580.289062 306.582031 L 1580.105469 310.039062 L 1579.550781 313.308594 L 1578.683594 316.332031 L 1577.449219 319.171875 L 1575.847656 321.761719 L 1573.933594 324.167969 Z M 1564.183594 316.207031 L 1569.675781 320.714844 L 1571.15625 318.863281 L 1572.390625 316.765625 L 1573.316406 314.480469 L 1573.996094 312.074219 L 1574.367188 309.480469 L 1574.550781 306.644531 L 1574.425781 304.050781 L 1574.058594 301.582031 L 1573.441406 299.300781 L 1572.636719 297.203125 L 1571.589844 295.226562 L 1570.292969 293.4375 L 1568.8125 291.957031 L 1567.269531 290.722656 L 1565.539062 289.734375 L 1563.6875 288.992188 L 1561.652344 288.5 L 1559.554688 288.191406 L 1558.566406 288.191406 L 1556.347656 288.375 L 1554.246094 288.746094 L 1552.273438 289.363281 L 1550.484375 290.289062 L 1548.816406 291.460938 L 1547.335938 292.882812 L 1545.917969 294.546875 L 1544.804688 296.398438 L 1543.878906 298.433594 L 1543.203125 300.65625 L 1542.769531 303.0625 L 1542.585938 305.65625 L 1542.585938 306.703125 L 1542.644531 309.421875 L 1543.015625 311.886719 L 1543.632812 314.171875 L 1544.433594 316.332031 L 1545.546875 318.304688 L 1546.902344 320.035156 L 1548.324219 321.578125 L 1549.929688 322.8125 L 1551.65625 323.796875 L 1553.507812 324.476562 L 1555.542969 324.972656 L 1557.703125 325.15625 L 1557.828125 325.21875 L 1559.617188 325.21875 L 1560.789062 325.09375 L 1561.960938 324.847656 L 1563.070312 324.601562 L 1564.183594 324.230469 L 1565.355469 323.738281 L 1565.417969 323.738281 L 1565.539062 323.675781 L 1565.601562 323.613281 L 1565.726562 323.613281 L 1565.789062 323.550781 L 1565.910156 323.488281 L 1561.34375 319.664062 Z M 1564.183594 316.207031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1538 790 L 1573 790 M 1538 755 L 1573 755 M 1538 755 L 1538 790 M 1573 755 L 1573 790 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1538 790 L 1573 790 M 1538 755 L 1573 755 M 1573 790 L 1573 755 M 1538 790 L 1538 755 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.svg b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.svg
index 8c52f67..6606272 100644
--- a/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.svg
+++ b/cells/dlxtn/sky130_fd_sc_hs__dlxtn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1004.5 651.5 L 1032.5 651.5 L 1032.5 729.5 L 1004.5 729.5 Z M 1070.5 651.5 L 1098.5 651.5 L 1098.5 729.5 L 1070.5 729.5 Z M 286.5 635.5 L 314.5 635.5 L 314.5 736.5 L 286.5 736.5 Z M 395.5 601.5 L 422.5 601.5 L 422.5 737.5 L 395.5 737.5 Z M 1164.5 651.5 L 1192.5 651.5 L 1192.5 769.5 L 1164.5 769.5 Z M 1243.5 651.5 L 1271.5 651.5 L 1271.5 769.5 L 1243.5 769.5 Z M 786.5 651.5 L 814.5 651.5 L 814.5 769.5 L 786.5 769.5 Z M 858.5 651.5 L 886.5 651.5 L 886.5 769.5 L 858.5 769.5 Z M 1512.5 638.5 L 1540.5 638.5 L 1540.5 774.5 L 1512.5 774.5 Z M 1338.5 638.5 L 1365.5 638.5 L 1365.5 774.5 L 1338.5 774.5 Z M 1600.5 638.5 L 1627.5 638.5 L 1627.5 774.5 L 1600.5 774.5 Z M 1433.5 638.5 L 1461.5 638.5 L 1461.5 774.5 L 1433.5 774.5 Z M 628.5 638.5 L 656.5 638.5 L 656.5 774.5 L 628.5 774.5 Z M 628.5 638.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 907.5 298.5 L 934.5 298.5 L 934.5 375.5 L 907.5 375.5 Z M 984.5 298.5 L 1012.5 298.5 L 1012.5 375.5 L 984.5 375.5 Z M 393.5 298.5 L 421.5 298.5 L 421.5 452.5 L 393.5 452.5 Z M 1155.5 298.5 L 1183.5 298.5 L 1183.5 452.5 L 1155.5 452.5 Z M 1248.5 298.5 L 1275.5 298.5 L 1275.5 452.5 L 1248.5 452.5 Z M 292.5 298.5 L 319.5 298.5 L 319.5 452.5 L 292.5 452.5 Z M 725.5 298.5 L 752.5 298.5 L 752.5 481.5 L 725.5 481.5 Z M 802.5 298.5 L 830.5 298.5 L 830.5 481.5 L 802.5 481.5 Z M 603.5 327.5 L 630.5 327.5 L 630.5 481.5 L 603.5 481.5 Z M 1603.5 298.5 L 1630.5 298.5 L 1630.5 504.5 L 1603.5 504.5 Z M 1341.5 298.5 L 1368.5 298.5 L 1368.5 504.5 L 1341.5 504.5 Z M 1520.5 298.5 L 1547.5 298.5 L 1547.5 504.5 L 1520.5 504.5 Z M 1437.5 298.5 L 1465.5 298.5 L 1465.5 504.5 L 1437.5 504.5 Z M 1437.5 298.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -159,6 +159,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 1686.59375 487.328125 L 1684.023438 490.5 L 1678.28125 485.742188 L 1676.640625 486.617188 L 1674.996094 487.273438 L 1673.300781 487.820312 L 1671.496094 488.203125 L 1669.691406 488.421875 L 1667.832031 488.53125 L 1665.316406 488.367188 L 1662.964844 487.984375 L 1660.777344 487.328125 L 1658.699219 486.453125 L 1656.730469 485.304688 L 1654.976562 483.828125 L 1653.390625 482.242188 L 1652.023438 480.433594 L 1650.929688 478.464844 L 1650 476.332031 L 1649.289062 474.035156 L 1648.851562 471.519531 L 1648.742188 470.917969 L 1648.6875 470.261719 L 1648.632812 469.660156 L 1648.578125 469.003906 L 1648.578125 467.636719 L 1648.6875 464.902344 L 1649.070312 462.277344 L 1649.671875 459.867188 L 1650.546875 457.570312 L 1651.640625 455.4375 L 1653.0625 453.46875 L 1654.484375 451.882812 L 1656.125 450.460938 L 1657.933594 449.257812 L 1659.847656 448.328125 L 1661.925781 447.5625 L 1664.222656 447.015625 L 1664.769531 446.960938 L 1666.574219 446.796875 L 1667.175781 446.796875 L 1667.832031 446.742188 L 1670.292969 446.90625 L 1672.644531 447.289062 L 1674.832031 447.945312 L 1676.914062 448.820312 L 1678.882812 449.96875 L 1680.6875 451.390625 L 1682.21875 453.03125 L 1683.585938 454.78125 L 1684.679688 456.695312 L 1685.609375 458.828125 L 1686.320312 461.125 L 1686.8125 463.535156 L 1686.867188 464.246094 L 1687.03125 466.214844 L 1687.03125 466.871094 L 1687.085938 467.527344 L 1686.921875 470.589844 L 1686.429688 473.488281 L 1685.664062 476.167969 L 1684.570312 478.683594 L 1683.148438 480.984375 L 1681.453125 483.117188 Z M 1672.808594 476.058594 L 1677.679688 480.050781 L 1678.992188 478.410156 L 1680.085938 476.550781 L 1680.90625 474.527344 L 1681.507812 472.394531 L 1681.835938 470.097656 L 1682 467.582031 L 1681.890625 465.285156 L 1681.5625 463.097656 L 1681.015625 461.070312 L 1680.304688 459.210938 L 1679.375 457.460938 L 1678.226562 455.875 L 1676.914062 454.5625 L 1675.542969 453.46875 L 1674.011719 452.59375 L 1672.371094 451.9375 L 1670.566406 451.5 L 1668.707031 451.226562 L 1667.832031 451.226562 L 1665.863281 451.390625 L 1664.003906 451.71875 L 1662.253906 452.265625 L 1660.667969 453.085938 L 1659.191406 454.125 L 1657.878906 455.382812 L 1656.621094 456.859375 L 1655.632812 458.5 L 1654.8125 460.304688 L 1654.210938 462.277344 L 1653.828125 464.410156 L 1653.664062 466.707031 L 1653.664062 467.636719 L 1653.71875 470.042969 L 1654.046875 472.230469 L 1654.59375 474.253906 L 1655.304688 476.167969 L 1656.292969 477.917969 L 1657.496094 479.449219 L 1658.753906 480.820312 L 1660.175781 481.914062 L 1661.707031 482.789062 L 1663.347656 483.390625 L 1665.152344 483.828125 L 1667.066406 483.992188 L 1667.175781 484.046875 L 1668.761719 484.046875 L 1669.800781 483.9375 L 1670.839844 483.71875 L 1671.824219 483.5 L 1672.808594 483.171875 L 1673.847656 482.734375 L 1673.902344 482.734375 L 1674.011719 482.679688 L 1674.066406 482.625 L 1674.175781 482.625 L 1674.230469 482.570312 L 1674.339844 482.515625 L 1670.292969 479.121094 Z M 1672.808594 476.058594 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1649 627 L 1681 627 M 1649 596 L 1681 596 M 1649 596 L 1649 627 M 1681 596 L 1681 627 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1649 627 L 1681 627 M 1649 596 L 1681 596 M 1681 627 L 1681 596 M 1649 627 L 1649 596 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.svg b/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.svg
index dbd392d..201df3b 100644
--- a/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.svg
+++ b/cells/dlxtp/sky130_fd_sc_hs__dlxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 537.5 L 174.5 537.5 Z M 1011.5 537.5 L 1353.5 537.5 L 1353.5 567.5 L 1011.5 567.5 Z M 1011.5 537.5 "/>
 </clipPath>
-<image id="image292" 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="#image292"/>
+  <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 211.5 812.5 L 1706.5 812.5 L 1706.5 860.5 L 211.5 860.5 Z M 211.5 812.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="#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 682.5 633.5 L 711.5 633.5 L 711.5 715.5 L 682.5 715.5 Z M 758.5 633.5 L 787.5 633.5 L 787.5 715.5 L 758.5 715.5 Z M 298.5 667.5 L 327.5 667.5 L 327.5 774.5 L 298.5 774.5 Z M 508.5 633.5 L 537.5 633.5 L 537.5 777.5 L 508.5 777.5 Z M 878.5 633.5 L 907.5 633.5 L 907.5 777.5 L 878.5 777.5 Z M 1259.5 636.5 L 1288.5 636.5 L 1288.5 780.5 L 1259.5 780.5 Z M 1454.5 636.5 L 1483.5 636.5 L 1483.5 780.5 L 1454.5 780.5 Z M 1144.5 636.5 L 1173.5 636.5 L 1173.5 780.5 L 1144.5 780.5 Z M 1595.5 636.5 L 1624.5 636.5 L 1624.5 780.5 L 1595.5 780.5 Z M 1595.5 636.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <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 891.5 284.5 L 920.5 284.5 L 920.5 366.5 L 891.5 366.5 Z M 295.5 284.5 L 324.5 284.5 L 324.5 447.5 L 295.5 447.5 Z M 786.5 284.5 L 816.5 284.5 L 816.5 478.5 L 786.5 478.5 Z M 590.5 397.5 L 619.5 397.5 L 619.5 478.5 L 590.5 478.5 Z M 492.5 284.5 L 521.5 284.5 L 521.5 478.5 L 492.5 478.5 Z M 1478.5 338.5 L 1508.5 338.5 L 1508.5 502.5 L 1478.5 502.5 Z M 1592.5 284.5 L 1622.5 284.5 L 1622.5 502.5 L 1592.5 502.5 Z M 1111.5 314.5 L 1140.5 314.5 L 1140.5 532.5 L 1111.5 532.5 Z M 1231.5 368.5 L 1260.5 368.5 L 1260.5 532.5 L 1231.5 532.5 Z M 1231.5 368.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 241.5 195.5 L 274.5 195.5 L 274.5 228.5 L 241.5 228.5 Z M 1643.5 195.5 L 1676.5 195.5 L 1676.5 228.5 L 1643.5 228.5 Z M 1550.5 195.5 L 1583.5 195.5 L 1583.5 228.5 L 1550.5 228.5 Z M 1456.5 195.5 L 1489.5 195.5 L 1489.5 228.5 L 1456.5 228.5 Z M 1363.5 195.5 L 1396.5 195.5 L 1396.5 228.5 L 1363.5 228.5 Z M 1269.5 195.5 L 1302.5 195.5 L 1302.5 228.5 L 1269.5 228.5 Z M 1176.5 195.5 L 1209.5 195.5 L 1209.5 228.5 L 1176.5 228.5 Z M 1082.5 195.5 L 1115.5 195.5 L 1115.5 228.5 L 1082.5 228.5 Z M 989.5 195.5 L 1022.5 195.5 L 1022.5 228.5 L 989.5 228.5 Z M 895.5 195.5 L 929.5 195.5 L 929.5 228.5 L 895.5 228.5 Z M 802.5 195.5 L 835.5 195.5 L 835.5 228.5 L 802.5 228.5 Z M 709.5 195.5 L 742.5 195.5 L 742.5 228.5 L 709.5 228.5 Z M 615.5 195.5 L 648.5 195.5 L 648.5 228.5 L 615.5 228.5 Z M 522.5 195.5 L 555.5 195.5 L 555.5 228.5 L 522.5 228.5 Z M 428.5 195.5 L 461.5 195.5 L 461.5 228.5 L 428.5 228.5 Z M 335.5 195.5 L 368.5 195.5 L 368.5 228.5 L 335.5 228.5 Z M 241.5 843.5 L 274.5 843.5 L 274.5 877.5 L 241.5 877.5 Z M 1643.5 843.5 L 1676.5 843.5 L 1676.5 877.5 L 1643.5 877.5 Z M 1550.5 843.5 L 1583.5 843.5 L 1583.5 877.5 L 1550.5 877.5 Z M 1456.5 843.5 L 1489.5 843.5 L 1489.5 877.5 L 1456.5 877.5 Z M 1363.5 843.5 L 1396.5 843.5 L 1396.5 877.5 L 1363.5 877.5 Z M 1269.5 843.5 L 1302.5 843.5 L 1302.5 877.5 L 1269.5 877.5 Z M 1176.5 843.5 L 1209.5 843.5 L 1209.5 877.5 L 1176.5 877.5 Z M 1082.5 843.5 L 1115.5 843.5 L 1115.5 877.5 L 1082.5 877.5 Z M 989.5 843.5 L 1022.5 843.5 L 1022.5 877.5 L 989.5 877.5 Z M 895.5 843.5 L 929.5 843.5 L 929.5 877.5 L 895.5 877.5 Z M 802.5 843.5 L 835.5 843.5 L 835.5 877.5 L 802.5 877.5 Z M 709.5 843.5 L 742.5 843.5 L 742.5 877.5 L 709.5 877.5 Z M 615.5 843.5 L 648.5 843.5 L 648.5 877.5 L 615.5 877.5 Z M 522.5 843.5 L 555.5 843.5 L 555.5 877.5 L 522.5 877.5 Z M 428.5 843.5 L 461.5 843.5 L 461.5 877.5 L 428.5 877.5 Z M 335.5 843.5 L 368.5 843.5 L 368.5 877.5 L 335.5 877.5 Z M 335.5 843.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <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="surface289">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,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 1527.078125 538.085938 L 1527.078125 552.460938 L 1551.804688 552.460938 L 1551.804688 557.175781 L 1521.730469 557.175781 L 1521.730469 515.257812 L 1550.769531 515.257812 L 1550.769531 519.972656 L 1527.078125 519.972656 L 1527.078125 533.371094 L 1549.90625 533.371094 L 1549.90625 538.085938 Z M 1527.078125 538.085938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1456 560 L 1489 560 M 1456 527 L 1489 527 M 1456 527 L 1456 560 M 1489 527 L 1489 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1456 560 L 1489 560 M 1456 527 L 1489 527 M 1489 560 L 1489 527 M 1456 560 L 1456 527 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 214 L 211 223 M 206 219 L 215 219 M 210 220 L 212 220 M 210 218 L 212 218 M 210 218 L 210 220 M 212 218 L 212 220 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.svg b/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.svg
index 4ea0d56..a4bd154 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.svg
+++ b/cells/dlygate4sd1/sky130_fd_sc_hs__dlygate4sd1_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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="#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 1126.5 664.5 L 1160.5 664.5 L 1160.5 760.5 L 1126.5 760.5 Z M 615.5 737.5 L 649.5 737.5 L 649.5 833.5 L 615.5 833.5 Z M 818.5 737.5 L 852.5 737.5 L 852.5 833.5 L 818.5 833.5 Z M 1239.5 664.5 L 1274.5 664.5 L 1274.5 833.5 L 1239.5 833.5 Z M 1239.5 664.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <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 618.5 287.5 L 653.5 287.5 L 653.5 383.5 L 618.5 383.5 Z M 812.5 240.5 L 853.5 240.5 L 853.5 469.5 L 812.5 469.5 Z M 1119.5 267.5 L 1160.5 267.5 L 1160.5 496.5 L 1119.5 496.5 Z M 1242.5 240.5 L 1276.5 240.5 L 1276.5 496.5 L 1242.5 496.5 Z M 1242.5 240.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image297" 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="#image297"/>
+  <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="surface291">
+<g id="surface320">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,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 1349.855469 282.8125 L 1359.988281 297.5 L 1355.46875 297.5 L 1347.65625 285.5625 L 1339.800781 297.5 L 1335.363281 297.5 L 1345.496094 282.8125 L 1335.992188 268.871094 L 1340.429688 268.871094 L 1347.773438 280.101562 L 1355.15625 268.871094 L 1359.515625 268.871094 Z M 1349.855469 282.8125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1327 816 L 1366 816 M 1327 777 L 1366 777 M 1327 777 L 1327 816 M 1366 777 L 1366 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1327 816 L 1366 816 M 1327 777 L 1366 777 M 1366 816 L 1366 777 M 1327 816 L 1327 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.svg b/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.svg
index 2156aad..f28de8f 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.svg
+++ b/cells/dlygate4sd2/sky130_fd_sc_hs__dlygate4sd2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1119.5 664.5 L 1160.5 664.5 L 1160.5 760.5 L 1119.5 760.5 Z M 615.5 737.5 L 649.5 737.5 L 649.5 833.5 L 615.5 833.5 Z M 811.5 737.5 L 852.5 737.5 L 852.5 833.5 L 811.5 833.5 Z M 1239.5 664.5 L 1274.5 664.5 L 1274.5 833.5 L 1239.5 833.5 Z M 1239.5 664.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 618.5 287.5 L 653.5 287.5 L 653.5 383.5 L 618.5 383.5 Z M 796.5 240.5 L 853.5 240.5 L 853.5 469.5 L 796.5 469.5 Z M 1103.5 267.5 L 1160.5 267.5 L 1160.5 496.5 L 1103.5 496.5 Z M 1242.5 240.5 L 1276.5 240.5 L 1276.5 496.5 L 1242.5 496.5 Z M 1242.5 240.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface292">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,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 1349.855469 282.8125 L 1359.988281 297.5 L 1355.46875 297.5 L 1347.65625 285.5625 L 1339.800781 297.5 L 1335.363281 297.5 L 1345.496094 282.8125 L 1335.992188 268.871094 L 1340.429688 268.871094 L 1347.773438 280.101562 L 1355.15625 268.871094 L 1359.515625 268.871094 Z M 1349.855469 282.8125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1327 816 L 1366 816 M 1327 777 L 1366 777 M 1327 777 L 1327 816 M 1366 777 L 1366 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1327 816 L 1366 816 M 1327 777 L 1366 777 M 1366 816 L 1366 777 M 1327 816 L 1327 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.svg b/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.svg
index b2f6c72..45ce741 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.svg
+++ b/cells/dlygate4sd3/sky130_fd_sc_hs__dlygate4sd3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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="#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 1119.5 664.5 L 1160.5 664.5 L 1160.5 760.5 L 1119.5 760.5 Z M 615.5 737.5 L 649.5 737.5 L 649.5 833.5 L 615.5 833.5 Z M 812.5 737.5 L 853.5 737.5 L 853.5 833.5 L 812.5 833.5 Z M 1239.5 664.5 L 1274.5 664.5 L 1274.5 833.5 L 1239.5 833.5 Z M 1239.5 664.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <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 618.5 287.5 L 653.5 287.5 L 653.5 383.5 L 618.5 383.5 Z M 738.5 240.5 L 853.5 240.5 L 853.5 469.5 L 738.5 469.5 Z M 1046.5 267.5 L 1160.5 267.5 L 1160.5 496.5 L 1046.5 496.5 Z M 1242.5 240.5 L 1276.5 240.5 L 1276.5 496.5 L 1242.5 496.5 Z M 1242.5 240.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image297" 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="#image297"/>
+  <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="surface291">
+<g id="surface320">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,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 1349.855469 282.8125 L 1359.988281 297.5 L 1355.46875 297.5 L 1347.65625 285.5625 L 1339.800781 297.5 L 1335.363281 297.5 L 1345.496094 282.8125 L 1335.992188 268.871094 L 1340.429688 268.871094 L 1347.773438 280.101562 L 1355.15625 268.871094 L 1359.515625 268.871094 Z M 1349.855469 282.8125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1327 816 L 1366 816 M 1327 777 L 1366 777 M 1327 777 L 1327 816 M 1366 777 L 1366 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1327 816 L 1366 816 M 1327 777 L 1366 777 M 1366 816 L 1366 777 M 1327 816 L 1327 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.svg b/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.svg
index e1be526..1239e8e 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.svg
+++ b/cells/dlymetal6s2s/sky130_fd_sc_hs__dlymetal6s2s_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1164.5 664.5 L 1198.5 664.5 L 1198.5 760.5 L 1164.5 760.5 Z M 834.5 664.5 L 868.5 664.5 L 868.5 760.5 L 834.5 760.5 Z M 504.5 664.5 L 538.5 664.5 L 538.5 760.5 L 504.5 760.5 Z M 1276.5 664.5 L 1310.5 664.5 L 1310.5 833.5 L 1276.5 833.5 Z M 616.5 664.5 L 650.5 664.5 L 650.5 833.5 L 616.5 833.5 Z M 946.5 664.5 L 980.5 664.5 L 980.5 833.5 L 946.5 833.5 Z M 946.5 664.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 964.5 240.5 L 999.5 240.5 L 999.5 496.5 L 964.5 496.5 Z M 846.5 400.5 L 881.5 400.5 L 881.5 496.5 L 846.5 496.5 Z M 1187.5 400.5 L 1221.5 400.5 L 1221.5 496.5 L 1187.5 496.5 Z M 506.5 400.5 L 540.5 400.5 L 540.5 496.5 L 506.5 496.5 Z M 1306.5 240.5 L 1340.5 240.5 L 1340.5 496.5 L 1306.5 496.5 Z M 624.5 240.5 L 658.5 240.5 L 658.5 496.5 L 624.5 496.5 Z M 624.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 666.5 432.5 L 705.5 432.5 L 705.5 440.5 L 666.5 440.5 Z M 996.5 432.5 L 1035.5 432.5 L 1035.5 440.5 L 996.5 440.5 Z M 1326.5 432.5 L 1365.5 432.5 L 1365.5 440.5 L 1326.5 440.5 Z M 996.5 440.5 L 1035.5 440.5 L 1035.5 471.5 L 996.5 471.5 Z M 666.5 440.5 L 705.5 440.5 L 705.5 471.5 L 666.5 471.5 Z M 1326.5 440.5 L 1365.5 440.5 L 1365.5 471.5 L 1326.5 471.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -145,6 +145,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 477.410156 546.757812 L 458.492188 546.757812 L 453.308594 561.5 L 446.644531 561.5 L 464.148438 512.421875 L 472.226562 512.421875 L 489.460938 561.5 L 482.460938 561.5 Z M 475.660156 541.503906 L 468.121094 519.15625 L 460.042969 541.503906 Z M 475.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 447 562 L 486 562 M 447 523 L 486 523 M 447 523 L 447 562 M 486 523 L 486 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 447 562 L 486 562 M 447 523 L 486 523 M 486 562 L 486 523 M 447 562 L 447 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.svg b/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.svg
index cbb1115..b189d2f 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.svg
+++ b/cells/dlymetal6s4s/sky130_fd_sc_hs__dlymetal6s4s_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1164.5 664.5 L 1198.5 664.5 L 1198.5 760.5 L 1164.5 760.5 Z M 834.5 664.5 L 868.5 664.5 L 868.5 760.5 L 834.5 760.5 Z M 504.5 664.5 L 538.5 664.5 L 538.5 760.5 L 504.5 760.5 Z M 1276.5 664.5 L 1310.5 664.5 L 1310.5 833.5 L 1276.5 833.5 Z M 616.5 664.5 L 650.5 664.5 L 650.5 833.5 L 616.5 833.5 Z M 946.5 664.5 L 980.5 664.5 L 980.5 833.5 L 946.5 833.5 Z M 946.5 664.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 964.5 240.5 L 999.5 240.5 L 999.5 496.5 L 964.5 496.5 Z M 846.5 400.5 L 881.5 400.5 L 881.5 496.5 L 846.5 496.5 Z M 1187.5 400.5 L 1221.5 400.5 L 1221.5 496.5 L 1187.5 496.5 Z M 506.5 400.5 L 540.5 400.5 L 540.5 496.5 L 506.5 496.5 Z M 1306.5 240.5 L 1340.5 240.5 L 1340.5 496.5 L 1306.5 496.5 Z M 624.5 240.5 L 658.5 240.5 L 658.5 496.5 L 624.5 496.5 Z M 624.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 666.5 432.5 L 705.5 432.5 L 705.5 440.5 L 666.5 440.5 Z M 996.5 432.5 L 1035.5 432.5 L 1035.5 440.5 L 996.5 440.5 Z M 1326.5 432.5 L 1365.5 432.5 L 1365.5 440.5 L 1326.5 440.5 Z M 996.5 440.5 L 1035.5 440.5 L 1035.5 471.5 L 996.5 471.5 Z M 666.5 440.5 L 705.5 440.5 L 705.5 471.5 L 666.5 471.5 Z M 1326.5 440.5 L 1365.5 440.5 L 1365.5 471.5 L 1326.5 471.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -145,6 +145,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 477.410156 546.757812 L 458.492188 546.757812 L 453.308594 561.5 L 446.644531 561.5 L 464.148438 512.421875 L 472.226562 512.421875 L 489.460938 561.5 L 482.460938 561.5 Z M 475.660156 541.503906 L 468.121094 519.15625 L 460.042969 541.503906 Z M 475.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 447 562 L 486 562 M 447 523 L 486 523 M 447 523 L 447 562 M 486 523 L 486 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 447 562 L 486 562 M 447 523 L 486 523 M 486 562 L 486 523 M 447 562 L 447 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.svg b/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.svg
index b8a8b1c..a067ef9 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.svg
+++ b/cells/dlymetal6s6s/sky130_fd_sc_hs__dlymetal6s6s_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1164.5 664.5 L 1198.5 664.5 L 1198.5 760.5 L 1164.5 760.5 Z M 834.5 664.5 L 868.5 664.5 L 868.5 760.5 L 834.5 760.5 Z M 504.5 664.5 L 538.5 664.5 L 538.5 760.5 L 504.5 760.5 Z M 1276.5 664.5 L 1310.5 664.5 L 1310.5 833.5 L 1276.5 833.5 Z M 616.5 664.5 L 650.5 664.5 L 650.5 833.5 L 616.5 833.5 Z M 946.5 664.5 L 980.5 664.5 L 980.5 833.5 L 946.5 833.5 Z M 946.5 664.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 964.5 240.5 L 999.5 240.5 L 999.5 496.5 L 964.5 496.5 Z M 846.5 400.5 L 881.5 400.5 L 881.5 496.5 L 846.5 496.5 Z M 1187.5 400.5 L 1221.5 400.5 L 1221.5 496.5 L 1187.5 496.5 Z M 506.5 400.5 L 540.5 400.5 L 540.5 496.5 L 506.5 496.5 Z M 1306.5 240.5 L 1340.5 240.5 L 1340.5 496.5 L 1306.5 496.5 Z M 624.5 240.5 L 658.5 240.5 L 658.5 496.5 L 624.5 496.5 Z M 624.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 666.5 432.5 L 705.5 432.5 L 705.5 440.5 L 666.5 440.5 Z M 996.5 432.5 L 1035.5 432.5 L 1035.5 440.5 L 996.5 440.5 Z M 1326.5 432.5 L 1365.5 432.5 L 1365.5 440.5 L 1326.5 440.5 Z M 996.5 440.5 L 1035.5 440.5 L 1035.5 471.5 L 996.5 471.5 Z M 666.5 440.5 L 705.5 440.5 L 705.5 471.5 L 666.5 471.5 Z M 1326.5 440.5 L 1365.5 440.5 L 1365.5 471.5 L 1326.5 471.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -145,6 +145,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 477.410156 546.757812 L 458.492188 546.757812 L 453.308594 561.5 L 446.644531 561.5 L 464.148438 512.421875 L 472.226562 512.421875 L 489.460938 561.5 L 482.460938 561.5 Z M 475.660156 541.503906 L 468.121094 519.15625 L 460.042969 541.503906 Z M 475.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 447 562 L 486 562 M 447 523 L 486 523 M 447 523 L 447 562 M 486 523 L 486 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 447 562 L 486 562 M 447 523 L 486 523 M 486 562 L 486 523 M 447 562 L 447 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_1.svg b/cells/ebufn/sky130_fd_sc_hs__ebufn_1.svg
index 83eece4..d380b22 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_1.svg
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1229.5 664.5 L 1263.5 664.5 L 1263.5 833.5 L 1229.5 833.5 Z M 647.5 707.5 L 681.5 707.5 L 681.5 833.5 L 647.5 833.5 Z M 750.5 707.5 L 784.5 707.5 L 784.5 833.5 L 750.5 833.5 Z M 1140.5 664.5 L 1174.5 664.5 L 1174.5 833.5 L 1140.5 833.5 Z M 1140.5 664.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 763.5 263.5 L 797.5 263.5 L 797.5 455.5 L 763.5 455.5 Z M 620.5 263.5 L 655.5 263.5 L 655.5 455.5 L 620.5 455.5 Z M 1232.5 240.5 L 1267.5 240.5 L 1267.5 496.5 L 1232.5 496.5 Z M 1136.5 240.5 L 1170.5 240.5 L 1170.5 496.5 L 1136.5 496.5 Z M 1136.5 240.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,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 770.707031 547.648438 L 770.570312 549.804688 L 770.234375 551.753906 L 769.628906 553.574219 L 768.820312 555.1875 L 767.742188 556.738281 L 766.464844 558.082031 L 765.050781 559.226562 L 763.570312 560.101562 L 761.886719 560.777344 L 760.136719 561.316406 L 758.25 561.585938 L 756.230469 561.652344 L 734.082031 561.652344 L 734.082031 512.574219 L 754.011719 512.574219 L 756.90625 512.777344 L 759.464844 513.246094 L 761.753906 514.054688 L 763.703125 515.199219 L 765.386719 516.679688 L 766.734375 518.5 L 767.273438 519.507812 L 767.742188 520.585938 L 768.082031 521.59375 L 768.351562 522.738281 L 768.484375 523.882812 L 768.550781 525.027344 L 768.351562 527.453125 L 767.742188 529.539062 L 766.800781 531.492188 L 765.457031 533.105469 L 763.773438 534.589844 L 761.753906 535.734375 L 763.703125 536.609375 L 765.386719 537.550781 L 766.867188 538.628906 L 768.082031 539.839844 L 769.023438 541.117188 L 769.765625 542.464844 L 770.03125 543.273438 L 770.234375 544.082031 L 770.4375 544.886719 L 770.570312 545.832031 L 770.640625 546.707031 Z M 762.292969 525.902344 L 762.089844 523.882812 L 761.484375 522.203125 L 760.539062 520.71875 L 759.195312 519.644531 L 757.511719 518.835938 L 755.425781 518.296875 L 754.953125 518.296875 L 754.480469 518.230469 L 754.011719 518.160156 L 752.933594 518.160156 L 752.460938 518.09375 L 740.34375 518.09375 L 740.34375 533.714844 L 752.460938 533.714844 L 754.953125 533.578125 L 757.105469 533.175781 L 758.925781 532.433594 L 760.269531 531.425781 L 761.347656 530.078125 L 762.023438 528.460938 L 762.089844 528.125 L 762.15625 527.722656 L 762.222656 527.316406 L 762.222656 526.375 Z M 755.625 556.132812 L 757.511719 556.0625 L 759.195312 555.660156 L 760.675781 554.988281 L 761.886719 554.113281 L 762.898438 552.96875 L 763.703125 551.554688 L 763.90625 551.015625 L 764.042969 550.410156 L 764.242188 549.734375 L 764.3125 549.128906 L 764.378906 548.457031 L 764.445312 547.714844 L 764.3125 546.234375 L 764.042969 544.820312 L 763.570312 543.609375 L 762.898438 542.464844 L 762.023438 541.523438 L 761.011719 540.648438 L 760.269531 540.242188 L 759.464844 539.90625 L 758.589844 539.636719 L 757.644531 539.433594 L 756.636719 539.300781 L 755.625 539.234375 L 740.34375 539.234375 L 740.34375 556.132812 Z M 755.625 556.132812 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 667 562 L 706 562 M 667 523 L 706 523 M 667 523 L 667 562 M 706 523 L 706 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 667 562 L 706 562 M 667 523 L 706 523 M 706 562 L 706 523 M 667 562 L 667 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_2.svg b/cells/ebufn/sky130_fd_sc_hs__ebufn_2.svg
index b6463cb..500a41e 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_2.svg
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 563.5 664.5 L 598.5 664.5 L 598.5 833.5 L 563.5 833.5 Z M 1318.5 687.5 L 1353.5 687.5 L 1353.5 833.5 L 1318.5 833.5 Z M 1188.5 687.5 L 1222.5 687.5 L 1222.5 833.5 L 1188.5 833.5 Z M 891.5 664.5 L 925.5 664.5 L 925.5 833.5 L 891.5 833.5 Z M 791.5 664.5 L 826.5 664.5 L 826.5 833.5 L 791.5 833.5 Z M 662.5 664.5 L 696.5 664.5 L 696.5 833.5 L 662.5 833.5 Z M 662.5 664.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 572.5 240.5 L 607.5 240.5 L 607.5 496.5 L 572.5 496.5 Z M 1324.5 267.5 L 1358.5 267.5 L 1358.5 496.5 L 1324.5 496.5 Z M 1175.5 267.5 L 1209.5 267.5 L 1209.5 496.5 L 1175.5 496.5 Z M 944.5 240.5 L 978.5 240.5 L 978.5 496.5 L 944.5 496.5 Z M 801.5 240.5 L 836.5 240.5 L 836.5 496.5 L 801.5 496.5 Z M 687.5 240.5 L 721.5 240.5 L 721.5 496.5 L 687.5 496.5 Z M 687.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -154,6 +154,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 1302.410156 546.757812 L 1283.492188 546.757812 L 1278.308594 561.5 L 1271.644531 561.5 L 1289.148438 512.421875 L 1297.226562 512.421875 L 1314.460938 561.5 L 1307.460938 561.5 Z M 1300.660156 541.503906 L 1293.121094 519.15625 L 1285.042969 541.503906 Z M 1300.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 562 L 1311 562 M 1272 523 L 1311 523 M 1272 523 L 1272 562 M 1311 523 L 1311 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 562 L 1311 562 M 1272 523 L 1311 523 M 1311 562 L 1311 523 M 1272 562 L 1272 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_4.svg b/cells/ebufn/sky130_fd_sc_hs__ebufn_4.svg
index 056fb6b..67423e4 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_4.svg
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.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 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.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 1491.5 664.5 L 1526.5 664.5 L 1526.5 833.5 L 1491.5 833.5 Z M 405.5 664.5 L 439.5 664.5 L 439.5 833.5 L 405.5 833.5 Z M 504.5 664.5 L 538.5 664.5 L 538.5 833.5 L 504.5 833.5 Z M 797.5 664.5 L 831.5 664.5 L 831.5 833.5 L 797.5 833.5 Z M 895.5 664.5 L 930.5 664.5 L 930.5 833.5 L 895.5 833.5 Z M 994.5 664.5 L 1028.5 664.5 L 1028.5 833.5 L 994.5 833.5 Z M 1093.5 664.5 L 1127.5 664.5 L 1127.5 833.5 L 1093.5 833.5 Z M 1191.5 664.5 L 1225.5 664.5 L 1225.5 833.5 L 1191.5 833.5 Z M 1290.5 664.5 L 1324.5 664.5 L 1324.5 833.5 L 1290.5 833.5 Z M 1388.5 664.5 L 1423.5 664.5 L 1423.5 833.5 L 1388.5 833.5 Z M 1388.5 664.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 1488.5 240.5 L 1522.5 240.5 L 1522.5 496.5 L 1488.5 496.5 Z M 398.5 240.5 L 432.5 240.5 L 432.5 496.5 L 398.5 496.5 Z M 507.5 240.5 L 541.5 240.5 L 541.5 496.5 L 507.5 496.5 Z M 766.5 240.5 L 800.5 240.5 L 800.5 496.5 L 766.5 496.5 Z M 869.5 240.5 L 903.5 240.5 L 903.5 496.5 L 869.5 496.5 Z M 972.5 240.5 L 1007.5 240.5 L 1007.5 496.5 L 972.5 496.5 Z M 1075.5 240.5 L 1110.5 240.5 L 1110.5 496.5 L 1075.5 496.5 Z M 1178.5 240.5 L 1213.5 240.5 L 1213.5 496.5 L 1178.5 496.5 Z M 1282.5 240.5 L 1316.5 240.5 L 1316.5 496.5 L 1282.5 496.5 Z M 1385.5 240.5 L 1419.5 240.5 L 1419.5 496.5 L 1385.5 496.5 Z M 1385.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.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>
@@ -154,6 +154,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 475.410156 546.757812 L 456.492188 546.757812 L 451.308594 561.5 L 444.644531 561.5 L 462.148438 512.421875 L 470.226562 512.421875 L 487.460938 561.5 L 480.460938 561.5 Z M 473.660156 541.503906 L 466.121094 519.15625 L 458.042969 541.503906 Z M 473.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 445 562 L 484 562 M 445 523 L 484 523 M 445 523 L 445 562 M 484 523 L 484 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 445 562 L 484 562 M 445 523 L 484 523 M 484 562 L 484 523 M 445 562 L 445 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ebufn/sky130_fd_sc_hs__ebufn_8.svg b/cells/ebufn/sky130_fd_sc_hs__ebufn_8.svg
index 4947303..b3d1695 100644
--- a/cells/ebufn/sky130_fd_sc_hs__ebufn_8.svg
+++ b/cells/ebufn/sky130_fd_sc_hs__ebufn_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 269.5 L 1743.5 269.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 269.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 201.5 739.5 L 1716.5 739.5 L 1716.5 774.5 L 201.5 774.5 Z M 201.5 739.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1634.5 615.5 L 1655.5 615.5 L 1655.5 721.5 L 1634.5 721.5 Z M 261.5 615.5 L 283.5 615.5 L 283.5 721.5 L 261.5 721.5 Z M 323.5 615.5 L 345.5 615.5 L 345.5 721.5 L 323.5 721.5 Z M 388.5 615.5 L 410.5 615.5 L 410.5 721.5 L 388.5 721.5 Z M 450.5 615.5 L 471.5 615.5 L 471.5 721.5 L 450.5 721.5 Z M 522.5 615.5 L 543.5 615.5 L 543.5 721.5 L 522.5 721.5 Z M 593.5 615.5 L 615.5 615.5 L 615.5 721.5 L 593.5 721.5 Z M 667.5 615.5 L 689.5 615.5 L 689.5 721.5 L 667.5 721.5 Z M 737.5 615.5 L 758.5 615.5 L 758.5 721.5 L 737.5 721.5 Z M 799.5 615.5 L 820.5 615.5 L 820.5 721.5 L 799.5 721.5 Z M 860.5 615.5 L 882.5 615.5 L 882.5 721.5 L 860.5 721.5 Z M 922.5 615.5 L 944.5 615.5 L 944.5 721.5 L 922.5 721.5 Z M 984.5 615.5 L 1005.5 615.5 L 1005.5 721.5 L 984.5 721.5 Z M 1045.5 615.5 L 1067.5 615.5 L 1067.5 721.5 L 1045.5 721.5 Z M 1107.5 615.5 L 1129.5 615.5 L 1129.5 721.5 L 1107.5 721.5 Z M 1169.5 615.5 L 1190.5 615.5 L 1190.5 721.5 L 1169.5 721.5 Z M 1231.5 615.5 L 1252.5 615.5 L 1252.5 721.5 L 1231.5 721.5 Z M 1510.5 615.5 L 1532.5 615.5 L 1532.5 721.5 L 1510.5 721.5 Z M 1572.5 615.5 L 1594.5 615.5 L 1594.5 721.5 L 1572.5 721.5 Z M 1572.5 615.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1633.5 349.5 L 1654.5 349.5 L 1654.5 510.5 L 1633.5 510.5 Z M 263.5 349.5 L 285.5 349.5 L 285.5 510.5 L 263.5 510.5 Z M 328.5 349.5 L 350.5 349.5 L 350.5 510.5 L 328.5 510.5 Z M 393.5 349.5 L 414.5 349.5 L 414.5 510.5 L 393.5 510.5 Z M 464.5 349.5 L 486.5 349.5 L 486.5 510.5 L 464.5 510.5 Z M 529.5 349.5 L 550.5 349.5 L 550.5 510.5 L 529.5 510.5 Z M 593.5 349.5 L 615.5 349.5 L 615.5 510.5 L 593.5 510.5 Z M 665.5 349.5 L 687.5 349.5 L 687.5 510.5 L 665.5 510.5 Z M 735.5 349.5 L 756.5 349.5 L 756.5 510.5 L 735.5 510.5 Z M 801.5 349.5 L 823.5 349.5 L 823.5 510.5 L 801.5 510.5 Z M 880.5 349.5 L 902.5 349.5 L 902.5 510.5 L 880.5 510.5 Z M 945.5 349.5 L 967.5 349.5 L 967.5 510.5 L 945.5 510.5 Z M 1024.5 349.5 L 1045.5 349.5 L 1045.5 510.5 L 1024.5 510.5 Z M 1088.5 349.5 L 1110.5 349.5 L 1110.5 510.5 L 1088.5 510.5 Z M 1167.5 349.5 L 1189.5 349.5 L 1189.5 510.5 L 1167.5 510.5 Z M 1232.5 349.5 L 1253.5 349.5 L 1253.5 510.5 L 1232.5 510.5 Z M 1321.5 349.5 L 1342.5 349.5 L 1342.5 510.5 L 1321.5 510.5 Z M 1497.5 349.5 L 1518.5 349.5 L 1518.5 510.5 L 1497.5 510.5 Z M 1568.5 349.5 L 1590.5 349.5 L 1590.5 510.5 L 1568.5 510.5 Z M 1568.5 349.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 223.5 284.5 L 248.5 284.5 L 248.5 308.5 L 223.5 308.5 Z M 1670.5 284.5 L 1694.5 284.5 L 1694.5 308.5 L 1670.5 308.5 Z M 1601.5 284.5 L 1625.5 284.5 L 1625.5 308.5 L 1601.5 308.5 Z M 1532.5 284.5 L 1556.5 284.5 L 1556.5 308.5 L 1532.5 308.5 Z M 1463.5 284.5 L 1487.5 284.5 L 1487.5 308.5 L 1463.5 308.5 Z M 1394.5 284.5 L 1418.5 284.5 L 1418.5 308.5 L 1394.5 308.5 Z M 1325.5 284.5 L 1350.5 284.5 L 1350.5 308.5 L 1325.5 308.5 Z M 1256.5 284.5 L 1281.5 284.5 L 1281.5 308.5 L 1256.5 308.5 Z M 1187.5 284.5 L 1212.5 284.5 L 1212.5 308.5 L 1187.5 308.5 Z M 1119.5 284.5 L 1143.5 284.5 L 1143.5 308.5 L 1119.5 308.5 Z M 1050.5 284.5 L 1074.5 284.5 L 1074.5 308.5 L 1050.5 308.5 Z M 981.5 284.5 L 1005.5 284.5 L 1005.5 308.5 L 981.5 308.5 Z M 912.5 284.5 L 936.5 284.5 L 936.5 308.5 L 912.5 308.5 Z M 843.5 284.5 L 867.5 284.5 L 867.5 308.5 L 843.5 308.5 Z M 774.5 284.5 L 799.5 284.5 L 799.5 308.5 L 774.5 308.5 Z M 705.5 284.5 L 730.5 284.5 L 730.5 308.5 L 705.5 308.5 Z M 636.5 284.5 L 661.5 284.5 L 661.5 308.5 L 636.5 308.5 Z M 568.5 284.5 L 592.5 284.5 L 592.5 308.5 L 568.5 308.5 Z M 499.5 284.5 L 523.5 284.5 L 523.5 308.5 L 499.5 308.5 Z M 430.5 284.5 L 454.5 284.5 L 454.5 308.5 L 430.5 308.5 Z M 361.5 284.5 L 385.5 284.5 L 385.5 308.5 L 361.5 308.5 Z M 292.5 284.5 L 317.5 284.5 L 317.5 308.5 L 292.5 308.5 Z M 223.5 762.5 L 248.5 762.5 L 248.5 786.5 L 223.5 786.5 Z M 1670.5 762.5 L 1694.5 762.5 L 1694.5 786.5 L 1670.5 786.5 Z M 1601.5 762.5 L 1625.5 762.5 L 1625.5 786.5 L 1601.5 786.5 Z M 1532.5 762.5 L 1556.5 762.5 L 1556.5 786.5 L 1532.5 786.5 Z M 1463.5 762.5 L 1487.5 762.5 L 1487.5 786.5 L 1463.5 786.5 Z M 1394.5 762.5 L 1418.5 762.5 L 1418.5 786.5 L 1394.5 786.5 Z M 1325.5 762.5 L 1350.5 762.5 L 1350.5 786.5 L 1325.5 786.5 Z M 1256.5 762.5 L 1281.5 762.5 L 1281.5 786.5 L 1256.5 786.5 Z M 1187.5 762.5 L 1212.5 762.5 L 1212.5 786.5 L 1187.5 786.5 Z M 1119.5 762.5 L 1143.5 762.5 L 1143.5 786.5 L 1119.5 786.5 Z M 1050.5 762.5 L 1074.5 762.5 L 1074.5 786.5 L 1050.5 786.5 Z M 981.5 762.5 L 1005.5 762.5 L 1005.5 786.5 L 981.5 786.5 Z M 912.5 762.5 L 936.5 762.5 L 936.5 786.5 L 912.5 786.5 Z M 843.5 762.5 L 867.5 762.5 L 867.5 786.5 L 843.5 786.5 Z M 774.5 762.5 L 799.5 762.5 L 799.5 786.5 L 774.5 786.5 Z M 705.5 762.5 L 730.5 762.5 L 730.5 786.5 L 705.5 786.5 Z M 636.5 762.5 L 661.5 762.5 L 661.5 786.5 L 636.5 786.5 Z M 568.5 762.5 L 592.5 762.5 L 592.5 786.5 L 568.5 786.5 Z M 499.5 762.5 L 523.5 762.5 L 523.5 786.5 L 499.5 786.5 Z M 430.5 762.5 L 454.5 762.5 L 454.5 786.5 L 430.5 786.5 Z M 361.5 762.5 L 385.5 762.5 L 385.5 786.5 L 361.5 786.5 Z M 292.5 762.5 L 317.5 762.5 L 317.5 786.5 L 292.5 786.5 Z M 292.5 762.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface340">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 316.945312 519.828125 L 316.945312 523.359375 L 298.601562 547.050781 L 317.03125 547.050781 L 317.03125 550.5 L 293.679688 550.5 L 293.679688 547.050781 L 312.105469 523.277344 L 294.855469 523.277344 L 294.855469 519.828125 Z M 316.945312 519.828125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 292 556 L 317 556 M 292 532 L 317 532 M 292 532 L 292 556 M 317 532 L 317 556 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 292 556 L 317 556 M 292 532 L 317 532 M 317 556 L 317 532 M 292 556 L 292 532 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201 300 L 201 309 M 196 305 L 205 305 M 200 306 L 202 306 M 200 304 L 202 304 M 200 304 L 200 306 M 202 304 L 202 306 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.svg b/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.svg
index c436e95..990c3ce 100644
--- a/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.svg
+++ b/cells/edfxbp/sky130_fd_sc_hs__edfxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1743.5 337.5 L 1743.5 535.5 L 174.5 535.5 Z M 1454.5 535.5 L 1568.5 535.5 L 1568.5 536.5 L 1454.5 536.5 Z M 719.5 535.5 L 836.5 535.5 L 836.5 536.5 L 719.5 536.5 Z M 719.5 535.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 194.5 685.5 L 1723.5 685.5 L 1723.5 711.5 L 194.5 711.5 Z M 194.5 685.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#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 1360.5 604.5 L 1376.5 604.5 L 1376.5 648.5 L 1360.5 648.5 Z M 1402.5 604.5 L 1418.5 604.5 L 1418.5 648.5 L 1402.5 648.5 Z M 947.5 615.5 L 963.5 615.5 L 963.5 659.5 L 947.5 659.5 Z M 814.5 615.5 L 830.5 615.5 L 830.5 659.5 L 814.5 659.5 Z M 886.5 615.5 L 902.5 615.5 L 902.5 659.5 L 886.5 659.5 Z M 1662.5 591.5 L 1678.5 591.5 L 1678.5 669.5 L 1662.5 669.5 Z M 1582.5 591.5 L 1598.5 591.5 L 1598.5 669.5 L 1582.5 669.5 Z M 612.5 593.5 L 628.5 593.5 L 628.5 672.5 L 612.5 672.5 Z M 1137.5 593.5 L 1153.5 593.5 L 1153.5 672.5 L 1137.5 672.5 Z M 1020.5 604.5 L 1036.5 604.5 L 1036.5 672.5 L 1020.5 672.5 Z M 458.5 627.5 L 474.5 627.5 L 474.5 672.5 L 458.5 672.5 Z M 1176.5 593.5 L 1192.5 593.5 L 1192.5 672.5 L 1176.5 672.5 Z M 1471.5 604.5 L 1487.5 604.5 L 1487.5 672.5 L 1471.5 672.5 Z M 404.5 627.5 L 420.5 627.5 L 420.5 672.5 L 404.5 672.5 Z M 499.5 627.5 L 515.5 627.5 L 515.5 672.5 L 499.5 672.5 Z M 255.5 627.5 L 271.5 627.5 L 271.5 672.5 L 255.5 672.5 Z M 297.5 627.5 L 312.5 627.5 L 312.5 672.5 L 297.5 672.5 Z M 713.5 593.5 L 729.5 593.5 L 729.5 672.5 L 713.5 672.5 Z M 713.5 593.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 240.5 397.5 L 256.5 397.5 L 256.5 441.5 L 240.5 441.5 Z M 281.5 397.5 L 297.5 397.5 L 297.5 441.5 L 281.5 441.5 Z M 886.5 397.5 L 902.5 397.5 L 902.5 441.5 L 886.5 441.5 Z M 934.5 397.5 L 950.5 397.5 L 950.5 441.5 L 934.5 441.5 Z M 988.5 397.5 L 1004.5 397.5 L 1004.5 441.5 L 988.5 441.5 Z M 515.5 399.5 L 531.5 399.5 L 531.5 443.5 L 515.5 443.5 Z M 473.5 399.5 L 489.5 399.5 L 489.5 443.5 L 473.5 443.5 Z M 401.5 399.5 L 417.5 399.5 L 417.5 467.5 L 401.5 467.5 Z M 1400.5 431.5 L 1416.5 431.5 L 1416.5 476.5 L 1400.5 476.5 Z M 1349.5 431.5 L 1365.5 431.5 L 1365.5 476.5 L 1349.5 476.5 Z M 1054.5 397.5 L 1069.5 397.5 L 1069.5 486.5 L 1054.5 486.5 Z M 1244.5 397.5 L 1260.5 397.5 L 1260.5 503.5 L 1244.5 503.5 Z M 1289.5 397.5 L 1305.5 397.5 L 1305.5 503.5 L 1289.5 503.5 Z M 1609.5 397.5 L 1625.5 397.5 L 1625.5 516.5 L 1609.5 516.5 Z M 1657.5 397.5 L 1673.5 397.5 L 1673.5 516.5 L 1657.5 516.5 Z M 622.5 397.5 L 638.5 397.5 L 638.5 516.5 L 622.5 516.5 Z M 1502.5 411.5 L 1518.5 411.5 L 1518.5 517.5 L 1502.5 517.5 Z M 770.5 398.5 L 785.5 398.5 L 785.5 517.5 L 770.5 517.5 Z M 770.5 398.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 211.5 348.5 L 229.5 348.5 L 229.5 366.5 L 211.5 366.5 Z M 1689.5 348.5 L 1707.5 348.5 L 1707.5 366.5 L 1689.5 366.5 Z M 1638.5 348.5 L 1656.5 348.5 L 1656.5 366.5 L 1638.5 366.5 Z M 1587.5 348.5 L 1605.5 348.5 L 1605.5 366.5 L 1587.5 366.5 Z M 1536.5 348.5 L 1554.5 348.5 L 1554.5 366.5 L 1536.5 366.5 Z M 1485.5 348.5 L 1503.5 348.5 L 1503.5 366.5 L 1485.5 366.5 Z M 1434.5 348.5 L 1452.5 348.5 L 1452.5 366.5 L 1434.5 366.5 Z M 1383.5 348.5 L 1401.5 348.5 L 1401.5 366.5 L 1383.5 366.5 Z M 1332.5 348.5 L 1350.5 348.5 L 1350.5 366.5 L 1332.5 366.5 Z M 1281.5 348.5 L 1299.5 348.5 L 1299.5 366.5 L 1281.5 366.5 Z M 1230.5 348.5 L 1248.5 348.5 L 1248.5 366.5 L 1230.5 366.5 Z M 1179.5 348.5 L 1197.5 348.5 L 1197.5 366.5 L 1179.5 366.5 Z M 1128.5 348.5 L 1146.5 348.5 L 1146.5 366.5 L 1128.5 366.5 Z M 1077.5 348.5 L 1095.5 348.5 L 1095.5 366.5 L 1077.5 366.5 Z M 1026.5 348.5 L 1044.5 348.5 L 1044.5 366.5 L 1026.5 366.5 Z M 975.5 348.5 L 993.5 348.5 L 993.5 366.5 L 975.5 366.5 Z M 924.5 348.5 L 942.5 348.5 L 942.5 366.5 L 924.5 366.5 Z M 873.5 348.5 L 891.5 348.5 L 891.5 366.5 L 873.5 366.5 Z M 822.5 348.5 L 840.5 348.5 L 840.5 366.5 L 822.5 366.5 Z M 771.5 348.5 L 789.5 348.5 L 789.5 366.5 L 771.5 366.5 Z M 720.5 348.5 L 738.5 348.5 L 738.5 366.5 L 720.5 366.5 Z M 669.5 348.5 L 687.5 348.5 L 687.5 366.5 L 669.5 366.5 Z M 618.5 348.5 L 636.5 348.5 L 636.5 366.5 L 618.5 366.5 Z M 567.5 348.5 L 585.5 348.5 L 585.5 366.5 L 567.5 366.5 Z M 516.5 348.5 L 534.5 348.5 L 534.5 366.5 L 516.5 366.5 Z M 465.5 348.5 L 483.5 348.5 L 483.5 366.5 L 465.5 366.5 Z M 414.5 348.5 L 432.5 348.5 L 432.5 366.5 L 414.5 366.5 Z M 363.5 348.5 L 381.5 348.5 L 381.5 366.5 L 363.5 366.5 Z M 312.5 348.5 L 331.5 348.5 L 331.5 366.5 L 312.5 366.5 Z M 261.5 348.5 L 280.5 348.5 L 280.5 366.5 L 261.5 366.5 Z M 516.5 525.5 L 534.5 525.5 L 534.5 526.5 L 516.5 526.5 Z M 1485.5 525.5 L 1503.5 525.5 L 1503.5 543.5 L 1485.5 543.5 Z M 516.5 526.5 L 534.5 526.5 L 534.5 543.5 L 516.5 543.5 Z M 211.5 702.5 L 229.5 702.5 L 229.5 720.5 L 211.5 720.5 Z M 1689.5 702.5 L 1707.5 702.5 L 1707.5 720.5 L 1689.5 720.5 Z M 1638.5 702.5 L 1656.5 702.5 L 1656.5 720.5 L 1638.5 720.5 Z M 1587.5 702.5 L 1605.5 702.5 L 1605.5 720.5 L 1587.5 720.5 Z M 1536.5 702.5 L 1554.5 702.5 L 1554.5 720.5 L 1536.5 720.5 Z M 1485.5 702.5 L 1503.5 702.5 L 1503.5 720.5 L 1485.5 720.5 Z M 1434.5 702.5 L 1452.5 702.5 L 1452.5 720.5 L 1434.5 720.5 Z M 1383.5 702.5 L 1401.5 702.5 L 1401.5 720.5 L 1383.5 720.5 Z M 1332.5 702.5 L 1350.5 702.5 L 1350.5 720.5 L 1332.5 720.5 Z M 1281.5 702.5 L 1299.5 702.5 L 1299.5 720.5 L 1281.5 720.5 Z M 1230.5 702.5 L 1248.5 702.5 L 1248.5 720.5 L 1230.5 720.5 Z M 1179.5 702.5 L 1197.5 702.5 L 1197.5 720.5 L 1179.5 720.5 Z M 1128.5 702.5 L 1146.5 702.5 L 1146.5 720.5 L 1128.5 720.5 Z M 1077.5 702.5 L 1095.5 702.5 L 1095.5 720.5 L 1077.5 720.5 Z M 1026.5 702.5 L 1044.5 702.5 L 1044.5 720.5 L 1026.5 720.5 Z M 975.5 702.5 L 993.5 702.5 L 993.5 720.5 L 975.5 720.5 Z M 924.5 702.5 L 942.5 702.5 L 942.5 720.5 L 924.5 720.5 Z M 873.5 702.5 L 891.5 702.5 L 891.5 720.5 L 873.5 720.5 Z M 822.5 702.5 L 840.5 702.5 L 840.5 720.5 L 822.5 720.5 Z M 771.5 702.5 L 789.5 702.5 L 789.5 720.5 L 771.5 720.5 Z M 720.5 702.5 L 738.5 702.5 L 738.5 720.5 L 720.5 720.5 Z M 669.5 702.5 L 687.5 702.5 L 687.5 720.5 L 669.5 720.5 Z M 618.5 702.5 L 636.5 702.5 L 636.5 720.5 L 618.5 720.5 Z M 567.5 702.5 L 585.5 702.5 L 585.5 720.5 L 567.5 720.5 Z M 516.5 702.5 L 534.5 702.5 L 534.5 720.5 L 516.5 720.5 Z M 465.5 702.5 L 483.5 702.5 L 483.5 720.5 L 465.5 720.5 Z M 414.5 702.5 L 432.5 702.5 L 432.5 720.5 L 414.5 720.5 Z M 363.5 702.5 L 381.5 702.5 L 381.5 720.5 L 363.5 720.5 Z M 312.5 702.5 L 331.5 702.5 L 331.5 720.5 L 312.5 720.5 Z M 261.5 702.5 L 280.5 702.5 L 280.5 720.5 L 261.5 720.5 Z M 261.5 702.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>
@@ -188,6 +188,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1728.53125 601.574219 L 1728.53125 624.070312 L 1725.292969 624.070312 L 1713.660156 605.832031 L 1713.660156 624.070312 L 1710.945312 624.070312 L 1710.945312 601.574219 L 1714.0625 601.574219 L 1725.816406 619.964844 L 1725.816406 601.574219 Z M 1728.53125 601.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1689 475 L 1707 475 M 1689 457 L 1707 457 M 1689 457 L 1689 475 M 1707 457 L 1707 475 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1689 475 L 1707 475 M 1689 457 L 1707 457 M 1707 475 L 1707 457 M 1689 475 L 1689 457 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 194 363 L 194 372 M 189 368 L 198 368 M 193 369 L 195 369 M 193 367 L 195 367 M 193 367 L 193 369 M 195 367 L 195 369 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.svg b/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.svg
index f1d8102..e55db63 100644
--- a/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.svg
+++ b/cells/edfxtp/sky130_fd_sc_hs__edfxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 316.5 L 1744.5 316.5 L 1744.5 535.5 L 174.5 535.5 Z M 611.5 535.5 L 736.5 535.5 L 736.5 544.5 L 611.5 544.5 Z M 611.5 535.5 "/>
 </clipPath>
-<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image370"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 196.5 701.5 L 1721.5 701.5 L 1721.5 730.5 L 196.5 730.5 Z M 196.5 701.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="#image370"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1105.5 602.5 L 1123.5 602.5 L 1123.5 677.5 L 1105.5 677.5 Z M 859.5 628.5 L 876.5 628.5 L 876.5 677.5 L 859.5 677.5 Z M 1025.5 628.5 L 1043.5 628.5 L 1043.5 677.5 L 1025.5 677.5 Z M 972.5 628.5 L 990.5 628.5 L 990.5 677.5 L 972.5 677.5 Z M 510.5 630.5 L 528.5 630.5 L 528.5 679.5 L 510.5 679.5 Z M 417.5 630.5 L 435.5 630.5 L 435.5 679.5 L 417.5 679.5 Z M 468.5 630.5 L 485.5 630.5 L 485.5 679.5 L 468.5 679.5 Z M 1529.5 637.5 L 1547.5 637.5 L 1547.5 687.5 L 1529.5 687.5 Z M 628.5 600.5 L 645.5 600.5 L 645.5 687.5 L 628.5 687.5 Z M 1294.5 600.5 L 1311.5 600.5 L 1311.5 687.5 L 1294.5 687.5 Z M 1646.5 600.5 L 1664.5 600.5 L 1664.5 687.5 L 1646.5 687.5 Z M 1236.5 600.5 L 1254.5 600.5 L 1254.5 687.5 L 1236.5 687.5 Z M 1399.5 637.5 L 1417.5 637.5 L 1417.5 687.5 L 1399.5 687.5 Z M 1354.5 637.5 L 1371.5 637.5 L 1371.5 687.5 L 1354.5 687.5 Z M 302.5 637.5 L 319.5 637.5 L 319.5 687.5 L 302.5 687.5 Z M 742.5 600.5 L 760.5 600.5 L 760.5 687.5 L 742.5 687.5 Z M 256.5 637.5 L 273.5 637.5 L 273.5 687.5 L 256.5 687.5 Z M 256.5 637.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image371"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 246.5 382.5 L 263.5 382.5 L 263.5 431.5 L 246.5 431.5 Z M 292.5 382.5 L 309.5 382.5 L 309.5 431.5 L 292.5 431.5 Z M 939.5 382.5 L 956.5 382.5 L 956.5 431.5 L 939.5 431.5 Z M 1051.5 382.5 L 1069.5 382.5 L 1069.5 431.5 L 1051.5 431.5 Z M 992.5 382.5 L 1009.5 382.5 L 1009.5 431.5 L 992.5 431.5 Z M 1457.5 386.5 L 1474.5 386.5 L 1474.5 435.5 L 1457.5 435.5 Z M 1407.5 386.5 L 1425.5 386.5 L 1425.5 435.5 L 1407.5 435.5 Z M 1540.5 386.5 L 1558.5 386.5 L 1558.5 461.5 L 1540.5 461.5 Z M 551.5 424.5 L 568.5 424.5 L 568.5 474.5 L 551.5 474.5 Z M 505.5 424.5 L 522.5 424.5 L 522.5 474.5 L 505.5 474.5 Z M 425.5 398.5 L 442.5 398.5 L 442.5 474.5 L 425.5 474.5 Z M 1115.5 393.5 L 1133.5 393.5 L 1133.5 492.5 L 1115.5 492.5 Z M 1344.5 382.5 L 1362.5 382.5 L 1362.5 500.5 L 1344.5 500.5 Z M 1234.5 382.5 L 1252.5 382.5 L 1252.5 500.5 L 1234.5 500.5 Z M 824.5 382.5 L 842.5 382.5 L 842.5 514.5 L 824.5 514.5 Z M 1654.5 382.5 L 1672.5 382.5 L 1672.5 514.5 L 1654.5 514.5 Z M 665.5 391.5 L 683.5 391.5 L 683.5 523.5 L 665.5 523.5 Z M 665.5 391.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image372"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 215.5 328.5 L 235.5 328.5 L 235.5 348.5 L 215.5 348.5 Z M 1683.5 328.5 L 1703.5 328.5 L 1703.5 348.5 L 1683.5 348.5 Z M 1627.5 328.5 L 1647.5 328.5 L 1647.5 348.5 L 1627.5 348.5 Z M 1570.5 328.5 L 1590.5 328.5 L 1590.5 348.5 L 1570.5 348.5 Z M 1514.5 328.5 L 1534.5 328.5 L 1534.5 348.5 L 1514.5 348.5 Z M 1457.5 328.5 L 1477.5 328.5 L 1477.5 348.5 L 1457.5 348.5 Z M 1401.5 328.5 L 1421.5 328.5 L 1421.5 348.5 L 1401.5 348.5 Z M 1344.5 328.5 L 1364.5 328.5 L 1364.5 348.5 L 1344.5 348.5 Z M 1288.5 328.5 L 1308.5 328.5 L 1308.5 348.5 L 1288.5 348.5 Z M 1231.5 328.5 L 1251.5 328.5 L 1251.5 348.5 L 1231.5 348.5 Z M 1175.5 328.5 L 1195.5 328.5 L 1195.5 348.5 L 1175.5 348.5 Z M 1118.5 328.5 L 1138.5 328.5 L 1138.5 348.5 L 1118.5 348.5 Z M 1062.5 328.5 L 1082.5 328.5 L 1082.5 348.5 L 1062.5 348.5 Z M 1005.5 328.5 L 1025.5 328.5 L 1025.5 348.5 L 1005.5 348.5 Z M 949.5 328.5 L 969.5 328.5 L 969.5 348.5 L 949.5 348.5 Z M 892.5 328.5 L 912.5 328.5 L 912.5 348.5 L 892.5 348.5 Z M 836.5 328.5 L 856.5 328.5 L 856.5 348.5 L 836.5 348.5 Z M 779.5 328.5 L 799.5 328.5 L 799.5 348.5 L 779.5 348.5 Z M 723.5 328.5 L 743.5 328.5 L 743.5 348.5 L 723.5 348.5 Z M 666.5 328.5 L 686.5 328.5 L 686.5 348.5 L 666.5 348.5 Z M 610.5 328.5 L 630.5 328.5 L 630.5 348.5 L 610.5 348.5 Z M 554.5 328.5 L 574.5 328.5 L 574.5 348.5 L 554.5 348.5 Z M 497.5 328.5 L 517.5 328.5 L 517.5 348.5 L 497.5 348.5 Z M 441.5 328.5 L 461.5 328.5 L 461.5 348.5 L 441.5 348.5 Z M 384.5 328.5 L 404.5 328.5 L 404.5 348.5 L 384.5 348.5 Z M 328.5 328.5 L 348.5 328.5 L 348.5 348.5 L 328.5 348.5 Z M 271.5 328.5 L 291.5 328.5 L 291.5 348.5 L 271.5 348.5 Z M 497.5 524.5 L 517.5 524.5 L 517.5 544.5 L 497.5 544.5 Z M 1570.5 524.5 L 1590.5 524.5 L 1590.5 544.5 L 1570.5 544.5 Z M 215.5 720.5 L 235.5 720.5 L 235.5 740.5 L 215.5 740.5 Z M 1683.5 720.5 L 1703.5 720.5 L 1703.5 740.5 L 1683.5 740.5 Z M 1627.5 720.5 L 1647.5 720.5 L 1647.5 740.5 L 1627.5 740.5 Z M 1570.5 720.5 L 1590.5 720.5 L 1590.5 740.5 L 1570.5 740.5 Z M 1514.5 720.5 L 1534.5 720.5 L 1534.5 740.5 L 1514.5 740.5 Z M 1457.5 720.5 L 1477.5 720.5 L 1477.5 740.5 L 1457.5 740.5 Z M 1401.5 720.5 L 1421.5 720.5 L 1421.5 740.5 L 1401.5 740.5 Z M 1344.5 720.5 L 1364.5 720.5 L 1364.5 740.5 L 1344.5 740.5 Z M 1288.5 720.5 L 1308.5 720.5 L 1308.5 740.5 L 1288.5 740.5 Z M 1231.5 720.5 L 1251.5 720.5 L 1251.5 740.5 L 1231.5 740.5 Z M 1175.5 720.5 L 1195.5 720.5 L 1195.5 740.5 L 1175.5 740.5 Z M 1118.5 720.5 L 1138.5 720.5 L 1138.5 740.5 L 1118.5 740.5 Z M 1062.5 720.5 L 1082.5 720.5 L 1082.5 740.5 L 1062.5 740.5 Z M 1005.5 720.5 L 1025.5 720.5 L 1025.5 740.5 L 1005.5 740.5 Z M 949.5 720.5 L 969.5 720.5 L 969.5 740.5 L 949.5 740.5 Z M 892.5 720.5 L 912.5 720.5 L 912.5 740.5 L 892.5 740.5 Z M 836.5 720.5 L 856.5 720.5 L 856.5 740.5 L 836.5 740.5 Z M 779.5 720.5 L 799.5 720.5 L 799.5 740.5 L 779.5 740.5 Z M 723.5 720.5 L 743.5 720.5 L 743.5 740.5 L 723.5 740.5 Z M 666.5 720.5 L 686.5 720.5 L 686.5 740.5 L 666.5 740.5 Z M 610.5 720.5 L 630.5 720.5 L 630.5 740.5 L 610.5 740.5 Z M 554.5 720.5 L 574.5 720.5 L 574.5 740.5 L 554.5 740.5 Z M 497.5 720.5 L 517.5 720.5 L 517.5 740.5 L 497.5 740.5 Z M 441.5 720.5 L 461.5 720.5 L 461.5 740.5 L 441.5 740.5 Z M 384.5 720.5 L 404.5 720.5 L 404.5 740.5 L 384.5 740.5 Z M 328.5 720.5 L 348.5 720.5 L 348.5 740.5 L 328.5 740.5 Z M 271.5 720.5 L 291.5 720.5 L 291.5 740.5 L 271.5 740.5 Z M 271.5 720.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image373"/>
 </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="surface367">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -181,6 +181,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1650.203125 416.464844 L 1648.554688 418.5 L 1644.871094 415.449219 L 1643.820312 416.011719 L 1642.769531 416.429688 L 1641.679688 416.78125 L 1640.523438 417.027344 L 1639.367188 417.167969 L 1638.175781 417.238281 L 1636.5625 417.132812 L 1635.054688 416.886719 L 1633.652344 416.464844 L 1632.320312 415.90625 L 1631.058594 415.167969 L 1629.933594 414.222656 L 1628.917969 413.207031 L 1628.042969 412.046875 L 1627.339844 410.785156 L 1626.742188 409.417969 L 1626.289062 407.945312 L 1626.007812 406.332031 L 1625.9375 405.949219 L 1625.902344 405.527344 L 1625.867188 405.140625 L 1625.832031 404.71875 L 1625.832031 403.84375 L 1625.902344 402.089844 L 1626.148438 400.40625 L 1626.535156 398.863281 L 1627.09375 397.390625 L 1627.796875 396.023438 L 1628.707031 394.761719 L 1629.621094 393.746094 L 1630.671875 392.832031 L 1631.828125 392.0625 L 1633.054688 391.464844 L 1634.386719 390.976562 L 1635.859375 390.625 L 1636.210938 390.589844 L 1636.984375 390.519531 L 1637.367188 390.484375 L 1637.753906 390.484375 L 1638.175781 390.449219 L 1639.753906 390.554688 L 1641.261719 390.800781 L 1642.664062 391.222656 L 1643.996094 391.78125 L 1645.257812 392.519531 L 1646.414062 393.429688 L 1647.394531 394.480469 L 1648.273438 395.605469 L 1648.972656 396.832031 L 1649.570312 398.199219 L 1650.027344 399.671875 L 1650.339844 401.214844 L 1650.375 401.667969 L 1650.480469 402.933594 L 1650.480469 403.351562 L 1650.515625 403.773438 L 1650.410156 405.738281 L 1650.097656 407.59375 L 1649.605469 409.3125 L 1648.902344 410.925781 L 1647.992188 412.398438 L 1646.90625 413.765625 Z M 1641.367188 409.242188 L 1644.484375 411.804688 L 1645.328125 410.75 L 1646.027344 409.558594 L 1646.554688 408.261719 L 1646.941406 406.894531 L 1647.152344 405.421875 L 1647.257812 403.808594 L 1647.1875 402.335938 L 1646.976562 400.933594 L 1646.625 399.636719 L 1646.167969 398.445312 L 1645.574219 397.320312 L 1644.835938 396.304688 L 1643.996094 395.464844 L 1643.117188 394.761719 L 1642.136719 394.203125 L 1641.085938 393.78125 L 1639.929688 393.5 L 1638.734375 393.324219 L 1638.175781 393.324219 L 1636.914062 393.429688 L 1635.71875 393.640625 L 1634.597656 393.992188 L 1633.582031 394.515625 L 1632.632812 395.183594 L 1631.792969 395.988281 L 1630.988281 396.9375 L 1630.355469 397.988281 L 1629.828125 399.144531 L 1629.445312 400.40625 L 1629.199219 401.773438 L 1629.09375 403.246094 L 1629.09375 403.84375 L 1629.128906 405.386719 L 1629.339844 406.789062 L 1629.6875 408.085938 L 1630.144531 409.3125 L 1630.777344 410.433594 L 1631.546875 411.417969 L 1632.355469 412.292969 L 1633.265625 412.996094 L 1634.246094 413.554688 L 1635.300781 413.941406 L 1636.457031 414.222656 L 1637.683594 414.328125 L 1637.753906 414.363281 L 1638.769531 414.363281 L 1639.4375 414.292969 L 1640.101562 414.152344 L 1640.734375 414.011719 L 1641.367188 413.800781 L 1642.03125 413.519531 L 1642.066406 413.519531 L 1642.136719 413.484375 L 1642.171875 413.449219 L 1642.242188 413.449219 L 1642.277344 413.414062 L 1642.347656 413.378906 L 1639.753906 411.207031 Z M 1641.367188 409.242188 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1627 685 L 1647 685 M 1627 665 L 1647 665 M 1627 665 L 1627 685 M 1647 665 L 1647 685 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1627 685 L 1647 685 M 1627 665 L 1647 665 M 1647 685 L 1647 665 M 1627 685 L 1627 665 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 344 L 196 353 M 191 349 L 200 349 M 195 350 L 197 350 M 195 348 L 197 348 M 195 348 L 195 350 M 197 348 L 197 350 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_1.svg b/cells/einvn/sky130_fd_sc_hs__einvn_1.svg
index 9f34a60..847d6ba 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_1.svg
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image286" 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="#image286"/>
+  <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 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.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="#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 859.5 616.5 L 893.5 616.5 L 893.5 712.5 L 859.5 712.5 Z M 1065.5 634.5 L 1099.5 634.5 L 1099.5 804.5 L 1065.5 804.5 Z M 976.5 634.5 L 1010.5 634.5 L 1010.5 804.5 L 976.5 804.5 Z M 976.5 634.5 "/>
 </clipPath>
-<image id="image287" 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="#image287"/>
+  <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 850.5 331.5 L 884.5 331.5 L 884.5 478.5 L 850.5 478.5 Z M 1068.5 240.5 L 1103.5 240.5 L 1103.5 496.5 L 1068.5 496.5 Z M 972.5 240.5 L 1007.5 240.5 L 1007.5 496.5 L 972.5 496.5 Z M 972.5 240.5 "/>
 </clipPath>
-<image id="image288" 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="#image288"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image289" 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="#image289"/>
+  <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="surface283">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1046.707031 547.648438 L 1046.570312 549.804688 L 1046.234375 551.753906 L 1045.628906 553.574219 L 1044.820312 555.1875 L 1043.742188 556.738281 L 1042.464844 558.082031 L 1041.050781 559.226562 L 1039.570312 560.101562 L 1037.886719 560.777344 L 1036.136719 561.316406 L 1034.25 561.585938 L 1032.230469 561.652344 L 1010.082031 561.652344 L 1010.082031 512.574219 L 1030.011719 512.574219 L 1032.90625 512.777344 L 1035.464844 513.246094 L 1037.753906 514.054688 L 1039.703125 515.199219 L 1041.386719 516.679688 L 1042.734375 518.5 L 1043.273438 519.507812 L 1043.742188 520.585938 L 1044.082031 521.59375 L 1044.351562 522.738281 L 1044.484375 523.882812 L 1044.550781 525.027344 L 1044.351562 527.453125 L 1043.742188 529.539062 L 1042.800781 531.492188 L 1041.457031 533.105469 L 1039.773438 534.589844 L 1037.753906 535.734375 L 1039.703125 536.609375 L 1041.386719 537.550781 L 1042.867188 538.628906 L 1044.082031 539.839844 L 1045.023438 541.117188 L 1045.765625 542.464844 L 1046.03125 543.273438 L 1046.234375 544.082031 L 1046.4375 544.886719 L 1046.570312 545.832031 L 1046.640625 546.707031 Z M 1038.292969 525.902344 L 1038.089844 523.882812 L 1037.484375 522.203125 L 1036.539062 520.71875 L 1035.195312 519.644531 L 1033.511719 518.835938 L 1031.425781 518.296875 L 1030.953125 518.296875 L 1030.480469 518.230469 L 1030.011719 518.160156 L 1028.933594 518.160156 L 1028.460938 518.09375 L 1016.34375 518.09375 L 1016.34375 533.714844 L 1028.460938 533.714844 L 1030.953125 533.578125 L 1033.105469 533.175781 L 1034.925781 532.433594 L 1036.269531 531.425781 L 1037.347656 530.078125 L 1038.023438 528.460938 L 1038.089844 528.125 L 1038.15625 527.722656 L 1038.222656 527.316406 L 1038.222656 526.375 Z M 1031.625 556.132812 L 1033.511719 556.0625 L 1035.195312 555.660156 L 1036.675781 554.988281 L 1037.886719 554.113281 L 1038.898438 552.96875 L 1039.703125 551.554688 L 1039.90625 551.015625 L 1040.042969 550.410156 L 1040.242188 549.734375 L 1040.3125 549.128906 L 1040.378906 548.457031 L 1040.445312 547.714844 L 1040.3125 546.234375 L 1040.042969 544.820312 L 1039.570312 543.609375 L 1038.898438 542.464844 L 1038.023438 541.523438 L 1037.011719 540.648438 L 1036.269531 540.242188 L 1035.464844 539.90625 L 1034.589844 539.636719 L 1033.644531 539.433594 L 1032.636719 539.300781 L 1031.625 539.234375 L 1016.34375 539.234375 L 1016.34375 556.132812 Z M 1031.625 556.132812 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 944 562 L 983 562 M 944 523 L 983 523 M 944 523 L 944 562 M 983 523 L 983 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 944 562 L 983 562 M 944 523 L 983 523 M 983 562 L 983 523 M 944 562 L 944 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_2.svg b/cells/einvn/sky130_fd_sc_hs__einvn_2.svg
index 1cfaad1..b9f6249 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_2.svg
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1104.5 664.5 L 1138.5 664.5 L 1138.5 833.5 L 1104.5 833.5 Z M 677.5 737.5 L 711.5 737.5 L 711.5 833.5 L 677.5 833.5 Z M 1204.5 664.5 L 1238.5 664.5 L 1238.5 833.5 L 1204.5 833.5 Z M 1005.5 664.5 L 1040.5 664.5 L 1040.5 833.5 L 1005.5 833.5 Z M 907.5 664.5 L 941.5 664.5 L 941.5 833.5 L 907.5 833.5 Z M 907.5 664.5 "/>
 </clipPath>
-<image id="image309" 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="#image309"/>
+  <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 674.5 240.5 L 709.5 240.5 L 709.5 386.5 L 674.5 386.5 Z M 1111.5 240.5 L 1145.5 240.5 L 1145.5 496.5 L 1111.5 496.5 Z M 905.5 240.5 L 939.5 240.5 L 939.5 496.5 L 905.5 496.5 Z M 1008.5 240.5 L 1042.5 240.5 L 1042.5 496.5 L 1008.5 496.5 Z M 1214.5 240.5 L 1248.5 240.5 L 1248.5 496.5 L 1214.5 496.5 Z M 1214.5 240.5 "/>
 </clipPath>
-<image id="image310" 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="#image310"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <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="surface305">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 1202.613281 427.421875 L 1202.613281 433.078125 L 1173.261719 470.980469 L 1202.75 470.980469 L 1202.75 476.5 L 1165.386719 476.5 L 1165.386719 470.980469 L 1194.871094 432.941406 L 1167.269531 432.941406 L 1167.269531 427.421875 Z M 1202.613281 427.421875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1162 647 L 1201 647 M 1162 608 L 1201 608 M 1162 608 L 1162 647 M 1201 608 L 1201 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1162 647 L 1201 647 M 1162 608 L 1201 608 M 1201 647 L 1201 608 M 1162 647 L 1162 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_4.svg b/cells/einvn/sky130_fd_sc_hs__einvn_4.svg
index f2982f4..564bcaf 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_4.svg
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image287" 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="#image287"/>
+  <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 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.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="#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 1435.5 664.5 L 1470.5 664.5 L 1470.5 833.5 L 1435.5 833.5 Z M 452.5 664.5 L 486.5 664.5 L 486.5 833.5 L 452.5 833.5 Z M 743.5 664.5 L 777.5 664.5 L 777.5 833.5 L 743.5 833.5 Z M 842.5 664.5 L 876.5 664.5 L 876.5 833.5 L 842.5 833.5 Z M 940.5 664.5 L 975.5 664.5 L 975.5 833.5 L 940.5 833.5 Z M 1039.5 664.5 L 1073.5 664.5 L 1073.5 833.5 L 1039.5 833.5 Z M 1137.5 664.5 L 1172.5 664.5 L 1172.5 833.5 L 1137.5 833.5 Z M 1236.5 664.5 L 1270.5 664.5 L 1270.5 833.5 L 1236.5 833.5 Z M 1337.5 664.5 L 1371.5 664.5 L 1371.5 833.5 L 1337.5 833.5 Z M 1337.5 664.5 "/>
 </clipPath>
-<image id="image288" 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="#image288"/>
+  <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 1433.5 240.5 L 1467.5 240.5 L 1467.5 496.5 L 1433.5 496.5 Z M 468.5 240.5 L 502.5 240.5 L 502.5 496.5 L 468.5 496.5 Z M 699.5 240.5 L 734.5 240.5 L 734.5 496.5 L 699.5 496.5 Z M 803.5 240.5 L 837.5 240.5 L 837.5 496.5 L 803.5 496.5 Z M 906.5 240.5 L 940.5 240.5 L 940.5 496.5 L 906.5 496.5 Z M 1020.5 240.5 L 1055.5 240.5 L 1055.5 496.5 L 1020.5 496.5 Z M 1123.5 240.5 L 1158.5 240.5 L 1158.5 496.5 L 1123.5 496.5 Z M 1227.5 240.5 L 1261.5 240.5 L 1261.5 496.5 L 1227.5 496.5 Z M 1330.5 240.5 L 1364.5 240.5 L 1364.5 496.5 L 1330.5 496.5 Z M 1330.5 240.5 "/>
 </clipPath>
-<image id="image289" 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="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image290" 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="#image290"/>
+  <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="surface284">
+<g id="surface312">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1200.613281 512.421875 L 1200.613281 518.078125 L 1171.261719 555.980469 L 1200.75 555.980469 L 1200.75 561.5 L 1163.386719 561.5 L 1163.386719 555.980469 L 1192.871094 517.941406 L 1165.269531 517.941406 L 1165.269531 512.421875 Z M 1200.613281 512.421875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1161 562 L 1200 562 M 1161 523 L 1200 523 M 1161 523 L 1161 562 M 1200 523 L 1200 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1161 562 L 1200 562 M 1161 523 L 1200 523 M 1200 562 L 1200 523 M 1161 562 L 1161 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvn/sky130_fd_sc_hs__einvn_8.svg b/cells/einvn/sky130_fd_sc_hs__einvn_8.svg
index 2a02038..c7344f6 100644
--- a/cells/einvn/sky130_fd_sc_hs__einvn_8.svg
+++ b/cells/einvn/sky130_fd_sc_hs__einvn_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 536.5 L 175.5 536.5 Z M 175.5 229.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1618.5 627.5 L 1643.5 627.5 L 1643.5 749.5 L 1618.5 749.5 Z M 285.5 627.5 L 310.5 627.5 L 310.5 749.5 L 285.5 749.5 Z M 495.5 627.5 L 520.5 627.5 L 520.5 749.5 L 495.5 749.5 Z M 566.5 627.5 L 591.5 627.5 L 591.5 749.5 L 566.5 749.5 Z M 637.5 627.5 L 662.5 627.5 L 662.5 749.5 L 637.5 749.5 Z M 720.5 627.5 L 744.5 627.5 L 744.5 749.5 L 720.5 749.5 Z M 791.5 627.5 L 815.5 627.5 L 815.5 749.5 L 791.5 749.5 Z M 873.5 627.5 L 898.5 627.5 L 898.5 749.5 L 873.5 749.5 Z M 944.5 627.5 L 969.5 627.5 L 969.5 749.5 L 944.5 749.5 Z M 1015.5 627.5 L 1040.5 627.5 L 1040.5 749.5 L 1015.5 749.5 Z M 1086.5 627.5 L 1111.5 627.5 L 1111.5 749.5 L 1086.5 749.5 Z M 1157.5 627.5 L 1182.5 627.5 L 1182.5 749.5 L 1157.5 749.5 Z M 1228.5 627.5 L 1253.5 627.5 L 1253.5 749.5 L 1228.5 749.5 Z M 1299.5 627.5 L 1324.5 627.5 L 1324.5 749.5 L 1299.5 749.5 Z M 1382.5 627.5 L 1407.5 627.5 L 1407.5 749.5 L 1382.5 749.5 Z M 1453.5 627.5 L 1478.5 627.5 L 1478.5 749.5 L 1453.5 749.5 Z M 1524.5 627.5 L 1549.5 627.5 L 1549.5 749.5 L 1524.5 749.5 Z M 1524.5 627.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1616.5 321.5 L 1641.5 321.5 L 1641.5 506.5 L 1616.5 506.5 Z M 285.5 321.5 L 310.5 321.5 L 310.5 506.5 L 285.5 506.5 Z M 452.5 321.5 L 477.5 321.5 L 477.5 506.5 L 452.5 506.5 Z M 535.5 321.5 L 559.5 321.5 L 559.5 506.5 L 535.5 506.5 Z M 609.5 321.5 L 634.5 321.5 L 634.5 506.5 L 609.5 506.5 Z M 692.5 321.5 L 716.5 321.5 L 716.5 506.5 L 692.5 506.5 Z M 766.5 321.5 L 791.5 321.5 L 791.5 506.5 L 766.5 506.5 Z M 848.5 321.5 L 873.5 321.5 L 873.5 506.5 L 848.5 506.5 Z M 923.5 321.5 L 948.5 321.5 L 948.5 506.5 L 923.5 506.5 Z M 1014.5 321.5 L 1038.5 321.5 L 1038.5 506.5 L 1014.5 506.5 Z M 1088.5 321.5 L 1113.5 321.5 L 1113.5 506.5 L 1088.5 506.5 Z M 1162.5 321.5 L 1187.5 321.5 L 1187.5 506.5 L 1162.5 506.5 Z M 1236.5 321.5 L 1261.5 321.5 L 1261.5 506.5 L 1236.5 506.5 Z M 1319.5 321.5 L 1344.5 321.5 L 1344.5 506.5 L 1319.5 506.5 Z M 1393.5 321.5 L 1418.5 321.5 L 1418.5 506.5 L 1393.5 506.5 Z M 1468.5 321.5 L 1492.5 321.5 L 1492.5 506.5 L 1468.5 506.5 Z M 1542.5 321.5 L 1567.5 321.5 L 1567.5 506.5 L 1542.5 506.5 Z M 1542.5 321.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 1053.019531 517.714844 L 1053.019531 521.839844 L 1031.617188 549.476562 L 1053.117188 549.476562 L 1053.117188 553.5 L 1025.875 553.5 L 1025.875 549.476562 L 1047.375 521.738281 L 1027.25 521.738281 L 1027.25 517.714844 Z M 1053.019531 517.714844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1024 558 L 1052 558 M 1024 530 L 1052 530 M 1024 530 L 1024 558 M 1052 530 L 1052 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1024 558 L 1052 558 M 1024 530 L 1052 530 M 1052 558 L 1052 530 M 1024 558 L 1024 530 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_1.svg b/cells/einvp/sky130_fd_sc_hs__einvp_1.svg
index cb04701..315da76 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_1.svg
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.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="#image314"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1107.5 664.5 L 1142.5 664.5 L 1142.5 833.5 L 1107.5 833.5 Z M 906.5 737.5 L 940.5 737.5 L 940.5 833.5 L 906.5 833.5 Z M 1018.5 664.5 L 1052.5 664.5 L 1052.5 833.5 L 1018.5 833.5 Z M 1018.5 664.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1105.5 240.5 L 1140.5 240.5 L 1140.5 469.5 L 1105.5 469.5 Z M 886.5 373.5 L 921.5 373.5 L 921.5 469.5 L 886.5 469.5 Z M 1009.5 240.5 L 1043.5 240.5 L 1043.5 469.5 L 1009.5 469.5 Z M 1009.5 240.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface284">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -156,6 +156,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 1193.410156 546.757812 L 1174.492188 546.757812 L 1169.308594 561.5 L 1162.644531 561.5 L 1180.148438 512.421875 L 1188.226562 512.421875 L 1205.460938 561.5 L 1198.460938 561.5 Z M 1191.660156 541.503906 L 1184.121094 519.15625 L 1176.042969 541.503906 Z M 1191.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1164 562 L 1203 562 M 1164 523 L 1203 523 M 1164 523 L 1164 562 M 1203 523 L 1203 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1164 562 L 1203 562 M 1164 523 L 1203 523 M 1203 562 L 1203 523 M 1164 562 L 1164 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_2.svg b/cells/einvp/sky130_fd_sc_hs__einvp_2.svg
index 871f1ae..fb53096 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_2.svg
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1213.5 661.5 L 1247.5 661.5 L 1247.5 758.5 L 1213.5 758.5 Z M 683.5 664.5 L 718.5 664.5 L 718.5 833.5 L 683.5 833.5 Z M 782.5 664.5 L 816.5 664.5 L 816.5 833.5 L 782.5 833.5 Z M 881.5 664.5 L 915.5 664.5 L 915.5 833.5 L 881.5 833.5 Z M 979.5 664.5 L 1013.5 664.5 L 1013.5 833.5 L 979.5 833.5 Z M 979.5 664.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1214.5 240.5 L 1248.5 240.5 L 1248.5 386.5 L 1214.5 386.5 Z M 675.5 240.5 L 710.5 240.5 L 710.5 496.5 L 675.5 496.5 Z M 779.5 240.5 L 813.5 240.5 L 813.5 496.5 L 779.5 496.5 Z M 882.5 240.5 L 916.5 240.5 L 916.5 496.5 L 882.5 496.5 Z M 985.5 240.5 L 1019.5 240.5 L 1019.5 496.5 L 985.5 496.5 Z M 985.5 240.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface285">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1194.886719 793.148438 L 1194.886719 809.980469 L 1223.832031 809.980469 L 1223.832031 815.5 L 1188.625 815.5 L 1188.625 766.421875 L 1222.621094 766.421875 L 1222.621094 771.941406 L 1194.886719 771.941406 L 1194.886719 787.628906 L 1221.613281 787.628906 L 1221.613281 793.148438 Z M 1194.886719 793.148438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1162 307 L 1201 307 M 1162 269 L 1201 269 M 1162 269 L 1162 307 M 1201 269 L 1201 307 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1162 307 L 1201 307 M 1162 269 L 1201 269 M 1201 307 L 1201 269 M 1162 307 L 1162 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_4.svg b/cells/einvp/sky130_fd_sc_hs__einvp_4.svg
index e74fb09..625bbe2 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_4.svg
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.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 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.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 1441.5 664.5 L 1475.5 664.5 L 1475.5 833.5 L 1441.5 833.5 Z M 396.5 664.5 L 430.5 664.5 L 430.5 833.5 L 396.5 833.5 Z M 510.5 664.5 L 545.5 664.5 L 545.5 833.5 L 510.5 833.5 Z M 631.5 664.5 L 665.5 664.5 L 665.5 833.5 L 631.5 833.5 Z M 740.5 664.5 L 774.5 664.5 L 774.5 833.5 L 740.5 833.5 Z M 854.5 664.5 L 889.5 664.5 L 889.5 833.5 L 854.5 833.5 Z M 985.5 664.5 L 1019.5 664.5 L 1019.5 833.5 L 985.5 833.5 Z M 1083.5 664.5 L 1118.5 664.5 L 1118.5 833.5 L 1083.5 833.5 Z M 1214.5 664.5 L 1248.5 664.5 L 1248.5 833.5 L 1214.5 833.5 Z M 1214.5 664.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 1487.5 240.5 L 1521.5 240.5 L 1521.5 496.5 L 1487.5 496.5 Z M 399.5 240.5 L 434.5 240.5 L 434.5 496.5 L 399.5 496.5 Z M 513.5 240.5 L 547.5 240.5 L 547.5 496.5 L 513.5 496.5 Z M 627.5 240.5 L 662.5 240.5 L 662.5 496.5 L 627.5 496.5 Z M 730.5 240.5 L 765.5 240.5 L 765.5 496.5 L 730.5 496.5 Z M 845.5 240.5 L 879.5 240.5 L 879.5 496.5 L 845.5 496.5 Z M 960.5 240.5 L 994.5 240.5 L 994.5 496.5 L 960.5 496.5 Z M 1063.5 240.5 L 1097.5 240.5 L 1097.5 496.5 L 1063.5 496.5 Z M 1168.5 240.5 L 1203.5 240.5 L 1203.5 496.5 L 1168.5 496.5 Z M 1168.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.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=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 585.410156 546.757812 L 566.492188 546.757812 L 561.308594 561.5 L 554.644531 561.5 L 572.148438 512.421875 L 580.226562 512.421875 L 597.460938 561.5 L 590.460938 561.5 Z M 583.660156 541.503906 L 576.121094 519.15625 L 568.042969 541.503906 Z M 583.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 555 562 L 594 562 M 555 523 L 594 523 M 555 523 L 555 562 M 594 523 L 594 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 562 L 594 562 M 555 523 L 594 523 M 594 562 L 594 523 M 555 562 L 555 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/einvp/sky130_fd_sc_hs__einvp_8.svg b/cells/einvp/sky130_fd_sc_hs__einvp_8.svg
index f8753fd..d41faa5 100644
--- a/cells/einvp/sky130_fd_sc_hs__einvp_8.svg
+++ b/cells/einvp/sky130_fd_sc_hs__einvp_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 536.5 L 175.5 536.5 Z M 175.5 229.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 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.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 1606.5 627.5 L 1631.5 627.5 L 1631.5 749.5 L 1606.5 749.5 Z M 275.5 627.5 L 300.5 627.5 L 300.5 749.5 L 275.5 749.5 Z M 346.5 627.5 L 371.5 627.5 L 371.5 749.5 L 346.5 749.5 Z M 429.5 627.5 L 454.5 627.5 L 454.5 749.5 L 429.5 749.5 Z M 512.5 627.5 L 536.5 627.5 L 536.5 749.5 L 512.5 749.5 Z M 594.5 627.5 L 619.5 627.5 L 619.5 749.5 L 594.5 749.5 Z M 677.5 627.5 L 701.5 627.5 L 701.5 749.5 L 677.5 749.5 Z M 759.5 627.5 L 784.5 627.5 L 784.5 749.5 L 759.5 749.5 Z M 842.5 627.5 L 867.5 627.5 L 867.5 749.5 L 842.5 749.5 Z M 913.5 627.5 L 938.5 627.5 L 938.5 749.5 L 913.5 749.5 Z M 995.5 627.5 L 1020.5 627.5 L 1020.5 749.5 L 995.5 749.5 Z M 1066.5 627.5 L 1091.5 627.5 L 1091.5 749.5 L 1066.5 749.5 Z M 1137.5 627.5 L 1162.5 627.5 L 1162.5 749.5 L 1137.5 749.5 Z M 1208.5 627.5 L 1233.5 627.5 L 1233.5 749.5 L 1208.5 749.5 Z M 1279.5 627.5 L 1304.5 627.5 L 1304.5 749.5 L 1279.5 749.5 Z M 1350.5 627.5 L 1375.5 627.5 L 1375.5 749.5 L 1350.5 749.5 Z M 1433.5 627.5 L 1458.5 627.5 L 1458.5 749.5 L 1433.5 749.5 Z M 1433.5 627.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 1618.5 321.5 L 1643.5 321.5 L 1643.5 506.5 L 1618.5 506.5 Z M 276.5 321.5 L 301.5 321.5 L 301.5 506.5 L 276.5 506.5 Z M 351.5 321.5 L 375.5 321.5 L 375.5 506.5 L 351.5 506.5 Z M 425.5 321.5 L 450.5 321.5 L 450.5 506.5 L 425.5 506.5 Z M 499.5 321.5 L 524.5 321.5 L 524.5 506.5 L 499.5 506.5 Z M 573.5 321.5 L 598.5 321.5 L 598.5 506.5 L 573.5 506.5 Z M 648.5 321.5 L 673.5 321.5 L 673.5 506.5 L 648.5 506.5 Z M 722.5 321.5 L 747.5 321.5 L 747.5 506.5 L 722.5 506.5 Z M 796.5 321.5 L 821.5 321.5 L 821.5 506.5 L 796.5 506.5 Z M 871.5 321.5 L 895.5 321.5 L 895.5 506.5 L 871.5 506.5 Z M 945.5 321.5 L 970.5 321.5 L 970.5 506.5 L 945.5 506.5 Z M 1019.5 321.5 L 1044.5 321.5 L 1044.5 506.5 L 1019.5 506.5 Z M 1094.5 321.5 L 1118.5 321.5 L 1118.5 506.5 L 1094.5 506.5 Z M 1168.5 321.5 L 1193.5 321.5 L 1193.5 506.5 L 1168.5 506.5 Z M 1242.5 321.5 L 1267.5 321.5 L 1267.5 506.5 L 1242.5 506.5 Z M 1317.5 321.5 L 1341.5 321.5 L 1341.5 506.5 L 1317.5 506.5 Z M 1391.5 321.5 L 1416.5 321.5 L 1416.5 506.5 L 1391.5 506.5 Z M 1391.5 321.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.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>
@@ -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 729.769531 603.75 L 715.972656 603.75 L 712.195312 614.5 L 707.335938 614.5 L 720.097656 578.714844 L 725.988281 578.714844 L 738.554688 614.5 L 733.449219 614.5 Z M 728.492188 599.921875 L 722.992188 583.625 L 717.101562 599.921875 Z M 728.492188 599.921875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 707 497 L 735 497 M 707 469 L 735 469 M 707 469 L 707 497 M 735 469 L 735 497 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 707 497 L 735 497 M 707 469 L 735 469 M 735 497 L 735 469 M 707 497 L 707 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 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fa/sky130_fd_sc_hs__fa_1.svg b/cells/fa/sky130_fd_sc_hs__fa_1.svg
index 8770496..dbef628 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_1.svg
+++ b/cells/fa/sky130_fd_sc_hs__fa_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 468.5 536.5 L 1508.5 536.5 L 1508.5 555.5 L 468.5 555.5 Z M 468.5 536.5 "/>
 </clipPath>
-<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 387.5 649.5 L 413.5 649.5 L 413.5 760.5 L 387.5 760.5 Z M 455.5 649.5 L 481.5 649.5 L 481.5 760.5 L 455.5 760.5 Z M 1448.5 649.5 L 1475.5 649.5 L 1475.5 760.5 L 1448.5 760.5 Z M 523.5 649.5 L 549.5 649.5 L 549.5 760.5 L 523.5 760.5 Z M 1138.5 649.5 L 1164.5 649.5 L 1164.5 760.5 L 1138.5 760.5 Z M 1063.5 649.5 L 1089.5 649.5 L 1089.5 760.5 L 1063.5 760.5 Z M 883.5 649.5 L 909.5 649.5 L 909.5 760.5 L 883.5 760.5 Z M 995.5 649.5 L 1021.5 649.5 L 1021.5 760.5 L 995.5 760.5 Z M 808.5 649.5 L 834.5 649.5 L 834.5 760.5 L 808.5 760.5 Z M 1322.5 649.5 L 1348.5 649.5 L 1348.5 760.5 L 1322.5 760.5 Z M 617.5 649.5 L 643.5 649.5 L 643.5 760.5 L 617.5 760.5 Z M 706.5 649.5 L 732.5 649.5 L 732.5 760.5 L 706.5 760.5 Z M 280.5 632.5 L 306.5 632.5 L 306.5 761.5 L 280.5 761.5 Z M 1614.5 632.5 L 1640.5 632.5 L 1640.5 761.5 L 1614.5 761.5 Z M 1614.5 632.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image380"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 458.5 313.5 L 484.5 313.5 L 484.5 487.5 L 458.5 487.5 Z M 1611.5 310.5 L 1637.5 310.5 L 1637.5 505.5 L 1611.5 505.5 Z M 370.5 331.5 L 396.5 331.5 L 396.5 505.5 L 370.5 505.5 Z M 280.5 310.5 L 306.5 310.5 L 306.5 505.5 L 280.5 505.5 Z M 1393.5 336.5 L 1419.5 336.5 L 1419.5 510.5 L 1393.5 510.5 Z M 1066.5 349.5 L 1092.5 349.5 L 1092.5 523.5 L 1066.5 523.5 Z M 978.5 349.5 L 1004.5 349.5 L 1004.5 523.5 L 978.5 523.5 Z M 898.5 349.5 L 924.5 349.5 L 924.5 523.5 L 898.5 523.5 Z M 810.5 349.5 L 836.5 349.5 L 836.5 523.5 L 810.5 523.5 Z M 545.5 349.5 L 572.5 349.5 L 572.5 523.5 L 545.5 523.5 Z M 624.5 349.5 L 650.5 349.5 L 650.5 523.5 L 624.5 523.5 Z M 708.5 349.5 L 734.5 349.5 L 734.5 523.5 L 708.5 523.5 Z M 1247.5 349.5 L 1274.5 349.5 L 1274.5 523.5 L 1247.5 523.5 Z M 1144.5 349.5 L 1170.5 349.5 L 1170.5 523.5 L 1144.5 523.5 Z M 1144.5 349.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image381"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 485.5 521.5 L 514.5 521.5 L 514.5 550.5 L 485.5 550.5 Z M 1069.5 521.5 L 1099.5 521.5 L 1099.5 550.5 L 1069.5 550.5 Z M 902.5 521.5 L 932.5 521.5 L 932.5 550.5 L 902.5 550.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface376">
+<g id="surface403">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -202,6 +202,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 289.160156 683.339844 L 284.210938 683.339844 L 273.761719 652.488281 L 273.761719 683.339844 L 269.316406 683.339844 L 269.316406 646.53125 L 275.832031 646.53125 L 286.738281 678.59375 L 297.441406 646.53125 L 303.953125 646.53125 L 303.953125 683.339844 L 299.511719 683.339844 L 299.511719 652.488281 Z M 289.160156 683.339844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 234 430 L 264 430 M 234 400 L 264 400 M 234 400 L 234 430 M 264 400 L 264 430 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 234 430 L 264 430 M 234 400 L 264 400 M 264 430 L 264 400 M 234 430 L 234 400 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fa/sky130_fd_sc_hs__fa_2.svg b/cells/fa/sky130_fd_sc_hs__fa_2.svg
index a33db1a..6c4f531 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_2.svg
+++ b/cells/fa/sky130_fd_sc_hs__fa_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 536.5 L 175.5 536.5 Z M 311.5 536.5 L 1183.5 536.5 L 1183.5 553.5 L 311.5 553.5 Z M 311.5 536.5 "/>
 </clipPath>
-<image id="image326" 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="#image326"/>
+  <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 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1618.5 623.5 L 1643.5 623.5 L 1643.5 745.5 L 1618.5 745.5 Z M 275.5 623.5 L 300.5 623.5 L 300.5 745.5 L 275.5 745.5 Z M 382.5 623.5 L 407.5 623.5 L 407.5 745.5 L 382.5 745.5 Z M 501.5 623.5 L 526.5 623.5 L 526.5 745.5 L 501.5 745.5 Z M 583.5 623.5 L 608.5 623.5 L 608.5 745.5 L 583.5 745.5 Z M 648.5 623.5 L 673.5 623.5 L 673.5 745.5 L 648.5 745.5 Z M 760.5 623.5 L 785.5 623.5 L 785.5 745.5 L 760.5 745.5 Z M 831.5 623.5 L 856.5 623.5 L 856.5 745.5 L 831.5 745.5 Z M 929.5 623.5 L 953.5 623.5 L 953.5 745.5 L 929.5 745.5 Z M 1023.5 623.5 L 1047.5 623.5 L 1047.5 745.5 L 1023.5 745.5 Z M 1105.5 623.5 L 1130.5 623.5 L 1130.5 745.5 L 1105.5 745.5 Z M 1176.5 623.5 L 1201.5 623.5 L 1201.5 745.5 L 1176.5 745.5 Z M 1241.5 623.5 L 1265.5 623.5 L 1265.5 745.5 L 1241.5 745.5 Z M 1359.5 623.5 L 1383.5 623.5 L 1383.5 745.5 L 1359.5 745.5 Z M 1430.5 623.5 L 1454.5 623.5 L 1454.5 745.5 L 1430.5 745.5 Z M 1547.5 623.5 L 1572.5 623.5 L 1572.5 745.5 L 1547.5 745.5 Z M 1547.5 623.5 "/>
 </clipPath>
-<image id="image327" 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="#image327"/>
+  <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 277.5 333.5 L 302.5 333.5 L 302.5 498.5 L 277.5 498.5 Z M 829.5 333.5 L 853.5 333.5 L 853.5 498.5 L 829.5 498.5 Z M 1337.5 321.5 L 1362.5 321.5 L 1362.5 506.5 L 1337.5 506.5 Z M 1615.5 321.5 L 1640.5 321.5 L 1640.5 506.5 L 1615.5 506.5 Z M 1174.5 341.5 L 1199.5 341.5 L 1199.5 506.5 L 1174.5 506.5 Z M 1427.5 321.5 L 1452.5 321.5 L 1452.5 506.5 L 1427.5 506.5 Z M 1541.5 321.5 L 1566.5 321.5 L 1566.5 506.5 L 1541.5 506.5 Z M 1243.5 341.5 L 1268.5 341.5 L 1268.5 506.5 L 1243.5 506.5 Z M 1000.5 359.5 L 1025.5 359.5 L 1025.5 524.5 L 1000.5 524.5 Z M 459.5 359.5 L 484.5 359.5 L 484.5 524.5 L 459.5 524.5 Z M 926.5 359.5 L 951.5 359.5 L 951.5 524.5 L 926.5 524.5 Z M 581.5 359.5 L 606.5 359.5 L 606.5 524.5 L 581.5 524.5 Z M 650.5 359.5 L 675.5 359.5 L 675.5 524.5 L 650.5 524.5 Z M 384.5 359.5 L 409.5 359.5 L 409.5 524.5 L 384.5 524.5 Z M 1085.5 359.5 L 1109.5 359.5 L 1109.5 524.5 L 1085.5 524.5 Z M 745.5 359.5 L 770.5 359.5 L 770.5 524.5 L 745.5 524.5 Z M 745.5 359.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 1262.5 521.5 L 1290.5 521.5 L 1290.5 546.5 L 1262.5 546.5 Z M 1262.5 546.5 L 1290.5 546.5 L 1290.5 549.5 L 1262.5 549.5 Z M 628.5 521.5 L 656.5 521.5 L 656.5 549.5 L 628.5 549.5 Z M 866.5 521.5 L 894.5 521.5 L 894.5 549.5 L 866.5 549.5 Z M 232.5 521.5 L 260.5 521.5 L 260.5 549.5 L 232.5 549.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.5 "/>
 </clipPath>
-<image id="image329" 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="#image329"/>
+  <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="surface323">
+<g id="surface351">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -176,6 +176,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1633.558594 370.371094 L 1628.75 370.371094 L 1618.585938 340.378906 L 1618.585938 370.371094 L 1614.265625 370.371094 L 1614.265625 334.585938 L 1620.597656 334.585938 L 1631.203125 365.757812 L 1641.609375 334.585938 L 1647.941406 334.585938 L 1647.941406 370.371094 L 1643.621094 370.371094 L 1643.621094 340.378906 Z M 1633.558594 370.371094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1579 741 L 1607 741 M 1579 713 L 1607 713 M 1579 713 L 1579 741 M 1607 713 L 1607 741 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1579 741 L 1607 741 M 1579 713 L 1607 713 M 1607 741 L 1607 713 M 1579 741 L 1579 713 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fa/sky130_fd_sc_hs__fa_4.svg b/cells/fa/sky130_fd_sc_hs__fa_4.svg
index e77fdd0..fdcbed4 100644
--- a/cells/fa/sky130_fd_sc_hs__fa_4.svg
+++ b/cells/fa/sky130_fd_sc_hs__fa_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 535.5 L 174.5 535.5 Z M 288.5 535.5 L 1110.5 535.5 L 1110.5 550.5 L 288.5 550.5 Z M 288.5 535.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <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 200.5 730.5 L 1717.5 730.5 L 1717.5 764.5 L 200.5 764.5 Z M 200.5 730.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#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 1639.5 606.5 L 1660.5 606.5 L 1660.5 707.5 L 1639.5 707.5 Z M 1580.5 606.5 L 1601.5 606.5 L 1601.5 707.5 L 1580.5 707.5 Z M 1462.5 606.5 L 1482.5 606.5 L 1482.5 707.5 L 1462.5 707.5 Z M 1182.5 606.5 L 1202.5 606.5 L 1202.5 707.5 L 1182.5 707.5 Z M 1381.5 606.5 L 1401.5 606.5 L 1401.5 707.5 L 1381.5 707.5 Z M 1521.5 606.5 L 1542.5 606.5 L 1542.5 707.5 L 1521.5 707.5 Z M 1322.5 606.5 L 1342.5 606.5 L 1342.5 707.5 L 1322.5 707.5 Z M 1241.5 606.5 L 1261.5 606.5 L 1261.5 707.5 L 1241.5 707.5 Z M 824.5 611.5 L 845.5 611.5 L 845.5 713.5 L 824.5 713.5 Z M 883.5 611.5 L 904.5 611.5 L 904.5 713.5 L 883.5 713.5 Z M 977.5 611.5 L 997.5 611.5 L 997.5 713.5 L 977.5 713.5 Z M 1030.5 611.5 L 1051.5 611.5 L 1051.5 713.5 L 1030.5 713.5 Z M 1100.5 611.5 L 1121.5 611.5 L 1121.5 713.5 L 1100.5 713.5 Z M 258.5 611.5 L 279.5 611.5 L 279.5 713.5 L 258.5 713.5 Z M 684.5 611.5 L 705.5 611.5 L 705.5 713.5 L 684.5 713.5 Z M 620.5 611.5 L 640.5 611.5 L 640.5 713.5 L 620.5 713.5 Z M 467.5 611.5 L 488.5 611.5 L 488.5 713.5 L 467.5 713.5 Z M 408.5 611.5 L 429.5 611.5 L 429.5 713.5 L 408.5 713.5 Z M 743.5 611.5 L 764.5 611.5 L 764.5 713.5 L 743.5 713.5 Z M 545.5 611.5 L 566.5 611.5 L 566.5 713.5 L 545.5 713.5 Z M 545.5 611.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <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 260.5 357.5 L 280.5 357.5 L 280.5 494.5 L 260.5 494.5 Z M 1438.5 357.5 L 1459.5 357.5 L 1459.5 511.5 L 1438.5 511.5 Z M 1569.5 357.5 L 1590.5 357.5 L 1590.5 511.5 L 1569.5 511.5 Z M 1370.5 357.5 L 1390.5 357.5 L 1390.5 511.5 L 1370.5 511.5 Z M 1177.5 357.5 L 1198.5 357.5 L 1198.5 511.5 L 1177.5 511.5 Z M 1631.5 357.5 L 1651.5 357.5 L 1651.5 511.5 L 1631.5 511.5 Z M 1103.5 373.5 L 1123.5 373.5 L 1123.5 511.5 L 1103.5 511.5 Z M 1500.5 357.5 L 1521.5 357.5 L 1521.5 511.5 L 1500.5 511.5 Z M 1239.5 357.5 L 1260.5 357.5 L 1260.5 511.5 L 1239.5 511.5 Z M 1308.5 357.5 L 1329.5 357.5 L 1329.5 511.5 L 1308.5 511.5 Z M 1028.5 388.5 L 1049.5 388.5 L 1049.5 525.5 L 1028.5 525.5 Z M 349.5 388.5 L 369.5 388.5 L 369.5 525.5 L 349.5 525.5 Z M 547.5 388.5 L 568.5 388.5 L 568.5 525.5 L 547.5 525.5 Z M 617.5 388.5 L 638.5 388.5 L 638.5 525.5 L 617.5 525.5 Z M 895.5 388.5 L 916.5 388.5 L 916.5 525.5 L 895.5 525.5 Z M 686.5 388.5 L 707.5 388.5 L 707.5 525.5 L 686.5 525.5 Z M 826.5 388.5 L 847.5 388.5 L 847.5 525.5 L 826.5 525.5 Z M 486.5 388.5 L 506.5 388.5 L 506.5 525.5 L 486.5 525.5 Z M 964.5 388.5 L 984.5 388.5 L 984.5 525.5 L 964.5 525.5 Z M 748.5 388.5 L 769.5 388.5 L 769.5 525.5 L 748.5 525.5 Z M 748.5 388.5 "/>
 </clipPath>
-<image id="image361" 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="#image361"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 222.5 294.5 L 245.5 294.5 L 245.5 318.5 L 222.5 318.5 Z M 1673.5 294.5 L 1696.5 294.5 L 1696.5 318.5 L 1673.5 318.5 Z M 1607.5 294.5 L 1630.5 294.5 L 1630.5 318.5 L 1607.5 318.5 Z M 1541.5 294.5 L 1564.5 294.5 L 1564.5 318.5 L 1541.5 318.5 Z M 1475.5 294.5 L 1498.5 294.5 L 1498.5 318.5 L 1475.5 318.5 Z M 1409.5 294.5 L 1432.5 294.5 L 1432.5 318.5 L 1409.5 318.5 Z M 1343.5 294.5 L 1366.5 294.5 L 1366.5 318.5 L 1343.5 318.5 Z M 1277.5 294.5 L 1300.5 294.5 L 1300.5 318.5 L 1277.5 318.5 Z M 1211.5 294.5 L 1234.5 294.5 L 1234.5 318.5 L 1211.5 318.5 Z M 1145.5 294.5 L 1168.5 294.5 L 1168.5 318.5 L 1145.5 318.5 Z M 1079.5 294.5 L 1103.5 294.5 L 1103.5 318.5 L 1079.5 318.5 Z M 1013.5 294.5 L 1037.5 294.5 L 1037.5 318.5 L 1013.5 318.5 Z M 947.5 294.5 L 971.5 294.5 L 971.5 318.5 L 947.5 318.5 Z M 881.5 294.5 L 905.5 294.5 L 905.5 318.5 L 881.5 318.5 Z M 815.5 294.5 L 839.5 294.5 L 839.5 318.5 L 815.5 318.5 Z M 749.5 294.5 L 773.5 294.5 L 773.5 318.5 L 749.5 318.5 Z M 683.5 294.5 L 707.5 294.5 L 707.5 318.5 L 683.5 318.5 Z M 617.5 294.5 L 641.5 294.5 L 641.5 318.5 L 617.5 318.5 Z M 552.5 294.5 L 575.5 294.5 L 575.5 318.5 L 552.5 318.5 Z M 486.5 294.5 L 509.5 294.5 L 509.5 318.5 L 486.5 318.5 Z M 420.5 294.5 L 443.5 294.5 L 443.5 318.5 L 420.5 318.5 Z M 354.5 294.5 L 377.5 294.5 L 377.5 318.5 L 354.5 318.5 Z M 288.5 294.5 L 311.5 294.5 L 311.5 318.5 L 288.5 318.5 Z M 486.5 574.5 L 509.5 574.5 L 509.5 585.5 L 486.5 585.5 Z M 947.5 574.5 L 971.5 574.5 L 971.5 585.5 L 947.5 585.5 Z M 617.5 574.5 L 641.5 574.5 L 641.5 597.5 L 617.5 597.5 Z M 947.5 585.5 L 971.5 585.5 L 971.5 597.5 L 947.5 597.5 Z M 486.5 585.5 L 509.5 585.5 L 509.5 597.5 L 486.5 597.5 Z M 222.5 752.5 L 245.5 752.5 L 245.5 775.5 L 222.5 775.5 Z M 1673.5 752.5 L 1696.5 752.5 L 1696.5 775.5 L 1673.5 775.5 Z M 1607.5 752.5 L 1630.5 752.5 L 1630.5 775.5 L 1607.5 775.5 Z M 1541.5 752.5 L 1564.5 752.5 L 1564.5 775.5 L 1541.5 775.5 Z M 1475.5 752.5 L 1498.5 752.5 L 1498.5 775.5 L 1475.5 775.5 Z M 1409.5 752.5 L 1432.5 752.5 L 1432.5 775.5 L 1409.5 775.5 Z M 1343.5 752.5 L 1366.5 752.5 L 1366.5 775.5 L 1343.5 775.5 Z M 1277.5 752.5 L 1300.5 752.5 L 1300.5 775.5 L 1277.5 775.5 Z M 1211.5 752.5 L 1234.5 752.5 L 1234.5 775.5 L 1211.5 775.5 Z M 1145.5 752.5 L 1168.5 752.5 L 1168.5 775.5 L 1145.5 775.5 Z M 1079.5 752.5 L 1103.5 752.5 L 1103.5 775.5 L 1079.5 775.5 Z M 1013.5 752.5 L 1037.5 752.5 L 1037.5 775.5 L 1013.5 775.5 Z M 947.5 752.5 L 971.5 752.5 L 971.5 775.5 L 947.5 775.5 Z M 881.5 752.5 L 905.5 752.5 L 905.5 775.5 L 881.5 775.5 Z M 815.5 752.5 L 839.5 752.5 L 839.5 775.5 L 815.5 775.5 Z M 749.5 752.5 L 773.5 752.5 L 773.5 775.5 L 749.5 775.5 Z M 683.5 752.5 L 707.5 752.5 L 707.5 775.5 L 683.5 775.5 Z M 617.5 752.5 L 641.5 752.5 L 641.5 775.5 L 617.5 775.5 Z M 552.5 752.5 L 575.5 752.5 L 575.5 775.5 L 552.5 775.5 Z M 486.5 752.5 L 509.5 752.5 L 509.5 775.5 L 486.5 775.5 Z M 420.5 752.5 L 443.5 752.5 L 443.5 775.5 L 420.5 775.5 Z M 354.5 752.5 L 377.5 752.5 L 377.5 775.5 L 354.5 775.5 Z M 288.5 752.5 L 311.5 752.5 L 311.5 775.5 L 288.5 775.5 Z M 288.5 752.5 "/>
 </clipPath>
-<image id="image362" 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="#image362"/>
+  <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="surface356">
+<g id="surface384">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -195,6 +195,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 305.777344 540.59375 L 294.351562 540.59375 L 291.21875 549.5 L 287.191406 549.5 L 297.765625 519.847656 L 302.648438 519.847656 L 313.058594 549.5 L 308.828125 549.5 Z M 304.722656 537.421875 L 300.167969 523.917969 L 295.285156 537.421875 Z M 304.722656 537.421875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 288 556 L 311 556 M 288 533 L 311 533 M 288 533 L 288 556 M 311 533 L 311 556 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 288 556 L 311 556 M 288 533 L 311 533 M 311 556 L 311 533 M 288 556 L 288 533 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 310 L 200 319 M 195 315 L 204 315 M 199 316 L 201 316 M 199 314 L 201 314 M 199 314 L 199 316 M 201 314 L 201 316 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fah/sky130_fd_sc_hs__fah_1.svg b/cells/fah/sky130_fd_sc_hs__fah_1.svg
index cfbdb6c..8487cae 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_1.svg
+++ b/cells/fah/sky130_fd_sc_hs__fah_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 331.5 L 1743.5 331.5 L 1743.5 504.5 L 174.5 504.5 Z M 801.5 504.5 L 1743.5 504.5 L 1743.5 535.5 L 801.5 535.5 Z M 174.5 504.5 L 652.5 504.5 L 652.5 535.5 L 174.5 535.5 Z M 801.5 535.5 L 1561.5 535.5 L 1561.5 541.5 L 801.5 541.5 Z M 1236.5 541.5 L 1561.5 541.5 L 1561.5 549.5 L 1236.5 549.5 Z M 1236.5 541.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 195.5 690.5 L 1723.5 690.5 L 1723.5 717.5 L 195.5 717.5 Z M 195.5 690.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 717.5 555.5 L 733.5 555.5 L 733.5 625.5 L 717.5 625.5 Z M 305.5 574.5 L 322.5 574.5 L 322.5 644.5 L 305.5 644.5 Z M 772.5 578.5 L 789.5 578.5 L 789.5 648.5 L 772.5 648.5 Z M 819.5 578.5 L 836.5 578.5 L 836.5 648.5 L 819.5 648.5 Z M 241.5 574.5 L 257.5 574.5 L 257.5 655.5 L 241.5 655.5 Z M 874.5 588.5 L 891.5 588.5 L 891.5 658.5 L 874.5 658.5 Z M 532.5 590.5 L 548.5 590.5 L 548.5 660.5 L 532.5 660.5 Z M 1231.5 595.5 L 1247.5 595.5 L 1247.5 665.5 L 1231.5 665.5 Z M 1149.5 595.5 L 1165.5 595.5 L 1165.5 665.5 L 1149.5 665.5 Z M 1296.5 595.5 L 1312.5 595.5 L 1312.5 665.5 L 1296.5 665.5 Z M 1424.5 595.5 L 1441.5 595.5 L 1441.5 665.5 L 1424.5 665.5 Z M 420.5 590.5 L 436.5 590.5 L 436.5 671.5 L 420.5 671.5 Z M 1602.5 606.5 L 1618.5 606.5 L 1618.5 676.5 L 1602.5 676.5 Z M 1480.5 595.5 L 1497.5 595.5 L 1497.5 676.5 L 1480.5 676.5 Z M 1660.5 606.5 L 1676.5 606.5 L 1676.5 676.5 L 1660.5 676.5 Z M 1022.5 595.5 L 1039.5 595.5 L 1039.5 676.5 L 1022.5 676.5 Z M 1022.5 595.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 642.5 392.5 L 658.5 392.5 L 658.5 484.5 L 642.5 484.5 Z M 758.5 392.5 L 774.5 392.5 L 774.5 484.5 L 758.5 484.5 Z M 1658.5 392.5 L 1675.5 392.5 L 1675.5 502.5 L 1658.5 502.5 Z M 1604.5 392.5 L 1620.5 392.5 L 1620.5 502.5 L 1604.5 502.5 Z M 317.5 399.5 L 333.5 399.5 L 333.5 508.5 L 317.5 508.5 Z M 564.5 400.5 L 580.5 400.5 L 580.5 510.5 L 564.5 510.5 Z M 1193.5 420.5 L 1210.5 420.5 L 1210.5 512.5 L 1193.5 512.5 Z M 958.5 420.5 L 974.5 420.5 L 974.5 512.5 L 958.5 512.5 Z M 875.5 420.5 L 891.5 420.5 L 891.5 512.5 L 875.5 512.5 Z M 1138.5 420.5 L 1155.5 420.5 L 1155.5 512.5 L 1138.5 512.5 Z M 1482.5 392.5 L 1498.5 392.5 L 1498.5 515.5 L 1482.5 515.5 Z M 1426.5 423.5 L 1443.5 423.5 L 1443.5 515.5 L 1426.5 515.5 Z M 493.5 392.5 L 509.5 392.5 L 509.5 515.5 L 493.5 515.5 Z M 1377.5 423.5 L 1393.5 423.5 L 1393.5 515.5 L 1377.5 515.5 Z M 242.5 392.5 L 259.5 392.5 L 259.5 515.5 L 242.5 515.5 Z M 1016.5 398.5 L 1033.5 398.5 L 1033.5 521.5 L 1016.5 521.5 Z M 1016.5 398.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 212.5 342.5 L 231.5 342.5 L 231.5 361.5 L 212.5 361.5 Z M 1687.5 342.5 L 1706.5 342.5 L 1706.5 361.5 L 1687.5 361.5 Z M 1634.5 342.5 L 1653.5 342.5 L 1653.5 361.5 L 1634.5 361.5 Z M 1582.5 342.5 L 1600.5 342.5 L 1600.5 361.5 L 1582.5 361.5 Z M 1529.5 342.5 L 1548.5 342.5 L 1548.5 361.5 L 1529.5 361.5 Z M 1476.5 342.5 L 1495.5 342.5 L 1495.5 361.5 L 1476.5 361.5 Z M 1424.5 342.5 L 1442.5 342.5 L 1442.5 361.5 L 1424.5 361.5 Z M 1371.5 342.5 L 1390.5 342.5 L 1390.5 361.5 L 1371.5 361.5 Z M 1318.5 342.5 L 1337.5 342.5 L 1337.5 361.5 L 1318.5 361.5 Z M 1266.5 342.5 L 1284.5 342.5 L 1284.5 361.5 L 1266.5 361.5 Z M 1213.5 342.5 L 1232.5 342.5 L 1232.5 361.5 L 1213.5 361.5 Z M 1160.5 342.5 L 1179.5 342.5 L 1179.5 361.5 L 1160.5 361.5 Z M 1108.5 342.5 L 1126.5 342.5 L 1126.5 361.5 L 1108.5 361.5 Z M 1055.5 342.5 L 1073.5 342.5 L 1073.5 361.5 L 1055.5 361.5 Z M 1002.5 342.5 L 1021.5 342.5 L 1021.5 361.5 L 1002.5 361.5 Z M 949.5 342.5 L 968.5 342.5 L 968.5 361.5 L 949.5 361.5 Z M 897.5 342.5 L 915.5 342.5 L 915.5 361.5 L 897.5 361.5 Z M 844.5 342.5 L 863.5 342.5 L 863.5 361.5 L 844.5 361.5 Z M 791.5 342.5 L 810.5 342.5 L 810.5 361.5 L 791.5 361.5 Z M 739.5 342.5 L 757.5 342.5 L 757.5 361.5 L 739.5 361.5 Z M 686.5 342.5 L 705.5 342.5 L 705.5 361.5 L 686.5 361.5 Z M 633.5 342.5 L 652.5 342.5 L 652.5 361.5 L 633.5 361.5 Z M 581.5 342.5 L 599.5 342.5 L 599.5 361.5 L 581.5 361.5 Z M 528.5 342.5 L 547.5 342.5 L 547.5 361.5 L 528.5 361.5 Z M 475.5 342.5 L 494.5 342.5 L 494.5 361.5 L 475.5 361.5 Z M 423.5 342.5 L 441.5 342.5 L 441.5 361.5 L 423.5 361.5 Z M 370.5 342.5 L 389.5 342.5 L 389.5 361.5 L 370.5 361.5 Z M 317.5 342.5 L 336.5 342.5 L 336.5 361.5 L 317.5 361.5 Z M 265.5 342.5 L 283.5 342.5 L 283.5 361.5 L 265.5 361.5 Z M 1319.5 484.5 L 1338.5 484.5 L 1338.5 491.5 L 1319.5 491.5 Z M 1280.5 484.5 L 1298.5 484.5 L 1298.5 491.5 L 1280.5 491.5 Z M 1560.5 484.5 L 1578.5 484.5 L 1578.5 492.5 L 1560.5 492.5 Z M 1165.5 484.5 L 1184.5 484.5 L 1184.5 499.5 L 1165.5 499.5 Z M 1280.5 491.5 L 1298.5 491.5 L 1298.5 503.5 L 1280.5 503.5 Z M 1319.5 491.5 L 1338.5 491.5 L 1338.5 503.5 L 1319.5 503.5 Z M 791.5 484.5 L 810.5 484.5 L 810.5 503.5 L 791.5 503.5 Z M 1165.5 499.5 L 1184.5 499.5 L 1184.5 503.5 L 1165.5 503.5 Z M 1560.5 492.5 L 1578.5 492.5 L 1578.5 503.5 L 1560.5 503.5 Z M 949.5 525.5 L 968.5 525.5 L 968.5 544.5 L 949.5 544.5 Z M 1404.5 525.5 L 1422.5 525.5 L 1422.5 544.5 L 1404.5 544.5 Z M 528.5 525.5 L 547.5 525.5 L 547.5 544.5 L 528.5 544.5 Z M 897.5 525.5 L 915.5 525.5 L 915.5 544.5 L 897.5 544.5 Z M 212.5 708.5 L 231.5 708.5 L 231.5 726.5 L 212.5 726.5 Z M 1687.5 708.5 L 1706.5 708.5 L 1706.5 726.5 L 1687.5 726.5 Z M 1634.5 708.5 L 1653.5 708.5 L 1653.5 726.5 L 1634.5 726.5 Z M 1582.5 708.5 L 1600.5 708.5 L 1600.5 726.5 L 1582.5 726.5 Z M 1529.5 708.5 L 1548.5 708.5 L 1548.5 726.5 L 1529.5 726.5 Z M 1476.5 708.5 L 1495.5 708.5 L 1495.5 726.5 L 1476.5 726.5 Z M 1424.5 708.5 L 1442.5 708.5 L 1442.5 726.5 L 1424.5 726.5 Z M 1371.5 708.5 L 1390.5 708.5 L 1390.5 726.5 L 1371.5 726.5 Z M 1318.5 708.5 L 1337.5 708.5 L 1337.5 726.5 L 1318.5 726.5 Z M 1266.5 708.5 L 1284.5 708.5 L 1284.5 726.5 L 1266.5 726.5 Z M 1213.5 708.5 L 1232.5 708.5 L 1232.5 726.5 L 1213.5 726.5 Z M 1160.5 708.5 L 1179.5 708.5 L 1179.5 726.5 L 1160.5 726.5 Z M 1108.5 708.5 L 1126.5 708.5 L 1126.5 726.5 L 1108.5 726.5 Z M 1055.5 708.5 L 1073.5 708.5 L 1073.5 726.5 L 1055.5 726.5 Z M 1002.5 708.5 L 1021.5 708.5 L 1021.5 726.5 L 1002.5 726.5 Z M 949.5 708.5 L 968.5 708.5 L 968.5 726.5 L 949.5 726.5 Z M 897.5 708.5 L 915.5 708.5 L 915.5 726.5 L 897.5 726.5 Z M 844.5 708.5 L 863.5 708.5 L 863.5 726.5 L 844.5 726.5 Z M 791.5 708.5 L 810.5 708.5 L 810.5 726.5 L 791.5 726.5 Z M 739.5 708.5 L 757.5 708.5 L 757.5 726.5 L 739.5 726.5 Z M 686.5 708.5 L 705.5 708.5 L 705.5 726.5 L 686.5 726.5 Z M 633.5 708.5 L 652.5 708.5 L 652.5 726.5 L 633.5 726.5 Z M 581.5 708.5 L 599.5 708.5 L 599.5 726.5 L 581.5 726.5 Z M 528.5 708.5 L 547.5 708.5 L 547.5 726.5 L 528.5 726.5 Z M 475.5 708.5 L 494.5 708.5 L 494.5 726.5 L 475.5 726.5 Z M 423.5 708.5 L 441.5 708.5 L 441.5 726.5 L 423.5 726.5 Z M 370.5 708.5 L 389.5 708.5 L 389.5 726.5 L 370.5 726.5 Z M 317.5 708.5 L 336.5 708.5 L 336.5 726.5 L 317.5 726.5 Z M 265.5 708.5 L 283.5 708.5 L 283.5 726.5 L 265.5 726.5 Z M 265.5 708.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface355">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1232.597656 579.789062 L 1232.53125 580.824219 L 1232.371094 581.757812 L 1232.082031 582.628906 L 1231.695312 583.402344 L 1231.175781 584.144531 L 1230.566406 584.789062 L 1229.886719 585.339844 L 1229.175781 585.757812 L 1228.371094 586.082031 L 1227.53125 586.339844 L 1226.628906 586.46875 L 1225.660156 586.5 L 1215.046875 586.5 L 1215.046875 562.984375 L 1224.597656 562.984375 L 1225.984375 563.082031 L 1227.210938 563.304688 L 1228.304688 563.695312 L 1229.242188 564.242188 L 1230.046875 564.953125 L 1230.695312 565.824219 L 1230.953125 566.304688 L 1231.175781 566.824219 L 1231.339844 567.304688 L 1231.46875 567.855469 L 1231.53125 568.402344 L 1231.566406 568.953125 L 1231.46875 570.113281 L 1231.175781 571.113281 L 1230.726562 572.046875 L 1230.082031 572.824219 L 1229.273438 573.53125 L 1228.304688 574.082031 L 1229.242188 574.5 L 1230.046875 574.953125 L 1230.757812 575.46875 L 1231.339844 576.046875 L 1231.789062 576.660156 L 1232.144531 577.304688 L 1232.273438 577.695312 L 1232.46875 578.46875 L 1232.53125 578.917969 L 1232.566406 579.339844 Z M 1228.566406 569.371094 L 1228.46875 568.402344 L 1228.175781 567.597656 L 1227.726562 566.886719 L 1227.082031 566.371094 L 1226.273438 565.984375 L 1225.273438 565.726562 L 1225.046875 565.726562 L 1224.824219 565.695312 L 1224.597656 565.660156 L 1224.082031 565.660156 L 1223.855469 565.628906 L 1218.046875 565.628906 L 1218.046875 573.113281 L 1223.855469 573.113281 L 1225.046875 573.046875 L 1226.082031 572.855469 L 1226.953125 572.5 L 1227.597656 572.015625 L 1228.113281 571.371094 L 1228.433594 570.597656 L 1228.46875 570.433594 L 1228.5 570.242188 L 1228.53125 570.046875 L 1228.53125 569.597656 Z M 1225.371094 583.855469 L 1226.273438 583.824219 L 1227.082031 583.628906 L 1227.789062 583.304688 L 1228.371094 582.886719 L 1228.855469 582.339844 L 1229.242188 581.660156 L 1229.339844 581.402344 L 1229.402344 581.113281 L 1229.5 580.789062 L 1229.53125 580.5 L 1229.566406 580.175781 L 1229.597656 579.824219 L 1229.53125 579.113281 L 1229.402344 578.433594 L 1229.175781 577.855469 L 1228.855469 577.304688 L 1228.433594 576.855469 L 1227.953125 576.433594 L 1227.597656 576.242188 L 1227.210938 576.082031 L 1226.789062 575.953125 L 1226.339844 575.855469 L 1225.855469 575.789062 L 1225.371094 575.757812 L 1218.046875 575.757812 L 1218.046875 583.855469 Z M 1225.371094 583.855469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1213 514 L 1232 514 M 1213 495 L 1232 495 M 1213 495 L 1213 514 M 1232 495 L 1232 514 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1213 514 L 1232 514 M 1213 495 L 1232 495 M 1232 514 L 1232 495 M 1213 514 L 1213 495 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 195 357 L 195 366 M 190 362 L 199 362 M 194 363 L 196 363 M 194 361 L 196 361 M 194 361 L 194 363 M 196 361 L 196 363 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fah/sky130_fd_sc_hs__fah_2.svg b/cells/fah/sky130_fd_sc_hs__fah_2.svg
index 67891ea..4e89f03 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_2.svg
+++ b/cells/fah/sky130_fd_sc_hs__fah_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1743.5 337.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 337.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 194.5 685.5 L 1723.5 685.5 L 1723.5 711.5 L 194.5 711.5 Z M 194.5 685.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 748.5 587.5 L 764.5 587.5 L 764.5 655.5 L 748.5 655.5 Z M 658.5 587.5 L 674.5 587.5 L 674.5 655.5 L 658.5 655.5 Z M 471.5 587.5 L 487.5 587.5 L 487.5 655.5 L 471.5 655.5 Z M 426.5 587.5 L 441.5 587.5 L 441.5 655.5 L 426.5 655.5 Z M 552.5 587.5 L 568.5 587.5 L 568.5 655.5 L 552.5 655.5 Z M 380.5 587.5 L 396.5 587.5 L 396.5 655.5 L 380.5 655.5 Z M 1190.5 601.5 L 1206.5 601.5 L 1206.5 669.5 L 1190.5 669.5 Z M 1102.5 601.5 L 1118.5 601.5 L 1118.5 669.5 L 1102.5 669.5 Z M 993.5 601.5 L 1009.5 601.5 L 1009.5 669.5 L 993.5 669.5 Z M 1278.5 601.5 L 1294.5 601.5 L 1294.5 669.5 L 1278.5 669.5 Z M 1406.5 601.5 L 1421.5 601.5 L 1421.5 669.5 L 1406.5 669.5 Z M 1339.5 601.5 L 1355.5 601.5 L 1355.5 669.5 L 1339.5 669.5 Z M 1662.5 593.5 L 1678.5 593.5 L 1678.5 672.5 L 1662.5 672.5 Z M 1517.5 593.5 L 1533.5 593.5 L 1533.5 672.5 L 1517.5 672.5 Z M 1563.5 593.5 L 1579.5 593.5 L 1579.5 672.5 L 1563.5 672.5 Z M 248.5 593.5 L 264.5 593.5 L 264.5 672.5 L 248.5 672.5 Z M 1616.5 593.5 L 1632.5 593.5 L 1632.5 672.5 L 1616.5 672.5 Z M 943.5 593.5 L 959.5 593.5 L 959.5 672.5 L 943.5 672.5 Z M 943.5 593.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1268.5 397.5 L 1283.5 397.5 L 1283.5 486.5 L 1268.5 486.5 Z M 1184.5 397.5 L 1200.5 397.5 L 1200.5 486.5 L 1184.5 486.5 Z M 1075.5 397.5 L 1091.5 397.5 L 1091.5 486.5 L 1075.5 486.5 Z M 948.5 397.5 L 964.5 397.5 L 964.5 486.5 L 948.5 486.5 Z M 451.5 397.5 L 467.5 397.5 L 467.5 486.5 L 451.5 486.5 Z M 788.5 397.5 L 804.5 397.5 L 804.5 486.5 L 788.5 486.5 Z M 629.5 397.5 L 645.5 397.5 L 645.5 486.5 L 629.5 486.5 Z M 564.5 397.5 L 580.5 397.5 L 580.5 486.5 L 564.5 486.5 Z M 397.5 397.5 L 413.5 397.5 L 413.5 503.5 L 397.5 503.5 Z M 343.5 397.5 L 359.5 397.5 L 359.5 503.5 L 343.5 503.5 Z M 1340.5 397.5 L 1356.5 397.5 L 1356.5 503.5 L 1340.5 503.5 Z M 1411.5 397.5 L 1427.5 397.5 L 1427.5 503.5 L 1411.5 503.5 Z M 1661.5 397.5 L 1677.5 397.5 L 1677.5 516.5 L 1661.5 516.5 Z M 1564.5 397.5 L 1580.5 397.5 L 1580.5 516.5 L 1564.5 516.5 Z M 239.5 397.5 L 255.5 397.5 L 255.5 516.5 L 239.5 516.5 Z M 893.5 397.5 L 909.5 397.5 L 909.5 516.5 L 893.5 516.5 Z M 1516.5 397.5 L 1532.5 397.5 L 1532.5 516.5 L 1516.5 516.5 Z M 1612.5 397.5 L 1628.5 397.5 L 1628.5 516.5 L 1612.5 516.5 Z M 1612.5 397.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 211.5 348.5 L 229.5 348.5 L 229.5 366.5 L 211.5 366.5 Z M 1689.5 348.5 L 1707.5 348.5 L 1707.5 366.5 L 1689.5 366.5 Z M 1638.5 348.5 L 1656.5 348.5 L 1656.5 366.5 L 1638.5 366.5 Z M 1587.5 348.5 L 1605.5 348.5 L 1605.5 366.5 L 1587.5 366.5 Z M 1536.5 348.5 L 1554.5 348.5 L 1554.5 366.5 L 1536.5 366.5 Z M 1485.5 348.5 L 1503.5 348.5 L 1503.5 366.5 L 1485.5 366.5 Z M 1434.5 348.5 L 1452.5 348.5 L 1452.5 366.5 L 1434.5 366.5 Z M 1383.5 348.5 L 1401.5 348.5 L 1401.5 366.5 L 1383.5 366.5 Z M 1332.5 348.5 L 1350.5 348.5 L 1350.5 366.5 L 1332.5 366.5 Z M 1281.5 348.5 L 1299.5 348.5 L 1299.5 366.5 L 1281.5 366.5 Z M 1230.5 348.5 L 1248.5 348.5 L 1248.5 366.5 L 1230.5 366.5 Z M 1179.5 348.5 L 1197.5 348.5 L 1197.5 366.5 L 1179.5 366.5 Z M 1128.5 348.5 L 1146.5 348.5 L 1146.5 366.5 L 1128.5 366.5 Z M 1077.5 348.5 L 1095.5 348.5 L 1095.5 366.5 L 1077.5 366.5 Z M 1026.5 348.5 L 1044.5 348.5 L 1044.5 366.5 L 1026.5 366.5 Z M 975.5 348.5 L 993.5 348.5 L 993.5 366.5 L 975.5 366.5 Z M 924.5 348.5 L 942.5 348.5 L 942.5 366.5 L 924.5 366.5 Z M 873.5 348.5 L 891.5 348.5 L 891.5 366.5 L 873.5 366.5 Z M 822.5 348.5 L 840.5 348.5 L 840.5 366.5 L 822.5 366.5 Z M 771.5 348.5 L 789.5 348.5 L 789.5 366.5 L 771.5 366.5 Z M 720.5 348.5 L 738.5 348.5 L 738.5 366.5 L 720.5 366.5 Z M 669.5 348.5 L 687.5 348.5 L 687.5 366.5 L 669.5 366.5 Z M 618.5 348.5 L 636.5 348.5 L 636.5 366.5 L 618.5 366.5 Z M 567.5 348.5 L 585.5 348.5 L 585.5 366.5 L 567.5 366.5 Z M 516.5 348.5 L 534.5 348.5 L 534.5 366.5 L 516.5 366.5 Z M 465.5 348.5 L 483.5 348.5 L 483.5 366.5 L 465.5 366.5 Z M 414.5 348.5 L 432.5 348.5 L 432.5 366.5 L 414.5 366.5 Z M 363.5 348.5 L 381.5 348.5 L 381.5 366.5 L 363.5 366.5 Z M 312.5 348.5 L 331.5 348.5 L 331.5 366.5 L 312.5 366.5 Z M 261.5 348.5 L 280.5 348.5 L 280.5 366.5 L 261.5 366.5 Z M 211.5 564.5 L 229.5 564.5 L 229.5 582.5 L 211.5 582.5 Z M 618.5 564.5 L 636.5 564.5 L 636.5 582.5 L 618.5 582.5 Z M 1077.5 604.5 L 1095.5 604.5 L 1095.5 605.5 L 1077.5 605.5 Z M 1077.5 605.5 L 1095.5 605.5 L 1095.5 622.5 L 1077.5 622.5 Z M 1485.5 604.5 L 1503.5 604.5 L 1503.5 622.5 L 1485.5 622.5 Z M 211.5 702.5 L 229.5 702.5 L 229.5 720.5 L 211.5 720.5 Z M 1689.5 702.5 L 1707.5 702.5 L 1707.5 720.5 L 1689.5 720.5 Z M 1638.5 702.5 L 1656.5 702.5 L 1656.5 720.5 L 1638.5 720.5 Z M 1587.5 702.5 L 1605.5 702.5 L 1605.5 720.5 L 1587.5 720.5 Z M 1536.5 702.5 L 1554.5 702.5 L 1554.5 720.5 L 1536.5 720.5 Z M 1485.5 702.5 L 1503.5 702.5 L 1503.5 720.5 L 1485.5 720.5 Z M 1434.5 702.5 L 1452.5 702.5 L 1452.5 720.5 L 1434.5 720.5 Z M 1383.5 702.5 L 1401.5 702.5 L 1401.5 720.5 L 1383.5 720.5 Z M 1332.5 702.5 L 1350.5 702.5 L 1350.5 720.5 L 1332.5 720.5 Z M 1281.5 702.5 L 1299.5 702.5 L 1299.5 720.5 L 1281.5 720.5 Z M 1230.5 702.5 L 1248.5 702.5 L 1248.5 720.5 L 1230.5 720.5 Z M 1179.5 702.5 L 1197.5 702.5 L 1197.5 720.5 L 1179.5 720.5 Z M 1128.5 702.5 L 1146.5 702.5 L 1146.5 720.5 L 1128.5 720.5 Z M 1077.5 702.5 L 1095.5 702.5 L 1095.5 720.5 L 1077.5 720.5 Z M 1026.5 702.5 L 1044.5 702.5 L 1044.5 720.5 L 1026.5 720.5 Z M 975.5 702.5 L 993.5 702.5 L 993.5 720.5 L 975.5 720.5 Z M 924.5 702.5 L 942.5 702.5 L 942.5 720.5 L 924.5 720.5 Z M 873.5 702.5 L 891.5 702.5 L 891.5 720.5 L 873.5 720.5 Z M 822.5 702.5 L 840.5 702.5 L 840.5 720.5 L 822.5 720.5 Z M 771.5 702.5 L 789.5 702.5 L 789.5 720.5 L 771.5 720.5 Z M 720.5 702.5 L 738.5 702.5 L 738.5 720.5 L 720.5 720.5 Z M 669.5 702.5 L 687.5 702.5 L 687.5 720.5 L 669.5 720.5 Z M 618.5 702.5 L 636.5 702.5 L 636.5 720.5 L 618.5 720.5 Z M 567.5 702.5 L 585.5 702.5 L 585.5 720.5 L 567.5 720.5 Z M 516.5 702.5 L 534.5 702.5 L 534.5 720.5 L 516.5 720.5 Z M 465.5 702.5 L 483.5 702.5 L 483.5 720.5 L 465.5 720.5 Z M 414.5 702.5 L 432.5 702.5 L 432.5 720.5 L 414.5 720.5 Z M 363.5 702.5 L 381.5 702.5 L 381.5 720.5 L 363.5 720.5 Z M 312.5 702.5 L 331.5 702.5 L 331.5 720.5 L 312.5 720.5 Z M 261.5 702.5 L 280.5 702.5 L 280.5 720.5 L 261.5 720.5 Z M 261.5 702.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface345">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -174,6 +174,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 484.722656 500.082031 L 484.660156 501.070312 L 484.507812 501.964844 L 484.230469 502.796875 L 483.859375 503.539062 L 483.367188 504.246094 L 482.777344 504.863281 L 482.132812 505.390625 L 481.453125 505.789062 L 480.679688 506.097656 L 479.878906 506.347656 L 479.015625 506.46875 L 478.089844 506.5 L 467.9375 506.5 L 467.9375 484.007812 L 477.070312 484.007812 L 478.398438 484.097656 L 479.570312 484.316406 L 480.621094 484.683594 L 481.515625 485.210938 L 482.285156 485.886719 L 482.902344 486.722656 L 483.148438 487.183594 L 483.367188 487.679688 L 483.519531 488.140625 L 483.644531 488.664062 L 483.703125 489.191406 L 483.734375 489.714844 L 483.644531 490.824219 L 483.367188 491.78125 L 482.933594 492.675781 L 482.316406 493.417969 L 481.542969 494.097656 L 480.621094 494.621094 L 481.515625 495.023438 L 482.285156 495.453125 L 482.964844 495.949219 L 483.519531 496.503906 L 483.953125 497.089844 L 484.292969 497.707031 L 484.414062 498.078125 L 484.507812 498.445312 L 484.597656 498.816406 L 484.660156 499.25 L 484.691406 499.648438 Z M 480.867188 490.117188 L 480.773438 489.191406 L 480.496094 488.417969 L 480.0625 487.738281 L 479.445312 487.246094 L 478.675781 486.875 L 477.71875 486.628906 L 477.503906 486.628906 L 477.285156 486.597656 L 477.070312 486.566406 L 476.578125 486.566406 L 476.359375 486.535156 L 470.808594 486.535156 L 470.808594 493.695312 L 476.359375 493.695312 L 477.503906 493.632812 L 478.488281 493.449219 L 479.324219 493.109375 L 479.941406 492.644531 L 480.433594 492.027344 L 480.742188 491.289062 L 480.773438 491.132812 L 480.835938 490.765625 L 480.835938 490.332031 Z M 477.8125 503.96875 L 478.675781 503.9375 L 479.445312 503.753906 L 480.125 503.445312 L 480.679688 503.042969 L 481.144531 502.519531 L 481.515625 501.871094 L 481.605469 501.625 L 481.667969 501.347656 L 481.761719 501.039062 L 481.792969 500.761719 L 481.824219 500.453125 L 481.851562 500.113281 L 481.792969 499.433594 L 481.667969 498.785156 L 481.453125 498.230469 L 481.144531 497.707031 L 480.742188 497.273438 L 480.28125 496.875 L 479.941406 496.6875 L 479.570312 496.535156 L 479.167969 496.410156 L 478.738281 496.316406 L 478.273438 496.257812 L 477.8125 496.226562 L 470.808594 496.226562 L 470.808594 503.96875 Z M 477.8125 503.96875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 465 593 L 483 593 M 465 575 L 483 575 M 465 575 L 465 593 M 483 575 L 483 593 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 465 593 L 483 593 M 465 575 L 483 575 M 483 593 L 483 575 M 465 593 L 465 575 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 194 363 L 194 372 M 189 368 L 198 368 M 193 369 L 195 369 M 193 367 L 195 367 M 193 367 L 193 369 M 195 367 L 195 369 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fah/sky130_fd_sc_hs__fah_4.svg b/cells/fah/sky130_fd_sc_hs__fah_4.svg
index ae0ba8b..3c8c5f9 100644
--- a/cells/fah/sky130_fd_sc_hs__fah_4.svg
+++ b/cells/fah/sky130_fd_sc_hs__fah_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 349.5 L 1743.5 349.5 L 1743.5 529.5 L 174.5 529.5 Z M 1030.5 529.5 L 1743.5 529.5 L 1743.5 534.5 L 1030.5 534.5 Z M 174.5 529.5 L 896.5 529.5 L 896.5 534.5 L 174.5 534.5 Z M 334.5 534.5 L 896.5 534.5 L 896.5 537.5 L 334.5 537.5 Z M 334.5 534.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 193.5 676.5 L 1724.5 676.5 L 1724.5 700.5 L 193.5 700.5 Z M 193.5 676.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 957.5 563.5 L 971.5 563.5 L 971.5 627.5 L 957.5 627.5 Z M 539.5 571.5 L 554.5 571.5 L 554.5 635.5 L 539.5 635.5 Z M 586.5 571.5 L 601.5 571.5 L 601.5 635.5 L 586.5 635.5 Z M 908.5 574.5 L 923.5 574.5 L 923.5 638.5 L 908.5 638.5 Z M 865.5 574.5 L 880.5 574.5 L 880.5 638.5 L 865.5 638.5 Z M 1472.5 576.5 L 1487.5 576.5 L 1487.5 640.5 L 1472.5 640.5 Z M 1125.5 576.5 L 1140.5 576.5 L 1140.5 640.5 L 1125.5 640.5 Z M 488.5 579.5 L 503.5 579.5 L 503.5 643.5 L 488.5 643.5 Z M 445.5 579.5 L 460.5 579.5 L 460.5 643.5 L 445.5 643.5 Z M 815.5 585.5 L 830.5 585.5 L 830.5 649.5 L 815.5 649.5 Z M 1225.5 576.5 L 1240.5 576.5 L 1240.5 650.5 L 1225.5 650.5 Z M 1322.5 576.5 L 1337.5 576.5 L 1337.5 650.5 L 1322.5 650.5 Z M 1532.5 576.5 L 1547.5 576.5 L 1547.5 650.5 L 1532.5 650.5 Z M 1268.5 576.5 L 1283.5 576.5 L 1283.5 650.5 L 1268.5 650.5 Z M 1660.5 576.5 L 1675.5 576.5 L 1675.5 650.5 L 1660.5 650.5 Z M 1365.5 576.5 L 1380.5 576.5 L 1380.5 650.5 L 1365.5 650.5 Z M 1575.5 576.5 L 1590.5 576.5 L 1590.5 650.5 L 1575.5 650.5 Z M 1618.5 576.5 L 1633.5 576.5 L 1633.5 650.5 L 1618.5 650.5 Z M 398.5 579.5 L 413.5 579.5 L 413.5 653.5 L 398.5 653.5 Z M 235.5 599.5 L 250.5 599.5 L 250.5 663.5 L 235.5 663.5 Z M 278.5 599.5 L 292.5 599.5 L 292.5 663.5 L 278.5 663.5 Z M 686.5 589.5 L 701.5 589.5 L 701.5 663.5 L 686.5 663.5 Z M 686.5 589.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 932.5 405.5 L 947.5 405.5 L 947.5 489.5 L 932.5 489.5 Z M 1026.5 405.5 L 1041.5 405.5 L 1041.5 489.5 L 1026.5 489.5 Z M 236.5 405.5 L 251.5 405.5 L 251.5 505.5 L 236.5 505.5 Z M 280.5 405.5 L 295.5 405.5 L 295.5 505.5 L 280.5 505.5 Z M 808.5 427.5 L 823.5 427.5 L 823.5 511.5 L 808.5 511.5 Z M 868.5 427.5 L 883.5 427.5 L 883.5 511.5 L 868.5 511.5 Z M 1562.5 405.5 L 1577.5 405.5 L 1577.5 517.5 L 1562.5 517.5 Z M 1459.5 417.5 L 1474.5 417.5 L 1474.5 517.5 L 1459.5 517.5 Z M 1080.5 417.5 L 1095.5 417.5 L 1095.5 517.5 L 1080.5 517.5 Z M 755.5 405.5 L 770.5 405.5 L 770.5 517.5 L 755.5 517.5 Z M 1165.5 405.5 L 1180.5 405.5 L 1180.5 517.5 L 1165.5 517.5 Z M 1317.5 405.5 L 1332.5 405.5 L 1332.5 517.5 L 1317.5 517.5 Z M 1272.5 405.5 L 1287.5 405.5 L 1287.5 517.5 L 1272.5 517.5 Z M 1616.5 405.5 L 1631.5 405.5 L 1631.5 517.5 L 1616.5 517.5 Z M 1517.5 405.5 L 1532.5 405.5 L 1532.5 517.5 L 1517.5 517.5 Z M 1662.5 405.5 L 1677.5 405.5 L 1677.5 517.5 L 1662.5 517.5 Z M 1210.5 405.5 L 1225.5 405.5 L 1225.5 517.5 L 1210.5 517.5 Z M 593.5 436.5 L 608.5 436.5 L 608.5 520.5 L 593.5 520.5 Z M 548.5 436.5 L 563.5 436.5 L 563.5 520.5 L 548.5 520.5 Z M 391.5 408.5 L 406.5 408.5 L 406.5 520.5 L 391.5 520.5 Z M 441.5 436.5 L 456.5 436.5 L 456.5 520.5 L 441.5 520.5 Z M 486.5 436.5 L 501.5 436.5 L 501.5 520.5 L 486.5 520.5 Z M 486.5 436.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 208.5 360.5 L 225.5 360.5 L 225.5 376.5 L 208.5 376.5 Z M 1692.5 360.5 L 1709.5 360.5 L 1709.5 376.5 L 1692.5 376.5 Z M 1644.5 360.5 L 1661.5 360.5 L 1661.5 376.5 L 1644.5 376.5 Z M 1596.5 360.5 L 1613.5 360.5 L 1613.5 376.5 L 1596.5 376.5 Z M 1548.5 360.5 L 1565.5 360.5 L 1565.5 376.5 L 1548.5 376.5 Z M 1500.5 360.5 L 1517.5 360.5 L 1517.5 376.5 L 1500.5 376.5 Z M 1453.5 360.5 L 1470.5 360.5 L 1470.5 376.5 L 1453.5 376.5 Z M 1405.5 360.5 L 1422.5 360.5 L 1422.5 376.5 L 1405.5 376.5 Z M 1357.5 360.5 L 1374.5 360.5 L 1374.5 376.5 L 1357.5 376.5 Z M 1309.5 360.5 L 1326.5 360.5 L 1326.5 376.5 L 1309.5 376.5 Z M 1261.5 360.5 L 1278.5 360.5 L 1278.5 376.5 L 1261.5 376.5 Z M 1213.5 360.5 L 1230.5 360.5 L 1230.5 376.5 L 1213.5 376.5 Z M 1165.5 360.5 L 1182.5 360.5 L 1182.5 376.5 L 1165.5 376.5 Z M 1118.5 360.5 L 1135.5 360.5 L 1135.5 376.5 L 1118.5 376.5 Z M 1070.5 360.5 L 1087.5 360.5 L 1087.5 376.5 L 1070.5 376.5 Z M 1022.5 360.5 L 1039.5 360.5 L 1039.5 376.5 L 1022.5 376.5 Z M 974.5 360.5 L 991.5 360.5 L 991.5 376.5 L 974.5 376.5 Z M 926.5 360.5 L 943.5 360.5 L 943.5 376.5 L 926.5 376.5 Z M 878.5 360.5 L 895.5 360.5 L 895.5 376.5 L 878.5 376.5 Z M 830.5 360.5 L 847.5 360.5 L 847.5 376.5 L 830.5 376.5 Z M 783.5 360.5 L 799.5 360.5 L 799.5 376.5 L 783.5 376.5 Z M 735.5 360.5 L 752.5 360.5 L 752.5 376.5 L 735.5 376.5 Z M 687.5 360.5 L 704.5 360.5 L 704.5 376.5 L 687.5 376.5 Z M 639.5 360.5 L 656.5 360.5 L 656.5 376.5 L 639.5 376.5 Z M 591.5 360.5 L 608.5 360.5 L 608.5 376.5 L 591.5 376.5 Z M 543.5 360.5 L 560.5 360.5 L 560.5 376.5 L 543.5 376.5 Z M 495.5 360.5 L 512.5 360.5 L 512.5 376.5 L 495.5 376.5 Z M 448.5 360.5 L 464.5 360.5 L 464.5 376.5 L 448.5 376.5 Z M 400.5 360.5 L 417.5 360.5 L 417.5 376.5 L 400.5 376.5 Z M 352.5 360.5 L 369.5 360.5 L 369.5 376.5 L 352.5 376.5 Z M 304.5 360.5 L 321.5 360.5 L 321.5 376.5 L 304.5 376.5 Z M 256.5 360.5 L 273.5 360.5 L 273.5 376.5 L 256.5 376.5 Z M 543.5 489.5 L 560.5 489.5 L 560.5 506.5 L 543.5 506.5 Z M 878.5 489.5 L 895.5 489.5 L 895.5 506.5 L 878.5 506.5 Z M 591.5 526.5 L 608.5 526.5 L 608.5 542.5 L 591.5 542.5 Z M 1118.5 526.5 L 1135.5 526.5 L 1135.5 542.5 L 1118.5 542.5 Z M 495.5 526.5 L 512.5 526.5 L 512.5 542.5 L 495.5 542.5 Z M 783.5 526.5 L 799.5 526.5 L 799.5 542.5 L 783.5 542.5 Z M 735.5 526.5 L 752.5 526.5 L 752.5 542.5 L 735.5 542.5 Z M 208.5 692.5 L 225.5 692.5 L 225.5 708.5 L 208.5 708.5 Z M 1692.5 692.5 L 1709.5 692.5 L 1709.5 708.5 L 1692.5 708.5 Z M 1644.5 692.5 L 1661.5 692.5 L 1661.5 708.5 L 1644.5 708.5 Z M 1596.5 692.5 L 1613.5 692.5 L 1613.5 708.5 L 1596.5 708.5 Z M 1548.5 692.5 L 1565.5 692.5 L 1565.5 708.5 L 1548.5 708.5 Z M 1500.5 692.5 L 1517.5 692.5 L 1517.5 708.5 L 1500.5 708.5 Z M 1453.5 692.5 L 1470.5 692.5 L 1470.5 708.5 L 1453.5 708.5 Z M 1405.5 692.5 L 1422.5 692.5 L 1422.5 708.5 L 1405.5 708.5 Z M 1357.5 692.5 L 1374.5 692.5 L 1374.5 708.5 L 1357.5 708.5 Z M 1309.5 692.5 L 1326.5 692.5 L 1326.5 708.5 L 1309.5 708.5 Z M 1261.5 692.5 L 1278.5 692.5 L 1278.5 708.5 L 1261.5 708.5 Z M 1213.5 692.5 L 1230.5 692.5 L 1230.5 708.5 L 1213.5 708.5 Z M 1165.5 692.5 L 1182.5 692.5 L 1182.5 708.5 L 1165.5 708.5 Z M 1118.5 692.5 L 1135.5 692.5 L 1135.5 708.5 L 1118.5 708.5 Z M 1070.5 692.5 L 1087.5 692.5 L 1087.5 708.5 L 1070.5 708.5 Z M 1022.5 692.5 L 1039.5 692.5 L 1039.5 708.5 L 1022.5 708.5 Z M 974.5 692.5 L 991.5 692.5 L 991.5 708.5 L 974.5 708.5 Z M 926.5 692.5 L 943.5 692.5 L 943.5 708.5 L 926.5 708.5 Z M 878.5 692.5 L 895.5 692.5 L 895.5 708.5 L 878.5 708.5 Z M 830.5 692.5 L 847.5 692.5 L 847.5 708.5 L 830.5 708.5 Z M 783.5 692.5 L 799.5 692.5 L 799.5 708.5 L 783.5 708.5 Z M 735.5 692.5 L 752.5 692.5 L 752.5 708.5 L 735.5 708.5 Z M 687.5 692.5 L 704.5 692.5 L 704.5 708.5 L 687.5 708.5 Z M 639.5 692.5 L 656.5 692.5 L 656.5 708.5 L 639.5 708.5 Z M 591.5 692.5 L 608.5 692.5 L 608.5 708.5 L 591.5 708.5 Z M 543.5 692.5 L 560.5 692.5 L 560.5 708.5 L 543.5 708.5 Z M 495.5 692.5 L 512.5 692.5 L 512.5 708.5 L 495.5 708.5 Z M 448.5 692.5 L 464.5 692.5 L 464.5 708.5 L 448.5 708.5 Z M 400.5 692.5 L 417.5 692.5 L 417.5 708.5 L 400.5 708.5 Z M 352.5 692.5 L 369.5 692.5 L 369.5 708.5 L 352.5 708.5 Z M 304.5 692.5 L 321.5 692.5 L 321.5 708.5 L 304.5 708.5 Z M 256.5 692.5 L 273.5 692.5 L 273.5 708.5 L 256.5 708.5 Z M 256.5 692.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface314">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,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 1475.449219 523.351562 L 1475.449219 544.824219 L 1472.679688 544.824219 L 1472.679688 523.351562 Z M 1475.449219 523.351562 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1453 553 L 1470 553 M 1453 537 L 1470 537 M 1453 537 L 1453 553 M 1470 537 L 1470 553 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1453 553 L 1470 553 M 1453 537 L 1470 537 M 1470 553 L 1470 537 M 1453 553 L 1453 537 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 193 374 L 193 383 M 188 379 L 197 379 M 192 380 L 194 380 M 192 378 L 194 378 M 192 378 L 192 380 M 194 378 L 194 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fahcin/sky130_fd_sc_hs__fahcin_1.svg b/cells/fahcin/sky130_fd_sc_hs__fahcin_1.svg
index 84dbb3a..c4da0e9 100644
--- a/cells/fahcin/sky130_fd_sc_hs__fahcin_1.svg
+++ b/cells/fahcin/sky130_fd_sc_hs__fahcin_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 316.5 L 1744.5 316.5 L 1744.5 535.5 L 174.5 535.5 Z M 174.5 316.5 "/>
 </clipPath>
-<image id="image366" 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="#image366"/>
+  <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 196.5 701.5 L 1721.5 701.5 L 1721.5 730.5 L 196.5 730.5 Z M 196.5 701.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#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 1358.5 575.5 L 1375.5 575.5 L 1375.5 650.5 L 1358.5 650.5 Z M 1469.5 575.5 L 1487.5 575.5 L 1487.5 650.5 L 1469.5 650.5 Z M 1537.5 584.5 L 1554.5 584.5 L 1554.5 660.5 L 1537.5 660.5 Z M 616.5 585.5 L 634.5 585.5 L 634.5 660.5 L 616.5 660.5 Z M 694.5 585.5 L 712.5 585.5 L 712.5 660.5 L 694.5 660.5 Z M 1302.5 575.5 L 1319.5 575.5 L 1319.5 662.5 L 1302.5 662.5 Z M 1654.5 584.5 L 1672.5 584.5 L 1672.5 671.5 L 1654.5 671.5 Z M 354.5 600.5 L 371.5 600.5 L 371.5 675.5 L 354.5 675.5 Z M 818.5 596.5 L 836.5 596.5 L 836.5 683.5 L 818.5 683.5 Z M 1198.5 607.5 L 1215.5 607.5 L 1215.5 683.5 L 1198.5 683.5 Z M 904.5 607.5 L 922.5 607.5 L 922.5 683.5 L 904.5 683.5 Z M 955.5 607.5 L 972.5 607.5 L 972.5 683.5 L 955.5 683.5 Z M 1139.5 607.5 L 1157.5 607.5 L 1157.5 683.5 L 1139.5 683.5 Z M 486.5 611.5 L 504.5 611.5 L 504.5 687.5 L 486.5 687.5 Z M 246.5 600.5 L 264.5 600.5 L 264.5 687.5 L 246.5 687.5 Z M 536.5 611.5 L 554.5 611.5 L 554.5 687.5 L 536.5 687.5 Z M 536.5 611.5 "/>
 </clipPath>
-<image id="image367" 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="#image367"/>
+  <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 545.5 386.5 L 563.5 386.5 L 563.5 484.5 L 545.5 484.5 Z M 488.5 386.5 L 505.5 386.5 L 505.5 484.5 L 488.5 484.5 Z M 952.5 396.5 L 969.5 396.5 L 969.5 495.5 L 952.5 495.5 Z M 1117.5 396.5 L 1135.5 396.5 L 1135.5 495.5 L 1117.5 495.5 Z M 1388.5 406.5 L 1406.5 406.5 L 1406.5 504.5 L 1388.5 504.5 Z M 1441.5 406.5 L 1459.5 406.5 L 1459.5 504.5 L 1441.5 504.5 Z M 608.5 408.5 L 626.5 408.5 L 626.5 507.5 L 608.5 507.5 Z M 692.5 408.5 L 710.5 408.5 L 710.5 507.5 L 692.5 507.5 Z M 1653.5 382.5 L 1671.5 382.5 L 1671.5 514.5 L 1653.5 514.5 Z M 248.5 382.5 L 266.5 382.5 L 266.5 514.5 L 248.5 514.5 Z M 816.5 382.5 L 834.5 382.5 L 834.5 514.5 L 816.5 514.5 Z M 883.5 396.5 L 901.5 396.5 L 901.5 514.5 L 883.5 514.5 Z M 1187.5 396.5 L 1204.5 396.5 L 1204.5 514.5 L 1187.5 514.5 Z M 329.5 396.5 L 347.5 396.5 L 347.5 514.5 L 329.5 514.5 Z M 1573.5 396.5 L 1591.5 396.5 L 1591.5 514.5 L 1573.5 514.5 Z M 1269.5 382.5 L 1287.5 382.5 L 1287.5 514.5 L 1269.5 514.5 Z M 1269.5 382.5 "/>
 </clipPath>
-<image id="image368" 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="#image368"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 215.5 328.5 L 235.5 328.5 L 235.5 348.5 L 215.5 348.5 Z M 1683.5 328.5 L 1703.5 328.5 L 1703.5 348.5 L 1683.5 348.5 Z M 1627.5 328.5 L 1647.5 328.5 L 1647.5 348.5 L 1627.5 348.5 Z M 1570.5 328.5 L 1590.5 328.5 L 1590.5 348.5 L 1570.5 348.5 Z M 1514.5 328.5 L 1534.5 328.5 L 1534.5 348.5 L 1514.5 348.5 Z M 1457.5 328.5 L 1477.5 328.5 L 1477.5 348.5 L 1457.5 348.5 Z M 1401.5 328.5 L 1421.5 328.5 L 1421.5 348.5 L 1401.5 348.5 Z M 1344.5 328.5 L 1364.5 328.5 L 1364.5 348.5 L 1344.5 348.5 Z M 1288.5 328.5 L 1308.5 328.5 L 1308.5 348.5 L 1288.5 348.5 Z M 1231.5 328.5 L 1251.5 328.5 L 1251.5 348.5 L 1231.5 348.5 Z M 1175.5 328.5 L 1195.5 328.5 L 1195.5 348.5 L 1175.5 348.5 Z M 1118.5 328.5 L 1138.5 328.5 L 1138.5 348.5 L 1118.5 348.5 Z M 1062.5 328.5 L 1082.5 328.5 L 1082.5 348.5 L 1062.5 348.5 Z M 1005.5 328.5 L 1025.5 328.5 L 1025.5 348.5 L 1005.5 348.5 Z M 949.5 328.5 L 969.5 328.5 L 969.5 348.5 L 949.5 348.5 Z M 892.5 328.5 L 912.5 328.5 L 912.5 348.5 L 892.5 348.5 Z M 836.5 328.5 L 856.5 328.5 L 856.5 348.5 L 836.5 348.5 Z M 779.5 328.5 L 799.5 328.5 L 799.5 348.5 L 779.5 348.5 Z M 723.5 328.5 L 743.5 328.5 L 743.5 348.5 L 723.5 348.5 Z M 666.5 328.5 L 686.5 328.5 L 686.5 348.5 L 666.5 348.5 Z M 610.5 328.5 L 630.5 328.5 L 630.5 348.5 L 610.5 348.5 Z M 554.5 328.5 L 574.5 328.5 L 574.5 348.5 L 554.5 348.5 Z M 497.5 328.5 L 517.5 328.5 L 517.5 348.5 L 497.5 348.5 Z M 441.5 328.5 L 461.5 328.5 L 461.5 348.5 L 441.5 348.5 Z M 384.5 328.5 L 404.5 328.5 L 404.5 348.5 L 384.5 348.5 Z M 328.5 328.5 L 348.5 328.5 L 348.5 348.5 L 328.5 348.5 Z M 271.5 328.5 L 291.5 328.5 L 291.5 348.5 L 271.5 348.5 Z M 723.5 481.5 L 743.5 481.5 L 743.5 500.5 L 723.5 500.5 Z M 1062.5 481.5 L 1082.5 481.5 L 1082.5 501.5 L 1062.5 501.5 Z M 1457.5 481.5 L 1477.5 481.5 L 1477.5 501.5 L 1457.5 501.5 Z M 723.5 500.5 L 743.5 500.5 L 743.5 501.5 L 723.5 501.5 Z M 441.5 481.5 L 461.5 481.5 L 461.5 501.5 L 441.5 501.5 Z M 215.5 720.5 L 235.5 720.5 L 235.5 740.5 L 215.5 740.5 Z M 1683.5 720.5 L 1703.5 720.5 L 1703.5 740.5 L 1683.5 740.5 Z M 1627.5 720.5 L 1647.5 720.5 L 1647.5 740.5 L 1627.5 740.5 Z M 1570.5 720.5 L 1590.5 720.5 L 1590.5 740.5 L 1570.5 740.5 Z M 1514.5 720.5 L 1534.5 720.5 L 1534.5 740.5 L 1514.5 740.5 Z M 1457.5 720.5 L 1477.5 720.5 L 1477.5 740.5 L 1457.5 740.5 Z M 1401.5 720.5 L 1421.5 720.5 L 1421.5 740.5 L 1401.5 740.5 Z M 1344.5 720.5 L 1364.5 720.5 L 1364.5 740.5 L 1344.5 740.5 Z M 1288.5 720.5 L 1308.5 720.5 L 1308.5 740.5 L 1288.5 740.5 Z M 1231.5 720.5 L 1251.5 720.5 L 1251.5 740.5 L 1231.5 740.5 Z M 1175.5 720.5 L 1195.5 720.5 L 1195.5 740.5 L 1175.5 740.5 Z M 1118.5 720.5 L 1138.5 720.5 L 1138.5 740.5 L 1118.5 740.5 Z M 1062.5 720.5 L 1082.5 720.5 L 1082.5 740.5 L 1062.5 740.5 Z M 1005.5 720.5 L 1025.5 720.5 L 1025.5 740.5 L 1005.5 740.5 Z M 949.5 720.5 L 969.5 720.5 L 969.5 740.5 L 949.5 740.5 Z M 892.5 720.5 L 912.5 720.5 L 912.5 740.5 L 892.5 740.5 Z M 836.5 720.5 L 856.5 720.5 L 856.5 740.5 L 836.5 740.5 Z M 779.5 720.5 L 799.5 720.5 L 799.5 740.5 L 779.5 740.5 Z M 723.5 720.5 L 743.5 720.5 L 743.5 740.5 L 723.5 740.5 Z M 666.5 720.5 L 686.5 720.5 L 686.5 740.5 L 666.5 740.5 Z M 610.5 720.5 L 630.5 720.5 L 630.5 740.5 L 610.5 740.5 Z M 554.5 720.5 L 574.5 720.5 L 574.5 740.5 L 554.5 740.5 Z M 497.5 720.5 L 517.5 720.5 L 517.5 740.5 L 497.5 740.5 Z M 441.5 720.5 L 461.5 720.5 L 461.5 740.5 L 441.5 740.5 Z M 384.5 720.5 L 404.5 720.5 L 404.5 740.5 L 384.5 740.5 Z M 328.5 720.5 L 348.5 720.5 L 348.5 740.5 L 328.5 740.5 Z M 271.5 720.5 L 291.5 720.5 L 291.5 740.5 L 271.5 740.5 Z M 271.5 720.5 "/>
 </clipPath>
-<image id="image369" 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="#image369"/>
+  <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="surface363">
+<g id="surface390">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -197,6 +197,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1722.542969 416.695312 L 1719.105469 416.695312 L 1711.847656 395.269531 L 1711.847656 416.695312 L 1708.761719 416.695312 L 1708.761719 391.132812 L 1713.285156 391.132812 L 1720.859375 413.398438 L 1728.292969 391.132812 L 1732.816406 391.132812 L 1732.816406 416.695312 L 1729.730469 416.695312 L 1729.730469 395.269531 Z M 1722.542969 416.695312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1683 685 L 1703 685 M 1683 665 L 1703 665 M 1683 665 L 1683 685 M 1703 665 L 1703 685 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1683 685 L 1703 685 M 1683 665 L 1703 665 M 1703 685 L 1703 665 M 1683 685 L 1683 665 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 344 L 196 353 M 191 349 L 200 349 M 195 350 L 197 350 M 195 348 L 197 348 M 195 348 L 195 350 M 197 348 L 197 350 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fahcon/sky130_fd_sc_hs__fahcon_1.svg b/cells/fahcon/sky130_fd_sc_hs__fahcon_1.svg
index 0152ae6..1f72fa6 100644
--- a/cells/fahcon/sky130_fd_sc_hs__fahcon_1.svg
+++ b/cells/fahcon/sky130_fd_sc_hs__fahcon_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 290.5 L 1744.5 290.5 L 1744.5 535.5 L 175.5 535.5 Z M 365.5 535.5 L 864.5 535.5 L 864.5 537.5 L 365.5 537.5 Z M 365.5 535.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 200.5 722.5 L 1719.5 722.5 L 1719.5 754.5 L 200.5 754.5 Z M 200.5 722.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 562.5 582.5 L 582.5 582.5 L 582.5 667.5 L 562.5 667.5 Z M 642.5 582.5 L 662.5 582.5 L 662.5 667.5 L 642.5 667.5 Z M 504.5 582.5 L 524.5 582.5 L 524.5 667.5 L 504.5 667.5 Z M 426.5 591.5 L 446.5 591.5 L 446.5 675.5 L 426.5 675.5 Z M 370.5 591.5 L 390.5 591.5 L 390.5 675.5 L 370.5 675.5 Z M 255.5 591.5 L 275.5 591.5 L 275.5 688.5 L 255.5 688.5 Z M 1330.5 608.5 L 1350.5 608.5 L 1350.5 692.5 L 1330.5 692.5 Z M 1524.5 608.5 L 1543.5 608.5 L 1543.5 692.5 L 1524.5 692.5 Z M 1437.5 608.5 L 1456.5 608.5 L 1456.5 692.5 L 1437.5 692.5 Z M 1644.5 608.5 L 1663.5 608.5 L 1663.5 705.5 L 1644.5 705.5 Z M 824.5 608.5 L 844.5 608.5 L 844.5 705.5 L 824.5 705.5 Z M 1009.5 621.5 L 1029.5 621.5 L 1029.5 705.5 L 1009.5 705.5 Z M 1103.5 621.5 L 1123.5 621.5 L 1123.5 705.5 L 1103.5 705.5 Z M 1263.5 608.5 L 1282.5 608.5 L 1282.5 705.5 L 1263.5 705.5 Z M 1195.5 621.5 L 1215.5 621.5 L 1215.5 705.5 L 1195.5 705.5 Z M 887.5 621.5 L 906.5 621.5 L 906.5 705.5 L 887.5 705.5 Z M 887.5 621.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1011.5 366.5 L 1031.5 366.5 L 1031.5 477.5 L 1011.5 477.5 Z M 925.5 366.5 L 945.5 366.5 L 945.5 477.5 L 925.5 477.5 Z M 1172.5 364.5 L 1192.5 364.5 L 1192.5 496.5 L 1172.5 496.5 Z M 1576.5 364.5 L 1596.5 364.5 L 1596.5 496.5 L 1576.5 496.5 Z M 854.5 366.5 L 874.5 366.5 L 874.5 498.5 L 854.5 498.5 Z M 1642.5 364.5 L 1662.5 364.5 L 1662.5 512.5 L 1642.5 512.5 Z M 1383.5 401.5 L 1403.5 401.5 L 1403.5 512.5 L 1383.5 512.5 Z M 1239.5 364.5 L 1259.5 364.5 L 1259.5 512.5 L 1239.5 512.5 Z M 339.5 380.5 L 359.5 380.5 L 359.5 512.5 L 339.5 512.5 Z M 262.5 364.5 L 281.5 364.5 L 281.5 512.5 L 262.5 512.5 Z M 1443.5 401.5 L 1462.5 401.5 L 1462.5 512.5 L 1443.5 512.5 Z M 423.5 403.5 L 443.5 403.5 L 443.5 514.5 L 423.5 514.5 Z M 638.5 403.5 L 658.5 403.5 L 658.5 514.5 L 638.5 514.5 Z M 558.5 403.5 L 577.5 403.5 L 577.5 514.5 L 558.5 514.5 Z M 775.5 366.5 L 794.5 366.5 L 794.5 514.5 L 775.5 514.5 Z M 498.5 403.5 L 518.5 403.5 L 518.5 514.5 L 498.5 514.5 Z M 498.5 403.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 220.5 304.5 L 243.5 304.5 L 243.5 326.5 L 220.5 326.5 Z M 1676.5 304.5 L 1698.5 304.5 L 1698.5 326.5 L 1676.5 326.5 Z M 1613.5 304.5 L 1635.5 304.5 L 1635.5 326.5 L 1613.5 326.5 Z M 1549.5 304.5 L 1572.5 304.5 L 1572.5 326.5 L 1549.5 326.5 Z M 1486.5 304.5 L 1508.5 304.5 L 1508.5 326.5 L 1486.5 326.5 Z M 1423.5 304.5 L 1445.5 304.5 L 1445.5 326.5 L 1423.5 326.5 Z M 1359.5 304.5 L 1382.5 304.5 L 1382.5 326.5 L 1359.5 326.5 Z M 1296.5 304.5 L 1319.5 304.5 L 1319.5 326.5 L 1296.5 326.5 Z M 1233.5 304.5 L 1255.5 304.5 L 1255.5 326.5 L 1233.5 326.5 Z M 1170.5 304.5 L 1192.5 304.5 L 1192.5 326.5 L 1170.5 326.5 Z M 1106.5 304.5 L 1129.5 304.5 L 1129.5 326.5 L 1106.5 326.5 Z M 1043.5 304.5 L 1065.5 304.5 L 1065.5 326.5 L 1043.5 326.5 Z M 980.5 304.5 L 1002.5 304.5 L 1002.5 326.5 L 980.5 326.5 Z M 916.5 304.5 L 939.5 304.5 L 939.5 326.5 L 916.5 326.5 Z M 853.5 304.5 L 876.5 304.5 L 876.5 326.5 L 853.5 326.5 Z M 790.5 304.5 L 812.5 304.5 L 812.5 326.5 L 790.5 326.5 Z M 726.5 304.5 L 749.5 304.5 L 749.5 326.5 L 726.5 326.5 Z M 663.5 304.5 L 686.5 304.5 L 686.5 326.5 L 663.5 326.5 Z M 600.5 304.5 L 622.5 304.5 L 622.5 326.5 L 600.5 326.5 Z M 537.5 304.5 L 559.5 304.5 L 559.5 326.5 L 537.5 326.5 Z M 473.5 304.5 L 496.5 304.5 L 496.5 326.5 L 473.5 326.5 Z M 410.5 304.5 L 432.5 304.5 L 432.5 326.5 L 410.5 326.5 Z M 347.5 304.5 L 369.5 304.5 L 369.5 326.5 L 347.5 326.5 Z M 283.5 304.5 L 306.5 304.5 L 306.5 326.5 L 283.5 326.5 Z M 1043.5 523.5 L 1065.5 523.5 L 1065.5 539.5 L 1043.5 539.5 Z M 1359.5 523.5 L 1382.5 523.5 L 1382.5 546.5 L 1359.5 546.5 Z M 1043.5 539.5 L 1065.5 539.5 L 1065.5 546.5 L 1043.5 546.5 Z M 600.5 523.5 L 622.5 523.5 L 622.5 546.5 L 600.5 546.5 Z M 980.5 621.5 L 1002.5 621.5 L 1002.5 643.5 L 980.5 643.5 Z M 1423.5 621.5 L 1445.5 621.5 L 1445.5 643.5 L 1423.5 643.5 Z M 473.5 621.5 L 496.5 621.5 L 496.5 643.5 L 473.5 643.5 Z M 1106.5 621.5 L 1129.5 621.5 L 1129.5 643.5 L 1106.5 643.5 Z M 220.5 743.5 L 243.5 743.5 L 243.5 765.5 L 220.5 765.5 Z M 1676.5 743.5 L 1698.5 743.5 L 1698.5 765.5 L 1676.5 765.5 Z M 1613.5 743.5 L 1635.5 743.5 L 1635.5 765.5 L 1613.5 765.5 Z M 1549.5 743.5 L 1572.5 743.5 L 1572.5 765.5 L 1549.5 765.5 Z M 1486.5 743.5 L 1508.5 743.5 L 1508.5 765.5 L 1486.5 765.5 Z M 1423.5 743.5 L 1445.5 743.5 L 1445.5 765.5 L 1423.5 765.5 Z M 1359.5 743.5 L 1382.5 743.5 L 1382.5 765.5 L 1359.5 765.5 Z M 1296.5 743.5 L 1319.5 743.5 L 1319.5 765.5 L 1296.5 765.5 Z M 1233.5 743.5 L 1255.5 743.5 L 1255.5 765.5 L 1233.5 765.5 Z M 1170.5 743.5 L 1192.5 743.5 L 1192.5 765.5 L 1170.5 765.5 Z M 1106.5 743.5 L 1129.5 743.5 L 1129.5 765.5 L 1106.5 765.5 Z M 1043.5 743.5 L 1065.5 743.5 L 1065.5 765.5 L 1043.5 765.5 Z M 980.5 743.5 L 1002.5 743.5 L 1002.5 765.5 L 980.5 765.5 Z M 916.5 743.5 L 939.5 743.5 L 939.5 765.5 L 916.5 765.5 Z M 853.5 743.5 L 876.5 743.5 L 876.5 765.5 L 853.5 765.5 Z M 790.5 743.5 L 812.5 743.5 L 812.5 765.5 L 790.5 765.5 Z M 726.5 743.5 L 749.5 743.5 L 749.5 765.5 L 726.5 765.5 Z M 663.5 743.5 L 686.5 743.5 L 686.5 765.5 L 663.5 765.5 Z M 600.5 743.5 L 622.5 743.5 L 622.5 765.5 L 600.5 765.5 Z M 537.5 743.5 L 559.5 743.5 L 559.5 765.5 L 537.5 765.5 Z M 473.5 743.5 L 496.5 743.5 L 496.5 765.5 L 473.5 765.5 Z M 410.5 743.5 L 432.5 743.5 L 432.5 765.5 L 410.5 765.5 Z M 347.5 743.5 L 369.5 743.5 L 369.5 765.5 L 347.5 765.5 Z M 283.5 743.5 L 306.5 743.5 L 306.5 765.5 L 283.5 765.5 Z M 283.5 743.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface345">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,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 1136.761719 666.960938 L 1136.761719 695.589844 L 1132.636719 695.589844 L 1117.832031 672.378906 L 1117.832031 695.589844 L 1114.375 695.589844 L 1114.375 666.960938 L 1118.34375 666.960938 L 1133.304688 690.367188 L 1133.304688 666.960938 Z M 1136.761719 666.960938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1043 409 L 1065 409 M 1043 387 L 1065 387 M 1043 387 L 1043 409 M 1065 387 L 1065 409 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1043 409 L 1065 409 M 1043 387 L 1065 387 M 1065 409 L 1065 387 M 1043 409 L 1043 387 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 320 L 200 329 M 195 325 L 204 325 M 199 326 L 201 326 M 199 324 L 201 324 M 199 324 L 199 326 M 201 324 L 201 326 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hs__fill_1.svg b/cells/fill/sky130_fd_sc_hs__fill_1.svg
index b822054..43c6ee5 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_1.svg
+++ b/cells/fill/sky130_fd_sc_hs__fill_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 867.5 111.5 L 1064.5 111.5 L 1064.5 538.5 L 867.5 538.5 Z M 867.5 111.5 "/>
 </clipPath>
-<image id="image229" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image255" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image229"/>
+  <use xlink:href="#image255"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 910.5 862.5 L 1020.5 862.5 L 1020.5 918.5 L 910.5 918.5 Z M 910.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image229"/>
+  <use xlink:href="#image255"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -32,15 +32,15 @@
 <clipPath id="clip6">
   <path d="M 946.5 136.5 L 985.5 136.5 L 985.5 174.5 L 946.5 174.5 Z M 946.5 899.5 L 985.5 899.5 L 985.5 938.5 L 946.5 938.5 Z M 946.5 899.5 "/>
 </clipPath>
-<image id="image230" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image256" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image256"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface226">
+<g id="surface252">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -85,6 +85,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 999.976562 904.597656 L 999.976562 875.96875 L 1011.011719 875.96875 L 1012.738281 876.085938 L 1014.351562 876.402344 L 1015.84375 876.949219 L 1017.214844 877.65625 L 1018.433594 878.640625 L 1019.574219 879.777344 L 1020.515625 881.152344 L 1021.300781 882.644531 L 1021.890625 884.332031 L 1022.320312 886.140625 L 1022.558594 888.140625 L 1022.675781 890.261719 L 1022.558594 892.5 L 1022.28125 894.582031 L 1021.8125 896.46875 L 1021.183594 898.195312 L 1020.359375 899.726562 L 1019.335938 901.0625 L 1018.238281 902.160156 L 1017.019531 903.027344 L 1015.683594 903.734375 L 1014.230469 904.203125 L 1012.660156 904.519531 L 1011.011719 904.597656 Z M 1003.628906 901.375 L 1010.382812 901.375 L 1012.191406 901.257812 L 1013.800781 900.828125 L 1015.214844 900.082031 L 1016.390625 899.097656 L 1017.335938 897.765625 L 1018.121094 896.152344 L 1018.355469 895.328125 L 1018.589844 894.464844 L 1018.789062 893.523438 L 1018.90625 892.5 L 1018.984375 891.441406 L 1019.023438 890.300781 L 1018.867188 887.75 L 1018.472656 885.511719 L 1017.765625 883.585938 L 1016.824219 882.054688 L 1015.605469 880.796875 L 1014.113281 879.894531 L 1013.566406 879.699219 L 1012.976562 879.503906 L 1012.347656 879.386719 L 1011.71875 879.265625 L 1010.382812 879.1875 L 1003.628906 879.1875 Z M 1003.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 910 217 L 1020 217 M 910 161 L 1020 161 M 910 161 L 910 217 M 1020 161 L 1020 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 910 217 L 1020 217 M 910 161 L 1020 161 M 1020 217 L 1020 161 M 910 217 L 910 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 910 156 L 910 165 M 905 161 L 914 161 M 909 162 L 911 162 M 909 160 L 911 160 M 909 160 L 909 162 M 911 160 L 911 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hs__fill_2.svg b/cells/fill/sky130_fd_sc_hs__fill_2.svg
index 514cef0..dfc686f 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_2.svg
+++ b/cells/fill/sky130_fd_sc_hs__fill_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 538.5 L 812.5 538.5 Z M 812.5 111.5 "/>
 </clipPath>
-<image id="image230" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image280"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 855.5 862.5 L 1075.5 862.5 L 1075.5 918.5 L 855.5 918.5 Z M 855.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image280"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -32,15 +32,15 @@
 <clipPath id="clip6">
   <path d="M 891.5 136.5 L 930.5 136.5 L 930.5 174.5 L 891.5 174.5 Z M 1001.5 136.5 L 1040.5 136.5 L 1040.5 174.5 L 1001.5 174.5 Z M 891.5 899.5 L 930.5 899.5 L 930.5 938.5 L 891.5 938.5 Z M 1001.5 899.5 L 1040.5 899.5 L 1040.5 938.5 L 1001.5 938.5 Z M 1001.5 899.5 "/>
 </clipPath>
-<image id="image231" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image231"/>
+  <use xlink:href="#image281"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface227">
+<g id="surface277">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -85,6 +85,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 999.976562 904.597656 L 999.976562 875.96875 L 1011.011719 875.96875 L 1012.738281 876.085938 L 1014.351562 876.402344 L 1015.84375 876.949219 L 1017.214844 877.65625 L 1018.433594 878.640625 L 1019.574219 879.777344 L 1020.515625 881.152344 L 1021.300781 882.644531 L 1021.890625 884.332031 L 1022.320312 886.140625 L 1022.558594 888.140625 L 1022.675781 890.261719 L 1022.558594 892.5 L 1022.28125 894.582031 L 1021.8125 896.46875 L 1021.183594 898.195312 L 1020.359375 899.726562 L 1019.335938 901.0625 L 1018.238281 902.160156 L 1017.019531 903.027344 L 1015.683594 903.734375 L 1014.230469 904.203125 L 1012.660156 904.519531 L 1011.011719 904.597656 Z M 1003.628906 901.375 L 1010.382812 901.375 L 1012.191406 901.257812 L 1013.800781 900.828125 L 1015.214844 900.082031 L 1016.390625 899.097656 L 1017.335938 897.765625 L 1018.121094 896.152344 L 1018.355469 895.328125 L 1018.589844 894.464844 L 1018.789062 893.523438 L 1018.90625 892.5 L 1018.984375 891.441406 L 1019.023438 890.300781 L 1018.867188 887.75 L 1018.472656 885.511719 L 1017.765625 883.585938 L 1016.824219 882.054688 L 1015.605469 880.796875 L 1014.113281 879.894531 L 1013.566406 879.699219 L 1012.976562 879.503906 L 1012.347656 879.386719 L 1011.71875 879.265625 L 1010.382812 879.1875 L 1003.628906 879.1875 Z M 1003.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 855 217 L 1075 217 M 855 161 L 1075 161 M 855 161 L 855 217 M 1075 161 L 1075 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 217 L 1075 217 M 855 161 L 1075 161 M 1075 217 L 1075 161 M 855 217 L 855 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 156 L 855 165 M 850 161 L 859 161 M 854 162 L 856 162 M 854 160 L 856 160 M 854 160 L 854 162 M 856 160 L 856 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hs__fill_4.svg b/cells/fill/sky130_fd_sc_hs__fill_4.svg
index b4029d5..8c469f1 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_4.svg
+++ b/cells/fill/sky130_fd_sc_hs__fill_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 538.5 L 701.5 538.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image230" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image257" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image257"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 744.5 862.5 L 1184.5 862.5 L 1184.5 918.5 L 744.5 918.5 Z M 744.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image257"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -32,15 +32,15 @@
 <clipPath id="clip6">
   <path d="M 780.5 136.5 L 819.5 136.5 L 819.5 174.5 L 780.5 174.5 Z M 1110.5 136.5 L 1149.5 136.5 L 1149.5 174.5 L 1110.5 174.5 Z M 1000.5 136.5 L 1039.5 136.5 L 1039.5 174.5 L 1000.5 174.5 Z M 890.5 136.5 L 929.5 136.5 L 929.5 174.5 L 890.5 174.5 Z M 780.5 899.5 L 819.5 899.5 L 819.5 938.5 L 780.5 938.5 Z M 1110.5 899.5 L 1149.5 899.5 L 1149.5 938.5 L 1110.5 938.5 Z M 1000.5 899.5 L 1039.5 899.5 L 1039.5 938.5 L 1000.5 938.5 Z M 890.5 899.5 L 929.5 899.5 L 929.5 938.5 L 890.5 938.5 Z M 890.5 899.5 "/>
 </clipPath>
-<image id="image231" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image258" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image231"/>
+  <use xlink:href="#image258"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface227">
+<g id="surface254">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -85,6 +85,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 997.976562 904.597656 L 997.976562 875.96875 L 1009.011719 875.96875 L 1010.738281 876.085938 L 1012.351562 876.402344 L 1013.84375 876.949219 L 1015.214844 877.65625 L 1016.433594 878.640625 L 1017.574219 879.777344 L 1018.515625 881.152344 L 1019.300781 882.644531 L 1019.890625 884.332031 L 1020.320312 886.140625 L 1020.558594 888.140625 L 1020.675781 890.261719 L 1020.558594 892.5 L 1020.28125 894.582031 L 1019.8125 896.46875 L 1019.183594 898.195312 L 1018.359375 899.726562 L 1017.335938 901.0625 L 1016.238281 902.160156 L 1015.019531 903.027344 L 1013.683594 903.734375 L 1012.230469 904.203125 L 1010.660156 904.519531 L 1009.011719 904.597656 Z M 1001.628906 901.375 L 1008.382812 901.375 L 1010.191406 901.257812 L 1011.800781 900.828125 L 1013.214844 900.082031 L 1014.390625 899.097656 L 1015.335938 897.765625 L 1016.121094 896.152344 L 1016.355469 895.328125 L 1016.589844 894.464844 L 1016.789062 893.523438 L 1016.90625 892.5 L 1016.984375 891.441406 L 1017.023438 890.300781 L 1016.867188 887.75 L 1016.472656 885.511719 L 1015.765625 883.585938 L 1014.824219 882.054688 L 1013.605469 880.796875 L 1012.113281 879.894531 L 1011.566406 879.699219 L 1010.976562 879.503906 L 1010.347656 879.386719 L 1009.71875 879.265625 L 1008.382812 879.1875 L 1001.628906 879.1875 Z M 1001.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 744 217 L 1184 217 M 744 161 L 1184 161 M 744 161 L 744 217 M 1184 161 L 1184 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 217 L 1184 217 M 744 161 L 1184 161 M 1184 217 L 1184 161 M 744 217 L 744 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 156 L 744 165 M 739 161 L 748 161 M 743 162 L 745 162 M 743 160 L 745 160 M 743 160 L 743 162 M 745 160 L 745 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill/sky130_fd_sc_hs__fill_8.svg b/cells/fill/sky130_fd_sc_hs__fill_8.svg
index fc8269c..e9f8a04 100644
--- a/cells/fill/sky130_fd_sc_hs__fill_8.svg
+++ b/cells/fill/sky130_fd_sc_hs__fill_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image230" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image257" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image257"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image257"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -32,15 +32,15 @@
 <clipPath id="clip6">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image231" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image258" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image231"/>
+  <use xlink:href="#image258"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface227">
+<g id="surface254">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -85,6 +85,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 995.976562 904.597656 L 995.976562 875.96875 L 1007.011719 875.96875 L 1008.738281 876.085938 L 1010.351562 876.402344 L 1011.84375 876.949219 L 1013.214844 877.65625 L 1014.433594 878.640625 L 1015.574219 879.777344 L 1016.515625 881.152344 L 1017.300781 882.644531 L 1017.890625 884.332031 L 1018.320312 886.140625 L 1018.558594 888.140625 L 1018.675781 890.261719 L 1018.558594 892.5 L 1018.28125 894.582031 L 1017.8125 896.46875 L 1017.183594 898.195312 L 1016.359375 899.726562 L 1015.335938 901.0625 L 1014.238281 902.160156 L 1013.019531 903.027344 L 1011.683594 903.734375 L 1010.230469 904.203125 L 1008.660156 904.519531 L 1007.011719 904.597656 Z M 999.628906 901.375 L 1006.382812 901.375 L 1008.191406 901.257812 L 1009.800781 900.828125 L 1011.214844 900.082031 L 1012.390625 899.097656 L 1013.335938 897.765625 L 1014.121094 896.152344 L 1014.355469 895.328125 L 1014.589844 894.464844 L 1014.789062 893.523438 L 1014.90625 892.5 L 1014.984375 891.441406 L 1015.023438 890.300781 L 1014.867188 887.75 L 1014.472656 885.511719 L 1013.765625 883.585938 L 1012.824219 882.054688 L 1011.605469 880.796875 L 1010.113281 879.894531 L 1009.566406 879.699219 L 1008.976562 879.503906 L 1008.347656 879.386719 L 1007.71875 879.265625 L 1006.382812 879.1875 L 999.628906 879.1875 Z M 999.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 217 L 1402 217 M 522 161 L 1402 161 M 522 161 L 522 217 M 1402 161 L 1402 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 522 217 L 1402 217 M 522 161 L 1402 161 M 1402 217 L 1402 161 M 522 217 L 522 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.svg b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.svg
index 1e0fe90..caf57c5 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.svg
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 538.5 L 812.5 538.5 Z M 812.5 111.5 "/>
 </clipPath>
-<image id="image238" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image238"/>
+  <use xlink:href="#image273"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 855.5 862.5 L 1075.5 862.5 L 1075.5 918.5 L 855.5 918.5 Z M 855.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image238"/>
+  <use xlink:href="#image273"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -38,15 +38,15 @@
 <clipPath id="clip8">
   <path d="M 891.5 136.5 L 930.5 136.5 L 930.5 174.5 L 891.5 174.5 Z M 1001.5 136.5 L 1040.5 136.5 L 1040.5 174.5 L 1001.5 174.5 Z M 891.5 899.5 L 930.5 899.5 L 930.5 938.5 L 891.5 938.5 Z M 1001.5 899.5 L 1040.5 899.5 L 1040.5 938.5 L 1001.5 938.5 Z M 1001.5 899.5 "/>
 </clipPath>
-<image id="image239" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image239"/>
+  <use xlink:href="#image274"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface235">
+<g id="surface270">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -99,6 +99,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 999.976562 904.597656 L 999.976562 875.96875 L 1011.011719 875.96875 L 1012.738281 876.085938 L 1014.351562 876.402344 L 1015.84375 876.949219 L 1017.214844 877.65625 L 1018.433594 878.640625 L 1019.574219 879.777344 L 1020.515625 881.152344 L 1021.300781 882.644531 L 1021.890625 884.332031 L 1022.320312 886.140625 L 1022.558594 888.140625 L 1022.675781 890.261719 L 1022.558594 892.5 L 1022.28125 894.582031 L 1021.8125 896.46875 L 1021.183594 898.195312 L 1020.359375 899.726562 L 1019.335938 901.0625 L 1018.238281 902.160156 L 1017.019531 903.027344 L 1015.683594 903.734375 L 1014.230469 904.203125 L 1012.660156 904.519531 L 1011.011719 904.597656 Z M 1003.628906 901.375 L 1010.382812 901.375 L 1012.191406 901.257812 L 1013.800781 900.828125 L 1015.214844 900.082031 L 1016.390625 899.097656 L 1017.335938 897.765625 L 1018.121094 896.152344 L 1018.355469 895.328125 L 1018.589844 894.464844 L 1018.789062 893.523438 L 1018.90625 892.5 L 1018.984375 891.441406 L 1019.023438 890.300781 L 1018.867188 887.75 L 1018.472656 885.511719 L 1017.765625 883.585938 L 1016.824219 882.054688 L 1015.605469 880.796875 L 1014.113281 879.894531 L 1013.566406 879.699219 L 1012.976562 879.503906 L 1012.347656 879.386719 L 1011.71875 879.265625 L 1010.382812 879.1875 L 1003.628906 879.1875 Z M 1003.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 855 217 L 1075 217 M 855 161 L 1075 161 M 855 161 L 855 217 M 1075 161 L 1075 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 217 L 1075 217 M 855 161 L 1075 161 M 1075 217 L 1075 161 M 855 217 L 855 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 156 L 855 165 M 850 161 L 859 161 M 854 162 L 856 162 M 854 160 L 856 160 M 854 160 L 854 162 M 856 160 L 856 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.svg b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.svg
index 989f131..2de8e3f 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.svg
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 538.5 L 701.5 538.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image238" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image238"/>
+  <use xlink:href="#image265"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 744.5 862.5 L 1184.5 862.5 L 1184.5 918.5 L 744.5 918.5 Z M 744.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image238"/>
+  <use xlink:href="#image265"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -38,15 +38,15 @@
 <clipPath id="clip8">
   <path d="M 780.5 136.5 L 819.5 136.5 L 819.5 174.5 L 780.5 174.5 Z M 1110.5 136.5 L 1149.5 136.5 L 1149.5 174.5 L 1110.5 174.5 Z M 1000.5 136.5 L 1039.5 136.5 L 1039.5 174.5 L 1000.5 174.5 Z M 890.5 136.5 L 929.5 136.5 L 929.5 174.5 L 890.5 174.5 Z M 780.5 899.5 L 819.5 899.5 L 819.5 938.5 L 780.5 938.5 Z M 1110.5 899.5 L 1149.5 899.5 L 1149.5 938.5 L 1110.5 938.5 Z M 1000.5 899.5 L 1039.5 899.5 L 1039.5 938.5 L 1000.5 938.5 Z M 890.5 899.5 L 929.5 899.5 L 929.5 938.5 L 890.5 938.5 Z M 890.5 899.5 "/>
 </clipPath>
-<image id="image239" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image239"/>
+  <use xlink:href="#image266"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface235">
+<g id="surface262">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -99,6 +99,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 997.976562 904.597656 L 997.976562 875.96875 L 1009.011719 875.96875 L 1010.738281 876.085938 L 1012.351562 876.402344 L 1013.84375 876.949219 L 1015.214844 877.65625 L 1016.433594 878.640625 L 1017.574219 879.777344 L 1018.515625 881.152344 L 1019.300781 882.644531 L 1019.890625 884.332031 L 1020.320312 886.140625 L 1020.558594 888.140625 L 1020.675781 890.261719 L 1020.558594 892.5 L 1020.28125 894.582031 L 1019.8125 896.46875 L 1019.183594 898.195312 L 1018.359375 899.726562 L 1017.335938 901.0625 L 1016.238281 902.160156 L 1015.019531 903.027344 L 1013.683594 903.734375 L 1012.230469 904.203125 L 1010.660156 904.519531 L 1009.011719 904.597656 Z M 1001.628906 901.375 L 1008.382812 901.375 L 1010.191406 901.257812 L 1011.800781 900.828125 L 1013.214844 900.082031 L 1014.390625 899.097656 L 1015.335938 897.765625 L 1016.121094 896.152344 L 1016.355469 895.328125 L 1016.589844 894.464844 L 1016.789062 893.523438 L 1016.90625 892.5 L 1016.984375 891.441406 L 1017.023438 890.300781 L 1016.867188 887.75 L 1016.472656 885.511719 L 1015.765625 883.585938 L 1014.824219 882.054688 L 1013.605469 880.796875 L 1012.113281 879.894531 L 1011.566406 879.699219 L 1010.976562 879.503906 L 1010.347656 879.386719 L 1009.71875 879.265625 L 1008.382812 879.1875 L 1001.628906 879.1875 Z M 1001.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 744 217 L 1184 217 M 744 161 L 1184 161 M 744 161 L 744 217 M 1184 161 L 1184 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 217 L 1184 217 M 744 161 L 1184 161 M 1184 217 L 1184 161 M 744 217 L 744 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 156 L 744 165 M 739 161 L 748 161 M 743 162 L 745 162 M 743 160 L 745 160 M 743 160 L 743 162 M 745 160 L 745 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.svg b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.svg
index 42aeabc..0a08488 100644
--- a/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.svg
+++ b/cells/fill_diode/sky130_fd_sc_hs__fill_diode_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image238" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image238"/>
+  <use xlink:href="#image265"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image238"/>
+  <use xlink:href="#image265"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -38,15 +38,15 @@
 <clipPath id="clip8">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image239" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image239"/>
+  <use xlink:href="#image266"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface235">
+<g id="surface262">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -99,6 +99,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 995.976562 904.597656 L 995.976562 875.96875 L 1007.011719 875.96875 L 1008.738281 876.085938 L 1010.351562 876.402344 L 1011.84375 876.949219 L 1013.214844 877.65625 L 1014.433594 878.640625 L 1015.574219 879.777344 L 1016.515625 881.152344 L 1017.300781 882.644531 L 1017.890625 884.332031 L 1018.320312 886.140625 L 1018.558594 888.140625 L 1018.675781 890.261719 L 1018.558594 892.5 L 1018.28125 894.582031 L 1017.8125 896.46875 L 1017.183594 898.195312 L 1016.359375 899.726562 L 1015.335938 901.0625 L 1014.238281 902.160156 L 1013.019531 903.027344 L 1011.683594 903.734375 L 1010.230469 904.203125 L 1008.660156 904.519531 L 1007.011719 904.597656 Z M 999.628906 901.375 L 1006.382812 901.375 L 1008.191406 901.257812 L 1009.800781 900.828125 L 1011.214844 900.082031 L 1012.390625 899.097656 L 1013.335938 897.765625 L 1014.121094 896.152344 L 1014.355469 895.328125 L 1014.589844 894.464844 L 1014.789062 893.523438 L 1014.90625 892.5 L 1014.984375 891.441406 L 1015.023438 890.300781 L 1014.867188 887.75 L 1014.472656 885.511719 L 1013.765625 883.585938 L 1012.824219 882.054688 L 1011.605469 880.796875 L 1010.113281 879.894531 L 1009.566406 879.699219 L 1008.976562 879.503906 L 1008.347656 879.386719 L 1007.71875 879.265625 L 1006.382812 879.1875 L 999.628906 879.1875 Z M 999.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 522 217 L 1402 217 M 522 161 L 1402 161 M 522 161 L 522 217 M 1402 161 L 1402 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 522 217 L 1402 217 M 522 161 L 1402 161 M 1402 217 L 1402 161 M 522 217 L 522 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ha/sky130_fd_sc_hs__ha_1.svg b/cells/ha/sky130_fd_sc_hs__ha_1.svg
index 1a68eb4..2a88de3 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_1.svg
+++ b/cells/ha/sky130_fd_sc_hs__ha_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 510.5 L 367.5 510.5 Z M 1123.5 510.5 L 1554.5 510.5 L 1554.5 538.5 L 1123.5 538.5 Z M 367.5 510.5 L 811.5 510.5 L 811.5 538.5 L 367.5 538.5 Z M 367.5 510.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 946.5 612.5 L 980.5 612.5 L 980.5 759.5 L 946.5 759.5 Z M 726.5 623.5 L 760.5 623.5 L 760.5 769.5 L 726.5 769.5 Z M 824.5 623.5 L 859.5 623.5 L 859.5 769.5 L 824.5 769.5 Z M 1173.5 635.5 L 1207.5 635.5 L 1207.5 782.5 L 1173.5 782.5 Z M 1255.5 635.5 L 1290.5 635.5 L 1290.5 782.5 L 1255.5 782.5 Z M 1370.5 635.5 L 1404.5 635.5 L 1404.5 805.5 L 1370.5 805.5 Z M 507.5 664.5 L 541.5 664.5 L 541.5 833.5 L 507.5 833.5 Z M 507.5 664.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1138.5 240.5 L 1173.5 240.5 L 1173.5 432.5 L 1138.5 432.5 Z M 1242.5 240.5 L 1276.5 240.5 L 1276.5 432.5 L 1242.5 432.5 Z M 819.5 240.5 L 853.5 240.5 L 853.5 469.5 L 819.5 469.5 Z M 949.5 240.5 L 984.5 240.5 L 984.5 469.5 L 949.5 469.5 Z M 703.5 276.5 L 737.5 276.5 L 737.5 469.5 L 703.5 469.5 Z M 1368.5 240.5 L 1402.5 240.5 L 1402.5 496.5 L 1368.5 496.5 Z M 509.5 240.5 L 544.5 240.5 L 544.5 496.5 L 509.5 496.5 Z M 509.5 240.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface364">
+<g id="surface391">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -198,6 +198,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1026.410156 800.757812 L 1007.492188 800.757812 L 1002.308594 815.5 L 995.644531 815.5 L 1013.148438 766.421875 L 1021.226562 766.421875 L 1038.460938 815.5 L 1031.460938 815.5 Z M 1024.660156 795.503906 L 1017.121094 773.15625 L 1009.042969 795.503906 Z M 1024.660156 795.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 996 307 L 1035 307 M 996 269 L 1035 269 M 996 269 L 996 307 M 1035 269 L 1035 307 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 996 307 L 1035 307 M 996 269 L 1035 269 M 1035 307 L 1035 269 M 996 307 L 996 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ha/sky130_fd_sc_hs__ha_2.svg b/cells/ha/sky130_fd_sc_hs__ha_2.svg
index e20db67..2f7819c 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_2.svg
+++ b/cells/ha/sky130_fd_sc_hs__ha_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.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="#image348"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1489.5 664.5 L 1523.5 664.5 L 1523.5 833.5 L 1489.5 833.5 Z M 396.5 664.5 L 430.5 664.5 L 430.5 833.5 L 396.5 833.5 Z M 485.5 664.5 L 520.5 664.5 L 520.5 833.5 L 485.5 833.5 Z M 584.5 664.5 L 618.5 664.5 L 618.5 833.5 L 584.5 833.5 Z M 682.5 664.5 L 717.5 664.5 L 717.5 833.5 L 682.5 833.5 Z M 955.5 664.5 L 989.5 664.5 L 989.5 833.5 L 955.5 833.5 Z M 1182.5 664.5 L 1216.5 664.5 L 1216.5 833.5 L 1182.5 833.5 Z M 1292.5 664.5 L 1326.5 664.5 L 1326.5 833.5 L 1292.5 833.5 Z M 1390.5 664.5 L 1425.5 664.5 L 1425.5 833.5 L 1390.5 833.5 Z M 1390.5 664.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 975.5 244.5 L 1009.5 244.5 L 1009.5 474.5 L 975.5 474.5 Z M 713.5 244.5 L 748.5 244.5 L 748.5 474.5 L 713.5 474.5 Z M 617.5 244.5 L 651.5 244.5 L 651.5 474.5 L 617.5 474.5 Z M 501.5 249.5 L 536.5 249.5 L 536.5 478.5 L 501.5 478.5 Z M 398.5 249.5 L 432.5 249.5 L 432.5 478.5 L 398.5 478.5 Z M 1384.5 240.5 L 1418.5 240.5 L 1418.5 496.5 L 1384.5 496.5 Z M 1280.5 240.5 L 1315.5 240.5 L 1315.5 496.5 L 1280.5 496.5 Z M 1177.5 240.5 L 1212.5 240.5 L 1212.5 496.5 L 1177.5 496.5 Z M 1487.5 240.5 L 1521.5 240.5 L 1521.5 496.5 L 1487.5 496.5 Z M 1487.5 240.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface345">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -176,6 +176,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1535.71875 687.394531 L 1535.71875 730.953125 L 1529.457031 730.953125 L 1529.457031 687.394531 L 1513.300781 687.394531 L 1513.300781 681.875 L 1551.808594 681.875 L 1551.808594 687.394531 Z M 1535.71875 687.394531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1435 392 L 1474 392 M 1435 353 L 1474 353 M 1435 353 L 1435 392 M 1474 353 L 1474 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1435 392 L 1474 392 M 1435 353 L 1474 353 M 1474 392 L 1474 353 M 1435 392 L 1435 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/ha/sky130_fd_sc_hs__ha_4.svg b/cells/ha/sky130_fd_sc_hs__ha_4.svg
index 1feb051..980f73a 100644
--- a/cells/ha/sky130_fd_sc_hs__ha_4.svg
+++ b/cells/ha/sky130_fd_sc_hs__ha_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 735.5 536.5 L 924.5 536.5 L 924.5 547.5 L 735.5 547.5 Z M 735.5 536.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 266.5 595.5 L 289.5 595.5 L 289.5 691.5 L 266.5 691.5 Z M 331.5 595.5 L 354.5 595.5 L 354.5 691.5 L 331.5 691.5 Z M 460.5 595.5 L 483.5 595.5 L 483.5 691.5 L 460.5 691.5 Z M 529.5 595.5 L 552.5 595.5 L 552.5 691.5 L 529.5 691.5 Z M 396.5 595.5 L 418.5 595.5 L 418.5 691.5 L 396.5 691.5 Z M 600.5 595.5 L 622.5 595.5 L 622.5 691.5 L 600.5 691.5 Z M 841.5 599.5 L 864.5 599.5 L 864.5 695.5 L 841.5 695.5 Z M 916.5 599.5 L 939.5 599.5 L 939.5 695.5 L 916.5 695.5 Z M 991.5 599.5 L 1014.5 599.5 L 1014.5 695.5 L 991.5 695.5 Z M 777.5 599.5 L 799.5 599.5 L 799.5 695.5 L 777.5 695.5 Z M 1459.5 618.5 L 1482.5 618.5 L 1482.5 729.5 L 1459.5 729.5 Z M 1618.5 618.5 L 1640.5 618.5 L 1640.5 729.5 L 1618.5 729.5 Z M 1330.5 618.5 L 1353.5 618.5 L 1353.5 729.5 L 1330.5 729.5 Z M 1395.5 618.5 L 1417.5 618.5 L 1417.5 729.5 L 1395.5 729.5 Z M 1201.5 618.5 L 1224.5 618.5 L 1224.5 729.5 L 1201.5 729.5 Z M 1266.5 618.5 L 1288.5 618.5 L 1288.5 729.5 L 1266.5 729.5 Z M 1534.5 618.5 L 1557.5 618.5 L 1557.5 729.5 L 1534.5 729.5 Z M 1137.5 618.5 L 1159.5 618.5 L 1159.5 729.5 L 1137.5 729.5 Z M 1137.5 618.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 915.5 351.5 L 937.5 351.5 L 937.5 477.5 L 915.5 477.5 Z M 847.5 351.5 L 870.5 351.5 L 870.5 477.5 L 847.5 477.5 Z M 334.5 341.5 L 356.5 341.5 L 356.5 491.5 L 334.5 491.5 Z M 469.5 341.5 L 491.5 341.5 L 491.5 491.5 L 469.5 491.5 Z M 401.5 341.5 L 424.5 341.5 L 424.5 491.5 L 401.5 491.5 Z M 266.5 341.5 L 289.5 341.5 L 289.5 491.5 L 266.5 491.5 Z M 689.5 374.5 L 712.5 374.5 L 712.5 500.5 L 689.5 500.5 Z M 622.5 374.5 L 644.5 374.5 L 644.5 500.5 L 622.5 500.5 Z M 757.5 374.5 L 779.5 374.5 L 779.5 500.5 L 757.5 500.5 Z M 1319.5 341.5 L 1342.5 341.5 L 1342.5 509.5 L 1319.5 509.5 Z M 1252.5 341.5 L 1274.5 341.5 L 1274.5 509.5 L 1252.5 509.5 Z M 1454.5 341.5 L 1477.5 341.5 L 1477.5 509.5 L 1454.5 509.5 Z M 1387.5 341.5 L 1409.5 341.5 L 1409.5 509.5 L 1387.5 509.5 Z M 994.5 383.5 L 1016.5 383.5 L 1016.5 509.5 L 994.5 509.5 Z M 1628.5 341.5 L 1651.5 341.5 L 1651.5 509.5 L 1628.5 509.5 Z M 1522.5 341.5 L 1544.5 341.5 L 1544.5 509.5 L 1522.5 509.5 Z M 1093.5 341.5 L 1115.5 341.5 L 1115.5 509.5 L 1093.5 509.5 Z M 1184.5 341.5 L 1207.5 341.5 L 1207.5 509.5 L 1184.5 509.5 Z M 1184.5 341.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 1522.5 467.5 L 1548.5 467.5 L 1548.5 492.5 L 1522.5 492.5 Z M 1666.5 467.5 L 1692.5 467.5 L 1692.5 492.5 L 1666.5 492.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface320">
+<g id="surface348">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,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 390.109375 541.976562 L 377.890625 541.976562 L 374.542969 551.5 L 370.238281 551.5 L 381.542969 519.804688 L 386.761719 519.804688 L 397.890625 551.5 L 393.371094 551.5 Z M 388.976562 538.585938 L 384.109375 524.152344 L 378.890625 538.585938 Z M 388.976562 538.585938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 370 557 L 396 557 M 370 531 L 396 531 M 370 531 L 370 557 M 396 531 L 396 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 557 L 396 557 M 370 531 L 396 531 M 396 557 L 396 531 M 370 557 L 370 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hs__inv_1.svg b/cells/inv/sky130_fd_sc_hs__inv_1.svg
index 1e9613d..93a6062 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_1.svg
+++ b/cells/inv/sky130_fd_sc_hs__inv_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 538.5 L 756.5 538.5 Z M 756.5 111.5 "/>
 </clipPath>
-<image id="image288" 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="#image288"/>
+  <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 799.5 862.5 L 1129.5 862.5 L 1129.5 918.5 L 799.5 918.5 Z M 799.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#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 996.5 664.5 L 1031.5 664.5 L 1031.5 833.5 L 996.5 833.5 Z M 996.5 664.5 "/>
 </clipPath>
-<image id="image289" 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="#image289"/>
+  <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 994.5 240.5 L 1028.5 240.5 L 1028.5 496.5 L 994.5 496.5 Z M 994.5 240.5 "/>
 </clipPath>
-<image id="image290" 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="#image290"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 835.5 136.5 L 874.5 136.5 L 874.5 174.5 L 835.5 174.5 Z M 1055.5 136.5 L 1094.5 136.5 L 1094.5 174.5 L 1055.5 174.5 Z M 945.5 136.5 L 984.5 136.5 L 984.5 174.5 L 945.5 174.5 Z M 835.5 899.5 L 874.5 899.5 L 874.5 938.5 L 835.5 938.5 Z M 1055.5 899.5 L 1094.5 899.5 L 1094.5 938.5 L 1055.5 938.5 Z M 945.5 899.5 L 984.5 899.5 L 984.5 938.5 L 945.5 938.5 Z M 945.5 899.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <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="surface285">
+<g id="surface312">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 864.410156 546.757812 L 845.492188 546.757812 L 840.308594 561.5 L 833.644531 561.5 L 851.148438 512.421875 L 859.226562 512.421875 L 876.460938 561.5 L 869.460938 561.5 Z M 862.660156 541.503906 L 855.121094 519.15625 L 847.042969 541.503906 Z M 862.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 835 562 L 874 562 M 835 523 L 874 523 M 835 523 L 835 562 M 874 523 L 874 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 835 562 L 874 562 M 835 523 L 874 523 M 874 562 L 874 523 M 835 562 L 835 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 799 156 L 799 165 M 794 161 L 803 161 M 798 162 L 800 162 M 798 160 L 800 160 M 798 160 L 798 162 M 800 160 L 800 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hs__inv_16.svg b/cells/inv/sky130_fd_sc_hs__inv_16.svg
index 28c5d81..2344158 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_16.svg
+++ b/cells/inv/sky130_fd_sc_hs__inv_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image271" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image271"/>
+  <use xlink:href="#image299"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image271"/>
+  <use xlink:href="#image299"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1592.5 638.5 L 1619.5 638.5 L 1619.5 774.5 L 1592.5 774.5 Z M 299.5 638.5 L 327.5 638.5 L 327.5 774.5 L 299.5 774.5 Z M 378.5 638.5 L 406.5 638.5 L 406.5 774.5 L 378.5 774.5 Z M 470.5 638.5 L 498.5 638.5 L 498.5 774.5 L 470.5 774.5 Z M 549.5 638.5 L 577.5 638.5 L 577.5 774.5 L 549.5 774.5 Z M 641.5 638.5 L 669.5 638.5 L 669.5 774.5 L 641.5 774.5 Z M 720.5 638.5 L 748.5 638.5 L 748.5 774.5 L 720.5 774.5 Z M 812.5 638.5 L 840.5 638.5 L 840.5 774.5 L 812.5 774.5 Z M 891.5 638.5 L 919.5 638.5 L 919.5 774.5 L 891.5 774.5 Z M 970.5 638.5 L 998.5 638.5 L 998.5 774.5 L 970.5 774.5 Z M 1049.5 638.5 L 1077.5 638.5 L 1077.5 774.5 L 1049.5 774.5 Z M 1141.5 638.5 L 1169.5 638.5 L 1169.5 774.5 L 1141.5 774.5 Z M 1220.5 638.5 L 1248.5 638.5 L 1248.5 774.5 L 1220.5 774.5 Z M 1325.5 638.5 L 1353.5 638.5 L 1353.5 774.5 L 1325.5 774.5 Z M 1404.5 638.5 L 1432.5 638.5 L 1432.5 774.5 L 1404.5 774.5 Z M 1512.5 638.5 L 1540.5 638.5 L 1540.5 774.5 L 1512.5 774.5 Z M 1512.5 638.5 "/>
 </clipPath>
-<image id="image272" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image272"/>
+  <use xlink:href="#image300"/>
 </pattern>
 <mask id="mask2">
 <rect 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 298.5 L 1630.5 298.5 L 1630.5 504.5 L 1603.5 504.5 Z M 288.5 298.5 L 316.5 298.5 L 316.5 504.5 L 288.5 504.5 Z M 371.5 298.5 L 398.5 298.5 L 398.5 504.5 L 371.5 504.5 Z M 463.5 298.5 L 490.5 298.5 L 490.5 504.5 L 463.5 504.5 Z M 546.5 298.5 L 573.5 298.5 L 573.5 504.5 L 546.5 504.5 Z M 637.5 298.5 L 665.5 298.5 L 665.5 504.5 L 637.5 504.5 Z M 720.5 298.5 L 748.5 298.5 L 748.5 504.5 L 720.5 504.5 Z M 812.5 298.5 L 840.5 298.5 L 840.5 504.5 L 812.5 504.5 Z M 895.5 298.5 L 922.5 298.5 L 922.5 504.5 L 895.5 504.5 Z M 978.5 298.5 L 1005.5 298.5 L 1005.5 504.5 L 978.5 504.5 Z M 1060.5 298.5 L 1088.5 298.5 L 1088.5 504.5 L 1060.5 504.5 Z M 1147.5 298.5 L 1174.5 298.5 L 1174.5 504.5 L 1147.5 504.5 Z M 1235.5 298.5 L 1262.5 298.5 L 1262.5 504.5 L 1235.5 504.5 Z M 1336.5 298.5 L 1364.5 298.5 L 1364.5 504.5 L 1336.5 504.5 Z M 1419.5 298.5 L 1446.5 298.5 L 1446.5 504.5 L 1419.5 504.5 Z M 1520.5 298.5 L 1547.5 298.5 L 1547.5 504.5 L 1520.5 504.5 Z M 1520.5 298.5 "/>
 </clipPath>
-<image id="image273" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 502.5 452.5 L 534.5 452.5 L 534.5 454.5 L 502.5 454.5 Z M 1376.5 452.5 L 1407.5 452.5 L 1407.5 461.5 L 1376.5 461.5 Z M 1017.5 452.5 L 1048.5 452.5 L 1048.5 461.5 L 1017.5 461.5 Z M 852.5 452.5 L 883.5 452.5 L 883.5 461.5 L 852.5 461.5 Z M 677.5 452.5 L 708.5 452.5 L 708.5 461.5 L 677.5 461.5 Z M 328.5 452.5 L 359.5 452.5 L 359.5 461.5 L 328.5 461.5 Z M 1559.5 452.5 L 1591.5 452.5 L 1591.5 461.5 L 1559.5 461.5 Z M 1192.5 452.5 L 1223.5 452.5 L 1223.5 461.5 L 1192.5 461.5 Z M 1017.5 461.5 L 1048.5 461.5 L 1048.5 483.5 L 1017.5 483.5 Z M 502.5 454.5 L 534.5 454.5 L 534.5 483.5 L 502.5 483.5 Z M 852.5 461.5 L 883.5 461.5 L 883.5 483.5 L 852.5 483.5 Z M 1559.5 461.5 L 1591.5 461.5 L 1591.5 483.5 L 1559.5 483.5 Z M 1192.5 461.5 L 1223.5 461.5 L 1223.5 483.5 L 1192.5 483.5 Z M 677.5 461.5 L 708.5 461.5 L 708.5 483.5 L 677.5 483.5 Z M 1376.5 461.5 L 1407.5 461.5 L 1407.5 483.5 L 1376.5 483.5 Z M 328.5 461.5 L 359.5 461.5 L 359.5 483.5 L 328.5 483.5 Z M 1284.5 520.5 L 1315.5 520.5 L 1315.5 548.5 L 1284.5 548.5 Z M 1101.5 520.5 L 1132.5 520.5 L 1132.5 548.5 L 1101.5 548.5 Z M 592.5 520.5 L 624.5 520.5 L 624.5 548.5 L 592.5 548.5 Z M 1467.5 520.5 L 1498.5 520.5 L 1498.5 548.5 L 1467.5 548.5 Z M 765.5 520.5 L 796.5 520.5 L 796.5 548.5 L 765.5 548.5 Z M 420.5 520.5 L 451.5 520.5 L 451.5 548.5 L 420.5 548.5 Z M 933.5 520.5 L 965.5 520.5 L 965.5 548.5 L 933.5 548.5 Z M 933.5 548.5 L 965.5 548.5 L 965.5 551.5 L 933.5 551.5 Z M 1284.5 548.5 L 1315.5 548.5 L 1315.5 551.5 L 1284.5 551.5 Z M 592.5 548.5 L 624.5 548.5 L 624.5 551.5 L 592.5 551.5 Z M 420.5 548.5 L 451.5 548.5 L 451.5 551.5 L 420.5 551.5 Z M 1467.5 548.5 L 1498.5 548.5 L 1498.5 551.5 L 1467.5 551.5 Z M 765.5 548.5 L 796.5 548.5 L 796.5 551.5 L 765.5 551.5 Z M 1101.5 548.5 L 1132.5 548.5 L 1132.5 551.5 L 1101.5 551.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface268">
+<g id="surface296">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -145,6 +145,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 968.414062 545.679688 L 950.679688 545.679688 L 945.820312 559.5 L 939.574219 559.5 L 955.984375 513.488281 L 963.554688 513.488281 L 979.714844 559.5 L 973.148438 559.5 Z M 966.773438 540.753906 L 959.707031 519.800781 L 952.132812 540.753906 Z M 966.773438 540.753906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 409 564 L 1509 564 M 409 522 L 1509 522 M 409 522 L 409 564 M 1509 522 L 1509 564 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 409 564 L 1509 564 M 409 522 L 1509 522 M 1509 564 L 1509 522 M 409 564 L 409 522 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hs__inv_2.svg b/cells/inv/sky130_fd_sc_hs__inv_2.svg
index 27549f0..34a5b5e 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_2.svg
+++ b/cells/inv/sky130_fd_sc_hs__inv_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 538.5 L 756.5 538.5 Z M 756.5 111.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 799.5 862.5 L 1129.5 862.5 L 1129.5 918.5 L 799.5 918.5 Z M 799.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 997.5 664.5 L 1032.5 664.5 L 1032.5 833.5 L 997.5 833.5 Z M 899.5 664.5 L 933.5 664.5 L 933.5 833.5 L 899.5 833.5 Z M 899.5 664.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 999.5 240.5 L 1033.5 240.5 L 1033.5 496.5 L 999.5 496.5 Z M 895.5 240.5 L 930.5 240.5 L 930.5 496.5 L 895.5 496.5 Z M 895.5 240.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 835.5 136.5 L 874.5 136.5 L 874.5 174.5 L 835.5 174.5 Z M 1055.5 136.5 L 1094.5 136.5 L 1094.5 174.5 L 1055.5 174.5 Z M 945.5 136.5 L 984.5 136.5 L 984.5 174.5 L 945.5 174.5 Z M 835.5 899.5 L 874.5 899.5 L 874.5 938.5 L 835.5 938.5 Z M 1055.5 899.5 L 1094.5 899.5 L 1094.5 938.5 L 1055.5 938.5 Z M 945.5 899.5 L 984.5 899.5 L 984.5 938.5 L 945.5 938.5 Z M 945.5 899.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 968.554688 288.246094 L 968.554688 307.5 L 962.292969 307.5 L 962.292969 288.246094 L 943.375 258.421875 L 951.117188 258.421875 L 965.523438 282.320312 L 979.527344 258.421875 L 987 258.421875 Z M 968.554688 288.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 945 816 L 984 816 M 945 777 L 984 777 M 945 777 L 945 816 M 984 777 L 984 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 945 816 L 984 816 M 945 777 L 984 777 M 984 816 L 984 777 M 945 816 L 945 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 799 156 L 799 165 M 794 161 L 803 161 M 798 162 L 800 162 M 798 160 L 800 160 M 798 160 L 798 162 M 800 160 L 800 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hs__inv_4.svg b/cells/inv/sky130_fd_sc_hs__inv_4.svg
index b6977a1..38fb95f 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_4.svg
+++ b/cells/inv/sky130_fd_sc_hs__inv_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1107.5 664.5 L 1142.5 664.5 L 1142.5 833.5 L 1107.5 833.5 Z M 791.5 664.5 L 826.5 664.5 L 826.5 833.5 L 791.5 833.5 Z M 899.5 664.5 L 933.5 664.5 L 933.5 833.5 L 899.5 833.5 Z M 1009.5 664.5 L 1043.5 664.5 L 1043.5 833.5 L 1009.5 833.5 Z M 1009.5 664.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1104.5 240.5 L 1138.5 240.5 L 1138.5 496.5 L 1104.5 496.5 Z M 795.5 240.5 L 829.5 240.5 L 829.5 496.5 L 795.5 496.5 Z M 898.5 240.5 L 932.5 240.5 L 932.5 496.5 L 898.5 496.5 Z M 1001.5 240.5 L 1035.5 240.5 L 1035.5 496.5 L 1001.5 496.5 Z M 1001.5 240.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface277">
+<g id="surface305">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1083.410156 546.757812 L 1064.492188 546.757812 L 1059.308594 561.5 L 1052.644531 561.5 L 1070.148438 512.421875 L 1078.226562 512.421875 L 1095.460938 561.5 L 1088.460938 561.5 Z M 1081.660156 541.503906 L 1074.121094 519.15625 L 1066.042969 541.503906 Z M 1081.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1054 562 L 1093 562 M 1054 523 L 1093 523 M 1054 523 L 1054 562 M 1093 523 L 1093 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1054 562 L 1093 562 M 1054 523 L 1093 523 M 1093 562 L 1093 523 M 1054 562 L 1054 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inv/sky130_fd_sc_hs__inv_8.svg b/cells/inv/sky130_fd_sc_hs__inv_8.svg
index 960860a..7205700 100644
--- a/cells/inv/sky130_fd_sc_hs__inv_8.svg
+++ b/cells/inv/sky130_fd_sc_hs__inv_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1305.5 664.5 L 1339.5 664.5 L 1339.5 833.5 L 1305.5 833.5 Z M 567.5 664.5 L 601.5 664.5 L 601.5 833.5 L 567.5 833.5 Z M 665.5 664.5 L 699.5 664.5 L 699.5 833.5 L 665.5 833.5 Z M 764.5 664.5 L 798.5 664.5 L 798.5 833.5 L 764.5 833.5 Z M 862.5 664.5 L 897.5 664.5 L 897.5 833.5 L 862.5 833.5 Z M 977.5 664.5 L 1011.5 664.5 L 1011.5 833.5 L 977.5 833.5 Z M 1075.5 664.5 L 1110.5 664.5 L 1110.5 833.5 L 1075.5 833.5 Z M 1206.5 664.5 L 1240.5 664.5 L 1240.5 833.5 L 1206.5 833.5 Z M 1206.5 664.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1310.5 240.5 L 1345.5 240.5 L 1345.5 496.5 L 1310.5 496.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 669.5 240.5 L 703.5 240.5 L 703.5 496.5 L 669.5 496.5 Z M 783.5 240.5 L 818.5 240.5 L 818.5 496.5 L 783.5 496.5 Z M 886.5 240.5 L 921.5 240.5 L 921.5 496.5 L 886.5 496.5 Z M 989.5 240.5 L 1024.5 240.5 L 1024.5 496.5 L 989.5 496.5 Z M 1093.5 240.5 L 1127.5 240.5 L 1127.5 496.5 L 1093.5 496.5 Z M 1207.5 240.5 L 1242.5 240.5 L 1242.5 496.5 L 1207.5 496.5 Z M 1207.5 240.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface274">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,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 1406.554688 627.246094 L 1406.554688 646.5 L 1400.292969 646.5 L 1400.292969 627.246094 L 1381.375 597.421875 L 1389.117188 597.421875 L 1403.523438 621.320312 L 1417.527344 597.421875 L 1425 597.421875 Z M 1406.554688 627.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1382 477 L 1421 477 M 1382 438 L 1421 438 M 1382 438 L 1382 477 M 1421 438 L 1421 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1382 477 L 1421 477 M 1382 438 L 1421 438 M 1421 477 L 1421 438 M 1382 477 L 1382 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_1.svg b/cells/maj3/sky130_fd_sc_hs__maj3_1.svg
index ea99b63..de3626b 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_1.svg
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1169.5 616.5 L 1204.5 616.5 L 1204.5 762.5 L 1169.5 762.5 Z M 1266.5 616.5 L 1300.5 616.5 L 1300.5 762.5 L 1266.5 762.5 Z M 949.5 616.5 L 984.5 616.5 L 984.5 762.5 L 949.5 762.5 Z M 1039.5 616.5 L 1073.5 616.5 L 1073.5 762.5 L 1039.5 762.5 Z M 743.5 634.5 L 777.5 634.5 L 777.5 781.5 L 743.5 781.5 Z M 832.5 634.5 L 867.5 634.5 L 867.5 781.5 L 832.5 781.5 Z M 618.5 634.5 L 653.5 634.5 L 653.5 804.5 L 618.5 804.5 Z M 618.5 634.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 746.5 249.5 L 781.5 249.5 L 781.5 478.5 L 746.5 478.5 Z M 1269.5 249.5 L 1303.5 249.5 L 1303.5 478.5 L 1269.5 478.5 Z M 1173.5 249.5 L 1207.5 249.5 L 1207.5 478.5 L 1173.5 478.5 Z M 1049.5 249.5 L 1083.5 249.5 L 1083.5 478.5 L 1049.5 478.5 Z M 953.5 249.5 L 987.5 249.5 L 987.5 478.5 L 953.5 478.5 Z M 843.5 249.5 L 877.5 249.5 L 877.5 478.5 L 843.5 478.5 Z M 631.5 240.5 L 665.5 240.5 L 665.5 496.5 L 631.5 496.5 Z M 631.5 240.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface279">
+<g id="surface307">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,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 1108.730469 536.984375 L 1108.796875 534.292969 L 1109.066406 531.667969 L 1109.539062 529.175781 L 1110.144531 526.753906 L 1110.953125 524.464844 L 1112.03125 522.242188 L 1113.714844 519.347656 L 1115.800781 516.855469 L 1118.15625 514.835938 L 1120.847656 513.222656 L 1123.8125 512.078125 L 1127.175781 511.335938 L 1127.785156 511.269531 L 1128.457031 511.203125 L 1129.0625 511.132812 L 1130.410156 511.132812 L 1131.148438 511.066406 L 1135.457031 511.402344 L 1139.226562 512.414062 L 1142.460938 514.027344 L 1145.152344 516.316406 L 1147.304688 519.210938 L 1148.988281 522.78125 L 1149.394531 524.125 L 1149.59375 524.867188 L 1149.730469 525.609375 L 1149.863281 526.347656 L 1150.066406 527.089844 L 1143.671875 527.089844 L 1142.996094 524.734375 L 1142.121094 522.714844 L 1141.046875 520.960938 L 1139.632812 519.480469 L 1138.082031 518.335938 L 1136.265625 517.460938 L 1135.390625 517.191406 L 1134.449219 516.992188 L 1133.503906 516.855469 L 1132.496094 516.722656 L 1131.484375 516.652344 L 1130.410156 516.585938 L 1128.050781 516.789062 L 1125.898438 517.261719 L 1123.878906 518 L 1122.0625 519.144531 L 1120.378906 520.558594 L 1118.964844 522.242188 L 1117.753906 524.195312 L 1116.742188 526.347656 L 1115.933594 528.703125 L 1115.394531 531.261719 L 1115.058594 534.023438 L 1114.992188 536.917969 L 1115.058594 540.082031 L 1115.464844 542.910156 L 1116.136719 545.601562 L 1117.078125 547.957031 L 1118.292969 550.179688 L 1119.773438 552.066406 L 1121.253906 553.613281 L 1122.867188 554.824219 L 1124.621094 555.769531 L 1126.570312 556.441406 L 1128.660156 556.84375 L 1130.949219 556.980469 L 1133.371094 556.84375 L 1135.59375 556.375 L 1137.613281 555.566406 L 1139.296875 554.421875 L 1140.777344 552.941406 L 1142.054688 551.121094 L 1142.59375 550.046875 L 1143.066406 548.832031 L 1143.535156 547.554688 L 1143.941406 546.140625 L 1144.277344 544.660156 L 1144.613281 543.042969 L 1151.078125 543.042969 L 1149.863281 549.035156 L 1147.84375 553.882812 L 1144.882812 557.652344 L 1141.113281 560.347656 L 1136.402344 561.894531 L 1130.878906 562.5 L 1126.976562 562.230469 L 1123.476562 561.421875 L 1120.3125 560.210938 L 1117.484375 558.394531 L 1114.992188 556.039062 L 1112.90625 553.140625 L 1111.695312 551.054688 L 1110.683594 548.765625 L 1109.875 546.34375 L 1109.269531 543.785156 L 1108.867188 541.09375 L 1108.730469 538.265625 Z M 1108.730469 536.984375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1107 562 L 1146 562 M 1107 523 L 1146 523 M 1107 523 L 1107 562 M 1146 523 L 1146 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1107 562 L 1146 562 M 1107 523 L 1146 523 M 1146 562 L 1146 523 M 1107 562 L 1107 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_2.svg b/cells/maj3/sky130_fd_sc_hs__maj3_2.svg
index fc20f49..4410924 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_2.svg
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 840.5 538.5 L 1287.5 538.5 L 1287.5 562.5 L 840.5 562.5 Z M 840.5 538.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1374.5 664.5 L 1409.5 664.5 L 1409.5 833.5 L 1374.5 833.5 Z M 512.5 664.5 L 546.5 664.5 L 546.5 833.5 L 512.5 833.5 Z M 610.5 664.5 L 644.5 664.5 L 644.5 833.5 L 610.5 833.5 Z M 850.5 664.5 L 884.5 664.5 L 884.5 833.5 L 850.5 833.5 Z M 939.5 664.5 L 973.5 664.5 L 973.5 833.5 L 939.5 833.5 Z M 1038.5 664.5 L 1072.5 664.5 L 1072.5 833.5 L 1038.5 833.5 Z M 1148.5 664.5 L 1182.5 664.5 L 1182.5 833.5 L 1148.5 833.5 Z M 1285.5 664.5 L 1319.5 664.5 L 1319.5 833.5 L 1285.5 833.5 Z M 1285.5 664.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 514.5 240.5 L 548.5 240.5 L 548.5 496.5 L 514.5 496.5 Z M 617.5 240.5 L 651.5 240.5 L 651.5 496.5 L 617.5 496.5 Z M 1378.5 267.5 L 1412.5 267.5 L 1412.5 496.5 L 1378.5 496.5 Z M 1282.5 267.5 L 1316.5 267.5 L 1316.5 496.5 L 1282.5 496.5 Z M 827.5 267.5 L 861.5 267.5 L 861.5 496.5 L 827.5 496.5 Z M 942.5 291.5 L 977.5 291.5 L 977.5 521.5 L 942.5 521.5 Z M 1046.5 291.5 L 1080.5 291.5 L 1080.5 521.5 L 1046.5 521.5 Z M 1151.5 291.5 L 1185.5 291.5 L 1185.5 521.5 L 1151.5 521.5 Z M 1151.5 291.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -157,6 +157,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 806.410156 631.757812 L 787.492188 631.757812 L 782.308594 646.5 L 775.644531 646.5 L 793.148438 597.421875 L 801.226562 597.421875 L 818.460938 646.5 L 811.460938 646.5 Z M 804.660156 626.503906 L 797.121094 604.15625 L 789.042969 626.503906 Z M 804.660156 626.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 776 477 L 815 477 M 776 438 L 815 438 M 776 438 L 776 477 M 815 438 L 815 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 776 477 L 815 477 M 776 438 L 815 438 M 815 477 L 815 438 M 776 477 L 776 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/maj3/sky130_fd_sc_hs__maj3_4.svg b/cells/maj3/sky130_fd_sc_hs__maj3_4.svg
index 3fd1057..ddd5192 100644
--- a/cells/maj3/sky130_fd_sc_hs__maj3_4.svg
+++ b/cells/maj3/sky130_fd_sc_hs__maj3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 286.5 609.5 L 314.5 609.5 L 314.5 727.5 L 286.5 727.5 Z M 395.5 609.5 L 422.5 609.5 L 422.5 727.5 L 395.5 727.5 Z M 566.5 609.5 L 593.5 609.5 L 593.5 727.5 L 566.5 727.5 Z M 645.5 609.5 L 672.5 609.5 L 672.5 727.5 L 645.5 727.5 Z M 474.5 609.5 L 501.5 609.5 L 501.5 727.5 L 474.5 727.5 Z M 735.5 609.5 L 762.5 609.5 L 762.5 727.5 L 735.5 727.5 Z M 814.5 609.5 L 841.5 609.5 L 841.5 727.5 L 814.5 727.5 Z M 1108.5 615.5 L 1136.5 615.5 L 1136.5 732.5 L 1108.5 732.5 Z M 1187.5 615.5 L 1215.5 615.5 L 1215.5 732.5 L 1187.5 732.5 Z M 1266.5 615.5 L 1294.5 615.5 L 1294.5 732.5 L 1266.5 732.5 Z M 1360.5 615.5 L 1387.5 615.5 L 1387.5 751.5 L 1360.5 751.5 Z M 1525.5 615.5 L 1553.5 615.5 L 1553.5 751.5 L 1525.5 751.5 Z M 1604.5 615.5 L 1632.5 615.5 L 1632.5 751.5 L 1604.5 751.5 Z M 1446.5 615.5 L 1474.5 615.5 L 1474.5 751.5 L 1446.5 751.5 Z M 922.5 652.5 L 950.5 652.5 L 950.5 770.5 L 922.5 770.5 Z M 1014.5 652.5 L 1042.5 652.5 L 1042.5 770.5 L 1014.5 770.5 Z M 1014.5 652.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1262.5 298.5 L 1289.5 298.5 L 1289.5 481.5 L 1262.5 481.5 Z M 1013.5 298.5 L 1041.5 298.5 L 1041.5 481.5 L 1013.5 481.5 Z M 383.5 298.5 L 410.5 298.5 L 410.5 481.5 L 383.5 481.5 Z M 466.5 298.5 L 493.5 298.5 L 493.5 481.5 L 466.5 481.5 Z M 548.5 298.5 L 576.5 298.5 L 576.5 481.5 L 548.5 481.5 Z M 909.5 298.5 L 936.5 298.5 L 936.5 481.5 L 909.5 481.5 Z M 725.5 298.5 L 752.5 298.5 L 752.5 481.5 L 725.5 481.5 Z M 291.5 298.5 L 318.5 298.5 L 318.5 481.5 L 291.5 481.5 Z M 817.5 298.5 L 844.5 298.5 L 844.5 481.5 L 817.5 481.5 Z M 1179.5 298.5 L 1206.5 298.5 L 1206.5 481.5 L 1179.5 481.5 Z M 1096.5 298.5 L 1124.5 298.5 L 1124.5 481.5 L 1096.5 481.5 Z M 642.5 298.5 L 670.5 298.5 L 670.5 481.5 L 642.5 481.5 Z M 1520.5 298.5 L 1547.5 298.5 L 1547.5 504.5 L 1520.5 504.5 Z M 1437.5 298.5 L 1465.5 298.5 L 1465.5 504.5 L 1437.5 504.5 Z M 1354.5 298.5 L 1382.5 298.5 L 1382.5 504.5 L 1354.5 504.5 Z M 1603.5 298.5 L 1630.5 298.5 L 1630.5 504.5 L 1603.5 504.5 Z M 1603.5 298.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface277">
+<g id="surface306">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 615.425781 543.519531 L 600.058594 543.519531 L 595.84375 555.5 L 590.429688 555.5 L 604.652344 515.625 L 611.214844 515.625 L 625.21875 555.5 L 619.53125 555.5 Z M 614.003906 539.253906 L 607.878906 521.09375 L 601.316406 539.253906 Z M 614.003906 539.253906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 591 559 L 622 559 M 591 528 L 622 528 M 591 528 L 591 559 M 622 528 L 622 559 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 591 559 L 622 559 M 591 528 L 622 528 M 622 559 L 622 528 M 591 559 L 591 528 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_1.svg b/cells/mux2/sky130_fd_sc_hs__mux2_1.svg
index 8cb0d20..a879bee 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_1.svg
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 563.5 664.5 L 598.5 664.5 L 598.5 790.5 L 563.5 790.5 Z M 940.5 664.5 L 975.5 664.5 L 975.5 833.5 L 940.5 833.5 Z M 691.5 664.5 L 726.5 664.5 L 726.5 833.5 L 691.5 833.5 Z M 781.5 664.5 L 815.5 664.5 L 815.5 833.5 L 781.5 833.5 Z M 1324.5 664.5 L 1358.5 664.5 L 1358.5 833.5 L 1324.5 833.5 Z M 1160.5 664.5 L 1195.5 664.5 L 1195.5 833.5 L 1160.5 833.5 Z M 1160.5 664.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1306.5 240.5 L 1340.5 240.5 L 1340.5 496.5 L 1306.5 496.5 Z M 565.5 304.5 L 600.5 304.5 L 600.5 496.5 L 565.5 496.5 Z M 688.5 267.5 L 722.5 267.5 L 722.5 496.5 L 688.5 496.5 Z M 1033.5 267.5 L 1067.5 267.5 L 1067.5 496.5 L 1033.5 496.5 Z M 909.5 267.5 L 944.5 267.5 L 944.5 496.5 L 909.5 496.5 Z M 1164.5 267.5 L 1198.5 267.5 L 1198.5 496.5 L 1164.5 496.5 Z M 1164.5 267.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface292">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 1100.773438 612.503906 L 1090.203125 612.503906 L 1090.203125 608.261719 L 1092.019531 608.058594 L 1093.636719 607.789062 L 1095.050781 607.453125 L 1096.261719 607.183594 L 1097.269531 606.847656 L 1098.148438 606.445312 L 1098.820312 606.039062 L 1099.425781 605.570312 L 1099.964844 605.03125 L 1100.503906 604.355469 L 1100.972656 603.617188 L 1101.445312 602.742188 L 1101.648438 602.269531 L 1101.847656 601.730469 L 1102.050781 601.125 L 1102.320312 600.386719 L 1102.523438 599.644531 L 1102.792969 598.769531 L 1106.695312 598.769531 L 1106.695312 646.5 L 1100.773438 646.5 Z M 1100.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 477 L 1091 477 M 1052 438 L 1091 438 M 1052 438 L 1052 477 M 1091 438 L 1091 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 477 L 1091 477 M 1052 438 L 1091 438 M 1091 477 L 1091 438 M 1052 477 L 1052 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_2.svg b/cells/mux2/sky130_fd_sc_hs__mux2_2.svg
index 52dfccc..2ec79a8 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_2.svg
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.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 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.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 465.5 664.5 L 499.5 664.5 L 499.5 833.5 L 465.5 833.5 Z M 1191.5 707.5 L 1225.5 707.5 L 1225.5 833.5 L 1191.5 833.5 Z M 1321.5 664.5 L 1355.5 664.5 L 1355.5 833.5 L 1321.5 833.5 Z M 1419.5 664.5 L 1454.5 664.5 L 1454.5 833.5 L 1419.5 833.5 Z M 882.5 664.5 L 916.5 664.5 L 916.5 833.5 L 882.5 833.5 Z M 720.5 664.5 L 755.5 664.5 L 755.5 833.5 L 720.5 833.5 Z M 631.5 664.5 L 665.5 664.5 L 665.5 833.5 L 631.5 833.5 Z M 631.5 664.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 789.5 240.5 L 823.5 240.5 L 823.5 469.5 L 789.5 469.5 Z M 915.5 240.5 L 949.5 240.5 L 949.5 469.5 L 915.5 469.5 Z M 454.5 267.5 L 489.5 267.5 L 489.5 496.5 L 454.5 496.5 Z M 557.5 267.5 L 592.5 267.5 L 592.5 496.5 L 557.5 496.5 Z M 1420.5 240.5 L 1455.5 240.5 L 1455.5 496.5 L 1420.5 496.5 Z M 1317.5 240.5 L 1352.5 240.5 L 1352.5 496.5 L 1317.5 496.5 Z M 1192.5 304.5 L 1227.5 304.5 L 1227.5 496.5 L 1192.5 496.5 Z M 1192.5 304.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.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>
@@ -159,6 +159,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 1295.824219 536.320312 L 1313.191406 561.5 L 1305.449219 561.5 L 1292.050781 541.035156 L 1278.589844 561.5 L 1270.980469 561.5 L 1288.351562 536.320312 L 1272.058594 512.421875 L 1279.664062 512.421875 L 1292.253906 531.675781 L 1304.910156 512.421875 L 1312.382812 512.421875 Z M 1295.824219 536.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1271 562 L 1310 562 M 1271 523 L 1310 523 M 1271 523 L 1271 562 M 1310 523 L 1310 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1271 562 L 1310 562 M 1271 523 L 1310 523 M 1310 562 L 1310 523 M 1271 562 L 1271 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2/sky130_fd_sc_hs__mux2_4.svg b/cells/mux2/sky130_fd_sc_hs__mux2_4.svg
index 3c49618..5e53c1e 100644
--- a/cells/mux2/sky130_fd_sc_hs__mux2_4.svg
+++ b/cells/mux2/sky130_fd_sc_hs__mux2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 355.5 536.5 L 717.5 536.5 L 717.5 551.5 L 355.5 551.5 Z M 355.5 551.5 L 501.5 551.5 L 501.5 569.5 L 355.5 569.5 Z M 355.5 551.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.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="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1071.5 610.5 L 1097.5 610.5 L 1097.5 722.5 L 1071.5 722.5 Z M 996.5 610.5 L 1022.5 610.5 L 1022.5 722.5 L 996.5 722.5 Z M 798.5 610.5 L 824.5 610.5 L 824.5 722.5 L 798.5 722.5 Z M 885.5 610.5 L 911.5 610.5 L 911.5 722.5 L 885.5 722.5 Z M 307.5 629.5 L 333.5 629.5 L 333.5 740.5 L 307.5 740.5 Z M 406.5 629.5 L 432.5 629.5 L 432.5 757.5 L 406.5 757.5 Z M 666.5 629.5 L 692.5 629.5 L 692.5 757.5 L 666.5 757.5 Z M 488.5 629.5 L 514.5 629.5 L 514.5 757.5 L 488.5 757.5 Z M 591.5 629.5 L 617.5 629.5 L 617.5 757.5 L 591.5 757.5 Z M 1603.5 649.5 L 1629.5 649.5 L 1629.5 761.5 L 1603.5 761.5 Z M 1361.5 649.5 L 1388.5 649.5 L 1388.5 761.5 L 1361.5 761.5 Z M 1440.5 649.5 L 1466.5 649.5 L 1466.5 761.5 L 1440.5 761.5 Z M 1523.5 649.5 L 1549.5 649.5 L 1549.5 761.5 L 1523.5 761.5 Z M 1523.5 649.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1522.5 310.5 L 1548.5 310.5 L 1548.5 484.5 L 1522.5 484.5 Z M 1442.5 310.5 L 1468.5 310.5 L 1468.5 484.5 L 1442.5 484.5 Z M 1364.5 310.5 L 1390.5 310.5 L 1390.5 484.5 L 1364.5 484.5 Z M 1601.5 310.5 L 1627.5 310.5 L 1627.5 484.5 L 1601.5 484.5 Z M 1073.5 311.5 L 1100.5 311.5 L 1100.5 485.5 L 1073.5 485.5 Z M 809.5 311.5 L 835.5 311.5 L 835.5 485.5 L 809.5 485.5 Z M 995.5 311.5 L 1021.5 311.5 L 1021.5 485.5 L 995.5 485.5 Z M 887.5 311.5 L 913.5 311.5 L 913.5 485.5 L 887.5 485.5 Z M 593.5 310.5 L 619.5 310.5 L 619.5 505.5 L 593.5 505.5 Z M 701.5 310.5 L 727.5 310.5 L 727.5 505.5 L 701.5 505.5 Z M 282.5 331.5 L 308.5 331.5 L 308.5 505.5 L 282.5 505.5 Z M 485.5 310.5 L 512.5 310.5 L 512.5 505.5 L 485.5 505.5 Z M 378.5 310.5 L 404.5 310.5 L 404.5 505.5 L 378.5 505.5 Z M 378.5 310.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,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 334.769531 551.359375 L 336.988281 551.257812 L 338.90625 550.90625 L 340.523438 550.351562 L 341.886719 549.542969 L 342.898438 548.53125 L 343.652344 547.21875 L 343.804688 546.867188 L 343.90625 546.460938 L 344.007812 546.058594 L 344.058594 545.605469 L 344.109375 545.148438 L 344.160156 544.695312 L 344.007812 543.632812 L 343.703125 542.675781 L 343.097656 541.765625 L 342.339844 540.957031 L 341.28125 540.25 L 340.070312 539.59375 L 339.664062 539.496094 L 339.261719 539.34375 L 338.808594 539.191406 L 338.351562 539.039062 L 337.847656 538.886719 L 337.394531 538.738281 L 328.253906 536.3125 L 326.03125 535.554688 L 324.214844 534.546875 L 322.800781 533.234375 L 321.792969 531.71875 L 321.1875 529.851562 L 321.035156 527.730469 L 321.136719 526.0625 L 321.4375 524.5 L 321.992188 523.035156 L 322.75 521.773438 L 323.710938 520.609375 L 324.921875 519.550781 L 326.132812 518.742188 L 327.445312 518.085938 L 328.960938 517.582031 L 330.527344 517.226562 L 332.242188 517.027344 L 334.113281 516.925781 L 336.484375 517.078125 L 338.65625 517.378906 L 340.574219 517.984375 L 342.339844 518.742188 L 343.804688 519.804688 L 345.117188 521.015625 L 345.875 522.023438 L 346.480469 523.136719 L 346.9375 524.296875 L 347.289062 525.558594 L 347.492188 526.921875 L 347.59375 528.335938 L 343.148438 528.335938 L 342.996094 526.871094 L 342.644531 525.507812 L 342.039062 524.347656 L 341.28125 523.335938 L 340.222656 522.480469 L 339.007812 521.773438 L 338.25 521.519531 L 337.496094 521.265625 L 336.6875 521.117188 L 335.828125 520.964844 L 334.917969 520.914062 L 333.960938 520.863281 L 332.546875 520.964844 L 331.234375 521.167969 L 330.070312 521.46875 L 329.011719 521.921875 L 328.101562 522.480469 L 327.296875 523.1875 L 326.789062 523.742188 L 326.386719 524.347656 L 326.082031 525.003906 L 325.882812 525.660156 L 325.730469 526.367188 L 325.730469 527.074219 L 325.78125 527.882812 L 325.933594 528.589844 L 326.183594 529.246094 L 326.539062 529.851562 L 326.992188 530.355469 L 327.597656 530.808594 L 328.050781 531.164062 L 328.660156 531.464844 L 329.316406 531.769531 L 330.070312 532.023438 L 330.878906 532.273438 L 331.789062 532.527344 L 341.027344 535 L 342.644531 535.554688 L 344.058594 536.261719 L 345.320312 537.070312 L 346.378906 538.03125 L 347.289062 539.089844 L 347.996094 540.300781 L 348.25 540.90625 L 348.449219 541.515625 L 348.753906 542.828125 L 348.855469 544.242188 L 348.753906 545.503906 L 348.550781 546.714844 L 348.25 547.875 L 347.742188 548.988281 L 347.136719 550.046875 L 346.429688 551.058594 L 345.066406 552.46875 L 343.453125 553.582031 L 341.585938 554.390625 L 339.464844 554.996094 L 337.089844 555.347656 L 334.464844 555.5 L 332.191406 555.398438 L 330.121094 555.097656 L 328.203125 554.589844 L 326.488281 553.984375 L 324.972656 553.125 L 323.609375 552.015625 L 322.449219 550.855469 L 321.539062 549.542969 L 320.832031 548.078125 L 320.328125 546.410156 L 320.023438 544.59375 L 319.921875 542.625 L 324.367188 542.625 L 324.367188 542.878906 L 324.417969 544.191406 L 324.667969 545.402344 L 325.074219 546.511719 L 325.628906 547.523438 L 326.335938 548.429688 L 327.246094 549.238281 L 328.152344 549.894531 L 329.214844 550.449219 L 330.425781 550.855469 L 331.738281 551.15625 L 333.203125 551.308594 Z M 334.769531 551.359375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 318 558 L 347 558 M 318 529 L 347 529 M 318 529 L 318 558 M 347 529 L 347 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 318 558 L 347 558 M 318 529 L 347 529 M 347 558 L 347 529 M 318 558 L 318 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_1.svg b/cells/mux2i/sky130_fd_sc_hs__mux2i_1.svg
index d9476a1..60d18f7 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_1.svg
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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 1065.5 664.5 L 1099.5 664.5 L 1099.5 833.5 L 1065.5 833.5 Z M 618.5 707.5 L 653.5 707.5 L 653.5 833.5 L 618.5 833.5 Z M 1261.5 664.5 L 1295.5 664.5 L 1295.5 833.5 L 1261.5 833.5 Z M 976.5 664.5 L 1010.5 664.5 L 1010.5 833.5 L 976.5 833.5 Z M 845.5 664.5 L 879.5 664.5 L 879.5 833.5 L 845.5 833.5 Z M 845.5 664.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 618.5 240.5 L 653.5 240.5 L 653.5 432.5 L 618.5 432.5 Z M 1168.5 240.5 L 1203.5 240.5 L 1203.5 496.5 L 1168.5 496.5 Z M 842.5 240.5 L 876.5 240.5 L 876.5 496.5 L 842.5 496.5 Z M 945.5 240.5 L 979.5 240.5 L 979.5 496.5 L 945.5 496.5 Z M 1271.5 240.5 L 1306.5 240.5 L 1306.5 496.5 L 1271.5 496.5 Z M 1271.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.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>
@@ -156,6 +156,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 1131.554688 712.246094 L 1131.554688 731.5 L 1125.292969 731.5 L 1125.292969 712.246094 L 1106.375 682.421875 L 1114.117188 682.421875 L 1128.523438 706.320312 L 1142.527344 682.421875 L 1150 682.421875 Z M 1131.554688 712.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1107 392 L 1146 392 M 1107 353 L 1146 353 M 1107 353 L 1107 392 M 1146 353 L 1146 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1107 392 L 1146 392 M 1107 353 L 1146 353 M 1146 392 L 1146 353 M 1107 392 L 1107 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_2.svg b/cells/mux2i/sky130_fd_sc_hs__mux2i_2.svg
index 5e318ed..ab6a9b6 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_2.svg
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 538.5 L 201.5 538.5 Z M 201.5 111.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 245.5 862.5 L 1675.5 862.5 L 1675.5 918.5 L 245.5 918.5 Z M 245.5 862.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="#image349"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1544.5 636.5 L 1578.5 636.5 L 1578.5 783.5 L 1544.5 783.5 Z M 1411.5 636.5 L 1446.5 636.5 L 1446.5 806.5 L 1411.5 806.5 Z M 1162.5 636.5 L 1197.5 636.5 L 1197.5 806.5 L 1162.5 806.5 Z M 1052.5 636.5 L 1087.5 636.5 L 1087.5 806.5 L 1052.5 806.5 Z M 1301.5 636.5 L 1335.5 636.5 L 1335.5 806.5 L 1301.5 806.5 Z M 461.5 664.5 L 496.5 664.5 L 496.5 833.5 L 461.5 833.5 Z M 596.5 664.5 L 631.5 664.5 L 631.5 833.5 L 596.5 833.5 Z M 793.5 664.5 L 828.5 664.5 L 828.5 833.5 L 793.5 833.5 Z M 342.5 664.5 L 376.5 664.5 L 376.5 833.5 L 342.5 833.5 Z M 342.5 664.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 345.5 240.5 L 380.5 240.5 L 380.5 496.5 L 345.5 496.5 Z M 1542.5 267.5 L 1576.5 267.5 L 1576.5 496.5 L 1542.5 496.5 Z M 1408.5 240.5 L 1442.5 240.5 L 1442.5 496.5 L 1408.5 496.5 Z M 1305.5 240.5 L 1339.5 240.5 L 1339.5 496.5 L 1305.5 496.5 Z M 1159.5 240.5 L 1193.5 240.5 L 1193.5 496.5 L 1159.5 496.5 Z M 1056.5 240.5 L 1090.5 240.5 L 1090.5 496.5 L 1056.5 496.5 Z M 790.5 240.5 L 824.5 240.5 L 824.5 496.5 L 790.5 496.5 Z M 600.5 240.5 L 634.5 240.5 L 634.5 496.5 L 600.5 496.5 Z M 458.5 240.5 L 492.5 240.5 L 492.5 496.5 L 458.5 496.5 Z M 458.5 240.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 280.5 136.5 L 319.5 136.5 L 319.5 174.5 L 280.5 174.5 Z M 1600.5 136.5 L 1639.5 136.5 L 1639.5 174.5 L 1600.5 174.5 Z M 1490.5 136.5 L 1529.5 136.5 L 1529.5 174.5 L 1490.5 174.5 Z M 1380.5 136.5 L 1419.5 136.5 L 1419.5 174.5 L 1380.5 174.5 Z M 1270.5 136.5 L 1309.5 136.5 L 1309.5 174.5 L 1270.5 174.5 Z M 1160.5 136.5 L 1199.5 136.5 L 1199.5 174.5 L 1160.5 174.5 Z M 1050.5 136.5 L 1089.5 136.5 L 1089.5 174.5 L 1050.5 174.5 Z M 940.5 136.5 L 979.5 136.5 L 979.5 174.5 L 940.5 174.5 Z M 830.5 136.5 L 869.5 136.5 L 869.5 174.5 L 830.5 174.5 Z M 720.5 136.5 L 759.5 136.5 L 759.5 174.5 L 720.5 174.5 Z M 610.5 136.5 L 649.5 136.5 L 649.5 174.5 L 610.5 174.5 Z M 500.5 136.5 L 539.5 136.5 L 539.5 174.5 L 500.5 174.5 Z M 390.5 136.5 L 429.5 136.5 L 429.5 174.5 L 390.5 174.5 Z M 280.5 899.5 L 319.5 899.5 L 319.5 938.5 L 280.5 938.5 Z M 1600.5 899.5 L 1639.5 899.5 L 1639.5 938.5 L 1600.5 938.5 Z M 1490.5 899.5 L 1529.5 899.5 L 1529.5 938.5 L 1490.5 938.5 Z M 1380.5 899.5 L 1419.5 899.5 L 1419.5 938.5 L 1380.5 938.5 Z M 1270.5 899.5 L 1309.5 899.5 L 1309.5 938.5 L 1270.5 938.5 Z M 1160.5 899.5 L 1199.5 899.5 L 1199.5 938.5 L 1160.5 938.5 Z M 1050.5 899.5 L 1089.5 899.5 L 1089.5 938.5 L 1050.5 938.5 Z M 940.5 899.5 L 979.5 899.5 L 979.5 938.5 L 940.5 938.5 Z M 830.5 899.5 L 869.5 899.5 L 869.5 938.5 L 830.5 938.5 Z M 720.5 899.5 L 759.5 899.5 L 759.5 938.5 L 720.5 938.5 Z M 610.5 899.5 L 649.5 899.5 L 649.5 938.5 L 610.5 938.5 Z M 500.5 899.5 L 539.5 899.5 L 539.5 938.5 L 500.5 938.5 Z M 390.5 899.5 L 429.5 899.5 L 429.5 938.5 L 390.5 938.5 Z M 390.5 899.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface346">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -181,6 +181,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 988.773438 527.503906 L 978.203125 527.503906 L 978.203125 523.261719 L 980.019531 523.058594 L 981.636719 522.789062 L 983.050781 522.453125 L 984.261719 522.183594 L 985.269531 521.847656 L 986.148438 521.445312 L 986.820312 521.039062 L 987.425781 520.570312 L 987.964844 520.03125 L 988.503906 519.355469 L 988.972656 518.617188 L 989.445312 517.742188 L 989.648438 517.269531 L 989.847656 516.730469 L 990.050781 516.125 L 990.320312 515.386719 L 990.523438 514.644531 L 990.792969 513.769531 L 994.695312 513.769531 L 994.695312 561.5 L 988.773438 561.5 Z M 988.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 940 562 L 979 562 M 940 523 L 979 523 M 940 523 L 940 562 M 979 523 L 979 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 940 562 L 979 562 M 940 523 L 979 523 M 979 562 L 979 523 M 940 562 L 940 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 245 156 L 245 165 M 240 161 L 249 161 M 244 162 L 246 162 M 244 160 L 246 160 M 244 160 L 244 162 M 246 160 L 246 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux2i/sky130_fd_sc_hs__mux2i_4.svg b/cells/mux2i/sky130_fd_sc_hs__mux2i_4.svg
index e73e069..9d56085 100644
--- a/cells/mux2i/sky130_fd_sc_hs__mux2i_4.svg
+++ b/cells/mux2i/sky130_fd_sc_hs__mux2i_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.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="#image345"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1054.5 600.5 L 1076.5 600.5 L 1076.5 711.5 L 1054.5 711.5 Z M 989.5 600.5 L 1012.5 600.5 L 1012.5 711.5 L 989.5 711.5 Z M 683.5 610.5 L 706.5 610.5 L 706.5 721.5 L 683.5 721.5 Z M 395.5 610.5 L 418.5 610.5 L 418.5 721.5 L 395.5 721.5 Z M 331.5 610.5 L 353.5 610.5 L 353.5 721.5 L 331.5 721.5 Z M 612.5 610.5 L 634.5 610.5 L 634.5 721.5 L 612.5 721.5 Z M 266.5 610.5 L 289.5 610.5 L 289.5 721.5 L 266.5 721.5 Z M 748.5 610.5 L 770.5 610.5 L 770.5 721.5 L 748.5 721.5 Z M 537.5 610.5 L 559.5 610.5 L 559.5 721.5 L 537.5 721.5 Z M 472.5 610.5 L 495.5 610.5 L 495.5 721.5 L 472.5 721.5 Z M 1142.5 612.5 L 1165.5 612.5 L 1165.5 723.5 L 1142.5 723.5 Z M 1360.5 612.5 L 1382.5 612.5 L 1382.5 723.5 L 1360.5 723.5 Z M 1598.5 612.5 L 1621.5 612.5 L 1621.5 723.5 L 1598.5 723.5 Z M 1459.5 612.5 L 1481.5 612.5 L 1481.5 723.5 L 1459.5 723.5 Z M 1295.5 612.5 L 1318.5 612.5 L 1318.5 723.5 L 1295.5 723.5 Z M 1207.5 612.5 L 1229.5 612.5 L 1229.5 723.5 L 1207.5 723.5 Z M 1523.5 612.5 L 1546.5 612.5 L 1546.5 723.5 L 1523.5 723.5 Z M 1523.5 612.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 268.5 341.5 L 290.5 341.5 L 290.5 509.5 L 268.5 509.5 Z M 1628.5 383.5 L 1651.5 383.5 L 1651.5 509.5 L 1628.5 509.5 Z M 1561.5 383.5 L 1583.5 383.5 L 1583.5 509.5 L 1561.5 509.5 Z M 1485.5 341.5 L 1507.5 341.5 L 1507.5 509.5 L 1485.5 509.5 Z M 1417.5 341.5 L 1440.5 341.5 L 1440.5 509.5 L 1417.5 509.5 Z M 1335.5 341.5 L 1357.5 341.5 L 1357.5 509.5 L 1335.5 509.5 Z M 1267.5 341.5 L 1290.5 341.5 L 1290.5 509.5 L 1267.5 509.5 Z M 1192.5 341.5 L 1215.5 341.5 L 1215.5 509.5 L 1192.5 509.5 Z M 1113.5 341.5 L 1135.5 341.5 L 1135.5 509.5 L 1113.5 509.5 Z M 1045.5 341.5 L 1068.5 341.5 L 1068.5 509.5 L 1045.5 509.5 Z M 978.5 341.5 L 1000.5 341.5 L 1000.5 509.5 L 978.5 509.5 Z M 763.5 341.5 L 785.5 341.5 L 785.5 509.5 L 763.5 509.5 Z M 688.5 341.5 L 710.5 341.5 L 710.5 509.5 L 688.5 509.5 Z M 613.5 341.5 L 635.5 341.5 L 635.5 509.5 L 613.5 509.5 Z M 539.5 341.5 L 562.5 341.5 L 562.5 509.5 L 539.5 509.5 Z M 470.5 341.5 L 493.5 341.5 L 493.5 509.5 L 470.5 509.5 Z M 403.5 341.5 L 425.5 341.5 L 425.5 509.5 L 403.5 509.5 Z M 335.5 341.5 L 358.5 341.5 L 358.5 509.5 L 335.5 509.5 Z M 335.5 341.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface312">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,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 746.324219 539.066406 L 746.324219 551.5 L 742.28125 551.5 L 742.28125 539.066406 L 730.066406 519.804688 L 735.066406 519.804688 L 744.371094 535.238281 L 753.414062 519.804688 L 758.238281 519.804688 Z M 746.324219 539.066406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 730 557 L 756 557 M 730 531 L 756 531 M 730 531 L 730 557 M 756 531 L 756 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 730 557 L 756 557 M 730 531 L 756 531 M 756 557 L 756 531 M 730 557 L 730 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_1.svg b/cells/mux4/sky130_fd_sc_hs__mux4_1.svg
index ed08f78..0f54673 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_1.svg
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 536.5 L 174.5 536.5 Z M 311.5 536.5 L 874.5 536.5 L 874.5 557.5 L 311.5 557.5 Z M 311.5 536.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 204.5 758.5 L 1714.5 758.5 L 1714.5 797.5 L 204.5 797.5 Z M 204.5 758.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1301.5 598.5 L 1325.5 598.5 L 1325.5 699.5 L 1301.5 699.5 Z M 1232.5 598.5 L 1256.5 598.5 L 1256.5 699.5 L 1232.5 699.5 Z M 1522.5 615.5 L 1546.5 615.5 L 1546.5 715.5 L 1522.5 715.5 Z M 1612.5 615.5 L 1636.5 615.5 L 1636.5 731.5 L 1612.5 731.5 Z M 534.5 638.5 L 558.5 638.5 L 558.5 739.5 L 534.5 739.5 Z M 1011.5 638.5 L 1035.5 638.5 L 1035.5 739.5 L 1011.5 739.5 Z M 950.5 638.5 L 974.5 638.5 L 974.5 739.5 L 950.5 739.5 Z M 845.5 638.5 L 869.5 638.5 L 869.5 739.5 L 845.5 739.5 Z M 784.5 638.5 L 808.5 638.5 L 808.5 739.5 L 784.5 739.5 Z M 676.5 638.5 L 699.5 638.5 L 699.5 739.5 L 676.5 739.5 Z M 388.5 638.5 L 411.5 638.5 L 411.5 739.5 L 388.5 739.5 Z M 270.5 638.5 L 293.5 638.5 L 293.5 739.5 L 270.5 739.5 Z M 449.5 638.5 L 473.5 638.5 L 473.5 739.5 L 449.5 739.5 Z M 449.5 638.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1243.5 331.5 L 1266.5 331.5 L 1266.5 489.5 L 1243.5 489.5 Z M 1321.5 331.5 L 1345.5 331.5 L 1345.5 489.5 L 1321.5 489.5 Z M 1496.5 335.5 L 1519.5 335.5 L 1519.5 493.5 L 1496.5 493.5 Z M 1084.5 335.5 L 1107.5 335.5 L 1107.5 493.5 L 1084.5 493.5 Z M 1018.5 335.5 L 1041.5 335.5 L 1041.5 493.5 L 1018.5 493.5 Z M 860.5 335.5 L 883.5 335.5 L 883.5 493.5 L 860.5 493.5 Z M 1620.5 331.5 L 1644.5 331.5 L 1644.5 508.5 L 1620.5 508.5 Z M 289.5 350.5 L 312.5 350.5 L 312.5 508.5 L 289.5 508.5 Z M 381.5 372.5 L 404.5 372.5 L 404.5 529.5 L 381.5 529.5 Z M 602.5 372.5 L 626.5 372.5 L 626.5 529.5 L 602.5 529.5 Z M 532.5 372.5 L 555.5 372.5 L 555.5 529.5 L 532.5 529.5 Z M 683.5 372.5 L 706.5 372.5 L 706.5 529.5 L 683.5 529.5 Z M 780.5 372.5 L 804.5 372.5 L 804.5 529.5 L 780.5 529.5 Z M 780.5 372.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 228.5 260.5 L 255.5 260.5 L 255.5 287.5 L 228.5 287.5 Z M 1662.5 260.5 L 1689.5 260.5 L 1689.5 287.5 L 1662.5 287.5 Z M 1587.5 260.5 L 1614.5 260.5 L 1614.5 287.5 L 1587.5 287.5 Z M 1511.5 260.5 L 1538.5 260.5 L 1538.5 287.5 L 1511.5 287.5 Z M 1436.5 260.5 L 1463.5 260.5 L 1463.5 287.5 L 1436.5 287.5 Z M 1360.5 260.5 L 1387.5 260.5 L 1387.5 287.5 L 1360.5 287.5 Z M 1285.5 260.5 L 1312.5 260.5 L 1312.5 287.5 L 1285.5 287.5 Z M 1209.5 260.5 L 1236.5 260.5 L 1236.5 287.5 L 1209.5 287.5 Z M 1134.5 260.5 L 1161.5 260.5 L 1161.5 287.5 L 1134.5 287.5 Z M 1059.5 260.5 L 1085.5 260.5 L 1085.5 287.5 L 1059.5 287.5 Z M 983.5 260.5 L 1010.5 260.5 L 1010.5 287.5 L 983.5 287.5 Z M 908.5 260.5 L 934.5 260.5 L 934.5 287.5 L 908.5 287.5 Z M 832.5 260.5 L 859.5 260.5 L 859.5 287.5 L 832.5 287.5 Z M 757.5 260.5 L 783.5 260.5 L 783.5 287.5 L 757.5 287.5 Z M 681.5 260.5 L 708.5 260.5 L 708.5 287.5 L 681.5 287.5 Z M 606.5 260.5 L 632.5 260.5 L 632.5 287.5 L 606.5 287.5 Z M 530.5 260.5 L 557.5 260.5 L 557.5 287.5 L 530.5 287.5 Z M 455.5 260.5 L 481.5 260.5 L 481.5 287.5 L 455.5 287.5 Z M 379.5 260.5 L 406.5 260.5 L 406.5 287.5 L 379.5 287.5 Z M 304.5 260.5 L 330.5 260.5 L 330.5 287.5 L 304.5 287.5 Z M 228.5 784.5 L 255.5 784.5 L 255.5 810.5 L 228.5 810.5 Z M 1662.5 784.5 L 1689.5 784.5 L 1689.5 810.5 L 1662.5 810.5 Z M 1587.5 784.5 L 1614.5 784.5 L 1614.5 810.5 L 1587.5 810.5 Z M 1511.5 784.5 L 1538.5 784.5 L 1538.5 810.5 L 1511.5 810.5 Z M 1436.5 784.5 L 1463.5 784.5 L 1463.5 810.5 L 1436.5 810.5 Z M 1360.5 784.5 L 1387.5 784.5 L 1387.5 810.5 L 1360.5 810.5 Z M 1285.5 784.5 L 1312.5 784.5 L 1312.5 810.5 L 1285.5 810.5 Z M 1209.5 784.5 L 1236.5 784.5 L 1236.5 810.5 L 1209.5 810.5 Z M 1134.5 784.5 L 1161.5 784.5 L 1161.5 810.5 L 1134.5 810.5 Z M 1059.5 784.5 L 1085.5 784.5 L 1085.5 810.5 L 1059.5 810.5 Z M 983.5 784.5 L 1010.5 784.5 L 1010.5 810.5 L 983.5 810.5 Z M 908.5 784.5 L 934.5 784.5 L 934.5 810.5 L 908.5 810.5 Z M 832.5 784.5 L 859.5 784.5 L 859.5 810.5 L 832.5 810.5 Z M 757.5 784.5 L 783.5 784.5 L 783.5 810.5 L 757.5 810.5 Z M 681.5 784.5 L 708.5 784.5 L 708.5 810.5 L 681.5 810.5 Z M 606.5 784.5 L 632.5 784.5 L 632.5 810.5 L 606.5 810.5 Z M 530.5 784.5 L 557.5 784.5 L 557.5 810.5 L 530.5 810.5 Z M 455.5 784.5 L 481.5 784.5 L 481.5 810.5 L 455.5 810.5 Z M 379.5 784.5 L 406.5 784.5 L 406.5 810.5 L 379.5 810.5 Z M 304.5 784.5 L 330.5 784.5 L 330.5 810.5 L 304.5 810.5 Z M 304.5 784.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface331">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -192,6 +192,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 1679.597656 360.191406 L 1691.539062 377.5 L 1686.214844 377.5 L 1677.003906 363.429688 L 1667.75 377.5 L 1662.519531 377.5 L 1674.460938 360.191406 L 1663.257812 343.757812 L 1668.488281 343.757812 L 1677.144531 356.996094 L 1685.84375 343.757812 L 1690.984375 343.757812 Z M 1679.597656 360.191406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1662 732 L 1689 732 M 1662 705 L 1689 705 M 1662 705 L 1662 732 M 1689 705 L 1689 732 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1662 732 L 1689 732 M 1662 705 L 1689 705 M 1689 732 L 1689 705 M 1662 732 L 1662 705 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204 277 L 204 286 M 199 282 L 208 282 M 203 283 L 205 283 M 203 281 L 205 281 M 203 281 L 203 283 M 205 281 L 205 283 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_2.svg b/cells/mux4/sky130_fd_sc_hs__mux4_2.svg
index 81fda62..912907c 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_2.svg
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 269.5 L 1743.5 269.5 L 1743.5 521.5 L 174.5 521.5 Z M 1388.5 521.5 L 1743.5 521.5 L 1743.5 536.5 L 1388.5 536.5 Z M 174.5 521.5 L 1192.5 521.5 L 1192.5 536.5 L 174.5 536.5 Z M 174.5 521.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 201.5 739.5 L 1716.5 739.5 L 1716.5 774.5 L 201.5 774.5 Z M 201.5 739.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="#image359"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1277.5 582.5 L 1299.5 582.5 L 1299.5 688.5 L 1277.5 688.5 Z M 1440.5 596.5 L 1462.5 596.5 L 1462.5 688.5 L 1440.5 688.5 Z M 1568.5 596.5 L 1589.5 596.5 L 1589.5 702.5 L 1568.5 702.5 Z M 1629.5 596.5 L 1651.5 596.5 L 1651.5 702.5 L 1629.5 702.5 Z M 264.5 615.5 L 286.5 615.5 L 286.5 706.5 L 264.5 706.5 Z M 1205.5 615.5 L 1226.5 615.5 L 1226.5 721.5 L 1205.5 721.5 Z M 1064.5 615.5 L 1086.5 615.5 L 1086.5 721.5 L 1064.5 721.5 Z M 931.5 615.5 L 952.5 615.5 L 952.5 721.5 L 931.5 721.5 Z M 832.5 615.5 L 853.5 615.5 L 853.5 721.5 L 832.5 721.5 Z M 418.5 615.5 L 440.5 615.5 L 440.5 721.5 L 418.5 721.5 Z M 543.5 615.5 L 565.5 615.5 L 565.5 721.5 L 543.5 721.5 Z M 362.5 615.5 L 384.5 615.5 L 384.5 721.5 L 362.5 721.5 Z M 677.5 615.5 L 698.5 615.5 L 698.5 721.5 L 677.5 721.5 Z M 776.5 615.5 L 797.5 615.5 L 797.5 721.5 L 776.5 721.5 Z M 776.5 615.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1279.5 349.5 L 1301.5 349.5 L 1301.5 493.5 L 1279.5 493.5 Z M 1215.5 349.5 L 1236.5 349.5 L 1236.5 493.5 L 1215.5 493.5 Z M 283.5 349.5 L 304.5 349.5 L 304.5 493.5 L 283.5 493.5 Z M 782.5 349.5 L 804.5 349.5 L 804.5 493.5 L 782.5 493.5 Z M 520.5 349.5 L 541.5 349.5 L 541.5 493.5 L 520.5 493.5 Z M 623.5 349.5 L 644.5 349.5 L 644.5 493.5 L 623.5 493.5 Z M 683.5 349.5 L 705.5 349.5 L 705.5 493.5 L 683.5 493.5 Z M 1066.5 349.5 L 1088.5 349.5 L 1088.5 493.5 L 1066.5 493.5 Z M 907.5 349.5 L 928.5 349.5 L 928.5 493.5 L 907.5 493.5 Z M 369.5 349.5 L 390.5 349.5 L 390.5 493.5 L 369.5 493.5 Z M 1006.5 349.5 L 1027.5 349.5 L 1027.5 493.5 L 1006.5 493.5 Z M 1442.5 352.5 L 1464.5 352.5 L 1464.5 495.5 L 1442.5 495.5 Z M 1634.5 349.5 L 1655.5 349.5 L 1655.5 510.5 L 1634.5 510.5 Z M 1569.5 349.5 L 1591.5 349.5 L 1591.5 510.5 L 1569.5 510.5 Z M 1569.5 349.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 223.5 284.5 L 248.5 284.5 L 248.5 308.5 L 223.5 308.5 Z M 1670.5 284.5 L 1694.5 284.5 L 1694.5 308.5 L 1670.5 308.5 Z M 1601.5 284.5 L 1625.5 284.5 L 1625.5 308.5 L 1601.5 308.5 Z M 1532.5 284.5 L 1556.5 284.5 L 1556.5 308.5 L 1532.5 308.5 Z M 1463.5 284.5 L 1487.5 284.5 L 1487.5 308.5 L 1463.5 308.5 Z M 1394.5 284.5 L 1418.5 284.5 L 1418.5 308.5 L 1394.5 308.5 Z M 1325.5 284.5 L 1350.5 284.5 L 1350.5 308.5 L 1325.5 308.5 Z M 1256.5 284.5 L 1281.5 284.5 L 1281.5 308.5 L 1256.5 308.5 Z M 1187.5 284.5 L 1212.5 284.5 L 1212.5 308.5 L 1187.5 308.5 Z M 1119.5 284.5 L 1143.5 284.5 L 1143.5 308.5 L 1119.5 308.5 Z M 1050.5 284.5 L 1074.5 284.5 L 1074.5 308.5 L 1050.5 308.5 Z M 981.5 284.5 L 1005.5 284.5 L 1005.5 308.5 L 981.5 308.5 Z M 912.5 284.5 L 936.5 284.5 L 936.5 308.5 L 912.5 308.5 Z M 843.5 284.5 L 867.5 284.5 L 867.5 308.5 L 843.5 308.5 Z M 774.5 284.5 L 799.5 284.5 L 799.5 308.5 L 774.5 308.5 Z M 705.5 284.5 L 730.5 284.5 L 730.5 308.5 L 705.5 308.5 Z M 636.5 284.5 L 661.5 284.5 L 661.5 308.5 L 636.5 308.5 Z M 568.5 284.5 L 592.5 284.5 L 592.5 308.5 L 568.5 308.5 Z M 499.5 284.5 L 523.5 284.5 L 523.5 308.5 L 499.5 308.5 Z M 430.5 284.5 L 454.5 284.5 L 454.5 308.5 L 430.5 308.5 Z M 361.5 284.5 L 385.5 284.5 L 385.5 308.5 L 361.5 308.5 Z M 292.5 284.5 L 317.5 284.5 L 317.5 308.5 L 292.5 308.5 Z M 223.5 470.5 L 248.5 470.5 L 248.5 494.5 L 223.5 494.5 Z M 912.5 470.5 L 936.5 470.5 L 936.5 494.5 L 912.5 494.5 Z M 499.5 470.5 L 523.5 470.5 L 523.5 494.5 L 499.5 494.5 Z M 223.5 762.5 L 248.5 762.5 L 248.5 786.5 L 223.5 786.5 Z M 1670.5 762.5 L 1694.5 762.5 L 1694.5 786.5 L 1670.5 786.5 Z M 1601.5 762.5 L 1625.5 762.5 L 1625.5 786.5 L 1601.5 786.5 Z M 1532.5 762.5 L 1556.5 762.5 L 1556.5 786.5 L 1532.5 786.5 Z M 1463.5 762.5 L 1487.5 762.5 L 1487.5 786.5 L 1463.5 786.5 Z M 1394.5 762.5 L 1418.5 762.5 L 1418.5 786.5 L 1394.5 786.5 Z M 1325.5 762.5 L 1350.5 762.5 L 1350.5 786.5 L 1325.5 786.5 Z M 1256.5 762.5 L 1281.5 762.5 L 1281.5 786.5 L 1256.5 786.5 Z M 1187.5 762.5 L 1212.5 762.5 L 1212.5 786.5 L 1187.5 786.5 Z M 1119.5 762.5 L 1143.5 762.5 L 1143.5 786.5 L 1119.5 786.5 Z M 1050.5 762.5 L 1074.5 762.5 L 1074.5 786.5 L 1050.5 786.5 Z M 981.5 762.5 L 1005.5 762.5 L 1005.5 786.5 L 981.5 786.5 Z M 912.5 762.5 L 936.5 762.5 L 936.5 786.5 L 912.5 786.5 Z M 843.5 762.5 L 867.5 762.5 L 867.5 786.5 L 843.5 786.5 Z M 774.5 762.5 L 799.5 762.5 L 799.5 786.5 L 774.5 786.5 Z M 705.5 762.5 L 730.5 762.5 L 730.5 786.5 L 705.5 786.5 Z M 636.5 762.5 L 661.5 762.5 L 661.5 786.5 L 636.5 786.5 Z M 568.5 762.5 L 592.5 762.5 L 592.5 786.5 L 568.5 786.5 Z M 499.5 762.5 L 523.5 762.5 L 523.5 786.5 L 499.5 786.5 Z M 430.5 762.5 L 454.5 762.5 L 454.5 786.5 L 430.5 786.5 Z M 361.5 762.5 L 385.5 762.5 L 385.5 786.5 L 361.5 786.5 Z M 292.5 762.5 L 317.5 762.5 L 317.5 786.5 L 292.5 786.5 Z M 292.5 762.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface326">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1067.625 531.019531 L 1067.960938 527.863281 L 1068.847656 525.296875 L 1070.234375 523.277344 L 1072.128906 521.847656 L 1074.527344 520.960938 L 1077.472656 520.667969 L 1078.820312 520.753906 L 1080.121094 520.960938 L 1081.34375 521.300781 L 1082.4375 521.804688 L 1083.445312 522.433594 L 1084.414062 523.152344 L 1085.171875 524.035156 L 1085.84375 524.960938 L 1086.351562 525.96875 L 1086.730469 527.023438 L 1086.9375 528.199219 L 1087.023438 529.421875 L 1086.855469 531.144531 L 1086.390625 532.742188 L 1085.59375 534.214844 L 1084.5 535.605469 L 1083.066406 536.910156 L 1081.34375 538.046875 L 1080.710938 538.425781 L 1076.503906 540.695312 L 1075.410156 541.328125 L 1074.441406 541.957031 L 1073.601562 542.589844 L 1072.929688 543.222656 L 1072.339844 543.851562 L 1071.917969 544.484375 L 1071.707031 544.863281 L 1071.539062 545.199219 L 1071.414062 545.621094 L 1071.285156 545.996094 L 1071.160156 546.417969 L 1071.117188 546.839844 L 1086.8125 546.839844 L 1086.8125 550.5 L 1066.953125 550.5 L 1067.039062 549.027344 L 1067.246094 547.679688 L 1067.5 546.417969 L 1067.835938 545.324219 L 1068.214844 544.273438 L 1068.679688 543.347656 L 1069.183594 542.546875 L 1069.8125 541.75 L 1070.570312 540.949219 L 1071.414062 540.191406 L 1072.378906 539.433594 L 1073.515625 538.675781 L 1073.769531 538.507812 L 1074.0625 538.339844 L 1074.359375 538.128906 L 1074.652344 537.960938 L 1074.988281 537.792969 L 1075.324219 537.582031 L 1079.195312 535.394531 L 1080.417969 534.59375 L 1081.425781 533.710938 L 1082.226562 532.785156 L 1082.773438 531.777344 L 1083.109375 530.683594 L 1083.234375 529.503906 L 1083.152344 528.703125 L 1083.027344 527.90625 L 1082.730469 527.191406 L 1082.394531 526.515625 L 1081.890625 525.929688 L 1081.34375 525.339844 L 1080.753906 524.917969 L 1080.164062 524.539062 L 1079.492188 524.285156 L 1078.820312 524.078125 L 1078.101562 523.949219 L 1077.347656 523.90625 L 1075.703125 524.117188 L 1074.316406 524.625 L 1073.179688 525.507812 L 1072.339844 526.726562 L 1071.75 528.324219 L 1071.414062 530.21875 L 1071.371094 530.386719 L 1071.371094 530.640625 L 1071.328125 530.765625 L 1071.328125 531.019531 Z M 1067.625 531.019531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1050 556 L 1074 556 M 1050 532 L 1074 532 M 1050 532 L 1050 556 M 1074 532 L 1074 556 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1050 556 L 1074 556 M 1050 532 L 1074 532 M 1074 556 L 1074 532 M 1050 556 L 1050 532 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201 300 L 201 309 M 196 305 L 205 305 M 200 306 L 202 306 M 200 304 L 202 304 M 200 304 L 200 306 M 202 304 L 202 306 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/mux4/sky130_fd_sc_hs__mux4_4.svg b/cells/mux4/sky130_fd_sc_hs__mux4_4.svg
index d30d776..b9140eb 100644
--- a/cells/mux4/sky130_fd_sc_hs__mux4_4.svg
+++ b/cells/mux4/sky130_fd_sc_hs__mux4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 364.5 L 1743.5 364.5 L 1743.5 534.5 L 174.5 534.5 Z M 174.5 364.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image378"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 191.5 664.5 L 1726.5 664.5 L 1726.5 686.5 L 191.5 686.5 Z M 191.5 664.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="#image378"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 354.5 570.5 L 367.5 570.5 L 367.5 628.5 L 354.5 628.5 Z M 314.5 570.5 L 328.5 570.5 L 328.5 628.5 L 314.5 628.5 Z M 230.5 570.5 L 244.5 570.5 L 244.5 628.5 L 230.5 628.5 Z M 269.5 570.5 L 283.5 570.5 L 283.5 628.5 L 269.5 628.5 Z M 761.5 572.5 L 775.5 572.5 L 775.5 631.5 L 761.5 631.5 Z M 879.5 572.5 L 893.5 572.5 L 893.5 631.5 L 879.5 631.5 Z M 840.5 572.5 L 854.5 572.5 L 854.5 631.5 L 840.5 631.5 Z M 801.5 572.5 L 814.5 572.5 L 814.5 631.5 L 801.5 631.5 Z M 581.5 573.5 L 594.5 573.5 L 594.5 632.5 L 581.5 632.5 Z M 541.5 573.5 L 555.5 573.5 L 555.5 632.5 L 541.5 632.5 Z M 502.5 573.5 L 516.5 573.5 L 516.5 632.5 L 502.5 632.5 Z M 459.5 573.5 L 472.5 573.5 L 472.5 632.5 L 459.5 632.5 Z M 1595.5 585.5 L 1609.5 585.5 L 1609.5 652.5 L 1595.5 652.5 Z M 1635.5 585.5 L 1648.5 585.5 L 1648.5 652.5 L 1635.5 652.5 Z M 1674.5 585.5 L 1688.5 585.5 L 1688.5 652.5 L 1674.5 652.5 Z M 1081.5 594.5 L 1095.5 594.5 L 1095.5 652.5 L 1081.5 652.5 Z M 1393.5 594.5 L 1406.5 594.5 L 1406.5 652.5 L 1393.5 652.5 Z M 1120.5 594.5 L 1134.5 594.5 L 1134.5 652.5 L 1120.5 652.5 Z M 1042.5 594.5 L 1056.5 594.5 L 1056.5 652.5 L 1042.5 652.5 Z M 1003.5 594.5 L 1016.5 594.5 L 1016.5 652.5 L 1003.5 652.5 Z M 1276.5 594.5 L 1289.5 594.5 L 1289.5 652.5 L 1276.5 652.5 Z M 1353.5 594.5 L 1367.5 594.5 L 1367.5 652.5 L 1353.5 652.5 Z M 671.5 585.5 L 685.5 585.5 L 685.5 652.5 L 671.5 652.5 Z M 1222.5 594.5 L 1235.5 594.5 L 1235.5 652.5 L 1222.5 652.5 Z M 1556.5 585.5 L 1570.5 585.5 L 1570.5 652.5 L 1556.5 652.5 Z M 1489.5 585.5 L 1503.5 585.5 L 1503.5 652.5 L 1489.5 652.5 Z M 1489.5 585.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image379"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1375.5 416.5 L 1389.5 416.5 L 1389.5 507.5 L 1375.5 507.5 Z M 1284.5 416.5 L 1298.5 416.5 L 1298.5 507.5 L 1284.5 507.5 Z M 1238.5 416.5 L 1252.5 416.5 L 1252.5 507.5 L 1238.5 507.5 Z M 539.5 416.5 L 553.5 416.5 L 553.5 507.5 L 539.5 507.5 Z M 496.5 416.5 L 509.5 416.5 L 509.5 507.5 L 496.5 507.5 Z M 231.5 416.5 L 244.5 416.5 L 244.5 507.5 L 231.5 507.5 Z M 272.5 416.5 L 286.5 416.5 L 286.5 507.5 L 272.5 507.5 Z M 452.5 416.5 L 466.5 416.5 L 466.5 507.5 L 452.5 507.5 Z M 359.5 416.5 L 372.5 416.5 L 372.5 507.5 L 359.5 507.5 Z M 1128.5 416.5 L 1141.5 416.5 L 1141.5 507.5 L 1128.5 507.5 Z M 313.5 416.5 L 327.5 416.5 L 327.5 507.5 L 313.5 507.5 Z M 1087.5 416.5 L 1100.5 416.5 L 1100.5 507.5 L 1087.5 507.5 Z M 1330.5 416.5 L 1343.5 416.5 L 1343.5 507.5 L 1330.5 507.5 Z M 1029.5 416.5 L 1043.5 416.5 L 1043.5 507.5 L 1029.5 507.5 Z M 988.5 416.5 L 1002.5 416.5 L 1002.5 507.5 L 988.5 507.5 Z M 580.5 416.5 L 594.5 416.5 L 594.5 507.5 L 580.5 507.5 Z M 806.5 422.5 L 819.5 422.5 L 819.5 514.5 L 806.5 514.5 Z M 765.5 422.5 L 778.5 422.5 L 778.5 514.5 L 765.5 514.5 Z M 888.5 422.5 L 902.5 422.5 L 902.5 514.5 L 888.5 514.5 Z M 847.5 422.5 L 861.5 422.5 L 861.5 514.5 L 847.5 514.5 Z M 1666.5 416.5 L 1679.5 416.5 L 1679.5 518.5 L 1666.5 518.5 Z M 672.5 416.5 L 686.5 416.5 L 686.5 518.5 L 672.5 518.5 Z M 1491.5 416.5 L 1504.5 416.5 L 1504.5 518.5 L 1491.5 518.5 Z M 1579.5 416.5 L 1593.5 416.5 L 1593.5 518.5 L 1579.5 518.5 Z M 1538.5 416.5 L 1552.5 416.5 L 1552.5 518.5 L 1538.5 518.5 Z M 1625.5 416.5 L 1638.5 416.5 L 1638.5 518.5 L 1625.5 518.5 Z M 1625.5 416.5 "/>
 </clipPath>
-<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image380"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 206.5 374.5 L 221.5 374.5 L 221.5 390.5 L 206.5 390.5 Z M 1696.5 374.5 L 1712.5 374.5 L 1712.5 390.5 L 1696.5 390.5 Z M 1652.5 374.5 L 1668.5 374.5 L 1668.5 390.5 L 1652.5 390.5 Z M 1609.5 374.5 L 1624.5 374.5 L 1624.5 390.5 L 1609.5 390.5 Z M 1565.5 374.5 L 1580.5 374.5 L 1580.5 390.5 L 1565.5 390.5 Z M 1521.5 374.5 L 1536.5 374.5 L 1536.5 390.5 L 1521.5 390.5 Z M 1477.5 374.5 L 1493.5 374.5 L 1493.5 390.5 L 1477.5 390.5 Z M 1433.5 374.5 L 1449.5 374.5 L 1449.5 390.5 L 1433.5 390.5 Z M 1389.5 374.5 L 1405.5 374.5 L 1405.5 390.5 L 1389.5 390.5 Z M 1346.5 374.5 L 1361.5 374.5 L 1361.5 390.5 L 1346.5 390.5 Z M 1302.5 374.5 L 1317.5 374.5 L 1317.5 390.5 L 1302.5 390.5 Z M 1258.5 374.5 L 1273.5 374.5 L 1273.5 390.5 L 1258.5 390.5 Z M 1214.5 374.5 L 1230.5 374.5 L 1230.5 390.5 L 1214.5 390.5 Z M 1170.5 374.5 L 1186.5 374.5 L 1186.5 390.5 L 1170.5 390.5 Z M 1126.5 374.5 L 1142.5 374.5 L 1142.5 390.5 L 1126.5 390.5 Z M 1083.5 374.5 L 1098.5 374.5 L 1098.5 390.5 L 1083.5 390.5 Z M 1039.5 374.5 L 1054.5 374.5 L 1054.5 390.5 L 1039.5 390.5 Z M 995.5 374.5 L 1010.5 374.5 L 1010.5 390.5 L 995.5 390.5 Z M 951.5 374.5 L 967.5 374.5 L 967.5 390.5 L 951.5 390.5 Z M 907.5 374.5 L 923.5 374.5 L 923.5 390.5 L 907.5 390.5 Z M 863.5 374.5 L 879.5 374.5 L 879.5 390.5 L 863.5 390.5 Z M 819.5 374.5 L 835.5 374.5 L 835.5 390.5 L 819.5 390.5 Z M 776.5 374.5 L 791.5 374.5 L 791.5 390.5 L 776.5 390.5 Z M 732.5 374.5 L 747.5 374.5 L 747.5 390.5 L 732.5 390.5 Z M 688.5 374.5 L 703.5 374.5 L 703.5 390.5 L 688.5 390.5 Z M 644.5 374.5 L 660.5 374.5 L 660.5 390.5 L 644.5 390.5 Z M 600.5 374.5 L 616.5 374.5 L 616.5 390.5 L 600.5 390.5 Z M 556.5 374.5 L 572.5 374.5 L 572.5 390.5 L 556.5 390.5 Z M 513.5 374.5 L 528.5 374.5 L 528.5 390.5 L 513.5 390.5 Z M 469.5 374.5 L 484.5 374.5 L 484.5 390.5 L 469.5 390.5 Z M 425.5 374.5 L 440.5 374.5 L 440.5 390.5 L 425.5 390.5 Z M 381.5 374.5 L 397.5 374.5 L 397.5 390.5 L 381.5 390.5 Z M 337.5 374.5 L 353.5 374.5 L 353.5 390.5 L 337.5 390.5 Z M 293.5 374.5 L 309.5 374.5 L 309.5 390.5 L 293.5 390.5 Z M 249.5 374.5 L 265.5 374.5 L 265.5 390.5 L 249.5 390.5 Z M 600.5 492.5 L 616.5 492.5 L 616.5 501.5 L 600.5 501.5 Z M 1258.5 492.5 L 1273.5 492.5 L 1273.5 508.5 L 1258.5 508.5 Z M 600.5 501.5 L 616.5 501.5 L 616.5 508.5 L 600.5 508.5 Z M 206.5 678.5 L 221.5 678.5 L 221.5 694.5 L 206.5 694.5 Z M 1696.5 678.5 L 1712.5 678.5 L 1712.5 694.5 L 1696.5 694.5 Z M 1652.5 678.5 L 1668.5 678.5 L 1668.5 694.5 L 1652.5 694.5 Z M 1609.5 678.5 L 1624.5 678.5 L 1624.5 694.5 L 1609.5 694.5 Z M 1565.5 678.5 L 1580.5 678.5 L 1580.5 694.5 L 1565.5 694.5 Z M 1521.5 678.5 L 1536.5 678.5 L 1536.5 694.5 L 1521.5 694.5 Z M 1477.5 678.5 L 1493.5 678.5 L 1493.5 694.5 L 1477.5 694.5 Z M 1433.5 678.5 L 1449.5 678.5 L 1449.5 694.5 L 1433.5 694.5 Z M 1389.5 678.5 L 1405.5 678.5 L 1405.5 694.5 L 1389.5 694.5 Z M 1346.5 678.5 L 1361.5 678.5 L 1361.5 694.5 L 1346.5 694.5 Z M 1302.5 678.5 L 1317.5 678.5 L 1317.5 694.5 L 1302.5 694.5 Z M 1258.5 678.5 L 1273.5 678.5 L 1273.5 694.5 L 1258.5 694.5 Z M 1214.5 678.5 L 1230.5 678.5 L 1230.5 694.5 L 1214.5 694.5 Z M 1170.5 678.5 L 1186.5 678.5 L 1186.5 694.5 L 1170.5 694.5 Z M 1126.5 678.5 L 1142.5 678.5 L 1142.5 694.5 L 1126.5 694.5 Z M 1083.5 678.5 L 1098.5 678.5 L 1098.5 694.5 L 1083.5 694.5 Z M 1039.5 678.5 L 1054.5 678.5 L 1054.5 694.5 L 1039.5 694.5 Z M 995.5 678.5 L 1010.5 678.5 L 1010.5 694.5 L 995.5 694.5 Z M 951.5 678.5 L 967.5 678.5 L 967.5 694.5 L 951.5 694.5 Z M 907.5 678.5 L 923.5 678.5 L 923.5 694.5 L 907.5 694.5 Z M 863.5 678.5 L 879.5 678.5 L 879.5 694.5 L 863.5 694.5 Z M 819.5 678.5 L 835.5 678.5 L 835.5 694.5 L 819.5 694.5 Z M 776.5 678.5 L 791.5 678.5 L 791.5 694.5 L 776.5 694.5 Z M 732.5 678.5 L 747.5 678.5 L 747.5 694.5 L 732.5 694.5 Z M 688.5 678.5 L 703.5 678.5 L 703.5 694.5 L 688.5 694.5 Z M 644.5 678.5 L 660.5 678.5 L 660.5 694.5 L 644.5 694.5 Z M 600.5 678.5 L 616.5 678.5 L 616.5 694.5 L 600.5 694.5 Z M 556.5 678.5 L 572.5 678.5 L 572.5 694.5 L 556.5 694.5 Z M 513.5 678.5 L 528.5 678.5 L 528.5 694.5 L 513.5 694.5 Z M 469.5 678.5 L 484.5 678.5 L 484.5 694.5 L 469.5 694.5 Z M 425.5 678.5 L 440.5 678.5 L 440.5 694.5 L 425.5 694.5 Z M 381.5 678.5 L 397.5 678.5 L 397.5 694.5 L 381.5 694.5 Z M 337.5 678.5 L 353.5 678.5 L 353.5 694.5 L 337.5 694.5 Z M 293.5 678.5 L 309.5 678.5 L 309.5 694.5 L 293.5 694.5 Z M 249.5 678.5 L 265.5 678.5 L 265.5 694.5 L 249.5 694.5 Z M 249.5 678.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image381"/>
 </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="surface375">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -197,6 +197,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 1705.917969 534.535156 L 1712.792969 544.5 L 1709.730469 544.5 L 1704.425781 536.398438 L 1699.097656 544.5 L 1696.085938 544.5 L 1702.960938 534.535156 L 1696.511719 525.074219 L 1699.523438 525.074219 L 1704.507812 532.695312 L 1709.515625 525.074219 L 1712.476562 525.074219 Z M 1705.917969 534.535156 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1696 553 L 1712 553 M 1696 537 L 1712 537 M 1696 537 L 1696 553 M 1712 537 L 1712 553 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1696 553 L 1712 553 M 1696 537 L 1712 537 M 1712 553 L 1712 537 M 1696 553 L 1696 537 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 191 388 L 191 397 M 186 393 L 195 393 M 190 394 L 192 394 M 190 392 L 192 392 M 190 392 L 190 394 M 192 392 L 192 394 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_1.svg b/cells/nand2/sky130_fd_sc_hs__nand2_1.svg
index f1a0a9f..4737540 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_1.svg
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 538.5 L 756.5 538.5 Z M 756.5 111.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 799.5 862.5 L 1129.5 862.5 L 1129.5 918.5 L 799.5 918.5 Z M 799.5 862.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="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 988.5 664.5 L 1023.5 664.5 L 1023.5 833.5 L 988.5 833.5 Z M 899.5 664.5 L 933.5 664.5 L 933.5 833.5 L 899.5 833.5 Z M 899.5 664.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 999.5 240.5 L 1033.5 240.5 L 1033.5 496.5 L 999.5 496.5 Z M 895.5 240.5 L 930.5 240.5 L 930.5 496.5 L 895.5 496.5 Z M 895.5 240.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 835.5 136.5 L 874.5 136.5 L 874.5 174.5 L 835.5 174.5 Z M 1055.5 136.5 L 1094.5 136.5 L 1094.5 174.5 L 1055.5 174.5 Z M 945.5 136.5 L 984.5 136.5 L 984.5 174.5 L 945.5 174.5 Z M 835.5 899.5 L 874.5 899.5 L 874.5 938.5 L 835.5 938.5 Z M 1055.5 899.5 L 1094.5 899.5 L 1094.5 938.5 L 1055.5 938.5 Z M 945.5 899.5 L 984.5 899.5 L 984.5 938.5 L 945.5 938.5 Z M 945.5 899.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface282">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,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 1084.410156 631.757812 L 1065.492188 631.757812 L 1060.308594 646.5 L 1053.644531 646.5 L 1071.148438 597.421875 L 1079.226562 597.421875 L 1096.460938 646.5 L 1089.460938 646.5 Z M 1082.660156 626.503906 L 1075.121094 604.15625 L 1067.042969 626.503906 Z M 1082.660156 626.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1055 477 L 1094 477 M 1055 438 L 1094 438 M 1055 438 L 1055 477 M 1094 438 L 1094 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1055 477 L 1094 477 M 1055 438 L 1094 438 M 1094 477 L 1094 438 M 1055 477 L 1055 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 799 156 L 799 165 M 794 161 L 803 161 M 798 162 L 800 162 M 798 160 L 800 160 M 798 160 L 798 162 M 800 160 L 800 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_2.svg b/cells/nand2/sky130_fd_sc_hs__nand2_2.svg
index a57cfae..4e22af2 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_2.svg
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1103.5 664.5 L 1137.5 664.5 L 1137.5 833.5 L 1103.5 833.5 Z M 784.5 664.5 L 819.5 664.5 L 819.5 833.5 L 784.5 833.5 Z M 894.5 664.5 L 929.5 664.5 L 929.5 833.5 L 894.5 833.5 Z M 993.5 664.5 L 1027.5 664.5 L 1027.5 833.5 L 993.5 833.5 Z M 993.5 664.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1099.5 240.5 L 1134.5 240.5 L 1134.5 496.5 L 1099.5 496.5 Z M 788.5 240.5 L 822.5 240.5 L 822.5 496.5 L 788.5 496.5 Z M 891.5 240.5 L 925.5 240.5 L 925.5 496.5 L 891.5 496.5 Z M 996.5 240.5 L 1031.5 240.5 L 1031.5 496.5 L 996.5 496.5 Z M 996.5 240.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1083.410156 546.757812 L 1064.492188 546.757812 L 1059.308594 561.5 L 1052.644531 561.5 L 1070.148438 512.421875 L 1078.226562 512.421875 L 1095.460938 561.5 L 1088.460938 561.5 Z M 1081.660156 541.503906 L 1074.121094 519.15625 L 1066.042969 541.503906 Z M 1081.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1054 562 L 1093 562 M 1054 523 L 1093 523 M 1054 523 L 1054 562 M 1093 523 L 1093 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1054 562 L 1093 562 M 1054 523 L 1093 523 M 1093 562 L 1093 523 M 1054 562 L 1054 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_4.svg b/cells/nand2/sky130_fd_sc_hs__nand2_4.svg
index 3228ed3..9a23697 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_4.svg
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 1316.5 664.5 L 1350.5 664.5 L 1350.5 833.5 L 1316.5 833.5 Z M 563.5 664.5 L 598.5 664.5 L 598.5 833.5 L 563.5 833.5 Z M 662.5 664.5 L 696.5 664.5 L 696.5 833.5 L 662.5 833.5 Z M 760.5 664.5 L 795.5 664.5 L 795.5 833.5 L 760.5 833.5 Z M 859.5 664.5 L 893.5 664.5 L 893.5 833.5 L 859.5 833.5 Z M 967.5 664.5 L 1001.5 664.5 L 1001.5 833.5 L 967.5 833.5 Z M 1072.5 664.5 L 1106.5 664.5 L 1106.5 833.5 L 1072.5 833.5 Z M 1187.5 664.5 L 1221.5 664.5 L 1221.5 833.5 L 1187.5 833.5 Z M 1187.5 664.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 1313.5 240.5 L 1347.5 240.5 L 1347.5 496.5 L 1313.5 496.5 Z M 567.5 240.5 L 601.5 240.5 L 601.5 496.5 L 567.5 496.5 Z M 855.5 240.5 L 890.5 240.5 L 890.5 496.5 L 855.5 496.5 Z M 970.5 240.5 L 1004.5 240.5 L 1004.5 496.5 L 970.5 496.5 Z M 970.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -163,6 +163,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 1302.410156 546.757812 L 1283.492188 546.757812 L 1278.308594 561.5 L 1271.644531 561.5 L 1289.148438 512.421875 L 1297.226562 512.421875 L 1314.460938 561.5 L 1307.460938 561.5 Z M 1300.660156 541.503906 L 1293.121094 519.15625 L 1285.042969 541.503906 Z M 1300.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 562 L 1311 562 M 1272 523 L 1311 523 M 1272 523 L 1272 562 M 1311 523 L 1311 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 562 L 1311 562 M 1272 523 L 1311 523 M 1311 562 L 1311 523 M 1272 562 L 1272 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2/sky130_fd_sc_hs__nand2_8.svg b/cells/nand2/sky130_fd_sc_hs__nand2_8.svg
index d2435c3..9d7363b 100644
--- a/cells/nand2/sky130_fd_sc_hs__nand2_8.svg
+++ b/cells/nand2/sky130_fd_sc_hs__nand2_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.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 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.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 1603.5 638.5 L 1630.5 638.5 L 1630.5 774.5 L 1603.5 774.5 Z M 284.5 638.5 L 312.5 638.5 L 312.5 774.5 L 284.5 774.5 Z M 364.5 638.5 L 391.5 638.5 L 391.5 774.5 L 364.5 774.5 Z M 443.5 638.5 L 470.5 638.5 L 470.5 774.5 L 443.5 774.5 Z M 522.5 638.5 L 549.5 638.5 L 549.5 774.5 L 522.5 774.5 Z M 601.5 638.5 L 628.5 638.5 L 628.5 774.5 L 601.5 774.5 Z M 739.5 638.5 L 766.5 638.5 L 766.5 774.5 L 739.5 774.5 Z M 825.5 638.5 L 853.5 638.5 L 853.5 774.5 L 825.5 774.5 Z M 904.5 638.5 L 932.5 638.5 L 932.5 774.5 L 904.5 774.5 Z M 983.5 638.5 L 1011.5 638.5 L 1011.5 774.5 L 983.5 774.5 Z M 1062.5 638.5 L 1090.5 638.5 L 1090.5 774.5 L 1062.5 774.5 Z M 1141.5 638.5 L 1169.5 638.5 L 1169.5 774.5 L 1141.5 774.5 Z M 1220.5 638.5 L 1248.5 638.5 L 1248.5 774.5 L 1220.5 774.5 Z M 1299.5 638.5 L 1327.5 638.5 L 1327.5 774.5 L 1299.5 774.5 Z M 1378.5 638.5 L 1406.5 638.5 L 1406.5 774.5 L 1378.5 774.5 Z M 1524.5 638.5 L 1551.5 638.5 L 1551.5 774.5 L 1524.5 774.5 Z M 1524.5 638.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 1603.5 298.5 L 1631.5 298.5 L 1631.5 504.5 L 1603.5 504.5 Z M 578.5 298.5 L 605.5 298.5 L 605.5 504.5 L 578.5 504.5 Z M 670.5 298.5 L 697.5 298.5 L 697.5 504.5 L 670.5 504.5 Z M 989.5 298.5 L 1017.5 298.5 L 1017.5 504.5 L 989.5 504.5 Z M 1072.5 298.5 L 1100.5 298.5 L 1100.5 504.5 L 1072.5 504.5 Z M 1276.5 298.5 L 1304.5 298.5 L 1304.5 504.5 L 1276.5 504.5 Z M 1368.5 298.5 L 1396.5 298.5 L 1396.5 504.5 L 1368.5 504.5 Z M 1521.5 298.5 L 1548.5 298.5 L 1548.5 504.5 L 1521.5 504.5 Z M 1521.5 298.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.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>
@@ -166,6 +166,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 1051.667969 607.855469 L 1051.667969 623.5 L 1046.582031 623.5 L 1046.582031 607.855469 L 1031.210938 583.625 L 1037.5 583.625 L 1049.207031 603.042969 L 1060.585938 583.625 L 1066.65625 583.625 Z M 1051.667969 607.855469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1032 491 L 1063 491 M 1032 460 L 1063 460 M 1032 460 L 1032 491 M 1063 460 L 1063 491 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1032 491 L 1063 491 M 1032 460 L 1063 460 M 1063 491 L 1063 460 M 1032 491 L 1032 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_1.svg b/cells/nand2b/sky130_fd_sc_hs__nand2b_1.svg
index 0b03a0c..4770cdf 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_1.svg
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.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 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.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 784.5 664.5 L 819.5 664.5 L 819.5 790.5 L 784.5 790.5 Z M 1051.5 664.5 L 1086.5 664.5 L 1086.5 833.5 L 1051.5 833.5 Z M 962.5 664.5 L 996.5 664.5 L 996.5 833.5 L 962.5 833.5 Z M 962.5 664.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 1055.5 240.5 L 1089.5 240.5 L 1089.5 496.5 L 1055.5 496.5 Z M 787.5 304.5 L 821.5 304.5 L 821.5 496.5 L 787.5 496.5 Z M 940.5 240.5 L 975.5 240.5 L 975.5 496.5 L 940.5 496.5 Z M 940.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.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>
@@ -158,6 +158,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 967.554688 288.246094 L 967.554688 307.5 L 961.292969 307.5 L 961.292969 288.246094 L 942.375 258.421875 L 950.117188 258.421875 L 964.523438 282.320312 L 978.527344 258.421875 L 986 258.421875 Z M 967.554688 288.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 944 816 L 983 816 M 944 777 L 983 777 M 944 777 L 944 816 M 983 777 L 983 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 944 816 L 983 816 M 944 777 L 983 777 M 983 816 L 983 777 M 944 816 L 944 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_2.svg b/cells/nand2b/sky130_fd_sc_hs__nand2b_2.svg
index 3297f8e..d0262f2 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_2.svg
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 1117.5 664.5 L 1151.5 664.5 L 1151.5 833.5 L 1117.5 833.5 Z M 673.5 687.5 L 708.5 687.5 L 708.5 833.5 L 673.5 833.5 Z M 1216.5 664.5 L 1251.5 664.5 L 1251.5 833.5 L 1216.5 833.5 Z M 1018.5 664.5 L 1052.5 664.5 L 1052.5 833.5 L 1018.5 833.5 Z M 920.5 664.5 L 954.5 664.5 L 954.5 833.5 L 920.5 833.5 Z M 920.5 664.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 1111.5 240.5 L 1145.5 240.5 L 1145.5 496.5 L 1111.5 496.5 Z M 675.5 267.5 L 710.5 267.5 L 710.5 496.5 L 675.5 496.5 Z M 1214.5 240.5 L 1248.5 240.5 L 1248.5 496.5 L 1214.5 496.5 Z M 1008.5 240.5 L 1042.5 240.5 L 1042.5 496.5 L 1008.5 496.5 Z M 905.5 240.5 L 939.5 240.5 L 939.5 496.5 L 905.5 496.5 Z M 905.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -153,6 +153,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 696.1875 512.574219 L 696.1875 561.652344 L 689.121094 561.652344 L 663.738281 521.863281 L 663.738281 561.652344 L 657.816406 561.652344 L 657.816406 512.574219 L 664.613281 512.574219 L 690.265625 552.699219 L 690.265625 512.574219 Z M 696.1875 512.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 612 562 L 651 562 M 612 523 L 651 523 M 612 523 L 612 562 M 651 523 L 651 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 612 562 L 651 562 M 612 523 L 651 523 M 651 562 L 651 523 M 612 562 L 612 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand2b/sky130_fd_sc_hs__nand2b_4.svg b/cells/nand2b/sky130_fd_sc_hs__nand2b_4.svg
index 568011e..6e5a35e 100644
--- a/cells/nand2b/sky130_fd_sc_hs__nand2b_4.svg
+++ b/cells/nand2b/sky130_fd_sc_hs__nand2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.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="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1489.5 664.5 L 1523.5 664.5 L 1523.5 833.5 L 1489.5 833.5 Z M 400.5 664.5 L 435.5 664.5 L 435.5 833.5 L 400.5 833.5 Z M 643.5 664.5 L 678.5 664.5 L 678.5 833.5 L 643.5 833.5 Z M 742.5 664.5 L 776.5 664.5 L 776.5 833.5 L 742.5 833.5 Z M 840.5 664.5 L 875.5 664.5 L 875.5 833.5 L 840.5 833.5 Z M 970.5 664.5 L 1004.5 664.5 L 1004.5 833.5 L 970.5 833.5 Z M 1068.5 664.5 L 1103.5 664.5 L 1103.5 833.5 L 1068.5 833.5 Z M 1183.5 664.5 L 1217.5 664.5 L 1217.5 833.5 L 1183.5 833.5 Z M 1282.5 664.5 L 1316.5 664.5 L 1316.5 833.5 L 1282.5 833.5 Z M 1282.5 664.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1368.5 240.5 L 1402.5 240.5 L 1402.5 496.5 L 1368.5 496.5 Z M 654.5 304.5 L 688.5 304.5 L 688.5 496.5 L 654.5 496.5 Z M 551.5 304.5 L 585.5 304.5 L 585.5 496.5 L 551.5 496.5 Z M 967.5 240.5 L 1001.5 240.5 L 1001.5 496.5 L 967.5 496.5 Z M 776.5 240.5 L 811.5 240.5 L 811.5 496.5 L 776.5 496.5 Z M 1475.5 240.5 L 1510.5 240.5 L 1510.5 496.5 L 1475.5 496.5 Z M 1475.5 240.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,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 1586.441406 547.496094 L 1586.304688 549.652344 L 1585.96875 551.605469 L 1585.363281 553.421875 L 1584.554688 555.039062 L 1583.480469 556.585938 L 1582.199219 557.933594 L 1580.785156 559.078125 L 1579.304688 559.953125 L 1577.621094 560.625 L 1575.871094 561.164062 L 1573.988281 561.433594 L 1571.96875 561.5 L 1549.820312 561.5 L 1549.820312 512.421875 L 1569.746094 512.421875 L 1572.640625 512.625 L 1575.199219 513.097656 L 1577.488281 513.902344 L 1579.441406 515.046875 L 1581.121094 516.53125 L 1582.46875 518.347656 L 1583.007812 519.355469 L 1583.480469 520.433594 L 1583.816406 521.445312 L 1584.085938 522.589844 L 1584.21875 523.734375 L 1584.285156 524.878906 L 1584.085938 527.300781 L 1583.480469 529.386719 L 1582.535156 531.339844 L 1581.191406 532.957031 L 1579.507812 534.4375 L 1577.488281 535.582031 L 1579.441406 536.457031 L 1581.121094 537.398438 L 1582.605469 538.476562 L 1583.816406 539.6875 L 1584.757812 540.96875 L 1585.5 542.3125 L 1585.769531 543.121094 L 1585.96875 543.929688 L 1586.171875 544.738281 L 1586.304688 545.679688 L 1586.375 546.554688 Z M 1578.027344 525.753906 L 1577.824219 523.734375 L 1577.21875 522.050781 L 1576.277344 520.570312 L 1574.929688 519.492188 L 1573.246094 518.683594 L 1571.160156 518.144531 L 1570.6875 518.144531 L 1570.214844 518.078125 L 1569.746094 518.011719 L 1568.667969 518.011719 L 1568.195312 517.941406 L 1556.078125 517.941406 L 1556.078125 533.5625 L 1568.195312 533.5625 L 1570.6875 533.425781 L 1572.84375 533.023438 L 1574.660156 532.28125 L 1576.007812 531.273438 L 1577.082031 529.925781 L 1577.757812 528.3125 L 1577.824219 527.972656 L 1577.957031 527.167969 L 1577.957031 526.222656 Z M 1571.359375 555.980469 L 1573.246094 555.914062 L 1574.929688 555.507812 L 1576.410156 554.835938 L 1577.621094 553.960938 L 1578.632812 552.816406 L 1579.441406 551.402344 L 1579.640625 550.863281 L 1579.777344 550.257812 L 1579.976562 549.585938 L 1580.046875 548.976562 L 1580.113281 548.304688 L 1580.179688 547.566406 L 1580.046875 546.082031 L 1579.777344 544.667969 L 1579.304688 543.457031 L 1578.632812 542.3125 L 1577.757812 541.371094 L 1576.746094 540.496094 L 1576.007812 540.09375 L 1575.199219 539.753906 L 1574.324219 539.484375 L 1573.378906 539.285156 L 1572.371094 539.148438 L 1571.359375 539.082031 L 1556.078125 539.082031 L 1556.078125 555.980469 Z M 1571.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1545 562 L 1584 562 M 1545 523 L 1584 523 M 1545 523 L 1545 562 M 1584 523 L 1584 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1545 562 L 1584 562 M 1545 523 L 1584 523 M 1584 562 L 1584 523 M 1545 562 L 1545 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_1.svg b/cells/nand3/sky130_fd_sc_hs__nand3_1.svg
index b52551d..015f1da 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_1.svg
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1051.5 664.5 L 1086.5 664.5 L 1086.5 833.5 L 1051.5 833.5 Z M 831.5 664.5 L 866.5 664.5 L 866.5 833.5 L 831.5 833.5 Z M 921.5 664.5 L 955.5 664.5 L 955.5 833.5 L 921.5 833.5 Z M 921.5 664.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1055.5 240.5 L 1089.5 240.5 L 1089.5 496.5 L 1055.5 496.5 Z M 821.5 240.5 L 855.5 240.5 L 855.5 496.5 L 821.5 496.5 Z M 924.5 240.5 L 958.5 240.5 L 958.5 496.5 L 924.5 496.5 Z M 924.5 240.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +166,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 1083.410156 631.757812 L 1064.492188 631.757812 L 1059.308594 646.5 L 1052.644531 646.5 L 1070.148438 597.421875 L 1078.226562 597.421875 L 1095.460938 646.5 L 1088.460938 646.5 Z M 1081.660156 626.503906 L 1074.121094 604.15625 L 1066.042969 626.503906 Z M 1081.660156 626.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1054 477 L 1093 477 M 1054 438 L 1093 438 M 1054 438 L 1054 477 M 1093 438 L 1093 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1054 477 L 1093 477 M 1054 438 L 1093 438 M 1093 477 L 1093 438 M 1054 477 L 1054 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_2.svg b/cells/nand3/sky130_fd_sc_hs__nand3_2.svg
index 7b063ff..2327256 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_2.svg
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1093.5 651.5 L 1127.5 651.5 L 1127.5 821.5 L 1093.5 821.5 Z M 1220.5 651.5 L 1254.5 651.5 L 1254.5 821.5 L 1220.5 821.5 Z M 994.5 651.5 L 1028.5 651.5 L 1028.5 821.5 L 994.5 821.5 Z M 867.5 664.5 L 901.5 664.5 L 901.5 833.5 L 867.5 833.5 Z M 670.5 664.5 L 704.5 664.5 L 704.5 833.5 L 670.5 833.5 Z M 768.5 664.5 L 803.5 664.5 L 803.5 833.5 L 768.5 833.5 Z M 768.5 664.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1214.5 240.5 L 1248.5 240.5 L 1248.5 496.5 L 1214.5 496.5 Z M 675.5 240.5 L 710.5 240.5 L 710.5 496.5 L 675.5 496.5 Z M 779.5 240.5 L 813.5 240.5 L 813.5 496.5 L 779.5 496.5 Z M 893.5 240.5 L 928.5 240.5 L 928.5 496.5 L 893.5 496.5 Z M 997.5 240.5 L 1032.5 240.5 L 1032.5 496.5 L 997.5 496.5 Z M 1111.5 240.5 L 1145.5 240.5 L 1145.5 496.5 L 1111.5 496.5 Z M 1111.5 240.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1082.410156 546.757812 L 1063.492188 546.757812 L 1058.308594 561.5 L 1051.644531 561.5 L 1069.148438 512.421875 L 1077.226562 512.421875 L 1094.460938 561.5 L 1087.460938 561.5 Z M 1080.660156 541.503906 L 1073.121094 519.15625 L 1065.042969 541.503906 Z M 1080.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3/sky130_fd_sc_hs__nand3_4.svg b/cells/nand3/sky130_fd_sc_hs__nand3_4.svg
index f2615a5..06be000 100644
--- a/cells/nand3/sky130_fd_sc_hs__nand3_4.svg
+++ b/cells/nand3/sky130_fd_sc_hs__nand3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 538.5 L 201.5 538.5 Z M 201.5 111.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 245.5 862.5 L 1675.5 862.5 L 1675.5 918.5 L 245.5 918.5 Z M 245.5 862.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 1546.5 655.5 L 1581.5 655.5 L 1581.5 824.5 L 1546.5 824.5 Z M 339.5 655.5 L 373.5 655.5 L 373.5 824.5 L 339.5 824.5 Z M 437.5 655.5 L 471.5 655.5 L 471.5 824.5 L 437.5 824.5 Z M 536.5 655.5 L 570.5 655.5 L 570.5 824.5 L 536.5 824.5 Z M 634.5 655.5 L 669.5 655.5 L 669.5 824.5 L 634.5 824.5 Z M 733.5 655.5 L 767.5 655.5 L 767.5 824.5 L 733.5 824.5 Z M 831.5 655.5 L 866.5 655.5 L 866.5 824.5 L 831.5 824.5 Z M 930.5 655.5 L 964.5 655.5 L 964.5 824.5 L 930.5 824.5 Z M 1028.5 655.5 L 1063.5 655.5 L 1063.5 824.5 L 1028.5 824.5 Z M 1251.5 655.5 L 1285.5 655.5 L 1285.5 824.5 L 1251.5 824.5 Z M 1349.5 655.5 L 1384.5 655.5 L 1384.5 824.5 L 1349.5 824.5 Z M 1448.5 655.5 L 1482.5 655.5 L 1482.5 824.5 L 1448.5 824.5 Z M 1448.5 655.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 1224.5 240.5 L 1259.5 240.5 L 1259.5 496.5 L 1224.5 496.5 Z M 343.5 240.5 L 377.5 240.5 L 377.5 496.5 L 343.5 496.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 680.5 240.5 L 714.5 240.5 L 714.5 496.5 L 680.5 496.5 Z M 783.5 240.5 L 818.5 240.5 L 818.5 496.5 L 783.5 496.5 Z M 1121.5 240.5 L 1156.5 240.5 L 1156.5 496.5 L 1121.5 496.5 Z M 1121.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 280.5 136.5 L 319.5 136.5 L 319.5 174.5 L 280.5 174.5 Z M 1600.5 136.5 L 1639.5 136.5 L 1639.5 174.5 L 1600.5 174.5 Z M 1490.5 136.5 L 1529.5 136.5 L 1529.5 174.5 L 1490.5 174.5 Z M 1380.5 136.5 L 1419.5 136.5 L 1419.5 174.5 L 1380.5 174.5 Z M 1270.5 136.5 L 1309.5 136.5 L 1309.5 174.5 L 1270.5 174.5 Z M 1160.5 136.5 L 1199.5 136.5 L 1199.5 174.5 L 1160.5 174.5 Z M 1050.5 136.5 L 1089.5 136.5 L 1089.5 174.5 L 1050.5 174.5 Z M 940.5 136.5 L 979.5 136.5 L 979.5 174.5 L 940.5 174.5 Z M 830.5 136.5 L 869.5 136.5 L 869.5 174.5 L 830.5 174.5 Z M 720.5 136.5 L 759.5 136.5 L 759.5 174.5 L 720.5 174.5 Z M 610.5 136.5 L 649.5 136.5 L 649.5 174.5 L 610.5 174.5 Z M 500.5 136.5 L 539.5 136.5 L 539.5 174.5 L 500.5 174.5 Z M 390.5 136.5 L 429.5 136.5 L 429.5 174.5 L 390.5 174.5 Z M 280.5 899.5 L 319.5 899.5 L 319.5 938.5 L 280.5 938.5 Z M 1600.5 899.5 L 1639.5 899.5 L 1639.5 938.5 L 1600.5 938.5 Z M 1490.5 899.5 L 1529.5 899.5 L 1529.5 938.5 L 1490.5 938.5 Z M 1380.5 899.5 L 1419.5 899.5 L 1419.5 938.5 L 1380.5 938.5 Z M 1270.5 899.5 L 1309.5 899.5 L 1309.5 938.5 L 1270.5 938.5 Z M 1160.5 899.5 L 1199.5 899.5 L 1199.5 938.5 L 1160.5 938.5 Z M 1050.5 899.5 L 1089.5 899.5 L 1089.5 938.5 L 1050.5 938.5 Z M 940.5 899.5 L 979.5 899.5 L 979.5 938.5 L 940.5 938.5 Z M 830.5 899.5 L 869.5 899.5 L 869.5 938.5 L 830.5 938.5 Z M 720.5 899.5 L 759.5 899.5 L 759.5 938.5 L 720.5 938.5 Z M 610.5 899.5 L 649.5 899.5 L 649.5 938.5 L 610.5 938.5 Z M 500.5 899.5 L 539.5 899.5 L 539.5 938.5 L 500.5 938.5 Z M 390.5 899.5 L 429.5 899.5 L 429.5 938.5 L 390.5 938.5 Z M 390.5 899.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>
@@ -166,6 +166,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 304.554688 542.246094 L 304.554688 561.5 L 298.292969 561.5 L 298.292969 542.246094 L 279.375 512.421875 L 287.117188 512.421875 L 301.523438 536.320312 L 315.527344 512.421875 L 323 512.421875 Z M 304.554688 542.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 280 562 L 319 562 M 280 523 L 319 523 M 280 523 L 280 562 M 319 523 L 319 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 280 562 L 319 562 M 280 523 L 319 523 M 319 562 L 319 523 M 280 562 L 280 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 245 156 L 245 165 M 240 161 L 249 161 M 244 162 L 246 162 M 244 160 L 246 160 M 244 160 L 244 162 M 246 160 L 246 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_1.svg b/cells/nand3b/sky130_fd_sc_hs__nand3b_1.svg
index 33dc3a5..a85c4a4 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_1.svg
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 729.5 659.5 L 764.5 659.5 L 764.5 785.5 L 729.5 785.5 Z M 996.5 659.5 L 1031.5 659.5 L 1031.5 829.5 L 996.5 829.5 Z M 907.5 659.5 L 941.5 659.5 L 941.5 829.5 L 907.5 829.5 Z M 1120.5 659.5 L 1154.5 659.5 L 1154.5 829.5 L 1120.5 829.5 Z M 1120.5 659.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1130.5 240.5 L 1165.5 240.5 L 1165.5 496.5 L 1130.5 496.5 Z M 767.5 304.5 L 801.5 304.5 L 801.5 496.5 L 767.5 496.5 Z M 1004.5 240.5 L 1039.5 240.5 L 1039.5 496.5 L 1004.5 496.5 Z M 901.5 240.5 L 936.5 240.5 L 936.5 496.5 L 901.5 496.5 Z M 901.5 240.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface285">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -159,6 +159,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 1039.441406 547.496094 L 1039.304688 549.652344 L 1038.96875 551.605469 L 1038.363281 553.421875 L 1037.554688 555.039062 L 1036.480469 556.585938 L 1035.199219 557.933594 L 1033.785156 559.078125 L 1032.304688 559.953125 L 1030.621094 560.625 L 1028.871094 561.164062 L 1026.988281 561.433594 L 1024.96875 561.5 L 1002.820312 561.5 L 1002.820312 512.421875 L 1022.746094 512.421875 L 1025.640625 512.625 L 1028.199219 513.097656 L 1030.488281 513.902344 L 1032.441406 515.046875 L 1034.121094 516.53125 L 1035.46875 518.347656 L 1036.007812 519.355469 L 1036.480469 520.433594 L 1036.816406 521.445312 L 1037.085938 522.589844 L 1037.21875 523.734375 L 1037.285156 524.878906 L 1037.085938 527.300781 L 1036.480469 529.386719 L 1035.535156 531.339844 L 1034.191406 532.957031 L 1032.507812 534.4375 L 1030.488281 535.582031 L 1032.441406 536.457031 L 1034.121094 537.398438 L 1035.605469 538.476562 L 1036.816406 539.6875 L 1037.757812 540.96875 L 1038.5 542.3125 L 1038.769531 543.121094 L 1038.96875 543.929688 L 1039.171875 544.738281 L 1039.304688 545.679688 L 1039.375 546.554688 Z M 1031.027344 525.753906 L 1030.824219 523.734375 L 1030.21875 522.050781 L 1029.277344 520.570312 L 1027.929688 519.492188 L 1026.246094 518.683594 L 1024.160156 518.144531 L 1023.6875 518.144531 L 1023.214844 518.078125 L 1022.746094 518.011719 L 1021.667969 518.011719 L 1021.195312 517.941406 L 1009.078125 517.941406 L 1009.078125 533.5625 L 1021.195312 533.5625 L 1023.6875 533.425781 L 1025.84375 533.023438 L 1027.660156 532.28125 L 1029.007812 531.273438 L 1030.082031 529.925781 L 1030.757812 528.3125 L 1030.824219 527.972656 L 1030.957031 527.167969 L 1030.957031 526.222656 Z M 1024.359375 555.980469 L 1026.246094 555.914062 L 1027.929688 555.507812 L 1029.410156 554.835938 L 1030.621094 553.960938 L 1031.632812 552.816406 L 1032.441406 551.402344 L 1032.640625 550.863281 L 1032.777344 550.257812 L 1032.976562 549.585938 L 1033.046875 548.976562 L 1033.113281 548.304688 L 1033.179688 547.566406 L 1033.046875 546.082031 L 1032.777344 544.667969 L 1032.304688 543.457031 L 1031.632812 542.3125 L 1030.757812 541.371094 L 1029.746094 540.496094 L 1029.007812 540.09375 L 1028.199219 539.753906 L 1027.324219 539.484375 L 1026.378906 539.285156 L 1025.371094 539.148438 L 1024.359375 539.082031 L 1009.078125 539.082031 L 1009.078125 555.980469 Z M 1024.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 999 562 L 1038 562 M 999 523 L 1038 523 M 999 523 L 999 562 M 1038 523 L 1038 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 999 562 L 1038 562 M 999 523 L 1038 523 M 1038 562 L 1038 523 M 999 562 L 999 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_2.svg b/cells/nand3b/sky130_fd_sc_hs__nand3b_2.svg
index 8fee8bb..5b23987 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_2.svg
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 1231.5 634.5 L 1266.5 634.5 L 1266.5 804.5 L 1231.5 804.5 Z M 1330.5 634.5 L 1364.5 634.5 L 1364.5 804.5 L 1330.5 804.5 Z M 1004.5 634.5 L 1039.5 634.5 L 1039.5 804.5 L 1004.5 804.5 Z M 1103.5 634.5 L 1137.5 634.5 L 1137.5 804.5 L 1103.5 804.5 Z M 560.5 664.5 L 594.5 664.5 L 594.5 810.5 L 560.5 810.5 Z M 767.5 664.5 L 801.5 664.5 L 801.5 833.5 L 767.5 833.5 Z M 669.5 664.5 L 703.5 664.5 L 703.5 833.5 L 669.5 833.5 Z M 669.5 664.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 609.5 240.5 L 643.5 240.5 L 643.5 469.5 L 609.5 469.5 Z M 1056.5 240.5 L 1090.5 240.5 L 1090.5 496.5 L 1056.5 496.5 Z M 725.5 240.5 L 759.5 240.5 L 759.5 496.5 L 725.5 496.5 Z M 838.5 240.5 L 873.5 240.5 L 873.5 496.5 L 838.5 496.5 Z M 953.5 240.5 L 987.5 240.5 L 987.5 496.5 L 953.5 496.5 Z M 1324.5 240.5 L 1358.5 240.5 L 1358.5 496.5 L 1324.5 496.5 Z M 1207.5 240.5 L 1242.5 240.5 L 1242.5 496.5 L 1207.5 496.5 Z M 1207.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -162,6 +162,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 1423.441406 547.496094 L 1423.304688 549.652344 L 1422.96875 551.605469 L 1422.363281 553.421875 L 1421.554688 555.039062 L 1420.480469 556.585938 L 1419.199219 557.933594 L 1417.785156 559.078125 L 1416.304688 559.953125 L 1414.621094 560.625 L 1412.871094 561.164062 L 1410.988281 561.433594 L 1408.96875 561.5 L 1386.820312 561.5 L 1386.820312 512.421875 L 1406.746094 512.421875 L 1409.640625 512.625 L 1412.199219 513.097656 L 1414.488281 513.902344 L 1416.441406 515.046875 L 1418.121094 516.53125 L 1419.46875 518.347656 L 1420.007812 519.355469 L 1420.480469 520.433594 L 1420.816406 521.445312 L 1421.085938 522.589844 L 1421.21875 523.734375 L 1421.285156 524.878906 L 1421.085938 527.300781 L 1420.480469 529.386719 L 1419.535156 531.339844 L 1418.191406 532.957031 L 1416.507812 534.4375 L 1414.488281 535.582031 L 1416.441406 536.457031 L 1418.121094 537.398438 L 1419.605469 538.476562 L 1420.816406 539.6875 L 1421.757812 540.96875 L 1422.5 542.3125 L 1422.769531 543.121094 L 1422.96875 543.929688 L 1423.171875 544.738281 L 1423.304688 545.679688 L 1423.375 546.554688 Z M 1415.027344 525.753906 L 1414.824219 523.734375 L 1414.21875 522.050781 L 1413.277344 520.570312 L 1411.929688 519.492188 L 1410.246094 518.683594 L 1408.160156 518.144531 L 1407.6875 518.144531 L 1407.214844 518.078125 L 1406.746094 518.011719 L 1405.667969 518.011719 L 1405.195312 517.941406 L 1393.078125 517.941406 L 1393.078125 533.5625 L 1405.195312 533.5625 L 1407.6875 533.425781 L 1409.84375 533.023438 L 1411.660156 532.28125 L 1413.007812 531.273438 L 1414.082031 529.925781 L 1414.757812 528.3125 L 1414.824219 527.972656 L 1414.957031 527.167969 L 1414.957031 526.222656 Z M 1408.359375 555.980469 L 1410.246094 555.914062 L 1411.929688 555.507812 L 1413.410156 554.835938 L 1414.621094 553.960938 L 1415.632812 552.816406 L 1416.441406 551.402344 L 1416.640625 550.863281 L 1416.777344 550.257812 L 1416.976562 549.585938 L 1417.046875 548.976562 L 1417.113281 548.304688 L 1417.179688 547.566406 L 1417.046875 546.082031 L 1416.777344 544.667969 L 1416.304688 543.457031 L 1415.632812 542.3125 L 1414.757812 541.371094 L 1413.746094 540.496094 L 1413.007812 540.09375 L 1412.199219 539.753906 L 1411.324219 539.484375 L 1410.378906 539.285156 L 1409.371094 539.148438 L 1408.359375 539.082031 L 1393.078125 539.082031 L 1393.078125 555.980469 Z M 1408.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1382 562 L 1421 562 M 1382 523 L 1421 523 M 1382 523 L 1382 562 M 1421 523 L 1421 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1382 562 L 1421 562 M 1382 523 L 1421 523 M 1421 562 L 1421 523 M 1382 562 L 1382 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand3b/sky130_fd_sc_hs__nand3b_4.svg b/cells/nand3b/sky130_fd_sc_hs__nand3b_4.svg
index afbb614..1c88d70 100644
--- a/cells/nand3b/sky130_fd_sc_hs__nand3b_4.svg
+++ b/cells/nand3b/sky130_fd_sc_hs__nand3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 537.5 L 174.5 537.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 211.5 812.5 L 1706.5 812.5 L 1706.5 860.5 L 211.5 860.5 Z M 211.5 812.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 798.5 636.5 L 827.5 636.5 L 827.5 780.5 L 798.5 780.5 Z M 701.5 636.5 L 730.5 636.5 L 730.5 780.5 L 701.5 780.5 Z M 471.5 636.5 L 500.5 636.5 L 500.5 780.5 L 471.5 780.5 Z M 353.5 636.5 L 382.5 636.5 L 382.5 780.5 L 353.5 780.5 Z M 555.5 636.5 L 584.5 636.5 L 584.5 780.5 L 555.5 780.5 Z M 1344.5 644.5 L 1373.5 644.5 L 1373.5 788.5 L 1344.5 788.5 Z M 1428.5 644.5 L 1457.5 644.5 L 1457.5 788.5 L 1428.5 788.5 Z M 1512.5 644.5 L 1541.5 644.5 L 1541.5 788.5 L 1512.5 788.5 Z M 1595.5 644.5 L 1624.5 644.5 L 1624.5 788.5 L 1595.5 788.5 Z M 1079.5 644.5 L 1109.5 644.5 L 1109.5 788.5 L 1079.5 788.5 Z M 991.5 644.5 L 1020.5 644.5 L 1020.5 788.5 L 991.5 788.5 Z M 1247.5 644.5 L 1276.5 644.5 L 1276.5 788.5 L 1247.5 788.5 Z M 1163.5 644.5 L 1192.5 644.5 L 1192.5 788.5 L 1163.5 788.5 Z M 1163.5 644.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1259.5 284.5 L 1289.5 284.5 L 1289.5 502.5 L 1259.5 502.5 Z M 458.5 338.5 L 488.5 338.5 L 488.5 502.5 L 458.5 502.5 Z M 371.5 338.5 L 400.5 338.5 L 400.5 502.5 L 371.5 502.5 Z M 1076.5 284.5 L 1106.5 284.5 L 1106.5 502.5 L 1076.5 502.5 Z M 915.5 284.5 L 944.5 284.5 L 944.5 502.5 L 915.5 502.5 Z M 795.5 284.5 L 824.5 284.5 L 824.5 502.5 L 795.5 502.5 Z M 708.5 284.5 L 737.5 284.5 L 737.5 502.5 L 708.5 502.5 Z M 1347.5 284.5 L 1376.5 284.5 L 1376.5 502.5 L 1347.5 502.5 Z M 1347.5 284.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 241.5 195.5 L 274.5 195.5 L 274.5 228.5 L 241.5 228.5 Z M 1643.5 195.5 L 1676.5 195.5 L 1676.5 228.5 L 1643.5 228.5 Z M 1550.5 195.5 L 1583.5 195.5 L 1583.5 228.5 L 1550.5 228.5 Z M 1456.5 195.5 L 1489.5 195.5 L 1489.5 228.5 L 1456.5 228.5 Z M 1363.5 195.5 L 1396.5 195.5 L 1396.5 228.5 L 1363.5 228.5 Z M 1269.5 195.5 L 1302.5 195.5 L 1302.5 228.5 L 1269.5 228.5 Z M 1176.5 195.5 L 1209.5 195.5 L 1209.5 228.5 L 1176.5 228.5 Z M 1082.5 195.5 L 1115.5 195.5 L 1115.5 228.5 L 1082.5 228.5 Z M 989.5 195.5 L 1022.5 195.5 L 1022.5 228.5 L 989.5 228.5 Z M 895.5 195.5 L 929.5 195.5 L 929.5 228.5 L 895.5 228.5 Z M 802.5 195.5 L 835.5 195.5 L 835.5 228.5 L 802.5 228.5 Z M 709.5 195.5 L 742.5 195.5 L 742.5 228.5 L 709.5 228.5 Z M 615.5 195.5 L 648.5 195.5 L 648.5 228.5 L 615.5 228.5 Z M 522.5 195.5 L 555.5 195.5 L 555.5 228.5 L 522.5 228.5 Z M 428.5 195.5 L 461.5 195.5 L 461.5 228.5 L 428.5 228.5 Z M 335.5 195.5 L 368.5 195.5 L 368.5 228.5 L 335.5 228.5 Z M 241.5 843.5 L 274.5 843.5 L 274.5 877.5 L 241.5 877.5 Z M 1643.5 843.5 L 1676.5 843.5 L 1676.5 877.5 L 1643.5 877.5 Z M 1550.5 843.5 L 1583.5 843.5 L 1583.5 877.5 L 1550.5 877.5 Z M 1456.5 843.5 L 1489.5 843.5 L 1489.5 877.5 L 1456.5 877.5 Z M 1363.5 843.5 L 1396.5 843.5 L 1396.5 877.5 L 1363.5 877.5 Z M 1269.5 843.5 L 1302.5 843.5 L 1302.5 877.5 L 1269.5 877.5 Z M 1176.5 843.5 L 1209.5 843.5 L 1209.5 877.5 L 1176.5 877.5 Z M 1082.5 843.5 L 1115.5 843.5 L 1115.5 877.5 L 1082.5 877.5 Z M 989.5 843.5 L 1022.5 843.5 L 1022.5 877.5 L 989.5 877.5 Z M 895.5 843.5 L 929.5 843.5 L 929.5 877.5 L 895.5 877.5 Z M 802.5 843.5 L 835.5 843.5 L 835.5 877.5 L 802.5 877.5 Z M 709.5 843.5 L 742.5 843.5 L 742.5 877.5 L 709.5 877.5 Z M 615.5 843.5 L 648.5 843.5 L 648.5 877.5 L 615.5 877.5 Z M 522.5 843.5 L 555.5 843.5 L 555.5 877.5 L 522.5 877.5 Z M 428.5 843.5 L 461.5 843.5 L 461.5 877.5 L 428.5 877.5 Z M 335.5 843.5 L 368.5 843.5 L 368.5 877.5 L 335.5 877.5 Z M 335.5 843.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1196.753906 541.054688 L 1196.753906 557.5 L 1191.40625 557.5 L 1191.40625 541.054688 L 1175.246094 515.578125 L 1181.859375 515.578125 L 1194.167969 535.992188 L 1206.125 515.578125 L 1212.511719 515.578125 Z M 1196.753906 541.054688 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1176 560 L 1209 560 M 1176 527 L 1209 527 M 1176 527 L 1176 560 M 1209 527 L 1209 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1176 560 L 1209 560 M 1176 527 L 1209 527 M 1209 560 L 1209 527 M 1176 560 L 1176 527 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 214 L 211 223 M 206 219 L 215 219 M 210 220 L 212 220 M 210 218 L 212 218 M 210 218 L 210 220 M 212 218 L 212 220 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_1.svg b/cells/nand4/sky130_fd_sc_hs__nand4_1.svg
index 3f6ba59..0f76db1 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_1.svg
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1157.5 664.5 L 1191.5 664.5 L 1191.5 833.5 L 1157.5 833.5 Z M 806.5 664.5 L 840.5 664.5 L 840.5 833.5 L 806.5 833.5 Z M 895.5 664.5 L 930.5 664.5 L 930.5 833.5 L 895.5 833.5 Z M 1026.5 664.5 L 1060.5 664.5 L 1060.5 833.5 L 1026.5 833.5 Z M 1026.5 664.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1160.5 240.5 L 1195.5 240.5 L 1195.5 496.5 L 1160.5 496.5 Z M 803.5 240.5 L 837.5 240.5 L 837.5 496.5 L 803.5 496.5 Z M 906.5 240.5 L 940.5 240.5 L 940.5 496.5 L 906.5 496.5 Z M 1046.5 240.5 L 1080.5 240.5 L 1080.5 496.5 L 1046.5 496.5 Z M 1046.5 240.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1248.410156 631.757812 L 1229.492188 631.757812 L 1224.308594 646.5 L 1217.644531 646.5 L 1235.148438 597.421875 L 1243.226562 597.421875 L 1260.460938 646.5 L 1253.460938 646.5 Z M 1246.660156 626.503906 L 1239.121094 604.15625 L 1231.042969 626.503906 Z M 1246.660156 626.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1219 477 L 1258 477 M 1219 438 L 1258 438 M 1219 438 L 1219 477 M 1258 438 L 1258 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1219 477 L 1258 477 M 1219 438 L 1258 438 M 1258 477 L 1258 438 M 1219 477 L 1219 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_2.svg b/cells/nand4/sky130_fd_sc_hs__nand4_2.svg
index 3409ec9..0636004 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_2.svg
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1366.5 664.5 L 1401.5 664.5 L 1401.5 833.5 L 1366.5 833.5 Z M 507.5 664.5 L 541.5 664.5 L 541.5 833.5 L 507.5 833.5 Z M 626.5 664.5 L 661.5 664.5 L 661.5 833.5 L 626.5 833.5 Z M 725.5 664.5 L 759.5 664.5 L 759.5 833.5 L 725.5 833.5 Z M 823.5 664.5 L 858.5 664.5 L 858.5 833.5 L 823.5 833.5 Z M 1066.5 664.5 L 1101.5 664.5 L 1101.5 833.5 L 1066.5 833.5 Z M 1165.5 664.5 L 1199.5 664.5 L 1199.5 833.5 L 1165.5 833.5 Z M 1263.5 664.5 L 1298.5 664.5 L 1298.5 833.5 L 1263.5 833.5 Z M 1263.5 664.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1363.5 240.5 L 1397.5 240.5 L 1397.5 496.5 L 1363.5 496.5 Z M 510.5 240.5 L 545.5 240.5 L 545.5 496.5 L 510.5 496.5 Z M 623.5 240.5 L 657.5 240.5 L 657.5 496.5 L 623.5 496.5 Z M 735.5 240.5 L 769.5 240.5 L 769.5 496.5 L 735.5 496.5 Z M 843.5 240.5 L 877.5 240.5 L 877.5 496.5 L 843.5 496.5 Z M 1028.5 240.5 L 1063.5 240.5 L 1063.5 496.5 L 1028.5 496.5 Z M 1132.5 240.5 L 1166.5 240.5 L 1166.5 496.5 L 1132.5 496.5 Z M 1260.5 240.5 L 1294.5 240.5 L 1294.5 496.5 L 1260.5 496.5 Z M 1260.5 240.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface292">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 1356.410156 546.757812 L 1337.492188 546.757812 L 1332.308594 561.5 L 1325.644531 561.5 L 1343.148438 512.421875 L 1351.226562 512.421875 L 1368.460938 561.5 L 1361.460938 561.5 Z M 1354.660156 541.503906 L 1347.121094 519.15625 L 1339.042969 541.503906 Z M 1354.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1326 562 L 1365 562 M 1326 523 L 1365 523 M 1326 523 L 1326 562 M 1365 523 L 1365 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1326 562 L 1365 562 M 1326 523 L 1365 523 M 1365 562 L 1365 523 M 1326 562 L 1326 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4/sky130_fd_sc_hs__nand4_4.svg b/cells/nand4/sky130_fd_sc_hs__nand4_4.svg
index 25f655e..574a670 100644
--- a/cells/nand4/sky130_fd_sc_hs__nand4_4.svg
+++ b/cells/nand4/sky130_fd_sc_hs__nand4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.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 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.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 1611.5 632.5 L 1637.5 632.5 L 1637.5 761.5 L 1611.5 761.5 Z M 280.5 632.5 L 306.5 632.5 L 306.5 761.5 L 280.5 761.5 Z M 367.5 632.5 L 393.5 632.5 L 393.5 761.5 L 367.5 761.5 Z M 454.5 632.5 L 480.5 632.5 L 480.5 761.5 L 454.5 761.5 Z M 576.5 632.5 L 602.5 632.5 L 602.5 761.5 L 576.5 761.5 Z M 663.5 632.5 L 689.5 632.5 L 689.5 761.5 L 663.5 761.5 Z M 738.5 632.5 L 764.5 632.5 L 764.5 761.5 L 738.5 761.5 Z M 813.5 632.5 L 839.5 632.5 L 839.5 761.5 L 813.5 761.5 Z M 887.5 632.5 L 913.5 632.5 L 913.5 761.5 L 887.5 761.5 Z M 1060.5 632.5 L 1086.5 632.5 L 1086.5 761.5 L 1060.5 761.5 Z M 1134.5 632.5 L 1160.5 632.5 L 1160.5 761.5 L 1134.5 761.5 Z M 1209.5 632.5 L 1235.5 632.5 L 1235.5 761.5 L 1209.5 761.5 Z M 1284.5 632.5 L 1310.5 632.5 L 1310.5 761.5 L 1284.5 761.5 Z M 1359.5 632.5 L 1385.5 632.5 L 1385.5 761.5 L 1359.5 761.5 Z M 1434.5 632.5 L 1460.5 632.5 L 1460.5 761.5 L 1434.5 761.5 Z M 1508.5 632.5 L 1535.5 632.5 L 1535.5 761.5 L 1508.5 761.5 Z M 1508.5 632.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 1608.5 310.5 L 1635.5 310.5 L 1635.5 505.5 L 1608.5 505.5 Z M 500.5 310.5 L 526.5 310.5 L 526.5 505.5 L 500.5 505.5 Z M 587.5 310.5 L 613.5 310.5 L 613.5 505.5 L 587.5 505.5 Z M 666.5 310.5 L 692.5 310.5 L 692.5 505.5 L 666.5 505.5 Z M 810.5 310.5 L 836.5 310.5 L 836.5 505.5 L 810.5 505.5 Z M 987.5 310.5 L 1013.5 310.5 L 1013.5 505.5 L 987.5 505.5 Z M 1132.5 310.5 L 1158.5 310.5 L 1158.5 505.5 L 1132.5 505.5 Z M 1447.5 310.5 L 1473.5 310.5 L 1473.5 505.5 L 1447.5 505.5 Z M 1447.5 310.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.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>
@@ -193,6 +193,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 1266.957031 543.996094 L 1266.855469 545.613281 L 1266.601562 547.078125 L 1266.148438 548.441406 L 1265.542969 549.652344 L 1264.734375 550.8125 L 1263.773438 551.824219 L 1262.714844 552.683594 L 1261.605469 553.339844 L 1260.339844 553.84375 L 1259.027344 554.246094 L 1257.613281 554.449219 L 1256.101562 554.5 L 1239.488281 554.5 L 1239.488281 517.691406 L 1254.433594 517.691406 L 1256.605469 517.84375 L 1258.523438 518.195312 L 1260.242188 518.804688 L 1261.703125 519.660156 L 1262.96875 520.773438 L 1263.976562 522.136719 L 1264.378906 522.894531 L 1264.734375 523.699219 L 1264.988281 524.457031 L 1265.1875 525.316406 L 1265.289062 526.175781 L 1265.339844 527.03125 L 1265.1875 528.851562 L 1264.734375 530.414062 L 1264.027344 531.878906 L 1263.015625 533.09375 L 1261.753906 534.203125 L 1260.242188 535.0625 L 1261.703125 535.71875 L 1262.96875 536.425781 L 1264.078125 537.230469 L 1264.988281 538.140625 L 1265.695312 539.101562 L 1266.25 540.109375 L 1266.449219 540.714844 L 1266.601562 541.320312 L 1266.753906 541.929688 L 1266.855469 542.632812 L 1266.90625 543.292969 Z M 1260.644531 527.6875 L 1260.492188 526.175781 L 1260.039062 524.914062 L 1259.332031 523.800781 L 1258.320312 522.992188 L 1257.058594 522.386719 L 1255.496094 521.984375 L 1255.140625 521.984375 L 1254.789062 521.933594 L 1254.433594 521.882812 L 1253.625 521.882812 L 1253.273438 521.832031 L 1244.183594 521.832031 L 1244.183594 533.546875 L 1253.273438 533.546875 L 1255.140625 533.445312 L 1256.757812 533.140625 L 1258.121094 532.585938 L 1259.128906 531.828125 L 1259.9375 530.820312 L 1260.441406 529.609375 L 1260.492188 529.355469 L 1260.542969 529.050781 L 1260.59375 528.75 L 1260.59375 528.042969 Z M 1255.644531 550.359375 L 1257.058594 550.308594 L 1258.320312 550.007812 L 1259.433594 549.5 L 1260.339844 548.84375 L 1261.097656 547.988281 L 1261.703125 546.925781 L 1261.855469 546.523438 L 1261.957031 546.066406 L 1262.109375 545.5625 L 1262.160156 545.109375 L 1262.210938 544.605469 L 1262.261719 544.046875 L 1262.160156 542.9375 L 1261.957031 541.878906 L 1261.605469 540.96875 L 1261.097656 540.109375 L 1260.441406 539.402344 L 1259.683594 538.746094 L 1259.128906 538.445312 L 1258.523438 538.191406 L 1257.867188 537.988281 L 1257.160156 537.839844 L 1256.402344 537.738281 L 1255.644531 537.6875 L 1244.183594 537.6875 L 1244.183594 550.359375 Z M 1255.644531 550.359375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1236 558 L 1266 558 M 1236 529 L 1266 529 M 1236 529 L 1236 558 M 1266 529 L 1266 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1236 558 L 1266 558 M 1236 529 L 1266 529 M 1266 558 L 1266 529 M 1236 558 L 1236 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_1.svg b/cells/nand4b/sky130_fd_sc_hs__nand4b_1.svg
index 740ffc2..35fe00f 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_1.svg
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 720.5 664.5 L 755.5 664.5 L 755.5 790.5 L 720.5 790.5 Z M 1050.5 664.5 L 1085.5 664.5 L 1085.5 833.5 L 1050.5 833.5 Z M 844.5 664.5 L 878.5 664.5 L 878.5 833.5 L 844.5 833.5 Z M 933.5 664.5 L 968.5 664.5 L 968.5 833.5 L 933.5 833.5 Z M 1174.5 664.5 L 1208.5 664.5 L 1208.5 833.5 L 1174.5 833.5 Z M 1174.5 664.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 1074.5 240.5 L 1109.5 240.5 L 1109.5 496.5 L 1074.5 496.5 Z M 706.5 304.5 L 741.5 304.5 L 741.5 496.5 L 706.5 496.5 Z M 1177.5 240.5 L 1212.5 240.5 L 1212.5 496.5 L 1177.5 496.5 Z M 944.5 240.5 L 978.5 240.5 L 978.5 496.5 L 944.5 496.5 Z M 840.5 240.5 L 875.5 240.5 L 875.5 496.5 L 840.5 496.5 Z M 840.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -156,6 +156,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 1093.441406 632.496094 L 1093.304688 634.652344 L 1092.96875 636.605469 L 1092.363281 638.421875 L 1091.554688 640.039062 L 1090.480469 641.585938 L 1089.199219 642.933594 L 1087.785156 644.078125 L 1086.304688 644.953125 L 1084.621094 645.625 L 1082.871094 646.164062 L 1080.988281 646.433594 L 1078.96875 646.5 L 1056.820312 646.5 L 1056.820312 597.421875 L 1076.746094 597.421875 L 1079.640625 597.625 L 1082.199219 598.097656 L 1084.488281 598.902344 L 1086.441406 600.046875 L 1088.121094 601.53125 L 1089.46875 603.347656 L 1090.007812 604.355469 L 1090.480469 605.433594 L 1090.816406 606.445312 L 1091.085938 607.589844 L 1091.21875 608.734375 L 1091.285156 609.878906 L 1091.085938 612.300781 L 1090.480469 614.386719 L 1089.535156 616.339844 L 1088.191406 617.957031 L 1086.507812 619.4375 L 1084.488281 620.582031 L 1086.441406 621.457031 L 1088.121094 622.398438 L 1089.605469 623.476562 L 1090.816406 624.6875 L 1091.757812 625.96875 L 1092.5 627.3125 L 1092.769531 628.121094 L 1092.96875 628.929688 L 1093.171875 629.738281 L 1093.304688 630.679688 L 1093.375 631.554688 Z M 1085.027344 610.753906 L 1084.824219 608.734375 L 1084.21875 607.050781 L 1083.277344 605.570312 L 1081.929688 604.492188 L 1080.246094 603.683594 L 1078.160156 603.144531 L 1077.6875 603.144531 L 1077.214844 603.078125 L 1076.746094 603.011719 L 1075.667969 603.011719 L 1075.195312 602.941406 L 1063.078125 602.941406 L 1063.078125 618.5625 L 1075.195312 618.5625 L 1077.6875 618.425781 L 1079.84375 618.023438 L 1081.660156 617.28125 L 1083.007812 616.273438 L 1084.082031 614.925781 L 1084.757812 613.3125 L 1084.824219 612.972656 L 1084.957031 612.167969 L 1084.957031 611.222656 Z M 1078.359375 640.980469 L 1080.246094 640.914062 L 1081.929688 640.507812 L 1083.410156 639.835938 L 1084.621094 638.960938 L 1085.632812 637.816406 L 1086.441406 636.402344 L 1086.640625 635.863281 L 1086.777344 635.257812 L 1086.976562 634.585938 L 1087.046875 633.976562 L 1087.113281 633.304688 L 1087.179688 632.566406 L 1087.046875 631.082031 L 1086.777344 629.667969 L 1086.304688 628.457031 L 1085.632812 627.3125 L 1084.757812 626.371094 L 1083.746094 625.496094 L 1083.007812 625.09375 L 1082.199219 624.753906 L 1081.324219 624.484375 L 1080.378906 624.285156 L 1079.371094 624.148438 L 1078.359375 624.082031 L 1063.078125 624.082031 L 1063.078125 640.980469 Z M 1078.359375 640.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 477 L 1091 477 M 1052 438 L 1091 438 M 1052 438 L 1052 477 M 1091 438 L 1091 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 477 L 1091 477 M 1052 438 L 1091 438 M 1091 477 L 1091 438 M 1052 477 L 1052 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_2.svg b/cells/nand4b/sky130_fd_sc_hs__nand4b_2.svg
index 079b063..86929f4 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_2.svg
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1287.5 652.5 L 1322.5 652.5 L 1322.5 822.5 L 1287.5 822.5 Z M 1386.5 652.5 L 1420.5 652.5 L 1420.5 822.5 L 1386.5 822.5 Z M 1189.5 652.5 L 1223.5 652.5 L 1223.5 822.5 L 1189.5 822.5 Z M 1489.5 652.5 L 1523.5 652.5 L 1523.5 822.5 L 1489.5 822.5 Z M 827.5 664.5 L 861.5 664.5 L 861.5 833.5 L 827.5 833.5 Z M 962.5 664.5 L 996.5 664.5 L 996.5 833.5 L 962.5 833.5 Z M 396.5 687.5 L 430.5 687.5 L 430.5 833.5 L 396.5 833.5 Z M 728.5 664.5 L 763.5 664.5 L 763.5 833.5 L 728.5 833.5 Z M 623.5 664.5 L 657.5 664.5 L 657.5 833.5 L 623.5 833.5 Z M 623.5 664.5 "/>
 </clipPath>
-<image id="image309" 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="#image309"/>
+  <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 1234.5 240.5 L 1268.5 240.5 L 1268.5 496.5 L 1234.5 496.5 Z M 487.5 267.5 L 522.5 267.5 L 522.5 496.5 L 487.5 496.5 Z M 1382.5 240.5 L 1417.5 240.5 L 1417.5 496.5 L 1382.5 496.5 Z M 1486.5 240.5 L 1520.5 240.5 L 1520.5 496.5 L 1486.5 496.5 Z M 1130.5 240.5 L 1165.5 240.5 L 1165.5 496.5 L 1130.5 496.5 Z M 1004.5 240.5 L 1039.5 240.5 L 1039.5 496.5 L 1004.5 496.5 Z M 901.5 240.5 L 936.5 240.5 L 936.5 496.5 L 901.5 496.5 Z M 714.5 240.5 L 749.5 240.5 L 749.5 496.5 L 714.5 496.5 Z M 611.5 240.5 L 646.5 240.5 L 646.5 496.5 L 611.5 496.5 Z M 611.5 240.5 "/>
 </clipPath>
-<image id="image310" 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="#image310"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <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="surface305">
+<g id="surface335">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,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 816.441406 547.496094 L 816.304688 549.652344 L 815.96875 551.605469 L 815.363281 553.421875 L 814.554688 555.039062 L 813.480469 556.585938 L 812.199219 557.933594 L 810.785156 559.078125 L 809.304688 559.953125 L 807.621094 560.625 L 805.871094 561.164062 L 803.988281 561.433594 L 801.96875 561.5 L 779.820312 561.5 L 779.820312 512.421875 L 799.746094 512.421875 L 802.640625 512.625 L 805.199219 513.097656 L 807.488281 513.902344 L 809.441406 515.046875 L 811.121094 516.53125 L 812.46875 518.347656 L 813.007812 519.355469 L 813.480469 520.433594 L 813.816406 521.445312 L 814.085938 522.589844 L 814.21875 523.734375 L 814.285156 524.878906 L 814.085938 527.300781 L 813.480469 529.386719 L 812.535156 531.339844 L 811.191406 532.957031 L 809.507812 534.4375 L 807.488281 535.582031 L 809.441406 536.457031 L 811.121094 537.398438 L 812.605469 538.476562 L 813.816406 539.6875 L 814.757812 540.96875 L 815.5 542.3125 L 815.769531 543.121094 L 815.96875 543.929688 L 816.171875 544.738281 L 816.304688 545.679688 L 816.375 546.554688 Z M 808.027344 525.753906 L 807.824219 523.734375 L 807.21875 522.050781 L 806.277344 520.570312 L 804.929688 519.492188 L 803.246094 518.683594 L 801.160156 518.144531 L 800.6875 518.144531 L 800.214844 518.078125 L 799.746094 518.011719 L 798.667969 518.011719 L 798.195312 517.941406 L 786.078125 517.941406 L 786.078125 533.5625 L 798.195312 533.5625 L 800.6875 533.425781 L 802.84375 533.023438 L 804.660156 532.28125 L 806.007812 531.273438 L 807.082031 529.925781 L 807.757812 528.3125 L 807.824219 527.972656 L 807.957031 527.167969 L 807.957031 526.222656 Z M 801.359375 555.980469 L 803.246094 555.914062 L 804.929688 555.507812 L 806.410156 554.835938 L 807.621094 553.960938 L 808.632812 552.816406 L 809.441406 551.402344 L 809.640625 550.863281 L 809.777344 550.257812 L 809.976562 549.585938 L 810.046875 548.976562 L 810.113281 548.304688 L 810.179688 547.566406 L 810.046875 546.082031 L 809.777344 544.667969 L 809.304688 543.457031 L 808.632812 542.3125 L 807.757812 541.371094 L 806.746094 540.496094 L 806.007812 540.09375 L 805.199219 539.753906 L 804.324219 539.484375 L 803.378906 539.285156 L 802.371094 539.148438 L 801.359375 539.082031 L 786.078125 539.082031 L 786.078125 555.980469 Z M 801.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 775 562 L 814 562 M 775 523 L 814 523 M 775 523 L 775 562 M 814 523 L 814 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 775 562 L 814 562 M 775 523 L 814 523 M 814 562 L 814 523 M 775 562 L 775 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4b/sky130_fd_sc_hs__nand4b_4.svg b/cells/nand4b/sky130_fd_sc_hs__nand4b_4.svg
index 6a9a81c..989d2b9 100644
--- a/cells/nand4b/sky130_fd_sc_hs__nand4b_4.svg
+++ b/cells/nand4b/sky130_fd_sc_hs__nand4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 536.5 L 175.5 536.5 Z M 175.5 229.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1618.5 627.5 L 1643.5 627.5 L 1643.5 749.5 L 1618.5 749.5 Z M 275.5 627.5 L 300.5 627.5 L 300.5 749.5 L 275.5 749.5 Z M 439.5 627.5 L 464.5 627.5 L 464.5 749.5 L 439.5 749.5 Z M 510.5 627.5 L 535.5 627.5 L 535.5 749.5 L 510.5 749.5 Z M 581.5 627.5 L 606.5 627.5 L 606.5 749.5 L 581.5 749.5 Z M 652.5 627.5 L 677.5 627.5 L 677.5 749.5 L 652.5 749.5 Z M 723.5 627.5 L 748.5 627.5 L 748.5 749.5 L 723.5 749.5 Z M 794.5 627.5 L 819.5 627.5 L 819.5 749.5 L 794.5 749.5 Z M 865.5 627.5 L 890.5 627.5 L 890.5 749.5 L 865.5 749.5 Z M 936.5 627.5 L 961.5 627.5 L 961.5 749.5 L 936.5 749.5 Z M 1099.5 627.5 L 1124.5 627.5 L 1124.5 749.5 L 1099.5 749.5 Z M 1170.5 627.5 L 1195.5 627.5 L 1195.5 749.5 L 1170.5 749.5 Z M 1241.5 627.5 L 1266.5 627.5 L 1266.5 749.5 L 1241.5 749.5 Z M 1315.5 627.5 L 1340.5 627.5 L 1340.5 749.5 L 1315.5 749.5 Z M 1386.5 627.5 L 1411.5 627.5 L 1411.5 749.5 L 1386.5 749.5 Z M 1457.5 627.5 L 1482.5 627.5 L 1482.5 749.5 L 1457.5 749.5 Z M 1528.5 627.5 L 1553.5 627.5 L 1553.5 749.5 L 1528.5 749.5 Z M 1528.5 627.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1312.5 321.5 L 1337.5 321.5 L 1337.5 506.5 L 1312.5 506.5 Z M 350.5 368.5 L 375.5 368.5 L 375.5 506.5 L 350.5 506.5 Z M 424.5 368.5 L 449.5 368.5 L 449.5 506.5 L 424.5 506.5 Z M 1608.5 321.5 L 1633.5 321.5 L 1633.5 506.5 L 1608.5 506.5 Z M 1175.5 321.5 L 1200.5 321.5 L 1200.5 506.5 L 1175.5 506.5 Z M 970.5 321.5 L 995.5 321.5 L 995.5 506.5 L 970.5 506.5 Z M 895.5 321.5 L 920.5 321.5 L 920.5 506.5 L 895.5 506.5 Z M 654.5 321.5 L 679.5 321.5 L 679.5 506.5 L 654.5 506.5 Z M 512.5 321.5 L 537.5 321.5 L 537.5 506.5 L 512.5 506.5 Z M 1530.5 321.5 L 1555.5 321.5 L 1555.5 506.5 L 1530.5 506.5 Z M 1530.5 321.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -182,6 +182,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1660.867188 553.5 L 1660.867188 517.714844 L 1674.664062 517.714844 L 1676.824219 517.863281 L 1678.835938 518.253906 L 1680.699219 518.941406 L 1682.417969 519.824219 L 1683.941406 521.050781 L 1685.363281 522.476562 L 1686.542969 524.195312 L 1687.523438 526.058594 L 1688.261719 528.171875 L 1688.800781 530.429688 L 1689.09375 532.933594 L 1689.242188 535.582031 L 1689.09375 538.378906 L 1688.75 540.984375 L 1688.160156 543.339844 L 1687.375 545.5 L 1686.347656 547.414062 L 1685.070312 549.082031 L 1683.695312 550.457031 L 1682.171875 551.535156 L 1680.503906 552.421875 L 1678.6875 553.007812 L 1676.722656 553.402344 L 1674.664062 553.5 Z M 1665.433594 549.476562 L 1673.878906 549.476562 L 1676.136719 549.328125 L 1678.148438 548.789062 L 1679.914062 547.855469 L 1681.386719 546.628906 L 1682.566406 544.957031 L 1683.546875 542.945312 L 1683.84375 541.914062 L 1684.136719 540.835938 L 1684.382812 539.65625 L 1684.53125 538.378906 L 1684.628906 537.054688 L 1684.675781 535.632812 L 1684.480469 532.441406 L 1683.988281 529.644531 L 1683.105469 527.238281 L 1681.929688 525.324219 L 1680.40625 523.753906 L 1678.539062 522.625 L 1677.851562 522.378906 L 1677.117188 522.132812 L 1676.332031 521.984375 L 1675.546875 521.839844 L 1674.710938 521.789062 L 1673.878906 521.738281 L 1665.433594 521.738281 Z M 1665.433594 549.476562 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1658 558 L 1686 558 M 1658 530 L 1686 530 M 1658 530 L 1658 558 M 1686 530 L 1686 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1658 558 L 1686 558 M 1658 530 L 1686 530 M 1686 558 L 1686 530 M 1658 558 L 1658 530 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.svg b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.svg
index 63bd85e..b184e39 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.svg
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 569.5 633.5 L 603.5 633.5 L 603.5 759.5 L 569.5 759.5 Z M 702.5 643.5 L 736.5 643.5 L 736.5 769.5 L 702.5 769.5 Z M 1151.5 664.5 L 1185.5 664.5 L 1185.5 833.5 L 1151.5 833.5 Z M 1020.5 664.5 L 1055.5 664.5 L 1055.5 833.5 L 1020.5 833.5 Z M 931.5 664.5 L 965.5 664.5 L 965.5 833.5 L 931.5 833.5 Z M 1282.5 664.5 L 1316.5 664.5 L 1316.5 833.5 L 1282.5 833.5 Z M 1282.5 664.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 565.5 270.5 L 600.5 270.5 L 600.5 462.5 L 565.5 462.5 Z M 691.5 270.5 L 726.5 270.5 L 726.5 462.5 L 691.5 462.5 Z M 1299.5 240.5 L 1333.5 240.5 L 1333.5 496.5 L 1299.5 496.5 Z M 1058.5 240.5 L 1093.5 240.5 L 1093.5 496.5 L 1058.5 496.5 Z M 923.5 240.5 L 957.5 240.5 L 957.5 496.5 L 923.5 496.5 Z M 1173.5 240.5 L 1207.5 240.5 L 1207.5 496.5 L 1173.5 496.5 Z M 1173.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -166,6 +166,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 1163.730469 621.984375 L 1163.796875 619.292969 L 1164.066406 616.667969 L 1164.539062 614.175781 L 1165.144531 611.753906 L 1165.953125 609.464844 L 1167.03125 607.242188 L 1168.714844 604.347656 L 1170.800781 601.855469 L 1173.15625 599.835938 L 1175.847656 598.222656 L 1178.8125 597.078125 L 1182.175781 596.335938 L 1182.785156 596.269531 L 1183.457031 596.203125 L 1184.0625 596.132812 L 1185.410156 596.132812 L 1186.148438 596.066406 L 1190.457031 596.402344 L 1194.226562 597.414062 L 1197.460938 599.027344 L 1200.152344 601.316406 L 1202.304688 604.210938 L 1203.988281 607.78125 L 1204.394531 609.125 L 1204.59375 609.867188 L 1204.730469 610.609375 L 1204.863281 611.347656 L 1205.066406 612.089844 L 1198.671875 612.089844 L 1197.996094 609.734375 L 1197.121094 607.714844 L 1196.046875 605.960938 L 1194.632812 604.480469 L 1193.082031 603.335938 L 1191.265625 602.460938 L 1190.390625 602.191406 L 1189.449219 601.992188 L 1188.503906 601.855469 L 1187.496094 601.722656 L 1186.484375 601.652344 L 1185.410156 601.585938 L 1183.050781 601.789062 L 1180.898438 602.261719 L 1178.878906 603 L 1177.0625 604.144531 L 1175.378906 605.558594 L 1173.964844 607.242188 L 1172.753906 609.195312 L 1171.742188 611.347656 L 1170.933594 613.703125 L 1170.394531 616.261719 L 1170.058594 619.023438 L 1169.992188 621.917969 L 1170.058594 625.082031 L 1170.464844 627.910156 L 1171.136719 630.601562 L 1172.078125 632.957031 L 1173.292969 635.179688 L 1174.773438 637.066406 L 1176.253906 638.613281 L 1177.867188 639.824219 L 1179.621094 640.769531 L 1181.570312 641.441406 L 1183.660156 641.84375 L 1185.949219 641.980469 L 1188.371094 641.84375 L 1190.59375 641.375 L 1192.613281 640.566406 L 1194.296875 639.421875 L 1195.777344 637.941406 L 1197.054688 636.121094 L 1197.59375 635.046875 L 1198.066406 633.832031 L 1198.535156 632.554688 L 1198.941406 631.140625 L 1199.277344 629.660156 L 1199.613281 628.042969 L 1206.078125 628.042969 L 1204.863281 634.035156 L 1202.84375 638.882812 L 1199.882812 642.652344 L 1196.113281 645.347656 L 1191.402344 646.894531 L 1185.878906 647.5 L 1181.976562 647.230469 L 1178.476562 646.421875 L 1175.3125 645.210938 L 1172.484375 643.394531 L 1169.992188 641.039062 L 1167.90625 638.140625 L 1166.695312 636.054688 L 1165.683594 633.765625 L 1164.875 631.34375 L 1164.269531 628.785156 L 1163.867188 626.09375 L 1163.730469 623.265625 Z M 1163.730469 621.984375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1162 477 L 1201 477 M 1162 438 L 1201 438 M 1162 438 L 1162 477 M 1201 438 L 1201 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1162 477 L 1201 477 M 1162 438 L 1201 438 M 1201 477 L 1201 438 M 1162 477 L 1162 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.svg b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.svg
index 8a2978b..a85d4e1 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.svg
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1369.5 659.5 L 1402.5 659.5 L 1402.5 823.5 L 1369.5 823.5 Z M 313.5 681.5 L 346.5 681.5 L 346.5 823.5 L 313.5 823.5 Z M 438.5 681.5 L 472.5 681.5 L 472.5 823.5 L 438.5 823.5 Z M 1574.5 659.5 L 1607.5 659.5 L 1607.5 823.5 L 1574.5 823.5 Z M 1258.5 659.5 L 1291.5 659.5 L 1291.5 823.5 L 1258.5 823.5 Z M 1027.5 659.5 L 1060.5 659.5 L 1060.5 823.5 L 1027.5 823.5 Z M 932.5 659.5 L 965.5 659.5 L 965.5 823.5 L 932.5 823.5 Z M 802.5 659.5 L 835.5 659.5 L 835.5 823.5 L 802.5 823.5 Z M 701.5 659.5 L 735.5 659.5 L 735.5 823.5 L 701.5 823.5 Z M 1464.5 659.5 L 1497.5 659.5 L 1497.5 823.5 L 1464.5 823.5 Z M 1464.5 659.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1341.5 250.5 L 1374.5 250.5 L 1374.5 498.5 L 1341.5 498.5 Z M 311.5 277.5 L 345.5 277.5 L 345.5 498.5 L 311.5 498.5 Z M 448.5 277.5 L 482.5 277.5 L 482.5 498.5 L 448.5 498.5 Z M 1571.5 250.5 L 1604.5 250.5 L 1604.5 498.5 L 1571.5 498.5 Z M 1242.5 250.5 L 1275.5 250.5 L 1275.5 498.5 L 1242.5 498.5 Z M 1025.5 250.5 L 1058.5 250.5 L 1058.5 498.5 L 1025.5 498.5 Z M 926.5 250.5 L 959.5 250.5 L 959.5 498.5 L 926.5 498.5 Z M 804.5 250.5 L 837.5 250.5 L 837.5 498.5 L 804.5 498.5 Z M 705.5 250.5 L 738.5 250.5 L 738.5 498.5 L 705.5 498.5 Z M 1463.5 250.5 L 1496.5 250.5 L 1496.5 498.5 L 1463.5 498.5 Z M 1463.5 250.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 541.953125 595.113281 L 541.953125 642.144531 L 535.175781 642.144531 L 510.855469 604.015625 L 510.855469 642.144531 L 505.175781 642.144531 L 505.175781 595.113281 L 511.695312 595.113281 L 536.273438 633.566406 L 536.273438 595.113281 Z M 541.953125 595.113281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 463 480 L 500 480 M 463 442 L 500 442 M 463 442 L 463 480 M 500 442 L 500 480 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 463 480 L 500 480 M 463 442 L 500 442 M 500 480 L 500 442 M 463 480 L 463 442 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.svg b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.svg
index 45d74cf..0a43984 100644
--- a/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.svg
+++ b/cells/nand4bb/sky130_fd_sc_hs__nand4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.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 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.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 266.5 588.5 L 289.5 588.5 L 289.5 699.5 L 266.5 699.5 Z M 355.5 588.5 L 377.5 588.5 L 377.5 699.5 L 355.5 699.5 Z M 1555.5 618.5 L 1577.5 618.5 L 1577.5 729.5 L 1555.5 729.5 Z M 1490.5 618.5 L 1513.5 618.5 L 1513.5 729.5 L 1490.5 729.5 Z M 1426.5 618.5 L 1448.5 618.5 L 1448.5 729.5 L 1426.5 729.5 Z M 1361.5 618.5 L 1384.5 618.5 L 1384.5 729.5 L 1361.5 729.5 Z M 1297.5 618.5 L 1319.5 618.5 L 1319.5 729.5 L 1297.5 729.5 Z M 1232.5 618.5 L 1255.5 618.5 L 1255.5 729.5 L 1232.5 729.5 Z M 1168.5 618.5 L 1190.5 618.5 L 1190.5 729.5 L 1168.5 729.5 Z M 1019.5 618.5 L 1042.5 618.5 L 1042.5 729.5 L 1019.5 729.5 Z M 931.5 618.5 L 953.5 618.5 L 953.5 729.5 L 931.5 729.5 Z M 866.5 618.5 L 889.5 618.5 L 889.5 729.5 L 866.5 729.5 Z M 802.5 618.5 L 824.5 618.5 L 824.5 729.5 L 802.5 729.5 Z M 737.5 618.5 L 760.5 618.5 L 760.5 729.5 L 737.5 729.5 Z M 673.5 618.5 L 695.5 618.5 L 695.5 729.5 L 673.5 729.5 Z M 607.5 618.5 L 629.5 618.5 L 629.5 729.5 L 607.5 729.5 Z M 526.5 618.5 L 549.5 618.5 L 549.5 729.5 L 526.5 729.5 Z M 1630.5 618.5 L 1652.5 618.5 L 1652.5 729.5 L 1630.5 729.5 Z M 1630.5 618.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 470.5 341.5 L 493.5 341.5 L 493.5 467.5 L 470.5 467.5 Z M 403.5 341.5 L 425.5 341.5 L 425.5 467.5 L 403.5 467.5 Z M 335.5 341.5 L 358.5 341.5 L 358.5 467.5 L 335.5 467.5 Z M 268.5 341.5 L 290.5 341.5 L 290.5 467.5 L 268.5 467.5 Z M 1133.5 341.5 L 1156.5 341.5 L 1156.5 509.5 L 1133.5 509.5 Z M 578.5 341.5 L 601.5 341.5 L 601.5 509.5 L 578.5 509.5 Z M 653.5 341.5 L 676.5 341.5 L 676.5 509.5 L 653.5 509.5 Z M 721.5 341.5 L 743.5 341.5 L 743.5 509.5 L 721.5 509.5 Z M 788.5 341.5 L 811.5 341.5 L 811.5 509.5 L 788.5 509.5 Z M 856.5 341.5 L 878.5 341.5 L 878.5 509.5 L 856.5 509.5 Z M 923.5 341.5 L 946.5 341.5 L 946.5 509.5 L 923.5 509.5 Z M 1351.5 341.5 L 1373.5 341.5 L 1373.5 509.5 L 1351.5 509.5 Z M 1628.5 341.5 L 1651.5 341.5 L 1651.5 509.5 L 1628.5 509.5 Z M 1426.5 341.5 L 1448.5 341.5 L 1448.5 509.5 L 1426.5 509.5 Z M 1201.5 341.5 L 1223.5 341.5 L 1223.5 509.5 L 1201.5 509.5 Z M 1283.5 341.5 L 1306.5 341.5 L 1306.5 509.5 L 1283.5 509.5 Z M 1561.5 341.5 L 1583.5 341.5 L 1583.5 509.5 L 1561.5 509.5 Z M 998.5 341.5 L 1021.5 341.5 L 1021.5 509.5 L 998.5 509.5 Z M 1493.5 341.5 L 1516.5 341.5 L 1516.5 509.5 L 1493.5 509.5 Z M 1066.5 341.5 L 1088.5 341.5 L 1088.5 509.5 L 1066.5 509.5 Z M 1066.5 341.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.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>
@@ -170,6 +170,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 602.324219 372.066406 L 602.324219 384.5 L 598.28125 384.5 L 598.28125 372.066406 L 586.066406 352.804688 L 591.066406 352.804688 L 600.371094 368.238281 L 609.414062 352.804688 L 614.238281 352.804688 Z M 602.324219 372.066406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 586 723 L 612 723 M 586 698 L 612 698 M 586 698 L 586 723 M 612 698 L 612 723 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 586 723 L 612 723 M 586 698 L 612 698 M 612 723 L 612 698 M 586 723 L 586 698 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_1.svg b/cells/nor2/sky130_fd_sc_hs__nor2_1.svg
index 577cea3..ef45893 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_1.svg
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 538.5 L 756.5 538.5 Z M 756.5 111.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 799.5 862.5 L 1129.5 862.5 L 1129.5 918.5 L 799.5 918.5 Z M 799.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 999.5 664.5 L 1033.5 664.5 L 1033.5 833.5 L 999.5 833.5 Z M 900.5 664.5 L 934.5 664.5 L 934.5 833.5 L 900.5 833.5 Z M 900.5 664.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 994.5 240.5 L 1028.5 240.5 L 1028.5 496.5 L 994.5 496.5 Z M 898.5 240.5 L 932.5 240.5 L 932.5 496.5 L 898.5 496.5 Z M 898.5 240.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 835.5 136.5 L 874.5 136.5 L 874.5 174.5 L 835.5 174.5 Z M 1055.5 136.5 L 1094.5 136.5 L 1094.5 174.5 L 1055.5 174.5 Z M 945.5 136.5 L 984.5 136.5 L 984.5 174.5 L 945.5 174.5 Z M 835.5 899.5 L 874.5 899.5 L 874.5 938.5 L 835.5 938.5 Z M 1055.5 899.5 L 1094.5 899.5 L 1094.5 938.5 L 1055.5 938.5 Z M 945.5 899.5 L 984.5 899.5 L 984.5 938.5 L 945.5 938.5 Z M 945.5 899.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface274">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,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 864.410156 546.757812 L 845.492188 546.757812 L 840.308594 561.5 L 833.644531 561.5 L 851.148438 512.421875 L 859.226562 512.421875 L 876.460938 561.5 L 869.460938 561.5 Z M 862.660156 541.503906 L 855.121094 519.15625 L 847.042969 541.503906 Z M 862.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 835 562 L 874 562 M 835 523 L 874 523 M 835 523 L 835 562 M 874 523 L 874 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 835 562 L 874 562 M 835 523 L 874 523 M 874 562 L 874 523 M 835 562 L 835 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 799 156 L 799 165 M 794 161 L 803 161 M 798 162 L 800 162 M 798 160 L 800 160 M 798 160 L 798 162 M 800 160 L 800 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_2.svg b/cells/nor2/sky130_fd_sc_hs__nor2_2.svg
index e4c0594..045873d 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_2.svg
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 899.5 664.5 L 933.5 664.5 L 933.5 833.5 L 899.5 833.5 Z M 800.5 664.5 L 835.5 664.5 L 835.5 833.5 L 800.5 833.5 Z M 800.5 664.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1105.5 240.5 L 1140.5 240.5 L 1140.5 496.5 L 1105.5 496.5 Z M 796.5 240.5 L 830.5 240.5 L 830.5 496.5 L 796.5 496.5 Z M 899.5 240.5 L 933.5 240.5 L 933.5 496.5 L 899.5 496.5 Z M 1002.5 240.5 L 1036.5 240.5 L 1036.5 496.5 L 1002.5 496.5 Z M 1002.5 240.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,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 1193.410156 631.757812 L 1174.492188 631.757812 L 1169.308594 646.5 L 1162.644531 646.5 L 1180.148438 597.421875 L 1188.226562 597.421875 L 1205.460938 646.5 L 1198.460938 646.5 Z M 1191.660156 626.503906 L 1184.121094 604.15625 L 1176.042969 626.503906 Z M 1191.660156 626.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1164 477 L 1203 477 M 1164 438 L 1203 438 M 1164 438 L 1164 477 M 1203 438 L 1203 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1164 477 L 1203 477 M 1164 438 L 1203 438 M 1203 477 L 1203 438 M 1164 477 L 1164 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_4.svg b/cells/nor2/sky130_fd_sc_hs__nor2_4.svg
index 073756e..bc08994 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_4.svg
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1078.5 664.5 L 1112.5 664.5 L 1112.5 833.5 L 1078.5 833.5 Z M 569.5 664.5 L 603.5 664.5 L 603.5 833.5 L 569.5 833.5 Z M 865.5 664.5 L 899.5 664.5 L 899.5 833.5 L 865.5 833.5 Z M 975.5 664.5 L 1009.5 664.5 L 1009.5 833.5 L 975.5 833.5 Z M 975.5 664.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1310.5 240.5 L 1345.5 240.5 L 1345.5 496.5 L 1310.5 496.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 669.5 240.5 L 703.5 240.5 L 703.5 496.5 L 669.5 496.5 Z M 772.5 240.5 L 806.5 240.5 L 806.5 496.5 L 772.5 496.5 Z M 875.5 240.5 L 909.5 240.5 L 909.5 496.5 L 875.5 496.5 Z M 978.5 240.5 L 1012.5 240.5 L 1012.5 496.5 L 978.5 496.5 Z M 1081.5 240.5 L 1115.5 240.5 L 1115.5 496.5 L 1081.5 496.5 Z M 1196.5 240.5 L 1230.5 240.5 L 1230.5 496.5 L 1196.5 496.5 Z M 1196.5 240.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 1423.441406 632.496094 L 1423.304688 634.652344 L 1422.96875 636.605469 L 1422.363281 638.421875 L 1421.554688 640.039062 L 1420.480469 641.585938 L 1419.199219 642.933594 L 1417.785156 644.078125 L 1416.304688 644.953125 L 1414.621094 645.625 L 1412.871094 646.164062 L 1410.988281 646.433594 L 1408.96875 646.5 L 1386.820312 646.5 L 1386.820312 597.421875 L 1406.746094 597.421875 L 1409.640625 597.625 L 1412.199219 598.097656 L 1414.488281 598.902344 L 1416.441406 600.046875 L 1418.121094 601.53125 L 1419.46875 603.347656 L 1420.007812 604.355469 L 1420.480469 605.433594 L 1420.816406 606.445312 L 1421.085938 607.589844 L 1421.21875 608.734375 L 1421.285156 609.878906 L 1421.085938 612.300781 L 1420.480469 614.386719 L 1419.535156 616.339844 L 1418.191406 617.957031 L 1416.507812 619.4375 L 1414.488281 620.582031 L 1416.441406 621.457031 L 1418.121094 622.398438 L 1419.605469 623.476562 L 1420.816406 624.6875 L 1421.757812 625.96875 L 1422.5 627.3125 L 1422.769531 628.121094 L 1422.96875 628.929688 L 1423.171875 629.738281 L 1423.304688 630.679688 L 1423.375 631.554688 Z M 1415.027344 610.753906 L 1414.824219 608.734375 L 1414.21875 607.050781 L 1413.277344 605.570312 L 1411.929688 604.492188 L 1410.246094 603.683594 L 1408.160156 603.144531 L 1407.6875 603.144531 L 1407.214844 603.078125 L 1406.746094 603.011719 L 1405.667969 603.011719 L 1405.195312 602.941406 L 1393.078125 602.941406 L 1393.078125 618.5625 L 1405.195312 618.5625 L 1407.6875 618.425781 L 1409.84375 618.023438 L 1411.660156 617.28125 L 1413.007812 616.273438 L 1414.082031 614.925781 L 1414.757812 613.3125 L 1414.824219 612.972656 L 1414.957031 612.167969 L 1414.957031 611.222656 Z M 1408.359375 640.980469 L 1410.246094 640.914062 L 1411.929688 640.507812 L 1413.410156 639.835938 L 1414.621094 638.960938 L 1415.632812 637.816406 L 1416.441406 636.402344 L 1416.640625 635.863281 L 1416.777344 635.257812 L 1416.976562 634.585938 L 1417.046875 633.976562 L 1417.113281 633.304688 L 1417.179688 632.566406 L 1417.046875 631.082031 L 1416.777344 629.667969 L 1416.304688 628.457031 L 1415.632812 627.3125 L 1414.757812 626.371094 L 1413.746094 625.496094 L 1413.007812 625.09375 L 1412.199219 624.753906 L 1411.324219 624.484375 L 1410.378906 624.285156 L 1409.371094 624.148438 L 1408.359375 624.082031 L 1393.078125 624.082031 L 1393.078125 640.980469 Z M 1408.359375 640.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1382 477 L 1421 477 M 1382 438 L 1421 438 M 1382 438 L 1382 477 M 1421 438 L 1421 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1382 477 L 1421 477 M 1382 438 L 1421 438 M 1421 477 L 1421 438 M 1382 477 L 1382 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2/sky130_fd_sc_hs__nor2_8.svg b/cells/nor2/sky130_fd_sc_hs__nor2_8.svg
index 58ef7b9..45a129f 100644
--- a/cells/nor2/sky130_fd_sc_hs__nor2_8.svg
+++ b/cells/nor2/sky130_fd_sc_hs__nor2_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1358.5 638.5 L 1386.5 638.5 L 1386.5 774.5 L 1358.5 774.5 Z M 528.5 638.5 L 556.5 638.5 L 556.5 774.5 L 528.5 774.5 Z M 620.5 638.5 L 648.5 638.5 L 648.5 774.5 L 620.5 774.5 Z M 785.5 638.5 L 813.5 638.5 L 813.5 774.5 L 785.5 774.5 Z M 877.5 638.5 L 905.5 638.5 L 905.5 774.5 L 877.5 774.5 Z M 969.5 638.5 L 997.5 638.5 L 997.5 774.5 L 969.5 774.5 Z M 1174.5 638.5 L 1202.5 638.5 L 1202.5 774.5 L 1174.5 774.5 Z M 1279.5 638.5 L 1307.5 638.5 L 1307.5 774.5 L 1279.5 774.5 Z M 1279.5 638.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1593.5 298.5 L 1621.5 298.5 L 1621.5 504.5 L 1593.5 504.5 Z M 288.5 298.5 L 316.5 298.5 L 316.5 504.5 L 288.5 504.5 Z M 380.5 298.5 L 408.5 298.5 L 408.5 504.5 L 380.5 504.5 Z M 463.5 298.5 L 490.5 298.5 L 490.5 504.5 L 463.5 504.5 Z M 546.5 298.5 L 573.5 298.5 L 573.5 504.5 L 546.5 504.5 Z M 628.5 298.5 L 656.5 298.5 L 656.5 504.5 L 628.5 504.5 Z M 720.5 298.5 L 748.5 298.5 L 748.5 504.5 L 720.5 504.5 Z M 803.5 298.5 L 830.5 298.5 L 830.5 504.5 L 803.5 504.5 Z M 904.5 298.5 L 932.5 298.5 L 932.5 504.5 L 904.5 504.5 Z M 987.5 298.5 L 1014.5 298.5 L 1014.5 504.5 L 987.5 504.5 Z M 1079.5 298.5 L 1106.5 298.5 L 1106.5 504.5 L 1079.5 504.5 Z M 1171.5 298.5 L 1198.5 298.5 L 1198.5 504.5 L 1171.5 504.5 Z M 1253.5 298.5 L 1281.5 298.5 L 1281.5 504.5 L 1253.5 504.5 Z M 1336.5 298.5 L 1364.5 298.5 L 1364.5 504.5 L 1336.5 504.5 Z M 1419.5 298.5 L 1446.5 298.5 L 1446.5 504.5 L 1419.5 504.5 Z M 1511.5 298.5 L 1538.5 298.5 L 1538.5 504.5 L 1511.5 504.5 Z M 1511.5 298.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 1051.667969 539.855469 L 1051.667969 555.5 L 1046.582031 555.5 L 1046.582031 539.855469 L 1031.210938 515.625 L 1037.5 515.625 L 1049.207031 535.042969 L 1060.585938 515.625 L 1066.65625 515.625 Z M 1051.667969 539.855469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1032 559 L 1063 559 M 1032 528 L 1063 528 M 1032 528 L 1032 559 M 1063 528 L 1063 559 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1032 559 L 1063 559 M 1032 528 L 1063 528 M 1063 559 L 1063 528 M 1032 559 L 1032 528 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_1.svg b/cells/nor2b/sky130_fd_sc_hs__nor2b_1.svg
index 32da0c0..ddd024f 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_1.svg
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.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 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.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 836.5 664.5 L 870.5 664.5 L 870.5 790.5 L 836.5 790.5 Z M 1091.5 664.5 L 1126.5 664.5 L 1126.5 833.5 L 1091.5 833.5 Z M 976.5 664.5 L 1010.5 664.5 L 1010.5 833.5 L 976.5 833.5 Z M 976.5 664.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 1068.5 240.5 L 1103.5 240.5 L 1103.5 496.5 L 1068.5 496.5 Z M 832.5 304.5 L 867.5 304.5 L 867.5 496.5 L 832.5 496.5 Z M 972.5 240.5 L 1007.5 240.5 L 1007.5 496.5 L 972.5 496.5 Z M 972.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.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>
@@ -156,6 +156,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 973.410156 631.757812 L 954.492188 631.757812 L 949.308594 646.5 L 942.644531 646.5 L 960.148438 597.421875 L 968.226562 597.421875 L 985.460938 646.5 L 978.460938 646.5 Z M 971.660156 626.503906 L 964.121094 604.15625 L 956.042969 626.503906 Z M 971.660156 626.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 944 477 L 983 477 M 944 438 L 983 438 M 944 438 L 944 477 M 983 438 L 983 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 944 477 L 983 477 M 944 438 L 983 438 M 983 477 L 983 438 M 944 477 L 944 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_2.svg b/cells/nor2b/sky130_fd_sc_hs__nor2b_2.svg
index 144ba09..64d01e3 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_2.svg
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 750.5 664.5 L 784.5 664.5 L 784.5 810.5 L 750.5 810.5 Z M 1102.5 664.5 L 1136.5 664.5 L 1136.5 833.5 L 1102.5 833.5 Z M 889.5 664.5 L 923.5 664.5 L 923.5 833.5 L 889.5 833.5 Z M 999.5 664.5 L 1033.5 664.5 L 1033.5 833.5 L 999.5 833.5 Z M 1212.5 664.5 L 1246.5 664.5 L 1246.5 833.5 L 1212.5 833.5 Z M 1212.5 664.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 674.5 240.5 L 709.5 240.5 L 709.5 469.5 L 674.5 469.5 Z M 1112.5 240.5 L 1146.5 240.5 L 1146.5 496.5 L 1112.5 496.5 Z M 906.5 240.5 L 940.5 240.5 L 940.5 496.5 L 906.5 496.5 Z M 1009.5 240.5 L 1043.5 240.5 L 1043.5 496.5 L 1009.5 496.5 Z M 1215.5 240.5 L 1250.5 240.5 L 1250.5 496.5 L 1215.5 496.5 Z M 1215.5 240.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -153,6 +153,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 1296.554688 627.246094 L 1296.554688 646.5 L 1290.292969 646.5 L 1290.292969 627.246094 L 1271.375 597.421875 L 1279.117188 597.421875 L 1293.523438 621.320312 L 1307.527344 597.421875 L 1315 597.421875 Z M 1296.554688 627.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 477 L 1311 477 M 1272 438 L 1311 438 M 1272 438 L 1272 477 M 1311 438 L 1311 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 477 L 1311 477 M 1272 438 L 1311 438 M 1311 477 L 1311 438 M 1272 477 L 1272 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor2b/sky130_fd_sc_hs__nor2b_4.svg b/cells/nor2b/sky130_fd_sc_hs__nor2b_4.svg
index c337c28..331c3b2 100644
--- a/cells/nor2b/sky130_fd_sc_hs__nor2b_4.svg
+++ b/cells/nor2b/sky130_fd_sc_hs__nor2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1340.5 664.5 L 1374.5 664.5 L 1374.5 833.5 L 1340.5 833.5 Z M 799.5 664.5 L 834.5 664.5 L 834.5 833.5 L 799.5 833.5 Z M 898.5 664.5 L 932.5 664.5 L 932.5 833.5 L 898.5 833.5 Z M 1143.5 664.5 L 1177.5 664.5 L 1177.5 833.5 L 1143.5 833.5 Z M 1242.5 664.5 L 1276.5 664.5 L 1276.5 833.5 L 1242.5 833.5 Z M 1242.5 664.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1322.5 264.5 L 1356.5 264.5 L 1356.5 456.5 L 1322.5 456.5 Z M 1425.5 264.5 L 1459.5 264.5 L 1459.5 456.5 L 1425.5 456.5 Z M 764.5 240.5 L 798.5 240.5 L 798.5 496.5 L 764.5 496.5 Z M 1188.5 240.5 L 1222.5 240.5 L 1222.5 496.5 L 1188.5 496.5 Z M 1073.5 240.5 L 1107.5 240.5 L 1107.5 496.5 L 1073.5 496.5 Z M 970.5 240.5 L 1004.5 240.5 L 1004.5 496.5 L 970.5 496.5 Z M 454.5 240.5 L 489.5 240.5 L 489.5 496.5 L 454.5 496.5 Z M 557.5 240.5 L 592.5 240.5 L 592.5 496.5 L 557.5 496.5 Z M 661.5 240.5 L 695.5 240.5 L 695.5 496.5 L 661.5 496.5 Z M 867.5 240.5 L 901.5 240.5 L 901.5 496.5 L 867.5 496.5 Z M 867.5 240.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface324">
 <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 415.554688 627.246094 L 415.554688 646.5 L 409.292969 646.5 L 409.292969 627.246094 L 390.375 597.421875 L 398.117188 597.421875 L 412.523438 621.320312 L 426.527344 597.421875 L 434 597.421875 Z M 415.554688 627.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 391 477 L 430 477 M 391 438 L 430 438 M 391 438 L 391 477 M 430 438 L 430 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 391 477 L 430 477 M 391 438 L 430 438 M 430 477 L 430 438 M 391 477 L 391 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_1.svg b/cells/nor3/sky130_fd_sc_hs__nor3_1.svg
index d3232c7..cad8073 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_1.svg
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 538.5 L 701.5 538.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image285" 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="#image285"/>
+  <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 744.5 862.5 L 1184.5 862.5 L 1184.5 918.5 L 744.5 918.5 Z M 744.5 862.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="#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 1054.5 664.5 L 1088.5 664.5 L 1088.5 833.5 L 1054.5 833.5 Z M 840.5 664.5 L 875.5 664.5 L 875.5 833.5 L 840.5 833.5 Z M 939.5 664.5 L 973.5 664.5 L 973.5 833.5 L 939.5 833.5 Z M 939.5 664.5 "/>
 </clipPath>
-<image id="image286" 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="#image286"/>
+  <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 1054.5 240.5 L 1088.5 240.5 L 1088.5 496.5 L 1054.5 496.5 Z M 840.5 240.5 L 875.5 240.5 L 875.5 496.5 L 840.5 496.5 Z M 937.5 240.5 L 971.5 240.5 L 971.5 496.5 L 937.5 496.5 Z M 937.5 240.5 "/>
 </clipPath>
-<image id="image287" 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="#image287"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 780.5 136.5 L 819.5 136.5 L 819.5 174.5 L 780.5 174.5 Z M 1110.5 136.5 L 1149.5 136.5 L 1149.5 174.5 L 1110.5 174.5 Z M 1000.5 136.5 L 1039.5 136.5 L 1039.5 174.5 L 1000.5 174.5 Z M 890.5 136.5 L 929.5 136.5 L 929.5 174.5 L 890.5 174.5 Z M 780.5 899.5 L 819.5 899.5 L 819.5 938.5 L 780.5 938.5 Z M 1110.5 899.5 L 1149.5 899.5 L 1149.5 938.5 L 1110.5 938.5 Z M 1000.5 899.5 L 1039.5 899.5 L 1039.5 938.5 L 1000.5 938.5 Z M 890.5 899.5 L 929.5 899.5 L 929.5 938.5 L 890.5 938.5 Z M 890.5 899.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface282">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,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 809.410156 546.757812 L 790.492188 546.757812 L 785.308594 561.5 L 778.644531 561.5 L 796.148438 512.421875 L 804.226562 512.421875 L 821.460938 561.5 L 814.460938 561.5 Z M 807.660156 541.503906 L 800.121094 519.15625 L 792.042969 541.503906 Z M 807.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 780 562 L 819 562 M 780 523 L 819 523 M 780 523 L 780 562 M 819 523 L 819 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 780 562 L 819 562 M 780 523 L 819 523 M 819 562 L 819 523 M 780 562 L 780 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 744 156 L 744 165 M 739 161 L 748 161 M 743 162 L 745 162 M 743 160 L 745 160 M 743 160 L 743 162 M 745 160 L 745 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_2.svg b/cells/nor3/sky130_fd_sc_hs__nor3_2.svg
index 64b0fd4..7c30037 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_2.svg
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1025.5 664.5 L 1059.5 664.5 L 1059.5 833.5 L 1025.5 833.5 Z M 673.5 664.5 L 708.5 664.5 L 708.5 833.5 L 673.5 833.5 Z M 910.5 664.5 L 945.5 664.5 L 945.5 833.5 L 910.5 833.5 Z M 910.5 664.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1214.5 240.5 L 1248.5 240.5 L 1248.5 496.5 L 1214.5 496.5 Z M 675.5 240.5 L 710.5 240.5 L 710.5 496.5 L 675.5 496.5 Z M 790.5 240.5 L 824.5 240.5 L 824.5 496.5 L 790.5 496.5 Z M 893.5 240.5 L 928.5 240.5 L 928.5 496.5 L 893.5 496.5 Z M 1003.5 240.5 L 1038.5 240.5 L 1038.5 496.5 L 1003.5 496.5 Z M 1111.5 240.5 L 1145.5 240.5 L 1145.5 496.5 L 1111.5 496.5 Z M 1111.5 240.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,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 723.730469 621.984375 L 723.796875 619.292969 L 724.066406 616.667969 L 724.539062 614.175781 L 725.144531 611.753906 L 725.953125 609.464844 L 727.03125 607.242188 L 728.714844 604.347656 L 730.800781 601.855469 L 733.15625 599.835938 L 735.847656 598.222656 L 738.8125 597.078125 L 742.175781 596.335938 L 742.785156 596.269531 L 743.457031 596.203125 L 744.0625 596.132812 L 745.410156 596.132812 L 746.148438 596.066406 L 750.457031 596.402344 L 754.226562 597.414062 L 757.460938 599.027344 L 760.152344 601.316406 L 762.304688 604.210938 L 763.988281 607.78125 L 764.394531 609.125 L 764.59375 609.867188 L 764.730469 610.609375 L 764.863281 611.347656 L 765.066406 612.089844 L 758.671875 612.089844 L 757.996094 609.734375 L 757.121094 607.714844 L 756.046875 605.960938 L 754.632812 604.480469 L 753.082031 603.335938 L 751.265625 602.460938 L 750.390625 602.191406 L 749.449219 601.992188 L 748.503906 601.855469 L 747.496094 601.722656 L 746.484375 601.652344 L 745.410156 601.585938 L 743.050781 601.789062 L 740.898438 602.261719 L 738.878906 603 L 737.0625 604.144531 L 735.378906 605.558594 L 733.964844 607.242188 L 732.753906 609.195312 L 731.742188 611.347656 L 730.933594 613.703125 L 730.394531 616.261719 L 730.058594 619.023438 L 729.992188 621.917969 L 730.058594 625.082031 L 730.464844 627.910156 L 731.136719 630.601562 L 732.078125 632.957031 L 733.292969 635.179688 L 734.773438 637.066406 L 736.253906 638.613281 L 737.867188 639.824219 L 739.621094 640.769531 L 741.570312 641.441406 L 743.660156 641.84375 L 745.949219 641.980469 L 748.371094 641.84375 L 750.59375 641.375 L 752.613281 640.566406 L 754.296875 639.421875 L 755.777344 637.941406 L 757.054688 636.121094 L 757.59375 635.046875 L 758.066406 633.832031 L 758.535156 632.554688 L 758.941406 631.140625 L 759.277344 629.660156 L 759.613281 628.042969 L 766.078125 628.042969 L 764.863281 634.035156 L 762.84375 638.882812 L 759.882812 642.652344 L 756.113281 645.347656 L 751.402344 646.894531 L 745.878906 647.5 L 741.976562 647.230469 L 738.476562 646.421875 L 735.3125 645.210938 L 732.484375 643.394531 L 729.992188 641.039062 L 727.90625 638.140625 L 726.695312 636.054688 L 725.683594 633.765625 L 724.875 631.34375 L 724.269531 628.785156 L 723.867188 626.09375 L 723.730469 623.265625 Z M 723.730469 621.984375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 722 477 L 761 477 M 722 438 L 761 438 M 722 438 L 722 477 M 761 438 L 761 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 722 477 L 761 477 M 722 438 L 761 438 M 761 477 L 761 438 M 722 477 L 722 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3/sky130_fd_sc_hs__nor3_4.svg b/cells/nor3/sky130_fd_sc_hs__nor3_4.svg
index 1d8f93f..05efa09 100644
--- a/cells/nor3/sky130_fd_sc_hs__nor3_4.svg
+++ b/cells/nor3/sky130_fd_sc_hs__nor3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 538.5 L 174.5 538.5 Z M 610.5 538.5 L 1063.5 538.5 L 1063.5 553.5 L 610.5 553.5 Z M 610.5 538.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <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 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#image295"/>
+  <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 846.5 659.5 L 879.5 659.5 L 879.5 823.5 L 846.5 823.5 Z M 309.5 659.5 L 342.5 659.5 L 342.5 823.5 L 309.5 823.5 Z M 406.5 659.5 L 440.5 659.5 L 440.5 823.5 L 406.5 823.5 Z M 530.5 659.5 L 563.5 659.5 L 563.5 823.5 L 530.5 823.5 Z M 625.5 659.5 L 658.5 659.5 L 658.5 823.5 L 625.5 823.5 Z M 751.5 659.5 L 784.5 659.5 L 784.5 823.5 L 751.5 823.5 Z M 751.5 659.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <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 1575.5 250.5 L 1608.5 250.5 L 1608.5 498.5 L 1575.5 498.5 Z M 310.5 250.5 L 343.5 250.5 L 343.5 498.5 L 310.5 498.5 Z M 410.5 250.5 L 443.5 250.5 L 443.5 498.5 L 410.5 498.5 Z M 509.5 250.5 L 542.5 250.5 L 542.5 498.5 L 509.5 498.5 Z M 643.5 250.5 L 676.5 250.5 L 676.5 498.5 L 643.5 498.5 Z M 775.5 250.5 L 809.5 250.5 L 809.5 498.5 L 775.5 498.5 Z M 910.5 250.5 L 943.5 250.5 L 943.5 498.5 L 910.5 498.5 Z M 1043.5 250.5 L 1076.5 250.5 L 1076.5 498.5 L 1043.5 498.5 Z M 1177.5 250.5 L 1211.5 250.5 L 1211.5 498.5 L 1177.5 498.5 Z M 1277.5 250.5 L 1310.5 250.5 L 1310.5 498.5 L 1277.5 498.5 Z M 1376.5 250.5 L 1409.5 250.5 L 1409.5 498.5 L 1376.5 498.5 Z M 1476.5 250.5 L 1509.5 250.5 L 1509.5 498.5 L 1476.5 498.5 Z M 1476.5 250.5 "/>
 </clipPath>
-<image id="image297" 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="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.5 "/>
 </clipPath>
-<image id="image298" 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="#image298"/>
+  <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="surface292">
+<g id="surface320">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 379.46875 787.046875 L 379.46875 805.5 L 373.46875 805.5 L 373.46875 787.046875 L 355.339844 758.46875 L 362.757812 758.46875 L 376.566406 781.371094 L 389.984375 758.46875 L 397.144531 758.46875 Z M 379.46875 787.046875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 357 316 L 394 316 M 357 279 L 394 279 M 357 279 L 357 316 M 394 279 L 394 316 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 357 316 L 394 316 M 357 279 L 394 279 M 394 316 L 394 279 M 357 316 L 357 279 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_1.svg b/cells/nor3b/sky130_fd_sc_hs__nor3b_1.svg
index 7a023ec..183ede4 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_1.svg
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 776.5 664.5 L 811.5 664.5 L 811.5 790.5 L 776.5 790.5 Z M 1008.5 664.5 L 1042.5 664.5 L 1042.5 833.5 L 1008.5 833.5 Z M 900.5 664.5 L 934.5 664.5 L 934.5 833.5 L 900.5 833.5 Z M 1138.5 664.5 L 1173.5 664.5 L 1173.5 833.5 L 1138.5 833.5 Z M 1138.5 664.5 "/>
 </clipPath>
-<image id="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1123.5 240.5 L 1158.5 240.5 L 1158.5 496.5 L 1123.5 496.5 Z M 766.5 304.5 L 800.5 304.5 L 800.5 496.5 L 766.5 496.5 Z M 993.5 240.5 L 1027.5 240.5 L 1027.5 496.5 L 993.5 496.5 Z M 897.5 240.5 L 931.5 240.5 L 931.5 496.5 L 897.5 496.5 Z M 897.5 240.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -156,6 +156,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 1039.441406 547.496094 L 1039.304688 549.652344 L 1038.96875 551.605469 L 1038.363281 553.421875 L 1037.554688 555.039062 L 1036.480469 556.585938 L 1035.199219 557.933594 L 1033.785156 559.078125 L 1032.304688 559.953125 L 1030.621094 560.625 L 1028.871094 561.164062 L 1026.988281 561.433594 L 1024.96875 561.5 L 1002.820312 561.5 L 1002.820312 512.421875 L 1022.746094 512.421875 L 1025.640625 512.625 L 1028.199219 513.097656 L 1030.488281 513.902344 L 1032.441406 515.046875 L 1034.121094 516.53125 L 1035.46875 518.347656 L 1036.007812 519.355469 L 1036.480469 520.433594 L 1036.816406 521.445312 L 1037.085938 522.589844 L 1037.21875 523.734375 L 1037.285156 524.878906 L 1037.085938 527.300781 L 1036.480469 529.386719 L 1035.535156 531.339844 L 1034.191406 532.957031 L 1032.507812 534.4375 L 1030.488281 535.582031 L 1032.441406 536.457031 L 1034.121094 537.398438 L 1035.605469 538.476562 L 1036.816406 539.6875 L 1037.757812 540.96875 L 1038.5 542.3125 L 1038.769531 543.121094 L 1038.96875 543.929688 L 1039.171875 544.738281 L 1039.304688 545.679688 L 1039.375 546.554688 Z M 1031.027344 525.753906 L 1030.824219 523.734375 L 1030.21875 522.050781 L 1029.277344 520.570312 L 1027.929688 519.492188 L 1026.246094 518.683594 L 1024.160156 518.144531 L 1023.6875 518.144531 L 1023.214844 518.078125 L 1022.746094 518.011719 L 1021.667969 518.011719 L 1021.195312 517.941406 L 1009.078125 517.941406 L 1009.078125 533.5625 L 1021.195312 533.5625 L 1023.6875 533.425781 L 1025.84375 533.023438 L 1027.660156 532.28125 L 1029.007812 531.273438 L 1030.082031 529.925781 L 1030.757812 528.3125 L 1030.824219 527.972656 L 1030.957031 527.167969 L 1030.957031 526.222656 Z M 1024.359375 555.980469 L 1026.246094 555.914062 L 1027.929688 555.507812 L 1029.410156 554.835938 L 1030.621094 553.960938 L 1031.632812 552.816406 L 1032.441406 551.402344 L 1032.640625 550.863281 L 1032.777344 550.257812 L 1032.976562 549.585938 L 1033.046875 548.976562 L 1033.113281 548.304688 L 1033.179688 547.566406 L 1033.046875 546.082031 L 1032.777344 544.667969 L 1032.304688 543.457031 L 1031.632812 542.3125 L 1030.757812 541.371094 L 1029.746094 540.496094 L 1029.007812 540.09375 L 1028.199219 539.753906 L 1027.324219 539.484375 L 1026.378906 539.285156 L 1025.371094 539.148438 L 1024.359375 539.082031 L 1009.078125 539.082031 L 1009.078125 555.980469 Z M 1024.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 999 562 L 1038 562 M 999 523 L 1038 523 M 999 523 L 999 562 M 1038 523 L 1038 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 999 562 L 1038 562 M 999 523 L 1038 523 M 1038 562 L 1038 523 M 999 562 L 999 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_2.svg b/cells/nor3b/sky130_fd_sc_hs__nor3b_2.svg
index 3d06519..0fc2ed0 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_2.svg
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1266.5 664.5 L 1300.5 664.5 L 1300.5 833.5 L 1266.5 833.5 Z M 508.5 687.5 L 543.5 687.5 L 543.5 833.5 L 508.5 833.5 Z M 1376.5 664.5 L 1410.5 664.5 L 1410.5 833.5 L 1376.5 833.5 Z M 1039.5 664.5 L 1073.5 664.5 L 1073.5 833.5 L 1039.5 833.5 Z M 940.5 664.5 L 975.5 664.5 L 975.5 833.5 L 940.5 833.5 Z M 741.5 664.5 L 775.5 664.5 L 775.5 833.5 L 741.5 833.5 Z M 639.5 664.5 L 673.5 664.5 L 673.5 833.5 L 639.5 833.5 Z M 639.5 664.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 508.5 240.5 L 543.5 240.5 L 543.5 469.5 L 508.5 469.5 Z M 1047.5 240.5 L 1081.5 240.5 L 1081.5 496.5 L 1047.5 496.5 Z M 737.5 240.5 L 772.5 240.5 L 772.5 496.5 L 737.5 496.5 Z M 840.5 240.5 L 875.5 240.5 L 875.5 496.5 L 840.5 496.5 Z M 944.5 240.5 L 978.5 240.5 L 978.5 496.5 L 944.5 496.5 Z M 1379.5 240.5 L 1413.5 240.5 L 1413.5 496.5 L 1379.5 496.5 Z M 1276.5 240.5 L 1310.5 240.5 L 1310.5 496.5 L 1276.5 496.5 Z M 1276.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -162,6 +162,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 642.890625 511.574219 L 642.890625 560.652344 L 635.824219 560.652344 L 610.441406 520.863281 L 610.441406 560.652344 L 604.519531 560.652344 L 604.519531 511.574219 L 611.316406 511.574219 L 636.96875 551.699219 L 636.96875 511.574219 Z M 642.890625 511.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 556 562 L 595 562 M 556 523 L 595 523 M 556 523 L 556 562 M 595 523 L 595 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 556 562 L 595 562 M 556 523 L 595 523 M 595 562 L 595 523 M 556 562 L 556 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor3b/sky130_fd_sc_hs__nor3b_4.svg b/cells/nor3b/sky130_fd_sc_hs__nor3b_4.svg
index 7520360..eef1737 100644
--- a/cells/nor3b/sky130_fd_sc_hs__nor3b_4.svg
+++ b/cells/nor3b/sky130_fd_sc_hs__nor3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 537.5 L 174.5 537.5 Z M 174.5 175.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 211.5 812.5 L 1706.5 812.5 L 1706.5 860.5 L 211.5 860.5 Z M 211.5 812.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 1473.5 644.5 L 1502.5 644.5 L 1502.5 788.5 L 1473.5 788.5 Z M 302.5 644.5 L 331.5 644.5 L 331.5 788.5 L 302.5 788.5 Z M 390.5 644.5 L 419.5 644.5 L 419.5 788.5 L 390.5 788.5 Z M 501.5 644.5 L 530.5 644.5 L 530.5 788.5 L 501.5 788.5 Z M 585.5 644.5 L 614.5 644.5 L 614.5 788.5 L 585.5 788.5 Z M 682.5 644.5 L 711.5 644.5 L 711.5 788.5 L 682.5 788.5 Z M 766.5 644.5 L 795.5 644.5 L 795.5 788.5 L 766.5 788.5 Z M 863.5 644.5 L 893.5 644.5 L 893.5 788.5 L 863.5 788.5 Z M 947.5 644.5 L 976.5 644.5 L 976.5 788.5 L 947.5 788.5 Z M 1058.5 644.5 L 1087.5 644.5 L 1087.5 788.5 L 1058.5 788.5 Z M 1142.5 644.5 L 1171.5 644.5 L 1171.5 788.5 L 1142.5 788.5 Z M 1278.5 644.5 L 1307.5 644.5 L 1307.5 788.5 L 1278.5 788.5 Z M 1375.5 644.5 L 1405.5 644.5 L 1405.5 788.5 L 1375.5 788.5 Z M 1375.5 644.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 305.5 284.5 L 334.5 284.5 L 334.5 502.5 L 305.5 502.5 Z M 1593.5 338.5 L 1623.5 338.5 L 1623.5 502.5 L 1593.5 502.5 Z M 1506.5 338.5 L 1535.5 338.5 L 1535.5 502.5 L 1506.5 502.5 Z M 1392.5 284.5 L 1421.5 284.5 L 1421.5 502.5 L 1392.5 502.5 Z M 1304.5 284.5 L 1333.5 284.5 L 1333.5 502.5 L 1304.5 502.5 Z M 1217.5 284.5 L 1246.5 284.5 L 1246.5 502.5 L 1217.5 502.5 Z M 1129.5 284.5 L 1158.5 284.5 L 1158.5 502.5 L 1129.5 502.5 Z M 932.5 284.5 L 962.5 284.5 L 962.5 502.5 L 932.5 502.5 Z M 845.5 284.5 L 874.5 284.5 L 874.5 502.5 L 845.5 502.5 Z M 757.5 284.5 L 786.5 284.5 L 786.5 502.5 L 757.5 502.5 Z M 670.5 284.5 L 699.5 284.5 L 699.5 502.5 L 670.5 502.5 Z M 582.5 284.5 L 611.5 284.5 L 611.5 502.5 L 582.5 502.5 Z M 480.5 284.5 L 509.5 284.5 L 509.5 502.5 L 480.5 502.5 Z M 392.5 284.5 L 421.5 284.5 L 421.5 502.5 L 392.5 502.5 Z M 392.5 284.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 241.5 195.5 L 274.5 195.5 L 274.5 228.5 L 241.5 228.5 Z M 1643.5 195.5 L 1676.5 195.5 L 1676.5 228.5 L 1643.5 228.5 Z M 1550.5 195.5 L 1583.5 195.5 L 1583.5 228.5 L 1550.5 228.5 Z M 1456.5 195.5 L 1489.5 195.5 L 1489.5 228.5 L 1456.5 228.5 Z M 1363.5 195.5 L 1396.5 195.5 L 1396.5 228.5 L 1363.5 228.5 Z M 1269.5 195.5 L 1302.5 195.5 L 1302.5 228.5 L 1269.5 228.5 Z M 1176.5 195.5 L 1209.5 195.5 L 1209.5 228.5 L 1176.5 228.5 Z M 1082.5 195.5 L 1115.5 195.5 L 1115.5 228.5 L 1082.5 228.5 Z M 989.5 195.5 L 1022.5 195.5 L 1022.5 228.5 L 989.5 228.5 Z M 895.5 195.5 L 929.5 195.5 L 929.5 228.5 L 895.5 228.5 Z M 802.5 195.5 L 835.5 195.5 L 835.5 228.5 L 802.5 228.5 Z M 709.5 195.5 L 742.5 195.5 L 742.5 228.5 L 709.5 228.5 Z M 615.5 195.5 L 648.5 195.5 L 648.5 228.5 L 615.5 228.5 Z M 522.5 195.5 L 555.5 195.5 L 555.5 228.5 L 522.5 228.5 Z M 428.5 195.5 L 461.5 195.5 L 461.5 228.5 L 428.5 228.5 Z M 335.5 195.5 L 368.5 195.5 L 368.5 228.5 L 335.5 228.5 Z M 241.5 843.5 L 274.5 843.5 L 274.5 877.5 L 241.5 877.5 Z M 1643.5 843.5 L 1676.5 843.5 L 1676.5 877.5 L 1643.5 877.5 Z M 1550.5 843.5 L 1583.5 843.5 L 1583.5 877.5 L 1550.5 877.5 Z M 1456.5 843.5 L 1489.5 843.5 L 1489.5 877.5 L 1456.5 877.5 Z M 1363.5 843.5 L 1396.5 843.5 L 1396.5 877.5 L 1363.5 877.5 Z M 1269.5 843.5 L 1302.5 843.5 L 1302.5 877.5 L 1269.5 877.5 Z M 1176.5 843.5 L 1209.5 843.5 L 1209.5 877.5 L 1176.5 877.5 Z M 1082.5 843.5 L 1115.5 843.5 L 1115.5 877.5 L 1082.5 877.5 Z M 989.5 843.5 L 1022.5 843.5 L 1022.5 877.5 L 989.5 877.5 Z M 895.5 843.5 L 929.5 843.5 L 929.5 877.5 L 895.5 877.5 Z M 802.5 843.5 L 835.5 843.5 L 835.5 877.5 L 802.5 877.5 Z M 709.5 843.5 L 742.5 843.5 L 742.5 877.5 L 709.5 877.5 Z M 615.5 843.5 L 648.5 843.5 L 648.5 877.5 L 615.5 877.5 Z M 522.5 843.5 L 555.5 843.5 L 555.5 877.5 L 522.5 877.5 Z M 428.5 843.5 L 461.5 843.5 L 461.5 877.5 L 428.5 877.5 Z M 335.5 843.5 L 368.5 843.5 L 368.5 877.5 L 335.5 877.5 Z M 335.5 843.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>
@@ -162,6 +162,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 1624.023438 586.460938 L 1624.023438 628.378906 L 1617.984375 628.378906 L 1596.304688 594.394531 L 1596.304688 628.378906 L 1591.246094 628.378906 L 1591.246094 586.460938 L 1597.050781 586.460938 L 1618.960938 620.730469 L 1618.960938 586.460938 Z M 1624.023438 586.460938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1550 488 L 1583 488 M 1550 455 L 1583 455 M 1550 455 L 1550 488 M 1583 455 L 1583 488 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1550 488 L 1583 488 M 1550 455 L 1583 455 M 1583 488 L 1583 455 M 1550 488 L 1550 455 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 214 L 211 223 M 206 219 L 215 219 M 210 220 L 212 220 M 210 218 L 212 218 M 210 218 L 210 220 M 212 218 L 212 220 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_1.svg b/cells/nor4/sky130_fd_sc_hs__nor4_1.svg
index 7f0bda3..f16d05f 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_1.svg
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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 1118.5 664.5 L 1152.5 664.5 L 1152.5 833.5 L 1118.5 833.5 Z M 767.5 664.5 L 801.5 664.5 L 801.5 833.5 L 767.5 833.5 Z M 866.5 664.5 L 900.5 664.5 L 900.5 833.5 L 866.5 833.5 Z M 1019.5 664.5 L 1054.5 664.5 L 1054.5 833.5 L 1019.5 833.5 Z M 1019.5 664.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 1121.5 240.5 L 1156.5 240.5 L 1156.5 496.5 L 1121.5 496.5 Z M 764.5 240.5 L 798.5 240.5 L 798.5 496.5 L 764.5 496.5 Z M 860.5 240.5 L 894.5 240.5 L 894.5 496.5 L 860.5 496.5 Z M 991.5 240.5 L 1025.5 240.5 L 1025.5 496.5 L 991.5 496.5 Z M 991.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.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>
@@ -166,6 +166,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 698.410156 631.757812 L 679.492188 631.757812 L 674.308594 646.5 L 667.644531 646.5 L 685.148438 597.421875 L 693.226562 597.421875 L 710.460938 646.5 L 703.460938 646.5 Z M 696.660156 626.503906 L 689.121094 604.15625 L 681.042969 626.503906 Z M 696.660156 626.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 669 477 L 708 477 M 669 438 L 708 438 M 669 438 L 669 477 M 708 438 L 708 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 669 477 L 708 477 M 669 438 L 708 438 M 708 477 L 708 438 M 669 477 L 669 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_2.svg b/cells/nor4/sky130_fd_sc_hs__nor4_2.svg
index 810d42d..6aebdd0 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_2.svg
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1121.5 664.5 L 1156.5 664.5 L 1156.5 833.5 L 1121.5 833.5 Z M 784.5 664.5 L 819.5 664.5 L 819.5 833.5 L 784.5 833.5 Z M 892.5 664.5 L 926.5 664.5 L 926.5 833.5 L 892.5 833.5 Z M 1023.5 664.5 L 1057.5 664.5 L 1057.5 833.5 L 1023.5 833.5 Z M 1023.5 664.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1324.5 240.5 L 1358.5 240.5 L 1358.5 496.5 L 1324.5 496.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 672.5 240.5 L 706.5 240.5 L 706.5 496.5 L 672.5 496.5 Z M 781.5 240.5 L 815.5 240.5 L 815.5 496.5 L 781.5 496.5 Z M 884.5 240.5 L 918.5 240.5 L 918.5 496.5 L 884.5 496.5 Z M 994.5 240.5 L 1028.5 240.5 L 1028.5 496.5 L 994.5 496.5 Z M 1118.5 240.5 L 1152.5 240.5 L 1152.5 496.5 L 1118.5 496.5 Z M 1221.5 240.5 L 1255.5 240.5 L 1255.5 496.5 L 1221.5 496.5 Z M 1221.5 240.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 746.554688 457.246094 L 746.554688 476.5 L 740.292969 476.5 L 740.292969 457.246094 L 721.375 427.421875 L 729.117188 427.421875 L 743.523438 451.320312 L 757.527344 427.421875 L 765 427.421875 Z M 746.554688 457.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 722 647 L 761 647 M 722 608 L 761 608 M 722 608 L 722 647 M 761 608 L 761 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 722 647 L 761 647 M 722 608 L 761 608 M 761 647 L 761 608 M 722 647 L 722 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4/sky130_fd_sc_hs__nor4_4.svg b/cells/nor4/sky130_fd_sc_hs__nor4_4.svg
index d1c137d..652b308 100644
--- a/cells/nor4/sky130_fd_sc_hs__nor4_4.svg
+++ b/cells/nor4/sky130_fd_sc_hs__nor4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.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 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.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 1582.5 632.5 L 1608.5 632.5 L 1608.5 761.5 L 1582.5 761.5 Z M 288.5 632.5 L 314.5 632.5 L 314.5 761.5 L 288.5 761.5 Z M 518.5 632.5 L 544.5 632.5 L 544.5 761.5 L 518.5 761.5 Z M 605.5 632.5 L 631.5 632.5 L 631.5 761.5 L 605.5 761.5 Z M 839.5 632.5 L 866.5 632.5 L 866.5 761.5 L 839.5 761.5 Z M 926.5 632.5 L 953.5 632.5 L 953.5 761.5 L 926.5 761.5 Z M 1001.5 632.5 L 1027.5 632.5 L 1027.5 761.5 L 1001.5 761.5 Z M 1433.5 632.5 L 1459.5 632.5 L 1459.5 761.5 L 1433.5 761.5 Z M 1433.5 632.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 1609.5 310.5 L 1635.5 310.5 L 1635.5 505.5 L 1609.5 505.5 Z M 291.5 310.5 L 317.5 310.5 L 317.5 505.5 L 291.5 505.5 Z M 369.5 310.5 L 395.5 310.5 L 395.5 505.5 L 369.5 505.5 Z M 447.5 310.5 L 473.5 310.5 L 473.5 505.5 L 447.5 505.5 Z M 534.5 310.5 L 560.5 310.5 L 560.5 505.5 L 534.5 505.5 Z M 612.5 310.5 L 639.5 310.5 L 639.5 505.5 L 612.5 505.5 Z M 691.5 310.5 L 717.5 310.5 L 717.5 505.5 L 691.5 505.5 Z M 769.5 310.5 L 795.5 310.5 L 795.5 505.5 L 769.5 505.5 Z M 847.5 310.5 L 873.5 310.5 L 873.5 505.5 L 847.5 505.5 Z M 1023.5 310.5 L 1049.5 310.5 L 1049.5 505.5 L 1023.5 505.5 Z M 1101.5 310.5 L 1127.5 310.5 L 1127.5 505.5 L 1101.5 505.5 Z M 1183.5 310.5 L 1209.5 310.5 L 1209.5 505.5 L 1183.5 505.5 Z M 1261.5 310.5 L 1287.5 310.5 L 1287.5 505.5 L 1261.5 505.5 Z M 1340.5 310.5 L 1366.5 310.5 L 1366.5 505.5 L 1340.5 505.5 Z M 1435.5 310.5 L 1461.5 310.5 L 1461.5 505.5 L 1435.5 505.5 Z M 1514.5 310.5 L 1540.5 310.5 L 1540.5 505.5 L 1514.5 505.5 Z M 1514.5 310.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.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>
@@ -184,6 +184,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 487.992188 554.5 L 487.992188 517.691406 L 502.179688 517.691406 L 504.402344 517.84375 L 506.472656 518.246094 L 508.390625 518.953125 L 510.160156 519.863281 L 511.722656 521.125 L 513.1875 522.589844 L 514.402344 524.355469 L 515.410156 526.277344 L 516.167969 528.445312 L 516.722656 530.769531 L 517.027344 533.34375 L 517.175781 536.070312 L 517.027344 538.949219 L 516.671875 541.625 L 516.066406 544.046875 L 515.257812 546.269531 L 514.199219 548.238281 L 512.886719 549.957031 L 511.472656 551.371094 L 509.90625 552.480469 L 508.191406 553.390625 L 506.320312 553.996094 L 504.300781 554.398438 L 502.179688 554.5 Z M 492.6875 550.359375 L 501.375 550.359375 L 503.695312 550.207031 L 505.765625 549.652344 L 507.585938 548.695312 L 509.097656 547.429688 L 510.3125 545.714844 L 511.320312 543.644531 L 511.625 542.585938 L 511.925781 541.472656 L 512.179688 540.261719 L 512.332031 538.949219 L 512.429688 537.585938 L 512.480469 536.121094 L 512.28125 532.839844 L 511.773438 529.960938 L 510.867188 527.488281 L 509.652344 525.519531 L 508.089844 523.902344 L 506.171875 522.742188 L 505.464844 522.488281 L 504.707031 522.234375 L 503.898438 522.085938 L 503.089844 521.933594 L 502.230469 521.882812 L 501.375 521.832031 L 492.6875 521.832031 Z M 492.6875 550.359375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 485 558 L 514 558 M 485 529 L 514 529 M 485 529 L 485 558 M 514 529 L 514 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 485 558 L 514 558 M 485 529 L 514 529 M 514 558 L 514 529 M 485 558 L 485 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_1.svg b/cells/nor4b/sky130_fd_sc_hs__nor4b_1.svg
index 9199764..b20fcaa 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_1.svg
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 1075.5 664.5 L 1110.5 664.5 L 1110.5 833.5 L 1075.5 833.5 Z M 713.5 707.5 L 748.5 707.5 L 748.5 833.5 L 713.5 833.5 Z M 1174.5 664.5 L 1208.5 664.5 L 1208.5 833.5 L 1174.5 833.5 Z M 942.5 664.5 L 977.5 664.5 L 977.5 833.5 L 942.5 833.5 Z M 844.5 664.5 L 878.5 664.5 L 878.5 833.5 L 844.5 833.5 Z M 844.5 664.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 1054.5 240.5 L 1088.5 240.5 L 1088.5 496.5 L 1054.5 496.5 Z M 710.5 304.5 L 744.5 304.5 L 744.5 496.5 L 710.5 496.5 Z M 1184.5 240.5 L 1219.5 240.5 L 1219.5 496.5 L 1184.5 496.5 Z M 937.5 240.5 L 971.5 240.5 L 971.5 496.5 L 937.5 496.5 Z M 840.5 240.5 L 875.5 240.5 L 875.5 496.5 L 840.5 496.5 Z M 840.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -162,6 +162,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 1053.730469 536.984375 L 1053.796875 534.292969 L 1054.066406 531.667969 L 1054.539062 529.175781 L 1055.144531 526.753906 L 1055.953125 524.464844 L 1057.03125 522.242188 L 1058.714844 519.347656 L 1060.800781 516.855469 L 1063.15625 514.835938 L 1065.847656 513.222656 L 1068.8125 512.078125 L 1072.175781 511.335938 L 1072.785156 511.269531 L 1073.457031 511.203125 L 1074.0625 511.132812 L 1075.410156 511.132812 L 1076.148438 511.066406 L 1080.457031 511.402344 L 1084.226562 512.414062 L 1087.460938 514.027344 L 1090.152344 516.316406 L 1092.304688 519.210938 L 1093.988281 522.78125 L 1094.394531 524.125 L 1094.59375 524.867188 L 1094.730469 525.609375 L 1094.863281 526.347656 L 1095.066406 527.089844 L 1088.671875 527.089844 L 1087.996094 524.734375 L 1087.121094 522.714844 L 1086.046875 520.960938 L 1084.632812 519.480469 L 1083.082031 518.335938 L 1081.265625 517.460938 L 1080.390625 517.191406 L 1079.449219 516.992188 L 1078.503906 516.855469 L 1077.496094 516.722656 L 1076.484375 516.652344 L 1075.410156 516.585938 L 1073.050781 516.789062 L 1070.898438 517.261719 L 1068.878906 518 L 1067.0625 519.144531 L 1065.378906 520.558594 L 1063.964844 522.242188 L 1062.753906 524.195312 L 1061.742188 526.347656 L 1060.933594 528.703125 L 1060.394531 531.261719 L 1060.058594 534.023438 L 1059.992188 536.917969 L 1060.058594 540.082031 L 1060.464844 542.910156 L 1061.136719 545.601562 L 1062.078125 547.957031 L 1063.292969 550.179688 L 1064.773438 552.066406 L 1066.253906 553.613281 L 1067.867188 554.824219 L 1069.621094 555.769531 L 1071.570312 556.441406 L 1073.660156 556.84375 L 1075.949219 556.980469 L 1078.371094 556.84375 L 1080.59375 556.375 L 1082.613281 555.566406 L 1084.296875 554.421875 L 1085.777344 552.941406 L 1087.054688 551.121094 L 1087.59375 550.046875 L 1088.066406 548.832031 L 1088.535156 547.554688 L 1088.941406 546.140625 L 1089.277344 544.660156 L 1089.613281 543.042969 L 1096.078125 543.042969 L 1094.863281 549.035156 L 1092.84375 553.882812 L 1089.882812 557.652344 L 1086.113281 560.347656 L 1081.402344 561.894531 L 1075.878906 562.5 L 1071.976562 562.230469 L 1068.476562 561.421875 L 1065.3125 560.210938 L 1062.484375 558.394531 L 1059.992188 556.039062 L 1057.90625 553.140625 L 1056.695312 551.054688 L 1055.683594 548.765625 L 1054.875 546.34375 L 1054.269531 543.785156 L 1053.867188 541.09375 L 1053.730469 538.265625 Z M 1053.730469 536.984375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_2.svg b/cells/nor4b/sky130_fd_sc_hs__nor4b_2.svg
index e19582f..fd41fe1 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_2.svg
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image303" 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="#image303"/>
+  <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 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.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="#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 1174.5 664.5 L 1208.5 664.5 L 1208.5 833.5 L 1174.5 833.5 Z M 427.5 687.5 L 461.5 687.5 L 461.5 833.5 L 427.5 833.5 Z M 1374.5 664.5 L 1409.5 664.5 L 1409.5 833.5 L 1374.5 833.5 Z M 1486.5 664.5 L 1520.5 664.5 L 1520.5 833.5 L 1486.5 833.5 Z M 1055.5 664.5 L 1089.5 664.5 L 1089.5 833.5 L 1055.5 833.5 Z M 929.5 664.5 L 963.5 664.5 L 963.5 833.5 L 929.5 833.5 Z M 830.5 664.5 L 865.5 664.5 L 865.5 833.5 L 830.5 833.5 Z M 672.5 664.5 L 706.5 664.5 L 706.5 833.5 L 672.5 833.5 Z M 557.5 664.5 L 592.5 664.5 L 592.5 833.5 L 557.5 833.5 Z M 557.5 664.5 "/>
 </clipPath>
-<image id="image304" 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="#image304"/>
+  <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 398.5 240.5 L 432.5 240.5 L 432.5 469.5 L 398.5 469.5 Z M 1170.5 240.5 L 1205.5 240.5 L 1205.5 496.5 L 1170.5 496.5 Z M 630.5 240.5 L 664.5 240.5 L 664.5 496.5 L 630.5 496.5 Z M 733.5 240.5 L 767.5 240.5 L 767.5 496.5 L 733.5 496.5 Z M 836.5 240.5 L 870.5 240.5 L 870.5 496.5 L 836.5 496.5 Z M 939.5 240.5 L 973.5 240.5 L 973.5 496.5 L 939.5 496.5 Z M 1377.5 240.5 L 1411.5 240.5 L 1411.5 496.5 L 1377.5 496.5 Z M 1274.5 240.5 L 1308.5 240.5 L 1308.5 496.5 L 1274.5 496.5 Z M 1482.5 240.5 L 1517.5 240.5 L 1517.5 496.5 L 1482.5 496.5 Z M 1482.5 240.5 "/>
 </clipPath>
-<image id="image305" 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="#image305"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <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="surface300">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1129.554688 712.246094 L 1129.554688 731.5 L 1123.292969 731.5 L 1123.292969 712.246094 L 1104.375 682.421875 L 1112.117188 682.421875 L 1126.523438 706.320312 L 1140.527344 682.421875 L 1148 682.421875 Z M 1129.554688 712.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1105 392 L 1144 392 M 1105 353 L 1144 353 M 1105 353 L 1105 392 M 1144 353 L 1144 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1105 392 L 1144 392 M 1105 353 L 1144 353 M 1144 392 L 1144 353 M 1105 392 L 1105 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4b/sky130_fd_sc_hs__nor4b_4.svg b/cells/nor4b/sky130_fd_sc_hs__nor4b_4.svg
index 486d8d9..4430442 100644
--- a/cells/nor4b/sky130_fd_sc_hs__nor4b_4.svg
+++ b/cells/nor4b/sky130_fd_sc_hs__nor4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1619.5 618.5 L 1642.5 618.5 L 1642.5 729.5 L 1619.5 729.5 Z M 341.5 618.5 L 364.5 618.5 L 364.5 729.5 L 341.5 729.5 Z M 408.5 618.5 L 430.5 618.5 L 430.5 729.5 L 408.5 729.5 Z M 484.5 618.5 L 507.5 618.5 L 507.5 729.5 L 484.5 729.5 Z M 559.5 618.5 L 582.5 618.5 L 582.5 729.5 L 559.5 729.5 Z M 624.5 618.5 L 646.5 618.5 L 646.5 729.5 L 624.5 729.5 Z M 709.5 618.5 L 732.5 618.5 L 732.5 729.5 L 709.5 729.5 Z M 774.5 618.5 L 796.5 618.5 L 796.5 729.5 L 774.5 729.5 Z M 920.5 618.5 L 943.5 618.5 L 943.5 729.5 L 920.5 729.5 Z M 985.5 618.5 L 1007.5 618.5 L 1007.5 729.5 L 985.5 729.5 Z M 1122.5 618.5 L 1144.5 618.5 L 1144.5 729.5 L 1122.5 729.5 Z M 1197.5 618.5 L 1219.5 618.5 L 1219.5 729.5 L 1197.5 729.5 Z M 1272.5 618.5 L 1294.5 618.5 L 1294.5 729.5 L 1272.5 729.5 Z M 1336.5 618.5 L 1359.5 618.5 L 1359.5 729.5 L 1336.5 729.5 Z M 1426.5 618.5 L 1448.5 618.5 L 1448.5 729.5 L 1426.5 729.5 Z M 1490.5 618.5 L 1513.5 618.5 L 1513.5 729.5 L 1490.5 729.5 Z M 1555.5 618.5 L 1577.5 618.5 L 1577.5 729.5 L 1555.5 729.5 Z M 1555.5 618.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 335.5 341.5 L 358.5 341.5 L 358.5 467.5 L 335.5 467.5 Z M 268.5 341.5 L 290.5 341.5 L 290.5 467.5 L 268.5 467.5 Z M 1141.5 341.5 L 1163.5 341.5 L 1163.5 509.5 L 1141.5 509.5 Z M 487.5 341.5 L 509.5 341.5 L 509.5 509.5 L 487.5 509.5 Z M 554.5 341.5 L 577.5 341.5 L 577.5 509.5 L 554.5 509.5 Z M 629.5 341.5 L 652.5 341.5 L 652.5 509.5 L 629.5 509.5 Z M 697.5 341.5 L 719.5 341.5 L 719.5 509.5 L 697.5 509.5 Z M 764.5 341.5 L 787.5 341.5 L 787.5 509.5 L 764.5 509.5 Z M 839.5 341.5 L 862.5 341.5 L 862.5 509.5 L 839.5 509.5 Z M 918.5 341.5 L 940.5 341.5 L 940.5 509.5 L 918.5 509.5 Z M 1561.5 341.5 L 1583.5 341.5 L 1583.5 509.5 L 1561.5 509.5 Z M 1426.5 341.5 L 1448.5 341.5 L 1448.5 509.5 L 1426.5 509.5 Z M 1216.5 341.5 L 1238.5 341.5 L 1238.5 509.5 L 1216.5 509.5 Z M 1291.5 341.5 L 1313.5 341.5 L 1313.5 509.5 L 1291.5 509.5 Z M 1358.5 341.5 L 1381.5 341.5 L 1381.5 509.5 L 1358.5 509.5 Z M 1628.5 341.5 L 1651.5 341.5 L 1651.5 509.5 L 1628.5 509.5 Z M 1493.5 341.5 L 1516.5 341.5 L 1516.5 509.5 L 1493.5 509.5 Z M 989.5 341.5 L 1012.5 341.5 L 1012.5 509.5 L 989.5 509.5 Z M 989.5 341.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface320">
+<g id="surface349">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1034.324219 539.066406 L 1034.324219 551.5 L 1030.28125 551.5 L 1030.28125 539.066406 L 1018.066406 519.804688 L 1023.066406 519.804688 L 1032.371094 535.238281 L 1041.414062 519.804688 L 1046.238281 519.804688 Z M 1034.324219 539.066406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1018 557 L 1044 557 M 1018 531 L 1044 531 M 1018 531 L 1018 557 M 1044 531 L 1044 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1018 557 L 1044 557 M 1018 531 L 1044 531 M 1044 557 L 1044 531 M 1018 557 L 1018 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.svg b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.svg
index 32d2d9e..9a8e92e 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.svg
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1380.5 664.5 L 1415.5 664.5 L 1415.5 790.5 L 1380.5 790.5 Z M 568.5 664.5 L 602.5 664.5 L 602.5 790.5 L 568.5 790.5 Z M 713.5 664.5 L 748.5 664.5 L 748.5 833.5 L 713.5 833.5 Z M 828.5 664.5 L 862.5 664.5 L 862.5 833.5 L 828.5 833.5 Z M 1022.5 664.5 L 1056.5 664.5 L 1056.5 833.5 L 1022.5 833.5 Z M 1136.5 664.5 L 1170.5 664.5 L 1170.5 833.5 L 1136.5 833.5 Z M 1136.5 664.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1378.5 240.5 L 1412.5 240.5 L 1412.5 432.5 L 1378.5 432.5 Z M 509.5 304.5 L 544.5 304.5 L 544.5 496.5 L 509.5 496.5 Z M 735.5 240.5 L 769.5 240.5 L 769.5 496.5 L 735.5 496.5 Z M 984.5 240.5 L 1018.5 240.5 L 1018.5 496.5 L 984.5 496.5 Z M 831.5 240.5 L 866.5 240.5 L 866.5 496.5 L 831.5 496.5 Z M 1114.5 240.5 L 1149.5 240.5 L 1149.5 496.5 L 1114.5 496.5 Z M 1114.5 240.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1130.554688 796.246094 L 1130.554688 815.5 L 1124.292969 815.5 L 1124.292969 796.246094 L 1105.375 766.421875 L 1113.117188 766.421875 L 1127.523438 790.320312 L 1141.527344 766.421875 L 1149 766.421875 Z M 1130.554688 796.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1106 307 L 1145 307 M 1106 269 L 1145 269 M 1106 269 L 1106 307 M 1145 269 L 1145 307 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1106 307 L 1145 307 M 1106 269 L 1145 269 M 1145 307 L 1145 269 M 1106 307 L 1106 269 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.svg b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.svg
index de26c47..5c5dafd 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.svg
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 505.5 620.5 L 536.5 620.5 L 536.5 753.5 L 505.5 753.5 Z M 377.5 672.5 L 408.5 672.5 L 408.5 804.5 L 377.5 804.5 Z M 1488.5 651.5 L 1519.5 651.5 L 1519.5 804.5 L 1488.5 804.5 Z M 1587.5 651.5 L 1618.5 651.5 L 1618.5 804.5 L 1587.5 804.5 Z M 1199.5 651.5 L 1231.5 651.5 L 1231.5 804.5 L 1199.5 804.5 Z M 1096.5 651.5 L 1127.5 651.5 L 1127.5 804.5 L 1096.5 804.5 Z M 1007.5 651.5 L 1038.5 651.5 L 1038.5 804.5 L 1007.5 804.5 Z M 875.5 651.5 L 906.5 651.5 L 906.5 804.5 L 875.5 804.5 Z M 786.5 651.5 L 817.5 651.5 L 817.5 804.5 L 786.5 804.5 Z M 1289.5 651.5 L 1320.5 651.5 L 1320.5 804.5 L 1289.5 804.5 Z M 1289.5 651.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 576.5 268.5 L 607.5 268.5 L 607.5 475.5 L 576.5 475.5 Z M 303.5 268.5 L 334.5 268.5 L 334.5 475.5 L 303.5 475.5 Z M 1295.5 268.5 L 1326.5 268.5 L 1326.5 500.5 L 1295.5 500.5 Z M 785.5 268.5 L 816.5 268.5 L 816.5 500.5 L 785.5 500.5 Z M 878.5 268.5 L 910.5 268.5 L 910.5 500.5 L 878.5 500.5 Z M 982.5 268.5 L 1013.5 268.5 L 1013.5 500.5 L 982.5 500.5 Z M 1585.5 268.5 L 1616.5 268.5 L 1616.5 500.5 L 1585.5 500.5 Z M 1491.5 268.5 L 1523.5 268.5 L 1523.5 500.5 L 1491.5 500.5 Z M 1388.5 268.5 L 1419.5 268.5 L 1419.5 500.5 L 1388.5 500.5 Z M 1086.5 268.5 L 1117.5 268.5 L 1117.5 500.5 L 1086.5 500.5 Z M 1086.5 268.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 1162.382812 540.851562 L 1162.382812 558.5 L 1156.644531 558.5 L 1156.644531 540.851562 L 1139.300781 513.511719 L 1146.398438 513.511719 L 1159.605469 535.421875 L 1172.441406 513.511719 L 1179.292969 513.511719 Z M 1162.382812 540.851562 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1140 560 L 1176 560 M 1140 525 L 1176 525 M 1140 525 L 1140 560 M 1176 525 L 1176 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1140 560 L 1176 560 M 1140 525 L 1176 525 M 1176 560 L 1176 525 M 1140 560 L 1140 525 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.svg b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.svg
index e3e9beb..efa40fa 100644
--- a/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.svg
+++ b/cells/nor4bb/sky130_fd_sc_hs__nor4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 535.5 L 174.5 535.5 Z M 541.5 535.5 L 1392.5 535.5 L 1392.5 548.5 L 541.5 548.5 Z M 541.5 535.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 200.5 730.5 L 1717.5 730.5 L 1717.5 764.5 L 200.5 764.5 Z M 200.5 730.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1639.5 611.5 L 1660.5 611.5 L 1660.5 713.5 L 1639.5 713.5 Z M 268.5 611.5 L 288.5 611.5 L 288.5 713.5 L 268.5 713.5 Z M 327.5 611.5 L 347.5 611.5 L 347.5 713.5 L 327.5 713.5 Z M 399.5 611.5 L 420.5 611.5 L 420.5 713.5 L 399.5 713.5 Z M 464.5 611.5 L 485.5 611.5 L 485.5 713.5 L 464.5 713.5 Z M 538.5 611.5 L 559.5 611.5 L 559.5 713.5 L 538.5 713.5 Z M 600.5 611.5 L 621.5 611.5 L 621.5 713.5 L 600.5 713.5 Z M 666.5 611.5 L 687.5 611.5 L 687.5 713.5 L 666.5 713.5 Z M 735.5 611.5 L 756.5 611.5 L 756.5 713.5 L 735.5 713.5 Z M 794.5 611.5 L 815.5 611.5 L 815.5 713.5 L 794.5 713.5 Z M 863.5 611.5 L 883.5 611.5 L 883.5 713.5 L 863.5 713.5 Z M 931.5 611.5 L 952.5 611.5 L 952.5 713.5 L 931.5 713.5 Z M 999.5 611.5 L 1019.5 611.5 L 1019.5 713.5 L 999.5 713.5 Z M 1069.5 611.5 L 1089.5 611.5 L 1089.5 713.5 L 1069.5 713.5 Z M 1128.5 611.5 L 1149.5 611.5 L 1149.5 713.5 L 1128.5 713.5 Z M 1242.5 611.5 L 1263.5 611.5 L 1263.5 713.5 L 1242.5 713.5 Z M 1305.5 611.5 L 1325.5 611.5 L 1325.5 713.5 L 1305.5 713.5 Z M 1455.5 611.5 L 1476.5 611.5 L 1476.5 713.5 L 1455.5 713.5 Z M 1455.5 611.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1638.5 357.5 L 1658.5 357.5 L 1658.5 472.5 L 1638.5 472.5 Z M 1576.5 357.5 L 1597.5 357.5 L 1597.5 472.5 L 1576.5 472.5 Z M 1452.5 357.5 L 1473.5 357.5 L 1473.5 472.5 L 1452.5 472.5 Z M 1514.5 357.5 L 1535.5 357.5 L 1535.5 472.5 L 1514.5 472.5 Z M 328.5 357.5 L 349.5 357.5 L 349.5 511.5 L 328.5 511.5 Z M 260.5 357.5 L 280.5 357.5 L 280.5 511.5 L 260.5 511.5 Z M 533.5 357.5 L 554.5 357.5 L 554.5 511.5 L 533.5 511.5 Z M 459.5 357.5 L 479.5 357.5 L 479.5 511.5 L 459.5 511.5 Z M 397.5 357.5 L 418.5 357.5 L 418.5 511.5 L 397.5 511.5 Z M 1130.5 370.5 L 1151.5 370.5 L 1151.5 524.5 L 1130.5 524.5 Z M 1192.5 370.5 L 1212.5 370.5 L 1212.5 524.5 L 1192.5 524.5 Z M 1302.5 370.5 L 1323.5 370.5 L 1323.5 524.5 L 1302.5 524.5 Z M 664.5 370.5 L 685.5 370.5 L 685.5 524.5 L 664.5 524.5 Z M 602.5 370.5 L 623.5 370.5 L 623.5 524.5 L 602.5 524.5 Z M 1005.5 370.5 L 1026.5 370.5 L 1026.5 524.5 L 1005.5 524.5 Z M 733.5 370.5 L 754.5 370.5 L 754.5 524.5 L 733.5 524.5 Z M 858.5 370.5 L 879.5 370.5 L 879.5 524.5 L 858.5 524.5 Z M 796.5 370.5 L 817.5 370.5 L 817.5 524.5 L 796.5 524.5 Z M 1067.5 370.5 L 1087.5 370.5 L 1087.5 524.5 L 1067.5 524.5 Z M 943.5 370.5 L 964.5 370.5 L 964.5 524.5 L 943.5 524.5 Z M 943.5 370.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 222.5 294.5 L 245.5 294.5 L 245.5 318.5 L 222.5 318.5 Z M 1673.5 294.5 L 1696.5 294.5 L 1696.5 318.5 L 1673.5 318.5 Z M 1607.5 294.5 L 1630.5 294.5 L 1630.5 318.5 L 1607.5 318.5 Z M 1541.5 294.5 L 1564.5 294.5 L 1564.5 318.5 L 1541.5 318.5 Z M 1475.5 294.5 L 1498.5 294.5 L 1498.5 318.5 L 1475.5 318.5 Z M 1409.5 294.5 L 1432.5 294.5 L 1432.5 318.5 L 1409.5 318.5 Z M 1343.5 294.5 L 1366.5 294.5 L 1366.5 318.5 L 1343.5 318.5 Z M 1277.5 294.5 L 1300.5 294.5 L 1300.5 318.5 L 1277.5 318.5 Z M 1211.5 294.5 L 1234.5 294.5 L 1234.5 318.5 L 1211.5 318.5 Z M 1145.5 294.5 L 1168.5 294.5 L 1168.5 318.5 L 1145.5 318.5 Z M 1079.5 294.5 L 1103.5 294.5 L 1103.5 318.5 L 1079.5 318.5 Z M 1013.5 294.5 L 1037.5 294.5 L 1037.5 318.5 L 1013.5 318.5 Z M 947.5 294.5 L 971.5 294.5 L 971.5 318.5 L 947.5 318.5 Z M 881.5 294.5 L 905.5 294.5 L 905.5 318.5 L 881.5 318.5 Z M 815.5 294.5 L 839.5 294.5 L 839.5 318.5 L 815.5 318.5 Z M 749.5 294.5 L 773.5 294.5 L 773.5 318.5 L 749.5 318.5 Z M 683.5 294.5 L 707.5 294.5 L 707.5 318.5 L 683.5 318.5 Z M 617.5 294.5 L 641.5 294.5 L 641.5 318.5 L 617.5 318.5 Z M 552.5 294.5 L 575.5 294.5 L 575.5 318.5 L 552.5 318.5 Z M 486.5 294.5 L 509.5 294.5 L 509.5 318.5 L 486.5 318.5 Z M 420.5 294.5 L 443.5 294.5 L 443.5 318.5 L 420.5 318.5 Z M 354.5 294.5 L 377.5 294.5 L 377.5 318.5 L 354.5 318.5 Z M 288.5 294.5 L 311.5 294.5 L 311.5 318.5 L 288.5 318.5 Z M 222.5 752.5 L 245.5 752.5 L 245.5 775.5 L 222.5 775.5 Z M 1673.5 752.5 L 1696.5 752.5 L 1696.5 775.5 L 1673.5 775.5 Z M 1607.5 752.5 L 1630.5 752.5 L 1630.5 775.5 L 1607.5 775.5 Z M 1541.5 752.5 L 1564.5 752.5 L 1564.5 775.5 L 1541.5 775.5 Z M 1475.5 752.5 L 1498.5 752.5 L 1498.5 775.5 L 1475.5 775.5 Z M 1409.5 752.5 L 1432.5 752.5 L 1432.5 775.5 L 1409.5 775.5 Z M 1343.5 752.5 L 1366.5 752.5 L 1366.5 775.5 L 1343.5 775.5 Z M 1277.5 752.5 L 1300.5 752.5 L 1300.5 775.5 L 1277.5 775.5 Z M 1211.5 752.5 L 1234.5 752.5 L 1234.5 775.5 L 1211.5 775.5 Z M 1145.5 752.5 L 1168.5 752.5 L 1168.5 775.5 L 1145.5 775.5 Z M 1079.5 752.5 L 1103.5 752.5 L 1103.5 775.5 L 1079.5 775.5 Z M 1013.5 752.5 L 1037.5 752.5 L 1037.5 775.5 L 1013.5 775.5 Z M 947.5 752.5 L 971.5 752.5 L 971.5 775.5 L 947.5 775.5 Z M 881.5 752.5 L 905.5 752.5 L 905.5 775.5 L 881.5 775.5 Z M 815.5 752.5 L 839.5 752.5 L 839.5 775.5 L 815.5 775.5 Z M 749.5 752.5 L 773.5 752.5 L 773.5 775.5 L 749.5 775.5 Z M 683.5 752.5 L 707.5 752.5 L 707.5 775.5 L 683.5 775.5 Z M 617.5 752.5 L 641.5 752.5 L 641.5 775.5 L 617.5 775.5 Z M 552.5 752.5 L 575.5 752.5 L 575.5 775.5 L 552.5 775.5 Z M 486.5 752.5 L 509.5 752.5 L 509.5 775.5 L 486.5 775.5 Z M 420.5 752.5 L 443.5 752.5 L 443.5 775.5 L 420.5 775.5 Z M 354.5 752.5 L 377.5 752.5 L 377.5 775.5 L 354.5 775.5 Z M 288.5 752.5 L 311.5 752.5 L 311.5 775.5 L 288.5 775.5 Z M 288.5 752.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface305">
+<g id="surface334">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 1658.675781 519.691406 L 1658.675781 549.339844 L 1654.402344 549.339844 L 1639.070312 525.304688 L 1639.070312 549.339844 L 1635.488281 549.339844 L 1635.488281 519.691406 L 1639.597656 519.691406 L 1655.09375 543.933594 L 1655.09375 519.691406 Z M 1658.675781 519.691406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1607 556 L 1630 556 M 1607 533 L 1630 533 M 1607 533 L 1607 556 M 1630 533 L 1630 556 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1607 556 L 1630 556 M 1607 533 L 1630 533 M 1630 556 L 1630 533 M 1607 556 L 1607 533 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 310 L 200 319 M 195 315 L 204 315 M 199 316 L 201 316 M 199 314 L 201 314 M 199 314 L 199 316 M 201 314 L 201 316 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_1.svg b/cells/o2111a/sky130_fd_sc_hs__o2111a_1.svg
index 5a67f5b..6e27765 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_1.svg
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1268.5 664.5 L 1302.5 664.5 L 1302.5 833.5 L 1268.5 833.5 Z M 616.5 664.5 L 650.5 664.5 L 650.5 833.5 L 616.5 833.5 Z M 855.5 664.5 L 890.5 664.5 L 890.5 833.5 L 855.5 833.5 Z M 938.5 664.5 L 972.5 664.5 L 972.5 833.5 L 938.5 833.5 Z M 1027.5 664.5 L 1062.5 664.5 L 1062.5 833.5 L 1027.5 833.5 Z M 1144.5 664.5 L 1178.5 664.5 L 1178.5 833.5 L 1144.5 833.5 Z M 1144.5 664.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 765.5 252.5 L 799.5 252.5 L 799.5 445.5 L 765.5 445.5 Z M 1052.5 252.5 L 1087.5 252.5 L 1087.5 445.5 L 1052.5 445.5 Z M 879.5 252.5 L 914.5 252.5 L 914.5 445.5 L 879.5 445.5 Z M 1271.5 252.5 L 1306.5 252.5 L 1306.5 482.5 L 1271.5 482.5 Z M 1175.5 252.5 L 1209.5 252.5 L 1209.5 482.5 L 1175.5 482.5 Z M 620.5 240.5 L 655.5 240.5 L 655.5 496.5 L 620.5 496.5 Z M 620.5 240.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface346">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 581.824219 282.320312 L 599.191406 307.5 L 591.449219 307.5 L 578.050781 287.035156 L 564.589844 307.5 L 556.980469 307.5 L 574.351562 282.320312 L 558.058594 258.421875 L 565.664062 258.421875 L 578.253906 277.675781 L 590.910156 258.421875 L 598.382812 258.421875 Z M 581.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 557 816 L 596 816 M 557 777 L 596 777 M 557 777 L 557 816 M 596 777 L 596 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 557 816 L 596 816 M 557 777 L 596 777 M 596 816 L 596 777 M 557 816 L 557 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_2.svg b/cells/o2111a/sky130_fd_sc_hs__o2111a_2.svg
index a2df74b..bfd1902 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_2.svg
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1377.5 664.5 L 1411.5 664.5 L 1411.5 833.5 L 1377.5 833.5 Z M 554.5 664.5 L 588.5 664.5 L 588.5 833.5 L 554.5 833.5 Z M 685.5 664.5 L 719.5 664.5 L 719.5 833.5 L 685.5 833.5 Z M 799.5 664.5 L 834.5 664.5 L 834.5 833.5 L 799.5 833.5 Z M 905.5 664.5 L 939.5 664.5 L 939.5 833.5 L 905.5 833.5 Z M 1035.5 664.5 L 1070.5 664.5 L 1070.5 833.5 L 1035.5 833.5 Z M 1278.5 664.5 L 1313.5 664.5 L 1313.5 833.5 L 1278.5 833.5 Z M 1278.5 664.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 1263.5 240.5 L 1298.5 240.5 L 1298.5 496.5 L 1263.5 496.5 Z M 647.5 267.5 L 681.5 267.5 L 681.5 496.5 L 647.5 496.5 Z M 551.5 267.5 L 585.5 267.5 L 585.5 496.5 L 551.5 496.5 Z M 1039.5 267.5 L 1073.5 267.5 L 1073.5 496.5 L 1039.5 496.5 Z M 924.5 267.5 L 958.5 267.5 L 958.5 496.5 L 924.5 496.5 Z M 777.5 267.5 L 812.5 267.5 L 812.5 496.5 L 777.5 496.5 Z M 1366.5 240.5 L 1401.5 240.5 L 1401.5 496.5 L 1366.5 496.5 Z M 1366.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -169,6 +169,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 1350.824219 706.320312 L 1368.191406 731.5 L 1360.449219 731.5 L 1347.050781 711.035156 L 1333.589844 731.5 L 1325.980469 731.5 L 1343.351562 706.320312 L 1327.058594 682.421875 L 1334.664062 682.421875 L 1347.253906 701.675781 L 1359.910156 682.421875 L 1367.382812 682.421875 Z M 1350.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1326 392 L 1365 392 M 1326 353 L 1365 353 M 1326 353 L 1326 392 M 1365 353 L 1365 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1326 392 L 1365 392 M 1326 353 L 1365 353 M 1365 392 L 1365 353 M 1326 392 L 1326 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111a/sky130_fd_sc_hs__o2111a_4.svg b/cells/o2111a/sky130_fd_sc_hs__o2111a_4.svg
index ffef63b..3306347 100644
--- a/cells/o2111a/sky130_fd_sc_hs__o2111a_4.svg
+++ b/cells/o2111a/sky130_fd_sc_hs__o2111a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 873.5 606.5 L 900.5 606.5 L 900.5 742.5 L 873.5 742.5 Z M 963.5 606.5 L 990.5 606.5 L 990.5 742.5 L 963.5 742.5 Z M 715.5 606.5 L 742.5 606.5 L 742.5 742.5 L 715.5 742.5 Z M 794.5 606.5 L 821.5 606.5 L 821.5 742.5 L 794.5 742.5 Z M 1323.5 638.5 L 1351.5 638.5 L 1351.5 774.5 L 1323.5 774.5 Z M 1231.5 638.5 L 1259.5 638.5 L 1259.5 774.5 L 1231.5 774.5 Z M 1152.5 638.5 L 1180.5 638.5 L 1180.5 774.5 L 1152.5 774.5 Z M 366.5 638.5 L 394.5 638.5 L 394.5 774.5 L 366.5 774.5 Z M 287.5 638.5 L 315.5 638.5 L 315.5 774.5 L 287.5 774.5 Z M 445.5 638.5 L 473.5 638.5 L 473.5 774.5 L 445.5 774.5 Z M 524.5 638.5 L 552.5 638.5 L 552.5 774.5 L 524.5 774.5 Z M 1586.5 638.5 L 1614.5 638.5 L 1614.5 774.5 L 1586.5 774.5 Z M 1402.5 638.5 L 1430.5 638.5 L 1430.5 774.5 L 1402.5 774.5 Z M 1507.5 638.5 L 1535.5 638.5 L 1535.5 774.5 L 1507.5 774.5 Z M 1507.5 638.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1238.5 298.5 L 1265.5 298.5 L 1265.5 481.5 L 1238.5 481.5 Z M 472.5 327.5 L 500.5 327.5 L 500.5 481.5 L 472.5 481.5 Z M 389.5 327.5 L 417.5 327.5 L 417.5 481.5 L 389.5 481.5 Z M 960.5 298.5 L 988.5 298.5 L 988.5 481.5 L 960.5 481.5 Z M 678.5 327.5 L 705.5 327.5 L 705.5 481.5 L 678.5 481.5 Z M 761.5 327.5 L 788.5 327.5 L 788.5 481.5 L 761.5 481.5 Z M 564.5 327.5 L 591.5 327.5 L 591.5 481.5 L 564.5 481.5 Z M 1155.5 298.5 L 1183.5 298.5 L 1183.5 481.5 L 1155.5 481.5 Z M 868.5 298.5 L 896.5 298.5 L 896.5 481.5 L 868.5 481.5 Z M 288.5 327.5 L 316.5 327.5 L 316.5 481.5 L 288.5 481.5 Z M 1336.5 298.5 L 1364.5 298.5 L 1364.5 504.5 L 1336.5 504.5 Z M 1593.5 298.5 L 1621.5 298.5 L 1621.5 504.5 L 1593.5 504.5 Z M 1511.5 298.5 L 1538.5 298.5 L 1538.5 504.5 L 1511.5 504.5 Z M 1428.5 298.5 L 1455.5 298.5 L 1455.5 504.5 L 1428.5 504.5 Z M 1428.5 298.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface348">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -178,6 +178,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 1669.886719 603.042969 L 1684 623.5 L 1677.707031 623.5 L 1666.824219 606.871094 L 1655.882812 623.5 L 1649.703125 623.5 L 1663.816406 603.042969 L 1650.578125 583.625 L 1656.757812 583.625 L 1666.988281 599.269531 L 1677.269531 583.625 L 1683.34375 583.625 Z M 1669.886719 603.042969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1649 491 L 1681 491 M 1649 460 L 1681 460 M 1649 460 L 1649 491 M 1681 460 L 1681 491 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1649 491 L 1681 491 M 1649 460 L 1681 460 M 1681 491 L 1681 460 M 1649 491 L 1649 460 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.svg b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.svg
index 736e9fd..2f84330 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.svg
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 1216.5 664.5 L 1251.5 664.5 L 1251.5 833.5 L 1216.5 833.5 Z M 751.5 664.5 L 785.5 664.5 L 785.5 833.5 L 751.5 833.5 Z M 840.5 664.5 L 875.5 664.5 L 875.5 833.5 L 840.5 833.5 Z M 964.5 664.5 L 999.5 664.5 L 999.5 833.5 L 964.5 833.5 Z M 1081.5 664.5 L 1115.5 664.5 L 1115.5 833.5 L 1081.5 833.5 Z M 1081.5 664.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 1208.5 240.5 L 1243.5 240.5 L 1243.5 496.5 L 1208.5 496.5 Z M 748.5 240.5 L 782.5 240.5 L 782.5 496.5 L 748.5 496.5 Z M 851.5 240.5 L 885.5 240.5 L 885.5 496.5 L 851.5 496.5 Z M 995.5 240.5 L 1030.5 240.5 L 1030.5 496.5 L 995.5 496.5 Z M 1104.5 240.5 L 1138.5 240.5 L 1138.5 496.5 L 1104.5 496.5 Z M 1104.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -176,6 +176,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 1320.773438 612.503906 L 1310.203125 612.503906 L 1310.203125 608.261719 L 1312.019531 608.058594 L 1313.636719 607.789062 L 1315.050781 607.453125 L 1316.261719 607.183594 L 1317.269531 606.847656 L 1318.148438 606.445312 L 1318.820312 606.039062 L 1319.425781 605.570312 L 1319.964844 605.03125 L 1320.503906 604.355469 L 1320.972656 603.617188 L 1321.445312 602.742188 L 1321.648438 602.269531 L 1321.847656 601.730469 L 1322.050781 601.125 L 1322.320312 600.386719 L 1322.523438 599.644531 L 1322.792969 598.769531 L 1326.695312 598.769531 L 1326.695312 646.5 L 1320.773438 646.5 Z M 1320.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 477 L 1311 477 M 1272 438 L 1311 438 M 1272 438 L 1272 477 M 1311 438 L 1311 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 477 L 1311 477 M 1272 438 L 1311 438 M 1311 477 L 1311 438 M 1272 477 L 1272 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.svg b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.svg
index 9a115c9..8156458 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.svg
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1479.5 664.5 L 1513.5 664.5 L 1513.5 833.5 L 1479.5 833.5 Z M 411.5 664.5 L 445.5 664.5 L 445.5 833.5 L 411.5 833.5 Z M 509.5 664.5 L 544.5 664.5 L 544.5 833.5 L 509.5 833.5 Z M 608.5 664.5 L 642.5 664.5 L 642.5 833.5 L 608.5 833.5 Z M 722.5 664.5 L 757.5 664.5 L 757.5 833.5 L 722.5 833.5 Z M 949.5 664.5 L 984.5 664.5 L 984.5 833.5 L 949.5 833.5 Z M 1064.5 664.5 L 1098.5 664.5 L 1098.5 833.5 L 1064.5 833.5 Z M 1162.5 664.5 L 1197.5 664.5 L 1197.5 833.5 L 1162.5 833.5 Z M 1266.5 664.5 L 1300.5 664.5 L 1300.5 833.5 L 1266.5 833.5 Z M 1364.5 664.5 L 1399.5 664.5 L 1399.5 833.5 L 1364.5 833.5 Z M 1364.5 664.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1487.5 240.5 L 1521.5 240.5 L 1521.5 496.5 L 1487.5 496.5 Z M 407.5 240.5 L 442.5 240.5 L 442.5 496.5 L 407.5 496.5 Z M 510.5 240.5 L 545.5 240.5 L 545.5 496.5 L 510.5 496.5 Z M 625.5 240.5 L 659.5 240.5 L 659.5 496.5 L 625.5 496.5 Z M 728.5 240.5 L 763.5 240.5 L 763.5 496.5 L 728.5 496.5 Z M 831.5 240.5 L 866.5 240.5 L 866.5 496.5 L 831.5 496.5 Z M 934.5 240.5 L 969.5 240.5 L 969.5 496.5 L 934.5 496.5 Z M 1166.5 240.5 L 1200.5 240.5 L 1200.5 496.5 L 1166.5 496.5 Z M 1269.5 240.5 L 1303.5 240.5 L 1303.5 496.5 L 1269.5 496.5 Z M 1372.5 240.5 L 1407.5 240.5 L 1407.5 496.5 L 1372.5 496.5 Z M 1372.5 240.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface331">
+<g id="surface359">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -190,6 +190,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 469.554688 288.246094 L 469.554688 307.5 L 463.292969 307.5 L 463.292969 288.246094 L 444.375 258.421875 L 452.117188 258.421875 L 466.523438 282.320312 L 480.527344 258.421875 L 488 258.421875 Z M 469.554688 288.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 445 816 L 484 816 M 445 777 L 484 777 M 445 777 L 445 816 M 484 777 L 484 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 445 816 L 484 816 M 445 777 L 484 777 M 484 816 L 484 777 M 445 816 L 445 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.svg b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.svg
index c15277a..2acbce2 100644
--- a/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.svg
+++ b/cells/o2111ai/sky130_fd_sc_hs__o2111ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1630.5 618.5 L 1652.5 618.5 L 1652.5 729.5 L 1630.5 729.5 Z M 266.5 618.5 L 289.5 618.5 L 289.5 729.5 L 266.5 729.5 Z M 341.5 618.5 L 364.5 618.5 L 364.5 729.5 L 341.5 729.5 Z M 406.5 618.5 L 428.5 618.5 L 428.5 729.5 L 406.5 729.5 Z M 470.5 618.5 L 493.5 618.5 L 493.5 729.5 L 470.5 729.5 Z M 535.5 618.5 L 557.5 618.5 L 557.5 729.5 L 535.5 729.5 Z M 599.5 618.5 L 622.5 618.5 L 622.5 729.5 L 599.5 729.5 Z M 664.5 618.5 L 686.5 618.5 L 686.5 729.5 L 664.5 729.5 Z M 728.5 618.5 L 751.5 618.5 L 751.5 729.5 L 728.5 729.5 Z M 877.5 618.5 L 899.5 618.5 L 899.5 729.5 L 877.5 729.5 Z M 941.5 618.5 L 964.5 618.5 L 964.5 729.5 L 941.5 729.5 Z M 1006.5 618.5 L 1028.5 618.5 L 1028.5 729.5 L 1006.5 729.5 Z M 1070.5 618.5 L 1093.5 618.5 L 1093.5 729.5 L 1070.5 729.5 Z M 1145.5 618.5 L 1168.5 618.5 L 1168.5 729.5 L 1145.5 729.5 Z M 1220.5 618.5 L 1243.5 618.5 L 1243.5 729.5 L 1220.5 729.5 Z M 1285.5 618.5 L 1307.5 618.5 L 1307.5 729.5 L 1285.5 729.5 Z M 1349.5 618.5 L 1372.5 618.5 L 1372.5 729.5 L 1349.5 729.5 Z M 1414.5 618.5 L 1436.5 618.5 L 1436.5 729.5 L 1414.5 729.5 Z M 1489.5 618.5 L 1511.5 618.5 L 1511.5 729.5 L 1489.5 729.5 Z M 1565.5 618.5 L 1588.5 618.5 L 1588.5 729.5 L 1565.5 729.5 Z M 1565.5 618.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1628.5 341.5 L 1651.5 341.5 L 1651.5 509.5 L 1628.5 509.5 Z M 381.5 341.5 L 403.5 341.5 L 403.5 509.5 L 381.5 509.5 Z M 463.5 341.5 L 486.5 341.5 L 486.5 509.5 L 463.5 509.5 Z M 531.5 341.5 L 553.5 341.5 L 553.5 509.5 L 531.5 509.5 Z M 661.5 341.5 L 684.5 341.5 L 684.5 509.5 L 661.5 509.5 Z M 729.5 341.5 L 751.5 341.5 L 751.5 509.5 L 729.5 509.5 Z M 811.5 341.5 L 834.5 341.5 L 834.5 509.5 L 811.5 509.5 Z M 1131.5 341.5 L 1153.5 341.5 L 1153.5 509.5 L 1131.5 509.5 Z M 1201.5 341.5 L 1223.5 341.5 L 1223.5 509.5 L 1201.5 509.5 Z M 1268.5 341.5 L 1291.5 341.5 L 1291.5 509.5 L 1268.5 509.5 Z M 1336.5 341.5 L 1358.5 341.5 L 1358.5 509.5 L 1336.5 509.5 Z M 1405.5 341.5 L 1428.5 341.5 L 1428.5 509.5 L 1405.5 509.5 Z M 1478.5 341.5 L 1501.5 341.5 L 1501.5 509.5 L 1478.5 509.5 Z M 1553.5 341.5 L 1576.5 341.5 L 1576.5 509.5 L 1553.5 509.5 Z M 1553.5 341.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image362"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface356">
+<g id="surface385">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -202,6 +202,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 403.109375 529.542969 L 396.28125 529.542969 L 396.28125 526.804688 L 397.457031 526.675781 L 398.5 526.5 L 399.414062 526.28125 L 400.195312 526.109375 L 400.847656 525.890625 L 401.414062 525.628906 L 401.847656 525.371094 L 402.238281 525.066406 L 402.585938 524.71875 L 402.933594 524.28125 L 403.238281 523.804688 L 403.542969 523.238281 L 403.675781 522.933594 L 403.804688 522.585938 L 403.933594 522.195312 L 404.109375 521.71875 L 404.238281 521.238281 L 404.414062 520.675781 L 406.933594 520.675781 L 406.933594 551.5 L 403.109375 551.5 Z M 403.109375 529.542969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 370 557 L 396 557 M 370 531 L 396 531 M 370 531 L 370 557 M 396 531 L 396 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 557 L 396 557 M 370 531 L 396 531 M 396 557 L 396 531 M 370 557 L 370 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_1.svg b/cells/o211a/sky130_fd_sc_hs__o211a_1.svg
index 093e139..3e7b041 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_1.svg
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1191.5 616.5 L 1225.5 616.5 L 1225.5 762.5 L 1191.5 762.5 Z M 837.5 616.5 L 871.5 616.5 L 871.5 762.5 L 837.5 762.5 Z M 1300.5 616.5 L 1334.5 616.5 L 1334.5 762.5 L 1300.5 762.5 Z M 988.5 616.5 L 1023.5 616.5 L 1023.5 762.5 L 988.5 762.5 Z M 563.5 664.5 L 598.5 664.5 L 598.5 833.5 L 563.5 833.5 Z M 563.5 664.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1324.5 240.5 L 1358.5 240.5 L 1358.5 469.5 L 1324.5 469.5 Z M 1088.5 240.5 L 1122.5 240.5 L 1122.5 469.5 L 1088.5 469.5 Z M 889.5 240.5 L 923.5 240.5 L 923.5 469.5 L 889.5 469.5 Z M 985.5 240.5 L 1019.5 240.5 L 1019.5 469.5 L 985.5 469.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 565.5 240.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface334">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,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 880.773438 527.503906 L 870.203125 527.503906 L 870.203125 523.261719 L 872.019531 523.058594 L 873.636719 522.789062 L 875.050781 522.453125 L 876.261719 522.183594 L 877.269531 521.847656 L 878.148438 521.445312 L 878.820312 521.039062 L 879.425781 520.570312 L 879.964844 520.03125 L 880.503906 519.355469 L 880.972656 518.617188 L 881.445312 517.742188 L 881.648438 517.269531 L 881.847656 516.730469 L 882.050781 516.125 L 882.320312 515.386719 L 882.523438 514.644531 L 882.792969 513.769531 L 886.695312 513.769531 L 886.695312 561.5 L 880.773438 561.5 Z M 880.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 832 562 L 871 562 M 832 523 L 871 523 M 832 523 L 832 562 M 871 523 L 871 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 832 562 L 871 562 M 832 523 L 871 523 M 871 562 L 871 523 M 832 562 L 832 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_2.svg b/cells/o211a/sky130_fd_sc_hs__o211a_2.svg
index 8dd9545..1ed0f1f 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_2.svg
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1275.5 664.5 L 1309.5 664.5 L 1309.5 833.5 L 1275.5 833.5 Z M 622.5 664.5 L 656.5 664.5 L 656.5 833.5 L 622.5 833.5 Z M 711.5 664.5 L 745.5 664.5 L 745.5 833.5 L 711.5 833.5 Z M 828.5 664.5 L 862.5 664.5 L 862.5 833.5 L 828.5 833.5 Z M 956.5 664.5 L 991.5 664.5 L 991.5 833.5 L 956.5 833.5 Z M 1176.5 664.5 L 1211.5 664.5 L 1211.5 833.5 L 1176.5 833.5 Z M 1176.5 664.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1154.5 240.5 L 1189.5 240.5 L 1189.5 496.5 L 1154.5 496.5 Z M 742.5 267.5 L 776.5 267.5 L 776.5 496.5 L 742.5 496.5 Z M 618.5 267.5 L 653.5 267.5 L 653.5 496.5 L 618.5 496.5 Z M 955.5 267.5 L 989.5 267.5 L 989.5 496.5 L 955.5 496.5 Z M 847.5 267.5 L 882.5 267.5 L 882.5 496.5 L 847.5 496.5 Z M 1258.5 240.5 L 1292.5 240.5 L 1292.5 496.5 L 1258.5 496.5 Z M 1258.5 240.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1241.824219 621.320312 L 1259.191406 646.5 L 1251.449219 646.5 L 1238.050781 626.035156 L 1224.589844 646.5 L 1216.980469 646.5 L 1234.351562 621.320312 L 1218.058594 597.421875 L 1225.664062 597.421875 L 1238.253906 616.675781 L 1250.910156 597.421875 L 1258.382812 597.421875 Z M 1241.824219 621.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1217 477 L 1256 477 M 1217 438 L 1256 438 M 1217 438 L 1217 477 M 1256 438 L 1256 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1217 477 L 1256 477 M 1217 438 L 1256 438 M 1256 477 L 1256 438 M 1217 477 L 1217 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211a/sky130_fd_sc_hs__o211a_4.svg b/cells/o211a/sky130_fd_sc_hs__o211a_4.svg
index 1ebd626..4e7651a 100644
--- a/cells/o211a/sky130_fd_sc_hs__o211a_4.svg
+++ b/cells/o211a/sky130_fd_sc_hs__o211a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.5 850.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1575.5 625.5 L 1608.5 625.5 L 1608.5 766.5 L 1575.5 766.5 Z M 1358.5 625.5 L 1391.5 625.5 L 1391.5 766.5 L 1358.5 766.5 Z M 1143.5 625.5 L 1176.5 625.5 L 1176.5 766.5 L 1143.5 766.5 Z M 1256.5 625.5 L 1289.5 625.5 L 1289.5 766.5 L 1256.5 766.5 Z M 843.5 625.5 L 876.5 625.5 L 876.5 766.5 L 843.5 766.5 Z M 1465.5 625.5 L 1498.5 625.5 L 1498.5 766.5 L 1465.5 766.5 Z M 1033.5 625.5 L 1066.5 625.5 L 1066.5 766.5 L 1033.5 766.5 Z M 938.5 625.5 L 971.5 625.5 L 971.5 766.5 L 938.5 766.5 Z M 412.5 659.5 L 445.5 659.5 L 445.5 823.5 L 412.5 823.5 Z M 522.5 659.5 L 556.5 659.5 L 556.5 823.5 L 522.5 823.5 Z M 317.5 659.5 L 350.5 659.5 L 350.5 823.5 L 317.5 823.5 Z M 617.5 659.5 L 651.5 659.5 L 651.5 823.5 L 617.5 823.5 Z M 617.5 659.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1463.5 251.5 L 1496.5 251.5 L 1496.5 472.5 L 1463.5 472.5 Z M 1253.5 251.5 L 1286.5 251.5 L 1286.5 472.5 L 1253.5 472.5 Z M 800.5 287.5 L 833.5 287.5 L 833.5 472.5 L 800.5 472.5 Z M 1123.5 287.5 L 1157.5 287.5 L 1157.5 472.5 L 1123.5 472.5 Z M 1024.5 287.5 L 1057.5 287.5 L 1057.5 472.5 L 1024.5 472.5 Z M 1562.5 251.5 L 1595.5 251.5 L 1595.5 472.5 L 1562.5 472.5 Z M 1352.5 251.5 L 1385.5 251.5 L 1385.5 472.5 L 1352.5 472.5 Z M 899.5 287.5 L 932.5 287.5 L 932.5 472.5 L 899.5 472.5 Z M 422.5 250.5 L 455.5 250.5 L 455.5 498.5 L 422.5 498.5 Z M 543.5 250.5 L 577.5 250.5 L 577.5 498.5 L 543.5 498.5 Z M 643.5 250.5 L 676.5 250.5 L 676.5 498.5 L 643.5 498.5 Z M 322.5 250.5 L 356.5 250.5 L 356.5 498.5 L 322.5 498.5 Z M 322.5 250.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,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 274.726562 536.371094 L 291.371094 560.5 L 283.953125 560.5 L 271.113281 540.886719 L 258.210938 560.5 L 250.917969 560.5 L 267.566406 536.371094 L 251.953125 513.46875 L 259.242188 513.46875 L 271.304688 531.917969 L 283.433594 513.46875 L 290.597656 513.46875 Z M 274.726562 536.371094 "/>
 <path style="fill:none;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 561 L 288 561 M 251 524 L 288 524 M 251 524 L 251 561 M 288 524 L 288 561 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 561 L 288 561 M 251 524 L 288 524 M 288 561 L 288 524 M 251 561 L 251 524 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_1.svg b/cells/o211ai/sky130_fd_sc_hs__o211ai_1.svg
index 1807679..f1e8aa3 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_1.svg
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image353"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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="#image353"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1086.5 664.5 L 1120.5 664.5 L 1120.5 833.5 L 1086.5 833.5 Z M 734.5 664.5 L 768.5 664.5 L 768.5 833.5 L 734.5 833.5 Z M 848.5 664.5 L 883.5 664.5 L 883.5 833.5 L 848.5 833.5 Z M 955.5 664.5 L 989.5 664.5 L 989.5 833.5 L 955.5 833.5 Z M 955.5 664.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1107.5 240.5 L 1142.5 240.5 L 1142.5 496.5 L 1107.5 496.5 Z M 732.5 240.5 L 766.5 240.5 L 766.5 496.5 L 732.5 496.5 Z M 828.5 240.5 L 862.5 240.5 L 862.5 496.5 L 828.5 496.5 Z M 993.5 240.5 L 1027.5 240.5 L 1027.5 496.5 L 993.5 496.5 Z M 993.5 240.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface322">
+<g id="surface350">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -181,6 +181,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 716.773438 527.503906 L 706.203125 527.503906 L 706.203125 523.261719 L 708.019531 523.058594 L 709.636719 522.789062 L 711.050781 522.453125 L 712.261719 522.183594 L 713.269531 521.847656 L 714.148438 521.445312 L 714.820312 521.039062 L 715.425781 520.570312 L 715.964844 520.03125 L 716.503906 519.355469 L 716.972656 518.617188 L 717.445312 517.742188 L 717.648438 517.269531 L 717.847656 516.730469 L 718.050781 516.125 L 718.320312 515.386719 L 718.523438 514.644531 L 718.792969 513.769531 L 722.695312 513.769531 L 722.695312 561.5 L 716.773438 561.5 Z M 716.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 669 562 L 708 562 M 669 523 L 708 523 M 669 523 L 669 562 M 708 523 L 708 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 669 562 L 708 562 M 669 523 L 708 523 M 708 562 L 708 523 M 669 562 L 669 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_2.svg b/cells/o211ai/sky130_fd_sc_hs__o211ai_2.svg
index d12b40c..801d226 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_2.svg
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 510.5 652.5 L 545.5 652.5 L 545.5 822.5 L 510.5 822.5 Z M 609.5 652.5 L 643.5 652.5 L 643.5 822.5 L 609.5 822.5 Z M 838.5 652.5 L 873.5 652.5 L 873.5 822.5 L 838.5 822.5 Z M 724.5 652.5 L 758.5 652.5 L 758.5 822.5 L 724.5 822.5 Z M 1067.5 664.5 L 1102.5 664.5 L 1102.5 833.5 L 1067.5 833.5 Z M 1374.5 664.5 L 1409.5 664.5 L 1409.5 833.5 L 1374.5 833.5 Z M 1166.5 664.5 L 1200.5 664.5 L 1200.5 833.5 L 1166.5 833.5 Z M 1266.5 664.5 L 1300.5 664.5 L 1300.5 833.5 L 1266.5 833.5 Z M 1266.5 664.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 1378.5 240.5 L 1412.5 240.5 L 1412.5 496.5 L 1378.5 496.5 Z M 516.5 240.5 L 551.5 240.5 L 551.5 496.5 L 516.5 496.5 Z M 619.5 240.5 L 654.5 240.5 L 654.5 496.5 L 619.5 496.5 Z M 722.5 240.5 L 757.5 240.5 L 757.5 496.5 L 722.5 496.5 Z M 826.5 240.5 L 860.5 240.5 L 860.5 496.5 L 826.5 496.5 Z M 1057.5 240.5 L 1091.5 240.5 L 1091.5 496.5 L 1057.5 496.5 Z M 1160.5 240.5 L 1195.5 240.5 L 1195.5 496.5 L 1160.5 496.5 Z M 1263.5 240.5 L 1298.5 240.5 L 1298.5 496.5 L 1263.5 496.5 Z M 1263.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -169,6 +169,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 580.554688 288.246094 L 580.554688 307.5 L 574.292969 307.5 L 574.292969 288.246094 L 555.375 258.421875 L 563.117188 258.421875 L 577.523438 282.320312 L 591.527344 258.421875 L 599 258.421875 Z M 580.554688 288.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 556 816 L 595 816 M 556 777 L 595 777 M 556 777 L 556 816 M 595 777 L 595 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 556 816 L 595 816 M 556 777 L 595 777 M 595 816 L 595 777 M 556 816 L 556 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o211ai/sky130_fd_sc_hs__o211ai_4.svg b/cells/o211ai/sky130_fd_sc_hs__o211ai_4.svg
index 8f569da..6b2c41d 100644
--- a/cells/o211ai/sky130_fd_sc_hs__o211ai_4.svg
+++ b/cells/o211ai/sky130_fd_sc_hs__o211ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1604.5 629.5 L 1632.5 629.5 L 1632.5 765.5 L 1604.5 765.5 Z M 1525.5 629.5 L 1553.5 629.5 L 1553.5 765.5 L 1525.5 765.5 Z M 1367.5 629.5 L 1395.5 629.5 L 1395.5 765.5 L 1367.5 765.5 Z M 1446.5 629.5 L 1474.5 629.5 L 1474.5 765.5 L 1446.5 765.5 Z M 549.5 638.5 L 577.5 638.5 L 577.5 774.5 L 549.5 774.5 Z M 628.5 638.5 L 656.5 638.5 L 656.5 774.5 L 628.5 774.5 Z M 707.5 638.5 L 735.5 638.5 L 735.5 774.5 L 707.5 774.5 Z M 786.5 638.5 L 814.5 638.5 L 814.5 774.5 L 786.5 774.5 Z M 869.5 638.5 L 897.5 638.5 L 897.5 774.5 L 869.5 774.5 Z M 948.5 638.5 L 976.5 638.5 L 976.5 774.5 L 948.5 774.5 Z M 1027.5 638.5 L 1055.5 638.5 L 1055.5 774.5 L 1027.5 774.5 Z M 1106.5 638.5 L 1134.5 638.5 L 1134.5 774.5 L 1106.5 774.5 Z M 1185.5 638.5 L 1213.5 638.5 L 1213.5 774.5 L 1185.5 774.5 Z M 286.5 638.5 L 314.5 638.5 L 314.5 774.5 L 286.5 774.5 Z M 457.5 638.5 L 485.5 638.5 L 485.5 774.5 L 457.5 774.5 Z M 378.5 638.5 L 406.5 638.5 L 406.5 774.5 L 378.5 774.5 Z M 378.5 638.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1359.5 298.5 L 1387.5 298.5 L 1387.5 504.5 L 1359.5 504.5 Z M 291.5 298.5 L 318.5 298.5 L 318.5 504.5 L 291.5 504.5 Z M 374.5 298.5 L 401.5 298.5 L 401.5 504.5 L 374.5 504.5 Z M 456.5 298.5 L 484.5 298.5 L 484.5 504.5 L 456.5 504.5 Z M 539.5 298.5 L 567.5 298.5 L 567.5 504.5 L 539.5 504.5 Z M 631.5 298.5 L 659.5 298.5 L 659.5 504.5 L 631.5 504.5 Z M 714.5 298.5 L 741.5 298.5 L 741.5 504.5 L 714.5 504.5 Z M 796.5 298.5 L 824.5 298.5 L 824.5 504.5 L 796.5 504.5 Z M 888.5 298.5 L 916.5 298.5 L 916.5 504.5 L 888.5 504.5 Z M 1083.5 298.5 L 1111.5 298.5 L 1111.5 504.5 L 1083.5 504.5 Z M 1183.5 298.5 L 1210.5 298.5 L 1210.5 504.5 L 1183.5 504.5 Z M 1276.5 298.5 L 1304.5 298.5 L 1304.5 504.5 L 1276.5 504.5 Z M 1276.5 298.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface365">
+<g id="surface394">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -211,6 +211,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 1668.667969 335.855469 L 1668.667969 351.5 L 1663.582031 351.5 L 1663.582031 335.855469 L 1648.210938 311.625 L 1654.5 311.625 L 1666.207031 331.042969 L 1677.585938 311.625 L 1683.65625 311.625 Z M 1668.667969 335.855469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1649 763 L 1681 763 M 1649 732 L 1681 732 M 1649 732 L 1649 763 M 1681 732 L 1681 763 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1649 763 L 1681 763 M 1649 732 L 1681 732 M 1681 763 L 1681 732 M 1649 763 L 1649 732 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_1.svg b/cells/o21a/sky130_fd_sc_hs__o21a_1.svg
index a8d41ea..347b046 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_1.svg
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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 729.5 664.5 L 764.5 664.5 L 764.5 833.5 L 729.5 833.5 Z M 1162.5 687.5 L 1197.5 687.5 L 1197.5 833.5 L 1162.5 833.5 Z M 1064.5 687.5 L 1098.5 687.5 L 1098.5 833.5 L 1064.5 833.5 Z M 965.5 687.5 L 1000.5 687.5 L 1000.5 833.5 L 965.5 833.5 Z M 965.5 687.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 1160.5 246.5 L 1195.5 246.5 L 1195.5 475.5 L 1160.5 475.5 Z M 914.5 282.5 L 948.5 282.5 L 948.5 475.5 L 914.5 475.5 Z M 1030.5 246.5 L 1064.5 246.5 L 1064.5 475.5 L 1030.5 475.5 Z M 732.5 240.5 L 766.5 240.5 L 766.5 496.5 L 732.5 496.5 Z M 732.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.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>
@@ -172,6 +172,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 1266.773438 527.503906 L 1256.203125 527.503906 L 1256.203125 523.261719 L 1258.019531 523.058594 L 1259.636719 522.789062 L 1261.050781 522.453125 L 1262.261719 522.183594 L 1263.269531 521.847656 L 1264.148438 521.445312 L 1264.820312 521.039062 L 1265.425781 520.570312 L 1265.964844 520.03125 L 1266.503906 519.355469 L 1266.972656 518.617188 L 1267.445312 517.742188 L 1267.648438 517.269531 L 1267.847656 516.730469 L 1268.050781 516.125 L 1268.320312 515.386719 L 1268.523438 514.644531 L 1268.792969 513.769531 L 1272.695312 513.769531 L 1272.695312 561.5 L 1266.773438 561.5 Z M 1266.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1219 562 L 1258 562 M 1219 523 L 1258 523 M 1219 523 L 1219 562 M 1258 523 L 1258 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1219 562 L 1258 562 M 1219 523 L 1258 523 M 1258 562 L 1258 523 M 1219 562 L 1219 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_2.svg b/cells/o21a/sky130_fd_sc_hs__o21a_2.svg
index 4451c7c..dc5355f 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_2.svg
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1271.5 664.5 L 1306.5 664.5 L 1306.5 833.5 L 1271.5 833.5 Z M 665.5 664.5 L 699.5 664.5 L 699.5 833.5 L 665.5 833.5 Z M 805.5 664.5 L 839.5 664.5 L 839.5 833.5 L 805.5 833.5 Z M 914.5 664.5 L 948.5 664.5 L 948.5 833.5 L 914.5 833.5 Z M 1173.5 664.5 L 1207.5 664.5 L 1207.5 833.5 L 1173.5 833.5 Z M 1173.5 664.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1056.5 240.5 L 1090.5 240.5 L 1090.5 496.5 L 1056.5 496.5 Z M 767.5 267.5 L 801.5 267.5 L 801.5 496.5 L 767.5 496.5 Z M 671.5 267.5 L 705.5 267.5 L 705.5 496.5 L 671.5 496.5 Z M 898.5 267.5 L 932.5 267.5 L 932.5 496.5 L 898.5 496.5 Z M 1159.5 240.5 L 1193.5 240.5 L 1193.5 496.5 L 1159.5 496.5 Z M 1159.5 240.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1241.824219 536.320312 L 1259.191406 561.5 L 1251.449219 561.5 L 1238.050781 541.035156 L 1224.589844 561.5 L 1216.980469 561.5 L 1234.351562 536.320312 L 1218.058594 512.421875 L 1225.664062 512.421875 L 1238.253906 531.675781 L 1250.910156 512.421875 L 1258.382812 512.421875 Z M 1241.824219 536.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1217 562 L 1256 562 M 1217 523 L 1256 523 M 1217 523 L 1217 562 M 1256 523 L 1256 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1217 562 L 1256 562 M 1217 523 L 1256 523 M 1256 562 L 1256 523 M 1217 562 L 1217 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21a/sky130_fd_sc_hs__o21a_4.svg b/cells/o21a/sky130_fd_sc_hs__o21a_4.svg
index f5738bf..bfddb14 100644
--- a/cells/o21a/sky130_fd_sc_hs__o21a_4.svg
+++ b/cells/o21a/sky130_fd_sc_hs__o21a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.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 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.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 396.5 628.5 L 430.5 628.5 L 430.5 775.5 L 396.5 775.5 Z M 512.5 628.5 L 546.5 628.5 L 546.5 775.5 L 512.5 775.5 Z M 743.5 628.5 L 777.5 628.5 L 777.5 775.5 L 743.5 775.5 Z M 842.5 628.5 L 876.5 628.5 L 876.5 775.5 L 842.5 775.5 Z M 610.5 628.5 L 644.5 628.5 L 644.5 775.5 L 610.5 775.5 Z M 940.5 628.5 L 975.5 628.5 L 975.5 775.5 L 940.5 775.5 Z M 1390.5 664.5 L 1425.5 664.5 L 1425.5 833.5 L 1390.5 833.5 Z M 1489.5 664.5 L 1523.5 664.5 L 1523.5 833.5 L 1489.5 833.5 Z M 1185.5 664.5 L 1220.5 664.5 L 1220.5 833.5 L 1185.5 833.5 Z M 1284.5 664.5 L 1318.5 664.5 L 1318.5 833.5 L 1284.5 833.5 Z M 1284.5 664.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 616.5 246.5 L 650.5 246.5 L 650.5 475.5 L 616.5 475.5 Z M 398.5 246.5 L 432.5 246.5 L 432.5 475.5 L 398.5 475.5 Z M 976.5 282.5 L 1010.5 282.5 L 1010.5 475.5 L 976.5 475.5 Z M 854.5 282.5 L 889.5 282.5 L 889.5 475.5 L 854.5 475.5 Z M 730.5 246.5 L 765.5 246.5 L 765.5 475.5 L 730.5 475.5 Z M 513.5 246.5 L 547.5 246.5 L 547.5 475.5 L 513.5 475.5 Z M 1246.5 240.5 L 1280.5 240.5 L 1280.5 496.5 L 1246.5 496.5 Z M 1372.5 240.5 L 1407.5 240.5 L 1407.5 496.5 L 1372.5 496.5 Z M 1475.5 240.5 L 1510.5 240.5 L 1510.5 496.5 L 1475.5 496.5 Z M 1143.5 240.5 L 1177.5 240.5 L 1177.5 496.5 L 1143.5 496.5 Z M 1143.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.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>
@@ -158,6 +158,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 1569.824219 536.320312 L 1587.191406 561.5 L 1579.449219 561.5 L 1566.050781 541.035156 L 1552.589844 561.5 L 1544.980469 561.5 L 1562.351562 536.320312 L 1546.058594 512.421875 L 1553.664062 512.421875 L 1566.253906 531.675781 L 1578.910156 512.421875 L 1586.382812 512.421875 Z M 1569.824219 536.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1545 562 L 1584 562 M 1545 523 L 1584 523 M 1545 523 L 1545 562 M 1584 523 L 1584 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1545 562 L 1584 562 M 1545 523 L 1584 523 M 1584 562 L 1584 523 M 1545 562 L 1545 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_1.svg b/cells/o21ai/sky130_fd_sc_hs__o21ai_1.svg
index ceb3972..b3e51a3 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_1.svg
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <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 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#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 1091.5 664.5 L 1126.5 664.5 L 1126.5 833.5 L 1091.5 833.5 Z M 784.5 664.5 L 819.5 664.5 L 819.5 833.5 L 784.5 833.5 Z M 993.5 664.5 L 1027.5 664.5 L 1027.5 833.5 L 993.5 833.5 Z M 993.5 664.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <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 1086.5 240.5 L 1120.5 240.5 L 1120.5 496.5 L 1086.5 496.5 Z M 839.5 240.5 L 874.5 240.5 L 874.5 496.5 L 839.5 496.5 Z M 936.5 240.5 L 970.5 240.5 L 970.5 496.5 L 936.5 496.5 Z M 936.5 240.5 "/>
 </clipPath>
-<image id="image297" 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="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image298" 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="#image298"/>
+  <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="surface292">
+<g id="surface320">
 <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 771.773438 612.503906 L 761.203125 612.503906 L 761.203125 608.261719 L 763.019531 608.058594 L 764.636719 607.789062 L 766.050781 607.453125 L 767.261719 607.183594 L 768.269531 606.847656 L 769.148438 606.445312 L 769.820312 606.039062 L 770.425781 605.570312 L 770.964844 605.03125 L 771.503906 604.355469 L 771.972656 603.617188 L 772.445312 602.742188 L 772.648438 602.269531 L 772.847656 601.730469 L 773.050781 601.125 L 773.320312 600.386719 L 773.523438 599.644531 L 773.792969 598.769531 L 777.695312 598.769531 L 777.695312 646.5 L 771.773438 646.5 Z M 771.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 724 477 L 763 477 M 724 438 L 763 438 M 724 438 L 724 477 M 763 438 L 763 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 724 477 L 763 477 M 724 438 L 763 438 M 763 477 L 763 438 M 724 477 L 724 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_2.svg b/cells/o21ai/sky130_fd_sc_hs__o21ai_2.svg
index 4b6fdbc..afc9be7 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_2.svg
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 1216.5 664.5 L 1251.5 664.5 L 1251.5 833.5 L 1216.5 833.5 Z M 673.5 664.5 L 708.5 664.5 L 708.5 833.5 L 673.5 833.5 Z M 788.5 664.5 L 822.5 664.5 L 822.5 833.5 L 788.5 833.5 Z M 890.5 664.5 L 924.5 664.5 L 924.5 833.5 L 890.5 833.5 Z M 1001.5 664.5 L 1035.5 664.5 L 1035.5 833.5 L 1001.5 833.5 Z M 1110.5 664.5 L 1144.5 664.5 L 1144.5 833.5 L 1110.5 833.5 Z M 1110.5 664.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 1214.5 240.5 L 1248.5 240.5 L 1248.5 496.5 L 1214.5 496.5 Z M 675.5 240.5 L 710.5 240.5 L 710.5 496.5 L 675.5 496.5 Z M 779.5 240.5 L 813.5 240.5 L 813.5 496.5 L 779.5 496.5 Z M 893.5 240.5 L 928.5 240.5 L 928.5 496.5 L 893.5 496.5 Z M 1008.5 240.5 L 1042.5 240.5 L 1042.5 496.5 L 1008.5 496.5 Z M 1111.5 240.5 L 1145.5 240.5 L 1145.5 496.5 L 1111.5 496.5 Z M 1111.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -160,6 +160,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 1186.554688 288.246094 L 1186.554688 307.5 L 1180.292969 307.5 L 1180.292969 288.246094 L 1161.375 258.421875 L 1169.117188 258.421875 L 1183.523438 282.320312 L 1197.527344 258.421875 L 1205 258.421875 Z M 1186.554688 288.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1162 816 L 1201 816 M 1162 777 L 1201 777 M 1162 777 L 1162 816 M 1201 777 L 1201 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1162 816 L 1201 816 M 1162 777 L 1201 777 M 1201 816 L 1201 777 M 1162 816 L 1162 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ai/sky130_fd_sc_hs__o21ai_4.svg b/cells/o21ai/sky130_fd_sc_hs__o21ai_4.svg
index a9670ea..6778321 100644
--- a/cells/o21ai/sky130_fd_sc_hs__o21ai_4.svg
+++ b/cells/o21ai/sky130_fd_sc_hs__o21ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image317" 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="#image317"/>
+  <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 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#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 1489.5 664.5 L 1523.5 664.5 L 1523.5 833.5 L 1489.5 833.5 Z M 396.5 664.5 L 430.5 664.5 L 430.5 833.5 L 396.5 833.5 Z M 494.5 664.5 L 529.5 664.5 L 529.5 833.5 L 494.5 833.5 Z M 593.5 664.5 L 627.5 664.5 L 627.5 833.5 L 593.5 833.5 Z M 695.5 664.5 L 729.5 664.5 L 729.5 833.5 L 695.5 833.5 Z M 793.5 664.5 L 828.5 664.5 L 828.5 833.5 L 793.5 833.5 Z M 892.5 664.5 L 926.5 664.5 L 926.5 833.5 L 892.5 833.5 Z M 991.5 664.5 L 1025.5 664.5 L 1025.5 833.5 L 991.5 833.5 Z M 1089.5 664.5 L 1123.5 664.5 L 1123.5 833.5 L 1089.5 833.5 Z M 1193.5 664.5 L 1228.5 664.5 L 1228.5 833.5 L 1193.5 833.5 Z M 1292.5 664.5 L 1326.5 664.5 L 1326.5 833.5 L 1292.5 833.5 Z M 1390.5 664.5 L 1425.5 664.5 L 1425.5 833.5 L 1390.5 833.5 Z M 1390.5 664.5 "/>
 </clipPath>
-<image id="image318" 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="#image318"/>
+  <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 1486.5 240.5 L 1520.5 240.5 L 1520.5 496.5 L 1486.5 496.5 Z M 398.5 240.5 L 432.5 240.5 L 432.5 496.5 L 398.5 496.5 Z M 501.5 240.5 L 536.5 240.5 L 536.5 496.5 L 501.5 496.5 Z M 604.5 240.5 L 639.5 240.5 L 639.5 496.5 L 604.5 496.5 Z M 708.5 240.5 L 742.5 240.5 L 742.5 496.5 L 708.5 496.5 Z M 811.5 240.5 L 845.5 240.5 L 845.5 496.5 L 811.5 496.5 Z M 914.5 240.5 L 948.5 240.5 L 948.5 496.5 L 914.5 496.5 Z M 1165.5 240.5 L 1199.5 240.5 L 1199.5 496.5 L 1165.5 496.5 Z M 1279.5 240.5 L 1314.5 240.5 L 1314.5 496.5 L 1279.5 496.5 Z M 1382.5 240.5 L 1417.5 240.5 L 1417.5 496.5 L 1382.5 496.5 Z M 1382.5 240.5 "/>
 </clipPath>
-<image id="image319" 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="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image320" 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="#image320"/>
+  <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="surface314">
+<g id="surface343">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -174,6 +174,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 933.773438 612.503906 L 923.203125 612.503906 L 923.203125 608.261719 L 925.019531 608.058594 L 926.636719 607.789062 L 928.050781 607.453125 L 929.261719 607.183594 L 930.269531 606.847656 L 931.148438 606.445312 L 931.820312 606.039062 L 932.425781 605.570312 L 932.964844 605.03125 L 933.503906 604.355469 L 933.972656 603.617188 L 934.445312 602.742188 L 934.648438 602.269531 L 934.847656 601.730469 L 935.050781 601.125 L 935.320312 600.386719 L 935.523438 599.644531 L 935.792969 598.769531 L 939.695312 598.769531 L 939.695312 646.5 L 933.773438 646.5 Z M 933.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 885 477 L 924 477 M 885 438 L 924 438 M 885 438 L 885 477 M 924 438 L 924 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 885 477 L 924 477 M 885 438 L 924 438 M 924 477 L 924 438 M 885 477 L 885 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_1.svg b/cells/o21ba/sky130_fd_sc_hs__o21ba_1.svg
index 762d262..1c10749 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_1.svg
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1140.5 664.5 L 1174.5 664.5 L 1174.5 790.5 L 1140.5 790.5 Z M 749.5 687.5 L 783.5 687.5 L 783.5 833.5 L 749.5 833.5 Z M 618.5 687.5 L 653.5 687.5 L 653.5 833.5 L 618.5 833.5 Z M 851.5 687.5 L 885.5 687.5 L 885.5 833.5 L 851.5 833.5 Z M 1270.5 664.5 L 1305.5 664.5 L 1305.5 833.5 L 1270.5 833.5 Z M 1270.5 664.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 620.5 240.5 L 655.5 240.5 L 655.5 469.5 L 620.5 469.5 Z M 717.5 240.5 L 751.5 240.5 L 751.5 469.5 L 717.5 469.5 Z M 847.5 240.5 L 882.5 240.5 L 882.5 469.5 L 847.5 469.5 Z M 1269.5 240.5 L 1303.5 240.5 L 1303.5 496.5 L 1269.5 496.5 Z M 1135.5 304.5 L 1169.5 304.5 L 1169.5 496.5 L 1135.5 496.5 Z M 1135.5 304.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface307">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,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 1351.824219 282.320312 L 1369.191406 307.5 L 1361.449219 307.5 L 1348.050781 287.035156 L 1334.589844 307.5 L 1326.980469 307.5 L 1344.351562 282.320312 L 1328.058594 258.421875 L 1335.664062 258.421875 L 1348.253906 277.675781 L 1360.910156 258.421875 L 1368.382812 258.421875 Z M 1351.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1327 816 L 1366 816 M 1327 777 L 1366 777 M 1327 777 L 1327 816 M 1366 777 L 1366 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1327 816 L 1366 816 M 1327 777 L 1366 777 M 1366 816 L 1366 777 M 1327 816 L 1327 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_2.svg b/cells/o21ba/sky130_fd_sc_hs__o21ba_2.svg
index 5e2aaca..717b412 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_2.svg
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1144.5 664.5 L 1178.5 664.5 L 1178.5 833.5 L 1144.5 833.5 Z M 616.5 707.5 L 650.5 707.5 L 650.5 833.5 L 616.5 833.5 Z M 1275.5 664.5 L 1309.5 664.5 L 1309.5 833.5 L 1275.5 833.5 Z M 1046.5 664.5 L 1080.5 664.5 L 1080.5 833.5 L 1046.5 833.5 Z M 823.5 664.5 L 858.5 664.5 L 858.5 833.5 L 823.5 833.5 Z M 725.5 664.5 L 759.5 664.5 L 759.5 833.5 L 725.5 833.5 Z M 725.5 664.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 848.5 240.5 L 883.5 240.5 L 883.5 496.5 L 848.5 496.5 Z M 620.5 304.5 L 655.5 304.5 L 655.5 496.5 L 620.5 496.5 Z M 1271.5 267.5 L 1306.5 267.5 L 1306.5 496.5 L 1271.5 496.5 Z M 1051.5 267.5 L 1086.5 267.5 L 1086.5 496.5 L 1051.5 496.5 Z M 1154.5 267.5 L 1189.5 267.5 L 1189.5 496.5 L 1154.5 496.5 Z M 745.5 240.5 L 780.5 240.5 L 780.5 496.5 L 745.5 496.5 Z M 745.5 240.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface292">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -159,6 +159,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 659.550781 512.574219 L 659.550781 561.652344 L 652.484375 561.652344 L 627.101562 521.863281 L 627.101562 561.652344 L 621.179688 561.652344 L 621.179688 512.574219 L 627.976562 512.574219 L 653.628906 552.699219 L 653.628906 512.574219 Z M 659.550781 512.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 557 562 L 596 562 M 557 523 L 596 523 M 557 523 L 557 562 M 596 523 L 596 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 557 562 L 596 562 M 557 523 L 596 523 M 596 562 L 596 523 M 557 562 L 557 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21ba/sky130_fd_sc_hs__o21ba_4.svg b/cells/o21ba/sky130_fd_sc_hs__o21ba_4.svg
index e639bfd..7bf9fd5 100644
--- a/cells/o21ba/sky130_fd_sc_hs__o21ba_4.svg
+++ b/cells/o21ba/sky130_fd_sc_hs__o21ba_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 538.5 L 201.5 538.5 Z M 201.5 111.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 245.5 862.5 L 1675.5 862.5 L 1675.5 918.5 L 245.5 918.5 Z M 245.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1346.5 628.5 L 1380.5 628.5 L 1380.5 775.5 L 1346.5 775.5 Z M 1444.5 628.5 L 1479.5 628.5 L 1479.5 775.5 L 1444.5 775.5 Z M 1231.5 628.5 L 1266.5 628.5 L 1266.5 775.5 L 1231.5 775.5 Z M 1543.5 628.5 L 1577.5 628.5 L 1577.5 775.5 L 1543.5 775.5 Z M 1018.5 664.5 L 1052.5 664.5 L 1052.5 810.5 L 1018.5 810.5 Z M 1117.5 664.5 L 1151.5 664.5 L 1151.5 810.5 L 1117.5 810.5 Z M 348.5 664.5 L 382.5 664.5 L 382.5 833.5 L 348.5 833.5 Z M 764.5 664.5 L 798.5 664.5 L 798.5 833.5 L 764.5 833.5 Z M 567.5 664.5 L 601.5 664.5 L 601.5 833.5 L 567.5 833.5 Z M 665.5 664.5 L 699.5 664.5 L 699.5 833.5 L 665.5 833.5 Z M 466.5 664.5 L 500.5 664.5 L 500.5 833.5 L 466.5 833.5 Z M 466.5 664.5 "/>
 </clipPath>
-<image id="image309" 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="#image309"/>
+  <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 1098.5 240.5 L 1133.5 240.5 L 1133.5 432.5 L 1098.5 432.5 Z M 995.5 240.5 L 1030.5 240.5 L 1030.5 432.5 L 995.5 432.5 Z M 1542.5 240.5 L 1576.5 240.5 L 1576.5 469.5 L 1542.5 469.5 Z M 1232.5 240.5 L 1267.5 240.5 L 1267.5 469.5 L 1232.5 469.5 Z M 1439.5 240.5 L 1473.5 240.5 L 1473.5 469.5 L 1439.5 469.5 Z M 1335.5 240.5 L 1370.5 240.5 L 1370.5 469.5 L 1335.5 469.5 Z M 343.5 240.5 L 377.5 240.5 L 377.5 496.5 L 343.5 496.5 Z M 572.5 240.5 L 607.5 240.5 L 607.5 496.5 L 572.5 496.5 Z M 469.5 240.5 L 504.5 240.5 L 504.5 496.5 L 469.5 496.5 Z M 779.5 240.5 L 813.5 240.5 L 813.5 496.5 L 779.5 496.5 Z M 675.5 240.5 L 710.5 240.5 L 710.5 496.5 L 675.5 496.5 Z M 675.5 240.5 "/>
 </clipPath>
-<image id="image310" 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="#image310"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 280.5 136.5 L 319.5 136.5 L 319.5 174.5 L 280.5 174.5 Z M 1600.5 136.5 L 1639.5 136.5 L 1639.5 174.5 L 1600.5 174.5 Z M 1490.5 136.5 L 1529.5 136.5 L 1529.5 174.5 L 1490.5 174.5 Z M 1380.5 136.5 L 1419.5 136.5 L 1419.5 174.5 L 1380.5 174.5 Z M 1270.5 136.5 L 1309.5 136.5 L 1309.5 174.5 L 1270.5 174.5 Z M 1160.5 136.5 L 1199.5 136.5 L 1199.5 174.5 L 1160.5 174.5 Z M 1050.5 136.5 L 1089.5 136.5 L 1089.5 174.5 L 1050.5 174.5 Z M 940.5 136.5 L 979.5 136.5 L 979.5 174.5 L 940.5 174.5 Z M 830.5 136.5 L 869.5 136.5 L 869.5 174.5 L 830.5 174.5 Z M 720.5 136.5 L 759.5 136.5 L 759.5 174.5 L 720.5 174.5 Z M 610.5 136.5 L 649.5 136.5 L 649.5 174.5 L 610.5 174.5 Z M 500.5 136.5 L 539.5 136.5 L 539.5 174.5 L 500.5 174.5 Z M 390.5 136.5 L 429.5 136.5 L 429.5 174.5 L 390.5 174.5 Z M 280.5 899.5 L 319.5 899.5 L 319.5 938.5 L 280.5 938.5 Z M 1600.5 899.5 L 1639.5 899.5 L 1639.5 938.5 L 1600.5 938.5 Z M 1490.5 899.5 L 1529.5 899.5 L 1529.5 938.5 L 1490.5 938.5 Z M 1380.5 899.5 L 1419.5 899.5 L 1419.5 938.5 L 1380.5 938.5 Z M 1270.5 899.5 L 1309.5 899.5 L 1309.5 938.5 L 1270.5 938.5 Z M 1160.5 899.5 L 1199.5 899.5 L 1199.5 938.5 L 1160.5 938.5 Z M 1050.5 899.5 L 1089.5 899.5 L 1089.5 938.5 L 1050.5 938.5 Z M 940.5 899.5 L 979.5 899.5 L 979.5 938.5 L 940.5 938.5 Z M 830.5 899.5 L 869.5 899.5 L 869.5 938.5 L 830.5 938.5 Z M 720.5 899.5 L 759.5 899.5 L 759.5 938.5 L 720.5 938.5 Z M 610.5 899.5 L 649.5 899.5 L 649.5 938.5 L 610.5 938.5 Z M 500.5 899.5 L 539.5 899.5 L 539.5 938.5 L 500.5 938.5 Z M 390.5 899.5 L 429.5 899.5 L 429.5 938.5 L 390.5 938.5 Z M 390.5 899.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <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="surface305">
+<g id="surface335">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,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 524.824219 451.320312 L 542.191406 476.5 L 534.449219 476.5 L 521.050781 456.035156 L 507.589844 476.5 L 499.980469 476.5 L 517.351562 451.320312 L 501.058594 427.421875 L 508.664062 427.421875 L 521.253906 446.675781 L 533.910156 427.421875 L 541.382812 427.421875 Z M 524.824219 451.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 500 647 L 539 647 M 500 608 L 539 608 M 500 608 L 500 647 M 539 608 L 539 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 500 647 L 539 647 M 500 608 L 539 608 M 539 647 L 539 608 M 500 647 L 500 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 245 156 L 245 165 M 240 161 L 249 161 M 244 162 L 246 162 M 244 160 L 246 160 M 244 160 L 244 162 M 246 160 L 246 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_1.svg b/cells/o21bai/sky130_fd_sc_hs__o21bai_1.svg
index faeb121..83388ee 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_1.svg
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image317" 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="#image317"/>
+  <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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#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 1162.5 664.5 L 1197.5 664.5 L 1197.5 833.5 L 1162.5 833.5 Z M 728.5 707.5 L 763.5 707.5 L 763.5 833.5 L 728.5 833.5 Z M 1062.5 664.5 L 1096.5 664.5 L 1096.5 833.5 L 1062.5 833.5 Z M 952.5 664.5 L 986.5 664.5 L 986.5 833.5 L 952.5 833.5 Z M 952.5 664.5 "/>
 </clipPath>
-<image id="image318" 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="#image318"/>
+  <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 736.5 240.5 L 771.5 240.5 L 771.5 432.5 L 736.5 432.5 Z M 1051.5 240.5 L 1086.5 240.5 L 1086.5 496.5 L 1051.5 496.5 Z M 948.5 240.5 L 983.5 240.5 L 983.5 496.5 L 948.5 496.5 Z M 1161.5 240.5 L 1196.5 240.5 L 1196.5 496.5 L 1161.5 496.5 Z M 1161.5 240.5 "/>
 </clipPath>
-<image id="image319" 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="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image320" 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="#image320"/>
+  <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="surface314">
+<g id="surface343">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -174,6 +174,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 1266.773438 527.503906 L 1256.203125 527.503906 L 1256.203125 523.261719 L 1258.019531 523.058594 L 1259.636719 522.789062 L 1261.050781 522.453125 L 1262.261719 522.183594 L 1263.269531 521.847656 L 1264.148438 521.445312 L 1264.820312 521.039062 L 1265.425781 520.570312 L 1265.964844 520.03125 L 1266.503906 519.355469 L 1266.972656 518.617188 L 1267.445312 517.742188 L 1267.648438 517.269531 L 1267.847656 516.730469 L 1268.050781 516.125 L 1268.320312 515.386719 L 1268.523438 514.644531 L 1268.792969 513.769531 L 1272.695312 513.769531 L 1272.695312 561.5 L 1266.773438 561.5 Z M 1266.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1219 562 L 1258 562 M 1219 523 L 1258 523 M 1219 523 L 1219 562 M 1258 523 L 1258 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1219 562 L 1258 562 M 1219 523 L 1258 523 M 1258 562 L 1258 523 M 1219 562 L 1219 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_2.svg b/cells/o21bai/sky130_fd_sc_hs__o21bai_2.svg
index 2b32096..5a07c4f 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_2.svg
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 1223.5 664.5 L 1258.5 664.5 L 1258.5 833.5 L 1223.5 833.5 Z M 563.5 687.5 L 598.5 687.5 L 598.5 833.5 L 563.5 833.5 Z M 1322.5 664.5 L 1356.5 664.5 L 1356.5 833.5 L 1322.5 833.5 Z M 1125.5 664.5 L 1159.5 664.5 L 1159.5 833.5 L 1125.5 833.5 Z M 1003.5 664.5 L 1038.5 664.5 L 1038.5 833.5 L 1003.5 833.5 Z M 889.5 664.5 L 923.5 664.5 L 923.5 833.5 L 889.5 833.5 Z M 790.5 664.5 L 824.5 664.5 L 824.5 833.5 L 790.5 833.5 Z M 790.5 664.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 1220.5 240.5 L 1254.5 240.5 L 1254.5 496.5 L 1220.5 496.5 Z M 610.5 267.5 L 644.5 267.5 L 644.5 496.5 L 610.5 496.5 Z M 1324.5 240.5 L 1358.5 240.5 L 1358.5 496.5 L 1324.5 496.5 Z M 1117.5 240.5 L 1151.5 240.5 L 1151.5 496.5 L 1117.5 496.5 Z M 1013.5 240.5 L 1048.5 240.5 L 1048.5 496.5 L 1013.5 496.5 Z M 890.5 240.5 L 924.5 240.5 L 924.5 496.5 L 890.5 496.5 Z M 787.5 240.5 L 821.5 240.5 L 821.5 496.5 L 787.5 496.5 Z M 787.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -162,6 +162,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 856.554688 457.246094 L 856.554688 476.5 L 850.292969 476.5 L 850.292969 457.246094 L 831.375 427.421875 L 839.117188 427.421875 L 853.523438 451.320312 L 867.527344 427.421875 L 875 427.421875 Z M 856.554688 457.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 832 647 L 871 647 M 832 608 L 871 608 M 832 608 L 832 647 M 871 608 L 871 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 832 647 L 871 647 M 832 608 L 871 608 M 871 647 L 871 608 M 832 647 L 832 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o21bai/sky130_fd_sc_hs__o21bai_4.svg b/cells/o21bai/sky130_fd_sc_hs__o21bai_4.svg
index c98d322..c19ae69 100644
--- a/cells/o21bai/sky130_fd_sc_hs__o21bai_4.svg
+++ b/cells/o21bai/sky130_fd_sc_hs__o21bai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.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="#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 1587.5 620.5 L 1618.5 620.5 L 1618.5 773.5 L 1587.5 773.5 Z M 400.5 651.5 L 431.5 651.5 L 431.5 804.5 L 400.5 804.5 Z M 1367.5 651.5 L 1398.5 651.5 L 1398.5 804.5 L 1367.5 804.5 Z M 1264.5 651.5 L 1295.5 651.5 L 1295.5 804.5 L 1264.5 804.5 Z M 1160.5 651.5 L 1191.5 651.5 L 1191.5 804.5 L 1160.5 804.5 Z M 1071.5 651.5 L 1102.5 651.5 L 1102.5 804.5 L 1071.5 804.5 Z M 968.5 651.5 L 999.5 651.5 L 999.5 804.5 L 968.5 804.5 Z M 845.5 651.5 L 876.5 651.5 L 876.5 804.5 L 845.5 804.5 Z M 756.5 651.5 L 787.5 651.5 L 787.5 804.5 L 756.5 804.5 Z M 667.5 651.5 L 698.5 651.5 L 698.5 804.5 L 667.5 804.5 Z M 578.5 651.5 L 609.5 651.5 L 609.5 804.5 L 578.5 804.5 Z M 489.5 651.5 L 520.5 651.5 L 520.5 804.5 L 489.5 804.5 Z M 301.5 651.5 L 332.5 651.5 L 332.5 804.5 L 301.5 804.5 Z M 301.5 651.5 "/>
 </clipPath>
-<image id="image340" 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="#image340"/>
+  <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 1585.5 268.5 L 1616.5 268.5 L 1616.5 442.5 L 1585.5 442.5 Z M 1491.5 268.5 L 1523.5 268.5 L 1523.5 442.5 L 1491.5 442.5 Z M 397.5 268.5 L 428.5 268.5 L 428.5 500.5 L 397.5 500.5 Z M 490.5 268.5 L 521.5 268.5 L 521.5 500.5 L 490.5 500.5 Z M 583.5 268.5 L 614.5 268.5 L 614.5 500.5 L 583.5 500.5 Z M 677.5 268.5 L 708.5 268.5 L 708.5 500.5 L 677.5 500.5 Z M 770.5 268.5 L 801.5 268.5 L 801.5 500.5 L 770.5 500.5 Z M 863.5 268.5 L 894.5 268.5 L 894.5 500.5 L 863.5 500.5 Z M 967.5 268.5 L 998.5 268.5 L 998.5 500.5 L 967.5 500.5 Z M 1186.5 268.5 L 1217.5 268.5 L 1217.5 500.5 L 1186.5 500.5 Z M 1282.5 268.5 L 1313.5 268.5 L 1313.5 500.5 L 1282.5 500.5 Z M 304.5 268.5 L 335.5 268.5 L 335.5 500.5 L 304.5 500.5 Z M 304.5 268.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.5 "/>
 </clipPath>
-<image id="image342" 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="#image342"/>
+  <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="surface336">
+<g id="surface366">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -185,6 +185,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 1731.964844 513.652344 L 1731.964844 558.640625 L 1725.484375 558.640625 L 1702.21875 522.167969 L 1702.21875 558.640625 L 1696.789062 558.640625 L 1696.789062 513.652344 L 1703.023438 513.652344 L 1726.535156 550.429688 L 1726.535156 513.652344 Z M 1731.964844 513.652344 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1637 560 L 1673 560 M 1637 525 L 1673 525 M 1637 525 L 1637 560 M 1673 525 L 1673 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1637 560 L 1673 560 M 1637 525 L 1673 525 M 1673 560 L 1673 525 M 1637 560 L 1637 525 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_1.svg b/cells/o221a/sky130_fd_sc_hs__o221a_1.svg
index 0ac8a62..3b4aeb5 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_1.svg
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 713.5 664.5 L 748.5 664.5 L 748.5 810.5 L 713.5 810.5 Z M 828.5 664.5 L 862.5 664.5 L 862.5 810.5 L 828.5 810.5 Z M 1172.5 687.5 L 1206.5 687.5 L 1206.5 833.5 L 1172.5 833.5 Z M 1073.5 687.5 L 1107.5 687.5 L 1107.5 833.5 L 1073.5 833.5 Z M 1286.5 687.5 L 1321.5 687.5 L 1321.5 833.5 L 1286.5 833.5 Z M 580.5 664.5 L 615.5 664.5 L 615.5 833.5 L 580.5 833.5 Z M 580.5 664.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 1324.5 240.5 L 1358.5 240.5 L 1358.5 469.5 L 1324.5 469.5 Z M 1093.5 240.5 L 1127.5 240.5 L 1127.5 469.5 L 1093.5 469.5 Z M 735.5 240.5 L 769.5 240.5 L 769.5 469.5 L 735.5 469.5 Z M 831.5 240.5 L 866.5 240.5 L 866.5 469.5 L 831.5 469.5 Z M 962.5 240.5 L 996.5 240.5 L 996.5 469.5 L 962.5 469.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 565.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -169,6 +169,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 526.824219 706.320312 L 544.191406 731.5 L 536.449219 731.5 L 523.050781 711.035156 L 509.589844 731.5 L 501.980469 731.5 L 519.351562 706.320312 L 503.058594 682.421875 L 510.664062 682.421875 L 523.253906 701.675781 L 535.910156 682.421875 L 543.382812 682.421875 Z M 526.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 502 392 L 541 392 M 502 353 L 541 353 M 502 353 L 502 392 M 541 353 L 541 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 502 392 L 541 392 M 502 353 L 541 353 M 541 392 L 541 353 M 502 392 L 502 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_2.svg b/cells/o221a/sky130_fd_sc_hs__o221a_2.svg
index 6f4dbac..d97a7bb 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_2.svg
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1349.5 664.5 L 1384.5 664.5 L 1384.5 833.5 L 1349.5 833.5 Z M 565.5 664.5 L 600.5 664.5 L 600.5 833.5 L 565.5 833.5 Z M 679.5 664.5 L 713.5 664.5 L 713.5 833.5 L 679.5 833.5 Z M 795.5 664.5 L 829.5 664.5 L 829.5 833.5 L 795.5 833.5 Z M 1022.5 664.5 L 1056.5 664.5 L 1056.5 833.5 L 1022.5 833.5 Z M 1120.5 664.5 L 1154.5 664.5 L 1154.5 833.5 L 1120.5 833.5 Z M 1251.5 664.5 L 1285.5 664.5 L 1285.5 833.5 L 1251.5 833.5 Z M 1251.5 664.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 1275.5 240.5 L 1309.5 240.5 L 1309.5 496.5 L 1275.5 496.5 Z M 757.5 267.5 L 791.5 267.5 L 791.5 496.5 L 757.5 496.5 Z M 509.5 267.5 L 544.5 267.5 L 544.5 496.5 L 509.5 496.5 Z M 1114.5 267.5 L 1149.5 267.5 L 1149.5 496.5 L 1114.5 496.5 Z M 984.5 267.5 L 1018.5 267.5 L 1018.5 496.5 L 984.5 496.5 Z M 853.5 267.5 L 887.5 267.5 L 887.5 496.5 L 853.5 496.5 Z M 1378.5 240.5 L 1412.5 240.5 L 1412.5 496.5 L 1378.5 496.5 Z M 1378.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -169,6 +169,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 714.773438 527.503906 L 704.203125 527.503906 L 704.203125 523.261719 L 706.019531 523.058594 L 707.636719 522.789062 L 709.050781 522.453125 L 710.261719 522.183594 L 711.269531 521.847656 L 712.148438 521.445312 L 712.820312 521.039062 L 713.425781 520.570312 L 713.964844 520.03125 L 714.503906 519.355469 L 714.972656 518.617188 L 715.445312 517.742188 L 715.648438 517.269531 L 715.847656 516.730469 L 716.050781 516.125 L 716.320312 515.386719 L 716.523438 514.644531 L 716.792969 513.769531 L 720.695312 513.769531 L 720.695312 561.5 L 714.773438 561.5 Z M 714.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 666 562 L 705 562 M 666 523 L 705 523 M 666 523 L 666 562 M 705 523 L 705 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 666 562 L 705 562 M 666 523 L 705 523 M 705 562 L 705 523 M 666 562 L 666 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221a/sky130_fd_sc_hs__o221a_4.svg b/cells/o221a/sky130_fd_sc_hs__o221a_4.svg
index d766315..f47f9c9 100644
--- a/cells/o221a/sky130_fd_sc_hs__o221a_4.svg
+++ b/cells/o221a/sky130_fd_sc_hs__o221a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 537.5 L 174.5 537.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 211.5 812.5 L 1706.5 812.5 L 1706.5 860.5 L 211.5 860.5 Z M 211.5 812.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 740.5 614.5 L 769.5 614.5 L 769.5 738.5 L 740.5 738.5 Z M 655.5 614.5 L 684.5 614.5 L 684.5 738.5 L 655.5 738.5 Z M 474.5 614.5 L 503.5 614.5 L 503.5 738.5 L 474.5 738.5 Z M 377.5 614.5 L 406.5 614.5 L 406.5 738.5 L 377.5 738.5 Z M 565.5 614.5 L 594.5 614.5 L 594.5 738.5 L 565.5 738.5 Z M 293.5 614.5 L 322.5 614.5 L 322.5 738.5 L 293.5 738.5 Z M 1107.5 620.5 L 1136.5 620.5 L 1136.5 744.5 L 1107.5 744.5 Z M 1023.5 620.5 L 1052.5 620.5 L 1052.5 744.5 L 1023.5 744.5 Z M 938.5 620.5 L 967.5 620.5 L 967.5 744.5 L 938.5 744.5 Z M 1190.5 620.5 L 1220.5 620.5 L 1220.5 744.5 L 1190.5 744.5 Z M 1387.5 620.5 L 1416.5 620.5 L 1416.5 764.5 L 1387.5 764.5 Z M 1582.5 620.5 L 1611.5 620.5 L 1611.5 764.5 L 1582.5 764.5 Z M 1302.5 620.5 L 1332.5 620.5 L 1332.5 764.5 L 1302.5 764.5 Z M 1498.5 620.5 L 1527.5 620.5 L 1527.5 764.5 L 1498.5 764.5 Z M 1498.5 620.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1207.5 289.5 L 1236.5 289.5 L 1236.5 483.5 L 1207.5 483.5 Z M 295.5 289.5 L 324.5 289.5 L 324.5 483.5 L 295.5 483.5 Z M 382.5 289.5 L 412.5 289.5 L 412.5 483.5 L 382.5 483.5 Z M 925.5 289.5 L 954.5 289.5 L 954.5 483.5 L 925.5 483.5 Z M 567.5 289.5 L 597.5 289.5 L 597.5 483.5 L 567.5 483.5 Z M 743.5 289.5 L 772.5 289.5 L 772.5 483.5 L 743.5 483.5 Z M 655.5 289.5 L 684.5 289.5 L 684.5 483.5 L 655.5 483.5 Z M 1110.5 289.5 L 1139.5 289.5 L 1139.5 483.5 L 1110.5 483.5 Z M 1017.5 289.5 L 1046.5 289.5 L 1046.5 483.5 L 1017.5 483.5 Z M 471.5 289.5 L 500.5 289.5 L 500.5 483.5 L 471.5 483.5 Z M 1495.5 284.5 L 1524.5 284.5 L 1524.5 502.5 L 1495.5 502.5 Z M 1407.5 284.5 L 1437.5 284.5 L 1437.5 502.5 L 1407.5 502.5 Z M 1305.5 284.5 L 1334.5 284.5 L 1334.5 502.5 L 1305.5 502.5 Z M 1593.5 284.5 L 1623.5 284.5 L 1623.5 502.5 L 1593.5 502.5 Z M 1593.5 284.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 241.5 195.5 L 274.5 195.5 L 274.5 228.5 L 241.5 228.5 Z M 1643.5 195.5 L 1676.5 195.5 L 1676.5 228.5 L 1643.5 228.5 Z M 1550.5 195.5 L 1583.5 195.5 L 1583.5 228.5 L 1550.5 228.5 Z M 1456.5 195.5 L 1489.5 195.5 L 1489.5 228.5 L 1456.5 228.5 Z M 1363.5 195.5 L 1396.5 195.5 L 1396.5 228.5 L 1363.5 228.5 Z M 1269.5 195.5 L 1302.5 195.5 L 1302.5 228.5 L 1269.5 228.5 Z M 1176.5 195.5 L 1209.5 195.5 L 1209.5 228.5 L 1176.5 228.5 Z M 1082.5 195.5 L 1115.5 195.5 L 1115.5 228.5 L 1082.5 228.5 Z M 989.5 195.5 L 1022.5 195.5 L 1022.5 228.5 L 989.5 228.5 Z M 895.5 195.5 L 929.5 195.5 L 929.5 228.5 L 895.5 228.5 Z M 802.5 195.5 L 835.5 195.5 L 835.5 228.5 L 802.5 228.5 Z M 709.5 195.5 L 742.5 195.5 L 742.5 228.5 L 709.5 228.5 Z M 615.5 195.5 L 648.5 195.5 L 648.5 228.5 L 615.5 228.5 Z M 522.5 195.5 L 555.5 195.5 L 555.5 228.5 L 522.5 228.5 Z M 428.5 195.5 L 461.5 195.5 L 461.5 228.5 L 428.5 228.5 Z M 335.5 195.5 L 368.5 195.5 L 368.5 228.5 L 335.5 228.5 Z M 241.5 843.5 L 274.5 843.5 L 274.5 877.5 L 241.5 877.5 Z M 1643.5 843.5 L 1676.5 843.5 L 1676.5 877.5 L 1643.5 877.5 Z M 1550.5 843.5 L 1583.5 843.5 L 1583.5 877.5 L 1550.5 877.5 Z M 1456.5 843.5 L 1489.5 843.5 L 1489.5 877.5 L 1456.5 877.5 Z M 1363.5 843.5 L 1396.5 843.5 L 1396.5 877.5 L 1363.5 877.5 Z M 1269.5 843.5 L 1302.5 843.5 L 1302.5 877.5 L 1269.5 877.5 Z M 1176.5 843.5 L 1209.5 843.5 L 1209.5 877.5 L 1176.5 877.5 Z M 1082.5 843.5 L 1115.5 843.5 L 1115.5 877.5 L 1082.5 877.5 Z M 989.5 843.5 L 1022.5 843.5 L 1022.5 877.5 L 989.5 877.5 Z M 895.5 843.5 L 929.5 843.5 L 929.5 877.5 L 895.5 877.5 Z M 802.5 843.5 L 835.5 843.5 L 835.5 877.5 L 802.5 877.5 Z M 709.5 843.5 L 742.5 843.5 L 742.5 877.5 L 709.5 877.5 Z M 615.5 843.5 L 648.5 843.5 L 648.5 877.5 L 615.5 877.5 Z M 522.5 843.5 L 555.5 843.5 L 555.5 877.5 L 522.5 877.5 Z M 428.5 843.5 L 461.5 843.5 L 461.5 877.5 L 428.5 877.5 Z M 335.5 843.5 L 368.5 843.5 L 368.5 877.5 L 335.5 877.5 Z M 335.5 843.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface348">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -178,6 +178,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 378.851562 528.136719 L 369.824219 528.136719 L 369.824219 524.515625 L 371.378906 524.34375 L 372.757812 524.113281 L 373.964844 523.824219 L 375 523.59375 L 375.863281 523.308594 L 376.609375 522.960938 L 377.1875 522.617188 L 377.703125 522.214844 L 378.164062 521.753906 L 378.625 521.179688 L 379.027344 520.546875 L 379.429688 519.800781 L 379.601562 519.398438 L 379.773438 518.9375 L 379.945312 518.421875 L 380.175781 517.789062 L 380.347656 517.15625 L 380.578125 516.40625 L 383.914062 516.40625 L 383.914062 557.175781 L 378.851562 557.175781 Z M 378.851562 528.136719 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 335 560 L 368 560 M 335 527 L 368 527 M 335 527 L 335 560 M 368 527 L 368 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 335 560 L 368 560 M 335 527 L 368 527 M 368 560 L 368 527 M 335 560 L 335 527 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 214 L 211 223 M 206 219 L 215 219 M 210 220 L 212 220 M 210 218 L 212 218 M 210 218 L 210 220 M 212 218 L 212 220 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_1.svg b/cells/o221ai/sky130_fd_sc_hs__o221ai_1.svg
index d4a491a..5beb8a0 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_1.svg
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image353"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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="#image353"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1271.5 664.5 L 1306.5 664.5 L 1306.5 833.5 L 1271.5 833.5 Z M 618.5 664.5 L 653.5 664.5 L 653.5 833.5 L 618.5 833.5 Z M 861.5 664.5 L 895.5 664.5 L 895.5 833.5 L 861.5 833.5 Z M 976.5 664.5 L 1010.5 664.5 L 1010.5 833.5 L 976.5 833.5 Z M 1090.5 664.5 L 1125.5 664.5 L 1125.5 833.5 L 1090.5 833.5 Z M 1090.5 664.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1216.5 240.5 L 1251.5 240.5 L 1251.5 496.5 L 1216.5 496.5 Z M 650.5 240.5 L 685.5 240.5 L 685.5 496.5 L 650.5 496.5 Z M 859.5 240.5 L 893.5 240.5 L 893.5 496.5 L 859.5 496.5 Z M 955.5 240.5 L 989.5 240.5 L 989.5 496.5 L 955.5 496.5 Z M 1086.5 240.5 L 1120.5 240.5 L 1120.5 496.5 L 1086.5 496.5 Z M 1086.5 240.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface322">
+<g id="surface350">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -181,6 +181,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1136.703125 276.332031 L 1137.242188 271.28125 L 1138.652344 267.175781 L 1140.875 263.941406 L 1143.90625 261.652344 L 1147.742188 260.242188 L 1152.457031 259.769531 L 1154.609375 259.902344 L 1156.695312 260.242188 L 1158.648438 260.777344 L 1160.398438 261.585938 L 1162.015625 262.597656 L 1163.5625 263.742188 L 1164.773438 265.15625 L 1165.851562 266.636719 L 1166.660156 268.25 L 1167.265625 269.933594 L 1167.601562 271.820312 L 1167.738281 273.773438 L 1167.46875 276.53125 L 1166.726562 279.089844 L 1165.449219 281.445312 L 1163.699219 283.667969 L 1161.410156 285.753906 L 1158.648438 287.574219 L 1157.640625 288.179688 L 1150.90625 291.8125 L 1149.15625 292.824219 L 1147.609375 293.832031 L 1146.261719 294.84375 L 1145.183594 295.851562 L 1144.242188 296.863281 L 1143.570312 297.875 L 1143.230469 298.480469 L 1142.960938 299.015625 L 1142.761719 299.691406 L 1142.558594 300.296875 L 1142.355469 300.96875 L 1142.289062 301.644531 L 1167.402344 301.644531 L 1167.402344 307.5 L 1135.625 307.5 L 1135.757812 305.144531 L 1136.097656 302.988281 L 1136.5 300.96875 L 1137.039062 299.21875 L 1137.644531 297.535156 L 1138.386719 296.054688 L 1139.191406 294.777344 L 1140.203125 293.496094 L 1141.414062 292.21875 L 1142.761719 291.007812 L 1144.308594 289.792969 L 1146.125 288.582031 L 1146.53125 288.3125 L 1147.003906 288.042969 L 1147.472656 287.707031 L 1147.945312 287.4375 L 1148.484375 287.167969 L 1149.023438 286.832031 L 1155.214844 283.332031 L 1157.167969 282.050781 L 1158.785156 280.640625 L 1160.0625 279.15625 L 1160.9375 277.542969 L 1161.476562 275.792969 L 1161.679688 273.90625 L 1161.542969 272.628906 L 1161.339844 271.347656 L 1160.871094 270.203125 L 1160.332031 269.125 L 1159.523438 268.183594 L 1158.648438 267.242188 L 1157.707031 266.570312 L 1156.765625 265.960938 L 1155.6875 265.558594 L 1154.609375 265.222656 L 1153.464844 265.019531 L 1152.253906 264.953125 L 1149.628906 265.289062 L 1147.40625 266.097656 L 1145.589844 267.511719 L 1144.242188 269.464844 L 1143.300781 272.023438 L 1142.761719 275.050781 L 1142.695312 275.320312 L 1142.695312 275.722656 L 1142.625 275.925781 L 1142.625 276.332031 Z M 1136.703125 276.332031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1107 816 L 1146 816 M 1107 777 L 1146 777 M 1107 777 L 1107 816 M 1146 777 L 1146 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1107 816 L 1146 816 M 1107 777 L 1146 777 M 1146 816 L 1146 777 M 1107 816 L 1107 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_2.svg b/cells/o221ai/sky130_fd_sc_hs__o221ai_2.svg
index 1bd511f..d279936 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_2.svg
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1266.5 651.5 L 1300.5 651.5 L 1300.5 821.5 L 1266.5 821.5 Z M 1376.5 651.5 L 1410.5 651.5 L 1410.5 821.5 L 1376.5 821.5 Z M 820.5 651.5 L 854.5 651.5 L 854.5 821.5 L 820.5 821.5 Z M 1488.5 651.5 L 1522.5 651.5 L 1522.5 821.5 L 1488.5 821.5 Z M 1144.5 651.5 L 1178.5 651.5 L 1178.5 821.5 L 1144.5 821.5 Z M 1046.5 651.5 L 1080.5 651.5 L 1080.5 821.5 L 1046.5 821.5 Z M 918.5 651.5 L 953.5 651.5 L 953.5 821.5 L 918.5 821.5 Z M 721.5 651.5 L 756.5 651.5 L 756.5 821.5 L 721.5 821.5 Z M 494.5 664.5 L 529.5 664.5 L 529.5 833.5 L 494.5 833.5 Z M 396.5 664.5 L 430.5 664.5 L 430.5 833.5 L 396.5 833.5 Z M 396.5 664.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1475.5 240.5 L 1510.5 240.5 L 1510.5 496.5 L 1475.5 496.5 Z M 407.5 240.5 L 442.5 240.5 L 442.5 496.5 L 407.5 496.5 Z M 510.5 240.5 L 545.5 240.5 L 545.5 496.5 L 510.5 496.5 Z M 696.5 240.5 L 730.5 240.5 L 730.5 496.5 L 696.5 496.5 Z M 807.5 240.5 L 842.5 240.5 L 842.5 496.5 L 807.5 496.5 Z M 914.5 240.5 L 948.5 240.5 L 948.5 496.5 L 914.5 496.5 Z M 1028.5 240.5 L 1063.5 240.5 L 1063.5 496.5 L 1028.5 496.5 Z M 1154.5 240.5 L 1189.5 240.5 L 1189.5 496.5 L 1154.5 496.5 Z M 1269.5 240.5 L 1303.5 240.5 L 1303.5 496.5 L 1269.5 496.5 Z M 1372.5 240.5 L 1407.5 240.5 L 1407.5 496.5 L 1372.5 496.5 Z M 1372.5 240.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -189,6 +189,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 1353.703125 530.332031 L 1354.242188 525.28125 L 1355.652344 521.175781 L 1357.875 517.941406 L 1360.90625 515.652344 L 1364.742188 514.242188 L 1369.457031 513.769531 L 1371.609375 513.902344 L 1373.695312 514.242188 L 1375.648438 514.777344 L 1377.398438 515.585938 L 1379.015625 516.597656 L 1380.5625 517.742188 L 1381.773438 519.15625 L 1382.851562 520.636719 L 1383.660156 522.25 L 1384.265625 523.933594 L 1384.601562 525.820312 L 1384.738281 527.773438 L 1384.46875 530.53125 L 1383.726562 533.089844 L 1382.449219 535.445312 L 1380.699219 537.667969 L 1378.410156 539.753906 L 1375.648438 541.574219 L 1374.640625 542.179688 L 1367.90625 545.8125 L 1366.15625 546.824219 L 1364.609375 547.832031 L 1363.261719 548.84375 L 1362.183594 549.851562 L 1361.242188 550.863281 L 1360.570312 551.875 L 1360.230469 552.480469 L 1359.960938 553.015625 L 1359.761719 553.691406 L 1359.558594 554.296875 L 1359.355469 554.96875 L 1359.289062 555.644531 L 1384.402344 555.644531 L 1384.402344 561.5 L 1352.625 561.5 L 1352.757812 559.144531 L 1353.097656 556.988281 L 1353.5 554.96875 L 1354.039062 553.21875 L 1354.644531 551.535156 L 1355.386719 550.054688 L 1356.191406 548.777344 L 1357.203125 547.496094 L 1358.414062 546.21875 L 1359.761719 545.007812 L 1361.308594 543.792969 L 1363.125 542.582031 L 1363.53125 542.3125 L 1364.003906 542.042969 L 1364.472656 541.707031 L 1364.945312 541.4375 L 1365.484375 541.167969 L 1366.023438 540.832031 L 1372.214844 537.332031 L 1374.167969 536.050781 L 1375.785156 534.640625 L 1377.0625 533.15625 L 1377.9375 531.542969 L 1378.476562 529.792969 L 1378.679688 527.90625 L 1378.542969 526.628906 L 1378.339844 525.347656 L 1377.871094 524.203125 L 1377.332031 523.125 L 1376.523438 522.183594 L 1375.648438 521.242188 L 1374.707031 520.570312 L 1373.765625 519.960938 L 1372.6875 519.558594 L 1371.609375 519.222656 L 1370.464844 519.019531 L 1369.253906 518.953125 L 1366.628906 519.289062 L 1364.40625 520.097656 L 1362.589844 521.511719 L 1361.242188 523.464844 L 1360.300781 526.023438 L 1359.761719 529.050781 L 1359.695312 529.320312 L 1359.695312 529.722656 L 1359.625 529.925781 L 1359.625 530.332031 Z M 1353.703125 530.332031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1325 562 L 1364 562 M 1325 523 L 1364 523 M 1325 523 L 1325 562 M 1364 523 L 1364 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1325 562 L 1364 562 M 1325 523 L 1364 523 M 1364 562 L 1364 523 M 1325 562 L 1325 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o221ai/sky130_fd_sc_hs__o221ai_4.svg b/cells/o221ai/sky130_fd_sc_hs__o221ai_4.svg
index eeb4c60..1d33625 100644
--- a/cells/o221ai/sky130_fd_sc_hs__o221ai_4.svg
+++ b/cells/o221ai/sky130_fd_sc_hs__o221ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 460.5 611.5 L 482.5 611.5 L 482.5 722.5 L 460.5 722.5 Z M 395.5 611.5 L 418.5 611.5 L 418.5 722.5 L 395.5 722.5 Z M 266.5 611.5 L 289.5 611.5 L 289.5 722.5 L 266.5 722.5 Z M 331.5 611.5 L 353.5 611.5 L 353.5 722.5 L 331.5 722.5 Z M 802.5 618.5 L 824.5 618.5 L 824.5 729.5 L 802.5 729.5 Z M 866.5 618.5 L 889.5 618.5 L 889.5 729.5 L 866.5 729.5 Z M 931.5 618.5 L 953.5 618.5 L 953.5 729.5 L 931.5 729.5 Z M 995.5 618.5 L 1018.5 618.5 L 1018.5 729.5 L 995.5 729.5 Z M 1060.5 618.5 L 1082.5 618.5 L 1082.5 729.5 L 1060.5 729.5 Z M 1135.5 618.5 L 1157.5 618.5 L 1157.5 729.5 L 1135.5 729.5 Z M 1220.5 618.5 L 1243.5 618.5 L 1243.5 729.5 L 1220.5 729.5 Z M 1285.5 618.5 L 1307.5 618.5 L 1307.5 729.5 L 1285.5 729.5 Z M 1360.5 618.5 L 1382.5 618.5 L 1382.5 729.5 L 1360.5 729.5 Z M 1424.5 618.5 L 1447.5 618.5 L 1447.5 729.5 L 1424.5 729.5 Z M 1490.5 618.5 L 1513.5 618.5 L 1513.5 729.5 L 1490.5 729.5 Z M 1565.5 618.5 L 1588.5 618.5 L 1588.5 729.5 L 1565.5 729.5 Z M 1630.5 618.5 L 1652.5 618.5 L 1652.5 729.5 L 1630.5 729.5 Z M 608.5 618.5 L 631.5 618.5 L 631.5 729.5 L 608.5 729.5 Z M 737.5 618.5 L 760.5 618.5 L 760.5 729.5 L 737.5 729.5 Z M 673.5 618.5 L 695.5 618.5 L 695.5 729.5 L 673.5 729.5 Z M 673.5 618.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1627.5 341.5 L 1650.5 341.5 L 1650.5 509.5 L 1627.5 509.5 Z M 268.5 341.5 L 290.5 341.5 L 290.5 509.5 L 268.5 509.5 Z M 335.5 341.5 L 358.5 341.5 L 358.5 509.5 L 335.5 509.5 Z M 415.5 341.5 L 438.5 341.5 L 438.5 509.5 L 415.5 509.5 Z M 487.5 341.5 L 509.5 341.5 L 509.5 509.5 L 487.5 509.5 Z M 562.5 341.5 L 584.5 341.5 L 584.5 509.5 L 562.5 509.5 Z M 629.5 341.5 L 652.5 341.5 L 652.5 509.5 L 629.5 509.5 Z M 712.5 341.5 L 734.5 341.5 L 734.5 509.5 L 712.5 509.5 Z M 779.5 341.5 L 802.5 341.5 L 802.5 509.5 L 779.5 509.5 Z M 847.5 341.5 L 869.5 341.5 L 869.5 509.5 L 847.5 509.5 Z M 914.5 341.5 L 937.5 341.5 L 937.5 509.5 L 914.5 509.5 Z M 989.5 341.5 L 1012.5 341.5 L 1012.5 509.5 L 989.5 509.5 Z M 1064.5 341.5 L 1087.5 341.5 L 1087.5 509.5 L 1064.5 509.5 Z M 1147.5 341.5 L 1169.5 341.5 L 1169.5 509.5 L 1147.5 509.5 Z M 1222.5 341.5 L 1245.5 341.5 L 1245.5 509.5 L 1222.5 509.5 Z M 1290.5 341.5 L 1312.5 341.5 L 1312.5 509.5 L 1290.5 509.5 Z M 1357.5 341.5 L 1380.5 341.5 L 1380.5 509.5 L 1357.5 509.5 Z M 1425.5 341.5 L 1447.5 341.5 L 1447.5 509.5 L 1425.5 509.5 Z M 1492.5 341.5 L 1515.5 341.5 L 1515.5 509.5 L 1492.5 509.5 Z M 1560.5 341.5 L 1582.5 341.5 L 1582.5 509.5 L 1560.5 509.5 Z M 1560.5 341.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image378"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image350"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface344">
+<g id="surface373">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -194,6 +194,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1697.71875 529.542969 L 1690.890625 529.542969 L 1690.890625 526.804688 L 1692.066406 526.675781 L 1693.109375 526.5 L 1694.023438 526.28125 L 1694.804688 526.109375 L 1695.457031 525.890625 L 1696.023438 525.628906 L 1696.457031 525.371094 L 1696.847656 525.066406 L 1697.195312 524.71875 L 1697.542969 524.28125 L 1697.847656 523.804688 L 1698.152344 523.238281 L 1698.28125 522.933594 L 1698.414062 522.585938 L 1698.542969 522.195312 L 1698.71875 521.71875 L 1698.847656 521.238281 L 1699.023438 520.675781 L 1701.542969 520.675781 L 1701.542969 551.5 L 1697.71875 551.5 Z M 1697.71875 529.542969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1666 557 L 1692 557 M 1666 531 L 1692 531 M 1666 531 L 1666 557 M 1692 531 L 1692 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1666 557 L 1692 557 M 1666 531 L 1692 531 M 1692 557 L 1692 531 M 1666 557 L 1666 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_1.svg b/cells/o22a/sky130_fd_sc_hs__o22a_1.svg
index 98c4ffe..0f0a673 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_1.svg
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 534.5 L 478.5 534.5 Z M 1253.5 534.5 L 1446.5 534.5 L 1446.5 538.5 L 1253.5 538.5 Z M 478.5 534.5 L 788.5 534.5 L 788.5 538.5 L 478.5 538.5 Z M 478.5 534.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1136.5 612.5 L 1170.5 612.5 L 1170.5 759.5 L 1136.5 759.5 Z M 930.5 612.5 L 964.5 612.5 L 964.5 759.5 L 930.5 759.5 Z M 1038.5 612.5 L 1072.5 612.5 L 1072.5 759.5 L 1038.5 759.5 Z M 1271.5 623.5 L 1306.5 623.5 L 1306.5 769.5 L 1271.5 769.5 Z M 618.5 664.5 L 653.5 664.5 L 653.5 833.5 L 618.5 833.5 Z M 618.5 664.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1267.5 240.5 L 1301.5 240.5 L 1301.5 469.5 L 1267.5 469.5 Z M 1143.5 240.5 L 1177.5 240.5 L 1177.5 469.5 L 1143.5 469.5 Z M 944.5 240.5 L 978.5 240.5 L 978.5 469.5 L 944.5 469.5 Z M 1040.5 240.5 L 1074.5 240.5 L 1074.5 469.5 L 1040.5 469.5 Z M 620.5 240.5 L 655.5 240.5 L 655.5 496.5 L 620.5 496.5 Z M 620.5 240.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,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 1375.773438 527.503906 L 1365.203125 527.503906 L 1365.203125 523.261719 L 1367.019531 523.058594 L 1368.636719 522.789062 L 1370.050781 522.453125 L 1371.261719 522.183594 L 1372.269531 521.847656 L 1373.148438 521.445312 L 1373.820312 521.039062 L 1374.425781 520.570312 L 1374.964844 520.03125 L 1375.503906 519.355469 L 1375.972656 518.617188 L 1376.445312 517.742188 L 1376.648438 517.269531 L 1376.847656 516.730469 L 1377.050781 516.125 L 1377.320312 515.386719 L 1377.523438 514.644531 L 1377.792969 513.769531 L 1381.695312 513.769531 L 1381.695312 561.5 L 1375.773438 561.5 Z M 1375.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1327 562 L 1366 562 M 1327 523 L 1366 523 M 1327 523 L 1327 562 M 1366 523 L 1366 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1327 562 L 1366 562 M 1327 523 L 1366 523 M 1366 562 L 1366 523 M 1327 562 L 1327 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_2.svg b/cells/o22a/sky130_fd_sc_hs__o22a_2.svg
index fd73ae2..e6ba20f 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_2.svg
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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 1271.5 664.5 L 1306.5 664.5 L 1306.5 833.5 L 1271.5 833.5 Z M 616.5 664.5 L 650.5 664.5 L 650.5 833.5 L 616.5 833.5 Z M 714.5 664.5 L 749.5 664.5 L 749.5 833.5 L 714.5 833.5 Z M 937.5 664.5 L 971.5 664.5 L 971.5 833.5 L 937.5 833.5 Z M 1042.5 664.5 L 1077.5 664.5 L 1077.5 833.5 L 1042.5 833.5 Z M 1157.5 664.5 L 1191.5 664.5 L 1191.5 833.5 L 1157.5 833.5 Z M 1157.5 664.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 926.5 249.5 L 961.5 249.5 L 961.5 478.5 L 926.5 478.5 Z M 1030.5 249.5 L 1064.5 249.5 L 1064.5 478.5 L 1030.5 478.5 Z M 1146.5 249.5 L 1181.5 249.5 L 1181.5 478.5 L 1146.5 478.5 Z M 1270.5 249.5 L 1305.5 249.5 L 1305.5 478.5 L 1270.5 478.5 Z M 740.5 240.5 L 774.5 240.5 L 774.5 496.5 L 740.5 496.5 Z M 636.5 240.5 L 671.5 240.5 L 671.5 496.5 L 636.5 496.5 Z M 636.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface288">
+<g id="surface316">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1375.773438 527.503906 L 1365.203125 527.503906 L 1365.203125 523.261719 L 1367.019531 523.058594 L 1368.636719 522.789062 L 1370.050781 522.453125 L 1371.261719 522.183594 L 1372.269531 521.847656 L 1373.148438 521.445312 L 1373.820312 521.039062 L 1374.425781 520.570312 L 1374.964844 520.03125 L 1375.503906 519.355469 L 1375.972656 518.617188 L 1376.445312 517.742188 L 1376.648438 517.269531 L 1376.847656 516.730469 L 1377.050781 516.125 L 1377.320312 515.386719 L 1377.523438 514.644531 L 1377.792969 513.769531 L 1381.695312 513.769531 L 1381.695312 561.5 L 1375.773438 561.5 Z M 1375.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1327 562 L 1366 562 M 1327 523 L 1366 523 M 1327 523 L 1327 562 M 1366 523 L 1366 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1327 562 L 1366 562 M 1327 523 L 1366 523 M 1366 562 L 1366 523 M 1327 562 L 1327 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22a/sky130_fd_sc_hs__o22a_4.svg b/cells/o22a/sky130_fd_sc_hs__o22a_4.svg
index 2e3016a..6a5f049 100644
--- a/cells/o22a/sky130_fd_sc_hs__o22a_4.svg
+++ b/cells/o22a/sky130_fd_sc_hs__o22a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 309.5 613.5 L 342.5 613.5 L 342.5 754.5 L 309.5 754.5 Z M 420.5 613.5 L 453.5 613.5 L 453.5 754.5 L 420.5 754.5 Z M 634.5 613.5 L 667.5 613.5 L 667.5 754.5 L 634.5 754.5 Z M 1053.5 613.5 L 1086.5 613.5 L 1086.5 754.5 L 1053.5 754.5 Z M 750.5 613.5 L 783.5 613.5 L 783.5 754.5 L 750.5 754.5 Z M 515.5 613.5 L 548.5 613.5 L 548.5 754.5 L 515.5 754.5 Z M 958.5 613.5 L 991.5 613.5 L 991.5 754.5 L 958.5 754.5 Z M 846.5 613.5 L 879.5 613.5 L 879.5 754.5 L 846.5 754.5 Z M 1384.5 659.5 L 1417.5 659.5 L 1417.5 823.5 L 1384.5 823.5 Z M 1479.5 659.5 L 1512.5 659.5 L 1512.5 823.5 L 1479.5 823.5 Z M 1574.5 659.5 L 1607.5 659.5 L 1607.5 823.5 L 1574.5 823.5 Z M 1289.5 659.5 L 1322.5 659.5 L 1322.5 823.5 L 1289.5 823.5 Z M 1289.5 659.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1074.5 250.5 L 1107.5 250.5 L 1107.5 471.5 L 1074.5 471.5 Z M 753.5 250.5 L 786.5 250.5 L 786.5 471.5 L 753.5 471.5 Z M 411.5 250.5 L 444.5 250.5 L 444.5 471.5 L 411.5 471.5 Z M 632.5 250.5 L 665.5 250.5 L 665.5 471.5 L 632.5 471.5 Z M 521.5 250.5 L 554.5 250.5 L 554.5 471.5 L 521.5 471.5 Z M 963.5 250.5 L 996.5 250.5 L 996.5 471.5 L 963.5 471.5 Z M 853.5 250.5 L 886.5 250.5 L 886.5 471.5 L 853.5 471.5 Z M 311.5 250.5 L 345.5 250.5 L 345.5 471.5 L 311.5 471.5 Z M 1463.5 250.5 L 1496.5 250.5 L 1496.5 498.5 L 1463.5 498.5 Z M 1302.5 250.5 L 1335.5 250.5 L 1335.5 498.5 L 1302.5 498.5 Z M 1195.5 250.5 L 1228.5 250.5 L 1228.5 498.5 L 1195.5 498.5 Z M 1562.5 250.5 L 1595.5 250.5 L 1595.5 498.5 L 1562.5 498.5 Z M 1562.5 250.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -162,6 +162,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 914.695312 530.628906 L 915.210938 525.789062 L 916.566406 521.855469 L 918.695312 518.757812 L 921.597656 516.566406 L 925.273438 515.210938 L 929.789062 514.757812 L 931.855469 514.886719 L 933.855469 515.210938 L 935.726562 515.726562 L 937.402344 516.5 L 938.953125 517.46875 L 940.433594 518.566406 L 941.597656 519.917969 L 942.628906 521.339844 L 943.402344 522.886719 L 943.984375 524.5 L 944.304688 526.304688 L 944.433594 528.175781 L 944.175781 530.824219 L 943.46875 533.273438 L 942.242188 535.53125 L 940.566406 537.660156 L 938.371094 539.660156 L 935.726562 541.402344 L 934.757812 541.984375 L 928.304688 545.46875 L 926.628906 546.433594 L 925.144531 547.402344 L 923.855469 548.371094 L 922.824219 549.339844 L 921.917969 550.304688 L 921.273438 551.273438 L 920.953125 551.855469 L 920.695312 552.371094 L 920.5 553.015625 L 920.304688 553.597656 L 920.113281 554.242188 L 920.046875 554.886719 L 944.113281 554.886719 L 944.113281 560.5 L 913.660156 560.5 L 913.789062 558.242188 L 914.113281 556.175781 L 914.5 554.242188 L 915.015625 552.566406 L 915.597656 550.953125 L 916.304688 549.53125 L 917.082031 548.304688 L 918.046875 547.082031 L 919.210938 545.855469 L 920.5 544.695312 L 921.984375 543.53125 L 923.726562 542.371094 L 924.113281 542.113281 L 924.566406 541.855469 L 925.015625 541.53125 L 925.46875 541.273438 L 925.984375 541.015625 L 926.5 540.695312 L 932.433594 537.339844 L 934.304688 536.113281 L 935.855469 534.757812 L 937.082031 533.339844 L 937.917969 531.789062 L 938.433594 530.113281 L 938.628906 528.304688 L 938.5 527.082031 L 938.304688 525.855469 L 937.855469 524.757812 L 937.339844 523.726562 L 936.566406 522.824219 L 935.726562 521.917969 L 934.824219 521.273438 L 933.917969 520.695312 L 932.886719 520.304688 L 931.855469 519.984375 L 930.757812 519.789062 L 929.597656 519.726562 L 927.082031 520.046875 L 924.953125 520.824219 L 923.210938 522.175781 L 921.917969 524.046875 L 921.015625 526.5 L 920.5 529.402344 L 920.433594 529.660156 L 920.433594 530.046875 L 920.371094 530.242188 L 920.371094 530.628906 Z M 914.695312 530.628906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 887 561 L 925 561 M 887 524 L 925 524 M 887 524 L 887 561 M 925 524 L 925 561 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 887 561 L 925 561 M 887 524 L 925 524 M 925 561 L 925 524 M 887 561 L 887 524 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_1.svg b/cells/o22ai/sky130_fd_sc_hs__o22ai_1.svg
index 5595843..6b5840e 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_1.svg
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1141.5 664.5 L 1175.5 664.5 L 1175.5 833.5 L 1141.5 833.5 Z M 729.5 664.5 L 764.5 664.5 L 764.5 833.5 L 729.5 833.5 Z M 895.5 664.5 L 930.5 664.5 L 930.5 833.5 L 895.5 833.5 Z M 1010.5 664.5 L 1044.5 664.5 L 1044.5 833.5 L 1010.5 833.5 Z M 1010.5 664.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1119.5 240.5 L 1153.5 240.5 L 1153.5 496.5 L 1119.5 496.5 Z M 761.5 240.5 L 796.5 240.5 L 796.5 496.5 L 761.5 496.5 Z M 858.5 240.5 L 892.5 240.5 L 892.5 496.5 L 858.5 496.5 Z M 988.5 240.5 L 1023.5 240.5 L 1023.5 496.5 L 988.5 496.5 Z M 988.5 240.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,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 1266.773438 527.503906 L 1256.203125 527.503906 L 1256.203125 523.261719 L 1258.019531 523.058594 L 1259.636719 522.789062 L 1261.050781 522.453125 L 1262.261719 522.183594 L 1263.269531 521.847656 L 1264.148438 521.445312 L 1264.820312 521.039062 L 1265.425781 520.570312 L 1265.964844 520.03125 L 1266.503906 519.355469 L 1266.972656 518.617188 L 1267.445312 517.742188 L 1267.648438 517.269531 L 1267.847656 516.730469 L 1268.050781 516.125 L 1268.320312 515.386719 L 1268.523438 514.644531 L 1268.792969 513.769531 L 1272.695312 513.769531 L 1272.695312 561.5 L 1266.773438 561.5 Z M 1266.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1219 562 L 1258 562 M 1219 523 L 1258 523 M 1219 523 L 1219 562 M 1258 523 L 1258 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1219 562 L 1258 562 M 1219 523 L 1258 523 M 1258 562 L 1258 523 M 1219 562 L 1219 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_2.svg b/cells/o22ai/sky130_fd_sc_hs__o22ai_2.svg
index 2bb5f01..9f8ba99 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_2.svg
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1380.5 664.5 L 1415.5 664.5 L 1415.5 833.5 L 1380.5 833.5 Z M 507.5 664.5 L 541.5 664.5 L 541.5 833.5 L 507.5 833.5 Z M 628.5 664.5 L 663.5 664.5 L 663.5 833.5 L 628.5 833.5 Z M 736.5 664.5 L 771.5 664.5 L 771.5 833.5 L 736.5 833.5 Z M 851.5 664.5 L 885.5 664.5 L 885.5 833.5 L 851.5 833.5 Z M 1059.5 664.5 L 1094.5 664.5 L 1094.5 833.5 L 1059.5 833.5 Z M 1167.5 664.5 L 1201.5 664.5 L 1201.5 833.5 L 1167.5 833.5 Z M 1266.5 664.5 L 1300.5 664.5 L 1300.5 833.5 L 1266.5 833.5 Z M 1266.5 664.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 1372.5 240.5 L 1407.5 240.5 L 1407.5 496.5 L 1372.5 496.5 Z M 510.5 240.5 L 545.5 240.5 L 545.5 496.5 L 510.5 496.5 Z M 625.5 240.5 L 659.5 240.5 L 659.5 496.5 L 625.5 496.5 Z M 728.5 240.5 L 763.5 240.5 L 763.5 496.5 L 728.5 496.5 Z M 831.5 240.5 L 866.5 240.5 L 866.5 496.5 L 831.5 496.5 Z M 1063.5 240.5 L 1097.5 240.5 L 1097.5 496.5 L 1063.5 496.5 Z M 1166.5 240.5 L 1200.5 240.5 L 1200.5 496.5 L 1166.5 496.5 Z M 1269.5 240.5 L 1303.5 240.5 L 1303.5 496.5 L 1269.5 496.5 Z M 1269.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -170,6 +170,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 910.554688 627.246094 L 910.554688 646.5 L 904.292969 646.5 L 904.292969 627.246094 L 885.375 597.421875 L 893.117188 597.421875 L 907.523438 621.320312 L 921.527344 597.421875 L 929 597.421875 Z M 910.554688 627.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 886 477 L 925 477 M 886 438 L 925 438 M 886 438 L 886 477 M 925 438 L 925 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 886 477 L 925 477 M 886 438 L 925 438 M 925 477 L 925 438 M 886 477 L 886 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o22ai/sky130_fd_sc_hs__o22ai_4.svg b/cells/o22ai/sky130_fd_sc_hs__o22ai_4.svg
index bc90eec..982b9e1 100644
--- a/cells/o22ai/sky130_fd_sc_hs__o22ai_4.svg
+++ b/cells/o22ai/sky130_fd_sc_hs__o22ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.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="#image349"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1590.5 638.5 L 1617.5 638.5 L 1617.5 774.5 L 1590.5 774.5 Z M 286.5 638.5 L 314.5 638.5 L 314.5 774.5 L 286.5 774.5 Z M 378.5 638.5 L 406.5 638.5 L 406.5 774.5 L 378.5 774.5 Z M 457.5 638.5 L 485.5 638.5 L 485.5 774.5 L 457.5 774.5 Z M 549.5 638.5 L 577.5 638.5 L 577.5 774.5 L 549.5 774.5 Z M 628.5 638.5 L 656.5 638.5 L 656.5 774.5 L 628.5 774.5 Z M 720.5 638.5 L 748.5 638.5 L 748.5 774.5 L 720.5 774.5 Z M 807.5 638.5 L 834.5 638.5 L 834.5 774.5 L 807.5 774.5 Z M 904.5 638.5 L 932.5 638.5 L 932.5 774.5 L 904.5 774.5 Z M 985.5 638.5 L 1012.5 638.5 L 1012.5 774.5 L 985.5 774.5 Z M 1075.5 638.5 L 1103.5 638.5 L 1103.5 774.5 L 1075.5 774.5 Z M 1156.5 638.5 L 1183.5 638.5 L 1183.5 774.5 L 1156.5 774.5 Z M 1235.5 638.5 L 1262.5 638.5 L 1262.5 774.5 L 1235.5 774.5 Z M 1314.5 638.5 L 1342.5 638.5 L 1342.5 774.5 L 1314.5 774.5 Z M 1406.5 638.5 L 1433.5 638.5 L 1433.5 774.5 L 1406.5 774.5 Z M 1498.5 638.5 L 1525.5 638.5 L 1525.5 774.5 L 1498.5 774.5 Z M 1498.5 638.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1585.5 298.5 L 1613.5 298.5 L 1613.5 504.5 L 1585.5 504.5 Z M 289.5 298.5 L 317.5 298.5 L 317.5 504.5 L 289.5 504.5 Z M 372.5 298.5 L 399.5 298.5 L 399.5 504.5 L 372.5 504.5 Z M 464.5 298.5 L 491.5 298.5 L 491.5 504.5 L 464.5 504.5 Z M 546.5 298.5 L 574.5 298.5 L 574.5 504.5 L 546.5 504.5 Z M 638.5 298.5 L 666.5 298.5 L 666.5 504.5 L 638.5 504.5 Z M 721.5 298.5 L 749.5 298.5 L 749.5 504.5 L 721.5 504.5 Z M 804.5 298.5 L 831.5 298.5 L 831.5 504.5 L 804.5 504.5 Z M 887.5 298.5 L 914.5 298.5 L 914.5 504.5 L 887.5 504.5 Z M 988.5 298.5 L 1015.5 298.5 L 1015.5 504.5 L 988.5 504.5 Z M 1070.5 298.5 L 1098.5 298.5 L 1098.5 504.5 L 1070.5 504.5 Z M 1153.5 298.5 L 1181.5 298.5 L 1181.5 504.5 L 1153.5 504.5 Z M 1245.5 298.5 L 1273.5 298.5 L 1273.5 504.5 L 1245.5 504.5 Z M 1328.5 298.5 L 1355.5 298.5 L 1355.5 504.5 L 1328.5 504.5 Z M 1410.5 298.5 L 1438.5 298.5 L 1438.5 504.5 L 1410.5 504.5 Z M 1495.5 298.5 L 1523.5 298.5 L 1523.5 504.5 L 1495.5 504.5 Z M 1495.5 298.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface346">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,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 807.097656 459.878906 L 798.507812 459.878906 L 798.507812 456.429688 L 799.984375 456.265625 L 801.296875 456.046875 L 802.445312 455.773438 L 803.429688 455.554688 L 804.25 455.28125 L 804.960938 454.953125 L 805.511719 454.625 L 806.003906 454.242188 L 806.441406 453.804688 L 806.878906 453.257812 L 807.261719 452.65625 L 807.644531 451.945312 L 807.808594 451.5625 L 807.972656 451.125 L 808.136719 450.632812 L 808.355469 450.03125 L 808.519531 449.429688 L 808.738281 448.71875 L 811.910156 448.71875 L 811.910156 487.5 L 807.097656 487.5 Z M 807.097656 459.878906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 767 627 L 798 627 M 767 596 L 798 596 M 767 596 L 767 627 M 798 596 L 798 627 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 767 627 L 798 627 M 767 596 L 798 596 M 798 627 L 798 596 M 767 627 L 767 596 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.svg b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.svg
index df90ed9..f8f41d4 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.svg
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 722.5 664.5 L 757.5 664.5 L 757.5 810.5 L 722.5 810.5 Z M 812.5 664.5 L 846.5 664.5 L 846.5 810.5 L 812.5 810.5 Z M 1205.5 687.5 L 1239.5 687.5 L 1239.5 833.5 L 1205.5 833.5 Z M 1106.5 687.5 L 1141.5 687.5 L 1141.5 833.5 L 1106.5 833.5 Z M 1326.5 687.5 L 1361.5 687.5 L 1361.5 833.5 L 1326.5 833.5 Z M 565.5 664.5 L 600.5 664.5 L 600.5 833.5 L 565.5 833.5 Z M 565.5 664.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1323.5 249.5 L 1357.5 249.5 L 1357.5 478.5 L 1323.5 478.5 Z M 699.5 286.5 L 734.5 286.5 L 734.5 478.5 L 699.5 478.5 Z M 815.5 286.5 L 850.5 286.5 L 850.5 478.5 L 815.5 478.5 Z M 1110.5 286.5 L 1144.5 286.5 L 1144.5 478.5 L 1110.5 478.5 Z M 1227.5 249.5 L 1261.5 249.5 L 1261.5 478.5 L 1227.5 478.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 565.5 240.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,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 824.550781 512.574219 L 824.550781 561.652344 L 817.484375 561.652344 L 792.101562 521.863281 L 792.101562 561.652344 L 786.179688 561.652344 L 786.179688 512.574219 L 792.976562 512.574219 L 818.628906 552.699219 L 818.628906 512.574219 Z M 824.550781 512.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 722 562 L 761 562 M 722 523 L 761 523 M 722 523 L 722 562 M 761 523 L 761 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 722 562 L 761 562 M 722 523 L 761 523 M 761 562 L 761 523 M 722 562 L 722 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.svg b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.svg
index e5abd2e..72c880e 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.svg
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 563.5 664.5 L 598.5 664.5 L 598.5 833.5 L 563.5 833.5 Z M 1005.5 687.5 L 1040.5 687.5 L 1040.5 833.5 L 1005.5 833.5 Z M 1095.5 687.5 L 1129.5 687.5 L 1129.5 833.5 L 1095.5 833.5 Z M 1224.5 664.5 L 1259.5 664.5 L 1259.5 833.5 L 1224.5 833.5 Z M 1323.5 664.5 L 1357.5 664.5 L 1357.5 833.5 L 1323.5 833.5 Z M 776.5 664.5 L 811.5 664.5 L 811.5 833.5 L 776.5 833.5 Z M 662.5 664.5 L 696.5 664.5 L 696.5 833.5 L 662.5 833.5 Z M 662.5 664.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1051.5 275.5 L 1086.5 275.5 L 1086.5 468.5 L 1051.5 468.5 Z M 928.5 275.5 L 962.5 275.5 L 962.5 468.5 L 928.5 468.5 Z M 780.5 240.5 L 814.5 240.5 L 814.5 469.5 L 780.5 469.5 Z M 663.5 240.5 L 697.5 240.5 L 697.5 469.5 L 663.5 469.5 Z M 567.5 240.5 L 601.5 240.5 L 601.5 469.5 L 567.5 469.5 Z M 1324.5 240.5 L 1358.5 240.5 L 1358.5 496.5 L 1324.5 496.5 Z M 1221.5 240.5 L 1255.5 240.5 L 1255.5 496.5 L 1221.5 496.5 Z M 1221.5 240.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface307">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,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 751.703125 530.332031 L 752.242188 525.28125 L 753.652344 521.175781 L 755.875 517.941406 L 758.90625 515.652344 L 762.742188 514.242188 L 767.457031 513.769531 L 769.609375 513.902344 L 771.695312 514.242188 L 773.648438 514.777344 L 775.398438 515.585938 L 777.015625 516.597656 L 778.5625 517.742188 L 779.773438 519.15625 L 780.851562 520.636719 L 781.660156 522.25 L 782.265625 523.933594 L 782.601562 525.820312 L 782.738281 527.773438 L 782.46875 530.53125 L 781.726562 533.089844 L 780.449219 535.445312 L 778.699219 537.667969 L 776.410156 539.753906 L 773.648438 541.574219 L 772.640625 542.179688 L 765.90625 545.8125 L 764.15625 546.824219 L 762.609375 547.832031 L 761.261719 548.84375 L 760.183594 549.851562 L 759.242188 550.863281 L 758.570312 551.875 L 758.230469 552.480469 L 757.960938 553.015625 L 757.761719 553.691406 L 757.558594 554.296875 L 757.355469 554.96875 L 757.289062 555.644531 L 782.402344 555.644531 L 782.402344 561.5 L 750.625 561.5 L 750.757812 559.144531 L 751.097656 556.988281 L 751.5 554.96875 L 752.039062 553.21875 L 752.644531 551.535156 L 753.386719 550.054688 L 754.191406 548.777344 L 755.203125 547.496094 L 756.414062 546.21875 L 757.761719 545.007812 L 759.308594 543.792969 L 761.125 542.582031 L 761.53125 542.3125 L 762.003906 542.042969 L 762.472656 541.707031 L 762.945312 541.4375 L 763.484375 541.167969 L 764.023438 540.832031 L 770.214844 537.332031 L 772.167969 536.050781 L 773.785156 534.640625 L 775.0625 533.15625 L 775.9375 531.542969 L 776.476562 529.792969 L 776.679688 527.90625 L 776.542969 526.628906 L 776.339844 525.347656 L 775.871094 524.203125 L 775.332031 523.125 L 774.523438 522.183594 L 773.648438 521.242188 L 772.707031 520.570312 L 771.765625 519.960938 L 770.6875 519.558594 L 769.609375 519.222656 L 768.464844 519.019531 L 767.253906 518.953125 L 764.628906 519.289062 L 762.40625 520.097656 L 760.589844 521.511719 L 759.242188 523.464844 L 758.300781 526.023438 L 757.761719 529.050781 L 757.695312 529.320312 L 757.695312 529.722656 L 757.625 529.925781 L 757.625 530.332031 Z M 751.703125 530.332031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 722 562 L 761 562 M 722 523 L 761 523 M 722 523 L 722 562 M 761 523 L 761 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 722 562 L 761 562 M 722 523 L 761 523 M 761 562 L 761 523 M 722 562 L 722 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.svg b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.svg
index 19e2991..c48803d 100644
--- a/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.svg
+++ b/cells/o2bb2a/sky130_fd_sc_hs__o2bb2a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1128.5 651.5 L 1159.5 651.5 L 1159.5 784.5 L 1128.5 784.5 Z M 1047.5 651.5 L 1078.5 651.5 L 1078.5 784.5 L 1047.5 784.5 Z M 508.5 672.5 L 539.5 672.5 L 539.5 804.5 L 508.5 804.5 Z M 419.5 672.5 L 450.5 672.5 L 450.5 804.5 L 419.5 804.5 Z M 707.5 672.5 L 738.5 672.5 L 738.5 804.5 L 707.5 804.5 Z M 611.5 672.5 L 642.5 672.5 L 642.5 804.5 L 611.5 804.5 Z M 803.5 672.5 L 834.5 672.5 L 834.5 804.5 L 803.5 804.5 Z M 1483.5 651.5 L 1514.5 651.5 L 1514.5 804.5 L 1483.5 804.5 Z M 1261.5 651.5 L 1292.5 651.5 L 1292.5 804.5 L 1261.5 804.5 Z M 1380.5 651.5 L 1411.5 651.5 L 1411.5 804.5 L 1380.5 804.5 Z M 301.5 672.5 L 332.5 672.5 L 332.5 804.5 L 301.5 804.5 Z M 1572.5 651.5 L 1603.5 651.5 L 1603.5 804.5 L 1572.5 804.5 Z M 1572.5 651.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 317.5 268.5 L 348.5 268.5 L 348.5 475.5 L 317.5 475.5 Z M 410.5 268.5 L 442.5 268.5 L 442.5 475.5 L 410.5 475.5 Z M 597.5 268.5 L 628.5 268.5 L 628.5 475.5 L 597.5 475.5 Z M 504.5 268.5 L 535.5 268.5 L 535.5 475.5 L 504.5 475.5 Z M 1135.5 326.5 L 1166.5 326.5 L 1166.5 500.5 L 1135.5 500.5 Z M 1264.5 268.5 L 1295.5 268.5 L 1295.5 500.5 L 1264.5 500.5 Z M 1378.5 268.5 L 1409.5 268.5 L 1409.5 500.5 L 1378.5 500.5 Z M 1575.5 268.5 L 1606.5 268.5 L 1606.5 500.5 L 1575.5 500.5 Z M 1481.5 268.5 L 1512.5 268.5 L 1512.5 500.5 L 1481.5 500.5 Z M 914.5 326.5 L 945.5 326.5 L 945.5 500.5 L 914.5 500.5 Z M 1042.5 326.5 L 1073.5 326.5 L 1073.5 500.5 L 1042.5 500.5 Z M 806.5 326.5 L 837.5 326.5 L 837.5 500.5 L 806.5 500.5 Z M 806.5 326.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,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 1234.964844 513.652344 L 1234.964844 558.640625 L 1228.484375 558.640625 L 1205.21875 522.167969 L 1205.21875 558.640625 L 1199.789062 558.640625 L 1199.789062 513.652344 L 1206.023438 513.652344 L 1229.535156 550.429688 L 1229.535156 513.652344 Z M 1234.964844 513.652344 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1140 560 L 1176 560 M 1140 525 L 1176 525 M 1140 525 L 1140 560 M 1176 525 L 1176 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1140 560 L 1176 560 M 1140 525 L 1176 525 M 1176 560 L 1176 525 M 1140 560 L 1140 525 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.svg b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.svg
index 0261d8d..bcdd783 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1112.5 664.5 L 1146.5 664.5 L 1146.5 833.5 L 1112.5 833.5 Z M 763.5 687.5 L 797.5 687.5 L 797.5 833.5 L 763.5 833.5 Z M 673.5 687.5 L 708.5 687.5 L 708.5 833.5 L 673.5 833.5 Z M 997.5 664.5 L 1032.5 664.5 L 1032.5 833.5 L 997.5 833.5 Z M 1211.5 664.5 L 1245.5 664.5 L 1245.5 833.5 L 1211.5 833.5 Z M 1211.5 664.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 693.5 287.5 L 727.5 287.5 L 727.5 479.5 L 693.5 479.5 Z M 796.5 287.5 L 830.5 287.5 L 830.5 479.5 L 796.5 479.5 Z M 1214.5 240.5 L 1248.5 240.5 L 1248.5 496.5 L 1214.5 496.5 Z M 1001.5 240.5 L 1035.5 240.5 L 1035.5 496.5 L 1001.5 496.5 Z M 1104.5 240.5 L 1138.5 240.5 L 1138.5 496.5 L 1104.5 496.5 Z M 1104.5 240.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface305">
+<g id="surface334">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -165,6 +165,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 824.550781 596.574219 L 824.550781 645.652344 L 817.484375 645.652344 L 792.101562 605.863281 L 792.101562 645.652344 L 786.179688 645.652344 L 786.179688 596.574219 L 792.976562 596.574219 L 818.628906 636.699219 L 818.628906 596.574219 Z M 824.550781 596.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 722 477 L 761 477 M 722 438 L 761 438 M 722 438 L 722 477 M 761 438 L 761 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 722 477 L 761 477 M 722 438 L 761 438 M 761 477 L 761 438 M 722 477 L 722 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.svg b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.svg
index 1fe9fa5..af76563 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1277.5 664.5 L 1311.5 664.5 L 1311.5 833.5 L 1277.5 833.5 Z M 633.5 687.5 L 667.5 687.5 L 667.5 833.5 L 633.5 833.5 Z M 517.5 687.5 L 552.5 687.5 L 552.5 833.5 L 517.5 833.5 Z M 419.5 687.5 L 453.5 687.5 L 453.5 833.5 L 419.5 833.5 Z M 732.5 687.5 L 766.5 687.5 L 766.5 833.5 L 732.5 833.5 Z M 1057.5 664.5 L 1091.5 664.5 L 1091.5 833.5 L 1057.5 833.5 Z M 958.5 664.5 L 993.5 664.5 L 993.5 833.5 L 958.5 833.5 Z M 1162.5 664.5 L 1197.5 664.5 L 1197.5 833.5 L 1162.5 833.5 Z M 1489.5 664.5 L 1523.5 664.5 L 1523.5 833.5 L 1489.5 833.5 Z M 1387.5 664.5 L 1421.5 664.5 L 1421.5 833.5 L 1387.5 833.5 Z M 1387.5 664.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 521.5 282.5 L 555.5 282.5 L 555.5 475.5 L 521.5 475.5 Z M 418.5 282.5 L 452.5 282.5 L 452.5 475.5 L 418.5 475.5 Z M 663.5 282.5 L 697.5 282.5 L 697.5 475.5 L 663.5 475.5 Z M 1177.5 240.5 L 1212.5 240.5 L 1212.5 496.5 L 1177.5 496.5 Z M 1487.5 240.5 L 1521.5 240.5 L 1521.5 496.5 L 1487.5 496.5 Z M 1054.5 240.5 L 1088.5 240.5 L 1088.5 496.5 L 1054.5 496.5 Z M 947.5 240.5 L 981.5 240.5 L 981.5 496.5 L 947.5 496.5 Z M 788.5 304.5 L 822.5 304.5 L 822.5 496.5 L 788.5 496.5 Z M 1280.5 240.5 L 1315.5 240.5 L 1315.5 496.5 L 1280.5 496.5 Z M 1384.5 240.5 L 1418.5 240.5 L 1418.5 496.5 L 1384.5 496.5 Z M 1384.5 240.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface340">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 437.550781 512.574219 L 437.550781 561.652344 L 430.484375 561.652344 L 405.101562 521.863281 L 405.101562 561.652344 L 399.179688 561.652344 L 399.179688 512.574219 L 405.976562 512.574219 L 431.628906 552.699219 L 431.628906 512.574219 Z M 437.550781 512.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 335 562 L 374 562 M 335 523 L 374 523 M 335 523 L 335 562 M 374 523 L 374 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 335 562 L 374 562 M 335 523 L 374 523 M 374 562 L 374 523 M 335 562 L 335 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.svg b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.svg
index 784acf9..3aaf47e 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_hs__o2bb2ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.5 "/>
 </clipPath>
-<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image390"/>
+  <use xlink:href="#image420"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image390"/>
+  <use xlink:href="#image420"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1630.5 618.5 L 1652.5 618.5 L 1652.5 729.5 L 1630.5 729.5 Z M 266.5 618.5 L 289.5 618.5 L 289.5 729.5 L 266.5 729.5 Z M 331.5 618.5 L 353.5 618.5 L 353.5 729.5 L 331.5 729.5 Z M 397.5 618.5 L 419.5 618.5 L 419.5 729.5 L 397.5 729.5 Z M 461.5 618.5 L 484.5 618.5 L 484.5 729.5 L 461.5 729.5 Z M 526.5 618.5 L 548.5 618.5 L 548.5 729.5 L 526.5 729.5 Z M 590.5 618.5 L 613.5 618.5 L 613.5 729.5 L 590.5 729.5 Z M 669.5 618.5 L 691.5 618.5 L 691.5 729.5 L 669.5 729.5 Z M 740.5 618.5 L 763.5 618.5 L 763.5 729.5 L 740.5 729.5 Z M 889.5 618.5 L 911.5 618.5 L 911.5 729.5 L 889.5 729.5 Z M 953.5 618.5 L 976.5 618.5 L 976.5 729.5 L 953.5 729.5 Z M 1018.5 618.5 L 1040.5 618.5 L 1040.5 729.5 L 1018.5 729.5 Z M 1082.5 618.5 L 1105.5 618.5 L 1105.5 729.5 L 1082.5 729.5 Z M 1147.5 618.5 L 1169.5 618.5 L 1169.5 729.5 L 1147.5 729.5 Z M 1222.5 618.5 L 1244.5 618.5 L 1244.5 729.5 L 1222.5 729.5 Z M 1286.5 618.5 L 1309.5 618.5 L 1309.5 729.5 L 1286.5 729.5 Z M 1361.5 618.5 L 1384.5 618.5 L 1384.5 729.5 L 1361.5 729.5 Z M 1426.5 618.5 L 1448.5 618.5 L 1448.5 729.5 L 1426.5 729.5 Z M 1490.5 618.5 L 1513.5 618.5 L 1513.5 729.5 L 1490.5 729.5 Z M 1555.5 618.5 L 1577.5 618.5 L 1577.5 729.5 L 1555.5 729.5 Z M 1555.5 618.5 "/>
 </clipPath>
-<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1630.5 341.5 L 1652.5 341.5 L 1652.5 509.5 L 1630.5 509.5 Z M 266.5 341.5 L 289.5 341.5 L 289.5 509.5 L 266.5 509.5 Z M 334.5 341.5 L 356.5 341.5 L 356.5 509.5 L 334.5 509.5 Z M 401.5 341.5 L 424.5 341.5 L 424.5 509.5 L 401.5 509.5 Z M 469.5 341.5 L 491.5 341.5 L 491.5 509.5 L 469.5 509.5 Z M 536.5 341.5 L 559.5 341.5 L 559.5 509.5 L 536.5 509.5 Z M 604.5 341.5 L 626.5 341.5 L 626.5 509.5 L 604.5 509.5 Z M 671.5 341.5 L 694.5 341.5 L 694.5 509.5 L 671.5 509.5 Z M 739.5 341.5 L 761.5 341.5 L 761.5 509.5 L 739.5 509.5 Z M 806.5 341.5 L 829.5 341.5 L 829.5 509.5 L 806.5 509.5 Z M 874.5 341.5 L 896.5 341.5 L 896.5 509.5 L 874.5 509.5 Z M 941.5 341.5 L 964.5 341.5 L 964.5 509.5 L 941.5 509.5 Z M 1009.5 341.5 L 1031.5 341.5 L 1031.5 509.5 L 1009.5 509.5 Z M 1157.5 341.5 L 1180.5 341.5 L 1180.5 509.5 L 1157.5 509.5 Z M 1225.5 341.5 L 1247.5 341.5 L 1247.5 509.5 L 1225.5 509.5 Z M 1292.5 341.5 L 1315.5 341.5 L 1315.5 509.5 L 1292.5 509.5 Z M 1360.5 341.5 L 1382.5 341.5 L 1382.5 509.5 L 1360.5 509.5 Z M 1427.5 341.5 L 1450.5 341.5 L 1450.5 509.5 L 1427.5 509.5 Z M 1495.5 341.5 L 1517.5 341.5 L 1517.5 509.5 L 1495.5 509.5 Z M 1562.5 341.5 L 1585.5 341.5 L 1585.5 509.5 L 1562.5 509.5 Z M 1562.5 341.5 "/>
 </clipPath>
-<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image392"/>
+  <use xlink:href="#image422"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.5 "/>
 </clipPath>
-<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image393"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface387">
+<g id="surface417">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -210,6 +210,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1324.628906 531.371094 L 1324.976562 528.109375 L 1325.890625 525.457031 L 1327.324219 523.371094 L 1329.28125 521.890625 L 1331.761719 520.976562 L 1334.804688 520.675781 L 1336.195312 520.761719 L 1337.542969 520.976562 L 1338.804688 521.324219 L 1339.933594 521.847656 L 1340.976562 522.5 L 1341.976562 523.238281 L 1342.761719 524.152344 L 1343.457031 525.109375 L 1343.976562 526.152344 L 1344.371094 527.238281 L 1344.585938 528.457031 L 1344.675781 529.71875 L 1344.5 531.5 L 1344.023438 533.152344 L 1343.195312 534.675781 L 1342.066406 536.109375 L 1340.585938 537.457031 L 1338.804688 538.628906 L 1338.152344 539.023438 L 1333.804688 541.371094 L 1332.675781 542.023438 L 1331.675781 542.675781 L 1330.804688 543.324219 L 1330.109375 543.976562 L 1329.5 544.628906 L 1329.066406 545.28125 L 1328.847656 545.675781 L 1328.675781 546.023438 L 1328.542969 546.457031 L 1328.414062 546.847656 L 1328.28125 547.28125 L 1328.238281 547.71875 L 1344.457031 547.71875 L 1344.457031 551.5 L 1323.933594 551.5 L 1324.023438 549.976562 L 1324.238281 548.585938 L 1324.5 547.28125 L 1324.847656 546.152344 L 1325.238281 545.066406 L 1325.71875 544.109375 L 1326.238281 543.28125 L 1326.890625 542.457031 L 1327.675781 541.628906 L 1328.542969 540.847656 L 1329.542969 540.066406 L 1330.71875 539.28125 L 1330.976562 539.109375 L 1331.28125 538.933594 L 1331.585938 538.71875 L 1331.890625 538.542969 L 1332.238281 538.371094 L 1332.585938 538.152344 L 1336.585938 535.890625 L 1337.847656 535.066406 L 1338.890625 534.152344 L 1339.71875 533.195312 L 1340.28125 532.152344 L 1340.628906 531.023438 L 1340.761719 529.804688 L 1340.675781 528.976562 L 1340.542969 528.152344 L 1340.238281 527.414062 L 1339.890625 526.71875 L 1339.371094 526.109375 L 1338.804688 525.5 L 1338.195312 525.066406 L 1337.585938 524.675781 L 1336.890625 524.414062 L 1336.195312 524.195312 L 1335.457031 524.066406 L 1334.675781 524.023438 L 1332.976562 524.238281 L 1331.542969 524.761719 L 1330.371094 525.675781 L 1329.5 526.933594 L 1328.890625 528.585938 L 1328.542969 530.542969 L 1328.5 530.71875 L 1328.5 530.976562 L 1328.457031 531.109375 L 1328.457031 531.371094 Z M 1324.628906 531.371094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1306 557 L 1332 557 M 1306 531 L 1332 531 M 1306 531 L 1306 557 M 1332 531 L 1332 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1306 557 L 1332 557 M 1306 531 L 1332 531 M 1332 557 L 1332 531 M 1306 557 L 1306 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_1.svg b/cells/o311a/sky130_fd_sc_hs__o311a_1.svg
index d2326d6..2622830 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_1.svg
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.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 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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 1325.5 664.5 L 1360.5 664.5 L 1360.5 833.5 L 1325.5 833.5 Z M 672.5 687.5 L 706.5 687.5 L 706.5 833.5 L 672.5 833.5 Z M 1208.5 687.5 L 1243.5 687.5 L 1243.5 833.5 L 1208.5 833.5 Z M 961.5 687.5 L 995.5 687.5 L 995.5 833.5 L 961.5 833.5 Z M 796.5 687.5 L 830.5 687.5 L 830.5 833.5 L 796.5 833.5 Z M 583.5 687.5 L 617.5 687.5 L 617.5 833.5 L 583.5 833.5 Z M 583.5 687.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 570.5 246.5 L 604.5 246.5 L 604.5 475.5 L 570.5 475.5 Z M 696.5 246.5 L 730.5 246.5 L 730.5 475.5 L 696.5 475.5 Z M 1177.5 246.5 L 1212.5 246.5 L 1212.5 475.5 L 1177.5 475.5 Z M 1047.5 246.5 L 1081.5 246.5 L 1081.5 475.5 L 1047.5 475.5 Z M 799.5 246.5 L 834.5 246.5 L 834.5 475.5 L 799.5 475.5 Z M 1319.5 240.5 L 1354.5 240.5 L 1354.5 496.5 L 1319.5 496.5 Z M 1319.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.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>
@@ -173,6 +173,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 1406.824219 706.320312 L 1424.191406 731.5 L 1416.449219 731.5 L 1403.050781 711.035156 L 1389.589844 731.5 L 1381.980469 731.5 L 1399.351562 706.320312 L 1383.058594 682.421875 L 1390.664062 682.421875 L 1403.253906 701.675781 L 1415.910156 682.421875 L 1423.382812 682.421875 Z M 1406.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1382 392 L 1421 392 M 1382 353 L 1421 353 M 1382 353 L 1382 392 M 1421 353 L 1421 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1382 392 L 1421 392 M 1382 353 L 1421 353 M 1421 392 L 1421 353 M 1382 392 L 1382 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_2.svg b/cells/o311a/sky130_fd_sc_hs__o311a_2.svg
index c83e552..94f5fe2 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_2.svg
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1306.5 664.5 L 1340.5 664.5 L 1340.5 833.5 L 1306.5 833.5 Z M 587.5 664.5 L 622.5 664.5 L 622.5 833.5 L 587.5 833.5 Z M 683.5 664.5 L 718.5 664.5 L 718.5 833.5 L 683.5 833.5 Z M 807.5 664.5 L 842.5 664.5 L 842.5 833.5 L 807.5 833.5 Z M 972.5 664.5 L 1007.5 664.5 L 1007.5 833.5 L 972.5 833.5 Z M 1071.5 664.5 L 1105.5 664.5 L 1105.5 833.5 L 1071.5 833.5 Z M 1207.5 664.5 L 1242.5 664.5 L 1242.5 833.5 L 1207.5 833.5 Z M 1207.5 664.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1199.5 240.5 L 1234.5 240.5 L 1234.5 496.5 L 1199.5 496.5 Z M 721.5 267.5 L 756.5 267.5 L 756.5 496.5 L 721.5 496.5 Z M 591.5 267.5 L 625.5 267.5 L 625.5 496.5 L 591.5 496.5 Z M 1065.5 240.5 L 1099.5 240.5 L 1099.5 496.5 L 1065.5 496.5 Z M 941.5 240.5 L 976.5 240.5 L 976.5 496.5 L 941.5 496.5 Z M 845.5 240.5 L 879.5 240.5 L 879.5 496.5 L 845.5 496.5 Z M 1302.5 240.5 L 1337.5 240.5 L 1337.5 496.5 L 1302.5 496.5 Z M 1302.5 240.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface346">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 553.476562 611.953125 L 542.90625 611.953125 L 542.90625 607.714844 L 544.722656 607.511719 L 546.339844 607.242188 L 547.753906 606.90625 L 548.964844 606.636719 L 549.972656 606.300781 L 550.847656 605.894531 L 551.523438 605.492188 L 552.128906 605.019531 L 552.667969 604.480469 L 553.207031 603.808594 L 553.675781 603.066406 L 554.148438 602.191406 L 554.351562 601.722656 L 554.550781 601.183594 L 554.753906 600.578125 L 555.023438 599.835938 L 555.226562 599.097656 L 555.496094 598.222656 L 559.398438 598.222656 L 559.398438 645.953125 L 553.476562 645.953125 Z M 553.476562 611.953125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 502 477 L 541 477 M 502 438 L 541 438 M 502 438 L 502 477 M 541 438 L 541 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 502 477 L 541 477 M 502 438 L 541 438 M 541 477 L 541 438 M 502 477 L 502 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311a/sky130_fd_sc_hs__o311a_4.svg b/cells/o311a/sky130_fd_sc_hs__o311a_4.svg
index 8aca0ec..e7b3461 100644
--- a/cells/o311a/sky130_fd_sc_hs__o311a_4.svg
+++ b/cells/o311a/sky130_fd_sc_hs__o311a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 747.5 646.5 L 773.5 646.5 L 773.5 757.5 L 747.5 757.5 Z M 1611.5 646.5 L 1637.5 646.5 L 1637.5 757.5 L 1611.5 757.5 Z M 1534.5 646.5 L 1560.5 646.5 L 1560.5 757.5 L 1534.5 757.5 Z M 1089.5 646.5 L 1115.5 646.5 L 1115.5 757.5 L 1089.5 757.5 Z M 1350.5 646.5 L 1376.5 646.5 L 1376.5 757.5 L 1350.5 757.5 Z M 1181.5 646.5 L 1207.5 646.5 L 1207.5 757.5 L 1181.5 757.5 Z M 1274.5 646.5 L 1301.5 646.5 L 1301.5 757.5 L 1274.5 757.5 Z M 912.5 646.5 L 938.5 646.5 L 938.5 757.5 L 912.5 757.5 Z M 1014.5 646.5 L 1040.5 646.5 L 1040.5 757.5 L 1014.5 757.5 Z M 1441.5 646.5 L 1468.5 646.5 L 1468.5 757.5 L 1441.5 757.5 Z M 367.5 632.5 L 393.5 632.5 L 393.5 761.5 L 367.5 761.5 Z M 488.5 632.5 L 514.5 632.5 L 514.5 761.5 L 488.5 761.5 Z M 575.5 632.5 L 601.5 632.5 L 601.5 761.5 L 575.5 761.5 Z M 292.5 632.5 L 318.5 632.5 L 318.5 761.5 L 292.5 761.5 Z M 292.5 632.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1604.5 310.5 L 1630.5 310.5 L 1630.5 484.5 L 1604.5 484.5 Z M 1522.5 310.5 L 1548.5 310.5 L 1548.5 484.5 L 1522.5 484.5 Z M 1345.5 310.5 L 1371.5 310.5 L 1371.5 484.5 L 1345.5 484.5 Z M 895.5 310.5 L 921.5 310.5 L 921.5 484.5 L 895.5 484.5 Z M 745.5 310.5 L 771.5 310.5 L 771.5 484.5 L 745.5 484.5 Z M 1266.5 310.5 L 1292.5 310.5 L 1292.5 484.5 L 1266.5 484.5 Z M 646.5 310.5 L 672.5 310.5 L 672.5 484.5 L 646.5 484.5 Z M 1444.5 310.5 L 1470.5 310.5 L 1470.5 484.5 L 1444.5 484.5 Z M 982.5 310.5 L 1008.5 310.5 L 1008.5 484.5 L 982.5 484.5 Z M 1184.5 310.5 L 1210.5 310.5 L 1210.5 484.5 L 1184.5 484.5 Z M 558.5 310.5 L 584.5 310.5 L 584.5 505.5 L 558.5 505.5 Z M 447.5 310.5 L 473.5 310.5 L 473.5 505.5 L 447.5 505.5 Z M 282.5 310.5 L 308.5 310.5 L 308.5 505.5 L 282.5 505.5 Z M 360.5 310.5 L 386.5 310.5 L 386.5 505.5 L 360.5 505.5 Z M 360.5 310.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface334">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,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 252.242188 599.617188 L 265.269531 618.5 L 259.460938 618.5 L 249.414062 603.152344 L 239.316406 618.5 L 233.609375 618.5 L 246.636719 599.617188 L 234.417969 581.691406 L 240.125 581.691406 L 249.566406 596.132812 L 259.058594 581.691406 L 264.664062 581.691406 Z M 252.242188 599.617188 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 234 494 L 264 494 M 234 464 L 264 464 M 234 464 L 234 494 M 264 464 L 264 494 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 234 494 L 264 494 M 234 464 L 264 464 M 264 494 L 264 464 M 234 494 L 234 464 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_1.svg b/cells/o311ai/sky130_fd_sc_hs__o311ai_1.svg
index 50bd414..3b8dd98 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_1.svg
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1185.5 664.5 L 1220.5 664.5 L 1220.5 833.5 L 1185.5 833.5 Z M 689.5 664.5 L 724.5 664.5 L 724.5 833.5 L 689.5 833.5 Z M 793.5 664.5 L 828.5 664.5 L 828.5 833.5 L 793.5 833.5 Z M 965.5 664.5 L 1000.5 664.5 L 1000.5 833.5 L 965.5 833.5 Z M 1080.5 664.5 L 1114.5 664.5 L 1114.5 833.5 L 1080.5 833.5 Z M 1080.5 664.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1189.5 240.5 L 1223.5 240.5 L 1223.5 496.5 L 1189.5 496.5 Z M 701.5 240.5 L 735.5 240.5 L 735.5 496.5 L 701.5 496.5 Z M 797.5 240.5 L 831.5 240.5 L 831.5 496.5 L 797.5 496.5 Z M 928.5 240.5 L 962.5 240.5 L 962.5 496.5 L 928.5 496.5 Z M 1058.5 240.5 L 1093.5 240.5 L 1093.5 496.5 L 1058.5 496.5 Z M 1058.5 240.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface345">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 986.511719 603.40625 L 984.292969 603.605469 L 982.40625 604.078125 L 980.859375 604.886719 L 979.578125 606.03125 L 978.636719 607.511719 L 977.960938 609.328125 L 977.761719 609.933594 L 977.625 610.609375 L 977.558594 611.28125 L 977.492188 612.089844 L 977.425781 612.828125 L 977.425781 613.636719 L 971.5 613.636719 L 971.769531 609.867188 L 972.644531 606.636719 L 973.921875 603.941406 L 975.808594 601.722656 L 978.097656 600.039062 L 980.992188 598.894531 L 981.800781 598.691406 L 982.675781 598.558594 L 983.550781 598.421875 L 985.433594 598.289062 L 986.445312 598.222656 L 988.9375 598.355469 L 991.292969 598.757812 L 993.378906 599.433594 L 995.265625 600.308594 L 996.878906 601.519531 L 998.292969 602.933594 L 999.101562 604.144531 L 999.773438 605.355469 L 1000.3125 606.703125 L 1000.648438 608.183594 L 1000.851562 609.734375 L 1000.988281 611.347656 L 1000.785156 613.703125 L 1000.246094 615.722656 L 999.304688 617.476562 L 998.023438 619.023438 L 996.339844 620.300781 L 994.320312 621.246094 L 996.003906 621.917969 L 997.484375 622.726562 L 998.765625 623.601562 L 999.84375 624.609375 L 1000.71875 625.753906 L 1001.390625 626.96875 L 1001.660156 627.773438 L 1001.929688 628.648438 L 1002.132812 629.59375 L 1002.265625 630.535156 L 1002.332031 631.542969 L 1002.402344 632.621094 L 1002.265625 634.910156 L 1001.863281 636.996094 L 1001.1875 638.882812 L 1000.3125 640.699219 L 999.167969 642.316406 L 997.753906 643.730469 L 996.207031 644.875 L 994.523438 645.816406 L 992.707031 646.488281 L 990.6875 647.027344 L 988.53125 647.367188 L 986.242188 647.5 L 982.609375 647.230469 L 979.511719 646.421875 L 976.820312 645.210938 L 974.597656 643.394531 L 972.847656 641.105469 L 971.632812 638.277344 L 971.296875 637.402344 L 971.097656 636.390625 L 970.894531 635.382812 L 970.691406 634.371094 L 970.558594 633.296875 L 970.488281 632.082031 L 976.414062 632.082031 L 976.683594 634.507812 L 977.222656 636.59375 L 978.03125 638.34375 L 979.105469 639.757812 L 980.453125 640.902344 L 982.136719 641.644531 L 982.742188 641.84375 L 983.414062 641.980469 L 984.089844 642.113281 L 984.828125 642.179688 L 985.570312 642.25 L 986.445312 642.25 L 988.261719 642.179688 L 989.945312 641.84375 L 991.425781 641.304688 L 992.773438 640.566406 L 993.917969 639.554688 L 994.859375 638.34375 L 995.265625 637.605469 L 995.667969 636.730469 L 995.9375 635.785156 L 996.140625 634.84375 L 996.273438 633.832031 L 996.339844 632.6875 L 996.070312 630.265625 L 995.398438 628.246094 L 994.253906 626.5625 L 992.640625 625.351562 L 990.550781 624.542969 L 987.992188 624.070312 L 986.648438 624.070312 L 986.445312 624.003906 L 983.953125 624.070312 L 983.214844 624.070312 L 983.214844 619.023438 L 985.234375 618.957031 L 987.050781 618.820312 L 988.667969 618.621094 L 990.011719 618.351562 L 991.15625 618.011719 L 992.167969 617.542969 L 992.976562 616.9375 L 993.648438 616.128906 L 994.1875 615.253906 L 994.589844 614.175781 L 994.792969 612.964844 L 994.929688 611.550781 L 994.792969 610.070312 L 994.523438 608.65625 L 994.050781 607.445312 L 993.378906 606.367188 L 992.503906 605.425781 L 991.425781 604.617188 L 990.6875 604.28125 L 989.878906 603.941406 L 989.136719 603.742188 L 988.261719 603.539062 Z M 986.511719 603.40625 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 942 477 L 981 477 M 942 438 L 981 438 M 942 438 L 942 477 M 981 438 L 981 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 942 477 L 981 477 M 942 438 L 981 438 M 981 477 L 981 438 M 942 477 L 942 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_2.svg b/cells/o311ai/sky130_fd_sc_hs__o311ai_2.svg
index f39e413..4eb6188 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_2.svg
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.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 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.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 1489.5 664.5 L 1523.5 664.5 L 1523.5 833.5 L 1489.5 833.5 Z M 396.5 664.5 L 430.5 664.5 L 430.5 833.5 L 396.5 833.5 Z M 508.5 664.5 L 543.5 664.5 L 543.5 833.5 L 508.5 833.5 Z M 620.5 664.5 L 655.5 664.5 L 655.5 833.5 L 620.5 833.5 Z M 721.5 664.5 L 756.5 664.5 L 756.5 833.5 L 721.5 833.5 Z M 829.5 664.5 L 863.5 664.5 L 863.5 833.5 L 829.5 833.5 Z M 934.5 664.5 L 969.5 664.5 L 969.5 833.5 L 934.5 833.5 Z M 1033.5 664.5 L 1067.5 664.5 L 1067.5 833.5 L 1033.5 833.5 Z M 1164.5 664.5 L 1198.5 664.5 L 1198.5 833.5 L 1164.5 833.5 Z M 1390.5 664.5 L 1425.5 664.5 L 1425.5 833.5 L 1390.5 833.5 Z M 1390.5 664.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 1483.5 240.5 L 1518.5 240.5 L 1518.5 496.5 L 1483.5 496.5 Z M 399.5 240.5 L 434.5 240.5 L 434.5 496.5 L 399.5 496.5 Z M 505.5 240.5 L 539.5 240.5 L 539.5 496.5 L 505.5 496.5 Z M 617.5 240.5 L 651.5 240.5 L 651.5 496.5 L 617.5 496.5 Z M 736.5 240.5 L 771.5 240.5 L 771.5 496.5 L 736.5 496.5 Z M 968.5 240.5 L 1002.5 240.5 L 1002.5 496.5 L 968.5 496.5 Z M 1071.5 240.5 L 1105.5 240.5 L 1105.5 496.5 L 1071.5 496.5 Z M 1174.5 240.5 L 1208.5 240.5 L 1208.5 496.5 L 1174.5 496.5 Z M 1277.5 240.5 L 1311.5 240.5 L 1311.5 496.5 L 1277.5 496.5 Z M 1380.5 240.5 L 1415.5 240.5 L 1415.5 496.5 L 1380.5 496.5 Z M 1380.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.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>
@@ -192,6 +192,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 493.773438 527.503906 L 483.203125 527.503906 L 483.203125 523.261719 L 485.019531 523.058594 L 486.636719 522.789062 L 488.050781 522.453125 L 489.261719 522.183594 L 490.269531 521.847656 L 491.148438 521.445312 L 491.820312 521.039062 L 492.425781 520.570312 L 492.964844 520.03125 L 493.503906 519.355469 L 493.972656 518.617188 L 494.445312 517.742188 L 494.648438 517.269531 L 494.847656 516.730469 L 495.050781 516.125 L 495.320312 515.386719 L 495.523438 514.644531 L 495.792969 513.769531 L 499.695312 513.769531 L 499.695312 561.5 L 493.773438 561.5 Z M 493.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 445 562 L 484 562 M 445 523 L 484 523 M 445 523 L 445 562 M 484 523 L 484 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 445 562 L 484 562 M 445 523 L 484 523 M 484 562 L 484 523 M 445 562 L 445 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o311ai/sky130_fd_sc_hs__o311ai_4.svg b/cells/o311ai/sky130_fd_sc_hs__o311ai_4.svg
index 6053f5e..58be32c 100644
--- a/cells/o311ai/sky130_fd_sc_hs__o311ai_4.svg
+++ b/cells/o311ai/sky130_fd_sc_hs__o311ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 535.5 L 174.5 535.5 Z M 174.5 280.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 200.5 730.5 L 1717.5 730.5 L 1717.5 764.5 L 200.5 764.5 Z M 200.5 730.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 1639.5 611.5 L 1660.5 611.5 L 1660.5 713.5 L 1639.5 713.5 Z M 258.5 611.5 L 279.5 611.5 L 279.5 713.5 L 258.5 713.5 Z M 318.5 611.5 L 339.5 611.5 L 339.5 713.5 L 318.5 713.5 Z M 377.5 611.5 L 398.5 611.5 L 398.5 713.5 L 377.5 713.5 Z M 436.5 611.5 L 457.5 611.5 L 457.5 713.5 L 436.5 713.5 Z M 495.5 611.5 L 516.5 611.5 L 516.5 713.5 L 495.5 713.5 Z M 554.5 611.5 L 575.5 611.5 L 575.5 713.5 L 554.5 713.5 Z M 613.5 611.5 L 634.5 611.5 L 634.5 713.5 L 613.5 713.5 Z M 674.5 611.5 L 694.5 611.5 L 694.5 713.5 L 674.5 713.5 Z M 848.5 611.5 L 869.5 611.5 L 869.5 713.5 L 848.5 713.5 Z M 907.5 611.5 L 928.5 611.5 L 928.5 713.5 L 907.5 713.5 Z M 988.5 611.5 L 1009.5 611.5 L 1009.5 713.5 L 988.5 713.5 Z M 1048.5 611.5 L 1068.5 611.5 L 1068.5 713.5 L 1048.5 713.5 Z M 1130.5 611.5 L 1151.5 611.5 L 1151.5 713.5 L 1130.5 713.5 Z M 1189.5 611.5 L 1210.5 611.5 L 1210.5 713.5 L 1189.5 713.5 Z M 1254.5 611.5 L 1274.5 611.5 L 1274.5 713.5 L 1254.5 713.5 Z M 1323.5 611.5 L 1344.5 611.5 L 1344.5 713.5 L 1323.5 713.5 Z M 1382.5 611.5 L 1403.5 611.5 L 1403.5 713.5 L 1382.5 713.5 Z M 1441.5 611.5 L 1462.5 611.5 L 1462.5 713.5 L 1441.5 713.5 Z M 1578.5 611.5 L 1599.5 611.5 L 1599.5 713.5 L 1578.5 713.5 Z M 1578.5 611.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 1638.5 357.5 L 1658.5 357.5 L 1658.5 511.5 L 1638.5 511.5 Z M 260.5 357.5 L 280.5 357.5 L 280.5 511.5 L 260.5 511.5 Z M 352.5 357.5 L 373.5 357.5 L 373.5 511.5 L 352.5 511.5 Z M 421.5 357.5 L 442.5 357.5 L 442.5 511.5 L 421.5 511.5 Z M 483.5 357.5 L 503.5 357.5 L 503.5 511.5 L 483.5 511.5 Z M 819.5 357.5 L 839.5 357.5 L 839.5 511.5 L 819.5 511.5 Z M 887.5 357.5 L 908.5 357.5 L 908.5 511.5 L 887.5 511.5 Z M 959.5 357.5 L 980.5 357.5 L 980.5 511.5 L 959.5 511.5 Z M 1046.5 357.5 L 1066.5 357.5 L 1066.5 511.5 L 1046.5 511.5 Z M 1107.5 357.5 L 1128.5 357.5 L 1128.5 511.5 L 1107.5 511.5 Z M 1176.5 357.5 L 1197.5 357.5 L 1197.5 511.5 L 1176.5 511.5 Z M 1252.5 357.5 L 1272.5 357.5 L 1272.5 511.5 L 1252.5 511.5 Z M 1313.5 357.5 L 1334.5 357.5 L 1334.5 511.5 L 1313.5 511.5 Z M 1452.5 357.5 L 1473.5 357.5 L 1473.5 511.5 L 1452.5 511.5 Z M 1514.5 357.5 L 1535.5 357.5 L 1535.5 511.5 L 1514.5 511.5 Z M 1576.5 357.5 L 1597.5 357.5 L 1597.5 511.5 L 1576.5 511.5 Z M 1576.5 357.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 222.5 294.5 L 245.5 294.5 L 245.5 318.5 L 222.5 318.5 Z M 1673.5 294.5 L 1696.5 294.5 L 1696.5 318.5 L 1673.5 318.5 Z M 1607.5 294.5 L 1630.5 294.5 L 1630.5 318.5 L 1607.5 318.5 Z M 1541.5 294.5 L 1564.5 294.5 L 1564.5 318.5 L 1541.5 318.5 Z M 1475.5 294.5 L 1498.5 294.5 L 1498.5 318.5 L 1475.5 318.5 Z M 1409.5 294.5 L 1432.5 294.5 L 1432.5 318.5 L 1409.5 318.5 Z M 1343.5 294.5 L 1366.5 294.5 L 1366.5 318.5 L 1343.5 318.5 Z M 1277.5 294.5 L 1300.5 294.5 L 1300.5 318.5 L 1277.5 318.5 Z M 1211.5 294.5 L 1234.5 294.5 L 1234.5 318.5 L 1211.5 318.5 Z M 1145.5 294.5 L 1168.5 294.5 L 1168.5 318.5 L 1145.5 318.5 Z M 1079.5 294.5 L 1103.5 294.5 L 1103.5 318.5 L 1079.5 318.5 Z M 1013.5 294.5 L 1037.5 294.5 L 1037.5 318.5 L 1013.5 318.5 Z M 947.5 294.5 L 971.5 294.5 L 971.5 318.5 L 947.5 318.5 Z M 881.5 294.5 L 905.5 294.5 L 905.5 318.5 L 881.5 318.5 Z M 815.5 294.5 L 839.5 294.5 L 839.5 318.5 L 815.5 318.5 Z M 749.5 294.5 L 773.5 294.5 L 773.5 318.5 L 749.5 318.5 Z M 683.5 294.5 L 707.5 294.5 L 707.5 318.5 L 683.5 318.5 Z M 617.5 294.5 L 641.5 294.5 L 641.5 318.5 L 617.5 318.5 Z M 552.5 294.5 L 575.5 294.5 L 575.5 318.5 L 552.5 318.5 Z M 486.5 294.5 L 509.5 294.5 L 509.5 318.5 L 486.5 318.5 Z M 420.5 294.5 L 443.5 294.5 L 443.5 318.5 L 420.5 318.5 Z M 354.5 294.5 L 377.5 294.5 L 377.5 318.5 L 354.5 318.5 Z M 288.5 294.5 L 311.5 294.5 L 311.5 318.5 L 288.5 318.5 Z M 222.5 752.5 L 245.5 752.5 L 245.5 775.5 L 222.5 775.5 Z M 1673.5 752.5 L 1696.5 752.5 L 1696.5 775.5 L 1673.5 775.5 Z M 1607.5 752.5 L 1630.5 752.5 L 1630.5 775.5 L 1607.5 775.5 Z M 1541.5 752.5 L 1564.5 752.5 L 1564.5 775.5 L 1541.5 775.5 Z M 1475.5 752.5 L 1498.5 752.5 L 1498.5 775.5 L 1475.5 775.5 Z M 1409.5 752.5 L 1432.5 752.5 L 1432.5 775.5 L 1409.5 775.5 Z M 1343.5 752.5 L 1366.5 752.5 L 1366.5 775.5 L 1343.5 775.5 Z M 1277.5 752.5 L 1300.5 752.5 L 1300.5 775.5 L 1277.5 775.5 Z M 1211.5 752.5 L 1234.5 752.5 L 1234.5 775.5 L 1211.5 775.5 Z M 1145.5 752.5 L 1168.5 752.5 L 1168.5 775.5 L 1145.5 775.5 Z M 1079.5 752.5 L 1103.5 752.5 L 1103.5 775.5 L 1079.5 775.5 Z M 1013.5 752.5 L 1037.5 752.5 L 1037.5 775.5 L 1013.5 775.5 Z M 947.5 752.5 L 971.5 752.5 L 971.5 775.5 L 947.5 775.5 Z M 881.5 752.5 L 905.5 752.5 L 905.5 775.5 L 881.5 775.5 Z M 815.5 752.5 L 839.5 752.5 L 839.5 775.5 L 815.5 775.5 Z M 749.5 752.5 L 773.5 752.5 L 773.5 775.5 L 749.5 775.5 Z M 683.5 752.5 L 707.5 752.5 L 707.5 775.5 L 683.5 775.5 Z M 617.5 752.5 L 641.5 752.5 L 641.5 775.5 L 617.5 775.5 Z M 552.5 752.5 L 575.5 752.5 L 575.5 775.5 L 552.5 775.5 Z M 486.5 752.5 L 509.5 752.5 L 509.5 775.5 L 486.5 775.5 Z M 420.5 752.5 L 443.5 752.5 L 443.5 775.5 L 420.5 775.5 Z M 354.5 752.5 L 377.5 752.5 L 377.5 775.5 L 354.5 775.5 Z M 288.5 752.5 L 311.5 752.5 L 311.5 775.5 L 288.5 775.5 Z M 288.5 752.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>
@@ -197,6 +197,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 1636.121094 528.960938 L 1629.738281 528.960938 L 1629.738281 526.398438 L 1630.835938 526.277344 L 1631.8125 526.113281 L 1632.664062 525.910156 L 1633.398438 525.746094 L 1634.007812 525.542969 L 1634.535156 525.300781 L 1634.941406 525.054688 L 1635.308594 524.769531 L 1635.632812 524.445312 L 1635.960938 524.039062 L 1636.246094 523.589844 L 1636.53125 523.0625 L 1636.652344 522.777344 L 1636.773438 522.453125 L 1636.894531 522.085938 L 1637.058594 521.640625 L 1637.179688 521.191406 L 1637.34375 520.664062 L 1639.703125 520.664062 L 1639.703125 549.5 L 1636.121094 549.5 Z M 1636.121094 528.960938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1607 556 L 1630 556 M 1607 533 L 1630 533 M 1607 533 L 1607 556 M 1630 533 L 1630 556 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1607 556 L 1630 556 M 1607 533 L 1630 533 M 1630 556 L 1630 533 M 1607 556 L 1607 533 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 310 L 200 319 M 195 315 L 204 315 M 199 316 L 201 316 M 199 314 L 201 314 M 199 314 L 199 316 M 201 314 L 201 316 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_1.svg b/cells/o31a/sky130_fd_sc_hs__o31a_1.svg
index a4f8151..1a61c3a 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_1.svg
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1200.5 664.5 L 1235.5 664.5 L 1235.5 810.5 L 1200.5 810.5 Z M 1087.5 664.5 L 1121.5 664.5 L 1121.5 810.5 L 1087.5 810.5 Z M 806.5 664.5 L 840.5 664.5 L 840.5 810.5 L 806.5 810.5 Z M 922.5 664.5 L 956.5 664.5 L 956.5 810.5 L 922.5 810.5 Z M 673.5 664.5 L 708.5 664.5 L 708.5 833.5 L 673.5 833.5 Z M 673.5 664.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 678.5 240.5 L 712.5 240.5 L 712.5 496.5 L 678.5 496.5 Z M 1173.5 304.5 L 1207.5 304.5 L 1207.5 496.5 L 1173.5 496.5 Z M 1049.5 267.5 L 1083.5 267.5 L 1083.5 496.5 L 1049.5 496.5 Z M 932.5 267.5 L 967.5 267.5 L 967.5 496.5 L 932.5 496.5 Z M 836.5 267.5 L 870.5 267.5 L 870.5 496.5 L 836.5 496.5 Z M 836.5 267.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface320">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,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 636.824219 282.320312 L 654.191406 307.5 L 646.449219 307.5 L 633.050781 287.035156 L 619.589844 307.5 L 611.980469 307.5 L 629.351562 282.320312 L 613.058594 258.421875 L 620.664062 258.421875 L 633.253906 277.675781 L 645.910156 258.421875 L 653.382812 258.421875 Z M 636.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 612 816 L 651 816 M 612 777 L 651 777 M 612 777 L 612 816 M 651 777 L 651 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 612 816 L 651 816 M 612 777 L 651 777 M 651 816 L 651 777 M 612 816 L 612 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_2.svg b/cells/o31a/sky130_fd_sc_hs__o31a_2.svg
index 6962167..33b04a4 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_2.svg
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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 1255.5 664.5 L 1290.5 664.5 L 1290.5 833.5 L 1255.5 833.5 Z M 634.5 664.5 L 669.5 664.5 L 669.5 833.5 L 634.5 833.5 Z M 733.5 664.5 L 767.5 664.5 L 767.5 833.5 L 733.5 833.5 Z M 863.5 664.5 L 898.5 664.5 L 898.5 833.5 L 863.5 833.5 Z M 977.5 664.5 L 1011.5 664.5 L 1011.5 833.5 L 977.5 833.5 Z M 1107.5 664.5 L 1142.5 664.5 L 1142.5 833.5 L 1107.5 833.5 Z M 1107.5 664.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 1235.5 240.5 L 1269.5 240.5 L 1269.5 469.5 L 1235.5 469.5 Z M 1111.5 240.5 L 1145.5 240.5 L 1145.5 469.5 L 1111.5 469.5 Z M 884.5 240.5 L 918.5 240.5 L 918.5 469.5 L 884.5 469.5 Z M 980.5 240.5 L 1015.5 240.5 L 1015.5 469.5 L 980.5 469.5 Z M 620.5 240.5 L 655.5 240.5 L 655.5 496.5 L 620.5 496.5 Z M 736.5 240.5 L 771.5 240.5 L 771.5 496.5 L 736.5 496.5 Z M 736.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.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>
@@ -166,6 +166,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 691.824219 451.320312 L 709.191406 476.5 L 701.449219 476.5 L 688.050781 456.035156 L 674.589844 476.5 L 666.980469 476.5 L 684.351562 451.320312 L 668.058594 427.421875 L 675.664062 427.421875 L 688.253906 446.675781 L 700.910156 427.421875 L 708.382812 427.421875 Z M 691.824219 451.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 667 647 L 706 647 M 667 608 L 706 608 M 667 608 L 667 647 M 706 608 L 706 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 667 647 L 706 647 M 667 608 L 706 608 M 706 647 L 706 608 M 667 647 L 667 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31a/sky130_fd_sc_hs__o31a_4.svg b/cells/o31a/sky130_fd_sc_hs__o31a_4.svg
index c6eab4e..8e1fe24 100644
--- a/cells/o31a/sky130_fd_sc_hs__o31a_4.svg
+++ b/cells/o31a/sky130_fd_sc_hs__o31a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 127.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 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#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 1570.5 625.5 L 1603.5 625.5 L 1603.5 766.5 L 1570.5 766.5 Z M 1349.5 625.5 L 1382.5 625.5 L 1382.5 766.5 L 1349.5 766.5 Z M 1159.5 625.5 L 1192.5 625.5 L 1192.5 766.5 L 1159.5 766.5 Z M 1254.5 625.5 L 1287.5 625.5 L 1287.5 766.5 L 1254.5 766.5 Z M 827.5 625.5 L 860.5 625.5 L 860.5 766.5 L 827.5 766.5 Z M 1459.5 625.5 L 1492.5 625.5 L 1492.5 766.5 L 1459.5 766.5 Z M 1064.5 625.5 L 1097.5 625.5 L 1097.5 766.5 L 1064.5 766.5 Z M 933.5 625.5 L 967.5 625.5 L 967.5 766.5 L 933.5 766.5 Z M 411.5 659.5 L 444.5 659.5 L 444.5 823.5 L 411.5 823.5 Z M 509.5 659.5 L 542.5 659.5 L 542.5 823.5 L 509.5 823.5 Z M 316.5 659.5 L 349.5 659.5 L 349.5 823.5 L 316.5 823.5 Z M 604.5 659.5 L 637.5 659.5 L 637.5 823.5 L 604.5 823.5 Z M 604.5 659.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 1571.5 250.5 L 1604.5 250.5 L 1604.5 471.5 L 1571.5 471.5 Z M 1463.5 250.5 L 1496.5 250.5 L 1496.5 471.5 L 1463.5 471.5 Z M 1253.5 250.5 L 1286.5 250.5 L 1286.5 471.5 L 1253.5 471.5 Z M 731.5 250.5 L 764.5 250.5 L 764.5 471.5 L 731.5 471.5 Z M 1153.5 250.5 L 1186.5 250.5 L 1186.5 471.5 L 1153.5 471.5 Z M 1352.5 250.5 L 1385.5 250.5 L 1385.5 471.5 L 1352.5 471.5 Z M 831.5 250.5 L 864.5 250.5 L 864.5 471.5 L 831.5 471.5 Z M 1054.5 250.5 L 1087.5 250.5 L 1087.5 471.5 L 1054.5 471.5 Z M 514.5 250.5 L 547.5 250.5 L 547.5 498.5 L 514.5 498.5 Z M 414.5 250.5 L 447.5 250.5 L 447.5 498.5 L 414.5 498.5 Z M 315.5 250.5 L 348.5 250.5 L 348.5 498.5 L 315.5 498.5 Z M 613.5 250.5 L 646.5 250.5 L 646.5 498.5 L 613.5 498.5 Z M 613.5 250.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.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>
@@ -192,6 +192,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 380.726562 291.371094 L 397.371094 315.5 L 389.953125 315.5 L 377.113281 295.886719 L 364.210938 315.5 L 356.917969 315.5 L 373.566406 291.371094 L 357.953125 268.46875 L 365.242188 268.46875 L 377.304688 286.917969 L 389.433594 268.46875 L 396.597656 268.46875 Z M 380.726562 291.371094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 357 807 L 394 807 M 357 769 L 394 769 M 357 769 L 357 807 M 394 769 L 394 807 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 357 807 L 394 807 M 357 769 L 394 769 M 394 807 L 394 769 M 357 807 L 357 769 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_1.svg b/cells/o31ai/sky130_fd_sc_hs__o31ai_1.svg
index b0e49c7..9f32770 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_1.svg
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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="#image339"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1151.5 664.5 L 1185.5 664.5 L 1185.5 833.5 L 1151.5 833.5 Z M 729.5 664.5 L 764.5 664.5 L 764.5 833.5 L 729.5 833.5 Z M 828.5 664.5 L 862.5 664.5 L 862.5 833.5 L 828.5 833.5 Z M 1048.5 664.5 L 1082.5 664.5 L 1082.5 833.5 L 1048.5 833.5 Z M 1048.5 664.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1154.5 240.5 L 1189.5 240.5 L 1189.5 496.5 L 1154.5 496.5 Z M 735.5 240.5 L 769.5 240.5 L 769.5 496.5 L 735.5 496.5 Z M 831.5 240.5 L 866.5 240.5 L 866.5 496.5 L 831.5 496.5 Z M 962.5 240.5 L 996.5 240.5 L 996.5 496.5 L 962.5 496.5 Z M 962.5 240.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface309">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,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 1022.554688 288.246094 L 1022.554688 307.5 L 1016.292969 307.5 L 1016.292969 288.246094 L 997.375 258.421875 L 1005.117188 258.421875 L 1019.523438 282.320312 L 1033.527344 258.421875 L 1041 258.421875 Z M 1022.554688 288.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 999 816 L 1038 816 M 999 777 L 1038 777 M 999 777 L 999 816 M 1038 777 L 1038 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 999 816 L 1038 816 M 999 777 L 1038 777 M 1038 816 L 1038 777 M 999 816 L 999 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_2.svg b/cells/o31ai/sky130_fd_sc_hs__o31ai_2.svg
index 272ffdf..02e0ff0 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_2.svg
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1374.5 664.5 L 1409.5 664.5 L 1409.5 833.5 L 1374.5 833.5 Z M 507.5 664.5 L 541.5 664.5 L 541.5 833.5 L 507.5 833.5 Z M 638.5 664.5 L 672.5 664.5 L 672.5 833.5 L 638.5 833.5 Z M 736.5 664.5 L 771.5 664.5 L 771.5 833.5 L 736.5 833.5 Z M 867.5 664.5 L 901.5 664.5 L 901.5 833.5 L 867.5 833.5 Z M 965.5 664.5 L 1000.5 664.5 L 1000.5 833.5 L 965.5 833.5 Z M 1166.5 664.5 L 1200.5 664.5 L 1200.5 833.5 L 1166.5 833.5 Z M 1264.5 664.5 L 1299.5 664.5 L 1299.5 833.5 L 1264.5 833.5 Z M 1264.5 664.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1378.5 240.5 L 1412.5 240.5 L 1412.5 496.5 L 1378.5 496.5 Z M 510.5 240.5 L 545.5 240.5 L 545.5 496.5 L 510.5 496.5 Z M 614.5 240.5 L 648.5 240.5 L 648.5 496.5 L 614.5 496.5 Z M 717.5 240.5 L 751.5 240.5 L 751.5 496.5 L 717.5 496.5 Z M 820.5 240.5 L 854.5 240.5 L 854.5 496.5 L 820.5 496.5 Z M 1057.5 240.5 L 1091.5 240.5 L 1091.5 496.5 L 1057.5 496.5 Z M 1160.5 240.5 L 1195.5 240.5 L 1195.5 496.5 L 1160.5 496.5 Z M 1275.5 240.5 L 1309.5 240.5 L 1309.5 496.5 L 1275.5 496.5 Z M 1275.5 240.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface310">
+<g id="surface338">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1240.554688 288.246094 L 1240.554688 307.5 L 1234.292969 307.5 L 1234.292969 288.246094 L 1215.375 258.421875 L 1223.117188 258.421875 L 1237.523438 282.320312 L 1251.527344 258.421875 L 1259 258.421875 Z M 1240.554688 288.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1216 816 L 1255 816 M 1216 777 L 1255 777 M 1216 777 L 1216 816 M 1255 777 L 1255 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1216 816 L 1255 816 M 1216 777 L 1255 777 M 1255 816 L 1255 777 M 1216 816 L 1216 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o31ai/sky130_fd_sc_hs__o31ai_4.svg b/cells/o31ai/sky130_fd_sc_hs__o31ai_4.svg
index 231b079..1fcab31 100644
--- a/cells/o31ai/sky130_fd_sc_hs__o31ai_4.svg
+++ b/cells/o31ai/sky130_fd_sc_hs__o31ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.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 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.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 1611.5 625.5 L 1637.5 625.5 L 1637.5 754.5 L 1611.5 754.5 Z M 280.5 625.5 L 306.5 625.5 L 306.5 754.5 L 280.5 754.5 Z M 367.5 625.5 L 393.5 625.5 L 393.5 754.5 L 367.5 754.5 Z M 442.5 625.5 L 468.5 625.5 L 468.5 754.5 L 442.5 754.5 Z M 529.5 625.5 L 555.5 625.5 L 555.5 754.5 L 529.5 754.5 Z M 604.5 625.5 L 630.5 625.5 L 630.5 754.5 L 604.5 754.5 Z M 732.5 625.5 L 759.5 625.5 L 759.5 754.5 L 732.5 754.5 Z M 819.5 625.5 L 846.5 625.5 L 846.5 754.5 L 819.5 754.5 Z M 894.5 625.5 L 920.5 625.5 L 920.5 754.5 L 894.5 754.5 Z M 969.5 625.5 L 995.5 625.5 L 995.5 754.5 L 969.5 754.5 Z M 1133.5 625.5 L 1159.5 625.5 L 1159.5 754.5 L 1133.5 754.5 Z M 1207.5 625.5 L 1234.5 625.5 L 1234.5 754.5 L 1207.5 754.5 Z M 1312.5 625.5 L 1338.5 625.5 L 1338.5 754.5 L 1312.5 754.5 Z M 1387.5 625.5 L 1413.5 625.5 L 1413.5 754.5 L 1387.5 754.5 Z M 1461.5 625.5 L 1488.5 625.5 L 1488.5 754.5 L 1461.5 754.5 Z M 1536.5 625.5 L 1562.5 625.5 L 1562.5 754.5 L 1536.5 754.5 Z M 1536.5 625.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 1609.5 310.5 L 1635.5 310.5 L 1635.5 505.5 L 1609.5 505.5 Z M 283.5 310.5 L 309.5 310.5 L 309.5 505.5 L 283.5 505.5 Z M 361.5 310.5 L 387.5 310.5 L 387.5 505.5 L 361.5 505.5 Z M 439.5 310.5 L 465.5 310.5 L 465.5 505.5 L 439.5 505.5 Z M 526.5 310.5 L 552.5 310.5 L 552.5 505.5 L 526.5 505.5 Z M 605.5 310.5 L 631.5 310.5 L 631.5 505.5 L 605.5 505.5 Z M 692.5 310.5 L 718.5 310.5 L 718.5 505.5 L 692.5 505.5 Z M 817.5 310.5 L 843.5 310.5 L 843.5 505.5 L 817.5 505.5 Z M 895.5 310.5 L 921.5 310.5 L 921.5 505.5 L 895.5 505.5 Z M 1080.5 310.5 L 1106.5 310.5 L 1106.5 505.5 L 1080.5 505.5 Z M 1158.5 310.5 L 1184.5 310.5 L 1184.5 505.5 L 1158.5 505.5 Z M 1236.5 310.5 L 1262.5 310.5 L 1262.5 505.5 L 1236.5 505.5 Z M 1314.5 310.5 L 1341.5 310.5 L 1341.5 505.5 L 1314.5 505.5 Z M 1401.5 310.5 L 1428.5 310.5 L 1428.5 505.5 L 1401.5 505.5 Z M 1401.5 310.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.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>
@@ -197,6 +197,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 521.203125 529.003906 L 513.277344 529.003906 L 513.277344 525.820312 L 514.640625 525.667969 L 515.851562 525.46875 L 516.914062 525.214844 L 517.820312 525.011719 L 518.578125 524.761719 L 519.234375 524.457031 L 519.738281 524.15625 L 520.195312 523.800781 L 520.597656 523.398438 L 521.003906 522.894531 L 521.355469 522.335938 L 521.707031 521.679688 L 521.859375 521.328125 L 522.011719 520.921875 L 522.164062 520.46875 L 522.367188 519.914062 L 522.515625 519.359375 L 522.71875 518.703125 L 525.648438 518.703125 L 525.648438 554.5 L 521.203125 554.5 Z M 521.203125 529.003906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 485 558 L 514 558 M 485 529 L 514 529 M 485 529 L 485 558 M 514 529 L 514 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 485 558 L 514 558 M 485 529 L 514 529 M 514 558 L 514 529 M 485 558 L 485 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_1.svg b/cells/o32a/sky130_fd_sc_hs__o32a_1.svg
index 90e96fa..01216da 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_1.svg
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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 644.5 664.5 L 679.5 664.5 L 679.5 833.5 L 644.5 833.5 Z M 1255.5 687.5 L 1290.5 687.5 L 1290.5 833.5 L 1255.5 833.5 Z M 1119.5 687.5 L 1153.5 687.5 L 1153.5 833.5 L 1119.5 833.5 Z M 1004.5 687.5 L 1039.5 687.5 L 1039.5 833.5 L 1004.5 833.5 Z M 874.5 687.5 L 908.5 687.5 L 908.5 833.5 L 874.5 833.5 Z M 775.5 687.5 L 810.5 687.5 L 810.5 833.5 L 775.5 833.5 Z M 775.5 687.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 620.5 240.5 L 655.5 240.5 L 655.5 496.5 L 620.5 496.5 Z M 1252.5 267.5 L 1286.5 267.5 L 1286.5 496.5 L 1252.5 496.5 Z M 1115.5 267.5 L 1150.5 267.5 L 1150.5 496.5 L 1115.5 496.5 Z M 992.5 267.5 L 1026.5 267.5 L 1026.5 496.5 L 992.5 496.5 Z M 868.5 267.5 L 902.5 267.5 L 902.5 496.5 L 868.5 496.5 Z M 772.5 267.5 L 806.5 267.5 L 806.5 496.5 L 772.5 496.5 Z M 772.5 267.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.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>
@@ -169,6 +169,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 581.824219 706.320312 L 599.191406 731.5 L 591.449219 731.5 L 578.050781 711.035156 L 564.589844 731.5 L 556.980469 731.5 L 574.351562 706.320312 L 558.058594 682.421875 L 565.664062 682.421875 L 578.253906 701.675781 L 590.910156 682.421875 L 598.382812 682.421875 Z M 581.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 557 392 L 596 392 M 557 353 L 596 353 M 557 353 L 557 392 M 596 353 L 596 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 557 392 L 596 392 M 557 353 L 596 353 M 596 392 L 596 353 M 557 392 L 557 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_2.svg b/cells/o32a/sky130_fd_sc_hs__o32a_2.svg
index a49ccd0..54035b4 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_2.svg
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1364.5 664.5 L 1399.5 664.5 L 1399.5 833.5 L 1364.5 833.5 Z M 547.5 664.5 L 581.5 664.5 L 581.5 833.5 L 547.5 833.5 Z M 646.5 664.5 L 680.5 664.5 L 680.5 833.5 L 646.5 833.5 Z M 776.5 664.5 L 811.5 664.5 L 811.5 833.5 L 776.5 833.5 Z M 875.5 664.5 L 909.5 664.5 L 909.5 833.5 L 875.5 833.5 Z M 1005.5 664.5 L 1040.5 664.5 L 1040.5 833.5 L 1005.5 833.5 Z M 1120.5 664.5 L 1154.5 664.5 L 1154.5 833.5 L 1120.5 833.5 Z M 1120.5 664.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 509.5 240.5 L 544.5 240.5 L 544.5 496.5 L 509.5 496.5 Z M 1254.5 267.5 L 1289.5 267.5 L 1289.5 496.5 L 1254.5 496.5 Z M 1123.5 267.5 L 1158.5 267.5 L 1158.5 496.5 L 1123.5 496.5 Z M 993.5 267.5 L 1027.5 267.5 L 1027.5 496.5 L 993.5 496.5 Z M 869.5 267.5 L 903.5 267.5 L 903.5 496.5 L 869.5 496.5 Z M 773.5 267.5 L 807.5 267.5 L 807.5 496.5 L 773.5 496.5 Z M 612.5 240.5 L 647.5 240.5 L 647.5 496.5 L 612.5 496.5 Z M 612.5 240.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface324">
+<g id="surface352">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -184,6 +184,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 580.824219 282.320312 L 598.191406 307.5 L 590.449219 307.5 L 577.050781 287.035156 L 563.589844 307.5 L 555.980469 307.5 L 573.351562 282.320312 L 557.058594 258.421875 L 564.664062 258.421875 L 577.253906 277.675781 L 589.910156 258.421875 L 597.382812 258.421875 Z M 580.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 556 816 L 595 816 M 556 777 L 595 777 M 556 777 L 556 816 M 595 777 L 595 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 556 816 L 595 816 M 556 777 L 595 777 M 595 816 L 595 777 M 556 816 L 556 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32a/sky130_fd_sc_hs__o32a_4.svg b/cells/o32a/sky130_fd_sc_hs__o32a_4.svg
index 3fbb25f..69ed92e 100644
--- a/cells/o32a/sky130_fd_sc_hs__o32a_4.svg
+++ b/cells/o32a/sky130_fd_sc_hs__o32a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 312.5 638.5 L 340.5 638.5 L 340.5 774.5 L 312.5 774.5 Z M 1604.5 656.5 L 1632.5 656.5 L 1632.5 774.5 L 1604.5 774.5 Z M 1490.5 656.5 L 1517.5 656.5 L 1517.5 774.5 L 1490.5 774.5 Z M 1410.5 656.5 L 1438.5 656.5 L 1438.5 774.5 L 1410.5 774.5 Z M 1319.5 656.5 L 1346.5 656.5 L 1346.5 774.5 L 1319.5 774.5 Z M 1236.5 656.5 L 1263.5 656.5 L 1263.5 774.5 L 1236.5 774.5 Z M 1140.5 656.5 L 1168.5 656.5 L 1168.5 774.5 L 1140.5 774.5 Z M 1043.5 656.5 L 1070.5 656.5 L 1070.5 774.5 L 1043.5 774.5 Z M 951.5 656.5 L 978.5 656.5 L 978.5 774.5 L 951.5 774.5 Z M 859.5 656.5 L 887.5 656.5 L 887.5 774.5 L 859.5 774.5 Z M 780.5 656.5 L 807.5 656.5 L 807.5 774.5 L 780.5 774.5 Z M 598.5 638.5 L 625.5 638.5 L 625.5 774.5 L 598.5 774.5 Z M 496.5 638.5 L 523.5 638.5 L 523.5 774.5 L 496.5 774.5 Z M 391.5 638.5 L 419.5 638.5 L 419.5 774.5 L 391.5 774.5 Z M 391.5 638.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1603.5 298.5 L 1630.5 298.5 L 1630.5 481.5 L 1603.5 481.5 Z M 1520.5 298.5 L 1547.5 298.5 L 1547.5 481.5 L 1520.5 481.5 Z M 1316.5 298.5 L 1343.5 298.5 L 1343.5 481.5 L 1316.5 481.5 Z M 1233.5 298.5 L 1261.5 298.5 L 1261.5 481.5 L 1233.5 481.5 Z M 1433.5 298.5 L 1461.5 298.5 L 1461.5 481.5 L 1433.5 481.5 Z M 1147.5 298.5 L 1174.5 298.5 L 1174.5 481.5 L 1147.5 481.5 Z M 864.5 301.5 L 891.5 301.5 L 891.5 485.5 L 864.5 485.5 Z M 781.5 301.5 L 808.5 301.5 L 808.5 485.5 L 781.5 485.5 Z M 672.5 301.5 L 700.5 301.5 L 700.5 485.5 L 672.5 485.5 Z M 946.5 301.5 L 974.5 301.5 L 974.5 485.5 L 946.5 485.5 Z M 371.5 298.5 L 398.5 298.5 L 398.5 504.5 L 371.5 504.5 Z M 568.5 298.5 L 595.5 298.5 L 595.5 504.5 L 568.5 504.5 Z M 288.5 298.5 L 316.5 298.5 L 316.5 504.5 L 288.5 504.5 Z M 463.5 298.5 L 490.5 298.5 L 490.5 504.5 L 463.5 504.5 Z M 463.5 298.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -174,6 +174,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 718.097656 527.878906 L 709.507812 527.878906 L 709.507812 524.429688 L 710.984375 524.265625 L 712.296875 524.046875 L 713.445312 523.773438 L 714.429688 523.554688 L 715.25 523.28125 L 715.960938 522.953125 L 716.511719 522.625 L 717.003906 522.242188 L 717.441406 521.804688 L 717.878906 521.257812 L 718.261719 520.65625 L 718.644531 519.945312 L 718.808594 519.5625 L 718.972656 519.125 L 719.136719 518.632812 L 719.355469 518.03125 L 719.519531 517.429688 L 719.738281 516.71875 L 722.910156 516.71875 L 722.910156 555.5 L 718.097656 555.5 Z M 718.097656 527.878906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 679 559 L 710 559 M 679 528 L 710 528 M 679 528 L 679 559 M 710 528 L 710 559 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 679 559 L 710 559 M 679 528 L 710 528 M 710 559 L 710 528 M 679 559 L 679 528 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_1.svg b/cells/o32ai/sky130_fd_sc_hs__o32ai_1.svg
index b74a9de..ba955ff 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_1.svg
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1192.5 664.5 L 1227.5 664.5 L 1227.5 833.5 L 1192.5 833.5 Z M 673.5 664.5 L 708.5 664.5 L 708.5 833.5 L 673.5 833.5 Z M 842.5 664.5 L 876.5 664.5 L 876.5 833.5 L 842.5 833.5 Z M 956.5 664.5 L 991.5 664.5 L 991.5 833.5 L 956.5 833.5 Z M 1094.5 664.5 L 1128.5 664.5 L 1128.5 833.5 L 1094.5 833.5 Z M 1094.5 664.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1196.5 240.5 L 1230.5 240.5 L 1230.5 496.5 L 1196.5 496.5 Z M 689.5 240.5 L 724.5 240.5 L 724.5 496.5 L 689.5 496.5 Z M 785.5 240.5 L 820.5 240.5 L 820.5 496.5 L 785.5 496.5 Z M 934.5 240.5 L 969.5 240.5 L 969.5 496.5 L 934.5 496.5 Z M 1065.5 240.5 L 1099.5 240.5 L 1099.5 496.5 L 1065.5 496.5 Z M 1065.5 240.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface325">
+<g id="surface353">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -182,6 +182,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1320.773438 612.503906 L 1310.203125 612.503906 L 1310.203125 608.261719 L 1312.019531 608.058594 L 1313.636719 607.789062 L 1315.050781 607.453125 L 1316.261719 607.183594 L 1317.269531 606.847656 L 1318.148438 606.445312 L 1318.820312 606.039062 L 1319.425781 605.570312 L 1319.964844 605.03125 L 1320.503906 604.355469 L 1320.972656 603.617188 L 1321.445312 602.742188 L 1321.648438 602.269531 L 1321.847656 601.730469 L 1322.050781 601.125 L 1322.320312 600.386719 L 1322.523438 599.644531 L 1322.792969 598.769531 L 1326.695312 598.769531 L 1326.695312 646.5 L 1320.773438 646.5 Z M 1320.773438 612.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 477 L 1311 477 M 1272 438 L 1311 438 M 1272 438 L 1272 477 M 1311 438 L 1311 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 477 L 1311 477 M 1272 438 L 1311 438 M 1311 477 L 1311 438 M 1272 477 L 1272 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_2.svg b/cells/o32ai/sky130_fd_sc_hs__o32ai_2.svg
index 7184b07..46fd1da 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_2.svg
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 538.5 L 201.5 538.5 Z M 201.5 111.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 245.5 862.5 L 1675.5 862.5 L 1675.5 918.5 L 245.5 918.5 Z M 245.5 862.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 1544.5 664.5 L 1578.5 664.5 L 1578.5 833.5 L 1544.5 833.5 Z M 341.5 664.5 L 375.5 664.5 L 375.5 833.5 L 341.5 833.5 Z M 439.5 664.5 L 474.5 664.5 L 474.5 833.5 L 439.5 833.5 Z M 554.5 664.5 L 588.5 664.5 L 588.5 833.5 L 554.5 833.5 Z M 669.5 664.5 L 703.5 664.5 L 703.5 833.5 L 669.5 833.5 Z M 783.5 664.5 L 818.5 664.5 L 818.5 833.5 L 783.5 833.5 Z M 973.5 664.5 L 1008.5 664.5 L 1008.5 833.5 L 973.5 833.5 Z M 1087.5 664.5 L 1121.5 664.5 L 1121.5 833.5 L 1087.5 833.5 Z M 1197.5 664.5 L 1231.5 664.5 L 1231.5 833.5 L 1197.5 833.5 Z M 1301.5 664.5 L 1335.5 664.5 L 1335.5 833.5 L 1301.5 833.5 Z M 1301.5 664.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 1541.5 240.5 L 1575.5 240.5 L 1575.5 496.5 L 1541.5 496.5 Z M 343.5 240.5 L 377.5 240.5 L 377.5 496.5 L 343.5 496.5 Z M 446.5 240.5 L 481.5 240.5 L 481.5 496.5 L 446.5 496.5 Z M 549.5 240.5 L 584.5 240.5 L 584.5 496.5 L 549.5 496.5 Z M 653.5 240.5 L 687.5 240.5 L 687.5 496.5 L 653.5 496.5 Z M 884.5 240.5 L 918.5 240.5 L 918.5 496.5 L 884.5 496.5 Z M 987.5 240.5 L 1022.5 240.5 L 1022.5 496.5 L 987.5 496.5 Z M 1090.5 240.5 L 1125.5 240.5 L 1125.5 496.5 L 1090.5 496.5 Z M 1193.5 240.5 L 1228.5 240.5 L 1228.5 496.5 L 1193.5 496.5 Z M 1436.5 240.5 L 1471.5 240.5 L 1471.5 496.5 L 1436.5 496.5 Z M 1436.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 280.5 136.5 L 319.5 136.5 L 319.5 174.5 L 280.5 174.5 Z M 1600.5 136.5 L 1639.5 136.5 L 1639.5 174.5 L 1600.5 174.5 Z M 1490.5 136.5 L 1529.5 136.5 L 1529.5 174.5 L 1490.5 174.5 Z M 1380.5 136.5 L 1419.5 136.5 L 1419.5 174.5 L 1380.5 174.5 Z M 1270.5 136.5 L 1309.5 136.5 L 1309.5 174.5 L 1270.5 174.5 Z M 1160.5 136.5 L 1199.5 136.5 L 1199.5 174.5 L 1160.5 174.5 Z M 1050.5 136.5 L 1089.5 136.5 L 1089.5 174.5 L 1050.5 174.5 Z M 940.5 136.5 L 979.5 136.5 L 979.5 174.5 L 940.5 174.5 Z M 830.5 136.5 L 869.5 136.5 L 869.5 174.5 L 830.5 174.5 Z M 720.5 136.5 L 759.5 136.5 L 759.5 174.5 L 720.5 174.5 Z M 610.5 136.5 L 649.5 136.5 L 649.5 174.5 L 610.5 174.5 Z M 500.5 136.5 L 539.5 136.5 L 539.5 174.5 L 500.5 174.5 Z M 390.5 136.5 L 429.5 136.5 L 429.5 174.5 L 390.5 174.5 Z M 280.5 899.5 L 319.5 899.5 L 319.5 938.5 L 280.5 938.5 Z M 1600.5 899.5 L 1639.5 899.5 L 1639.5 938.5 L 1600.5 938.5 Z M 1490.5 899.5 L 1529.5 899.5 L 1529.5 938.5 L 1490.5 938.5 Z M 1380.5 899.5 L 1419.5 899.5 L 1419.5 938.5 L 1380.5 938.5 Z M 1270.5 899.5 L 1309.5 899.5 L 1309.5 938.5 L 1270.5 938.5 Z M 1160.5 899.5 L 1199.5 899.5 L 1199.5 938.5 L 1160.5 938.5 Z M 1050.5 899.5 L 1089.5 899.5 L 1089.5 938.5 L 1050.5 938.5 Z M 940.5 899.5 L 979.5 899.5 L 979.5 938.5 L 940.5 938.5 Z M 830.5 899.5 L 869.5 899.5 L 869.5 938.5 L 830.5 938.5 Z M 720.5 899.5 L 759.5 899.5 L 759.5 938.5 L 720.5 938.5 Z M 610.5 899.5 L 649.5 899.5 L 649.5 938.5 L 610.5 938.5 Z M 500.5 899.5 L 539.5 899.5 L 539.5 938.5 L 500.5 938.5 Z M 390.5 899.5 L 429.5 899.5 L 429.5 938.5 L 390.5 938.5 Z M 390.5 899.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>
@@ -193,6 +193,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 964.554688 372.246094 L 964.554688 391.5 L 958.292969 391.5 L 958.292969 372.246094 L 939.375 342.421875 L 947.117188 342.421875 L 961.523438 366.320312 L 975.527344 342.421875 L 983 342.421875 Z M 964.554688 372.246094 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 940 731 L 979 731 M 940 693 L 979 693 M 940 693 L 940 731 M 979 693 L 979 731 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 940 731 L 979 731 M 940 693 L 979 693 M 979 731 L 979 693 M 940 731 L 940 693 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 245 156 L 245 165 M 240 161 L 249 161 M 244 162 L 246 162 M 244 160 L 246 160 M 244 160 L 244 162 M 246 160 L 246 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o32ai/sky130_fd_sc_hs__o32ai_4.svg b/cells/o32ai/sky130_fd_sc_hs__o32ai_4.svg
index 4a58de9..27e5e7a 100644
--- a/cells/o32ai/sky130_fd_sc_hs__o32ai_4.svg
+++ b/cells/o32ai/sky130_fd_sc_hs__o32ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 535.5 L 174.5 535.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 200.5 730.5 L 1717.5 730.5 L 1717.5 764.5 L 200.5 764.5 Z M 200.5 730.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask1">
 <rect 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 611.5 L 1615.5 611.5 L 1615.5 713.5 L 1594.5 713.5 Z M 258.5 611.5 L 279.5 611.5 L 279.5 713.5 L 258.5 713.5 Z M 317.5 611.5 L 338.5 611.5 L 338.5 713.5 L 317.5 713.5 Z M 386.5 611.5 L 407.5 611.5 L 407.5 713.5 L 386.5 713.5 Z M 447.5 611.5 L 468.5 611.5 L 468.5 713.5 L 447.5 713.5 Z M 514.5 611.5 L 534.5 611.5 L 534.5 713.5 L 514.5 713.5 Z M 582.5 611.5 L 603.5 611.5 L 603.5 713.5 L 582.5 713.5 Z M 651.5 611.5 L 672.5 611.5 L 672.5 713.5 L 651.5 713.5 Z M 720.5 611.5 L 740.5 611.5 L 740.5 713.5 L 720.5 713.5 Z M 789.5 611.5 L 809.5 611.5 L 809.5 713.5 L 789.5 713.5 Z M 870.5 611.5 L 890.5 611.5 L 890.5 713.5 L 870.5 713.5 Z M 938.5 611.5 L 958.5 611.5 L 958.5 713.5 L 938.5 713.5 Z M 997.5 611.5 L 1018.5 611.5 L 1018.5 713.5 L 997.5 713.5 Z M 1114.5 611.5 L 1134.5 611.5 L 1134.5 713.5 L 1114.5 713.5 Z M 1192.5 611.5 L 1212.5 611.5 L 1212.5 713.5 L 1192.5 713.5 Z M 1251.5 611.5 L 1272.5 611.5 L 1272.5 713.5 L 1251.5 713.5 Z M 1329.5 611.5 L 1350.5 611.5 L 1350.5 713.5 L 1329.5 713.5 Z M 1398.5 611.5 L 1419.5 611.5 L 1419.5 713.5 L 1398.5 713.5 Z M 1467.5 611.5 L 1487.5 611.5 L 1487.5 713.5 L 1467.5 713.5 Z M 1526.5 611.5 L 1546.5 611.5 L 1546.5 713.5 L 1526.5 713.5 Z M 1526.5 611.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image402"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1638.5 357.5 L 1658.5 357.5 L 1658.5 511.5 L 1638.5 511.5 Z M 260.5 357.5 L 280.5 357.5 L 280.5 511.5 L 260.5 511.5 Z M 321.5 357.5 L 342.5 357.5 L 342.5 511.5 L 321.5 511.5 Z M 383.5 357.5 L 404.5 357.5 L 404.5 511.5 L 383.5 511.5 Z M 445.5 357.5 L 466.5 357.5 L 466.5 511.5 L 445.5 511.5 Z M 507.5 357.5 L 527.5 357.5 L 527.5 511.5 L 507.5 511.5 Z M 569.5 357.5 L 589.5 357.5 L 589.5 511.5 L 569.5 511.5 Z M 631.5 357.5 L 651.5 357.5 L 651.5 511.5 L 631.5 511.5 Z M 694.5 357.5 L 714.5 357.5 L 714.5 511.5 L 694.5 511.5 Z M 833.5 357.5 L 853.5 357.5 L 853.5 511.5 L 833.5 511.5 Z M 894.5 357.5 L 915.5 357.5 L 915.5 511.5 L 894.5 511.5 Z M 956.5 357.5 L 977.5 357.5 L 977.5 511.5 L 956.5 511.5 Z M 1018.5 357.5 L 1039.5 357.5 L 1039.5 511.5 L 1018.5 511.5 Z M 1094.5 357.5 L 1114.5 357.5 L 1114.5 511.5 L 1094.5 511.5 Z M 1155.5 357.5 L 1176.5 357.5 L 1176.5 511.5 L 1155.5 511.5 Z M 1224.5 357.5 L 1245.5 357.5 L 1245.5 511.5 L 1224.5 511.5 Z M 1293.5 357.5 L 1313.5 357.5 L 1313.5 511.5 L 1293.5 511.5 Z M 1438.5 357.5 L 1459.5 357.5 L 1459.5 511.5 L 1438.5 511.5 Z M 1500.5 357.5 L 1521.5 357.5 L 1521.5 511.5 L 1500.5 511.5 Z M 1576.5 357.5 L 1597.5 357.5 L 1597.5 511.5 L 1576.5 511.5 Z M 1576.5 357.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image403"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 222.5 294.5 L 245.5 294.5 L 245.5 318.5 L 222.5 318.5 Z M 1673.5 294.5 L 1696.5 294.5 L 1696.5 318.5 L 1673.5 318.5 Z M 1607.5 294.5 L 1630.5 294.5 L 1630.5 318.5 L 1607.5 318.5 Z M 1541.5 294.5 L 1564.5 294.5 L 1564.5 318.5 L 1541.5 318.5 Z M 1475.5 294.5 L 1498.5 294.5 L 1498.5 318.5 L 1475.5 318.5 Z M 1409.5 294.5 L 1432.5 294.5 L 1432.5 318.5 L 1409.5 318.5 Z M 1343.5 294.5 L 1366.5 294.5 L 1366.5 318.5 L 1343.5 318.5 Z M 1277.5 294.5 L 1300.5 294.5 L 1300.5 318.5 L 1277.5 318.5 Z M 1211.5 294.5 L 1234.5 294.5 L 1234.5 318.5 L 1211.5 318.5 Z M 1145.5 294.5 L 1168.5 294.5 L 1168.5 318.5 L 1145.5 318.5 Z M 1079.5 294.5 L 1103.5 294.5 L 1103.5 318.5 L 1079.5 318.5 Z M 1013.5 294.5 L 1037.5 294.5 L 1037.5 318.5 L 1013.5 318.5 Z M 947.5 294.5 L 971.5 294.5 L 971.5 318.5 L 947.5 318.5 Z M 881.5 294.5 L 905.5 294.5 L 905.5 318.5 L 881.5 318.5 Z M 815.5 294.5 L 839.5 294.5 L 839.5 318.5 L 815.5 318.5 Z M 749.5 294.5 L 773.5 294.5 L 773.5 318.5 L 749.5 318.5 Z M 683.5 294.5 L 707.5 294.5 L 707.5 318.5 L 683.5 318.5 Z M 617.5 294.5 L 641.5 294.5 L 641.5 318.5 L 617.5 318.5 Z M 552.5 294.5 L 575.5 294.5 L 575.5 318.5 L 552.5 318.5 Z M 486.5 294.5 L 509.5 294.5 L 509.5 318.5 L 486.5 318.5 Z M 420.5 294.5 L 443.5 294.5 L 443.5 318.5 L 420.5 318.5 Z M 354.5 294.5 L 377.5 294.5 L 377.5 318.5 L 354.5 318.5 Z M 288.5 294.5 L 311.5 294.5 L 311.5 318.5 L 288.5 318.5 Z M 222.5 752.5 L 245.5 752.5 L 245.5 775.5 L 222.5 775.5 Z M 1673.5 752.5 L 1696.5 752.5 L 1696.5 775.5 L 1673.5 775.5 Z M 1607.5 752.5 L 1630.5 752.5 L 1630.5 775.5 L 1607.5 775.5 Z M 1541.5 752.5 L 1564.5 752.5 L 1564.5 775.5 L 1541.5 775.5 Z M 1475.5 752.5 L 1498.5 752.5 L 1498.5 775.5 L 1475.5 775.5 Z M 1409.5 752.5 L 1432.5 752.5 L 1432.5 775.5 L 1409.5 775.5 Z M 1343.5 752.5 L 1366.5 752.5 L 1366.5 775.5 L 1343.5 775.5 Z M 1277.5 752.5 L 1300.5 752.5 L 1300.5 775.5 L 1277.5 775.5 Z M 1211.5 752.5 L 1234.5 752.5 L 1234.5 775.5 L 1211.5 775.5 Z M 1145.5 752.5 L 1168.5 752.5 L 1168.5 775.5 L 1145.5 775.5 Z M 1079.5 752.5 L 1103.5 752.5 L 1103.5 775.5 L 1079.5 775.5 Z M 1013.5 752.5 L 1037.5 752.5 L 1037.5 775.5 L 1013.5 775.5 Z M 947.5 752.5 L 971.5 752.5 L 971.5 775.5 L 947.5 775.5 Z M 881.5 752.5 L 905.5 752.5 L 905.5 775.5 L 881.5 775.5 Z M 815.5 752.5 L 839.5 752.5 L 839.5 775.5 L 815.5 775.5 Z M 749.5 752.5 L 773.5 752.5 L 773.5 775.5 L 749.5 775.5 Z M 683.5 752.5 L 707.5 752.5 L 707.5 775.5 L 683.5 775.5 Z M 617.5 752.5 L 641.5 752.5 L 641.5 775.5 L 617.5 775.5 Z M 552.5 752.5 L 575.5 752.5 L 575.5 775.5 L 552.5 775.5 Z M 486.5 752.5 L 509.5 752.5 L 509.5 775.5 L 486.5 775.5 Z M 420.5 752.5 L 443.5 752.5 L 443.5 775.5 L 420.5 775.5 Z M 354.5 752.5 L 377.5 752.5 L 377.5 775.5 L 354.5 775.5 Z M 288.5 752.5 L 311.5 752.5 L 311.5 775.5 L 288.5 775.5 Z M 288.5 752.5 "/>
 </clipPath>
-<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface398">
+<g id="surface427">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -230,6 +230,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1702.121094 528.960938 L 1695.738281 528.960938 L 1695.738281 526.398438 L 1696.835938 526.277344 L 1697.8125 526.113281 L 1698.664062 525.910156 L 1699.398438 525.746094 L 1700.007812 525.542969 L 1700.535156 525.300781 L 1700.941406 525.054688 L 1701.308594 524.769531 L 1701.632812 524.445312 L 1701.960938 524.039062 L 1702.246094 523.589844 L 1702.53125 523.0625 L 1702.652344 522.777344 L 1702.773438 522.453125 L 1702.894531 522.085938 L 1703.058594 521.640625 L 1703.179688 521.191406 L 1703.34375 520.664062 L 1705.703125 520.664062 L 1705.703125 549.5 L 1702.121094 549.5 Z M 1702.121094 528.960938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1673 556 L 1696 556 M 1673 533 L 1696 533 M 1673 533 L 1673 556 M 1696 533 L 1696 556 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1673 556 L 1696 556 M 1673 533 L 1696 533 M 1696 556 L 1696 533 M 1673 556 L 1673 533 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 310 L 200 319 M 195 315 L 204 315 M 199 316 L 201 316 M 199 314 L 201 314 M 199 314 L 199 316 M 201 314 L 201 316 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_1.svg b/cells/o41a/sky130_fd_sc_hs__o41a_1.svg
index b41a166..1ce4b79 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_1.svg
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 563.5 664.5 L 598.5 664.5 L 598.5 833.5 L 563.5 833.5 Z M 1326.5 687.5 L 1361.5 687.5 L 1361.5 833.5 L 1326.5 833.5 Z M 1164.5 687.5 L 1198.5 687.5 L 1198.5 833.5 L 1164.5 833.5 Z M 1051.5 687.5 L 1086.5 687.5 L 1086.5 833.5 L 1051.5 833.5 Z M 921.5 687.5 L 955.5 687.5 L 955.5 833.5 L 921.5 833.5 Z M 806.5 687.5 L 840.5 687.5 L 840.5 833.5 L 806.5 833.5 Z M 806.5 687.5 "/>
 </clipPath>
-<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 818.5 271.5 L 852.5 271.5 L 852.5 463.5 L 818.5 463.5 Z M 940.5 240.5 L 975.5 240.5 L 975.5 496.5 L 940.5 496.5 Z M 1167.5 240.5 L 1201.5 240.5 L 1201.5 496.5 L 1167.5 496.5 Z M 1036.5 240.5 L 1071.5 240.5 L 1071.5 496.5 L 1036.5 496.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 1298.5 240.5 L 1332.5 240.5 L 1332.5 496.5 L 1298.5 496.5 Z M 1298.5 240.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface339">
+<g id="surface367">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -193,6 +193,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 526.824219 282.320312 L 544.191406 307.5 L 536.449219 307.5 L 523.050781 287.035156 L 509.589844 307.5 L 501.980469 307.5 L 519.351562 282.320312 L 503.058594 258.421875 L 510.664062 258.421875 L 523.253906 277.675781 L 535.910156 258.421875 L 543.382812 258.421875 Z M 526.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 502 816 L 541 816 M 502 777 L 541 777 M 502 777 L 502 816 M 541 777 L 541 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 502 816 L 541 816 M 502 777 L 541 777 M 541 816 L 541 777 M 502 816 L 502 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_2.svg b/cells/o41a/sky130_fd_sc_hs__o41a_2.svg
index fb97d25..315f28c 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_2.svg
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1364.5 664.5 L 1399.5 664.5 L 1399.5 833.5 L 1364.5 833.5 Z M 507.5 664.5 L 541.5 664.5 L 541.5 833.5 L 507.5 833.5 Z M 638.5 664.5 L 672.5 664.5 L 672.5 833.5 L 638.5 833.5 Z M 736.5 664.5 L 771.5 664.5 L 771.5 833.5 L 736.5 833.5 Z M 905.5 664.5 L 939.5 664.5 L 939.5 833.5 L 905.5 833.5 Z M 1007.5 664.5 L 1041.5 664.5 L 1041.5 833.5 L 1007.5 833.5 Z M 1266.5 664.5 L 1300.5 664.5 L 1300.5 833.5 L 1266.5 833.5 Z M 1266.5 664.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 509.5 240.5 L 544.5 240.5 L 544.5 496.5 L 509.5 496.5 Z M 997.5 267.5 L 1032.5 267.5 L 1032.5 496.5 L 997.5 496.5 Z M 1275.5 240.5 L 1309.5 240.5 L 1309.5 496.5 L 1275.5 496.5 Z M 1378.5 240.5 L 1412.5 240.5 L 1412.5 496.5 L 1378.5 496.5 Z M 867.5 240.5 L 901.5 240.5 L 901.5 496.5 L 867.5 496.5 Z M 736.5 240.5 L 771.5 240.5 L 771.5 496.5 L 736.5 496.5 Z M 606.5 240.5 L 640.5 240.5 L 640.5 496.5 L 606.5 496.5 Z M 606.5 240.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface331">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -186,6 +186,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1350.824219 621.320312 L 1368.191406 646.5 L 1360.449219 646.5 L 1347.050781 626.035156 L 1333.589844 646.5 L 1325.980469 646.5 L 1343.351562 621.320312 L 1327.058594 597.421875 L 1334.664062 597.421875 L 1347.253906 616.675781 L 1359.910156 597.421875 L 1367.382812 597.421875 Z M 1350.824219 621.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1326 477 L 1365 477 M 1326 438 L 1365 438 M 1326 438 L 1326 477 M 1365 438 L 1365 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1326 477 L 1365 477 M 1326 438 L 1365 438 M 1365 477 L 1365 438 M 1326 477 L 1326 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41a/sky130_fd_sc_hs__o41a_4.svg b/cells/o41a/sky130_fd_sc_hs__o41a_4.svg
index 219b5b2..7da79fa 100644
--- a/cells/o41a/sky130_fd_sc_hs__o41a_4.svg
+++ b/cells/o41a/sky130_fd_sc_hs__o41a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 917.5 610.5 L 944.5 610.5 L 944.5 728.5 L 917.5 728.5 Z M 821.5 610.5 L 849.5 610.5 L 849.5 728.5 L 821.5 728.5 Z M 742.5 610.5 L 770.5 610.5 L 770.5 728.5 L 742.5 728.5 Z M 1544.5 611.5 L 1571.5 611.5 L 1571.5 729.5 L 1544.5 729.5 Z M 1055.5 614.5 L 1082.5 614.5 L 1082.5 731.5 L 1055.5 731.5 Z M 1294.5 614.5 L 1321.5 614.5 L 1321.5 731.5 L 1294.5 731.5 Z M 1134.5 614.5 L 1161.5 614.5 L 1161.5 731.5 L 1134.5 731.5 Z M 1213.5 614.5 L 1240.5 614.5 L 1240.5 731.5 L 1213.5 731.5 Z M 1373.5 614.5 L 1400.5 614.5 L 1400.5 731.5 L 1373.5 731.5 Z M 1452.5 614.5 L 1479.5 614.5 L 1479.5 731.5 L 1452.5 731.5 Z M 310.5 638.5 L 338.5 638.5 L 338.5 774.5 L 310.5 774.5 Z M 560.5 638.5 L 588.5 638.5 L 588.5 774.5 L 560.5 774.5 Z M 389.5 638.5 L 417.5 638.5 L 417.5 774.5 L 389.5 774.5 Z M 481.5 638.5 L 509.5 638.5 L 509.5 774.5 L 481.5 774.5 Z M 481.5 638.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 695.5 333.5 L 723.5 333.5 L 723.5 487.5 L 695.5 487.5 Z M 778.5 333.5 L 806.5 333.5 L 806.5 487.5 L 778.5 487.5 Z M 1561.5 298.5 L 1589.5 298.5 L 1589.5 504.5 L 1561.5 504.5 Z M 1379.5 298.5 L 1407.5 298.5 L 1407.5 504.5 L 1379.5 504.5 Z M 1296.5 298.5 L 1324.5 298.5 L 1324.5 504.5 L 1296.5 504.5 Z M 1214.5 298.5 L 1241.5 298.5 L 1241.5 504.5 L 1214.5 504.5 Z M 1131.5 298.5 L 1159.5 298.5 L 1159.5 504.5 L 1131.5 504.5 Z M 1046.5 298.5 L 1074.5 298.5 L 1074.5 504.5 L 1046.5 504.5 Z M 349.5 298.5 L 376.5 298.5 L 376.5 504.5 L 349.5 504.5 Z M 514.5 298.5 L 542.5 298.5 L 542.5 504.5 L 514.5 504.5 Z M 1469.5 298.5 L 1497.5 298.5 L 1497.5 504.5 L 1469.5 504.5 Z M 597.5 298.5 L 625.5 298.5 L 625.5 504.5 L 597.5 504.5 Z M 964.5 298.5 L 991.5 298.5 L 991.5 504.5 L 964.5 504.5 Z M 432.5 298.5 L 459.5 298.5 L 459.5 504.5 L 432.5 504.5 Z M 432.5 298.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface346">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1158.816406 546.203125 L 1142.460938 546.203125 L 1142.460938 541.113281 L 1160.074219 516.71875 L 1163.628906 516.71875 L 1163.628906 541.878906 L 1169.371094 541.878906 L 1169.371094 546.203125 L 1163.628906 546.203125 L 1163.628906 555.5 L 1158.816406 555.5 Z M 1158.816406 541.878906 L 1158.816406 524.921875 L 1146.671875 541.878906 Z M 1158.816406 541.878906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1120 559 L 1151 559 M 1120 528 L 1151 528 M 1120 528 L 1120 559 M 1151 528 L 1151 559 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1120 559 L 1151 559 M 1120 528 L 1151 528 M 1151 559 L 1151 528 M 1120 559 L 1120 528 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_1.svg b/cells/o41ai/sky130_fd_sc_hs__o41ai_1.svg
index decb19d..70ee32e 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_1.svg
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1211.5 664.5 L 1245.5 664.5 L 1245.5 833.5 L 1211.5 833.5 Z M 722.5 664.5 L 757.5 664.5 L 757.5 833.5 L 722.5 833.5 Z M 847.5 664.5 L 882.5 664.5 L 882.5 833.5 L 847.5 833.5 Z M 981.5 664.5 L 1016.5 664.5 L 1016.5 833.5 L 981.5 833.5 Z M 1080.5 664.5 L 1114.5 664.5 L 1114.5 833.5 L 1080.5 833.5 Z M 1080.5 664.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1214.5 240.5 L 1248.5 240.5 L 1248.5 496.5 L 1214.5 496.5 Z M 726.5 240.5 L 760.5 240.5 L 760.5 496.5 L 726.5 496.5 Z M 840.5 240.5 L 875.5 240.5 L 875.5 496.5 L 840.5 496.5 Z M 953.5 240.5 L 987.5 240.5 L 987.5 496.5 L 953.5 496.5 Z M 1083.5 240.5 L 1118.5 240.5 L 1118.5 496.5 L 1083.5 496.5 Z M 1083.5 240.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface325">
+<g id="surface353">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -182,6 +182,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1320.773438 527.503906 L 1310.203125 527.503906 L 1310.203125 523.261719 L 1312.019531 523.058594 L 1313.636719 522.789062 L 1315.050781 522.453125 L 1316.261719 522.183594 L 1317.269531 521.847656 L 1318.148438 521.445312 L 1318.820312 521.039062 L 1319.425781 520.570312 L 1319.964844 520.03125 L 1320.503906 519.355469 L 1320.972656 518.617188 L 1321.445312 517.742188 L 1321.648438 517.269531 L 1321.847656 516.730469 L 1322.050781 516.125 L 1322.320312 515.386719 L 1322.523438 514.644531 L 1322.792969 513.769531 L 1326.695312 513.769531 L 1326.695312 561.5 L 1320.773438 561.5 Z M 1320.773438 527.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1272 562 L 1311 562 M 1272 523 L 1311 523 M 1272 523 L 1272 562 M 1311 523 L 1311 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1272 562 L 1311 562 M 1272 523 L 1311 523 M 1311 562 L 1311 523 M 1272 562 L 1272 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_2.svg b/cells/o41ai/sky130_fd_sc_hs__o41ai_2.svg
index b941fe0..753b5e1 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_2.svg
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 538.5 L 201.5 538.5 Z M 201.5 111.5 "/>
 </clipPath>
-<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 245.5 862.5 L 1675.5 862.5 L 1675.5 918.5 L 245.5 918.5 Z M 245.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1451.5 664.5 L 1486.5 664.5 L 1486.5 833.5 L 1451.5 833.5 Z M 461.5 664.5 L 496.5 664.5 L 496.5 833.5 L 461.5 833.5 Z M 560.5 664.5 L 594.5 664.5 L 594.5 833.5 L 560.5 833.5 Z M 674.5 664.5 L 709.5 664.5 L 709.5 833.5 L 674.5 833.5 Z M 789.5 664.5 L 823.5 664.5 L 823.5 833.5 L 789.5 833.5 Z M 902.5 664.5 L 937.5 664.5 L 937.5 833.5 L 902.5 833.5 Z M 1002.5 664.5 L 1036.5 664.5 L 1036.5 833.5 L 1002.5 833.5 Z M 1107.5 664.5 L 1142.5 664.5 L 1142.5 833.5 L 1107.5 833.5 Z M 1238.5 664.5 L 1272.5 664.5 L 1272.5 833.5 L 1238.5 833.5 Z M 1337.5 664.5 L 1371.5 664.5 L 1371.5 833.5 L 1337.5 833.5 Z M 1337.5 664.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1544.5 240.5 L 1578.5 240.5 L 1578.5 496.5 L 1544.5 496.5 Z M 341.5 240.5 L 375.5 240.5 L 375.5 496.5 L 341.5 496.5 Z M 444.5 240.5 L 478.5 240.5 L 478.5 496.5 L 444.5 496.5 Z M 669.5 240.5 L 703.5 240.5 L 703.5 496.5 L 669.5 496.5 Z M 772.5 240.5 L 806.5 240.5 L 806.5 496.5 L 772.5 496.5 Z M 906.5 240.5 L 940.5 240.5 L 940.5 496.5 L 906.5 496.5 Z M 1009.5 240.5 L 1043.5 240.5 L 1043.5 496.5 L 1009.5 496.5 Z M 1235.5 240.5 L 1269.5 240.5 L 1269.5 496.5 L 1235.5 496.5 Z M 1338.5 240.5 L 1372.5 240.5 L 1372.5 496.5 L 1338.5 496.5 Z M 1441.5 240.5 L 1475.5 240.5 L 1475.5 496.5 L 1441.5 496.5 Z M 1441.5 240.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 280.5 136.5 L 319.5 136.5 L 319.5 174.5 L 280.5 174.5 Z M 1600.5 136.5 L 1639.5 136.5 L 1639.5 174.5 L 1600.5 174.5 Z M 1490.5 136.5 L 1529.5 136.5 L 1529.5 174.5 L 1490.5 174.5 Z M 1380.5 136.5 L 1419.5 136.5 L 1419.5 174.5 L 1380.5 174.5 Z M 1270.5 136.5 L 1309.5 136.5 L 1309.5 174.5 L 1270.5 174.5 Z M 1160.5 136.5 L 1199.5 136.5 L 1199.5 174.5 L 1160.5 174.5 Z M 1050.5 136.5 L 1089.5 136.5 L 1089.5 174.5 L 1050.5 174.5 Z M 940.5 136.5 L 979.5 136.5 L 979.5 174.5 L 940.5 174.5 Z M 830.5 136.5 L 869.5 136.5 L 869.5 174.5 L 830.5 174.5 Z M 720.5 136.5 L 759.5 136.5 L 759.5 174.5 L 720.5 174.5 Z M 610.5 136.5 L 649.5 136.5 L 649.5 174.5 L 610.5 174.5 Z M 500.5 136.5 L 539.5 136.5 L 539.5 174.5 L 500.5 174.5 Z M 390.5 136.5 L 429.5 136.5 L 429.5 174.5 L 390.5 174.5 Z M 280.5 899.5 L 319.5 899.5 L 319.5 938.5 L 280.5 938.5 Z M 1600.5 899.5 L 1639.5 899.5 L 1639.5 938.5 L 1600.5 938.5 Z M 1490.5 899.5 L 1529.5 899.5 L 1529.5 938.5 L 1490.5 938.5 Z M 1380.5 899.5 L 1419.5 899.5 L 1419.5 938.5 L 1380.5 938.5 Z M 1270.5 899.5 L 1309.5 899.5 L 1309.5 938.5 L 1270.5 938.5 Z M 1160.5 899.5 L 1199.5 899.5 L 1199.5 938.5 L 1160.5 938.5 Z M 1050.5 899.5 L 1089.5 899.5 L 1089.5 938.5 L 1050.5 938.5 Z M 940.5 899.5 L 979.5 899.5 L 979.5 938.5 L 940.5 938.5 Z M 830.5 899.5 L 869.5 899.5 L 869.5 938.5 L 830.5 938.5 Z M 720.5 899.5 L 759.5 899.5 L 759.5 938.5 L 720.5 938.5 Z M 610.5 899.5 L 649.5 899.5 L 649.5 938.5 L 610.5 938.5 Z M 500.5 899.5 L 539.5 899.5 L 539.5 938.5 L 500.5 938.5 Z M 390.5 899.5 L 429.5 899.5 L 429.5 938.5 L 390.5 938.5 Z M 390.5 899.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface340">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,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 1408.703125 530.332031 L 1409.242188 525.28125 L 1410.652344 521.175781 L 1412.875 517.941406 L 1415.90625 515.652344 L 1419.742188 514.242188 L 1424.457031 513.769531 L 1426.609375 513.902344 L 1428.695312 514.242188 L 1430.648438 514.777344 L 1432.398438 515.585938 L 1434.015625 516.597656 L 1435.5625 517.742188 L 1436.773438 519.15625 L 1437.851562 520.636719 L 1438.660156 522.25 L 1439.265625 523.933594 L 1439.601562 525.820312 L 1439.738281 527.773438 L 1439.46875 530.53125 L 1438.726562 533.089844 L 1437.449219 535.445312 L 1435.699219 537.667969 L 1433.410156 539.753906 L 1430.648438 541.574219 L 1429.640625 542.179688 L 1422.90625 545.8125 L 1421.15625 546.824219 L 1419.609375 547.832031 L 1418.261719 548.84375 L 1417.183594 549.851562 L 1416.242188 550.863281 L 1415.570312 551.875 L 1415.230469 552.480469 L 1414.960938 553.015625 L 1414.761719 553.691406 L 1414.558594 554.296875 L 1414.355469 554.96875 L 1414.289062 555.644531 L 1439.402344 555.644531 L 1439.402344 561.5 L 1407.625 561.5 L 1407.757812 559.144531 L 1408.097656 556.988281 L 1408.5 554.96875 L 1409.039062 553.21875 L 1409.644531 551.535156 L 1410.386719 550.054688 L 1411.191406 548.777344 L 1412.203125 547.496094 L 1413.414062 546.21875 L 1414.761719 545.007812 L 1416.308594 543.792969 L 1418.125 542.582031 L 1418.53125 542.3125 L 1419.003906 542.042969 L 1419.472656 541.707031 L 1419.945312 541.4375 L 1420.484375 541.167969 L 1421.023438 540.832031 L 1427.214844 537.332031 L 1429.167969 536.050781 L 1430.785156 534.640625 L 1432.0625 533.15625 L 1432.9375 531.542969 L 1433.476562 529.792969 L 1433.679688 527.90625 L 1433.542969 526.628906 L 1433.339844 525.347656 L 1432.871094 524.203125 L 1432.332031 523.125 L 1431.523438 522.183594 L 1430.648438 521.242188 L 1429.707031 520.570312 L 1428.765625 519.960938 L 1427.6875 519.558594 L 1426.609375 519.222656 L 1425.464844 519.019531 L 1424.253906 518.953125 L 1421.628906 519.289062 L 1419.40625 520.097656 L 1417.589844 521.511719 L 1416.242188 523.464844 L 1415.300781 526.023438 L 1414.761719 529.050781 L 1414.695312 529.320312 L 1414.695312 529.722656 L 1414.625 529.925781 L 1414.625 530.332031 Z M 1408.703125 530.332031 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1380 562 L 1419 562 M 1380 523 L 1419 523 M 1380 523 L 1380 562 M 1419 523 L 1419 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1380 562 L 1419 562 M 1380 523 L 1419 523 M 1419 562 L 1419 523 M 1380 562 L 1380 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 245 156 L 245 165 M 240 161 L 249 161 M 244 162 L 246 162 M 244 160 L 246 160 M 244 160 L 244 162 M 246 160 L 246 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/o41ai/sky130_fd_sc_hs__o41ai_4.svg b/cells/o41ai/sky130_fd_sc_hs__o41ai_4.svg
index 30e6602..e504b45 100644
--- a/cells/o41ai/sky130_fd_sc_hs__o41ai_4.svg
+++ b/cells/o41ai/sky130_fd_sc_hs__o41ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1630.5 618.5 L 1652.5 618.5 L 1652.5 729.5 L 1630.5 729.5 Z M 266.5 618.5 L 289.5 618.5 L 289.5 729.5 L 266.5 729.5 Z M 331.5 618.5 L 353.5 618.5 L 353.5 729.5 L 331.5 729.5 Z M 395.5 618.5 L 418.5 618.5 L 418.5 729.5 L 395.5 729.5 Z M 470.5 618.5 L 493.5 618.5 L 493.5 729.5 L 470.5 729.5 Z M 545.5 618.5 L 568.5 618.5 L 568.5 729.5 L 545.5 729.5 Z M 655.5 618.5 L 677.5 618.5 L 677.5 729.5 L 655.5 729.5 Z M 723.5 618.5 L 745.5 618.5 L 745.5 729.5 L 723.5 729.5 Z M 787.5 618.5 L 810.5 618.5 L 810.5 729.5 L 787.5 729.5 Z M 852.5 618.5 L 874.5 618.5 L 874.5 729.5 L 852.5 729.5 Z M 927.5 618.5 L 949.5 618.5 L 949.5 729.5 L 927.5 729.5 Z M 991.5 618.5 L 1014.5 618.5 L 1014.5 729.5 L 991.5 729.5 Z M 1066.5 618.5 L 1089.5 618.5 L 1089.5 729.5 L 1066.5 729.5 Z M 1131.5 618.5 L 1153.5 618.5 L 1153.5 729.5 L 1131.5 729.5 Z M 1206.5 618.5 L 1228.5 618.5 L 1228.5 729.5 L 1206.5 729.5 Z M 1270.5 618.5 L 1293.5 618.5 L 1293.5 729.5 L 1270.5 729.5 Z M 1340.5 618.5 L 1363.5 618.5 L 1363.5 729.5 L 1340.5 729.5 Z M 1413.5 618.5 L 1435.5 618.5 L 1435.5 729.5 L 1413.5 729.5 Z M 1490.5 618.5 L 1513.5 618.5 L 1513.5 729.5 L 1490.5 729.5 Z M 1555.5 618.5 L 1577.5 618.5 L 1577.5 729.5 L 1555.5 729.5 Z M 1555.5 618.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1628.5 341.5 L 1651.5 341.5 L 1651.5 509.5 L 1628.5 509.5 Z M 268.5 341.5 L 290.5 341.5 L 290.5 509.5 L 268.5 509.5 Z M 350.5 341.5 L 373.5 341.5 L 373.5 509.5 L 350.5 509.5 Z M 502.5 341.5 L 524.5 341.5 L 524.5 509.5 L 502.5 509.5 Z M 569.5 341.5 L 592.5 341.5 L 592.5 509.5 L 569.5 509.5 Z M 637.5 341.5 L 659.5 341.5 L 659.5 509.5 L 637.5 509.5 Z M 704.5 341.5 L 727.5 341.5 L 727.5 509.5 L 704.5 509.5 Z M 772.5 341.5 L 794.5 341.5 L 794.5 509.5 L 772.5 509.5 Z M 854.5 341.5 L 877.5 341.5 L 877.5 509.5 L 854.5 509.5 Z M 922.5 341.5 L 944.5 341.5 L 944.5 509.5 L 922.5 509.5 Z M 989.5 341.5 L 1012.5 341.5 L 1012.5 509.5 L 989.5 509.5 Z M 1141.5 341.5 L 1163.5 341.5 L 1163.5 509.5 L 1141.5 509.5 Z M 1208.5 341.5 L 1231.5 341.5 L 1231.5 509.5 L 1208.5 509.5 Z M 1276.5 341.5 L 1298.5 341.5 L 1298.5 509.5 L 1276.5 509.5 Z M 1343.5 341.5 L 1366.5 341.5 L 1366.5 509.5 L 1343.5 509.5 Z M 1411.5 341.5 L 1433.5 341.5 L 1433.5 509.5 L 1411.5 509.5 Z M 1486.5 341.5 L 1508.5 341.5 L 1508.5 509.5 L 1486.5 509.5 Z M 1553.5 341.5 L 1576.5 341.5 L 1576.5 509.5 L 1553.5 509.5 Z M 1553.5 341.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface364">
+<g id="surface392">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -209,6 +209,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 674.324219 483.066406 L 674.324219 495.5 L 670.28125 495.5 L 670.28125 483.066406 L 658.066406 463.804688 L 663.066406 463.804688 L 672.371094 479.238281 L 681.414062 463.804688 L 686.238281 463.804688 Z M 674.324219 483.066406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 658 612 L 684 612 M 658 587 L 684 587 M 658 587 L 658 612 M 684 587 L 684 612 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 658 612 L 684 612 M 658 587 L 684 587 M 684 612 L 684 587 M 658 612 L 658 587 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2/sky130_fd_sc_hs__or2_1.svg b/cells/or2/sky130_fd_sc_hs__or2_1.svg
index 6d6beac..52df5c3 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_1.svg
+++ b/cells/or2/sky130_fd_sc_hs__or2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 975.5 664.5 L 1009.5 664.5 L 1009.5 790.5 L 975.5 790.5 Z M 831.5 664.5 L 866.5 664.5 L 866.5 790.5 L 831.5 790.5 Z M 1107.5 664.5 L 1142.5 664.5 L 1142.5 833.5 L 1107.5 833.5 Z M 1107.5 664.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1105.5 240.5 L 1140.5 240.5 L 1140.5 496.5 L 1105.5 496.5 Z M 828.5 304.5 L 862.5 304.5 L 862.5 496.5 L 828.5 496.5 Z M 924.5 304.5 L 958.5 304.5 L 958.5 496.5 L 924.5 496.5 Z M 924.5 304.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1187.824219 282.320312 L 1205.191406 307.5 L 1197.449219 307.5 L 1184.050781 287.035156 L 1170.589844 307.5 L 1162.980469 307.5 L 1180.351562 282.320312 L 1164.058594 258.421875 L 1171.664062 258.421875 L 1184.253906 277.675781 L 1196.910156 258.421875 L 1204.382812 258.421875 Z M 1187.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1164 816 L 1203 816 M 1164 777 L 1203 777 M 1164 777 L 1164 816 M 1203 777 L 1203 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1164 816 L 1203 816 M 1164 777 L 1203 777 M 1203 816 L 1203 777 M 1164 816 L 1164 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2/sky130_fd_sc_hs__or2_2.svg b/cells/or2/sky130_fd_sc_hs__or2_2.svg
index 7ef182f..83e94b9 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_2.svg
+++ b/cells/or2/sky130_fd_sc_hs__or2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 538.5 L 644.5 538.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 688.5 862.5 L 1238.5 862.5 L 1238.5 918.5 L 688.5 918.5 Z M 688.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 882.5 664.5 L 916.5 664.5 L 916.5 810.5 L 882.5 810.5 Z M 783.5 664.5 L 818.5 664.5 L 818.5 810.5 L 783.5 810.5 Z M 1096.5 664.5 L 1130.5 664.5 L 1130.5 833.5 L 1096.5 833.5 Z M 997.5 664.5 L 1032.5 664.5 L 1032.5 833.5 L 997.5 833.5 Z M 997.5 664.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1105.5 240.5 L 1140.5 240.5 L 1140.5 496.5 L 1105.5 496.5 Z M 784.5 267.5 L 819.5 267.5 L 819.5 496.5 L 784.5 496.5 Z M 874.5 267.5 L 908.5 267.5 L 908.5 496.5 L 874.5 496.5 Z M 997.5 240.5 L 1032.5 240.5 L 1032.5 496.5 L 997.5 496.5 Z M 997.5 240.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 724.5 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 1164.5 136.5 L 1203.5 136.5 L 1203.5 174.5 L 1164.5 174.5 Z M 1054.5 136.5 L 1093.5 136.5 L 1093.5 174.5 L 1054.5 174.5 Z M 944.5 136.5 L 983.5 136.5 L 983.5 174.5 L 944.5 174.5 Z M 834.5 136.5 L 873.5 136.5 L 873.5 174.5 L 834.5 174.5 Z M 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 1164.5 899.5 L 1203.5 899.5 L 1203.5 938.5 L 1164.5 938.5 Z M 1054.5 899.5 L 1093.5 899.5 L 1093.5 938.5 L 1054.5 938.5 Z M 944.5 899.5 L 983.5 899.5 L 983.5 938.5 L 944.5 938.5 Z M 834.5 899.5 L 873.5 899.5 L 873.5 938.5 L 834.5 938.5 Z M 834.5 899.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface285">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 863.410156 461.757812 L 844.492188 461.757812 L 839.308594 476.5 L 832.644531 476.5 L 850.148438 427.421875 L 858.226562 427.421875 L 875.460938 476.5 L 868.460938 476.5 Z M 861.660156 456.503906 L 854.121094 434.15625 L 846.042969 456.503906 Z M 861.660156 456.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 834 647 L 873 647 M 834 608 L 873 608 M 834 608 L 834 647 M 873 608 L 873 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 834 647 L 873 647 M 834 608 L 873 608 M 873 647 L 873 608 M 834 647 L 834 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 688 156 L 688 165 M 683 161 L 692 161 M 687 162 L 689 162 M 687 160 L 689 160 M 687 160 L 687 162 M 689 160 L 689 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2/sky130_fd_sc_hs__or2_4.svg b/cells/or2/sky130_fd_sc_hs__or2_4.svg
index c12c5ee..bf8c18d 100644
--- a/cells/or2/sky130_fd_sc_hs__or2_4.svg
+++ b/cells/or2/sky130_fd_sc_hs__or2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1104.5 664.5 L 1138.5 664.5 L 1138.5 833.5 L 1104.5 833.5 Z M 563.5 664.5 L 598.5 664.5 L 598.5 833.5 L 563.5 833.5 Z M 662.5 664.5 L 696.5 664.5 L 696.5 833.5 L 662.5 833.5 Z M 760.5 664.5 L 795.5 664.5 L 795.5 833.5 L 760.5 833.5 Z M 878.5 664.5 L 913.5 664.5 L 913.5 833.5 L 878.5 833.5 Z M 993.5 664.5 L 1027.5 664.5 L 1027.5 833.5 L 993.5 833.5 Z M 993.5 664.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1318.5 244.5 L 1353.5 244.5 L 1353.5 474.5 L 1318.5 474.5 Z M 997.5 244.5 L 1032.5 244.5 L 1032.5 474.5 L 997.5 474.5 Z M 1101.5 244.5 L 1135.5 244.5 L 1135.5 474.5 L 1101.5 474.5 Z M 1204.5 244.5 L 1238.5 244.5 L 1238.5 474.5 L 1204.5 474.5 Z M 772.5 240.5 L 806.5 240.5 L 806.5 496.5 L 772.5 496.5 Z M 875.5 240.5 L 909.5 240.5 L 909.5 496.5 L 875.5 496.5 Z M 669.5 240.5 L 703.5 240.5 L 703.5 496.5 L 669.5 496.5 Z M 565.5 240.5 L 600.5 240.5 L 600.5 496.5 L 565.5 496.5 Z M 565.5 240.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface274">
+<g id="surface303">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1082.410156 546.757812 L 1063.492188 546.757812 L 1058.308594 561.5 L 1051.644531 561.5 L 1069.148438 512.421875 L 1077.226562 512.421875 L 1094.460938 561.5 L 1087.460938 561.5 Z M 1080.660156 541.503906 L 1073.121094 519.15625 L 1065.042969 541.503906 Z M 1080.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_1.svg b/cells/or2b/sky130_fd_sc_hs__or2b_1.svg
index bba2051..6b3f2b3 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_1.svg
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 1040.5 664.5 L 1074.5 664.5 L 1074.5 790.5 L 1040.5 790.5 Z M 761.5 664.5 L 796.5 664.5 L 796.5 790.5 L 761.5 790.5 Z M 941.5 664.5 L 976.5 664.5 L 976.5 790.5 L 941.5 790.5 Z M 1207.5 664.5 L 1242.5 664.5 L 1242.5 833.5 L 1207.5 833.5 Z M 1207.5 664.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 675.5 240.5 L 710.5 240.5 L 710.5 432.5 L 675.5 432.5 Z M 947.5 267.5 L 981.5 267.5 L 981.5 496.5 L 947.5 496.5 Z M 1043.5 267.5 L 1078.5 267.5 L 1078.5 496.5 L 1043.5 496.5 Z M 1177.5 240.5 L 1212.5 240.5 L 1212.5 496.5 L 1177.5 496.5 Z M 1177.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -156,6 +156,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 1082.410156 546.757812 L 1063.492188 546.757812 L 1058.308594 561.5 L 1051.644531 561.5 L 1069.148438 512.421875 L 1077.226562 512.421875 L 1094.460938 561.5 L 1087.460938 561.5 Z M 1080.660156 541.503906 L 1073.121094 519.15625 L 1065.042969 541.503906 Z M 1080.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_2.svg b/cells/or2b/sky130_fd_sc_hs__or2b_2.svg
index e5ff614..e54f692 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_2.svg
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 674.5 664.5 L 709.5 664.5 L 709.5 790.5 L 674.5 790.5 Z M 1198.5 687.5 L 1232.5 687.5 L 1232.5 833.5 L 1198.5 833.5 Z M 1085.5 687.5 L 1119.5 687.5 L 1119.5 833.5 L 1085.5 833.5 Z M 891.5 664.5 L 925.5 664.5 L 925.5 833.5 L 891.5 833.5 Z M 791.5 664.5 L 826.5 664.5 L 826.5 833.5 L 791.5 833.5 Z M 791.5 664.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 950.5 240.5 L 985.5 240.5 L 985.5 496.5 L 950.5 496.5 Z M 675.5 304.5 L 710.5 304.5 L 710.5 496.5 L 675.5 496.5 Z M 1177.5 267.5 L 1212.5 267.5 L 1212.5 496.5 L 1177.5 496.5 Z M 1081.5 267.5 L 1115.5 267.5 L 1115.5 496.5 L 1081.5 496.5 Z M 798.5 240.5 L 832.5 240.5 L 832.5 496.5 L 798.5 496.5 Z M 798.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -153,6 +153,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 1082.410156 546.757812 L 1063.492188 546.757812 L 1058.308594 561.5 L 1051.644531 561.5 L 1069.148438 512.421875 L 1077.226562 512.421875 L 1094.460938 561.5 L 1087.460938 561.5 Z M 1080.660156 541.503906 L 1073.121094 519.15625 L 1065.042969 541.503906 Z M 1080.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1052 523 L 1052 562 M 1091 523 L 1091 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1052 562 L 1091 562 M 1052 523 L 1091 523 M 1091 562 L 1091 523 M 1052 562 L 1052 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or2b/sky130_fd_sc_hs__or2b_4.svg b/cells/or2b/sky130_fd_sc_hs__or2b_4.svg
index ab73d05..df4c0ba 100644
--- a/cells/or2b/sky130_fd_sc_hs__or2b_4.svg
+++ b/cells/or2b/sky130_fd_sc_hs__or2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.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 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.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 396.5 664.5 L 430.5 664.5 L 430.5 833.5 L 396.5 833.5 Z M 1287.5 687.5 L 1322.5 687.5 L 1322.5 833.5 L 1287.5 833.5 Z M 1173.5 687.5 L 1207.5 687.5 L 1207.5 833.5 L 1173.5 833.5 Z M 1074.5 687.5 L 1109.5 687.5 L 1109.5 833.5 L 1074.5 833.5 Z M 960.5 687.5 L 994.5 687.5 L 994.5 833.5 L 960.5 833.5 Z M 822.5 687.5 L 856.5 687.5 L 856.5 833.5 L 822.5 833.5 Z M 713.5 664.5 L 748.5 664.5 L 748.5 833.5 L 713.5 833.5 Z M 609.5 664.5 L 643.5 664.5 L 643.5 833.5 L 609.5 833.5 Z M 494.5 664.5 L 529.5 664.5 L 529.5 833.5 L 494.5 833.5 Z M 494.5 664.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 1489.5 240.5 L 1523.5 240.5 L 1523.5 469.5 L 1489.5 469.5 Z M 929.5 240.5 L 963.5 240.5 L 963.5 469.5 L 929.5 469.5 Z M 826.5 240.5 L 860.5 240.5 L 860.5 469.5 L 826.5 469.5 Z M 1157.5 246.5 L 1191.5 246.5 L 1191.5 475.5 L 1157.5 475.5 Z M 1260.5 246.5 L 1294.5 246.5 L 1294.5 475.5 L 1260.5 475.5 Z M 602.5 240.5 L 636.5 240.5 L 636.5 496.5 L 602.5 496.5 Z M 396.5 240.5 L 430.5 240.5 L 430.5 496.5 L 396.5 496.5 Z M 705.5 240.5 L 740.5 240.5 L 740.5 496.5 L 705.5 496.5 Z M 499.5 240.5 L 533.5 240.5 L 533.5 496.5 L 499.5 496.5 Z M 499.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.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>
@@ -158,6 +158,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 359.824219 621.320312 L 377.191406 646.5 L 369.449219 646.5 L 356.050781 626.035156 L 342.589844 646.5 L 334.980469 646.5 L 352.351562 621.320312 L 336.058594 597.421875 L 343.664062 597.421875 L 356.253906 616.675781 L 368.910156 597.421875 L 376.382812 597.421875 Z M 359.824219 621.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 335 477 L 374 477 M 335 438 L 374 438 M 335 438 L 335 477 M 374 438 L 374 477 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 335 477 L 374 477 M 335 438 L 374 438 M 374 477 L 374 438 M 335 477 L 335 438 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3/sky130_fd_sc_hs__or3_1.svg b/cells/or3/sky130_fd_sc_hs__or3_1.svg
index f10e841..efdf0cb 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_1.svg
+++ b/cells/or3/sky130_fd_sc_hs__or3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 538.5 L 589.5 538.5 Z M 589.5 111.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 633.5 862.5 L 1293.5 862.5 L 1293.5 918.5 L 633.5 918.5 Z M 633.5 862.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 1161.5 664.5 L 1196.5 664.5 L 1196.5 833.5 L 1161.5 833.5 Z M 729.5 707.5 L 764.5 707.5 L 764.5 833.5 L 729.5 833.5 Z M 1031.5 707.5 L 1065.5 707.5 L 1065.5 833.5 L 1031.5 833.5 Z M 844.5 707.5 L 878.5 707.5 L 878.5 833.5 L 844.5 833.5 Z M 844.5 707.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 1160.5 240.5 L 1195.5 240.5 L 1195.5 496.5 L 1160.5 496.5 Z M 732.5 267.5 L 766.5 267.5 L 766.5 496.5 L 732.5 496.5 Z M 958.5 267.5 L 993.5 267.5 L 993.5 496.5 L 958.5 496.5 Z M 828.5 267.5 L 862.5 267.5 L 862.5 496.5 L 828.5 496.5 Z M 828.5 267.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 669.5 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1219.5 136.5 L 1258.5 136.5 L 1258.5 174.5 L 1219.5 174.5 Z M 1109.5 136.5 L 1148.5 136.5 L 1148.5 174.5 L 1109.5 174.5 Z M 999.5 136.5 L 1038.5 136.5 L 1038.5 174.5 L 999.5 174.5 Z M 889.5 136.5 L 928.5 136.5 L 928.5 174.5 L 889.5 174.5 Z M 779.5 136.5 L 818.5 136.5 L 818.5 174.5 L 779.5 174.5 Z M 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 1219.5 899.5 L 1258.5 899.5 L 1258.5 938.5 L 1219.5 938.5 Z M 1109.5 899.5 L 1148.5 899.5 L 1148.5 938.5 L 1109.5 938.5 Z M 999.5 899.5 L 1038.5 899.5 L 1038.5 938.5 L 999.5 938.5 Z M 889.5 899.5 L 928.5 899.5 L 928.5 938.5 L 889.5 938.5 Z M 779.5 899.5 L 818.5 899.5 L 818.5 938.5 L 779.5 938.5 Z M 779.5 899.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>
@@ -154,6 +154,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 1242.824219 706.320312 L 1260.191406 731.5 L 1252.449219 731.5 L 1239.050781 711.035156 L 1225.589844 731.5 L 1217.980469 731.5 L 1235.351562 706.320312 L 1219.058594 682.421875 L 1226.664062 682.421875 L 1239.253906 701.675781 L 1251.910156 682.421875 L 1259.382812 682.421875 Z M 1242.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1219 392 L 1258 392 M 1219 353 L 1258 353 M 1219 353 L 1219 392 M 1258 353 L 1258 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1219 392 L 1258 392 M 1219 353 L 1258 353 M 1258 392 L 1258 353 M 1219 392 L 1219 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 633 156 L 633 165 M 628 161 L 637 161 M 632 162 L 634 162 M 632 160 L 634 160 M 632 160 L 632 162 M 634 160 L 634 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3/sky130_fd_sc_hs__or3_2.svg b/cells/or3/sky130_fd_sc_hs__or3_2.svg
index 421ff03..7eb38a7 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_2.svg
+++ b/cells/or3/sky130_fd_sc_hs__or3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1102.5 664.5 L 1136.5 664.5 L 1136.5 833.5 L 1102.5 833.5 Z M 823.5 687.5 L 858.5 687.5 L 858.5 833.5 L 823.5 833.5 Z M 673.5 687.5 L 708.5 687.5 L 708.5 833.5 L 673.5 833.5 Z M 938.5 687.5 L 972.5 687.5 L 972.5 833.5 L 938.5 833.5 Z M 1200.5 664.5 L 1235.5 664.5 L 1235.5 833.5 L 1200.5 833.5 Z M 1200.5 664.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 941.5 240.5 L 976.5 240.5 L 976.5 469.5 L 941.5 469.5 Z M 714.5 240.5 L 749.5 240.5 L 749.5 469.5 L 714.5 469.5 Z M 811.5 240.5 L 845.5 240.5 L 845.5 469.5 L 811.5 469.5 Z M 1184.5 240.5 L 1219.5 240.5 L 1219.5 496.5 L 1184.5 496.5 Z M 1081.5 240.5 L 1115.5 240.5 L 1115.5 496.5 L 1081.5 496.5 Z M 1081.5 240.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface285">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 873.441406 293.496094 L 873.304688 295.652344 L 872.96875 297.605469 L 872.363281 299.421875 L 871.554688 301.039062 L 870.480469 302.585938 L 869.199219 303.933594 L 867.785156 305.078125 L 866.304688 305.953125 L 864.621094 306.625 L 862.871094 307.164062 L 860.988281 307.433594 L 858.96875 307.5 L 836.820312 307.5 L 836.820312 258.421875 L 856.746094 258.421875 L 859.640625 258.625 L 862.199219 259.097656 L 864.488281 259.902344 L 866.441406 261.046875 L 868.121094 262.53125 L 869.46875 264.347656 L 870.007812 265.355469 L 870.480469 266.433594 L 870.816406 267.445312 L 871.085938 268.589844 L 871.21875 269.734375 L 871.285156 270.878906 L 871.085938 273.300781 L 870.480469 275.386719 L 869.535156 277.339844 L 868.191406 278.957031 L 866.507812 280.4375 L 864.488281 281.582031 L 866.441406 282.457031 L 868.121094 283.398438 L 869.605469 284.476562 L 870.816406 285.6875 L 871.757812 286.96875 L 872.5 288.3125 L 872.769531 289.121094 L 872.96875 289.929688 L 873.171875 290.738281 L 873.304688 291.679688 L 873.375 292.554688 Z M 865.027344 271.753906 L 864.824219 269.734375 L 864.21875 268.050781 L 863.277344 266.570312 L 861.929688 265.492188 L 860.246094 264.683594 L 858.160156 264.144531 L 857.6875 264.144531 L 857.214844 264.078125 L 856.746094 264.011719 L 855.667969 264.011719 L 855.195312 263.941406 L 843.078125 263.941406 L 843.078125 279.5625 L 855.195312 279.5625 L 857.6875 279.425781 L 859.84375 279.023438 L 861.660156 278.28125 L 863.007812 277.273438 L 864.082031 275.925781 L 864.757812 274.3125 L 864.824219 273.972656 L 864.957031 273.167969 L 864.957031 272.222656 Z M 858.359375 301.980469 L 860.246094 301.914062 L 861.929688 301.507812 L 863.410156 300.835938 L 864.621094 299.960938 L 865.632812 298.816406 L 866.441406 297.402344 L 866.640625 296.863281 L 866.777344 296.257812 L 866.976562 295.585938 L 867.046875 294.976562 L 867.113281 294.304688 L 867.179688 293.566406 L 867.046875 292.082031 L 866.777344 290.667969 L 866.304688 289.457031 L 865.632812 288.3125 L 864.757812 287.371094 L 863.746094 286.496094 L 863.007812 286.09375 L 862.199219 285.753906 L 861.324219 285.484375 L 860.378906 285.285156 L 859.371094 285.148438 L 858.359375 285.082031 L 843.078125 285.082031 L 843.078125 301.980469 Z M 858.359375 301.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 832 816 L 871 816 M 832 777 L 871 777 M 832 777 L 832 816 M 871 777 L 871 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 832 816 L 871 816 M 832 777 L 871 777 M 871 816 L 871 777 M 832 816 L 832 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3/sky130_fd_sc_hs__or3_4.svg b/cells/or3/sky130_fd_sc_hs__or3_4.svg
index e6c7baa..19f1b45 100644
--- a/cells/or3/sky130_fd_sc_hs__or3_4.svg
+++ b/cells/or3/sky130_fd_sc_hs__or3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1435.5 664.5 L 1470.5 664.5 L 1470.5 833.5 L 1435.5 833.5 Z M 781.5 664.5 L 815.5 664.5 L 815.5 833.5 L 781.5 833.5 Z M 898.5 664.5 L 932.5 664.5 L 932.5 833.5 L 898.5 833.5 Z M 1010.5 664.5 L 1044.5 664.5 L 1044.5 833.5 L 1010.5 833.5 Z M 1125.5 664.5 L 1159.5 664.5 L 1159.5 833.5 L 1125.5 833.5 Z M 1224.5 664.5 L 1259.5 664.5 L 1259.5 833.5 L 1224.5 833.5 Z M 1337.5 664.5 L 1371.5 664.5 L 1371.5 833.5 L 1337.5 833.5 Z M 1337.5 664.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1001.5 244.5 L 1035.5 244.5 L 1035.5 474.5 L 1001.5 474.5 Z M 667.5 244.5 L 702.5 244.5 L 702.5 474.5 L 667.5 474.5 Z M 557.5 244.5 L 592.5 244.5 L 592.5 474.5 L 557.5 474.5 Z M 454.5 244.5 L 489.5 244.5 L 489.5 474.5 L 454.5 474.5 Z M 771.5 244.5 L 805.5 244.5 L 805.5 474.5 L 771.5 474.5 Z M 886.5 244.5 L 921.5 244.5 L 921.5 474.5 L 886.5 474.5 Z M 1433.5 240.5 L 1467.5 240.5 L 1467.5 496.5 L 1433.5 496.5 Z M 1330.5 240.5 L 1364.5 240.5 L 1364.5 496.5 L 1330.5 496.5 Z M 1227.5 240.5 L 1261.5 240.5 L 1261.5 496.5 L 1227.5 496.5 Z M 1123.5 240.5 L 1158.5 240.5 L 1158.5 496.5 L 1123.5 496.5 Z M 1123.5 240.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface285">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +163,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 1515.824219 536.320312 L 1533.191406 561.5 L 1525.449219 561.5 L 1512.050781 541.035156 L 1498.589844 561.5 L 1490.980469 561.5 L 1508.351562 536.320312 L 1492.058594 512.421875 L 1499.664062 512.421875 L 1512.253906 531.675781 L 1524.910156 512.421875 L 1532.382812 512.421875 Z M 1515.824219 536.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1491 562 L 1530 562 M 1491 523 L 1530 523 M 1491 523 L 1491 562 M 1530 523 L 1530 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1491 562 L 1530 562 M 1491 523 L 1530 523 M 1530 562 L 1530 523 M 1491 562 L 1491 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_1.svg b/cells/or3b/sky130_fd_sc_hs__or3b_1.svg
index 21ddd4a..7a8f955 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_1.svg
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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 1271.5 664.5 L 1306.5 664.5 L 1306.5 833.5 L 1271.5 833.5 Z M 861.5 707.5 L 895.5 707.5 L 895.5 833.5 L 861.5 833.5 Z M 1098.5 707.5 L 1133.5 707.5 L 1133.5 833.5 L 1098.5 833.5 Z M 992.5 707.5 L 1026.5 707.5 L 1026.5 833.5 L 992.5 833.5 Z M 633.5 707.5 L 667.5 707.5 L 667.5 833.5 L 633.5 833.5 Z M 633.5 707.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 240.5 L 664.5 240.5 L 664.5 432.5 L 630.5 432.5 Z M 909.5 241.5 L 944.5 241.5 L 944.5 470.5 L 909.5 470.5 Z M 1005.5 241.5 L 1040.5 241.5 L 1040.5 470.5 L 1005.5 470.5 Z M 1102.5 241.5 L 1136.5 241.5 L 1136.5 470.5 L 1102.5 470.5 Z M 1236.5 240.5 L 1270.5 240.5 L 1270.5 496.5 L 1236.5 496.5 Z M 1236.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.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>
@@ -170,6 +170,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 1351.824219 706.320312 L 1369.191406 731.5 L 1361.449219 731.5 L 1348.050781 711.035156 L 1334.589844 731.5 L 1326.980469 731.5 L 1344.351562 706.320312 L 1328.058594 682.421875 L 1335.664062 682.421875 L 1348.253906 701.675781 L 1360.910156 682.421875 L 1368.382812 682.421875 Z M 1351.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1327 392 L 1366 392 M 1327 353 L 1366 353 M 1327 353 L 1327 392 M 1366 353 L 1366 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1327 392 L 1366 392 M 1327 353 L 1366 353 M 1366 392 L 1366 353 M 1327 392 L 1327 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_2.svg b/cells/or3b/sky130_fd_sc_hs__or3b_2.svg
index c60ffee..3665fa6 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_2.svg
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.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 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.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 634.5 664.5 L 669.5 664.5 L 669.5 790.5 L 634.5 790.5 Z M 1016.5 664.5 L 1050.5 664.5 L 1050.5 810.5 L 1016.5 810.5 Z M 1130.5 664.5 L 1165.5 664.5 L 1165.5 810.5 L 1130.5 810.5 Z M 1261.5 664.5 L 1295.5 664.5 L 1295.5 810.5 L 1261.5 810.5 Z M 850.5 664.5 L 884.5 664.5 L 884.5 833.5 L 850.5 833.5 Z M 751.5 664.5 L 785.5 664.5 L 785.5 833.5 L 751.5 833.5 Z M 751.5 664.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 846.5 240.5 L 881.5 240.5 L 881.5 496.5 L 846.5 496.5 Z M 620.5 304.5 L 655.5 304.5 L 655.5 496.5 L 620.5 496.5 Z M 1232.5 267.5 L 1267.5 267.5 L 1267.5 496.5 L 1232.5 496.5 Z M 1012.5 267.5 L 1047.5 267.5 L 1047.5 496.5 L 1012.5 496.5 Z M 1109.5 267.5 L 1143.5 267.5 L 1143.5 496.5 L 1109.5 496.5 Z M 743.5 240.5 L 777.5 240.5 L 777.5 496.5 L 743.5 496.5 Z M 743.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.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>
@@ -159,6 +159,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 643.890625 511.574219 L 643.890625 560.652344 L 636.824219 560.652344 L 611.441406 520.863281 L 611.441406 560.652344 L 605.519531 560.652344 L 605.519531 511.574219 L 612.316406 511.574219 L 637.96875 551.699219 L 637.96875 511.574219 Z M 643.890625 511.574219 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 557 562 L 596 562 M 557 523 L 596 523 M 557 523 L 557 562 M 596 523 L 596 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 557 562 L 596 562 M 557 523 L 596 523 M 596 562 L 596 523 M 557 562 L 557 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or3b/sky130_fd_sc_hs__or3b_4.svg b/cells/or3b/sky130_fd_sc_hs__or3b_4.svg
index 753782a..7f2ef1c 100644
--- a/cells/or3b/sky130_fd_sc_hs__or3b_4.svg
+++ b/cells/or3b/sky130_fd_sc_hs__or3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 538.5 L 256.5 538.5 Z M 256.5 111.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 300.5 862.5 L 1620.5 862.5 L 1620.5 918.5 L 300.5 918.5 Z M 300.5 862.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 400.5 616.5 L 435.5 616.5 L 435.5 762.5 L 400.5 762.5 Z M 1489.5 664.5 L 1523.5 664.5 L 1523.5 833.5 L 1489.5 833.5 Z M 1390.5 664.5 L 1425.5 664.5 L 1425.5 833.5 L 1390.5 833.5 Z M 1280.5 664.5 L 1315.5 664.5 L 1315.5 833.5 L 1280.5 833.5 Z M 1176.5 664.5 L 1211.5 664.5 L 1211.5 833.5 L 1176.5 833.5 Z M 1059.5 664.5 L 1094.5 664.5 L 1094.5 833.5 L 1059.5 833.5 Z M 961.5 664.5 L 995.5 664.5 L 995.5 833.5 L 961.5 833.5 Z M 846.5 664.5 L 881.5 664.5 L 881.5 833.5 L 846.5 833.5 Z M 846.5 664.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 1063.5 240.5 L 1097.5 240.5 L 1097.5 469.5 L 1063.5 469.5 Z M 397.5 240.5 L 431.5 240.5 L 431.5 469.5 L 397.5 469.5 Z M 734.5 240.5 L 768.5 240.5 L 768.5 469.5 L 734.5 469.5 Z M 617.5 240.5 L 651.5 240.5 L 651.5 469.5 L 617.5 469.5 Z M 514.5 240.5 L 548.5 240.5 L 548.5 469.5 L 514.5 469.5 Z M 843.5 240.5 L 877.5 240.5 L 877.5 469.5 L 843.5 469.5 Z M 946.5 240.5 L 980.5 240.5 L 980.5 469.5 L 946.5 469.5 Z M 1489.5 240.5 L 1523.5 240.5 L 1523.5 496.5 L 1489.5 496.5 Z M 1386.5 240.5 L 1420.5 240.5 L 1420.5 496.5 L 1386.5 496.5 Z M 1283.5 240.5 L 1317.5 240.5 L 1317.5 496.5 L 1283.5 496.5 Z M 1180.5 240.5 L 1214.5 240.5 L 1214.5 496.5 L 1180.5 496.5 Z M 1180.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 335.5 136.5 L 374.5 136.5 L 374.5 174.5 L 335.5 174.5 Z M 1545.5 136.5 L 1584.5 136.5 L 1584.5 174.5 L 1545.5 174.5 Z M 1435.5 136.5 L 1474.5 136.5 L 1474.5 174.5 L 1435.5 174.5 Z M 1325.5 136.5 L 1364.5 136.5 L 1364.5 174.5 L 1325.5 174.5 Z M 1215.5 136.5 L 1254.5 136.5 L 1254.5 174.5 L 1215.5 174.5 Z M 1105.5 136.5 L 1144.5 136.5 L 1144.5 174.5 L 1105.5 174.5 Z M 995.5 136.5 L 1034.5 136.5 L 1034.5 174.5 L 995.5 174.5 Z M 885.5 136.5 L 924.5 136.5 L 924.5 174.5 L 885.5 174.5 Z M 775.5 136.5 L 814.5 136.5 L 814.5 174.5 L 775.5 174.5 Z M 665.5 136.5 L 704.5 136.5 L 704.5 174.5 L 665.5 174.5 Z M 555.5 136.5 L 594.5 136.5 L 594.5 174.5 L 555.5 174.5 Z M 445.5 136.5 L 484.5 136.5 L 484.5 174.5 L 445.5 174.5 Z M 335.5 899.5 L 374.5 899.5 L 374.5 938.5 L 335.5 938.5 Z M 1545.5 899.5 L 1584.5 899.5 L 1584.5 938.5 L 1545.5 938.5 Z M 1435.5 899.5 L 1474.5 899.5 L 1474.5 938.5 L 1435.5 938.5 Z M 1325.5 899.5 L 1364.5 899.5 L 1364.5 938.5 L 1325.5 938.5 Z M 1215.5 899.5 L 1254.5 899.5 L 1254.5 938.5 L 1215.5 938.5 Z M 1105.5 899.5 L 1144.5 899.5 L 1144.5 938.5 L 1105.5 938.5 Z M 995.5 899.5 L 1034.5 899.5 L 1034.5 938.5 L 995.5 938.5 Z M 885.5 899.5 L 924.5 899.5 L 924.5 938.5 L 885.5 938.5 Z M 775.5 899.5 L 814.5 899.5 L 814.5 938.5 L 775.5 938.5 Z M 665.5 899.5 L 704.5 899.5 L 704.5 938.5 L 665.5 938.5 Z M 555.5 899.5 L 594.5 899.5 L 594.5 938.5 L 555.5 938.5 Z M 445.5 899.5 L 484.5 899.5 L 484.5 938.5 L 445.5 938.5 Z M 445.5 899.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>
@@ -162,6 +162,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 1569.824219 536.320312 L 1587.191406 561.5 L 1579.449219 561.5 L 1566.050781 541.035156 L 1552.589844 561.5 L 1544.980469 561.5 L 1562.351562 536.320312 L 1546.058594 512.421875 L 1553.664062 512.421875 L 1566.253906 531.675781 L 1578.910156 512.421875 L 1586.382812 512.421875 Z M 1569.824219 536.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1545 562 L 1584 562 M 1545 523 L 1584 523 M 1545 523 L 1545 562 M 1584 523 L 1584 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1545 562 L 1584 562 M 1545 523 L 1584 523 M 1584 562 L 1584 523 M 1545 562 L 1545 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 300 156 L 300 165 M 295 161 L 304 161 M 299 162 L 301 162 M 299 160 L 301 160 M 299 160 L 299 162 M 301 160 L 301 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4/sky130_fd_sc_hs__or4_1.svg b/cells/or4/sky130_fd_sc_hs__or4_1.svg
index 6535009..3310cb7 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_1.svg
+++ b/cells/or4/sky130_fd_sc_hs__or4_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.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 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.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 1091.5 664.5 L 1126.5 664.5 L 1126.5 790.5 L 1091.5 790.5 Z M 689.5 664.5 L 724.5 664.5 L 724.5 790.5 L 689.5 790.5 Z M 788.5 664.5 L 822.5 664.5 L 822.5 790.5 L 788.5 790.5 Z M 956.5 664.5 L 991.5 664.5 L 991.5 790.5 L 956.5 790.5 Z M 1208.5 664.5 L 1243.5 664.5 L 1243.5 833.5 L 1208.5 833.5 Z M 1208.5 664.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 1052.5 240.5 L 1087.5 240.5 L 1087.5 469.5 L 1052.5 469.5 Z M 695.5 240.5 L 729.5 240.5 L 729.5 469.5 L 695.5 469.5 Z M 791.5 240.5 L 826.5 240.5 L 826.5 469.5 L 791.5 469.5 Z M 922.5 240.5 L 956.5 240.5 L 956.5 469.5 L 922.5 469.5 Z M 1211.5 240.5 L 1245.5 240.5 L 1245.5 496.5 L 1211.5 496.5 Z M 1211.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.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>
@@ -160,6 +160,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 983.441406 547.496094 L 983.304688 549.652344 L 982.96875 551.605469 L 982.363281 553.421875 L 981.554688 555.039062 L 980.480469 556.585938 L 979.199219 557.933594 L 977.785156 559.078125 L 976.304688 559.953125 L 974.621094 560.625 L 972.871094 561.164062 L 970.988281 561.433594 L 968.96875 561.5 L 946.820312 561.5 L 946.820312 512.421875 L 966.746094 512.421875 L 969.640625 512.625 L 972.199219 513.097656 L 974.488281 513.902344 L 976.441406 515.046875 L 978.121094 516.53125 L 979.46875 518.347656 L 980.007812 519.355469 L 980.480469 520.433594 L 980.816406 521.445312 L 981.085938 522.589844 L 981.21875 523.734375 L 981.285156 524.878906 L 981.085938 527.300781 L 980.480469 529.386719 L 979.535156 531.339844 L 978.191406 532.957031 L 976.507812 534.4375 L 974.488281 535.582031 L 976.441406 536.457031 L 978.121094 537.398438 L 979.605469 538.476562 L 980.816406 539.6875 L 981.757812 540.96875 L 982.5 542.3125 L 982.769531 543.121094 L 982.96875 543.929688 L 983.171875 544.738281 L 983.304688 545.679688 L 983.375 546.554688 Z M 975.027344 525.753906 L 974.824219 523.734375 L 974.21875 522.050781 L 973.277344 520.570312 L 971.929688 519.492188 L 970.246094 518.683594 L 968.160156 518.144531 L 967.6875 518.144531 L 967.214844 518.078125 L 966.746094 518.011719 L 965.667969 518.011719 L 965.195312 517.941406 L 953.078125 517.941406 L 953.078125 533.5625 L 965.195312 533.5625 L 967.6875 533.425781 L 969.84375 533.023438 L 971.660156 532.28125 L 973.007812 531.273438 L 974.082031 529.925781 L 974.757812 528.3125 L 974.824219 527.972656 L 974.957031 527.167969 L 974.957031 526.222656 Z M 968.359375 555.980469 L 970.246094 555.914062 L 971.929688 555.507812 L 973.410156 554.835938 L 974.621094 553.960938 L 975.632812 552.816406 L 976.441406 551.402344 L 976.640625 550.863281 L 976.777344 550.257812 L 976.976562 549.585938 L 977.046875 548.976562 L 977.113281 548.304688 L 977.179688 547.566406 L 977.046875 546.082031 L 976.777344 544.667969 L 976.304688 543.457031 L 975.632812 542.3125 L 974.757812 541.371094 L 973.746094 540.496094 L 973.007812 540.09375 L 972.199219 539.753906 L 971.324219 539.484375 L 970.378906 539.285156 L 969.371094 539.148438 L 968.359375 539.082031 L 953.078125 539.082031 L 953.078125 555.980469 Z M 968.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 942 562 L 981 562 M 942 523 L 981 523 M 942 523 L 942 562 M 981 523 L 981 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 942 562 L 981 562 M 942 523 L 981 523 M 981 562 L 981 523 M 942 562 L 942 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4/sky130_fd_sc_hs__or4_2.svg b/cells/or4/sky130_fd_sc_hs__or4_2.svg
index dea5529..72d2492 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_2.svg
+++ b/cells/or4/sky130_fd_sc_hs__or4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1173.5 664.5 L 1207.5 664.5 L 1207.5 833.5 L 1173.5 833.5 Z M 750.5 687.5 L 784.5 687.5 L 784.5 833.5 L 750.5 833.5 Z M 651.5 687.5 L 686.5 687.5 L 686.5 833.5 L 651.5 833.5 Z M 1018.5 687.5 L 1052.5 687.5 L 1052.5 833.5 L 1018.5 833.5 Z M 920.5 687.5 L 954.5 687.5 L 954.5 833.5 L 920.5 833.5 Z M 1271.5 664.5 L 1306.5 664.5 L 1306.5 833.5 L 1271.5 833.5 Z M 1271.5 664.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1012.5 240.5 L 1047.5 240.5 L 1047.5 469.5 L 1012.5 469.5 Z M 879.5 240.5 L 914.5 240.5 L 914.5 469.5 L 879.5 469.5 Z M 783.5 240.5 L 818.5 240.5 L 818.5 469.5 L 783.5 469.5 Z M 687.5 240.5 L 721.5 240.5 L 721.5 469.5 L 687.5 469.5 Z M 1146.5 240.5 L 1181.5 240.5 L 1181.5 496.5 L 1146.5 496.5 Z M 1250.5 240.5 L 1284.5 240.5 L 1284.5 496.5 L 1250.5 496.5 Z M 1250.5 240.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -175,6 +175,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 778.730469 282.984375 L 778.796875 280.292969 L 779.066406 277.667969 L 779.539062 275.175781 L 780.144531 272.753906 L 780.953125 270.464844 L 782.03125 268.242188 L 783.714844 265.347656 L 785.800781 262.855469 L 788.15625 260.835938 L 790.847656 259.222656 L 793.8125 258.078125 L 797.175781 257.335938 L 797.785156 257.269531 L 798.457031 257.203125 L 799.0625 257.132812 L 800.410156 257.132812 L 801.148438 257.066406 L 805.457031 257.402344 L 809.226562 258.414062 L 812.460938 260.027344 L 815.152344 262.316406 L 817.304688 265.210938 L 818.988281 268.78125 L 819.394531 270.125 L 819.59375 270.867188 L 819.730469 271.609375 L 819.863281 272.347656 L 820.066406 273.089844 L 813.671875 273.089844 L 812.996094 270.734375 L 812.121094 268.714844 L 811.046875 266.960938 L 809.632812 265.480469 L 808.082031 264.335938 L 806.265625 263.460938 L 805.390625 263.191406 L 804.449219 262.992188 L 803.503906 262.855469 L 802.496094 262.722656 L 801.484375 262.652344 L 800.410156 262.585938 L 798.050781 262.789062 L 795.898438 263.261719 L 793.878906 264 L 792.0625 265.144531 L 790.378906 266.558594 L 788.964844 268.242188 L 787.753906 270.195312 L 786.742188 272.347656 L 785.933594 274.703125 L 785.394531 277.261719 L 785.058594 280.023438 L 784.992188 282.917969 L 785.058594 286.082031 L 785.464844 288.910156 L 786.136719 291.601562 L 787.078125 293.957031 L 788.292969 296.179688 L 789.773438 298.066406 L 791.253906 299.613281 L 792.867188 300.824219 L 794.621094 301.769531 L 796.570312 302.441406 L 798.660156 302.84375 L 800.949219 302.980469 L 803.371094 302.84375 L 805.59375 302.375 L 807.613281 301.566406 L 809.296875 300.421875 L 810.777344 298.941406 L 812.054688 297.121094 L 812.59375 296.046875 L 813.066406 294.832031 L 813.535156 293.554688 L 813.941406 292.140625 L 814.277344 290.660156 L 814.613281 289.042969 L 821.078125 289.042969 L 819.863281 295.035156 L 817.84375 299.882812 L 814.882812 303.652344 L 811.113281 306.347656 L 806.402344 307.894531 L 800.878906 308.5 L 796.976562 308.230469 L 793.476562 307.421875 L 790.3125 306.210938 L 787.484375 304.394531 L 784.992188 302.039062 L 782.90625 299.140625 L 781.695312 297.054688 L 780.683594 294.765625 L 779.875 292.34375 L 779.269531 289.785156 L 778.867188 287.09375 L 778.730469 284.265625 Z M 778.730469 282.984375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 777 816 L 816 816 M 777 777 L 816 777 M 777 777 L 777 816 M 816 777 L 816 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 777 816 L 816 816 M 777 777 L 816 777 M 816 816 L 816 777 M 777 816 L 777 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4/sky130_fd_sc_hs__or4_4.svg b/cells/or4/sky130_fd_sc_hs__or4_4.svg
index 9d97646..565b16c 100644
--- a/cells/or4/sky130_fd_sc_hs__or4_4.svg
+++ b/cells/or4/sky130_fd_sc_hs__or4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 216.5 850.5 L 1701.5 850.5 L 1701.5 904.5 L 216.5 904.5 Z M 216.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="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1353.5 659.5 L 1386.5 659.5 L 1386.5 823.5 L 1353.5 823.5 Z M 325.5 659.5 L 358.5 659.5 L 358.5 823.5 L 325.5 823.5 Z M 420.5 659.5 L 453.5 659.5 L 453.5 823.5 L 420.5 823.5 Z M 530.5 659.5 L 563.5 659.5 L 563.5 823.5 L 530.5 823.5 Z M 697.5 659.5 L 730.5 659.5 L 730.5 823.5 L 697.5 823.5 Z M 834.5 659.5 L 867.5 659.5 L 867.5 823.5 L 834.5 823.5 Z M 929.5 659.5 L 962.5 659.5 L 962.5 823.5 L 929.5 823.5 Z M 1243.5 659.5 L 1276.5 659.5 L 1276.5 823.5 L 1243.5 823.5 Z M 1243.5 659.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1555.5 250.5 L 1588.5 250.5 L 1588.5 471.5 L 1555.5 471.5 Z M 1456.5 250.5 L 1489.5 250.5 L 1489.5 471.5 L 1456.5 471.5 Z M 1246.5 250.5 L 1279.5 250.5 L 1279.5 471.5 L 1246.5 471.5 Z M 833.5 250.5 L 866.5 250.5 L 866.5 471.5 L 833.5 471.5 Z M 1136.5 250.5 L 1169.5 250.5 L 1169.5 471.5 L 1136.5 471.5 Z M 1356.5 250.5 L 1390.5 250.5 L 1390.5 471.5 L 1356.5 471.5 Z M 932.5 250.5 L 965.5 250.5 L 965.5 471.5 L 932.5 471.5 Z M 1032.5 250.5 L 1065.5 250.5 L 1065.5 471.5 L 1032.5 471.5 Z M 510.5 250.5 L 543.5 250.5 L 543.5 498.5 L 510.5 498.5 Z M 411.5 250.5 L 444.5 250.5 L 444.5 498.5 L 411.5 498.5 Z M 311.5 250.5 L 345.5 250.5 L 345.5 498.5 L 311.5 498.5 Z M 610.5 250.5 L 643.5 250.5 L 643.5 498.5 L 610.5 498.5 Z M 610.5 250.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 251.5 150.5 L 288.5 150.5 L 288.5 187.5 L 251.5 187.5 Z M 1629.5 150.5 L 1667.5 150.5 L 1667.5 187.5 L 1629.5 187.5 Z M 1523.5 150.5 L 1561.5 150.5 L 1561.5 187.5 L 1523.5 187.5 Z M 1417.5 150.5 L 1455.5 150.5 L 1455.5 187.5 L 1417.5 187.5 Z M 1311.5 150.5 L 1349.5 150.5 L 1349.5 187.5 L 1311.5 187.5 Z M 1205.5 150.5 L 1243.5 150.5 L 1243.5 187.5 L 1205.5 187.5 Z M 1099.5 150.5 L 1137.5 150.5 L 1137.5 187.5 L 1099.5 187.5 Z M 993.5 150.5 L 1031.5 150.5 L 1031.5 187.5 L 993.5 187.5 Z M 887.5 150.5 L 925.5 150.5 L 925.5 187.5 L 887.5 187.5 Z M 781.5 150.5 L 818.5 150.5 L 818.5 187.5 L 781.5 187.5 Z M 675.5 150.5 L 712.5 150.5 L 712.5 187.5 L 675.5 187.5 Z M 569.5 150.5 L 606.5 150.5 L 606.5 187.5 L 569.5 187.5 Z M 463.5 150.5 L 500.5 150.5 L 500.5 187.5 L 463.5 187.5 Z M 357.5 150.5 L 394.5 150.5 L 394.5 187.5 L 357.5 187.5 Z M 251.5 886.5 L 288.5 886.5 L 288.5 923.5 L 251.5 923.5 Z M 1629.5 886.5 L 1667.5 886.5 L 1667.5 923.5 L 1629.5 923.5 Z M 1523.5 886.5 L 1561.5 886.5 L 1561.5 923.5 L 1523.5 923.5 Z M 1417.5 886.5 L 1455.5 886.5 L 1455.5 923.5 L 1417.5 923.5 Z M 1311.5 886.5 L 1349.5 886.5 L 1349.5 923.5 L 1311.5 923.5 Z M 1205.5 886.5 L 1243.5 886.5 L 1243.5 923.5 L 1205.5 923.5 Z M 1099.5 886.5 L 1137.5 886.5 L 1137.5 923.5 L 1099.5 923.5 Z M 993.5 886.5 L 1031.5 886.5 L 1031.5 923.5 L 993.5 923.5 Z M 887.5 886.5 L 925.5 886.5 L 925.5 923.5 L 887.5 923.5 Z M 781.5 886.5 L 818.5 886.5 L 818.5 923.5 L 781.5 923.5 Z M 675.5 886.5 L 712.5 886.5 L 712.5 923.5 L 675.5 923.5 Z M 569.5 886.5 L 606.5 886.5 L 606.5 923.5 L 569.5 923.5 Z M 463.5 886.5 L 500.5 886.5 L 500.5 923.5 L 463.5 923.5 Z M 357.5 886.5 L 394.5 886.5 L 394.5 923.5 L 357.5 923.5 Z M 357.5 886.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface325">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -175,6 +175,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 1022.082031 546.371094 L 1003.953125 546.371094 L 998.984375 560.5 L 992.597656 560.5 L 1009.371094 513.46875 L 1017.113281 513.46875 L 1033.628906 560.5 L 1026.917969 560.5 Z M 1020.402344 541.339844 L 1013.175781 519.917969 L 1005.433594 541.339844 Z M 1020.402344 541.339844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 993 561 L 1031 561 M 993 524 L 1031 524 M 993 524 L 993 561 M 1031 524 L 1031 561 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 993 561 L 1031 561 M 993 524 L 1031 524 M 1031 561 L 1031 524 M 993 561 L 993 524 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 216 170 L 216 179 M 211 175 L 220 175 M 215 176 L 217 176 M 215 174 L 217 174 M 215 174 L 215 176 M 217 174 L 217 176 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_1.svg b/cells/or4b/sky130_fd_sc_hs__or4b_1.svg
index 5bdbcdc..83807eb 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_1.svg
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1317.5 664.5 L 1352.5 664.5 L 1352.5 833.5 L 1317.5 833.5 Z M 694.5 707.5 L 728.5 707.5 L 728.5 833.5 L 694.5 833.5 Z M 1169.5 707.5 L 1204.5 707.5 L 1204.5 833.5 L 1169.5 833.5 Z M 1071.5 707.5 L 1105.5 707.5 L 1105.5 833.5 L 1071.5 833.5 Z M 940.5 707.5 L 975.5 707.5 L 975.5 833.5 L 940.5 833.5 Z M 563.5 707.5 L 598.5 707.5 L 598.5 833.5 L 563.5 833.5 Z M 563.5 707.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 567.5 240.5 L 601.5 240.5 L 601.5 432.5 L 567.5 432.5 Z M 840.5 267.5 L 875.5 267.5 L 875.5 496.5 L 840.5 496.5 Z M 1157.5 267.5 L 1191.5 267.5 L 1191.5 496.5 L 1157.5 496.5 Z M 1033.5 267.5 L 1067.5 267.5 L 1067.5 496.5 L 1033.5 496.5 Z M 937.5 267.5 L 971.5 267.5 L 971.5 496.5 L 937.5 496.5 Z M 1315.5 240.5 L 1349.5 240.5 L 1349.5 496.5 L 1315.5 496.5 Z M 1315.5 240.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,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 1406.824219 282.320312 L 1424.191406 307.5 L 1416.449219 307.5 L 1403.050781 287.035156 L 1389.589844 307.5 L 1381.980469 307.5 L 1399.351562 282.320312 L 1383.058594 258.421875 L 1390.664062 258.421875 L 1403.253906 277.675781 L 1415.910156 258.421875 L 1423.382812 258.421875 Z M 1406.824219 282.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1382 816 L 1421 816 M 1382 777 L 1421 777 M 1382 777 L 1382 816 M 1421 777 L 1421 816 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1382 816 L 1421 816 M 1382 777 L 1421 777 M 1421 816 L 1421 777 M 1382 816 L 1382 777 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_2.svg b/cells/or4b/sky130_fd_sc_hs__or4b_2.svg
index e54b1ca..34bb0ae 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_2.svg
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 538.5 L 423.5 538.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 467.5 862.5 L 1457.5 862.5 L 1457.5 918.5 L 467.5 918.5 Z M 467.5 862.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="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 567.5 664.5 L 601.5 664.5 L 601.5 790.5 L 567.5 790.5 Z M 1054.5 664.5 L 1088.5 664.5 L 1088.5 810.5 L 1054.5 810.5 Z M 1201.5 664.5 L 1236.5 664.5 L 1236.5 810.5 L 1201.5 810.5 Z M 918.5 664.5 L 953.5 664.5 L 953.5 810.5 L 918.5 810.5 Z M 1310.5 664.5 L 1345.5 664.5 L 1345.5 810.5 L 1310.5 810.5 Z M 685.5 664.5 L 719.5 664.5 L 719.5 833.5 L 685.5 833.5 Z M 783.5 664.5 L 818.5 664.5 L 818.5 833.5 L 783.5 833.5 Z M 783.5 664.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1164.5 240.5 L 1198.5 240.5 L 1198.5 469.5 L 1164.5 469.5 Z M 950.5 240.5 L 985.5 240.5 L 985.5 469.5 L 950.5 469.5 Z M 1047.5 240.5 L 1081.5 240.5 L 1081.5 469.5 L 1047.5 469.5 Z M 1287.5 240.5 L 1322.5 240.5 L 1322.5 469.5 L 1287.5 469.5 Z M 688.5 240.5 L 722.5 240.5 L 722.5 496.5 L 688.5 496.5 Z M 565.5 304.5 L 600.5 304.5 L 600.5 496.5 L 565.5 496.5 Z M 791.5 240.5 L 826.5 240.5 L 826.5 496.5 L 791.5 496.5 Z M 791.5 240.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 502.5 136.5 L 541.5 136.5 L 541.5 174.5 L 502.5 174.5 Z M 1382.5 136.5 L 1421.5 136.5 L 1421.5 174.5 L 1382.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 502.5 899.5 L 541.5 899.5 L 541.5 938.5 L 502.5 938.5 Z M 1382.5 899.5 L 1421.5 899.5 L 1421.5 938.5 L 1382.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 612.5 899.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -168,6 +168,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 746.824219 451.320312 L 764.191406 476.5 L 756.449219 476.5 L 743.050781 456.035156 L 729.589844 476.5 L 721.980469 476.5 L 739.351562 451.320312 L 723.058594 427.421875 L 730.664062 427.421875 L 743.253906 446.675781 L 755.910156 427.421875 L 763.382812 427.421875 Z M 746.824219 451.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 722 647 L 761 647 M 722 608 L 761 608 M 722 608 L 722 647 M 761 608 L 761 647 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 722 647 L 761 647 M 722 608 L 761 608 M 761 647 L 761 608 M 722 647 L 722 608 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 467 156 L 467 165 M 462 161 L 471 161 M 466 162 L 468 162 M 466 160 L 468 160 M 466 160 L 466 162 M 468 160 L 468 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4b/sky130_fd_sc_hs__or4b_4.svg b/cells/or4b/sky130_fd_sc_hs__or4b_4.svg
index fa79532..6845540 100644
--- a/cells/or4b/sky130_fd_sc_hs__or4b_4.svg
+++ b/cells/or4b/sky130_fd_sc_hs__or4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 214.5 830.5 L 1705.5 830.5 L 1705.5 881.5 L 214.5 881.5 Z M 214.5 830.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1170.5 651.5 L 1202.5 651.5 L 1202.5 784.5 L 1170.5 784.5 Z M 301.5 651.5 L 332.5 651.5 L 332.5 804.5 L 301.5 804.5 Z M 419.5 651.5 L 450.5 651.5 L 450.5 804.5 L 419.5 804.5 Z M 679.5 651.5 L 710.5 651.5 L 710.5 804.5 L 679.5 804.5 Z M 797.5 651.5 L 828.5 651.5 L 828.5 804.5 L 797.5 804.5 Z M 1498.5 651.5 L 1529.5 651.5 L 1529.5 804.5 L 1498.5 804.5 Z M 1279.5 651.5 L 1310.5 651.5 L 1310.5 804.5 L 1279.5 804.5 Z M 1394.5 651.5 L 1425.5 651.5 L 1425.5 804.5 L 1394.5 804.5 Z M 1587.5 651.5 L 1618.5 651.5 L 1618.5 804.5 L 1587.5 804.5 Z M 1587.5 651.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 303.5 268.5 L 334.5 268.5 L 334.5 475.5 L 303.5 475.5 Z M 396.5 268.5 L 427.5 268.5 L 427.5 475.5 L 396.5 475.5 Z M 593.5 268.5 L 624.5 268.5 L 624.5 475.5 L 593.5 475.5 Z M 986.5 268.5 L 1017.5 268.5 L 1017.5 475.5 L 986.5 475.5 Z M 696.5 268.5 L 727.5 268.5 L 727.5 475.5 L 696.5 475.5 Z M 489.5 268.5 L 520.5 268.5 L 520.5 475.5 L 489.5 475.5 Z M 800.5 268.5 L 831.5 268.5 L 831.5 475.5 L 800.5 475.5 Z M 893.5 268.5 L 924.5 268.5 L 924.5 475.5 L 893.5 475.5 Z M 1586.5 268.5 L 1617.5 268.5 L 1617.5 500.5 L 1586.5 500.5 Z M 1399.5 268.5 L 1430.5 268.5 L 1430.5 500.5 L 1399.5 500.5 Z M 1492.5 268.5 L 1524.5 268.5 L 1524.5 500.5 L 1492.5 500.5 Z M 1195.5 293.5 L 1226.5 293.5 L 1226.5 500.5 L 1195.5 500.5 Z M 1306.5 268.5 L 1337.5 268.5 L 1337.5 500.5 L 1306.5 500.5 Z M 1306.5 268.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 246.5 174.5 L 281.5 174.5 L 281.5 209.5 L 246.5 209.5 Z M 1637.5 174.5 L 1673.5 174.5 L 1673.5 209.5 L 1637.5 209.5 Z M 1538.5 174.5 L 1573.5 174.5 L 1573.5 209.5 L 1538.5 209.5 Z M 1439.5 174.5 L 1474.5 174.5 L 1474.5 209.5 L 1439.5 209.5 Z M 1339.5 174.5 L 1374.5 174.5 L 1374.5 209.5 L 1339.5 209.5 Z M 1240.5 174.5 L 1275.5 174.5 L 1275.5 209.5 L 1240.5 209.5 Z M 1140.5 174.5 L 1176.5 174.5 L 1176.5 209.5 L 1140.5 209.5 Z M 1041.5 174.5 L 1076.5 174.5 L 1076.5 209.5 L 1041.5 209.5 Z M 942.5 174.5 L 977.5 174.5 L 977.5 209.5 L 942.5 209.5 Z M 842.5 174.5 L 877.5 174.5 L 877.5 209.5 L 842.5 209.5 Z M 743.5 174.5 L 778.5 174.5 L 778.5 209.5 L 743.5 209.5 Z M 643.5 174.5 L 679.5 174.5 L 679.5 209.5 L 643.5 209.5 Z M 544.5 174.5 L 579.5 174.5 L 579.5 209.5 L 544.5 209.5 Z M 445.5 174.5 L 480.5 174.5 L 480.5 209.5 L 445.5 209.5 Z M 345.5 174.5 L 380.5 174.5 L 380.5 209.5 L 345.5 209.5 Z M 1041.5 595.5 L 1076.5 595.5 L 1076.5 620.5 L 1041.5 620.5 Z M 1041.5 620.5 L 1076.5 620.5 L 1076.5 630.5 L 1041.5 630.5 Z M 743.5 595.5 L 778.5 595.5 L 778.5 630.5 L 743.5 630.5 Z M 246.5 863.5 L 281.5 863.5 L 281.5 899.5 L 246.5 899.5 Z M 1637.5 863.5 L 1673.5 863.5 L 1673.5 899.5 L 1637.5 899.5 Z M 1538.5 863.5 L 1573.5 863.5 L 1573.5 899.5 L 1538.5 899.5 Z M 1439.5 863.5 L 1474.5 863.5 L 1474.5 899.5 L 1439.5 899.5 Z M 1339.5 863.5 L 1374.5 863.5 L 1374.5 899.5 L 1339.5 899.5 Z M 1240.5 863.5 L 1275.5 863.5 L 1275.5 899.5 L 1240.5 899.5 Z M 1140.5 863.5 L 1176.5 863.5 L 1176.5 899.5 L 1140.5 899.5 Z M 1041.5 863.5 L 1076.5 863.5 L 1076.5 899.5 L 1041.5 899.5 Z M 942.5 863.5 L 977.5 863.5 L 977.5 899.5 L 942.5 899.5 Z M 842.5 863.5 L 877.5 863.5 L 877.5 899.5 L 842.5 899.5 Z M 743.5 863.5 L 778.5 863.5 L 778.5 899.5 L 743.5 899.5 Z M 643.5 863.5 L 679.5 863.5 L 679.5 899.5 L 643.5 899.5 Z M 544.5 863.5 L 579.5 863.5 L 579.5 899.5 L 544.5 899.5 Z M 445.5 863.5 L 480.5 863.5 L 480.5 899.5 L 445.5 899.5 Z M 345.5 863.5 L 380.5 863.5 L 380.5 899.5 L 345.5 899.5 Z M 345.5 863.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface334">
+<g id="surface363">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,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 1219.109375 589.652344 L 1219.109375 634.640625 L 1212.628906 634.640625 L 1189.363281 598.167969 L 1189.363281 634.640625 L 1183.933594 634.640625 L 1183.933594 589.652344 L 1190.167969 589.652344 L 1213.679688 626.429688 L 1213.679688 589.652344 Z M 1219.109375 589.652344 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1140 484 L 1176 484 M 1140 449 L 1176 449 M 1140 449 L 1140 484 M 1176 449 L 1176 484 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1140 484 L 1176 484 M 1140 449 L 1176 449 M 1176 484 L 1176 449 M 1140 484 L 1140 449 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 214 193 L 214 202 M 209 198 L 218 198 M 213 199 L 215 199 M 213 197 L 215 197 M 213 197 L 213 199 M 215 197 L 215 199 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_1.svg b/cells/or4bb/sky130_fd_sc_hs__or4bb_1.svg
index 74e678a..4ebebb4 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_1.svg
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1378.5 664.5 L 1412.5 664.5 L 1412.5 833.5 L 1378.5 833.5 Z M 643.5 707.5 L 678.5 707.5 L 678.5 833.5 L 643.5 833.5 Z M 1239.5 707.5 L 1274.5 707.5 L 1274.5 833.5 L 1239.5 833.5 Z M 1125.5 707.5 L 1159.5 707.5 L 1159.5 833.5 L 1125.5 833.5 Z M 995.5 707.5 L 1030.5 707.5 L 1030.5 833.5 L 995.5 833.5 Z M 884.5 707.5 L 918.5 707.5 L 918.5 833.5 L 884.5 833.5 Z M 513.5 707.5 L 547.5 707.5 L 547.5 833.5 L 513.5 833.5 Z M 513.5 707.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 509.5 240.5 L 544.5 240.5 L 544.5 432.5 L 509.5 432.5 Z M 624.5 240.5 L 658.5 240.5 L 658.5 432.5 L 624.5 432.5 Z M 984.5 256.5 L 1018.5 256.5 L 1018.5 485.5 L 984.5 485.5 Z M 1094.5 256.5 L 1128.5 256.5 L 1128.5 485.5 L 1094.5 485.5 Z M 887.5 256.5 L 922.5 256.5 L 922.5 485.5 L 887.5 485.5 Z M 1217.5 256.5 L 1252.5 256.5 L 1252.5 485.5 L 1217.5 485.5 Z M 1352.5 240.5 L 1386.5 240.5 L 1386.5 496.5 L 1352.5 496.5 Z M 1352.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -170,6 +170,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 1460.824219 706.320312 L 1478.191406 731.5 L 1470.449219 731.5 L 1457.050781 711.035156 L 1443.589844 731.5 L 1435.980469 731.5 L 1453.351562 706.320312 L 1437.058594 682.421875 L 1444.664062 682.421875 L 1457.253906 701.675781 L 1469.910156 682.421875 L 1477.382812 682.421875 Z M 1460.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1436 392 L 1475 392 M 1436 353 L 1475 353 M 1436 353 L 1436 392 M 1475 353 L 1475 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1436 392 L 1475 392 M 1436 353 L 1475 353 M 1475 392 L 1475 353 M 1436 392 L 1436 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_2.svg b/cells/or4bb/sky130_fd_sc_hs__or4bb_2.svg
index c963eac..9deb27b 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_2.svg
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 508.5 634.5 L 543.5 634.5 L 543.5 760.5 L 508.5 760.5 Z M 1162.5 616.5 L 1197.5 616.5 L 1197.5 762.5 L 1162.5 762.5 Z M 1039.5 616.5 L 1073.5 616.5 L 1073.5 762.5 L 1039.5 762.5 Z M 1263.5 616.5 L 1298.5 616.5 L 1298.5 762.5 L 1263.5 762.5 Z M 893.5 634.5 L 928.5 634.5 L 928.5 781.5 L 893.5 781.5 Z M 725.5 634.5 L 759.5 634.5 L 759.5 804.5 L 725.5 804.5 Z M 626.5 634.5 L 661.5 634.5 L 661.5 804.5 L 626.5 804.5 Z M 1380.5 688.5 L 1415.5 688.5 L 1415.5 814.5 L 1380.5 814.5 Z M 1380.5 688.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 507.5 240.5 L 541.5 240.5 L 541.5 432.5 L 507.5 432.5 Z M 953.5 240.5 L 987.5 240.5 L 987.5 469.5 L 953.5 469.5 Z M 1255.5 240.5 L 1290.5 240.5 L 1290.5 469.5 L 1255.5 469.5 Z M 1379.5 276.5 L 1413.5 276.5 L 1413.5 469.5 L 1379.5 469.5 Z M 1049.5 240.5 L 1083.5 240.5 L 1083.5 469.5 L 1049.5 469.5 Z M 1166.5 240.5 L 1200.5 240.5 L 1200.5 469.5 L 1166.5 469.5 Z M 623.5 240.5 L 657.5 240.5 L 657.5 496.5 L 623.5 496.5 Z M 726.5 240.5 L 760.5 240.5 L 760.5 496.5 L 726.5 496.5 Z M 726.5 240.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1246.410156 546.757812 L 1227.492188 546.757812 L 1222.308594 561.5 L 1215.644531 561.5 L 1233.148438 512.421875 L 1241.226562 512.421875 L 1258.460938 561.5 L 1251.460938 561.5 Z M 1244.660156 541.503906 L 1237.121094 519.15625 L 1229.042969 541.503906 Z M 1244.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1216 562 L 1255 562 M 1216 523 L 1255 523 M 1216 523 L 1216 562 M 1255 523 L 1255 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1216 562 L 1255 562 M 1216 523 L 1255 523 M 1255 562 L 1255 523 M 1216 562 L 1216 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/or4bb/sky130_fd_sc_hs__or4bb_4.svg b/cells/or4bb/sky130_fd_sc_hs__or4bb_4.svg
index b121463..73f93f0 100644
--- a/cells/or4bb/sky130_fd_sc_hs__or4bb_4.svg
+++ b/cells/or4bb/sky130_fd_sc_hs__or4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.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 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.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 786.5 632.5 L 813.5 632.5 L 813.5 743.5 L 786.5 743.5 Z M 280.5 632.5 L 306.5 632.5 L 306.5 743.5 L 280.5 743.5 Z M 380.5 632.5 L 406.5 632.5 L 406.5 761.5 L 380.5 761.5 Z M 455.5 632.5 L 481.5 632.5 L 481.5 761.5 L 455.5 761.5 Z M 558.5 632.5 L 584.5 632.5 L 584.5 761.5 L 558.5 761.5 Z M 698.5 632.5 L 724.5 632.5 L 724.5 761.5 L 698.5 761.5 Z M 1515.5 632.5 L 1541.5 632.5 L 1541.5 761.5 L 1515.5 761.5 Z M 1018.5 632.5 L 1044.5 632.5 L 1044.5 761.5 L 1018.5 761.5 Z M 1295.5 632.5 L 1321.5 632.5 L 1321.5 761.5 L 1295.5 761.5 Z M 1408.5 632.5 L 1434.5 632.5 L 1434.5 761.5 L 1408.5 761.5 Z M 1408.5 632.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 1444.5 310.5 L 1470.5 310.5 L 1470.5 484.5 L 1444.5 484.5 Z M 1025.5 310.5 L 1051.5 310.5 L 1051.5 484.5 L 1025.5 484.5 Z M 1103.5 310.5 L 1129.5 310.5 L 1129.5 484.5 L 1103.5 484.5 Z M 1190.5 310.5 L 1216.5 310.5 L 1216.5 484.5 L 1190.5 484.5 Z M 1366.5 310.5 L 1392.5 310.5 L 1392.5 484.5 L 1366.5 484.5 Z M 1609.5 310.5 L 1635.5 310.5 L 1635.5 484.5 L 1609.5 484.5 Z M 1522.5 310.5 L 1548.5 310.5 L 1548.5 484.5 L 1522.5 484.5 Z M 946.5 310.5 L 973.5 310.5 L 973.5 484.5 L 946.5 484.5 Z M 378.5 310.5 L 404.5 310.5 L 404.5 505.5 L 378.5 505.5 Z M 678.5 310.5 L 704.5 310.5 L 704.5 505.5 L 678.5 505.5 Z M 456.5 310.5 L 482.5 310.5 L 482.5 505.5 L 456.5 505.5 Z M 771.5 331.5 L 797.5 331.5 L 797.5 505.5 L 771.5 505.5 Z M 551.5 310.5 L 577.5 310.5 L 577.5 505.5 L 551.5 505.5 Z M 282.5 331.5 L 308.5 331.5 L 308.5 505.5 L 282.5 505.5 Z M 282.5 331.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.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>
@@ -170,6 +170,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1433.957031 543.996094 L 1433.855469 545.613281 L 1433.601562 547.078125 L 1433.148438 548.441406 L 1432.542969 549.652344 L 1431.734375 550.8125 L 1430.773438 551.824219 L 1429.714844 552.683594 L 1428.605469 553.339844 L 1427.339844 553.84375 L 1426.027344 554.246094 L 1424.613281 554.449219 L 1423.101562 554.5 L 1406.488281 554.5 L 1406.488281 517.691406 L 1421.433594 517.691406 L 1423.605469 517.84375 L 1425.523438 518.195312 L 1427.242188 518.804688 L 1428.703125 519.660156 L 1429.96875 520.773438 L 1430.976562 522.136719 L 1431.378906 522.894531 L 1431.734375 523.699219 L 1431.988281 524.457031 L 1432.1875 525.316406 L 1432.289062 526.175781 L 1432.339844 527.03125 L 1432.1875 528.851562 L 1431.734375 530.414062 L 1431.027344 531.878906 L 1430.015625 533.09375 L 1428.753906 534.203125 L 1427.242188 535.0625 L 1428.703125 535.71875 L 1429.96875 536.425781 L 1431.078125 537.230469 L 1431.988281 538.140625 L 1432.695312 539.101562 L 1433.25 540.109375 L 1433.449219 540.714844 L 1433.601562 541.320312 L 1433.753906 541.929688 L 1433.855469 542.632812 L 1433.90625 543.292969 Z M 1427.644531 527.6875 L 1427.492188 526.175781 L 1427.039062 524.914062 L 1426.332031 523.800781 L 1425.320312 522.992188 L 1424.058594 522.386719 L 1422.496094 521.984375 L 1422.140625 521.984375 L 1421.789062 521.933594 L 1421.433594 521.882812 L 1420.625 521.882812 L 1420.273438 521.832031 L 1411.183594 521.832031 L 1411.183594 533.546875 L 1420.273438 533.546875 L 1422.140625 533.445312 L 1423.757812 533.140625 L 1425.121094 532.585938 L 1426.128906 531.828125 L 1426.9375 530.820312 L 1427.441406 529.609375 L 1427.492188 529.355469 L 1427.542969 529.050781 L 1427.59375 528.75 L 1427.59375 528.042969 Z M 1422.644531 550.359375 L 1424.058594 550.308594 L 1425.320312 550.007812 L 1426.433594 549.5 L 1427.339844 548.84375 L 1428.097656 547.988281 L 1428.703125 546.925781 L 1428.855469 546.523438 L 1428.957031 546.066406 L 1429.109375 545.5625 L 1429.160156 545.109375 L 1429.210938 544.605469 L 1429.261719 544.046875 L 1429.160156 542.9375 L 1428.957031 541.878906 L 1428.605469 540.96875 L 1428.097656 540.109375 L 1427.441406 539.402344 L 1426.683594 538.746094 L 1426.128906 538.445312 L 1425.523438 538.191406 L 1424.867188 537.988281 L 1424.160156 537.839844 L 1423.402344 537.738281 L 1422.644531 537.6875 L 1411.183594 537.6875 L 1411.183594 550.359375 Z M 1422.644531 550.359375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1403 558 L 1433 558 M 1403 529 L 1433 529 M 1403 529 L 1403 558 M 1433 529 L 1433 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1403 558 L 1433 558 M 1403 529 L 1433 529 M 1433 558 L 1433 529 M 1403 558 L 1403 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.svg b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.svg
index 92fb594..99ebe3d 100644
--- a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.svg
+++ b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 364.5 L 1743.5 364.5 L 1743.5 534.5 L 174.5 534.5 Z M 1417.5 534.5 L 1589.5 534.5 L 1589.5 544.5 L 1417.5 544.5 Z M 1417.5 534.5 "/>
 </clipPath>
-<image id="image371" 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="#image371"/>
+  <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 191.5 664.5 L 1726.5 664.5 L 1726.5 686.5 L 191.5 686.5 Z M 191.5 664.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#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 1467.5 585.5 L 1480.5 585.5 L 1480.5 623.5 L 1467.5 623.5 Z M 1070.5 581.5 L 1084.5 581.5 L 1084.5 632.5 L 1070.5 632.5 Z M 232.5 593.5 L 246.5 593.5 L 246.5 632.5 L 232.5 632.5 Z M 928.5 581.5 L 942.5 581.5 L 942.5 632.5 L 928.5 632.5 Z M 317.5 593.5 L 331.5 593.5 L 331.5 632.5 L 317.5 632.5 Z M 353.5 593.5 L 366.5 593.5 L 366.5 632.5 L 353.5 632.5 Z M 429.5 593.5 L 443.5 593.5 L 443.5 632.5 L 429.5 632.5 Z M 776.5 593.5 L 789.5 593.5 L 789.5 632.5 L 776.5 632.5 Z M 736.5 593.5 L 750.5 593.5 L 750.5 632.5 L 736.5 632.5 Z M 703.5 593.5 L 717.5 593.5 L 717.5 632.5 L 703.5 632.5 Z M 1166.5 593.5 L 1180.5 593.5 L 1180.5 632.5 L 1166.5 632.5 Z M 1035.5 581.5 L 1048.5 581.5 L 1048.5 632.5 L 1035.5 632.5 Z M 880.5 581.5 L 893.5 581.5 L 893.5 632.5 L 880.5 632.5 Z M 268.5 593.5 L 281.5 593.5 L 281.5 632.5 L 268.5 632.5 Z M 983.5 581.5 L 997.5 581.5 L 997.5 632.5 L 983.5 632.5 Z M 1215.5 593.5 L 1229.5 593.5 L 1229.5 632.5 L 1215.5 632.5 Z M 520.5 581.5 L 534.5 581.5 L 534.5 648.5 L 520.5 648.5 Z M 574.5 581.5 L 587.5 581.5 L 587.5 648.5 L 574.5 648.5 Z M 1270.5 585.5 L 1284.5 585.5 L 1284.5 652.5 L 1270.5 652.5 Z M 1672.5 585.5 L 1686.5 585.5 L 1686.5 652.5 L 1672.5 652.5 Z M 1309.5 585.5 L 1323.5 585.5 L 1323.5 652.5 L 1309.5 652.5 Z M 1626.5 602.5 L 1639.5 602.5 L 1639.5 652.5 L 1626.5 652.5 Z M 1358.5 585.5 L 1372.5 585.5 L 1372.5 652.5 L 1358.5 652.5 Z M 1535.5 585.5 L 1549.5 585.5 L 1549.5 652.5 L 1535.5 652.5 Z M 1535.5 585.5 "/>
 </clipPath>
-<image id="image372" 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="#image372"/>
+  <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 1167.5 416.5 L 1181.5 416.5 L 1181.5 454.5 L 1167.5 454.5 Z M 1131.5 416.5 L 1145.5 416.5 L 1145.5 454.5 L 1131.5 454.5 Z M 707.5 421.5 L 721.5 421.5 L 721.5 459.5 L 707.5 459.5 Z M 671.5 421.5 L 685.5 421.5 L 685.5 459.5 L 671.5 459.5 Z M 446.5 416.5 L 460.5 416.5 L 460.5 474.5 L 446.5 474.5 Z M 354.5 416.5 L 368.5 416.5 L 368.5 474.5 L 354.5 474.5 Z M 313.5 416.5 L 327.5 416.5 L 327.5 474.5 L 313.5 474.5 Z M 275.5 416.5 L 288.5 416.5 L 288.5 474.5 L 275.5 474.5 Z M 231.5 416.5 L 244.5 416.5 L 244.5 474.5 L 231.5 474.5 Z M 1458.5 416.5 L 1472.5 416.5 L 1472.5 474.5 L 1458.5 474.5 Z M 756.5 421.5 L 770.5 421.5 L 770.5 479.5 L 756.5 479.5 Z M 1083.5 416.5 L 1096.5 416.5 L 1096.5 492.5 L 1083.5 492.5 Z M 1047.5 416.5 L 1061.5 416.5 L 1061.5 492.5 L 1047.5 492.5 Z M 955.5 416.5 L 969.5 416.5 L 969.5 492.5 L 955.5 492.5 Z M 914.5 416.5 L 928.5 416.5 L 928.5 492.5 L 914.5 492.5 Z M 876.5 416.5 L 889.5 416.5 L 889.5 492.5 L 876.5 492.5 Z M 1324.5 416.5 L 1337.5 416.5 L 1337.5 507.5 L 1324.5 507.5 Z M 1362.5 416.5 L 1376.5 416.5 L 1376.5 507.5 L 1362.5 507.5 Z M 1267.5 416.5 L 1281.5 416.5 L 1281.5 507.5 L 1267.5 507.5 Z M 1624.5 434.5 L 1638.5 434.5 L 1638.5 511.5 L 1624.5 511.5 Z M 538.5 416.5 L 552.5 416.5 L 552.5 518.5 L 538.5 518.5 Z M 579.5 416.5 L 593.5 416.5 L 593.5 518.5 L 579.5 518.5 Z M 1532.5 416.5 L 1546.5 416.5 L 1546.5 518.5 L 1532.5 518.5 Z M 1673.5 416.5 L 1687.5 416.5 L 1687.5 518.5 L 1673.5 518.5 Z M 1673.5 416.5 "/>
 </clipPath>
-<image id="image373" 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="#image373"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 206.5 374.5 L 221.5 374.5 L 221.5 390.5 L 206.5 390.5 Z M 1696.5 374.5 L 1712.5 374.5 L 1712.5 390.5 L 1696.5 390.5 Z M 1652.5 374.5 L 1668.5 374.5 L 1668.5 390.5 L 1652.5 390.5 Z M 1609.5 374.5 L 1624.5 374.5 L 1624.5 390.5 L 1609.5 390.5 Z M 1565.5 374.5 L 1580.5 374.5 L 1580.5 390.5 L 1565.5 390.5 Z M 1521.5 374.5 L 1536.5 374.5 L 1536.5 390.5 L 1521.5 390.5 Z M 1477.5 374.5 L 1493.5 374.5 L 1493.5 390.5 L 1477.5 390.5 Z M 1433.5 374.5 L 1449.5 374.5 L 1449.5 390.5 L 1433.5 390.5 Z M 1389.5 374.5 L 1405.5 374.5 L 1405.5 390.5 L 1389.5 390.5 Z M 1346.5 374.5 L 1361.5 374.5 L 1361.5 390.5 L 1346.5 390.5 Z M 1302.5 374.5 L 1317.5 374.5 L 1317.5 390.5 L 1302.5 390.5 Z M 1258.5 374.5 L 1273.5 374.5 L 1273.5 390.5 L 1258.5 390.5 Z M 1214.5 374.5 L 1230.5 374.5 L 1230.5 390.5 L 1214.5 390.5 Z M 1170.5 374.5 L 1186.5 374.5 L 1186.5 390.5 L 1170.5 390.5 Z M 1126.5 374.5 L 1142.5 374.5 L 1142.5 390.5 L 1126.5 390.5 Z M 1083.5 374.5 L 1098.5 374.5 L 1098.5 390.5 L 1083.5 390.5 Z M 1039.5 374.5 L 1054.5 374.5 L 1054.5 390.5 L 1039.5 390.5 Z M 995.5 374.5 L 1010.5 374.5 L 1010.5 390.5 L 995.5 390.5 Z M 951.5 374.5 L 967.5 374.5 L 967.5 390.5 L 951.5 390.5 Z M 907.5 374.5 L 923.5 374.5 L 923.5 390.5 L 907.5 390.5 Z M 863.5 374.5 L 879.5 374.5 L 879.5 390.5 L 863.5 390.5 Z M 819.5 374.5 L 835.5 374.5 L 835.5 390.5 L 819.5 390.5 Z M 776.5 374.5 L 791.5 374.5 L 791.5 390.5 L 776.5 390.5 Z M 732.5 374.5 L 747.5 374.5 L 747.5 390.5 L 732.5 390.5 Z M 688.5 374.5 L 703.5 374.5 L 703.5 390.5 L 688.5 390.5 Z M 644.5 374.5 L 660.5 374.5 L 660.5 390.5 L 644.5 390.5 Z M 600.5 374.5 L 616.5 374.5 L 616.5 390.5 L 600.5 390.5 Z M 556.5 374.5 L 572.5 374.5 L 572.5 390.5 L 556.5 390.5 Z M 513.5 374.5 L 528.5 374.5 L 528.5 390.5 L 513.5 390.5 Z M 469.5 374.5 L 484.5 374.5 L 484.5 390.5 L 469.5 390.5 Z M 425.5 374.5 L 440.5 374.5 L 440.5 390.5 L 425.5 390.5 Z M 381.5 374.5 L 397.5 374.5 L 397.5 390.5 L 381.5 390.5 Z M 337.5 374.5 L 353.5 374.5 L 353.5 390.5 L 337.5 390.5 Z M 293.5 374.5 L 309.5 374.5 L 309.5 390.5 L 293.5 390.5 Z M 249.5 374.5 L 265.5 374.5 L 265.5 390.5 L 249.5 390.5 Z M 951.5 492.5 L 967.5 492.5 L 967.5 508.5 L 951.5 508.5 Z M 1258.5 492.5 L 1273.5 492.5 L 1273.5 508.5 L 1258.5 508.5 Z M 1083.5 526.5 L 1098.5 526.5 L 1098.5 532.5 L 1083.5 532.5 Z M 688.5 526.5 L 703.5 526.5 L 703.5 535.5 L 688.5 535.5 Z M 1083.5 532.5 L 1098.5 532.5 L 1098.5 542.5 L 1083.5 542.5 Z M 688.5 535.5 L 703.5 535.5 L 703.5 542.5 L 688.5 542.5 Z M 206.5 678.5 L 221.5 678.5 L 221.5 694.5 L 206.5 694.5 Z M 1696.5 678.5 L 1712.5 678.5 L 1712.5 694.5 L 1696.5 694.5 Z M 1652.5 678.5 L 1668.5 678.5 L 1668.5 694.5 L 1652.5 694.5 Z M 1609.5 678.5 L 1624.5 678.5 L 1624.5 694.5 L 1609.5 694.5 Z M 1565.5 678.5 L 1580.5 678.5 L 1580.5 694.5 L 1565.5 694.5 Z M 1521.5 678.5 L 1536.5 678.5 L 1536.5 694.5 L 1521.5 694.5 Z M 1477.5 678.5 L 1493.5 678.5 L 1493.5 694.5 L 1477.5 694.5 Z M 1433.5 678.5 L 1449.5 678.5 L 1449.5 694.5 L 1433.5 694.5 Z M 1389.5 678.5 L 1405.5 678.5 L 1405.5 694.5 L 1389.5 694.5 Z M 1346.5 678.5 L 1361.5 678.5 L 1361.5 694.5 L 1346.5 694.5 Z M 1302.5 678.5 L 1317.5 678.5 L 1317.5 694.5 L 1302.5 694.5 Z M 1258.5 678.5 L 1273.5 678.5 L 1273.5 694.5 L 1258.5 694.5 Z M 1214.5 678.5 L 1230.5 678.5 L 1230.5 694.5 L 1214.5 694.5 Z M 1170.5 678.5 L 1186.5 678.5 L 1186.5 694.5 L 1170.5 694.5 Z M 1126.5 678.5 L 1142.5 678.5 L 1142.5 694.5 L 1126.5 694.5 Z M 1083.5 678.5 L 1098.5 678.5 L 1098.5 694.5 L 1083.5 694.5 Z M 1039.5 678.5 L 1054.5 678.5 L 1054.5 694.5 L 1039.5 694.5 Z M 995.5 678.5 L 1010.5 678.5 L 1010.5 694.5 L 995.5 694.5 Z M 951.5 678.5 L 967.5 678.5 L 967.5 694.5 L 951.5 694.5 Z M 907.5 678.5 L 923.5 678.5 L 923.5 694.5 L 907.5 694.5 Z M 863.5 678.5 L 879.5 678.5 L 879.5 694.5 L 863.5 694.5 Z M 819.5 678.5 L 835.5 678.5 L 835.5 694.5 L 819.5 694.5 Z M 776.5 678.5 L 791.5 678.5 L 791.5 694.5 L 776.5 694.5 Z M 732.5 678.5 L 747.5 678.5 L 747.5 694.5 L 732.5 694.5 Z M 688.5 678.5 L 703.5 678.5 L 703.5 694.5 L 688.5 694.5 Z M 644.5 678.5 L 660.5 678.5 L 660.5 694.5 L 644.5 694.5 Z M 600.5 678.5 L 616.5 678.5 L 616.5 694.5 L 600.5 694.5 Z M 556.5 678.5 L 572.5 678.5 L 572.5 694.5 L 556.5 694.5 Z M 513.5 678.5 L 528.5 678.5 L 528.5 694.5 L 513.5 694.5 Z M 469.5 678.5 L 484.5 678.5 L 484.5 694.5 L 469.5 694.5 Z M 425.5 678.5 L 440.5 678.5 L 440.5 694.5 L 425.5 694.5 Z M 381.5 678.5 L 397.5 678.5 L 397.5 694.5 L 381.5 694.5 Z M 337.5 678.5 L 353.5 678.5 L 353.5 694.5 L 337.5 694.5 Z M 293.5 678.5 L 309.5 678.5 L 309.5 694.5 L 293.5 694.5 Z M 249.5 678.5 L 265.5 678.5 L 265.5 694.5 L 249.5 694.5 Z M 249.5 678.5 "/>
 </clipPath>
-<image id="image374" 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="#image374"/>
+  <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="surface368">
+<g id="surface395">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -199,6 +199,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 1714.03125 442.953125 L 1712.78125 444.5 L 1709.984375 442.179688 L 1709.183594 442.609375 L 1708.382812 442.929688 L 1707.558594 443.195312 L 1706.679688 443.378906 L 1705.796875 443.488281 L 1704.894531 443.539062 L 1703.667969 443.460938 L 1702.519531 443.273438 L 1701.457031 442.953125 L 1700.441406 442.527344 L 1699.484375 441.96875 L 1698.628906 441.25 L 1697.859375 440.476562 L 1697.191406 439.597656 L 1696.660156 438.636719 L 1696.207031 437.597656 L 1695.859375 436.480469 L 1695.644531 435.253906 L 1695.59375 434.960938 L 1695.566406 434.640625 L 1695.539062 434.347656 L 1695.511719 434.027344 L 1695.511719 433.359375 L 1695.566406 432.027344 L 1695.753906 430.75 L 1696.046875 429.578125 L 1696.472656 428.457031 L 1697.003906 427.417969 L 1697.699219 426.460938 L 1698.390625 425.6875 L 1699.191406 424.992188 L 1700.070312 424.40625 L 1701.003906 423.953125 L 1702.015625 423.582031 L 1703.132812 423.316406 L 1703.402344 423.289062 L 1704.28125 423.207031 L 1704.574219 423.207031 L 1704.894531 423.179688 L 1706.09375 423.261719 L 1707.238281 423.449219 L 1708.304688 423.769531 L 1709.316406 424.195312 L 1710.277344 424.753906 L 1711.15625 425.445312 L 1711.902344 426.246094 L 1712.566406 427.097656 L 1713.101562 428.03125 L 1713.554688 429.070312 L 1713.898438 430.191406 L 1714.140625 431.363281 L 1714.167969 431.707031 L 1714.191406 432.027344 L 1714.246094 432.667969 L 1714.246094 432.988281 L 1714.273438 433.308594 L 1714.191406 434.800781 L 1713.953125 436.210938 L 1713.578125 437.519531 L 1713.046875 438.742188 L 1712.355469 439.863281 L 1711.527344 440.902344 Z M 1707.316406 437.464844 L 1709.6875 439.410156 L 1710.328125 438.609375 L 1710.863281 437.703125 L 1711.261719 436.71875 L 1711.554688 435.679688 L 1711.714844 434.558594 L 1711.792969 433.335938 L 1711.742188 432.214844 L 1711.582031 431.148438 L 1711.316406 430.164062 L 1710.96875 429.257812 L 1710.515625 428.40625 L 1709.957031 427.632812 L 1709.316406 426.992188 L 1708.648438 426.460938 L 1707.902344 426.03125 L 1707.105469 425.714844 L 1706.226562 425.5 L 1705.320312 425.367188 L 1704.894531 425.367188 L 1703.933594 425.445312 L 1703.027344 425.605469 L 1702.175781 425.875 L 1701.402344 426.273438 L 1700.683594 426.777344 L 1700.042969 427.390625 L 1699.429688 428.113281 L 1698.949219 428.910156 L 1698.550781 429.789062 L 1698.257812 430.75 L 1698.070312 431.789062 L 1697.992188 432.90625 L 1697.992188 433.359375 L 1698.015625 434.535156 L 1698.175781 435.597656 L 1698.445312 436.585938 L 1698.789062 437.519531 L 1699.269531 438.371094 L 1699.855469 439.117188 L 1700.46875 439.785156 L 1701.160156 440.316406 L 1701.90625 440.742188 L 1702.707031 441.035156 L 1703.585938 441.25 L 1704.519531 441.328125 L 1704.574219 441.355469 L 1705.347656 441.355469 L 1705.851562 441.300781 L 1706.359375 441.195312 L 1706.839844 441.089844 L 1707.316406 440.929688 L 1707.824219 440.714844 L 1707.851562 440.714844 L 1707.902344 440.6875 L 1707.929688 440.664062 L 1707.984375 440.664062 L 1708.011719 440.636719 L 1708.0625 440.609375 L 1706.09375 438.957031 Z M 1707.316406 437.464844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1696 654 L 1712 654 M 1696 639 L 1712 639 M 1696 639 L 1696 654 M 1712 639 L 1712 654 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1696 654 L 1712 654 M 1696 639 L 1712 639 M 1712 654 L 1712 639 M 1696 654 L 1696 639 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 191 388 L 191 397 M 186 393 L 195 393 M 190 394 L 192 394 M 190 392 L 192 392 M 190 392 L 190 394 M 192 392 L 192 394 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.svg b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.svg
index 650c035..e53828e 100644
--- a/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.svg
+++ b/cells/sdfbbn/sky130_fd_sc_hs__sdfbbn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 377.5 L 1744.5 377.5 L 1744.5 534.5 L 174.5 534.5 Z M 174.5 377.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 190.5 653.5 L 1728.5 653.5 L 1728.5 674.5 L 190.5 674.5 Z M 190.5 653.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1381.5 563.5 L 1393.5 563.5 L 1393.5 598.5 L 1381.5 598.5 Z M 886.5 575.5 L 899.5 575.5 L 899.5 621.5 L 886.5 621.5 Z M 707.5 586.5 L 720.5 586.5 L 720.5 621.5 L 707.5 621.5 Z M 677.5 586.5 L 690.5 586.5 L 690.5 621.5 L 677.5 621.5 Z M 746.5 586.5 L 758.5 586.5 L 758.5 621.5 L 746.5 621.5 Z M 850.5 575.5 L 862.5 575.5 L 862.5 621.5 L 850.5 621.5 Z M 937.5 575.5 L 950.5 575.5 L 950.5 621.5 L 937.5 621.5 Z M 979.5 575.5 L 992.5 575.5 L 992.5 621.5 L 979.5 621.5 Z M 421.5 588.5 L 433.5 588.5 L 433.5 624.5 L 421.5 624.5 Z M 331.5 588.5 L 343.5 588.5 L 343.5 624.5 L 331.5 624.5 Z M 363.5 588.5 L 376.5 588.5 L 376.5 624.5 L 363.5 624.5 Z M 261.5 588.5 L 273.5 588.5 L 273.5 624.5 L 261.5 624.5 Z M 228.5 588.5 L 240.5 588.5 L 240.5 624.5 L 228.5 624.5 Z M 504.5 570.5 L 517.5 570.5 L 517.5 633.5 L 504.5 633.5 Z M 575.5 570.5 L 588.5 570.5 L 588.5 633.5 L 575.5 633.5 Z M 1593.5 580.5 L 1606.5 580.5 L 1606.5 634.5 L 1593.5 634.5 Z M 1019.5 593.5 L 1032.5 593.5 L 1032.5 639.5 L 1019.5 639.5 Z M 1157.5 604.5 L 1170.5 604.5 L 1170.5 639.5 L 1157.5 639.5 Z M 1125.5 604.5 L 1137.5 604.5 L 1137.5 639.5 L 1125.5 639.5 Z M 1255.5 580.5 L 1267.5 580.5 L 1267.5 643.5 L 1255.5 643.5 Z M 1211.5 580.5 L 1224.5 580.5 L 1224.5 643.5 L 1211.5 643.5 Z M 1468.5 580.5 L 1480.5 580.5 L 1480.5 643.5 L 1468.5 643.5 Z M 1644.5 580.5 L 1656.5 580.5 L 1656.5 643.5 L 1644.5 643.5 Z M 1291.5 580.5 L 1304.5 580.5 L 1304.5 643.5 L 1291.5 643.5 Z M 1680.5 580.5 L 1693.5 580.5 L 1693.5 643.5 L 1680.5 643.5 Z M 1504.5 580.5 L 1516.5 580.5 L 1516.5 643.5 L 1504.5 643.5 Z M 1504.5 580.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1093.5 425.5 L 1105.5 425.5 L 1105.5 460.5 L 1093.5 460.5 Z M 1125.5 425.5 L 1138.5 425.5 L 1138.5 460.5 L 1125.5 460.5 Z M 226.5 425.5 L 239.5 425.5 L 239.5 478.5 L 226.5 478.5 Z M 264.5 425.5 L 277.5 425.5 L 277.5 478.5 L 264.5 478.5 Z M 335.5 425.5 L 348.5 425.5 L 348.5 478.5 L 335.5 478.5 Z M 420.5 425.5 L 433.5 425.5 L 433.5 478.5 L 420.5 478.5 Z M 709.5 425.5 L 722.5 425.5 L 722.5 478.5 L 709.5 478.5 Z M 297.5 425.5 L 310.5 425.5 L 310.5 478.5 L 297.5 478.5 Z M 664.5 443.5 L 677.5 443.5 L 677.5 478.5 L 664.5 478.5 Z M 629.5 443.5 L 641.5 443.5 L 641.5 478.5 L 629.5 478.5 Z M 884.5 425.5 L 897.5 425.5 L 897.5 495.5 L 884.5 495.5 Z M 848.5 425.5 L 861.5 425.5 L 861.5 495.5 L 848.5 495.5 Z M 1047.5 425.5 L 1060.5 425.5 L 1060.5 495.5 L 1047.5 495.5 Z M 929.5 425.5 L 942.5 425.5 L 942.5 495.5 L 929.5 495.5 Z M 1015.5 425.5 L 1027.5 425.5 L 1027.5 495.5 L 1015.5 495.5 Z M 1375.5 452.5 L 1388.5 452.5 L 1388.5 506.5 L 1375.5 506.5 Z M 1290.5 425.5 L 1303.5 425.5 L 1303.5 509.5 L 1290.5 509.5 Z M 1255.5 425.5 L 1267.5 425.5 L 1267.5 509.5 L 1255.5 509.5 Z M 1212.5 425.5 L 1224.5 425.5 L 1224.5 509.5 L 1212.5 509.5 Z M 1597.5 428.5 L 1609.5 428.5 L 1609.5 512.5 L 1597.5 512.5 Z M 543.5 425.5 L 556.5 425.5 L 556.5 519.5 L 543.5 519.5 Z M 505.5 425.5 L 518.5 425.5 L 518.5 519.5 L 505.5 519.5 Z M 1475.5 425.5 L 1487.5 425.5 L 1487.5 519.5 L 1475.5 519.5 Z M 1679.5 425.5 L 1691.5 425.5 L 1691.5 519.5 L 1679.5 519.5 Z M 1513.5 425.5 L 1525.5 425.5 L 1525.5 519.5 L 1513.5 519.5 Z M 1641.5 425.5 L 1653.5 425.5 L 1653.5 519.5 L 1641.5 519.5 Z M 1641.5 425.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 203.5 386.5 L 218.5 386.5 L 218.5 401.5 L 203.5 401.5 Z M 1700.5 386.5 L 1715.5 386.5 L 1715.5 401.5 L 1700.5 401.5 Z M 1660.5 386.5 L 1674.5 386.5 L 1674.5 401.5 L 1660.5 401.5 Z M 1619.5 386.5 L 1634.5 386.5 L 1634.5 401.5 L 1619.5 401.5 Z M 1579.5 386.5 L 1593.5 386.5 L 1593.5 401.5 L 1579.5 401.5 Z M 1538.5 386.5 L 1553.5 386.5 L 1553.5 401.5 L 1538.5 401.5 Z M 1498.5 386.5 L 1512.5 386.5 L 1512.5 401.5 L 1498.5 401.5 Z M 1457.5 386.5 L 1472.5 386.5 L 1472.5 401.5 L 1457.5 401.5 Z M 1417.5 386.5 L 1431.5 386.5 L 1431.5 401.5 L 1417.5 401.5 Z M 1377.5 386.5 L 1391.5 386.5 L 1391.5 401.5 L 1377.5 401.5 Z M 1336.5 386.5 L 1350.5 386.5 L 1350.5 401.5 L 1336.5 401.5 Z M 1296.5 386.5 L 1310.5 386.5 L 1310.5 401.5 L 1296.5 401.5 Z M 1255.5 386.5 L 1270.5 386.5 L 1270.5 401.5 L 1255.5 401.5 Z M 1215.5 386.5 L 1229.5 386.5 L 1229.5 401.5 L 1215.5 401.5 Z M 1174.5 386.5 L 1189.5 386.5 L 1189.5 401.5 L 1174.5 401.5 Z M 1134.5 386.5 L 1148.5 386.5 L 1148.5 401.5 L 1134.5 401.5 Z M 1093.5 386.5 L 1108.5 386.5 L 1108.5 401.5 L 1093.5 401.5 Z M 1053.5 386.5 L 1067.5 386.5 L 1067.5 401.5 L 1053.5 401.5 Z M 1012.5 386.5 L 1027.5 386.5 L 1027.5 401.5 L 1012.5 401.5 Z M 972.5 386.5 L 986.5 386.5 L 986.5 401.5 L 972.5 401.5 Z M 932.5 386.5 L 946.5 386.5 L 946.5 401.5 L 932.5 401.5 Z M 891.5 386.5 L 905.5 386.5 L 905.5 401.5 L 891.5 401.5 Z M 851.5 386.5 L 865.5 386.5 L 865.5 401.5 L 851.5 401.5 Z M 810.5 386.5 L 824.5 386.5 L 824.5 401.5 L 810.5 401.5 Z M 770.5 386.5 L 784.5 386.5 L 784.5 401.5 L 770.5 401.5 Z M 729.5 386.5 L 744.5 386.5 L 744.5 401.5 L 729.5 401.5 Z M 689.5 386.5 L 703.5 386.5 L 703.5 401.5 L 689.5 401.5 Z M 648.5 386.5 L 663.5 386.5 L 663.5 401.5 L 648.5 401.5 Z M 608.5 386.5 L 622.5 386.5 L 622.5 401.5 L 608.5 401.5 Z M 567.5 386.5 L 582.5 386.5 L 582.5 401.5 L 567.5 401.5 Z M 527.5 386.5 L 541.5 386.5 L 541.5 401.5 L 527.5 401.5 Z M 486.5 386.5 L 501.5 386.5 L 501.5 401.5 L 486.5 401.5 Z M 446.5 386.5 L 460.5 386.5 L 460.5 401.5 L 446.5 401.5 Z M 406.5 386.5 L 420.5 386.5 L 420.5 401.5 L 406.5 401.5 Z M 365.5 386.5 L 379.5 386.5 L 379.5 401.5 L 365.5 401.5 Z M 325.5 386.5 L 339.5 386.5 L 339.5 401.5 L 325.5 401.5 Z M 284.5 386.5 L 299.5 386.5 L 299.5 401.5 L 284.5 401.5 Z M 244.5 386.5 L 258.5 386.5 L 258.5 401.5 L 244.5 401.5 Z M 1215.5 527.5 L 1229.5 527.5 L 1229.5 541.5 L 1215.5 541.5 Z M 972.5 527.5 L 986.5 527.5 L 986.5 541.5 L 972.5 541.5 Z M 1053.5 558.5 L 1067.5 558.5 L 1067.5 572.5 L 1053.5 572.5 Z M 689.5 558.5 L 703.5 558.5 L 703.5 572.5 L 689.5 572.5 Z M 203.5 667.5 L 218.5 667.5 L 218.5 681.5 L 203.5 681.5 Z M 1700.5 667.5 L 1715.5 667.5 L 1715.5 681.5 L 1700.5 681.5 Z M 1660.5 667.5 L 1674.5 667.5 L 1674.5 681.5 L 1660.5 681.5 Z M 1619.5 667.5 L 1634.5 667.5 L 1634.5 681.5 L 1619.5 681.5 Z M 1579.5 667.5 L 1593.5 667.5 L 1593.5 681.5 L 1579.5 681.5 Z M 1538.5 667.5 L 1553.5 667.5 L 1553.5 681.5 L 1538.5 681.5 Z M 1498.5 667.5 L 1512.5 667.5 L 1512.5 681.5 L 1498.5 681.5 Z M 1457.5 667.5 L 1472.5 667.5 L 1472.5 681.5 L 1457.5 681.5 Z M 1417.5 667.5 L 1431.5 667.5 L 1431.5 681.5 L 1417.5 681.5 Z M 1377.5 667.5 L 1391.5 667.5 L 1391.5 681.5 L 1377.5 681.5 Z M 1336.5 667.5 L 1350.5 667.5 L 1350.5 681.5 L 1336.5 681.5 Z M 1296.5 667.5 L 1310.5 667.5 L 1310.5 681.5 L 1296.5 681.5 Z M 1255.5 667.5 L 1270.5 667.5 L 1270.5 681.5 L 1255.5 681.5 Z M 1215.5 667.5 L 1229.5 667.5 L 1229.5 681.5 L 1215.5 681.5 Z M 1174.5 667.5 L 1189.5 667.5 L 1189.5 681.5 L 1174.5 681.5 Z M 1134.5 667.5 L 1148.5 667.5 L 1148.5 681.5 L 1134.5 681.5 Z M 1093.5 667.5 L 1108.5 667.5 L 1108.5 681.5 L 1093.5 681.5 Z M 1053.5 667.5 L 1067.5 667.5 L 1067.5 681.5 L 1053.5 681.5 Z M 1012.5 667.5 L 1027.5 667.5 L 1027.5 681.5 L 1012.5 681.5 Z M 972.5 667.5 L 986.5 667.5 L 986.5 681.5 L 972.5 681.5 Z M 932.5 667.5 L 946.5 667.5 L 946.5 681.5 L 932.5 681.5 Z M 891.5 667.5 L 905.5 667.5 L 905.5 681.5 L 891.5 681.5 Z M 851.5 667.5 L 865.5 667.5 L 865.5 681.5 L 851.5 681.5 Z M 810.5 667.5 L 824.5 667.5 L 824.5 681.5 L 810.5 681.5 Z M 770.5 667.5 L 784.5 667.5 L 784.5 681.5 L 770.5 681.5 Z M 729.5 667.5 L 744.5 667.5 L 744.5 681.5 L 729.5 681.5 Z M 689.5 667.5 L 703.5 667.5 L 703.5 681.5 L 689.5 681.5 Z M 648.5 667.5 L 663.5 667.5 L 663.5 681.5 L 648.5 681.5 Z M 608.5 667.5 L 622.5 667.5 L 622.5 681.5 L 608.5 681.5 Z M 567.5 667.5 L 582.5 667.5 L 582.5 681.5 L 567.5 681.5 Z M 527.5 667.5 L 541.5 667.5 L 541.5 681.5 L 527.5 681.5 Z M 486.5 667.5 L 501.5 667.5 L 501.5 681.5 L 486.5 681.5 Z M 446.5 667.5 L 460.5 667.5 L 460.5 681.5 L 446.5 681.5 Z M 406.5 667.5 L 420.5 667.5 L 420.5 681.5 L 406.5 681.5 Z M 365.5 667.5 L 379.5 667.5 L 379.5 681.5 L 365.5 681.5 Z M 325.5 667.5 L 339.5 667.5 L 339.5 681.5 L 325.5 681.5 Z M 284.5 667.5 L 299.5 667.5 L 299.5 681.5 L 284.5 681.5 Z M 244.5 667.5 L 258.5 667.5 L 258.5 681.5 L 244.5 681.5 Z M 244.5 667.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface363">
+<g id="surface391">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -193,6 +193,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 1436.960938 538.34375 L 1436.914062 539.105469 L 1436.792969 539.796875 L 1436.578125 540.441406 L 1436.292969 541.015625 L 1435.910156 541.5625 L 1435.457031 542.039062 L 1434.957031 542.445312 L 1434.433594 542.753906 L 1433.835938 542.992188 L 1433.214844 543.183594 L 1432.550781 543.28125 L 1431.832031 543.304688 L 1423.988281 543.304688 L 1423.988281 525.921875 L 1431.046875 525.921875 L 1432.070312 525.992188 L 1432.976562 526.160156 L 1433.789062 526.445312 L 1434.480469 526.851562 L 1435.078125 527.375 L 1435.554688 528.019531 L 1435.742188 528.378906 L 1435.910156 528.757812 L 1436.03125 529.117188 L 1436.125 529.523438 L 1436.171875 529.929688 L 1436.195312 530.332031 L 1436.125 531.191406 L 1435.910156 531.929688 L 1435.578125 532.621094 L 1435.101562 533.195312 L 1434.503906 533.71875 L 1433.789062 534.125 L 1434.480469 534.433594 L 1435.078125 534.769531 L 1435.601562 535.148438 L 1436.03125 535.578125 L 1436.363281 536.03125 L 1436.625 536.507812 L 1436.722656 536.792969 L 1436.792969 537.082031 L 1436.863281 537.367188 L 1436.914062 537.699219 L 1436.9375 538.011719 Z M 1433.980469 530.644531 L 1433.90625 529.929688 L 1433.695312 529.332031 L 1433.359375 528.808594 L 1432.882812 528.425781 L 1432.285156 528.140625 L 1431.546875 527.949219 L 1431.378906 527.949219 L 1431.214844 527.925781 L 1431.046875 527.902344 L 1430.664062 527.902344 L 1430.5 527.878906 L 1426.207031 527.878906 L 1426.207031 533.410156 L 1430.5 533.410156 L 1431.378906 533.359375 L 1432.144531 533.21875 L 1432.789062 532.957031 L 1433.265625 532.597656 L 1433.644531 532.121094 L 1433.882812 531.550781 L 1433.90625 531.429688 L 1433.933594 531.285156 L 1433.957031 531.144531 L 1433.957031 530.808594 Z M 1431.621094 541.347656 L 1432.285156 541.324219 L 1432.882812 541.179688 L 1433.40625 540.941406 L 1433.835938 540.632812 L 1434.195312 540.226562 L 1434.480469 539.726562 L 1434.550781 539.535156 L 1434.597656 539.320312 L 1434.671875 539.082031 L 1434.695312 538.867188 L 1434.71875 538.628906 L 1434.742188 538.367188 L 1434.695312 537.84375 L 1434.597656 537.34375 L 1434.433594 536.914062 L 1434.195312 536.507812 L 1433.882812 536.175781 L 1433.527344 535.863281 L 1433.265625 535.722656 L 1432.976562 535.601562 L 1432.667969 535.507812 L 1432.335938 535.433594 L 1431.976562 535.386719 L 1431.621094 535.363281 L 1426.207031 535.363281 L 1426.207031 541.347656 Z M 1431.621094 541.347656 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1377 552 L 1391 552 M 1377 538 L 1391 538 M 1377 538 L 1377 552 M 1391 538 L 1391 552 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1377 552 L 1391 552 M 1377 538 L 1391 538 M 1391 552 L 1391 538 M 1377 552 L 1377 538 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 190 400 L 190 409 M 185 405 L 194 405 M 189 406 L 191 406 M 189 404 L 191 404 M 189 404 L 189 406 M 191 404 L 191 406 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.svg b/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.svg
index 80be415..91278b4 100644
--- a/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.svg
+++ b/cells/sdfbbp/sky130_fd_sc_hs__sdfbbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 354.5 L 1743.5 354.5 L 1743.5 534.5 L 174.5 534.5 Z M 1419.5 534.5 L 1572.5 534.5 L 1572.5 544.5 L 1419.5 544.5 Z M 1419.5 534.5 "/>
 </clipPath>
-<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image431"/>
+  <use xlink:href="#image458"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 192.5 671.5 L 1725.5 671.5 L 1725.5 695.5 L 192.5 695.5 Z M 192.5 671.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image431"/>
+  <use xlink:href="#image458"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1467.5 588.5 L 1481.5 588.5 L 1481.5 628.5 L 1467.5 628.5 Z M 864.5 581.5 L 878.5 581.5 L 878.5 635.5 L 864.5 635.5 Z M 801.5 594.5 L 815.5 594.5 L 815.5 635.5 L 801.5 635.5 Z M 323.5 597.5 L 337.5 597.5 L 337.5 637.5 L 323.5 637.5 Z M 273.5 597.5 L 288.5 597.5 L 288.5 637.5 L 273.5 637.5 Z M 425.5 597.5 L 440.5 597.5 L 440.5 637.5 L 425.5 637.5 Z M 235.5 597.5 L 250.5 597.5 L 250.5 637.5 L 235.5 637.5 Z M 937.5 584.5 L 952.5 584.5 L 952.5 637.5 L 937.5 637.5 Z M 979.5 584.5 L 993.5 584.5 L 993.5 637.5 L 979.5 637.5 Z M 1122.5 584.5 L 1137.5 584.5 L 1137.5 637.5 L 1122.5 637.5 Z M 1087.5 584.5 L 1102.5 584.5 L 1102.5 637.5 L 1087.5 637.5 Z M 357.5 597.5 L 372.5 597.5 L 372.5 637.5 L 357.5 637.5 Z M 521.5 576.5 L 535.5 576.5 L 535.5 648.5 L 521.5 648.5 Z M 602.5 576.5 L 617.5 576.5 L 617.5 648.5 L 602.5 648.5 Z M 755.5 608.5 L 769.5 608.5 L 769.5 649.5 L 755.5 649.5 Z M 706.5 608.5 L 721.5 608.5 L 721.5 649.5 L 706.5 649.5 Z M 1175.5 619.5 L 1190.5 619.5 L 1190.5 659.5 L 1175.5 659.5 Z M 1614.5 606.5 L 1628.5 606.5 L 1628.5 659.5 L 1614.5 659.5 Z M 1318.5 588.5 L 1333.5 588.5 L 1333.5 659.5 L 1318.5 659.5 Z M 1227.5 619.5 L 1242.5 619.5 L 1242.5 659.5 L 1227.5 659.5 Z M 1670.5 588.5 L 1684.5 588.5 L 1684.5 659.5 L 1670.5 659.5 Z M 1277.5 588.5 L 1291.5 588.5 L 1291.5 659.5 L 1277.5 659.5 Z M 1513.5 588.5 L 1527.5 588.5 L 1527.5 659.5 L 1513.5 659.5 Z M 1370.5 588.5 L 1385.5 588.5 L 1385.5 659.5 L 1370.5 659.5 Z M 1370.5 588.5 "/>
 </clipPath>
-<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image459" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image432"/>
+  <use xlink:href="#image459"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1179.5 411.5 L 1194.5 411.5 L 1194.5 451.5 L 1179.5 451.5 Z M 1139.5 411.5 L 1153.5 411.5 L 1153.5 451.5 L 1139.5 451.5 Z M 283.5 409.5 L 298.5 409.5 L 298.5 471.5 L 283.5 471.5 Z M 368.5 409.5 L 382.5 409.5 L 382.5 471.5 L 368.5 471.5 Z M 465.5 409.5 L 480.5 409.5 L 480.5 471.5 L 465.5 471.5 Z M 324.5 409.5 L 339.5 409.5 L 339.5 471.5 L 324.5 471.5 Z M 234.5 409.5 L 249.5 409.5 L 249.5 471.5 L 234.5 471.5 Z M 1621.5 409.5 L 1635.5 409.5 L 1635.5 490.5 L 1621.5 490.5 Z M 714.5 430.5 L 728.5 430.5 L 728.5 492.5 L 714.5 492.5 Z M 809.5 452.5 L 824.5 452.5 L 824.5 492.5 L 809.5 492.5 Z M 769.5 452.5 L 783.5 452.5 L 783.5 492.5 L 769.5 492.5 Z M 1086.5 411.5 L 1101.5 411.5 L 1101.5 492.5 L 1086.5 492.5 Z M 1331.5 409.5 L 1346.5 409.5 L 1346.5 505.5 L 1331.5 505.5 Z M 1369.5 409.5 L 1384.5 409.5 L 1384.5 505.5 L 1369.5 505.5 Z M 1278.5 409.5 L 1293.5 409.5 L 1293.5 505.5 L 1278.5 505.5 Z M 1032.5 430.5 L 1047.5 430.5 L 1047.5 512.5 L 1032.5 512.5 Z M 983.5 430.5 L 997.5 430.5 L 997.5 512.5 L 983.5 512.5 Z M 890.5 430.5 L 905.5 430.5 L 905.5 512.5 L 890.5 512.5 Z M 942.5 430.5 L 957.5 430.5 L 957.5 512.5 L 942.5 512.5 Z M 563.5 409.5 L 578.5 409.5 L 578.5 517.5 L 563.5 517.5 Z M 607.5 409.5 L 621.5 409.5 L 621.5 517.5 L 607.5 517.5 Z M 1670.5 409.5 L 1684.5 409.5 L 1684.5 517.5 L 1670.5 517.5 Z M 1464.5 465.5 L 1478.5 465.5 L 1478.5 527.5 L 1464.5 527.5 Z M 1514.5 418.5 L 1528.5 418.5 L 1528.5 527.5 L 1514.5 527.5 Z M 1514.5 418.5 "/>
 </clipPath>
-<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image460" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image433"/>
+  <use xlink:href="#image460"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 207.5 365.5 L 224.5 365.5 L 224.5 381.5 L 207.5 381.5 Z M 1694.5 365.5 L 1710.5 365.5 L 1710.5 381.5 L 1694.5 381.5 Z M 1647.5 365.5 L 1664.5 365.5 L 1664.5 381.5 L 1647.5 381.5 Z M 1601.5 365.5 L 1617.5 365.5 L 1617.5 381.5 L 1601.5 381.5 Z M 1554.5 365.5 L 1571.5 365.5 L 1571.5 381.5 L 1554.5 381.5 Z M 1508.5 365.5 L 1524.5 365.5 L 1524.5 381.5 L 1508.5 381.5 Z M 1461.5 365.5 L 1478.5 365.5 L 1478.5 381.5 L 1461.5 381.5 Z M 1415.5 365.5 L 1431.5 365.5 L 1431.5 381.5 L 1415.5 381.5 Z M 1369.5 365.5 L 1385.5 365.5 L 1385.5 381.5 L 1369.5 381.5 Z M 1322.5 365.5 L 1339.5 365.5 L 1339.5 381.5 L 1322.5 381.5 Z M 1276.5 365.5 L 1292.5 365.5 L 1292.5 381.5 L 1276.5 381.5 Z M 1229.5 365.5 L 1246.5 365.5 L 1246.5 381.5 L 1229.5 381.5 Z M 1183.5 365.5 L 1199.5 365.5 L 1199.5 381.5 L 1183.5 381.5 Z M 1136.5 365.5 L 1153.5 365.5 L 1153.5 381.5 L 1136.5 381.5 Z M 1090.5 365.5 L 1106.5 365.5 L 1106.5 381.5 L 1090.5 381.5 Z M 1043.5 365.5 L 1060.5 365.5 L 1060.5 381.5 L 1043.5 381.5 Z M 997.5 365.5 L 1013.5 365.5 L 1013.5 381.5 L 997.5 381.5 Z M 951.5 365.5 L 967.5 365.5 L 967.5 381.5 L 951.5 381.5 Z M 904.5 365.5 L 921.5 365.5 L 921.5 381.5 L 904.5 381.5 Z M 858.5 365.5 L 874.5 365.5 L 874.5 381.5 L 858.5 381.5 Z M 811.5 365.5 L 828.5 365.5 L 828.5 381.5 L 811.5 381.5 Z M 765.5 365.5 L 781.5 365.5 L 781.5 381.5 L 765.5 381.5 Z M 718.5 365.5 L 735.5 365.5 L 735.5 381.5 L 718.5 381.5 Z M 672.5 365.5 L 688.5 365.5 L 688.5 381.5 L 672.5 381.5 Z M 625.5 365.5 L 642.5 365.5 L 642.5 381.5 L 625.5 381.5 Z M 579.5 365.5 L 595.5 365.5 L 595.5 381.5 L 579.5 381.5 Z M 533.5 365.5 L 549.5 365.5 L 549.5 381.5 L 533.5 381.5 Z M 486.5 365.5 L 503.5 365.5 L 503.5 381.5 L 486.5 381.5 Z M 440.5 365.5 L 456.5 365.5 L 456.5 381.5 L 440.5 381.5 Z M 393.5 365.5 L 410.5 365.5 L 410.5 381.5 L 393.5 381.5 Z M 347.5 365.5 L 363.5 365.5 L 363.5 381.5 L 347.5 381.5 Z M 300.5 365.5 L 317.5 365.5 L 317.5 381.5 L 300.5 381.5 Z M 254.5 365.5 L 270.5 365.5 L 270.5 381.5 L 254.5 381.5 Z M 997.5 562.5 L 1013.5 562.5 L 1013.5 566.5 L 997.5 566.5 Z M 1415.5 562.5 L 1431.5 562.5 L 1431.5 569.5 L 1415.5 569.5 Z M 1415.5 569.5 L 1431.5 569.5 L 1431.5 578.5 L 1415.5 578.5 Z M 997.5 566.5 L 1013.5 566.5 L 1013.5 578.5 L 997.5 578.5 Z M 207.5 687.5 L 224.5 687.5 L 224.5 703.5 L 207.5 703.5 Z M 1694.5 687.5 L 1710.5 687.5 L 1710.5 703.5 L 1694.5 703.5 Z M 1647.5 687.5 L 1664.5 687.5 L 1664.5 703.5 L 1647.5 703.5 Z M 1601.5 687.5 L 1617.5 687.5 L 1617.5 703.5 L 1601.5 703.5 Z M 1554.5 687.5 L 1571.5 687.5 L 1571.5 703.5 L 1554.5 703.5 Z M 1508.5 687.5 L 1524.5 687.5 L 1524.5 703.5 L 1508.5 703.5 Z M 1461.5 687.5 L 1478.5 687.5 L 1478.5 703.5 L 1461.5 703.5 Z M 1415.5 687.5 L 1431.5 687.5 L 1431.5 703.5 L 1415.5 703.5 Z M 1369.5 687.5 L 1385.5 687.5 L 1385.5 703.5 L 1369.5 703.5 Z M 1322.5 687.5 L 1339.5 687.5 L 1339.5 703.5 L 1322.5 703.5 Z M 1276.5 687.5 L 1292.5 687.5 L 1292.5 703.5 L 1276.5 703.5 Z M 1229.5 687.5 L 1246.5 687.5 L 1246.5 703.5 L 1229.5 703.5 Z M 1183.5 687.5 L 1199.5 687.5 L 1199.5 703.5 L 1183.5 703.5 Z M 1136.5 687.5 L 1153.5 687.5 L 1153.5 703.5 L 1136.5 703.5 Z M 1090.5 687.5 L 1106.5 687.5 L 1106.5 703.5 L 1090.5 703.5 Z M 1043.5 687.5 L 1060.5 687.5 L 1060.5 703.5 L 1043.5 703.5 Z M 997.5 687.5 L 1013.5 687.5 L 1013.5 703.5 L 997.5 703.5 Z M 951.5 687.5 L 967.5 687.5 L 967.5 703.5 L 951.5 703.5 Z M 904.5 687.5 L 921.5 687.5 L 921.5 703.5 L 904.5 703.5 Z M 858.5 687.5 L 874.5 687.5 L 874.5 703.5 L 858.5 703.5 Z M 811.5 687.5 L 828.5 687.5 L 828.5 703.5 L 811.5 703.5 Z M 765.5 687.5 L 781.5 687.5 L 781.5 703.5 L 765.5 703.5 Z M 718.5 687.5 L 735.5 687.5 L 735.5 703.5 L 718.5 703.5 Z M 672.5 687.5 L 688.5 687.5 L 688.5 703.5 L 672.5 703.5 Z M 625.5 687.5 L 642.5 687.5 L 642.5 703.5 L 625.5 703.5 Z M 579.5 687.5 L 595.5 687.5 L 595.5 703.5 L 579.5 703.5 Z M 533.5 687.5 L 549.5 687.5 L 549.5 703.5 L 533.5 703.5 Z M 486.5 687.5 L 503.5 687.5 L 503.5 703.5 L 486.5 703.5 Z M 440.5 687.5 L 456.5 687.5 L 456.5 703.5 L 440.5 703.5 Z M 393.5 687.5 L 410.5 687.5 L 410.5 703.5 L 393.5 703.5 Z M 347.5 687.5 L 363.5 687.5 L 363.5 703.5 L 347.5 703.5 Z M 300.5 687.5 L 317.5 687.5 L 317.5 703.5 L 300.5 703.5 Z M 254.5 687.5 L 270.5 687.5 L 270.5 703.5 L 254.5 703.5 Z M 254.5 687.5 "/>
 </clipPath>
-<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image461" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image434"/>
+  <use xlink:href="#image461"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface428">
+<g id="surface455">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -229,6 +229,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 1329.015625 502.730469 L 1328.960938 503.625 L 1328.820312 504.441406 L 1328.570312 505.195312 L 1328.230469 505.871094 L 1327.785156 506.515625 L 1327.25 507.078125 L 1326.660156 507.554688 L 1326.042969 507.917969 L 1325.34375 508.199219 L 1324.613281 508.421875 L 1323.828125 508.535156 L 1322.988281 508.5625 L 1313.757812 508.5625 L 1313.757812 488.113281 L 1322.0625 488.113281 L 1323.265625 488.199219 L 1324.332031 488.394531 L 1325.285156 488.730469 L 1326.101562 489.207031 L 1326.800781 489.824219 L 1327.363281 490.582031 L 1327.585938 491.003906 L 1327.785156 491.453125 L 1327.921875 491.875 L 1328.035156 492.351562 L 1328.09375 492.828125 L 1328.121094 493.304688 L 1328.035156 494.3125 L 1327.785156 495.183594 L 1327.390625 495.996094 L 1326.828125 496.667969 L 1326.128906 497.285156 L 1325.285156 497.765625 L 1326.101562 498.128906 L 1326.800781 498.519531 L 1327.417969 498.96875 L 1327.921875 499.476562 L 1328.316406 500.007812 L 1328.625 500.570312 L 1328.738281 500.90625 L 1328.820312 501.242188 L 1328.90625 501.578125 L 1328.960938 501.972656 L 1328.988281 502.335938 Z M 1325.511719 493.667969 L 1325.425781 492.828125 L 1325.175781 492.125 L 1324.78125 491.507812 L 1324.222656 491.058594 L 1323.519531 490.722656 L 1322.648438 490.5 L 1322.453125 490.5 L 1322.257812 490.46875 L 1322.0625 490.441406 L 1321.613281 490.441406 L 1321.414062 490.414062 L 1316.367188 490.414062 L 1316.367188 496.921875 L 1321.414062 496.921875 L 1322.453125 496.867188 L 1323.351562 496.699219 L 1324.109375 496.390625 L 1324.667969 495.96875 L 1325.117188 495.40625 L 1325.398438 494.734375 L 1325.425781 494.59375 L 1325.457031 494.425781 L 1325.484375 494.257812 L 1325.484375 493.863281 Z M 1322.734375 506.261719 L 1323.519531 506.234375 L 1324.222656 506.066406 L 1324.839844 505.785156 L 1325.34375 505.421875 L 1325.765625 504.945312 L 1326.101562 504.355469 L 1326.183594 504.132812 L 1326.242188 503.878906 L 1326.324219 503.597656 L 1326.351562 503.347656 L 1326.378906 503.066406 L 1326.410156 502.757812 L 1326.351562 502.140625 L 1326.242188 501.550781 L 1326.042969 501.046875 L 1325.765625 500.570312 L 1325.398438 500.175781 L 1324.976562 499.8125 L 1324.667969 499.644531 L 1324.332031 499.503906 L 1323.96875 499.390625 L 1323.574219 499.304688 L 1323.15625 499.25 L 1322.734375 499.222656 L 1316.367188 499.222656 L 1316.367188 506.261719 Z M 1322.734375 506.261719 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1276 589 L 1292 589 M 1276 573 L 1292 573 M 1276 573 L 1276 589 M 1292 573 L 1292 589 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1276 589 L 1292 589 M 1276 573 L 1292 573 M 1292 589 L 1292 573 M 1276 589 L 1276 573 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 192 379 L 192 388 M 187 384 L 196 384 M 191 385 L 193 385 M 191 383 L 193 383 M 191 383 L 191 385 M 193 383 L 193 385 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.svg b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.svg
index 3dd06c9..88f155f 100644
--- a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.svg
+++ b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 331.5 L 1743.5 331.5 L 1743.5 535.5 L 174.5 535.5 Z M 644.5 535.5 L 1239.5 535.5 L 1239.5 537.5 L 644.5 537.5 Z M 1073.5 537.5 L 1239.5 537.5 L 1239.5 546.5 L 1073.5 546.5 Z M 1073.5 537.5 "/>
 </clipPath>
-<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image448" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image420"/>
+  <use xlink:href="#image448"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 195.5 690.5 L 1723.5 690.5 L 1723.5 717.5 L 195.5 717.5 Z M 195.5 690.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image420"/>
+  <use xlink:href="#image448"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 989.5 618.5 L 1005.5 618.5 L 1005.5 664.5 L 989.5 664.5 Z M 849.5 618.5 L 865.5 618.5 L 865.5 664.5 L 849.5 664.5 Z M 903.5 618.5 L 920.5 618.5 L 920.5 664.5 L 903.5 664.5 Z M 946.5 618.5 L 963.5 618.5 L 963.5 664.5 L 946.5 664.5 Z M 478.5 618.5 L 494.5 618.5 L 494.5 664.5 L 478.5 664.5 Z M 520.5 618.5 L 537.5 618.5 L 537.5 664.5 L 520.5 664.5 Z M 350.5 621.5 L 366.5 621.5 L 366.5 668.5 L 350.5 668.5 Z M 405.5 621.5 L 422.5 621.5 L 422.5 668.5 L 405.5 668.5 Z M 580.5 623.5 L 596.5 623.5 L 596.5 669.5 L 580.5 669.5 Z M 1500.5 595.5 L 1516.5 595.5 L 1516.5 676.5 L 1500.5 676.5 Z M 1090.5 606.5 L 1106.5 606.5 L 1106.5 676.5 L 1090.5 676.5 Z M 241.5 630.5 L 258.5 630.5 L 258.5 676.5 L 241.5 676.5 Z M 1137.5 606.5 L 1154.5 606.5 L 1154.5 676.5 L 1137.5 676.5 Z M 740.5 595.5 L 756.5 595.5 L 756.5 676.5 L 740.5 676.5 Z M 693.5 595.5 L 709.5 595.5 L 709.5 676.5 L 693.5 676.5 Z M 1659.5 595.5 L 1676.5 595.5 L 1676.5 676.5 L 1659.5 676.5 Z M 1383.5 630.5 L 1400.5 630.5 L 1400.5 676.5 L 1383.5 676.5 Z M 1297.5 630.5 L 1313.5 630.5 L 1313.5 676.5 L 1297.5 676.5 Z M 1257.5 630.5 L 1274.5 630.5 L 1274.5 676.5 L 1257.5 676.5 Z M 1344.5 630.5 L 1360.5 630.5 L 1360.5 676.5 L 1344.5 676.5 Z M 1606.5 616.5 L 1622.5 616.5 L 1622.5 676.5 L 1606.5 676.5 Z M 1606.5 616.5 "/>
 </clipPath>
-<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image449" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image421"/>
+  <use xlink:href="#image449"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1421.5 403.5 L 1437.5 403.5 L 1437.5 449.5 L 1421.5 449.5 Z M 1371.5 403.5 L 1388.5 403.5 L 1388.5 449.5 L 1371.5 449.5 Z M 1302.5 403.5 L 1318.5 403.5 L 1318.5 449.5 L 1302.5 449.5 Z M 1259.5 403.5 L 1275.5 403.5 L 1275.5 449.5 L 1259.5 449.5 Z M 364.5 392.5 L 381.5 392.5 L 381.5 462.5 L 364.5 462.5 Z M 460.5 392.5 L 476.5 392.5 L 476.5 462.5 L 460.5 462.5 Z M 519.5 392.5 L 535.5 392.5 L 535.5 462.5 L 519.5 462.5 Z M 309.5 392.5 L 326.5 392.5 L 326.5 462.5 L 309.5 462.5 Z M 581.5 392.5 L 598.5 392.5 L 598.5 462.5 L 581.5 462.5 Z M 410.5 392.5 L 427.5 392.5 L 427.5 462.5 L 410.5 462.5 Z M 907.5 417.5 L 924.5 417.5 L 924.5 463.5 L 907.5 463.5 Z M 1016.5 417.5 L 1032.5 417.5 L 1032.5 463.5 L 1016.5 463.5 Z M 950.5 417.5 L 967.5 417.5 L 967.5 463.5 L 950.5 463.5 Z M 858.5 417.5 L 874.5 417.5 L 874.5 463.5 L 858.5 463.5 Z M 1604.5 392.5 L 1621.5 392.5 L 1621.5 484.5 L 1604.5 484.5 Z M 1661.5 392.5 L 1678.5 392.5 L 1678.5 515.5 L 1661.5 515.5 Z M 1495.5 392.5 L 1512.5 392.5 L 1512.5 515.5 L 1495.5 515.5 Z M 746.5 394.5 L 762.5 394.5 L 762.5 517.5 L 746.5 517.5 Z M 697.5 394.5 L 713.5 394.5 L 713.5 517.5 L 697.5 517.5 Z M 1174.5 417.5 L 1190.5 417.5 L 1190.5 527.5 L 1174.5 527.5 Z M 1125.5 417.5 L 1141.5 417.5 L 1141.5 527.5 L 1125.5 527.5 Z M 1125.5 417.5 "/>
 </clipPath>
-<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image450" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image422"/>
+  <use xlink:href="#image450"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 212.5 342.5 L 231.5 342.5 L 231.5 361.5 L 212.5 361.5 Z M 1687.5 342.5 L 1706.5 342.5 L 1706.5 361.5 L 1687.5 361.5 Z M 1634.5 342.5 L 1653.5 342.5 L 1653.5 361.5 L 1634.5 361.5 Z M 1582.5 342.5 L 1600.5 342.5 L 1600.5 361.5 L 1582.5 361.5 Z M 1529.5 342.5 L 1548.5 342.5 L 1548.5 361.5 L 1529.5 361.5 Z M 1476.5 342.5 L 1495.5 342.5 L 1495.5 361.5 L 1476.5 361.5 Z M 1424.5 342.5 L 1442.5 342.5 L 1442.5 361.5 L 1424.5 361.5 Z M 1371.5 342.5 L 1390.5 342.5 L 1390.5 361.5 L 1371.5 361.5 Z M 1318.5 342.5 L 1337.5 342.5 L 1337.5 361.5 L 1318.5 361.5 Z M 1266.5 342.5 L 1284.5 342.5 L 1284.5 361.5 L 1266.5 361.5 Z M 1213.5 342.5 L 1232.5 342.5 L 1232.5 361.5 L 1213.5 361.5 Z M 1160.5 342.5 L 1179.5 342.5 L 1179.5 361.5 L 1160.5 361.5 Z M 1108.5 342.5 L 1126.5 342.5 L 1126.5 361.5 L 1108.5 361.5 Z M 1055.5 342.5 L 1073.5 342.5 L 1073.5 361.5 L 1055.5 361.5 Z M 1002.5 342.5 L 1021.5 342.5 L 1021.5 361.5 L 1002.5 361.5 Z M 949.5 342.5 L 968.5 342.5 L 968.5 361.5 L 949.5 361.5 Z M 897.5 342.5 L 915.5 342.5 L 915.5 361.5 L 897.5 361.5 Z M 844.5 342.5 L 863.5 342.5 L 863.5 361.5 L 844.5 361.5 Z M 791.5 342.5 L 810.5 342.5 L 810.5 361.5 L 791.5 361.5 Z M 739.5 342.5 L 757.5 342.5 L 757.5 361.5 L 739.5 361.5 Z M 686.5 342.5 L 705.5 342.5 L 705.5 361.5 L 686.5 361.5 Z M 633.5 342.5 L 652.5 342.5 L 652.5 361.5 L 633.5 361.5 Z M 581.5 342.5 L 599.5 342.5 L 599.5 361.5 L 581.5 361.5 Z M 528.5 342.5 L 547.5 342.5 L 547.5 361.5 L 528.5 361.5 Z M 475.5 342.5 L 494.5 342.5 L 494.5 361.5 L 475.5 361.5 Z M 423.5 342.5 L 441.5 342.5 L 441.5 361.5 L 423.5 361.5 Z M 370.5 342.5 L 389.5 342.5 L 389.5 361.5 L 370.5 361.5 Z M 317.5 342.5 L 336.5 342.5 L 336.5 361.5 L 317.5 361.5 Z M 265.5 342.5 L 283.5 342.5 L 283.5 361.5 L 265.5 361.5 Z M 633.5 484.5 L 652.5 484.5 L 652.5 490.5 L 633.5 490.5 Z M 1055.5 484.5 L 1073.5 484.5 L 1073.5 490.5 L 1055.5 490.5 Z M 1055.5 490.5 L 1073.5 490.5 L 1073.5 503.5 L 1055.5 503.5 Z M 633.5 490.5 L 652.5 490.5 L 652.5 503.5 L 633.5 503.5 Z M 1371.5 484.5 L 1390.5 484.5 L 1390.5 503.5 L 1371.5 503.5 Z M 212.5 708.5 L 231.5 708.5 L 231.5 726.5 L 212.5 726.5 Z M 1687.5 708.5 L 1706.5 708.5 L 1706.5 726.5 L 1687.5 726.5 Z M 1634.5 708.5 L 1653.5 708.5 L 1653.5 726.5 L 1634.5 726.5 Z M 1582.5 708.5 L 1600.5 708.5 L 1600.5 726.5 L 1582.5 726.5 Z M 1529.5 708.5 L 1548.5 708.5 L 1548.5 726.5 L 1529.5 726.5 Z M 1476.5 708.5 L 1495.5 708.5 L 1495.5 726.5 L 1476.5 726.5 Z M 1424.5 708.5 L 1442.5 708.5 L 1442.5 726.5 L 1424.5 726.5 Z M 1371.5 708.5 L 1390.5 708.5 L 1390.5 726.5 L 1371.5 726.5 Z M 1318.5 708.5 L 1337.5 708.5 L 1337.5 726.5 L 1318.5 726.5 Z M 1266.5 708.5 L 1284.5 708.5 L 1284.5 726.5 L 1266.5 726.5 Z M 1213.5 708.5 L 1232.5 708.5 L 1232.5 726.5 L 1213.5 726.5 Z M 1160.5 708.5 L 1179.5 708.5 L 1179.5 726.5 L 1160.5 726.5 Z M 1108.5 708.5 L 1126.5 708.5 L 1126.5 726.5 L 1108.5 726.5 Z M 1055.5 708.5 L 1073.5 708.5 L 1073.5 726.5 L 1055.5 726.5 Z M 1002.5 708.5 L 1021.5 708.5 L 1021.5 726.5 L 1002.5 726.5 Z M 949.5 708.5 L 968.5 708.5 L 968.5 726.5 L 949.5 726.5 Z M 897.5 708.5 L 915.5 708.5 L 915.5 726.5 L 897.5 726.5 Z M 844.5 708.5 L 863.5 708.5 L 863.5 726.5 L 844.5 726.5 Z M 791.5 708.5 L 810.5 708.5 L 810.5 726.5 L 791.5 726.5 Z M 739.5 708.5 L 757.5 708.5 L 757.5 726.5 L 739.5 726.5 Z M 686.5 708.5 L 705.5 708.5 L 705.5 726.5 L 686.5 726.5 Z M 633.5 708.5 L 652.5 708.5 L 652.5 726.5 L 633.5 726.5 Z M 581.5 708.5 L 599.5 708.5 L 599.5 726.5 L 581.5 726.5 Z M 528.5 708.5 L 547.5 708.5 L 547.5 726.5 L 528.5 726.5 Z M 475.5 708.5 L 494.5 708.5 L 494.5 726.5 L 475.5 726.5 Z M 423.5 708.5 L 441.5 708.5 L 441.5 726.5 L 423.5 726.5 Z M 370.5 708.5 L 389.5 708.5 L 389.5 726.5 L 370.5 726.5 Z M 317.5 708.5 L 336.5 708.5 L 336.5 726.5 L 317.5 726.5 Z M 265.5 708.5 L 283.5 708.5 L 283.5 726.5 L 265.5 726.5 Z M 265.5 708.5 "/>
 </clipPath>
-<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image451" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image423"/>
+  <use xlink:href="#image451"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface417">
+<g id="surface445">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -231,6 +231,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1571.304688 522.304688 L 1571.304688 545.824219 L 1567.917969 545.824219 L 1555.757812 526.757812 L 1555.757812 545.824219 L 1552.917969 545.824219 L 1552.917969 522.304688 L 1556.175781 522.304688 L 1568.46875 541.53125 L 1568.46875 522.304688 Z M 1571.304688 522.304688 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1529 554 L 1548 554 M 1529 535 L 1548 535 M 1529 535 L 1529 554 M 1548 535 L 1548 554 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1529 554 L 1548 554 M 1529 535 L 1548 535 M 1548 554 L 1548 535 M 1529 554 L 1529 535 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 195 357 L 195 366 M 190 362 L 199 362 M 194 363 L 196 363 M 194 361 L 196 361 M 194 361 L 194 363 M 196 361 L 196 363 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.svg b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.svg
index 5b9d7ac..95423cb 100644
--- a/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.svg
+++ b/cells/sdfrbp/sky130_fd_sc_hs__sdfrbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 343.5 L 1743.5 343.5 L 1743.5 535.5 L 174.5 535.5 Z M 1013.5 535.5 L 1483.5 535.5 L 1483.5 541.5 L 1013.5 541.5 Z M 1013.5 541.5 L 1168.5 541.5 L 1168.5 545.5 L 1013.5 545.5 Z M 1013.5 541.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 194.5 680.5 L 1724.5 680.5 L 1724.5 705.5 L 194.5 705.5 Z M 194.5 680.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 807.5 601.5 L 823.5 601.5 L 823.5 645.5 L 807.5 645.5 Z M 859.5 601.5 L 874.5 601.5 L 874.5 645.5 L 859.5 645.5 Z M 899.5 601.5 L 914.5 601.5 L 914.5 645.5 L 899.5 645.5 Z M 939.5 601.5 L 954.5 601.5 L 954.5 645.5 L 939.5 645.5 Z M 500.5 621.5 L 515.5 621.5 L 515.5 665.5 L 500.5 665.5 Z M 459.5 621.5 L 475.5 621.5 L 475.5 665.5 L 459.5 665.5 Z M 378.5 621.5 L 393.5 621.5 L 393.5 665.5 L 378.5 665.5 Z M 338.5 621.5 L 353.5 621.5 L 353.5 665.5 L 338.5 665.5 Z M 237.5 621.5 L 252.5 621.5 L 252.5 665.5 L 237.5 665.5 Z M 555.5 621.5 L 571.5 621.5 L 571.5 665.5 L 555.5 665.5 Z M 1099.5 601.5 L 1114.5 601.5 L 1114.5 667.5 L 1099.5 667.5 Z M 1054.5 601.5 L 1070.5 601.5 L 1070.5 667.5 L 1054.5 667.5 Z M 1667.5 591.5 L 1682.5 591.5 L 1682.5 667.5 L 1667.5 667.5 Z M 661.5 591.5 L 676.5 591.5 L 676.5 667.5 L 661.5 667.5 Z M 1623.5 591.5 L 1638.5 591.5 L 1638.5 667.5 L 1623.5 667.5 Z M 1325.5 624.5 L 1340.5 624.5 L 1340.5 667.5 L 1325.5 667.5 Z M 1244.5 624.5 L 1259.5 624.5 L 1259.5 667.5 L 1244.5 667.5 Z M 1522.5 601.5 L 1537.5 601.5 L 1537.5 667.5 L 1522.5 667.5 Z M 1473.5 591.5 L 1488.5 591.5 L 1488.5 667.5 L 1473.5 667.5 Z M 1207.5 624.5 L 1222.5 624.5 L 1222.5 667.5 L 1207.5 667.5 Z M 705.5 591.5 L 721.5 591.5 L 721.5 667.5 L 705.5 667.5 Z M 1288.5 624.5 L 1303.5 624.5 L 1303.5 667.5 L 1288.5 667.5 Z M 1429.5 591.5 L 1444.5 591.5 L 1444.5 667.5 L 1429.5 667.5 Z M 1429.5 591.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1364.5 420.5 L 1379.5 420.5 L 1379.5 463.5 L 1364.5 463.5 Z M 1227.5 420.5 L 1242.5 420.5 L 1242.5 463.5 L 1227.5 463.5 Z M 1318.5 420.5 L 1333.5 420.5 L 1333.5 463.5 L 1318.5 463.5 Z M 1183.5 420.5 L 1199.5 420.5 L 1199.5 463.5 L 1183.5 463.5 Z M 336.5 401.5 L 352.5 401.5 L 352.5 467.5 L 336.5 467.5 Z M 455.5 401.5 L 470.5 401.5 L 470.5 467.5 L 455.5 467.5 Z M 498.5 401.5 L 513.5 401.5 L 513.5 467.5 L 498.5 467.5 Z M 557.5 401.5 L 572.5 401.5 L 572.5 467.5 L 557.5 467.5 Z M 238.5 401.5 L 253.5 401.5 L 253.5 467.5 L 238.5 467.5 Z M 379.5 401.5 L 395.5 401.5 L 395.5 467.5 L 379.5 467.5 Z M 860.5 427.5 L 875.5 427.5 L 875.5 470.5 L 860.5 470.5 Z M 960.5 427.5 L 975.5 427.5 L 975.5 470.5 L 960.5 470.5 Z M 813.5 427.5 L 829.5 427.5 L 829.5 470.5 L 813.5 470.5 Z M 900.5 427.5 L 915.5 427.5 L 915.5 470.5 L 900.5 470.5 Z M 1517.5 401.5 L 1533.5 401.5 L 1533.5 504.5 L 1517.5 504.5 Z M 1619.5 401.5 L 1634.5 401.5 L 1634.5 516.5 L 1619.5 516.5 Z M 710.5 401.5 L 725.5 401.5 L 725.5 516.5 L 710.5 516.5 Z M 1465.5 401.5 L 1481.5 401.5 L 1481.5 516.5 L 1465.5 516.5 Z M 1665.5 401.5 L 1681.5 401.5 L 1681.5 516.5 L 1665.5 516.5 Z M 1419.5 401.5 L 1434.5 401.5 L 1434.5 516.5 L 1419.5 516.5 Z M 664.5 401.5 L 679.5 401.5 L 679.5 516.5 L 664.5 516.5 Z M 1060.5 424.5 L 1076.5 424.5 L 1076.5 527.5 L 1060.5 527.5 Z M 1106.5 424.5 L 1122.5 424.5 L 1122.5 527.5 L 1106.5 527.5 Z M 1106.5 424.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 210.5 354.5 L 227.5 354.5 L 227.5 372.5 L 210.5 372.5 Z M 1691.5 354.5 L 1708.5 354.5 L 1708.5 372.5 L 1691.5 372.5 Z M 1641.5 354.5 L 1659.5 354.5 L 1659.5 372.5 L 1641.5 372.5 Z M 1592.5 354.5 L 1609.5 354.5 L 1609.5 372.5 L 1592.5 372.5 Z M 1542.5 354.5 L 1560.5 354.5 L 1560.5 372.5 L 1542.5 372.5 Z M 1493.5 354.5 L 1511.5 354.5 L 1511.5 372.5 L 1493.5 372.5 Z M 1444.5 354.5 L 1461.5 354.5 L 1461.5 372.5 L 1444.5 372.5 Z M 1394.5 354.5 L 1412.5 354.5 L 1412.5 372.5 L 1394.5 372.5 Z M 1345.5 354.5 L 1362.5 354.5 L 1362.5 372.5 L 1345.5 372.5 Z M 1296.5 354.5 L 1313.5 354.5 L 1313.5 372.5 L 1296.5 372.5 Z M 1246.5 354.5 L 1264.5 354.5 L 1264.5 372.5 L 1246.5 372.5 Z M 1197.5 354.5 L 1214.5 354.5 L 1214.5 372.5 L 1197.5 372.5 Z M 1148.5 354.5 L 1165.5 354.5 L 1165.5 372.5 L 1148.5 372.5 Z M 1098.5 354.5 L 1116.5 354.5 L 1116.5 372.5 L 1098.5 372.5 Z M 1049.5 354.5 L 1066.5 354.5 L 1066.5 372.5 L 1049.5 372.5 Z M 999.5 354.5 L 1017.5 354.5 L 1017.5 372.5 L 999.5 372.5 Z M 950.5 354.5 L 968.5 354.5 L 968.5 372.5 L 950.5 372.5 Z M 901.5 354.5 L 918.5 354.5 L 918.5 372.5 L 901.5 372.5 Z M 851.5 354.5 L 869.5 354.5 L 869.5 372.5 L 851.5 372.5 Z M 802.5 354.5 L 819.5 354.5 L 819.5 372.5 L 802.5 372.5 Z M 753.5 354.5 L 770.5 354.5 L 770.5 372.5 L 753.5 372.5 Z M 703.5 354.5 L 721.5 354.5 L 721.5 372.5 L 703.5 372.5 Z M 654.5 354.5 L 671.5 354.5 L 671.5 372.5 L 654.5 372.5 Z M 604.5 354.5 L 622.5 354.5 L 622.5 372.5 L 604.5 372.5 Z M 555.5 354.5 L 573.5 354.5 L 573.5 372.5 L 555.5 372.5 Z M 506.5 354.5 L 523.5 354.5 L 523.5 372.5 L 506.5 372.5 Z M 456.5 354.5 L 474.5 354.5 L 474.5 372.5 L 456.5 372.5 Z M 407.5 354.5 L 425.5 354.5 L 425.5 372.5 L 407.5 372.5 Z M 358.5 354.5 L 375.5 354.5 L 375.5 372.5 L 358.5 372.5 Z M 308.5 354.5 L 326.5 354.5 L 326.5 372.5 L 308.5 372.5 Z M 259.5 354.5 L 276.5 354.5 L 276.5 372.5 L 259.5 372.5 Z M 604.5 487.5 L 622.5 487.5 L 622.5 492.5 L 604.5 492.5 Z M 1296.5 487.5 L 1313.5 487.5 L 1313.5 492.5 L 1296.5 492.5 Z M 999.5 487.5 L 1017.5 487.5 L 1017.5 495.5 L 999.5 495.5 Z M 999.5 495.5 L 1017.5 495.5 L 1017.5 505.5 L 999.5 505.5 Z M 604.5 492.5 L 622.5 492.5 L 622.5 505.5 L 604.5 505.5 Z M 1296.5 492.5 L 1313.5 492.5 L 1313.5 505.5 L 1296.5 505.5 Z M 210.5 697.5 L 227.5 697.5 L 227.5 714.5 L 210.5 714.5 Z M 1691.5 697.5 L 1708.5 697.5 L 1708.5 714.5 L 1691.5 714.5 Z M 1641.5 697.5 L 1659.5 697.5 L 1659.5 714.5 L 1641.5 714.5 Z M 1592.5 697.5 L 1609.5 697.5 L 1609.5 714.5 L 1592.5 714.5 Z M 1542.5 697.5 L 1560.5 697.5 L 1560.5 714.5 L 1542.5 714.5 Z M 1493.5 697.5 L 1511.5 697.5 L 1511.5 714.5 L 1493.5 714.5 Z M 1444.5 697.5 L 1461.5 697.5 L 1461.5 714.5 L 1444.5 714.5 Z M 1394.5 697.5 L 1412.5 697.5 L 1412.5 714.5 L 1394.5 714.5 Z M 1345.5 697.5 L 1362.5 697.5 L 1362.5 714.5 L 1345.5 714.5 Z M 1296.5 697.5 L 1313.5 697.5 L 1313.5 714.5 L 1296.5 714.5 Z M 1246.5 697.5 L 1264.5 697.5 L 1264.5 714.5 L 1246.5 714.5 Z M 1197.5 697.5 L 1214.5 697.5 L 1214.5 714.5 L 1197.5 714.5 Z M 1148.5 697.5 L 1165.5 697.5 L 1165.5 714.5 L 1148.5 714.5 Z M 1098.5 697.5 L 1116.5 697.5 L 1116.5 714.5 L 1098.5 714.5 Z M 1049.5 697.5 L 1066.5 697.5 L 1066.5 714.5 L 1049.5 714.5 Z M 999.5 697.5 L 1017.5 697.5 L 1017.5 714.5 L 999.5 714.5 Z M 950.5 697.5 L 968.5 697.5 L 968.5 714.5 L 950.5 714.5 Z M 901.5 697.5 L 918.5 697.5 L 918.5 714.5 L 901.5 714.5 Z M 851.5 697.5 L 869.5 697.5 L 869.5 714.5 L 851.5 714.5 Z M 802.5 697.5 L 819.5 697.5 L 819.5 714.5 L 802.5 714.5 Z M 753.5 697.5 L 770.5 697.5 L 770.5 714.5 L 753.5 714.5 Z M 703.5 697.5 L 721.5 697.5 L 721.5 714.5 L 703.5 714.5 Z M 654.5 697.5 L 671.5 697.5 L 671.5 714.5 L 654.5 714.5 Z M 604.5 697.5 L 622.5 697.5 L 622.5 714.5 L 604.5 714.5 Z M 555.5 697.5 L 573.5 697.5 L 573.5 714.5 L 555.5 714.5 Z M 506.5 697.5 L 523.5 697.5 L 523.5 714.5 L 506.5 714.5 Z M 456.5 697.5 L 474.5 697.5 L 474.5 714.5 L 456.5 714.5 Z M 407.5 697.5 L 425.5 697.5 L 425.5 714.5 L 407.5 714.5 Z M 358.5 697.5 L 375.5 697.5 L 375.5 714.5 L 358.5 714.5 Z M 308.5 697.5 L 326.5 697.5 L 326.5 714.5 L 308.5 714.5 Z M 259.5 697.5 L 276.5 697.5 L 276.5 714.5 L 259.5 714.5 Z M 259.5 697.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface370">
+<g id="surface399">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -199,6 +199,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 1481.757812 523.84375 L 1481.757812 545.316406 L 1478.664062 545.316406 L 1467.5625 527.910156 L 1467.5625 545.316406 L 1464.96875 545.316406 L 1464.96875 523.84375 L 1467.945312 523.84375 L 1479.167969 541.398438 L 1479.167969 523.84375 Z M 1481.757812 523.84375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1444 554 L 1461 554 M 1444 536 L 1461 536 M 1444 536 L 1444 554 M 1461 536 L 1461 554 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1444 554 L 1461 554 M 1444 536 L 1461 536 M 1461 554 L 1461 536 M 1444 554 L 1444 536 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 194 369 L 194 378 M 189 374 L 198 374 M 193 375 L 195 375 M 193 373 L 195 373 M 193 373 L 193 375 M 195 373 L 195 375 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.svg b/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.svg
index 07ca082..a9251a8 100644
--- a/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.svg
+++ b/cells/sdfrtn/sky130_fd_sc_hs__sdfrtn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 331.5 L 1743.5 331.5 L 1743.5 522.5 L 174.5 522.5 Z M 1262.5 522.5 L 1743.5 522.5 L 1743.5 535.5 L 1262.5 535.5 Z M 174.5 522.5 L 853.5 522.5 L 853.5 535.5 L 174.5 535.5 Z M 174.5 522.5 "/>
 </clipPath>
-<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 195.5 690.5 L 1723.5 690.5 L 1723.5 717.5 L 195.5 717.5 Z M 195.5 690.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1181.5 568.5 L 1197.5 568.5 L 1197.5 638.5 L 1181.5 638.5 Z M 1103.5 568.5 L 1120.5 568.5 L 1120.5 638.5 L 1103.5 638.5 Z M 953.5 599.5 L 969.5 599.5 L 969.5 645.5 L 953.5 645.5 Z M 996.5 599.5 L 1012.5 599.5 L 1012.5 645.5 L 996.5 645.5 Z M 877.5 599.5 L 893.5 599.5 L 893.5 645.5 L 877.5 645.5 Z M 1038.5 599.5 L 1055.5 599.5 L 1055.5 645.5 L 1038.5 645.5 Z M 241.5 623.5 L 258.5 623.5 L 258.5 669.5 L 241.5 669.5 Z M 768.5 587.5 L 784.5 587.5 L 784.5 669.5 L 768.5 669.5 Z M 474.5 626.5 L 490.5 626.5 L 490.5 672.5 L 474.5 672.5 Z M 517.5 626.5 L 533.5 626.5 L 533.5 672.5 L 517.5 672.5 Z M 565.5 626.5 L 581.5 626.5 L 581.5 672.5 L 565.5 672.5 Z M 356.5 626.5 L 373.5 626.5 L 373.5 672.5 L 356.5 672.5 Z M 396.5 626.5 L 412.5 626.5 L 412.5 672.5 L 396.5 672.5 Z M 1316.5 630.5 L 1332.5 630.5 L 1332.5 676.5 L 1316.5 676.5 Z M 1596.5 616.5 L 1613.5 616.5 L 1613.5 676.5 L 1596.5 676.5 Z M 1660.5 595.5 L 1676.5 595.5 L 1676.5 676.5 L 1660.5 676.5 Z M 1464.5 630.5 L 1481.5 630.5 L 1481.5 676.5 L 1464.5 676.5 Z M 1421.5 630.5 L 1438.5 630.5 L 1438.5 676.5 L 1421.5 676.5 Z M 1360.5 630.5 L 1376.5 630.5 L 1376.5 676.5 L 1360.5 676.5 Z M 647.5 595.5 L 664.5 595.5 L 664.5 676.5 L 647.5 676.5 Z M 647.5 595.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1478.5 392.5 L 1495.5 392.5 L 1495.5 438.5 L 1478.5 438.5 Z M 1429.5 392.5 L 1445.5 392.5 L 1445.5 438.5 L 1429.5 438.5 Z M 1030.5 392.5 L 1047.5 392.5 L 1047.5 438.5 L 1030.5 438.5 Z M 1344.5 392.5 L 1360.5 392.5 L 1360.5 438.5 L 1344.5 438.5 Z M 981.5 392.5 L 997.5 392.5 L 997.5 438.5 L 981.5 438.5 Z M 938.5 392.5 L 954.5 392.5 L 954.5 438.5 L 938.5 438.5 Z M 1299.5 392.5 L 1315.5 392.5 L 1315.5 438.5 L 1299.5 438.5 Z M 889.5 392.5 L 905.5 392.5 L 905.5 438.5 L 889.5 438.5 Z M 242.5 392.5 L 259.5 392.5 L 259.5 462.5 L 242.5 462.5 Z M 480.5 392.5 L 496.5 392.5 L 496.5 462.5 L 480.5 462.5 Z M 334.5 392.5 L 351.5 392.5 L 351.5 462.5 L 334.5 462.5 Z M 437.5 392.5 L 453.5 392.5 L 453.5 462.5 L 437.5 462.5 Z M 292.5 392.5 L 308.5 392.5 L 308.5 462.5 L 292.5 462.5 Z M 548.5 392.5 L 564.5 392.5 L 564.5 462.5 L 548.5 462.5 Z M 1595.5 392.5 L 1611.5 392.5 L 1611.5 484.5 L 1595.5 484.5 Z M 1242.5 392.5 L 1259.5 392.5 L 1259.5 502.5 L 1242.5 502.5 Z M 1140.5 392.5 L 1156.5 392.5 L 1156.5 502.5 L 1140.5 502.5 Z M 778.5 392.5 L 794.5 392.5 L 794.5 515.5 L 778.5 515.5 Z M 667.5 392.5 L 683.5 392.5 L 683.5 515.5 L 667.5 515.5 Z M 1658.5 392.5 L 1675.5 392.5 L 1675.5 515.5 L 1658.5 515.5 Z M 1658.5 392.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 212.5 342.5 L 231.5 342.5 L 231.5 361.5 L 212.5 361.5 Z M 1687.5 342.5 L 1706.5 342.5 L 1706.5 361.5 L 1687.5 361.5 Z M 1634.5 342.5 L 1653.5 342.5 L 1653.5 361.5 L 1634.5 361.5 Z M 1582.5 342.5 L 1600.5 342.5 L 1600.5 361.5 L 1582.5 361.5 Z M 1529.5 342.5 L 1548.5 342.5 L 1548.5 361.5 L 1529.5 361.5 Z M 1476.5 342.5 L 1495.5 342.5 L 1495.5 361.5 L 1476.5 361.5 Z M 1424.5 342.5 L 1442.5 342.5 L 1442.5 361.5 L 1424.5 361.5 Z M 1371.5 342.5 L 1390.5 342.5 L 1390.5 361.5 L 1371.5 361.5 Z M 1318.5 342.5 L 1337.5 342.5 L 1337.5 361.5 L 1318.5 361.5 Z M 1266.5 342.5 L 1284.5 342.5 L 1284.5 361.5 L 1266.5 361.5 Z M 1213.5 342.5 L 1232.5 342.5 L 1232.5 361.5 L 1213.5 361.5 Z M 1160.5 342.5 L 1179.5 342.5 L 1179.5 361.5 L 1160.5 361.5 Z M 1108.5 342.5 L 1126.5 342.5 L 1126.5 361.5 L 1108.5 361.5 Z M 1055.5 342.5 L 1073.5 342.5 L 1073.5 361.5 L 1055.5 361.5 Z M 1002.5 342.5 L 1021.5 342.5 L 1021.5 361.5 L 1002.5 361.5 Z M 949.5 342.5 L 968.5 342.5 L 968.5 361.5 L 949.5 361.5 Z M 897.5 342.5 L 915.5 342.5 L 915.5 361.5 L 897.5 361.5 Z M 844.5 342.5 L 863.5 342.5 L 863.5 361.5 L 844.5 361.5 Z M 791.5 342.5 L 810.5 342.5 L 810.5 361.5 L 791.5 361.5 Z M 739.5 342.5 L 757.5 342.5 L 757.5 361.5 L 739.5 361.5 Z M 686.5 342.5 L 705.5 342.5 L 705.5 361.5 L 686.5 361.5 Z M 633.5 342.5 L 652.5 342.5 L 652.5 361.5 L 633.5 361.5 Z M 581.5 342.5 L 599.5 342.5 L 599.5 361.5 L 581.5 361.5 Z M 528.5 342.5 L 547.5 342.5 L 547.5 361.5 L 528.5 361.5 Z M 475.5 342.5 L 494.5 342.5 L 494.5 361.5 L 475.5 361.5 Z M 423.5 342.5 L 441.5 342.5 L 441.5 361.5 L 423.5 361.5 Z M 370.5 342.5 L 389.5 342.5 L 389.5 361.5 L 370.5 361.5 Z M 317.5 342.5 L 336.5 342.5 L 336.5 361.5 L 317.5 361.5 Z M 265.5 342.5 L 283.5 342.5 L 283.5 361.5 L 265.5 361.5 Z M 1055.5 525.5 L 1073.5 525.5 L 1073.5 528.5 L 1055.5 528.5 Z M 581.5 525.5 L 599.5 525.5 L 599.5 541.5 L 581.5 541.5 Z M 581.5 541.5 L 599.5 541.5 L 599.5 544.5 L 581.5 544.5 Z M 1424.5 525.5 L 1442.5 525.5 L 1442.5 544.5 L 1424.5 544.5 Z M 1055.5 528.5 L 1073.5 528.5 L 1073.5 544.5 L 1055.5 544.5 Z M 212.5 708.5 L 231.5 708.5 L 231.5 726.5 L 212.5 726.5 Z M 1687.5 708.5 L 1706.5 708.5 L 1706.5 726.5 L 1687.5 726.5 Z M 1634.5 708.5 L 1653.5 708.5 L 1653.5 726.5 L 1634.5 726.5 Z M 1582.5 708.5 L 1600.5 708.5 L 1600.5 726.5 L 1582.5 726.5 Z M 1529.5 708.5 L 1548.5 708.5 L 1548.5 726.5 L 1529.5 726.5 Z M 1476.5 708.5 L 1495.5 708.5 L 1495.5 726.5 L 1476.5 726.5 Z M 1424.5 708.5 L 1442.5 708.5 L 1442.5 726.5 L 1424.5 726.5 Z M 1371.5 708.5 L 1390.5 708.5 L 1390.5 726.5 L 1371.5 726.5 Z M 1318.5 708.5 L 1337.5 708.5 L 1337.5 726.5 L 1318.5 726.5 Z M 1266.5 708.5 L 1284.5 708.5 L 1284.5 726.5 L 1266.5 726.5 Z M 1213.5 708.5 L 1232.5 708.5 L 1232.5 726.5 L 1213.5 726.5 Z M 1160.5 708.5 L 1179.5 708.5 L 1179.5 726.5 L 1160.5 726.5 Z M 1108.5 708.5 L 1126.5 708.5 L 1126.5 726.5 L 1108.5 726.5 Z M 1055.5 708.5 L 1073.5 708.5 L 1073.5 726.5 L 1055.5 726.5 Z M 1002.5 708.5 L 1021.5 708.5 L 1021.5 726.5 L 1002.5 726.5 Z M 949.5 708.5 L 968.5 708.5 L 968.5 726.5 L 949.5 726.5 Z M 897.5 708.5 L 915.5 708.5 L 915.5 726.5 L 897.5 726.5 Z M 844.5 708.5 L 863.5 708.5 L 863.5 726.5 L 844.5 726.5 Z M 791.5 708.5 L 810.5 708.5 L 810.5 726.5 L 791.5 726.5 Z M 739.5 708.5 L 757.5 708.5 L 757.5 726.5 L 739.5 726.5 Z M 686.5 708.5 L 705.5 708.5 L 705.5 726.5 L 686.5 726.5 Z M 633.5 708.5 L 652.5 708.5 L 652.5 726.5 L 633.5 726.5 Z M 581.5 708.5 L 599.5 708.5 L 599.5 726.5 L 581.5 726.5 Z M 528.5 708.5 L 547.5 708.5 L 547.5 726.5 L 528.5 726.5 Z M 475.5 708.5 L 494.5 708.5 L 494.5 726.5 L 475.5 726.5 Z M 423.5 708.5 L 441.5 708.5 L 441.5 726.5 L 423.5 726.5 Z M 370.5 708.5 L 389.5 708.5 L 389.5 726.5 L 370.5 726.5 Z M 317.5 708.5 L 336.5 708.5 L 336.5 726.5 L 317.5 726.5 Z M 265.5 708.5 L 283.5 708.5 L 283.5 726.5 L 265.5 726.5 Z M 265.5 708.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image402"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface396">
+<g id="surface423">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -212,6 +212,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 372.371094 505.5 L 372.371094 481.984375 L 381.433594 481.984375 L 382.855469 482.082031 L 384.175781 482.339844 L 385.402344 482.789062 L 386.53125 483.371094 L 387.53125 484.175781 L 388.46875 485.113281 L 389.242188 486.242188 L 389.886719 487.46875 L 390.371094 488.855469 L 390.726562 490.339844 L 390.917969 491.984375 L 391.015625 493.726562 L 390.917969 495.566406 L 390.695312 497.273438 L 390.304688 498.824219 L 389.789062 500.242188 L 389.113281 501.5 L 388.273438 502.597656 L 387.371094 503.5 L 386.371094 504.210938 L 385.273438 504.789062 L 384.082031 505.175781 L 382.789062 505.433594 L 381.433594 505.5 Z M 375.371094 502.855469 L 380.917969 502.855469 L 382.402344 502.757812 L 383.726562 502.402344 L 384.886719 501.789062 L 385.855469 500.984375 L 386.628906 499.886719 L 387.273438 498.566406 L 387.46875 497.886719 L 387.660156 497.175781 L 387.824219 496.402344 L 387.917969 495.566406 L 387.984375 494.695312 L 388.015625 493.757812 L 387.886719 491.660156 L 387.566406 489.824219 L 386.984375 488.242188 L 386.210938 486.984375 L 385.210938 485.953125 L 383.984375 485.210938 L 383.53125 485.046875 L 383.046875 484.886719 L 382.53125 484.789062 L 382.015625 484.695312 L 381.46875 484.660156 L 380.917969 484.628906 L 375.371094 484.628906 Z M 375.371094 502.855469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 370 595 L 389 595 M 370 576 L 389 576 M 370 576 L 370 595 M 389 576 L 389 595 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 595 L 389 595 M 370 576 L 389 576 M 389 595 L 389 576 M 370 595 L 370 576 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 195 357 L 195 366 M 190 362 L 199 362 M 194 363 L 196 363 M 194 361 L 196 361 M 194 361 L 194 363 M 196 361 L 196 363 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.svg b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.svg
index 9b1bd68..4e0fe88 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.svg
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 324.5 L 1743.5 324.5 L 1743.5 535.5 L 174.5 535.5 Z M 1120.5 535.5 L 1293.5 535.5 L 1293.5 547.5 L 1120.5 547.5 Z M 1120.5 535.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 196.5 695.5 L 1722.5 695.5 L 1722.5 723.5 L 196.5 723.5 Z M 196.5 695.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image390"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 927.5 609.5 L 944.5 609.5 L 944.5 656.5 L 927.5 656.5 Z M 972.5 609.5 L 989.5 609.5 L 989.5 656.5 L 972.5 656.5 Z M 879.5 609.5 L 896.5 609.5 L 896.5 656.5 L 879.5 656.5 Z M 1016.5 609.5 L 1033.5 609.5 L 1033.5 656.5 L 1016.5 656.5 Z M 243.5 626.5 L 260.5 626.5 L 260.5 673.5 L 243.5 673.5 Z M 532.5 630.5 L 549.5 630.5 L 549.5 677.5 L 532.5 677.5 Z M 488.5 630.5 L 505.5 630.5 L 505.5 677.5 L 488.5 677.5 Z M 602.5 630.5 L 619.5 630.5 L 619.5 677.5 L 602.5 677.5 Z M 356.5 630.5 L 373.5 630.5 L 373.5 677.5 L 356.5 677.5 Z M 400.5 630.5 L 417.5 630.5 L 417.5 677.5 L 400.5 677.5 Z M 1169.5 609.5 L 1186.5 609.5 L 1186.5 681.5 L 1169.5 681.5 Z M 1544.5 619.5 L 1561.5 619.5 L 1561.5 681.5 L 1544.5 681.5 Z M 766.5 597.5 L 783.5 597.5 L 783.5 681.5 L 766.5 681.5 Z M 717.5 597.5 L 734.5 597.5 L 734.5 681.5 L 717.5 681.5 Z M 1431.5 634.5 L 1448.5 634.5 L 1448.5 681.5 L 1431.5 681.5 Z M 1298.5 634.5 L 1315.5 634.5 L 1315.5 681.5 L 1298.5 681.5 Z M 1339.5 634.5 L 1356.5 634.5 L 1356.5 681.5 L 1339.5 681.5 Z M 1391.5 634.5 L 1408.5 634.5 L 1408.5 681.5 L 1391.5 681.5 Z M 1657.5 597.5 L 1674.5 597.5 L 1674.5 681.5 L 1657.5 681.5 Z M 1120.5 609.5 L 1137.5 609.5 L 1137.5 681.5 L 1120.5 681.5 Z M 1120.5 609.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image364"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1474.5 387.5 L 1491.5 387.5 L 1491.5 435.5 L 1474.5 435.5 Z M 1358.5 387.5 L 1375.5 387.5 L 1375.5 435.5 L 1358.5 435.5 Z M 1423.5 387.5 L 1440.5 387.5 L 1440.5 435.5 L 1423.5 435.5 Z M 1310.5 387.5 L 1327.5 387.5 L 1327.5 435.5 L 1310.5 435.5 Z M 244.5 387.5 L 261.5 387.5 L 261.5 460.5 L 244.5 460.5 Z M 484.5 387.5 L 501.5 387.5 L 501.5 460.5 L 484.5 460.5 Z M 301.5 387.5 L 318.5 387.5 L 318.5 460.5 L 301.5 460.5 Z M 532.5 387.5 L 549.5 387.5 L 549.5 460.5 L 532.5 460.5 Z M 596.5 387.5 L 613.5 387.5 L 613.5 460.5 L 596.5 460.5 Z M 349.5 387.5 L 366.5 387.5 L 366.5 460.5 L 349.5 460.5 Z M 1060.5 414.5 L 1077.5 414.5 L 1077.5 462.5 L 1060.5 462.5 Z M 941.5 414.5 L 958.5 414.5 L 958.5 462.5 L 941.5 462.5 Z M 989.5 414.5 L 1006.5 414.5 L 1006.5 462.5 L 989.5 462.5 Z M 884.5 416.5 L 901.5 416.5 L 901.5 464.5 L 884.5 464.5 Z M 1540.5 387.5 L 1557.5 387.5 L 1557.5 483.5 L 1540.5 483.5 Z M 1655.5 387.5 L 1672.5 387.5 L 1672.5 514.5 L 1655.5 514.5 Z M 766.5 387.5 L 783.5 387.5 L 783.5 514.5 L 766.5 514.5 Z M 714.5 387.5 L 731.5 387.5 L 731.5 514.5 L 714.5 514.5 Z M 1225.5 413.5 L 1242.5 413.5 L 1242.5 526.5 L 1225.5 526.5 Z M 1174.5 413.5 L 1191.5 413.5 L 1191.5 526.5 L 1174.5 526.5 Z M 1174.5 413.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 213.5 336.5 L 232.5 336.5 L 232.5 355.5 L 213.5 355.5 Z M 1685.5 336.5 L 1704.5 336.5 L 1704.5 355.5 L 1685.5 355.5 Z M 1630.5 336.5 L 1649.5 336.5 L 1649.5 355.5 L 1630.5 355.5 Z M 1576.5 336.5 L 1595.5 336.5 L 1595.5 355.5 L 1576.5 355.5 Z M 1521.5 336.5 L 1540.5 336.5 L 1540.5 355.5 L 1521.5 355.5 Z M 1467.5 336.5 L 1486.5 336.5 L 1486.5 355.5 L 1467.5 355.5 Z M 1412.5 336.5 L 1431.5 336.5 L 1431.5 355.5 L 1412.5 355.5 Z M 1358.5 336.5 L 1377.5 336.5 L 1377.5 355.5 L 1358.5 355.5 Z M 1303.5 336.5 L 1322.5 336.5 L 1322.5 355.5 L 1303.5 355.5 Z M 1249.5 336.5 L 1268.5 336.5 L 1268.5 355.5 L 1249.5 355.5 Z M 1194.5 336.5 L 1213.5 336.5 L 1213.5 355.5 L 1194.5 355.5 Z M 1140.5 336.5 L 1159.5 336.5 L 1159.5 355.5 L 1140.5 355.5 Z M 1085.5 336.5 L 1104.5 336.5 L 1104.5 355.5 L 1085.5 355.5 Z M 1031.5 336.5 L 1050.5 336.5 L 1050.5 355.5 L 1031.5 355.5 Z M 976.5 336.5 L 995.5 336.5 L 995.5 355.5 L 976.5 355.5 Z M 922.5 336.5 L 941.5 336.5 L 941.5 355.5 L 922.5 355.5 Z M 867.5 336.5 L 886.5 336.5 L 886.5 355.5 L 867.5 355.5 Z M 813.5 336.5 L 832.5 336.5 L 832.5 355.5 L 813.5 355.5 Z M 758.5 336.5 L 777.5 336.5 L 777.5 355.5 L 758.5 355.5 Z M 704.5 336.5 L 723.5 336.5 L 723.5 355.5 L 704.5 355.5 Z M 649.5 336.5 L 668.5 336.5 L 668.5 355.5 L 649.5 355.5 Z M 595.5 336.5 L 614.5 336.5 L 614.5 355.5 L 595.5 355.5 Z M 540.5 336.5 L 559.5 336.5 L 559.5 355.5 L 540.5 355.5 Z M 486.5 336.5 L 505.5 336.5 L 505.5 355.5 L 486.5 355.5 Z M 431.5 336.5 L 450.5 336.5 L 450.5 355.5 L 431.5 355.5 Z M 377.5 336.5 L 396.5 336.5 L 396.5 355.5 L 377.5 355.5 Z M 322.5 336.5 L 341.5 336.5 L 341.5 355.5 L 322.5 355.5 Z M 268.5 336.5 L 287.5 336.5 L 287.5 355.5 L 268.5 355.5 Z M 649.5 483.5 L 668.5 483.5 L 668.5 487.5 L 649.5 487.5 Z M 1412.5 483.5 L 1431.5 483.5 L 1431.5 488.5 L 1412.5 488.5 Z M 1085.5 483.5 L 1104.5 483.5 L 1104.5 489.5 L 1085.5 489.5 Z M 1085.5 489.5 L 1104.5 489.5 L 1104.5 502.5 L 1085.5 502.5 Z M 1412.5 488.5 L 1431.5 488.5 L 1431.5 502.5 L 1412.5 502.5 Z M 649.5 487.5 L 668.5 487.5 L 668.5 502.5 L 649.5 502.5 Z M 213.5 714.5 L 232.5 714.5 L 232.5 733.5 L 213.5 733.5 Z M 1685.5 714.5 L 1704.5 714.5 L 1704.5 733.5 L 1685.5 733.5 Z M 1630.5 714.5 L 1649.5 714.5 L 1649.5 733.5 L 1630.5 733.5 Z M 1576.5 714.5 L 1595.5 714.5 L 1595.5 733.5 L 1576.5 733.5 Z M 1521.5 714.5 L 1540.5 714.5 L 1540.5 733.5 L 1521.5 733.5 Z M 1467.5 714.5 L 1486.5 714.5 L 1486.5 733.5 L 1467.5 733.5 Z M 1412.5 714.5 L 1431.5 714.5 L 1431.5 733.5 L 1412.5 733.5 Z M 1358.5 714.5 L 1377.5 714.5 L 1377.5 733.5 L 1358.5 733.5 Z M 1303.5 714.5 L 1322.5 714.5 L 1322.5 733.5 L 1303.5 733.5 Z M 1249.5 714.5 L 1268.5 714.5 L 1268.5 733.5 L 1249.5 733.5 Z M 1194.5 714.5 L 1213.5 714.5 L 1213.5 733.5 L 1194.5 733.5 Z M 1140.5 714.5 L 1159.5 714.5 L 1159.5 733.5 L 1140.5 733.5 Z M 1085.5 714.5 L 1104.5 714.5 L 1104.5 733.5 L 1085.5 733.5 Z M 1031.5 714.5 L 1050.5 714.5 L 1050.5 733.5 L 1031.5 733.5 Z M 976.5 714.5 L 995.5 714.5 L 995.5 733.5 L 976.5 733.5 Z M 922.5 714.5 L 941.5 714.5 L 941.5 733.5 L 922.5 733.5 Z M 867.5 714.5 L 886.5 714.5 L 886.5 733.5 L 867.5 733.5 Z M 813.5 714.5 L 832.5 714.5 L 832.5 733.5 L 813.5 733.5 Z M 758.5 714.5 L 777.5 714.5 L 777.5 733.5 L 758.5 733.5 Z M 704.5 714.5 L 723.5 714.5 L 723.5 733.5 L 704.5 733.5 Z M 649.5 714.5 L 668.5 714.5 L 668.5 733.5 L 649.5 733.5 Z M 595.5 714.5 L 614.5 714.5 L 614.5 733.5 L 595.5 733.5 Z M 540.5 714.5 L 559.5 714.5 L 559.5 733.5 L 540.5 733.5 Z M 486.5 714.5 L 505.5 714.5 L 505.5 733.5 L 486.5 733.5 Z M 431.5 714.5 L 450.5 714.5 L 450.5 733.5 L 431.5 733.5 Z M 377.5 714.5 L 396.5 714.5 L 396.5 733.5 L 377.5 733.5 Z M 322.5 714.5 L 341.5 714.5 L 341.5 733.5 L 322.5 733.5 Z M 268.5 714.5 L 287.5 714.5 L 287.5 733.5 L 268.5 733.5 Z M 268.5 714.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface360">
+<g id="surface387">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -202,6 +202,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 378.496094 630.5 L 378.496094 605.960938 L 387.953125 605.960938 L 389.433594 606.0625 L 390.816406 606.332031 L 392.09375 606.804688 L 393.273438 607.410156 L 394.316406 608.25 L 395.292969 609.226562 L 396.101562 610.40625 L 396.773438 611.683594 L 397.277344 613.132812 L 397.648438 614.679688 L 397.851562 616.394531 L 397.953125 618.214844 L 397.851562 620.132812 L 397.613281 621.917969 L 397.210938 623.53125 L 396.671875 625.011719 L 395.964844 626.324219 L 395.089844 627.46875 L 394.148438 628.414062 L 393.105469 629.152344 L 391.960938 629.757812 L 390.714844 630.164062 L 389.367188 630.433594 L 387.953125 630.5 Z M 381.625 627.738281 L 387.414062 627.738281 L 388.964844 627.640625 L 390.34375 627.269531 L 391.554688 626.628906 L 392.566406 625.789062 L 393.375 624.644531 L 394.046875 623.261719 L 394.25 622.554688 L 394.449219 621.816406 L 394.621094 621.007812 L 394.71875 620.132812 L 394.789062 619.222656 L 394.820312 618.246094 L 394.6875 616.058594 L 394.351562 614.140625 L 393.742188 612.492188 L 392.9375 611.179688 L 391.894531 610.101562 L 390.613281 609.328125 L 390.140625 609.160156 L 389.636719 608.992188 L 388.558594 608.789062 L 387.988281 608.753906 L 387.414062 608.722656 L 381.625 608.722656 Z M 381.625 627.738281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 377 470 L 396 470 M 377 451 L 396 451 M 377 451 L 377 470 M 396 451 L 396 470 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 377 470 L 396 470 M 377 451 L 396 451 M 396 470 L 396 451 M 377 470 L 377 451 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 351 L 196 360 M 191 356 L 200 356 M 195 357 L 197 357 M 195 355 L 197 355 M 195 355 L 195 357 M 197 355 L 197 357 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.svg b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.svg
index 43273d1..3cc29f2 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.svg
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1743.5 337.5 L 1743.5 535.5 L 174.5 535.5 Z M 1056.5 535.5 L 1232.5 535.5 L 1232.5 546.5 L 1056.5 546.5 Z M 1056.5 535.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 194.5 685.5 L 1723.5 685.5 L 1723.5 711.5 L 194.5 711.5 Z M 194.5 685.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 938.5 593.5 L 954.5 593.5 L 954.5 638.5 L 938.5 638.5 Z M 844.5 593.5 L 860.5 593.5 L 860.5 638.5 L 844.5 638.5 Z M 897.5 593.5 L 913.5 593.5 L 913.5 638.5 L 897.5 638.5 Z M 980.5 593.5 L 996.5 593.5 L 996.5 638.5 L 980.5 638.5 Z M 469.5 623.5 L 484.5 623.5 L 484.5 668.5 L 469.5 668.5 Z M 568.5 623.5 L 584.5 623.5 L 584.5 668.5 L 568.5 668.5 Z M 510.5 623.5 L 526.5 623.5 L 526.5 668.5 L 510.5 668.5 Z M 344.5 623.5 L 360.5 623.5 L 360.5 668.5 L 344.5 668.5 Z M 385.5 623.5 L 401.5 623.5 L 401.5 668.5 L 385.5 668.5 Z M 1281.5 627.5 L 1297.5 627.5 L 1297.5 672.5 L 1281.5 672.5 Z M 1093.5 593.5 L 1109.5 593.5 L 1109.5 672.5 L 1093.5 672.5 Z M 1512.5 604.5 L 1528.5 604.5 L 1528.5 672.5 L 1512.5 672.5 Z M 1662.5 593.5 L 1678.5 593.5 L 1678.5 672.5 L 1662.5 672.5 Z M 1617.5 593.5 L 1633.5 593.5 L 1633.5 672.5 L 1617.5 672.5 Z M 1146.5 593.5 L 1162.5 593.5 L 1162.5 672.5 L 1146.5 672.5 Z M 737.5 593.5 L 753.5 593.5 L 753.5 672.5 L 737.5 672.5 Z M 1368.5 627.5 L 1384.5 627.5 L 1384.5 672.5 L 1368.5 672.5 Z M 239.5 627.5 L 255.5 627.5 L 255.5 672.5 L 239.5 672.5 Z M 1323.5 627.5 L 1339.5 627.5 L 1339.5 672.5 L 1323.5 672.5 Z M 684.5 593.5 L 700.5 593.5 L 700.5 672.5 L 684.5 672.5 Z M 1407.5 627.5 L 1423.5 627.5 L 1423.5 672.5 L 1407.5 672.5 Z M 1407.5 627.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1439.5 397.5 L 1455.5 397.5 L 1455.5 441.5 L 1439.5 441.5 Z M 1391.5 397.5 L 1407.5 397.5 L 1407.5 441.5 L 1391.5 441.5 Z M 1301.5 397.5 L 1317.5 397.5 L 1317.5 441.5 L 1301.5 441.5 Z M 1260.5 397.5 L 1275.5 397.5 L 1275.5 441.5 L 1260.5 441.5 Z M 240.5 397.5 L 256.5 397.5 L 256.5 465.5 L 240.5 465.5 Z M 451.5 397.5 L 467.5 397.5 L 467.5 465.5 L 451.5 465.5 Z M 359.5 397.5 L 375.5 397.5 L 375.5 465.5 L 359.5 465.5 Z M 508.5 397.5 L 524.5 397.5 L 524.5 465.5 L 508.5 465.5 Z M 403.5 397.5 L 419.5 397.5 L 419.5 465.5 L 403.5 465.5 Z M 569.5 397.5 L 585.5 397.5 L 585.5 465.5 L 569.5 465.5 Z M 837.5 424.5 L 853.5 424.5 L 853.5 468.5 L 837.5 468.5 Z M 885.5 424.5 L 901.5 424.5 L 901.5 468.5 L 885.5 468.5 Z M 930.5 424.5 L 946.5 424.5 L 946.5 468.5 L 930.5 468.5 Z M 996.5 424.5 L 1012.5 424.5 L 1012.5 468.5 L 996.5 468.5 Z M 1501.5 397.5 L 1517.5 397.5 L 1517.5 503.5 L 1501.5 503.5 Z M 727.5 397.5 L 743.5 397.5 L 743.5 516.5 L 727.5 516.5 Z M 679.5 397.5 L 695.5 397.5 L 695.5 516.5 L 679.5 516.5 Z M 1608.5 397.5 L 1624.5 397.5 L 1624.5 516.5 L 1608.5 516.5 Z M 1656.5 397.5 L 1672.5 397.5 L 1672.5 516.5 L 1656.5 516.5 Z M 1169.5 410.5 L 1185.5 410.5 L 1185.5 517.5 L 1169.5 517.5 Z M 1103.5 421.5 L 1119.5 421.5 L 1119.5 527.5 L 1103.5 527.5 Z M 1103.5 421.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 211.5 348.5 L 229.5 348.5 L 229.5 366.5 L 211.5 366.5 Z M 1689.5 348.5 L 1707.5 348.5 L 1707.5 366.5 L 1689.5 366.5 Z M 1638.5 348.5 L 1656.5 348.5 L 1656.5 366.5 L 1638.5 366.5 Z M 1587.5 348.5 L 1605.5 348.5 L 1605.5 366.5 L 1587.5 366.5 Z M 1536.5 348.5 L 1554.5 348.5 L 1554.5 366.5 L 1536.5 366.5 Z M 1485.5 348.5 L 1503.5 348.5 L 1503.5 366.5 L 1485.5 366.5 Z M 1434.5 348.5 L 1452.5 348.5 L 1452.5 366.5 L 1434.5 366.5 Z M 1383.5 348.5 L 1401.5 348.5 L 1401.5 366.5 L 1383.5 366.5 Z M 1332.5 348.5 L 1350.5 348.5 L 1350.5 366.5 L 1332.5 366.5 Z M 1281.5 348.5 L 1299.5 348.5 L 1299.5 366.5 L 1281.5 366.5 Z M 1230.5 348.5 L 1248.5 348.5 L 1248.5 366.5 L 1230.5 366.5 Z M 1179.5 348.5 L 1197.5 348.5 L 1197.5 366.5 L 1179.5 366.5 Z M 1128.5 348.5 L 1146.5 348.5 L 1146.5 366.5 L 1128.5 366.5 Z M 1077.5 348.5 L 1095.5 348.5 L 1095.5 366.5 L 1077.5 366.5 Z M 1026.5 348.5 L 1044.5 348.5 L 1044.5 366.5 L 1026.5 366.5 Z M 975.5 348.5 L 993.5 348.5 L 993.5 366.5 L 975.5 366.5 Z M 924.5 348.5 L 942.5 348.5 L 942.5 366.5 L 924.5 366.5 Z M 873.5 348.5 L 891.5 348.5 L 891.5 366.5 L 873.5 366.5 Z M 822.5 348.5 L 840.5 348.5 L 840.5 366.5 L 822.5 366.5 Z M 771.5 348.5 L 789.5 348.5 L 789.5 366.5 L 771.5 366.5 Z M 720.5 348.5 L 738.5 348.5 L 738.5 366.5 L 720.5 366.5 Z M 669.5 348.5 L 687.5 348.5 L 687.5 366.5 L 669.5 366.5 Z M 618.5 348.5 L 636.5 348.5 L 636.5 366.5 L 618.5 366.5 Z M 567.5 348.5 L 585.5 348.5 L 585.5 366.5 L 567.5 366.5 Z M 516.5 348.5 L 534.5 348.5 L 534.5 366.5 L 516.5 366.5 Z M 465.5 348.5 L 483.5 348.5 L 483.5 366.5 L 465.5 366.5 Z M 414.5 348.5 L 432.5 348.5 L 432.5 366.5 L 414.5 366.5 Z M 363.5 348.5 L 381.5 348.5 L 381.5 366.5 L 363.5 366.5 Z M 312.5 348.5 L 331.5 348.5 L 331.5 366.5 L 312.5 366.5 Z M 261.5 348.5 L 280.5 348.5 L 280.5 366.5 L 261.5 366.5 Z M 618.5 486.5 L 636.5 486.5 L 636.5 490.5 L 618.5 490.5 Z M 1383.5 486.5 L 1401.5 486.5 L 1401.5 500.5 L 1383.5 500.5 Z M 1077.5 486.5 L 1095.5 486.5 L 1095.5 504.5 L 1077.5 504.5 Z M 1383.5 500.5 L 1401.5 500.5 L 1401.5 504.5 L 1383.5 504.5 Z M 618.5 490.5 L 636.5 490.5 L 636.5 504.5 L 618.5 504.5 Z M 211.5 702.5 L 229.5 702.5 L 229.5 720.5 L 211.5 720.5 Z M 1689.5 702.5 L 1707.5 702.5 L 1707.5 720.5 L 1689.5 720.5 Z M 1638.5 702.5 L 1656.5 702.5 L 1656.5 720.5 L 1638.5 720.5 Z M 1587.5 702.5 L 1605.5 702.5 L 1605.5 720.5 L 1587.5 720.5 Z M 1536.5 702.5 L 1554.5 702.5 L 1554.5 720.5 L 1536.5 720.5 Z M 1485.5 702.5 L 1503.5 702.5 L 1503.5 720.5 L 1485.5 720.5 Z M 1434.5 702.5 L 1452.5 702.5 L 1452.5 720.5 L 1434.5 720.5 Z M 1383.5 702.5 L 1401.5 702.5 L 1401.5 720.5 L 1383.5 720.5 Z M 1332.5 702.5 L 1350.5 702.5 L 1350.5 720.5 L 1332.5 720.5 Z M 1281.5 702.5 L 1299.5 702.5 L 1299.5 720.5 L 1281.5 720.5 Z M 1230.5 702.5 L 1248.5 702.5 L 1248.5 720.5 L 1230.5 720.5 Z M 1179.5 702.5 L 1197.5 702.5 L 1197.5 720.5 L 1179.5 720.5 Z M 1128.5 702.5 L 1146.5 702.5 L 1146.5 720.5 L 1128.5 720.5 Z M 1077.5 702.5 L 1095.5 702.5 L 1095.5 720.5 L 1077.5 720.5 Z M 1026.5 702.5 L 1044.5 702.5 L 1044.5 720.5 L 1026.5 720.5 Z M 975.5 702.5 L 993.5 702.5 L 993.5 720.5 L 975.5 720.5 Z M 924.5 702.5 L 942.5 702.5 L 942.5 720.5 L 924.5 720.5 Z M 873.5 702.5 L 891.5 702.5 L 891.5 720.5 L 873.5 720.5 Z M 822.5 702.5 L 840.5 702.5 L 840.5 720.5 L 822.5 720.5 Z M 771.5 702.5 L 789.5 702.5 L 789.5 720.5 L 771.5 720.5 Z M 720.5 702.5 L 738.5 702.5 L 738.5 720.5 L 720.5 720.5 Z M 669.5 702.5 L 687.5 702.5 L 687.5 720.5 L 669.5 720.5 Z M 618.5 702.5 L 636.5 702.5 L 636.5 720.5 L 618.5 720.5 Z M 567.5 702.5 L 585.5 702.5 L 585.5 720.5 L 567.5 720.5 Z M 516.5 702.5 L 534.5 702.5 L 534.5 720.5 L 516.5 720.5 Z M 465.5 702.5 L 483.5 702.5 L 483.5 720.5 L 465.5 720.5 Z M 414.5 702.5 L 432.5 702.5 L 432.5 720.5 L 414.5 720.5 Z M 363.5 702.5 L 381.5 702.5 L 381.5 720.5 L 363.5 720.5 Z M 312.5 702.5 L 331.5 702.5 L 331.5 720.5 L 312.5 720.5 Z M 261.5 702.5 L 280.5 702.5 L 280.5 720.5 L 261.5 720.5 Z M 261.5 702.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface349">
+<g id="surface377">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -190,6 +190,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1658.117188 584.710938 L 1656.667969 586.5 L 1653.425781 583.816406 L 1652.5 584.308594 L 1651.574219 584.679688 L 1650.621094 584.988281 L 1649.601562 585.203125 L 1648.582031 585.328125 L 1647.535156 585.390625 L 1646.113281 585.296875 L 1644.789062 585.082031 L 1643.554688 584.710938 L 1642.378906 584.214844 L 1641.269531 583.570312 L 1640.28125 582.734375 L 1639.386719 581.839844 L 1638.617188 580.824219 L 1638 579.710938 L 1637.476562 578.507812 L 1637.074219 577.210938 L 1636.828125 575.792969 L 1636.765625 575.453125 L 1636.734375 575.082031 L 1636.703125 574.742188 L 1636.671875 574.375 L 1636.671875 573.601562 L 1636.734375 572.058594 L 1636.949219 570.578125 L 1637.289062 569.222656 L 1637.785156 567.925781 L 1638.402344 566.722656 L 1639.203125 565.609375 L 1640.003906 564.714844 L 1640.929688 563.914062 L 1641.949219 563.234375 L 1643.027344 562.710938 L 1644.203125 562.277344 L 1645.496094 561.96875 L 1645.804688 561.9375 L 1646.144531 561.90625 L 1646.484375 561.878906 L 1646.824219 561.847656 L 1647.164062 561.847656 L 1647.535156 561.816406 L 1648.921875 561.90625 L 1650.25 562.125 L 1651.484375 562.496094 L 1652.65625 562.988281 L 1653.765625 563.636719 L 1654.785156 564.4375 L 1655.648438 565.363281 L 1656.421875 566.351562 L 1657.039062 567.429688 L 1657.5625 568.632812 L 1657.960938 569.929688 L 1658.242188 571.289062 L 1658.269531 571.6875 L 1658.363281 572.800781 L 1658.363281 573.171875 L 1658.394531 573.539062 L 1658.300781 575.269531 L 1658.023438 576.902344 L 1657.59375 578.414062 L 1656.976562 579.835938 L 1656.171875 581.132812 L 1655.214844 582.335938 Z M 1650.339844 578.355469 L 1653.085938 580.605469 L 1653.828125 579.679688 L 1654.445312 578.632812 L 1654.90625 577.488281 L 1655.246094 576.285156 L 1655.433594 574.992188 L 1655.523438 573.570312 L 1655.464844 572.277344 L 1655.277344 571.042969 L 1654.96875 569.898438 L 1654.570312 568.851562 L 1654.042969 567.863281 L 1653.394531 566.96875 L 1652.65625 566.226562 L 1651.882812 565.609375 L 1651.019531 565.117188 L 1650.09375 564.746094 L 1649.078125 564.5 L 1648.027344 564.347656 L 1647.535156 564.347656 L 1646.421875 564.4375 L 1645.375 564.625 L 1644.386719 564.933594 L 1643.492188 565.394531 L 1642.660156 565.980469 L 1641.917969 566.691406 L 1641.207031 567.523438 L 1640.652344 568.449219 L 1640.191406 569.46875 L 1639.851562 570.578125 L 1639.632812 571.78125 L 1639.542969 573.078125 L 1639.542969 573.601562 L 1639.574219 574.960938 L 1639.757812 576.195312 L 1640.066406 577.335938 L 1640.46875 578.414062 L 1641.023438 579.402344 L 1641.703125 580.265625 L 1642.410156 581.039062 L 1643.214844 581.65625 L 1644.078125 582.148438 L 1645.003906 582.488281 L 1646.023438 582.734375 L 1647.101562 582.828125 L 1647.164062 582.859375 L 1648.058594 582.859375 L 1648.644531 582.796875 L 1649.230469 582.675781 L 1649.785156 582.550781 L 1650.339844 582.367188 L 1650.929688 582.117188 L 1650.957031 582.117188 L 1651.019531 582.085938 L 1651.050781 582.058594 L 1651.113281 582.058594 L 1651.144531 582.027344 L 1651.207031 581.996094 L 1648.921875 580.082031 Z M 1650.339844 578.355469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1638 515 L 1656 515 M 1638 497 L 1656 497 M 1638 497 L 1638 515 M 1656 497 L 1656 515 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1638 515 L 1656 515 M 1638 497 L 1656 497 M 1656 515 L 1656 497 M 1638 515 L 1638 497 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 194 363 L 194 372 M 189 368 L 198 368 M 193 369 L 195 369 M 193 367 L 195 367 M 193 367 L 193 369 M 195 367 L 195 369 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.svg b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.svg
index 52ed378..407a034 100644
--- a/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.svg
+++ b/cells/sdfrtp/sky130_fd_sc_hs__sdfrtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 343.5 L 1743.5 343.5 L 1743.5 535.5 L 174.5 535.5 Z M 1029.5 535.5 L 1186.5 535.5 L 1186.5 545.5 L 1029.5 545.5 Z M 1029.5 535.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 194.5 680.5 L 1724.5 680.5 L 1724.5 705.5 L 194.5 705.5 Z M 194.5 680.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 937.5 591.5 L 952.5 591.5 L 952.5 634.5 L 937.5 634.5 Z M 812.5 591.5 L 828.5 591.5 L 828.5 634.5 L 812.5 634.5 Z M 856.5 591.5 L 872.5 591.5 L 872.5 634.5 L 856.5 634.5 Z M 897.5 591.5 L 912.5 591.5 L 912.5 634.5 L 897.5 634.5 Z M 392.5 620.5 L 407.5 620.5 L 407.5 664.5 L 392.5 664.5 Z M 472.5 620.5 L 488.5 620.5 L 488.5 664.5 L 472.5 664.5 Z M 339.5 620.5 L 354.5 620.5 L 354.5 664.5 L 339.5 664.5 Z M 512.5 620.5 L 528.5 620.5 L 528.5 664.5 L 512.5 664.5 Z M 557.5 620.5 L 572.5 620.5 L 572.5 664.5 L 557.5 664.5 Z M 1470.5 591.5 L 1485.5 591.5 L 1485.5 667.5 L 1470.5 667.5 Z M 666.5 591.5 L 681.5 591.5 L 681.5 667.5 L 666.5 667.5 Z M 1076.5 601.5 L 1091.5 601.5 L 1091.5 667.5 L 1076.5 667.5 Z M 1027.5 591.5 L 1042.5 591.5 L 1042.5 667.5 L 1027.5 667.5 Z M 1183.5 624.5 L 1199.5 624.5 L 1199.5 667.5 L 1183.5 667.5 Z M 1621.5 591.5 L 1637.5 591.5 L 1637.5 667.5 L 1621.5 667.5 Z M 1224.5 624.5 L 1239.5 624.5 L 1239.5 667.5 L 1224.5 667.5 Z M 1279.5 624.5 L 1295.5 624.5 L 1295.5 667.5 L 1279.5 667.5 Z M 1426.5 591.5 L 1441.5 591.5 L 1441.5 667.5 L 1426.5 667.5 Z M 1665.5 591.5 L 1681.5 591.5 L 1681.5 667.5 L 1665.5 667.5 Z M 237.5 624.5 L 252.5 624.5 L 252.5 667.5 L 237.5 667.5 Z M 1316.5 624.5 L 1332.5 624.5 L 1332.5 667.5 L 1316.5 667.5 Z M 710.5 591.5 L 725.5 591.5 L 725.5 667.5 L 710.5 667.5 Z M 1514.5 591.5 L 1530.5 591.5 L 1530.5 667.5 L 1514.5 667.5 Z M 1514.5 591.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1366.5 401.5 L 1381.5 401.5 L 1381.5 444.5 L 1366.5 444.5 Z M 1241.5 401.5 L 1256.5 401.5 L 1256.5 444.5 L 1241.5 444.5 Z M 1311.5 401.5 L 1326.5 401.5 L 1326.5 444.5 L 1311.5 444.5 Z M 1197.5 401.5 L 1213.5 401.5 L 1213.5 444.5 L 1197.5 444.5 Z M 353.5 401.5 L 368.5 401.5 L 368.5 467.5 L 353.5 467.5 Z M 443.5 401.5 L 458.5 401.5 L 458.5 467.5 L 443.5 467.5 Z M 974.5 424.5 L 990.5 424.5 L 990.5 467.5 L 974.5 467.5 Z M 868.5 424.5 L 884.5 424.5 L 884.5 467.5 L 868.5 467.5 Z M 498.5 401.5 L 513.5 401.5 L 513.5 467.5 L 498.5 467.5 Z M 908.5 424.5 L 924.5 424.5 L 924.5 467.5 L 908.5 467.5 Z M 817.5 424.5 L 832.5 424.5 L 832.5 467.5 L 817.5 467.5 Z M 396.5 401.5 L 412.5 401.5 L 412.5 467.5 L 396.5 467.5 Z M 557.5 401.5 L 572.5 401.5 L 572.5 467.5 L 557.5 467.5 Z M 238.5 401.5 L 253.5 401.5 L 253.5 467.5 L 238.5 467.5 Z M 1424.5 430.5 L 1440.5 430.5 L 1440.5 516.5 L 1424.5 516.5 Z M 1470.5 430.5 L 1486.5 430.5 L 1486.5 516.5 L 1470.5 516.5 Z M 710.5 401.5 L 725.5 401.5 L 725.5 516.5 L 710.5 516.5 Z M 1618.5 401.5 L 1633.5 401.5 L 1633.5 516.5 L 1618.5 516.5 Z M 1525.5 401.5 L 1541.5 401.5 L 1541.5 516.5 L 1525.5 516.5 Z M 664.5 401.5 L 679.5 401.5 L 679.5 516.5 L 664.5 516.5 Z M 1572.5 401.5 L 1587.5 401.5 L 1587.5 516.5 L 1572.5 516.5 Z M 1664.5 401.5 L 1680.5 401.5 L 1680.5 516.5 L 1664.5 516.5 Z M 1078.5 424.5 L 1094.5 424.5 L 1094.5 527.5 L 1078.5 527.5 Z M 1124.5 424.5 L 1140.5 424.5 L 1140.5 527.5 L 1124.5 527.5 Z M 1124.5 424.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 210.5 354.5 L 227.5 354.5 L 227.5 372.5 L 210.5 372.5 Z M 1691.5 354.5 L 1708.5 354.5 L 1708.5 372.5 L 1691.5 372.5 Z M 1641.5 354.5 L 1659.5 354.5 L 1659.5 372.5 L 1641.5 372.5 Z M 1592.5 354.5 L 1609.5 354.5 L 1609.5 372.5 L 1592.5 372.5 Z M 1542.5 354.5 L 1560.5 354.5 L 1560.5 372.5 L 1542.5 372.5 Z M 1493.5 354.5 L 1511.5 354.5 L 1511.5 372.5 L 1493.5 372.5 Z M 1444.5 354.5 L 1461.5 354.5 L 1461.5 372.5 L 1444.5 372.5 Z M 1394.5 354.5 L 1412.5 354.5 L 1412.5 372.5 L 1394.5 372.5 Z M 1345.5 354.5 L 1362.5 354.5 L 1362.5 372.5 L 1345.5 372.5 Z M 1296.5 354.5 L 1313.5 354.5 L 1313.5 372.5 L 1296.5 372.5 Z M 1246.5 354.5 L 1264.5 354.5 L 1264.5 372.5 L 1246.5 372.5 Z M 1197.5 354.5 L 1214.5 354.5 L 1214.5 372.5 L 1197.5 372.5 Z M 1148.5 354.5 L 1165.5 354.5 L 1165.5 372.5 L 1148.5 372.5 Z M 1098.5 354.5 L 1116.5 354.5 L 1116.5 372.5 L 1098.5 372.5 Z M 1049.5 354.5 L 1066.5 354.5 L 1066.5 372.5 L 1049.5 372.5 Z M 999.5 354.5 L 1017.5 354.5 L 1017.5 372.5 L 999.5 372.5 Z M 950.5 354.5 L 968.5 354.5 L 968.5 372.5 L 950.5 372.5 Z M 901.5 354.5 L 918.5 354.5 L 918.5 372.5 L 901.5 372.5 Z M 851.5 354.5 L 869.5 354.5 L 869.5 372.5 L 851.5 372.5 Z M 802.5 354.5 L 819.5 354.5 L 819.5 372.5 L 802.5 372.5 Z M 753.5 354.5 L 770.5 354.5 L 770.5 372.5 L 753.5 372.5 Z M 703.5 354.5 L 721.5 354.5 L 721.5 372.5 L 703.5 372.5 Z M 654.5 354.5 L 671.5 354.5 L 671.5 372.5 L 654.5 372.5 Z M 604.5 354.5 L 622.5 354.5 L 622.5 372.5 L 604.5 372.5 Z M 555.5 354.5 L 573.5 354.5 L 573.5 372.5 L 555.5 372.5 Z M 506.5 354.5 L 523.5 354.5 L 523.5 372.5 L 506.5 372.5 Z M 456.5 354.5 L 474.5 354.5 L 474.5 372.5 L 456.5 372.5 Z M 407.5 354.5 L 425.5 354.5 L 425.5 372.5 L 407.5 372.5 Z M 358.5 354.5 L 375.5 354.5 L 375.5 372.5 L 358.5 372.5 Z M 308.5 354.5 L 326.5 354.5 L 326.5 372.5 L 308.5 372.5 Z M 259.5 354.5 L 276.5 354.5 L 276.5 372.5 L 259.5 372.5 Z M 604.5 487.5 L 622.5 487.5 L 622.5 491.5 L 604.5 491.5 Z M 999.5 487.5 L 1017.5 487.5 L 1017.5 492.5 L 999.5 492.5 Z M 1296.5 487.5 L 1313.5 487.5 L 1313.5 492.5 L 1296.5 492.5 Z M 1296.5 492.5 L 1313.5 492.5 L 1313.5 505.5 L 1296.5 505.5 Z M 999.5 492.5 L 1017.5 492.5 L 1017.5 505.5 L 999.5 505.5 Z M 604.5 491.5 L 622.5 491.5 L 622.5 505.5 L 604.5 505.5 Z M 210.5 697.5 L 227.5 697.5 L 227.5 714.5 L 210.5 714.5 Z M 1691.5 697.5 L 1708.5 697.5 L 1708.5 714.5 L 1691.5 714.5 Z M 1641.5 697.5 L 1659.5 697.5 L 1659.5 714.5 L 1641.5 714.5 Z M 1592.5 697.5 L 1609.5 697.5 L 1609.5 714.5 L 1592.5 714.5 Z M 1542.5 697.5 L 1560.5 697.5 L 1560.5 714.5 L 1542.5 714.5 Z M 1493.5 697.5 L 1511.5 697.5 L 1511.5 714.5 L 1493.5 714.5 Z M 1444.5 697.5 L 1461.5 697.5 L 1461.5 714.5 L 1444.5 714.5 Z M 1394.5 697.5 L 1412.5 697.5 L 1412.5 714.5 L 1394.5 714.5 Z M 1345.5 697.5 L 1362.5 697.5 L 1362.5 714.5 L 1345.5 714.5 Z M 1296.5 697.5 L 1313.5 697.5 L 1313.5 714.5 L 1296.5 714.5 Z M 1246.5 697.5 L 1264.5 697.5 L 1264.5 714.5 L 1246.5 714.5 Z M 1197.5 697.5 L 1214.5 697.5 L 1214.5 714.5 L 1197.5 714.5 Z M 1148.5 697.5 L 1165.5 697.5 L 1165.5 714.5 L 1148.5 714.5 Z M 1098.5 697.5 L 1116.5 697.5 L 1116.5 714.5 L 1098.5 714.5 Z M 1049.5 697.5 L 1066.5 697.5 L 1066.5 714.5 L 1049.5 714.5 Z M 999.5 697.5 L 1017.5 697.5 L 1017.5 714.5 L 999.5 714.5 Z M 950.5 697.5 L 968.5 697.5 L 968.5 714.5 L 950.5 714.5 Z M 901.5 697.5 L 918.5 697.5 L 918.5 714.5 L 901.5 714.5 Z M 851.5 697.5 L 869.5 697.5 L 869.5 714.5 L 851.5 714.5 Z M 802.5 697.5 L 819.5 697.5 L 819.5 714.5 L 802.5 714.5 Z M 753.5 697.5 L 770.5 697.5 L 770.5 714.5 L 753.5 714.5 Z M 703.5 697.5 L 721.5 697.5 L 721.5 714.5 L 703.5 714.5 Z M 654.5 697.5 L 671.5 697.5 L 671.5 714.5 L 654.5 714.5 Z M 604.5 697.5 L 622.5 697.5 L 622.5 714.5 L 604.5 714.5 Z M 555.5 697.5 L 573.5 697.5 L 573.5 714.5 L 555.5 714.5 Z M 506.5 697.5 L 523.5 697.5 L 523.5 714.5 L 506.5 714.5 Z M 456.5 697.5 L 474.5 697.5 L 474.5 714.5 L 456.5 714.5 Z M 407.5 697.5 L 425.5 697.5 L 425.5 714.5 L 407.5 714.5 Z M 358.5 697.5 L 375.5 697.5 L 375.5 714.5 L 358.5 714.5 Z M 308.5 697.5 L 326.5 697.5 L 326.5 714.5 L 308.5 714.5 Z M 259.5 697.5 L 276.5 697.5 L 276.5 714.5 L 259.5 714.5 Z M 259.5 697.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface343">
+<g id="surface371">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -184,6 +184,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 1710.089844 545.792969 L 1708.703125 547.5 L 1705.613281 544.9375 L 1704.730469 545.410156 L 1703.84375 545.761719 L 1702.933594 546.058594 L 1701.960938 546.261719 L 1700.988281 546.378906 L 1699.988281 546.441406 L 1698.632812 546.351562 L 1697.367188 546.144531 L 1696.1875 545.792969 L 1695.066406 545.320312 L 1694.007812 544.703125 L 1693.066406 543.90625 L 1692.210938 543.050781 L 1691.476562 542.082031 L 1690.886719 541.019531 L 1690.386719 539.871094 L 1690.003906 538.632812 L 1689.765625 537.28125 L 1689.707031 536.957031 L 1689.679688 536.601562 L 1689.648438 536.277344 L 1689.621094 535.925781 L 1689.621094 535.1875 L 1689.679688 533.714844 L 1689.882812 532.300781 L 1690.207031 531.007812 L 1690.679688 529.769531 L 1691.269531 528.621094 L 1692.035156 527.558594 L 1692.800781 526.707031 L 1693.683594 525.941406 L 1694.65625 525.292969 L 1695.6875 524.792969 L 1696.804688 524.378906 L 1698.042969 524.085938 L 1698.335938 524.054688 L 1698.660156 524.027344 L 1698.984375 523.996094 L 1699.308594 523.96875 L 1699.632812 523.96875 L 1699.988281 523.9375 L 1701.3125 524.027344 L 1702.578125 524.230469 L 1703.757812 524.585938 L 1704.875 525.058594 L 1705.9375 525.675781 L 1706.90625 526.441406 L 1707.734375 527.324219 L 1708.46875 528.265625 L 1709.058594 529.296875 L 1709.558594 530.445312 L 1709.941406 531.683594 L 1710.207031 532.980469 L 1710.234375 533.363281 L 1710.265625 533.714844 L 1710.296875 534.070312 L 1710.324219 534.421875 L 1710.324219 534.777344 L 1710.355469 535.128906 L 1710.265625 536.777344 L 1710 538.339844 L 1709.589844 539.785156 L 1709 541.136719 L 1708.234375 542.375 L 1707.320312 543.523438 Z M 1702.667969 539.722656 L 1705.289062 541.875 L 1705.996094 540.992188 L 1706.585938 539.988281 L 1707.027344 538.898438 L 1707.351562 537.75 L 1707.527344 536.515625 L 1707.613281 535.160156 L 1707.554688 533.921875 L 1707.378906 532.742188 L 1707.085938 531.652344 L 1706.703125 530.652344 L 1706.203125 529.710938 L 1705.582031 528.855469 L 1704.875 528.148438 L 1704.140625 527.558594 L 1703.316406 527.089844 L 1702.429688 526.734375 L 1701.460938 526.5 L 1700.457031 526.351562 L 1699.988281 526.351562 L 1698.925781 526.441406 L 1697.925781 526.617188 L 1696.984375 526.914062 L 1696.128906 527.355469 L 1695.332031 527.914062 L 1694.625 528.589844 L 1693.949219 529.386719 L 1693.417969 530.269531 L 1692.976562 531.242188 L 1692.652344 532.300781 L 1692.445312 533.449219 L 1692.359375 534.6875 L 1692.359375 535.1875 L 1692.386719 536.484375 L 1692.566406 537.664062 L 1692.859375 538.753906 L 1693.242188 539.785156 L 1693.773438 540.726562 L 1694.421875 541.550781 L 1695.097656 542.285156 L 1695.863281 542.875 L 1696.6875 543.347656 L 1697.570312 543.671875 L 1698.542969 543.90625 L 1699.574219 543.996094 L 1699.632812 544.023438 L 1700.488281 544.023438 L 1701.046875 543.964844 L 1701.605469 543.847656 L 1702.136719 543.730469 L 1702.667969 543.554688 L 1703.226562 543.316406 L 1703.257812 543.316406 L 1703.316406 543.289062 L 1703.34375 543.257812 L 1703.402344 543.257812 L 1703.433594 543.230469 L 1703.492188 543.199219 L 1701.3125 541.375 Z M 1702.667969 539.722656 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1691 554 L 1708 554 M 1691 536 L 1708 536 M 1691 536 L 1691 554 M 1708 536 L 1708 554 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1691 554 L 1708 554 M 1691 536 L 1708 536 M 1708 554 L 1708 536 M 1691 554 L 1691 536 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 194 369 L 194 378 M 189 374 L 198 374 M 193 375 L 195 375 M 193 373 L 195 373 M 193 373 L 193 375 M 195 373 L 195 375 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.svg b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.svg
index 2200894..da76fec 100644
--- a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.svg
+++ b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 337.5 L 1743.5 337.5 L 1743.5 535.5 L 174.5 535.5 Z M 980.5 535.5 L 1093.5 535.5 L 1093.5 546.5 L 980.5 546.5 Z M 980.5 535.5 "/>
 </clipPath>
-<image id="image455" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image482" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image455"/>
+  <use xlink:href="#image482"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 194.5 685.5 L 1723.5 685.5 L 1723.5 711.5 L 194.5 711.5 Z M 194.5 685.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image455"/>
+  <use xlink:href="#image482"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1581.5 593.5 L 1597.5 593.5 L 1597.5 661.5 L 1581.5 661.5 Z M 428.5 627.5 L 444.5 627.5 L 444.5 672.5 L 428.5 672.5 Z M 386.5 627.5 L 402.5 627.5 L 402.5 672.5 L 386.5 672.5 Z M 341.5 627.5 L 357.5 627.5 L 357.5 672.5 L 341.5 672.5 Z M 1356.5 627.5 L 1372.5 627.5 L 1372.5 672.5 L 1356.5 672.5 Z M 1273.5 627.5 L 1289.5 627.5 L 1289.5 672.5 L 1273.5 672.5 Z M 1215.5 627.5 L 1231.5 627.5 L 1231.5 672.5 L 1215.5 672.5 Z M 1174.5 627.5 L 1190.5 627.5 L 1190.5 672.5 L 1174.5 672.5 Z M 299.5 627.5 L 315.5 627.5 L 315.5 672.5 L 299.5 672.5 Z M 239.5 627.5 L 255.5 627.5 L 255.5 672.5 L 239.5 672.5 Z M 969.5 627.5 L 985.5 627.5 L 985.5 672.5 L 969.5 672.5 Z M 927.5 627.5 L 943.5 627.5 L 943.5 672.5 L 927.5 672.5 Z M 811.5 627.5 L 827.5 627.5 L 827.5 672.5 L 811.5 672.5 Z M 770.5 627.5 L 786.5 627.5 L 786.5 672.5 L 770.5 672.5 Z M 706.5 627.5 L 722.5 627.5 L 722.5 672.5 L 706.5 672.5 Z M 1072.5 604.5 L 1088.5 604.5 L 1088.5 672.5 L 1072.5 672.5 Z M 1114.5 604.5 L 1129.5 604.5 L 1129.5 672.5 L 1114.5 672.5 Z M 1662.5 593.5 L 1678.5 593.5 L 1678.5 672.5 L 1662.5 672.5 Z M 540.5 593.5 L 556.5 593.5 L 556.5 672.5 L 540.5 672.5 Z M 1468.5 593.5 L 1484.5 593.5 L 1484.5 672.5 L 1468.5 672.5 Z M 593.5 593.5 L 609.5 593.5 L 609.5 672.5 L 593.5 672.5 Z M 593.5 593.5 "/>
 </clipPath>
-<image id="image456" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image483" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image456"/>
+  <use xlink:href="#image483"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1449.5 397.5 L 1464.5 397.5 L 1464.5 441.5 L 1449.5 441.5 Z M 1342.5 397.5 L 1358.5 397.5 L 1358.5 441.5 L 1342.5 441.5 Z M 1295.5 397.5 L 1311.5 397.5 L 1311.5 441.5 L 1295.5 441.5 Z M 780.5 413.5 L 796.5 413.5 L 796.5 457.5 L 780.5 457.5 Z M 835.5 421.5 L 851.5 421.5 L 851.5 465.5 L 835.5 465.5 Z M 399.5 397.5 L 415.5 397.5 L 415.5 465.5 L 399.5 465.5 Z M 715.5 421.5 L 731.5 421.5 L 731.5 465.5 L 715.5 465.5 Z M 970.5 421.5 L 986.5 421.5 L 986.5 465.5 L 970.5 465.5 Z M 240.5 397.5 L 256.5 397.5 L 256.5 465.5 L 240.5 465.5 Z M 444.5 397.5 L 460.5 397.5 L 460.5 465.5 L 444.5 465.5 Z M 287.5 397.5 L 303.5 397.5 L 303.5 465.5 L 287.5 465.5 Z M 332.5 397.5 L 348.5 397.5 L 348.5 465.5 L 332.5 465.5 Z M 908.5 421.5 L 923.5 421.5 L 923.5 465.5 L 908.5 465.5 Z M 1608.5 408.5 L 1624.5 408.5 L 1624.5 497.5 L 1608.5 497.5 Z M 1131.5 468.5 L 1147.5 468.5 L 1147.5 512.5 L 1131.5 512.5 Z M 1188.5 406.5 L 1204.5 406.5 L 1204.5 512.5 L 1188.5 512.5 Z M 1662.5 397.5 L 1678.5 397.5 L 1678.5 516.5 L 1662.5 516.5 Z M 559.5 397.5 L 575.5 397.5 L 575.5 516.5 L 559.5 516.5 Z M 1502.5 397.5 L 1518.5 397.5 L 1518.5 516.5 L 1502.5 516.5 Z M 607.5 397.5 L 623.5 397.5 L 623.5 516.5 L 607.5 516.5 Z M 1028.5 421.5 L 1043.5 421.5 L 1043.5 527.5 L 1028.5 527.5 Z M 1028.5 421.5 "/>
 </clipPath>
-<image id="image457" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image484" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image457"/>
+  <use xlink:href="#image484"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 211.5 348.5 L 229.5 348.5 L 229.5 366.5 L 211.5 366.5 Z M 1689.5 348.5 L 1707.5 348.5 L 1707.5 366.5 L 1689.5 366.5 Z M 1638.5 348.5 L 1656.5 348.5 L 1656.5 366.5 L 1638.5 366.5 Z M 1587.5 348.5 L 1605.5 348.5 L 1605.5 366.5 L 1587.5 366.5 Z M 1536.5 348.5 L 1554.5 348.5 L 1554.5 366.5 L 1536.5 366.5 Z M 1485.5 348.5 L 1503.5 348.5 L 1503.5 366.5 L 1485.5 366.5 Z M 1434.5 348.5 L 1452.5 348.5 L 1452.5 366.5 L 1434.5 366.5 Z M 1383.5 348.5 L 1401.5 348.5 L 1401.5 366.5 L 1383.5 366.5 Z M 1332.5 348.5 L 1350.5 348.5 L 1350.5 366.5 L 1332.5 366.5 Z M 1281.5 348.5 L 1299.5 348.5 L 1299.5 366.5 L 1281.5 366.5 Z M 1230.5 348.5 L 1248.5 348.5 L 1248.5 366.5 L 1230.5 366.5 Z M 1179.5 348.5 L 1197.5 348.5 L 1197.5 366.5 L 1179.5 366.5 Z M 1128.5 348.5 L 1146.5 348.5 L 1146.5 366.5 L 1128.5 366.5 Z M 1077.5 348.5 L 1095.5 348.5 L 1095.5 366.5 L 1077.5 366.5 Z M 1026.5 348.5 L 1044.5 348.5 L 1044.5 366.5 L 1026.5 366.5 Z M 975.5 348.5 L 993.5 348.5 L 993.5 366.5 L 975.5 366.5 Z M 924.5 348.5 L 942.5 348.5 L 942.5 366.5 L 924.5 366.5 Z M 873.5 348.5 L 891.5 348.5 L 891.5 366.5 L 873.5 366.5 Z M 822.5 348.5 L 840.5 348.5 L 840.5 366.5 L 822.5 366.5 Z M 771.5 348.5 L 789.5 348.5 L 789.5 366.5 L 771.5 366.5 Z M 720.5 348.5 L 738.5 348.5 L 738.5 366.5 L 720.5 366.5 Z M 669.5 348.5 L 687.5 348.5 L 687.5 366.5 L 669.5 366.5 Z M 618.5 348.5 L 636.5 348.5 L 636.5 366.5 L 618.5 366.5 Z M 567.5 348.5 L 585.5 348.5 L 585.5 366.5 L 567.5 366.5 Z M 516.5 348.5 L 534.5 348.5 L 534.5 366.5 L 516.5 366.5 Z M 465.5 348.5 L 483.5 348.5 L 483.5 366.5 L 465.5 366.5 Z M 414.5 348.5 L 432.5 348.5 L 432.5 366.5 L 414.5 366.5 Z M 363.5 348.5 L 381.5 348.5 L 381.5 366.5 L 363.5 366.5 Z M 312.5 348.5 L 331.5 348.5 L 331.5 366.5 L 312.5 366.5 Z M 261.5 348.5 L 280.5 348.5 L 280.5 366.5 L 261.5 366.5 Z M 975.5 525.5 L 993.5 525.5 L 993.5 543.5 L 975.5 543.5 Z M 1230.5 525.5 L 1248.5 525.5 L 1248.5 543.5 L 1230.5 543.5 Z M 211.5 702.5 L 229.5 702.5 L 229.5 720.5 L 211.5 720.5 Z M 1689.5 702.5 L 1707.5 702.5 L 1707.5 720.5 L 1689.5 720.5 Z M 1638.5 702.5 L 1656.5 702.5 L 1656.5 720.5 L 1638.5 720.5 Z M 1587.5 702.5 L 1605.5 702.5 L 1605.5 720.5 L 1587.5 720.5 Z M 1536.5 702.5 L 1554.5 702.5 L 1554.5 720.5 L 1536.5 720.5 Z M 1485.5 702.5 L 1503.5 702.5 L 1503.5 720.5 L 1485.5 720.5 Z M 1434.5 702.5 L 1452.5 702.5 L 1452.5 720.5 L 1434.5 720.5 Z M 1383.5 702.5 L 1401.5 702.5 L 1401.5 720.5 L 1383.5 720.5 Z M 1332.5 702.5 L 1350.5 702.5 L 1350.5 720.5 L 1332.5 720.5 Z M 1281.5 702.5 L 1299.5 702.5 L 1299.5 720.5 L 1281.5 720.5 Z M 1230.5 702.5 L 1248.5 702.5 L 1248.5 720.5 L 1230.5 720.5 Z M 1179.5 702.5 L 1197.5 702.5 L 1197.5 720.5 L 1179.5 720.5 Z M 1128.5 702.5 L 1146.5 702.5 L 1146.5 720.5 L 1128.5 720.5 Z M 1077.5 702.5 L 1095.5 702.5 L 1095.5 720.5 L 1077.5 720.5 Z M 1026.5 702.5 L 1044.5 702.5 L 1044.5 720.5 L 1026.5 720.5 Z M 975.5 702.5 L 993.5 702.5 L 993.5 720.5 L 975.5 720.5 Z M 924.5 702.5 L 942.5 702.5 L 942.5 720.5 L 924.5 720.5 Z M 873.5 702.5 L 891.5 702.5 L 891.5 720.5 L 873.5 720.5 Z M 822.5 702.5 L 840.5 702.5 L 840.5 720.5 L 822.5 720.5 Z M 771.5 702.5 L 789.5 702.5 L 789.5 720.5 L 771.5 720.5 Z M 720.5 702.5 L 738.5 702.5 L 738.5 720.5 L 720.5 720.5 Z M 669.5 702.5 L 687.5 702.5 L 687.5 720.5 L 669.5 720.5 Z M 618.5 702.5 L 636.5 702.5 L 636.5 720.5 L 618.5 720.5 Z M 567.5 702.5 L 585.5 702.5 L 585.5 720.5 L 567.5 720.5 Z M 516.5 702.5 L 534.5 702.5 L 534.5 720.5 L 516.5 720.5 Z M 465.5 702.5 L 483.5 702.5 L 483.5 720.5 L 465.5 720.5 Z M 414.5 702.5 L 432.5 702.5 L 432.5 720.5 L 414.5 720.5 Z M 363.5 702.5 L 381.5 702.5 L 381.5 720.5 L 363.5 720.5 Z M 312.5 702.5 L 331.5 702.5 L 331.5 720.5 L 312.5 720.5 Z M 261.5 702.5 L 280.5 702.5 L 280.5 720.5 L 261.5 720.5 Z M 261.5 702.5 "/>
 </clipPath>
-<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image485" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image458"/>
+  <use xlink:href="#image485"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface452">
+<g id="surface479">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -235,6 +235,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 314.246094 506.5 L 314.246094 484.007812 L 322.917969 484.007812 L 324.273438 484.097656 L 325.539062 484.347656 L 326.710938 484.777344 L 327.792969 485.332031 L 328.75 486.105469 L 329.644531 487 L 330.382812 488.078125 L 331 489.25 L 331.464844 490.578125 L 331.804688 491.996094 L 331.988281 493.570312 L 332.082031 495.238281 L 331.988281 496.996094 L 331.773438 498.632812 L 331.402344 500.113281 L 330.90625 501.46875 L 330.261719 502.675781 L 329.457031 503.722656 L 328.59375 504.585938 L 327.636719 505.265625 L 326.589844 505.820312 L 325.445312 506.191406 L 324.210938 506.4375 L 322.917969 506.5 Z M 317.117188 503.96875 L 322.421875 503.96875 L 323.84375 503.878906 L 325.105469 503.539062 L 326.21875 502.953125 L 327.144531 502.179688 L 327.882812 501.132812 L 328.5 499.867188 L 328.6875 499.21875 L 328.871094 498.539062 L 329.027344 497.796875 L 329.117188 496.996094 L 329.179688 496.164062 L 329.210938 495.269531 L 329.085938 493.261719 L 328.777344 491.503906 L 328.222656 489.992188 L 327.484375 488.789062 L 326.527344 487.800781 L 325.355469 487.09375 L 324.921875 486.9375 L 324.460938 486.785156 L 323.964844 486.691406 L 323.472656 486.597656 L 322.949219 486.566406 L 322.421875 486.535156 L 317.117188 486.535156 Z M 317.117188 503.96875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 312 593 L 331 593 M 312 575 L 331 575 M 312 575 L 312 593 M 331 575 L 331 593 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 312 593 L 331 593 M 312 575 L 331 575 M 331 593 L 331 575 M 312 593 L 312 575 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 194 363 L 194 372 M 189 368 L 198 368 M 193 369 L 195 369 M 193 367 L 195 367 M 193 367 L 193 369 M 195 367 L 195 369 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.svg b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.svg
index 38df0e5..1b868b7 100644
--- a/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.svg
+++ b/cells/sdfsbp/sky130_fd_sc_hs__sdfsbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 373.5 L 1743.5 373.5 L 1743.5 534.5 L 174.5 534.5 Z M 174.5 373.5 "/>
 </clipPath>
-<image id="image480" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image508" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image480"/>
+  <use xlink:href="#image508"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 190.5 657.5 L 1727.5 657.5 L 1727.5 678.5 L 190.5 678.5 Z M 190.5 657.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image480"/>
+  <use xlink:href="#image508"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1592.5 582.5 L 1605.5 582.5 L 1605.5 637.5 L 1592.5 637.5 Z M 640.5 606.5 L 653.5 606.5 L 653.5 643.5 L 640.5 643.5 Z M 729.5 606.5 L 742.5 606.5 L 742.5 643.5 L 729.5 643.5 Z M 762.5 606.5 L 775.5 606.5 L 775.5 643.5 L 762.5 643.5 Z M 310.5 609.5 L 323.5 609.5 L 323.5 646.5 L 310.5 646.5 Z M 277.5 609.5 L 290.5 609.5 L 290.5 646.5 L 277.5 646.5 Z M 1371.5 609.5 L 1384.5 609.5 L 1384.5 646.5 L 1371.5 646.5 Z M 1327.5 609.5 L 1340.5 609.5 L 1340.5 646.5 L 1327.5 646.5 Z M 1293.5 609.5 L 1306.5 609.5 L 1306.5 646.5 L 1293.5 646.5 Z M 1259.5 609.5 L 1272.5 609.5 L 1272.5 646.5 L 1259.5 646.5 Z M 889.5 609.5 L 902.5 609.5 L 902.5 646.5 L 889.5 646.5 Z M 227.5 609.5 L 240.5 609.5 L 240.5 646.5 L 227.5 646.5 Z M 1678.5 582.5 L 1691.5 582.5 L 1691.5 646.5 L 1678.5 646.5 Z M 1502.5 582.5 L 1515.5 582.5 L 1515.5 646.5 L 1502.5 646.5 Z M 511.5 582.5 L 524.5 582.5 L 524.5 646.5 L 511.5 646.5 Z M 1072.5 590.5 L 1085.5 590.5 L 1085.5 646.5 L 1072.5 646.5 Z M 1034.5 590.5 L 1047.5 590.5 L 1047.5 646.5 L 1034.5 646.5 Z M 995.5 590.5 L 1008.5 590.5 L 1008.5 646.5 L 995.5 646.5 Z M 1115.5 590.5 L 1128.5 590.5 L 1128.5 646.5 L 1115.5 646.5 Z M 425.5 609.5 L 438.5 609.5 L 438.5 646.5 L 425.5 646.5 Z M 855.5 609.5 L 868.5 609.5 L 868.5 646.5 L 855.5 646.5 Z M 1640.5 582.5 L 1653.5 582.5 L 1653.5 646.5 L 1640.5 646.5 Z M 1463.5 582.5 L 1476.5 582.5 L 1476.5 646.5 L 1463.5 646.5 Z M 392.5 609.5 L 405.5 609.5 L 405.5 646.5 L 392.5 646.5 Z M 554.5 582.5 L 567.5 582.5 L 567.5 646.5 L 554.5 646.5 Z M 554.5 582.5 "/>
 </clipPath>
-<image id="image481" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image509" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image481"/>
+  <use xlink:href="#image509"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1330.5 422.5 L 1343.5 422.5 L 1343.5 458.5 L 1330.5 458.5 Z M 1291.5 422.5 L 1304.5 422.5 L 1304.5 458.5 L 1291.5 458.5 Z M 1418.5 428.5 L 1431.5 428.5 L 1431.5 464.5 L 1418.5 464.5 Z M 697.5 441.5 L 710.5 441.5 L 710.5 477.5 L 697.5 477.5 Z M 273.5 422.5 L 286.5 422.5 L 286.5 477.5 L 273.5 477.5 Z M 229.5 422.5 L 242.5 422.5 L 242.5 477.5 L 229.5 477.5 Z M 875.5 441.5 L 888.5 441.5 L 888.5 477.5 L 875.5 477.5 Z M 827.5 441.5 L 840.5 441.5 L 840.5 477.5 L 827.5 477.5 Z M 733.5 441.5 L 746.5 441.5 L 746.5 477.5 L 733.5 477.5 Z M 395.5 422.5 L 408.5 422.5 L 408.5 477.5 L 395.5 477.5 Z M 654.5 441.5 L 667.5 441.5 L 667.5 477.5 L 654.5 477.5 Z M 358.5 422.5 L 371.5 422.5 L 371.5 477.5 L 358.5 477.5 Z M 309.5 422.5 L 322.5 422.5 L 322.5 477.5 L 309.5 477.5 Z M 1201.5 445.5 L 1214.5 445.5 L 1214.5 481.5 L 1201.5 481.5 Z M 1072.5 422.5 L 1085.5 422.5 L 1085.5 494.5 L 1072.5 494.5 Z M 1033.5 422.5 L 1046.5 422.5 L 1046.5 494.5 L 1033.5 494.5 Z M 994.5 422.5 L 1007.5 422.5 L 1007.5 494.5 L 994.5 494.5 Z M 1111.5 422.5 L 1124.5 422.5 L 1124.5 494.5 L 1111.5 494.5 Z M 1677.5 422.5 L 1690.5 422.5 L 1690.5 519.5 L 1677.5 519.5 Z M 1503.5 422.5 L 1516.5 422.5 L 1516.5 519.5 L 1503.5 519.5 Z M 1464.5 422.5 L 1477.5 422.5 L 1477.5 519.5 L 1464.5 519.5 Z M 1638.5 422.5 L 1651.5 422.5 L 1651.5 519.5 L 1638.5 519.5 Z M 556.5 422.5 L 569.5 422.5 L 569.5 519.5 L 556.5 519.5 Z M 484.5 422.5 L 497.5 422.5 L 497.5 519.5 L 484.5 519.5 Z M 1590.5 432.5 L 1603.5 432.5 L 1603.5 519.5 L 1590.5 519.5 Z M 1590.5 432.5 "/>
 </clipPath>
-<image id="image482" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image510" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image482"/>
+  <use xlink:href="#image510"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 204.5 382.5 L 219.5 382.5 L 219.5 397.5 L 204.5 397.5 Z M 1699.5 382.5 L 1714.5 382.5 L 1714.5 397.5 L 1699.5 397.5 Z M 1657.5 382.5 L 1672.5 382.5 L 1672.5 397.5 L 1657.5 397.5 Z M 1616.5 382.5 L 1630.5 382.5 L 1630.5 397.5 L 1616.5 397.5 Z M 1574.5 382.5 L 1589.5 382.5 L 1589.5 397.5 L 1574.5 397.5 Z M 1533.5 382.5 L 1547.5 382.5 L 1547.5 397.5 L 1533.5 397.5 Z M 1491.5 382.5 L 1506.5 382.5 L 1506.5 397.5 L 1491.5 397.5 Z M 1450.5 382.5 L 1464.5 382.5 L 1464.5 397.5 L 1450.5 397.5 Z M 1408.5 382.5 L 1423.5 382.5 L 1423.5 397.5 L 1408.5 397.5 Z M 1367.5 382.5 L 1381.5 382.5 L 1381.5 397.5 L 1367.5 397.5 Z M 1325.5 382.5 L 1340.5 382.5 L 1340.5 397.5 L 1325.5 397.5 Z M 1284.5 382.5 L 1298.5 382.5 L 1298.5 397.5 L 1284.5 397.5 Z M 1242.5 382.5 L 1257.5 382.5 L 1257.5 397.5 L 1242.5 397.5 Z M 1201.5 382.5 L 1215.5 382.5 L 1215.5 397.5 L 1201.5 397.5 Z M 1159.5 382.5 L 1174.5 382.5 L 1174.5 397.5 L 1159.5 397.5 Z M 1117.5 382.5 L 1132.5 382.5 L 1132.5 397.5 L 1117.5 397.5 Z M 1076.5 382.5 L 1091.5 382.5 L 1091.5 397.5 L 1076.5 397.5 Z M 1034.5 382.5 L 1049.5 382.5 L 1049.5 397.5 L 1034.5 397.5 Z M 993.5 382.5 L 1008.5 382.5 L 1008.5 397.5 L 993.5 397.5 Z M 951.5 382.5 L 966.5 382.5 L 966.5 397.5 L 951.5 397.5 Z M 910.5 382.5 L 925.5 382.5 L 925.5 397.5 L 910.5 397.5 Z M 868.5 382.5 L 883.5 382.5 L 883.5 397.5 L 868.5 397.5 Z M 827.5 382.5 L 841.5 382.5 L 841.5 397.5 L 827.5 397.5 Z M 785.5 382.5 L 800.5 382.5 L 800.5 397.5 L 785.5 397.5 Z M 744.5 382.5 L 758.5 382.5 L 758.5 397.5 L 744.5 397.5 Z M 702.5 382.5 L 717.5 382.5 L 717.5 397.5 L 702.5 397.5 Z M 661.5 382.5 L 675.5 382.5 L 675.5 397.5 L 661.5 397.5 Z M 619.5 382.5 L 634.5 382.5 L 634.5 397.5 L 619.5 397.5 Z M 578.5 382.5 L 592.5 382.5 L 592.5 397.5 L 578.5 397.5 Z M 536.5 382.5 L 551.5 382.5 L 551.5 397.5 L 536.5 397.5 Z M 495.5 382.5 L 509.5 382.5 L 509.5 397.5 L 495.5 397.5 Z M 453.5 382.5 L 468.5 382.5 L 468.5 397.5 L 453.5 397.5 Z M 412.5 382.5 L 426.5 382.5 L 426.5 397.5 L 412.5 397.5 Z M 370.5 382.5 L 385.5 382.5 L 385.5 397.5 L 370.5 397.5 Z M 328.5 382.5 L 343.5 382.5 L 343.5 397.5 L 328.5 397.5 Z M 287.5 382.5 L 302.5 382.5 L 302.5 397.5 L 287.5 397.5 Z M 245.5 382.5 L 260.5 382.5 L 260.5 397.5 L 245.5 397.5 Z M 1325.5 526.5 L 1340.5 526.5 L 1340.5 529.5 L 1325.5 529.5 Z M 868.5 526.5 L 883.5 526.5 L 883.5 537.5 L 868.5 537.5 Z M 868.5 537.5 L 883.5 537.5 L 883.5 541.5 L 868.5 541.5 Z M 1325.5 529.5 L 1340.5 529.5 L 1340.5 541.5 L 1325.5 541.5 Z M 204.5 670.5 L 219.5 670.5 L 219.5 685.5 L 204.5 685.5 Z M 1699.5 670.5 L 1714.5 670.5 L 1714.5 685.5 L 1699.5 685.5 Z M 1657.5 670.5 L 1672.5 670.5 L 1672.5 685.5 L 1657.5 685.5 Z M 1616.5 670.5 L 1630.5 670.5 L 1630.5 685.5 L 1616.5 685.5 Z M 1574.5 670.5 L 1589.5 670.5 L 1589.5 685.5 L 1574.5 685.5 Z M 1533.5 670.5 L 1547.5 670.5 L 1547.5 685.5 L 1533.5 685.5 Z M 1491.5 670.5 L 1506.5 670.5 L 1506.5 685.5 L 1491.5 685.5 Z M 1450.5 670.5 L 1464.5 670.5 L 1464.5 685.5 L 1450.5 685.5 Z M 1408.5 670.5 L 1423.5 670.5 L 1423.5 685.5 L 1408.5 685.5 Z M 1367.5 670.5 L 1381.5 670.5 L 1381.5 685.5 L 1367.5 685.5 Z M 1325.5 670.5 L 1340.5 670.5 L 1340.5 685.5 L 1325.5 685.5 Z M 1284.5 670.5 L 1298.5 670.5 L 1298.5 685.5 L 1284.5 685.5 Z M 1242.5 670.5 L 1257.5 670.5 L 1257.5 685.5 L 1242.5 685.5 Z M 1201.5 670.5 L 1215.5 670.5 L 1215.5 685.5 L 1201.5 685.5 Z M 1159.5 670.5 L 1174.5 670.5 L 1174.5 685.5 L 1159.5 685.5 Z M 1117.5 670.5 L 1132.5 670.5 L 1132.5 685.5 L 1117.5 685.5 Z M 1076.5 670.5 L 1091.5 670.5 L 1091.5 685.5 L 1076.5 685.5 Z M 1034.5 670.5 L 1049.5 670.5 L 1049.5 685.5 L 1034.5 685.5 Z M 993.5 670.5 L 1008.5 670.5 L 1008.5 685.5 L 993.5 685.5 Z M 951.5 670.5 L 966.5 670.5 L 966.5 685.5 L 951.5 685.5 Z M 910.5 670.5 L 925.5 670.5 L 925.5 685.5 L 910.5 685.5 Z M 868.5 670.5 L 883.5 670.5 L 883.5 685.5 L 868.5 685.5 Z M 827.5 670.5 L 841.5 670.5 L 841.5 685.5 L 827.5 685.5 Z M 785.5 670.5 L 800.5 670.5 L 800.5 685.5 L 785.5 685.5 Z M 744.5 670.5 L 758.5 670.5 L 758.5 685.5 L 744.5 685.5 Z M 702.5 670.5 L 717.5 670.5 L 717.5 685.5 L 702.5 685.5 Z M 661.5 670.5 L 675.5 670.5 L 675.5 685.5 L 661.5 685.5 Z M 619.5 670.5 L 634.5 670.5 L 634.5 685.5 L 619.5 685.5 Z M 578.5 670.5 L 592.5 670.5 L 592.5 685.5 L 578.5 685.5 Z M 536.5 670.5 L 551.5 670.5 L 551.5 685.5 L 536.5 685.5 Z M 495.5 670.5 L 509.5 670.5 L 509.5 685.5 L 495.5 685.5 Z M 453.5 670.5 L 468.5 670.5 L 468.5 685.5 L 453.5 685.5 Z M 412.5 670.5 L 426.5 670.5 L 426.5 685.5 L 412.5 685.5 Z M 370.5 670.5 L 385.5 670.5 L 385.5 685.5 L 370.5 685.5 Z M 328.5 670.5 L 343.5 670.5 L 343.5 685.5 L 328.5 685.5 Z M 287.5 670.5 L 302.5 670.5 L 302.5 685.5 L 287.5 685.5 Z M 245.5 670.5 L 260.5 670.5 L 260.5 685.5 L 245.5 685.5 Z M 245.5 670.5 "/>
 </clipPath>
-<image id="image483" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image511" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image483"/>
+  <use xlink:href="#image511"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface477">
+<g id="surface505">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -233,6 +233,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 393.136719 566.539062 L 393.136719 572.847656 L 403.992188 572.847656 L 403.992188 574.917969 L 390.789062 574.917969 L 390.789062 556.515625 L 403.535156 556.515625 L 403.535156 558.585938 L 393.136719 558.585938 L 393.136719 564.46875 L 403.15625 564.46875 L 403.15625 566.539062 Z M 393.136719 566.539062 "/>
 <path style="fill:none;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 521 L 385 521 M 370 506 L 385 506 M 370 506 L 370 521 M 385 506 L 385 521 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 521 L 385 521 M 370 506 L 385 506 M 385 521 L 385 506 M 370 521 L 370 506 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 190 396 L 190 405 M 185 401 L 194 401 M 189 402 L 191 402 M 189 400 L 191 400 M 189 400 L 189 402 M 191 400 L 191 402 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.svg b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.svg
index 4743254..6457ebe 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.svg
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 331.5 L 1743.5 331.5 L 1743.5 535.5 L 174.5 535.5 Z M 1013.5 535.5 L 1129.5 535.5 L 1129.5 550.5 L 1013.5 550.5 Z M 1013.5 535.5 "/>
 </clipPath>
-<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image463" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image437"/>
+  <use xlink:href="#image463"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 195.5 690.5 L 1723.5 690.5 L 1723.5 717.5 L 195.5 717.5 Z M 195.5 690.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image437"/>
+  <use xlink:href="#image463"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1004.5 606.5 L 1020.5 606.5 L 1020.5 652.5 L 1004.5 652.5 Z M 961.5 606.5 L 977.5 606.5 L 977.5 652.5 L 961.5 652.5 Z M 1586.5 595.5 L 1602.5 595.5 L 1602.5 665.5 L 1586.5 665.5 Z M 810.5 626.5 L 826.5 626.5 L 826.5 672.5 L 810.5 672.5 Z M 852.5 626.5 L 869.5 626.5 L 869.5 672.5 L 852.5 672.5 Z M 726.5 626.5 L 743.5 626.5 L 743.5 672.5 L 726.5 672.5 Z M 1227.5 630.5 L 1243.5 630.5 L 1243.5 676.5 L 1227.5 676.5 Z M 352.5 630.5 L 368.5 630.5 L 368.5 676.5 L 352.5 676.5 Z M 309.5 630.5 L 326.5 630.5 L 326.5 676.5 L 309.5 676.5 Z M 250.5 630.5 L 266.5 630.5 L 266.5 676.5 L 250.5 676.5 Z M 1432.5 630.5 L 1448.5 630.5 L 1448.5 676.5 L 1432.5 676.5 Z M 1146.5 606.5 L 1163.5 606.5 L 1163.5 676.5 L 1146.5 676.5 Z M 618.5 595.5 L 634.5 595.5 L 634.5 676.5 L 618.5 676.5 Z M 555.5 595.5 L 571.5 595.5 L 571.5 676.5 L 555.5 676.5 Z M 1650.5 595.5 L 1666.5 595.5 L 1666.5 676.5 L 1650.5 676.5 Z M 1104.5 606.5 L 1120.5 606.5 L 1120.5 676.5 L 1104.5 676.5 Z M 1369.5 630.5 L 1386.5 630.5 L 1386.5 676.5 L 1369.5 676.5 Z M 442.5 630.5 L 458.5 630.5 L 458.5 676.5 L 442.5 676.5 Z M 399.5 630.5 L 416.5 630.5 L 416.5 676.5 L 399.5 676.5 Z M 1269.5 630.5 L 1286.5 630.5 L 1286.5 676.5 L 1269.5 676.5 Z M 1269.5 630.5 "/>
 </clipPath>
-<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image464" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image438"/>
+  <use xlink:href="#image464"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1338.5 392.5 L 1354.5 392.5 L 1354.5 438.5 L 1338.5 438.5 Z M 1496.5 392.5 L 1512.5 392.5 L 1512.5 438.5 L 1496.5 438.5 Z M 1387.5 392.5 L 1404.5 392.5 L 1404.5 438.5 L 1387.5 438.5 Z M 291.5 392.5 L 308.5 392.5 L 308.5 462.5 L 291.5 462.5 Z M 406.5 392.5 L 423.5 392.5 L 423.5 462.5 L 406.5 462.5 Z M 452.5 392.5 L 469.5 392.5 L 469.5 462.5 L 452.5 462.5 Z M 242.5 392.5 L 258.5 392.5 L 258.5 462.5 L 242.5 462.5 Z M 337.5 392.5 L 354.5 392.5 L 354.5 462.5 L 337.5 462.5 Z M 935.5 420.5 L 951.5 420.5 L 951.5 466.5 L 935.5 466.5 Z M 987.5 420.5 L 1004.5 420.5 L 1004.5 466.5 L 987.5 466.5 Z M 854.5 420.5 L 870.5 420.5 L 870.5 466.5 L 854.5 466.5 Z M 743.5 420.5 L 759.5 420.5 L 759.5 466.5 L 743.5 466.5 Z M 798.5 420.5 L 814.5 420.5 L 814.5 466.5 L 798.5 466.5 Z M 1605.5 404.5 L 1621.5 404.5 L 1621.5 496.5 L 1605.5 496.5 Z M 1168.5 466.5 L 1185.5 466.5 L 1185.5 512.5 L 1168.5 512.5 Z M 1230.5 402.5 L 1246.5 402.5 L 1246.5 512.5 L 1230.5 512.5 Z M 1660.5 392.5 L 1676.5 392.5 L 1676.5 515.5 L 1660.5 515.5 Z M 622.5 392.5 L 638.5 392.5 L 638.5 515.5 L 622.5 515.5 Z M 573.5 392.5 L 589.5 392.5 L 589.5 515.5 L 573.5 515.5 Z M 1062.5 420.5 L 1078.5 420.5 L 1078.5 530.5 L 1062.5 530.5 Z M 1062.5 420.5 "/>
 </clipPath>
-<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image465" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image439"/>
+  <use xlink:href="#image465"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 212.5 342.5 L 231.5 342.5 L 231.5 361.5 L 212.5 361.5 Z M 1687.5 342.5 L 1706.5 342.5 L 1706.5 361.5 L 1687.5 361.5 Z M 1634.5 342.5 L 1653.5 342.5 L 1653.5 361.5 L 1634.5 361.5 Z M 1582.5 342.5 L 1600.5 342.5 L 1600.5 361.5 L 1582.5 361.5 Z M 1529.5 342.5 L 1548.5 342.5 L 1548.5 361.5 L 1529.5 361.5 Z M 1476.5 342.5 L 1495.5 342.5 L 1495.5 361.5 L 1476.5 361.5 Z M 1424.5 342.5 L 1442.5 342.5 L 1442.5 361.5 L 1424.5 361.5 Z M 1371.5 342.5 L 1390.5 342.5 L 1390.5 361.5 L 1371.5 361.5 Z M 1318.5 342.5 L 1337.5 342.5 L 1337.5 361.5 L 1318.5 361.5 Z M 1266.5 342.5 L 1284.5 342.5 L 1284.5 361.5 L 1266.5 361.5 Z M 1213.5 342.5 L 1232.5 342.5 L 1232.5 361.5 L 1213.5 361.5 Z M 1160.5 342.5 L 1179.5 342.5 L 1179.5 361.5 L 1160.5 361.5 Z M 1108.5 342.5 L 1126.5 342.5 L 1126.5 361.5 L 1108.5 361.5 Z M 1055.5 342.5 L 1073.5 342.5 L 1073.5 361.5 L 1055.5 361.5 Z M 1002.5 342.5 L 1021.5 342.5 L 1021.5 361.5 L 1002.5 361.5 Z M 949.5 342.5 L 968.5 342.5 L 968.5 361.5 L 949.5 361.5 Z M 897.5 342.5 L 915.5 342.5 L 915.5 361.5 L 897.5 361.5 Z M 844.5 342.5 L 863.5 342.5 L 863.5 361.5 L 844.5 361.5 Z M 791.5 342.5 L 810.5 342.5 L 810.5 361.5 L 791.5 361.5 Z M 739.5 342.5 L 757.5 342.5 L 757.5 361.5 L 739.5 361.5 Z M 686.5 342.5 L 705.5 342.5 L 705.5 361.5 L 686.5 361.5 Z M 633.5 342.5 L 652.5 342.5 L 652.5 361.5 L 633.5 361.5 Z M 581.5 342.5 L 599.5 342.5 L 599.5 361.5 L 581.5 361.5 Z M 528.5 342.5 L 547.5 342.5 L 547.5 361.5 L 528.5 361.5 Z M 475.5 342.5 L 494.5 342.5 L 494.5 361.5 L 475.5 361.5 Z M 423.5 342.5 L 441.5 342.5 L 441.5 361.5 L 423.5 361.5 Z M 370.5 342.5 L 389.5 342.5 L 389.5 361.5 L 370.5 361.5 Z M 317.5 342.5 L 336.5 342.5 L 336.5 361.5 L 317.5 361.5 Z M 265.5 342.5 L 283.5 342.5 L 283.5 361.5 L 265.5 361.5 Z M 1371.5 525.5 L 1390.5 525.5 L 1390.5 538.5 L 1371.5 538.5 Z M 1002.5 525.5 L 1021.5 525.5 L 1021.5 543.5 L 1002.5 543.5 Z M 1002.5 543.5 L 1021.5 543.5 L 1021.5 544.5 L 1002.5 544.5 Z M 1371.5 538.5 L 1390.5 538.5 L 1390.5 544.5 L 1371.5 544.5 Z M 212.5 708.5 L 231.5 708.5 L 231.5 726.5 L 212.5 726.5 Z M 1687.5 708.5 L 1706.5 708.5 L 1706.5 726.5 L 1687.5 726.5 Z M 1634.5 708.5 L 1653.5 708.5 L 1653.5 726.5 L 1634.5 726.5 Z M 1582.5 708.5 L 1600.5 708.5 L 1600.5 726.5 L 1582.5 726.5 Z M 1529.5 708.5 L 1548.5 708.5 L 1548.5 726.5 L 1529.5 726.5 Z M 1476.5 708.5 L 1495.5 708.5 L 1495.5 726.5 L 1476.5 726.5 Z M 1424.5 708.5 L 1442.5 708.5 L 1442.5 726.5 L 1424.5 726.5 Z M 1371.5 708.5 L 1390.5 708.5 L 1390.5 726.5 L 1371.5 726.5 Z M 1318.5 708.5 L 1337.5 708.5 L 1337.5 726.5 L 1318.5 726.5 Z M 1266.5 708.5 L 1284.5 708.5 L 1284.5 726.5 L 1266.5 726.5 Z M 1213.5 708.5 L 1232.5 708.5 L 1232.5 726.5 L 1213.5 726.5 Z M 1160.5 708.5 L 1179.5 708.5 L 1179.5 726.5 L 1160.5 726.5 Z M 1108.5 708.5 L 1126.5 708.5 L 1126.5 726.5 L 1108.5 726.5 Z M 1055.5 708.5 L 1073.5 708.5 L 1073.5 726.5 L 1055.5 726.5 Z M 1002.5 708.5 L 1021.5 708.5 L 1021.5 726.5 L 1002.5 726.5 Z M 949.5 708.5 L 968.5 708.5 L 968.5 726.5 L 949.5 726.5 Z M 897.5 708.5 L 915.5 708.5 L 915.5 726.5 L 897.5 726.5 Z M 844.5 708.5 L 863.5 708.5 L 863.5 726.5 L 844.5 726.5 Z M 791.5 708.5 L 810.5 708.5 L 810.5 726.5 L 791.5 726.5 Z M 739.5 708.5 L 757.5 708.5 L 757.5 726.5 L 739.5 726.5 Z M 686.5 708.5 L 705.5 708.5 L 705.5 726.5 L 686.5 726.5 Z M 633.5 708.5 L 652.5 708.5 L 652.5 726.5 L 633.5 726.5 Z M 581.5 708.5 L 599.5 708.5 L 599.5 726.5 L 581.5 726.5 Z M 528.5 708.5 L 547.5 708.5 L 547.5 726.5 L 528.5 726.5 Z M 475.5 708.5 L 494.5 708.5 L 494.5 726.5 L 475.5 726.5 Z M 423.5 708.5 L 441.5 708.5 L 441.5 726.5 L 423.5 726.5 Z M 370.5 708.5 L 389.5 708.5 L 389.5 726.5 L 370.5 726.5 Z M 317.5 708.5 L 336.5 708.5 L 336.5 726.5 L 317.5 726.5 Z M 265.5 708.5 L 283.5 708.5 L 283.5 726.5 L 265.5 726.5 Z M 265.5 708.5 "/>
 </clipPath>
-<image id="image440" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image466" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image440"/>
+  <use xlink:href="#image466"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface434">
+<g id="surface460">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -225,6 +225,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 319.371094 505.5 L 319.371094 481.984375 L 328.433594 481.984375 L 329.855469 482.082031 L 331.175781 482.339844 L 332.402344 482.789062 L 333.53125 483.371094 L 334.53125 484.175781 L 335.46875 485.113281 L 336.242188 486.242188 L 336.886719 487.46875 L 337.371094 488.855469 L 337.726562 490.339844 L 337.917969 491.984375 L 338.015625 493.726562 L 337.917969 495.566406 L 337.695312 497.273438 L 337.304688 498.824219 L 336.789062 500.242188 L 336.113281 501.5 L 335.273438 502.597656 L 334.371094 503.5 L 333.371094 504.210938 L 332.273438 504.789062 L 331.082031 505.175781 L 329.789062 505.433594 L 328.433594 505.5 Z M 322.371094 502.855469 L 327.917969 502.855469 L 329.402344 502.757812 L 330.726562 502.402344 L 331.886719 501.789062 L 332.855469 500.984375 L 333.628906 499.886719 L 334.273438 498.566406 L 334.46875 497.886719 L 334.660156 497.175781 L 334.824219 496.402344 L 334.917969 495.566406 L 334.984375 494.695312 L 335.015625 493.757812 L 334.886719 491.660156 L 334.566406 489.824219 L 333.984375 488.242188 L 333.210938 486.984375 L 332.210938 485.953125 L 330.984375 485.210938 L 330.53125 485.046875 L 330.046875 484.886719 L 329.53125 484.789062 L 329.015625 484.695312 L 328.46875 484.660156 L 327.917969 484.628906 L 322.371094 484.628906 Z M 322.371094 502.855469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 317 595 L 336 595 M 317 576 L 336 576 M 317 576 L 317 595 M 336 576 L 336 595 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 317 595 L 336 595 M 317 576 L 336 576 M 336 595 L 336 576 M 317 595 L 317 576 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 195 357 L 195 366 M 190 362 L 199 362 M 194 363 L 196 363 M 194 361 L 196 361 M 194 361 L 194 363 M 196 361 L 196 363 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.svg b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.svg
index 27b44c9..510ca49 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.svg
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 343.5 L 1743.5 343.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 343.5 "/>
 </clipPath>
-<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image450" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image423"/>
+  <use xlink:href="#image450"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 194.5 680.5 L 1724.5 680.5 L 1724.5 705.5 L 194.5 705.5 Z M 194.5 680.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image423"/>
+  <use xlink:href="#image450"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1566.5 589.5 L 1581.5 589.5 L 1581.5 655.5 L 1566.5 655.5 Z M 688.5 620.5 L 703.5 620.5 L 703.5 664.5 L 688.5 664.5 Z M 766.5 620.5 L 781.5 620.5 L 781.5 664.5 L 766.5 664.5 Z M 803.5 620.5 L 818.5 620.5 L 818.5 664.5 L 803.5 664.5 Z M 1664.5 589.5 L 1679.5 589.5 L 1679.5 665.5 L 1664.5 665.5 Z M 1620.5 589.5 L 1635.5 589.5 L 1635.5 665.5 L 1620.5 665.5 Z M 1319.5 624.5 L 1335.5 624.5 L 1335.5 667.5 L 1319.5 667.5 Z M 1279.5 624.5 L 1295.5 624.5 L 1295.5 667.5 L 1279.5 667.5 Z M 341.5 624.5 L 357.5 624.5 L 357.5 667.5 L 341.5 667.5 Z M 301.5 624.5 L 317.5 624.5 L 317.5 667.5 L 301.5 667.5 Z M 237.5 624.5 L 252.5 624.5 L 252.5 667.5 L 237.5 667.5 Z M 913.5 624.5 L 928.5 624.5 L 928.5 667.5 L 913.5 667.5 Z M 1228.5 601.5 L 1243.5 601.5 L 1243.5 667.5 L 1228.5 667.5 Z M 953.5 624.5 L 969.5 624.5 L 969.5 667.5 L 953.5 667.5 Z M 587.5 591.5 L 602.5 591.5 L 602.5 667.5 L 587.5 667.5 Z M 1022.5 601.5 L 1037.5 601.5 L 1037.5 667.5 L 1022.5 667.5 Z M 1183.5 601.5 L 1199.5 601.5 L 1199.5 667.5 L 1183.5 667.5 Z M 1066.5 601.5 L 1082.5 601.5 L 1082.5 667.5 L 1066.5 667.5 Z M 385.5 624.5 L 401.5 624.5 L 401.5 667.5 L 385.5 667.5 Z M 434.5 624.5 L 449.5 624.5 L 449.5 667.5 L 434.5 667.5 Z M 536.5 591.5 L 551.5 591.5 L 551.5 667.5 L 536.5 667.5 Z M 1378.5 624.5 L 1393.5 624.5 L 1393.5 667.5 L 1378.5 667.5 Z M 1464.5 624.5 L 1479.5 624.5 L 1479.5 667.5 L 1464.5 667.5 Z M 1464.5 624.5 "/>
 </clipPath>
-<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image451" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image424"/>
+  <use xlink:href="#image451"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1366.5 401.5 L 1381.5 401.5 L 1381.5 444.5 L 1366.5 444.5 Z M 1466.5 401.5 L 1482.5 401.5 L 1482.5 444.5 L 1466.5 444.5 Z M 1279.5 401.5 L 1295.5 401.5 L 1295.5 444.5 L 1279.5 444.5 Z M 1319.5 401.5 L 1335.5 401.5 L 1335.5 444.5 L 1319.5 444.5 Z M 753.5 414.5 L 768.5 414.5 L 768.5 457.5 L 753.5 457.5 Z M 238.5 401.5 L 253.5 401.5 L 253.5 467.5 L 238.5 467.5 Z M 392.5 401.5 L 408.5 401.5 L 408.5 467.5 L 392.5 467.5 Z M 284.5 401.5 L 300.5 401.5 L 300.5 467.5 L 284.5 467.5 Z M 927.5 424.5 L 943.5 424.5 L 943.5 467.5 L 927.5 467.5 Z M 435.5 401.5 L 451.5 401.5 L 451.5 467.5 L 435.5 467.5 Z M 806.5 424.5 L 821.5 424.5 L 821.5 467.5 L 806.5 467.5 Z M 327.5 401.5 L 343.5 401.5 L 343.5 467.5 L 327.5 467.5 Z M 877.5 424.5 L 892.5 424.5 L 892.5 467.5 L 877.5 467.5 Z M 698.5 427.5 L 713.5 427.5 L 713.5 470.5 L 698.5 470.5 Z M 1157.5 401.5 L 1172.5 401.5 L 1172.5 487.5 L 1157.5 487.5 Z M 1203.5 401.5 L 1218.5 401.5 L 1218.5 487.5 L 1203.5 487.5 Z M 1567.5 401.5 L 1583.5 401.5 L 1583.5 504.5 L 1567.5 504.5 Z M 1039.5 424.5 L 1054.5 424.5 L 1054.5 510.5 L 1039.5 510.5 Z M 993.5 424.5 L 1008.5 424.5 L 1008.5 510.5 L 993.5 510.5 Z M 591.5 401.5 L 606.5 401.5 L 606.5 516.5 L 591.5 516.5 Z M 1619.5 401.5 L 1634.5 401.5 L 1634.5 516.5 L 1619.5 516.5 Z M 1665.5 401.5 L 1681.5 401.5 L 1681.5 516.5 L 1665.5 516.5 Z M 544.5 401.5 L 560.5 401.5 L 560.5 516.5 L 544.5 516.5 Z M 544.5 401.5 "/>
 </clipPath>
-<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image452" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image425"/>
+  <use xlink:href="#image452"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 210.5 354.5 L 227.5 354.5 L 227.5 372.5 L 210.5 372.5 Z M 1691.5 354.5 L 1708.5 354.5 L 1708.5 372.5 L 1691.5 372.5 Z M 1641.5 354.5 L 1659.5 354.5 L 1659.5 372.5 L 1641.5 372.5 Z M 1592.5 354.5 L 1609.5 354.5 L 1609.5 372.5 L 1592.5 372.5 Z M 1542.5 354.5 L 1560.5 354.5 L 1560.5 372.5 L 1542.5 372.5 Z M 1493.5 354.5 L 1511.5 354.5 L 1511.5 372.5 L 1493.5 372.5 Z M 1444.5 354.5 L 1461.5 354.5 L 1461.5 372.5 L 1444.5 372.5 Z M 1394.5 354.5 L 1412.5 354.5 L 1412.5 372.5 L 1394.5 372.5 Z M 1345.5 354.5 L 1362.5 354.5 L 1362.5 372.5 L 1345.5 372.5 Z M 1296.5 354.5 L 1313.5 354.5 L 1313.5 372.5 L 1296.5 372.5 Z M 1246.5 354.5 L 1264.5 354.5 L 1264.5 372.5 L 1246.5 372.5 Z M 1197.5 354.5 L 1214.5 354.5 L 1214.5 372.5 L 1197.5 372.5 Z M 1148.5 354.5 L 1165.5 354.5 L 1165.5 372.5 L 1148.5 372.5 Z M 1098.5 354.5 L 1116.5 354.5 L 1116.5 372.5 L 1098.5 372.5 Z M 1049.5 354.5 L 1066.5 354.5 L 1066.5 372.5 L 1049.5 372.5 Z M 999.5 354.5 L 1017.5 354.5 L 1017.5 372.5 L 999.5 372.5 Z M 950.5 354.5 L 968.5 354.5 L 968.5 372.5 L 950.5 372.5 Z M 901.5 354.5 L 918.5 354.5 L 918.5 372.5 L 901.5 372.5 Z M 851.5 354.5 L 869.5 354.5 L 869.5 372.5 L 851.5 372.5 Z M 802.5 354.5 L 819.5 354.5 L 819.5 372.5 L 802.5 372.5 Z M 753.5 354.5 L 770.5 354.5 L 770.5 372.5 L 753.5 372.5 Z M 703.5 354.5 L 721.5 354.5 L 721.5 372.5 L 703.5 372.5 Z M 654.5 354.5 L 671.5 354.5 L 671.5 372.5 L 654.5 372.5 Z M 604.5 354.5 L 622.5 354.5 L 622.5 372.5 L 604.5 372.5 Z M 555.5 354.5 L 573.5 354.5 L 573.5 372.5 L 555.5 372.5 Z M 506.5 354.5 L 523.5 354.5 L 523.5 372.5 L 506.5 372.5 Z M 456.5 354.5 L 474.5 354.5 L 474.5 372.5 L 456.5 372.5 Z M 407.5 354.5 L 425.5 354.5 L 425.5 372.5 L 407.5 372.5 Z M 358.5 354.5 L 375.5 354.5 L 375.5 372.5 L 358.5 372.5 Z M 308.5 354.5 L 326.5 354.5 L 326.5 372.5 L 308.5 372.5 Z M 259.5 354.5 L 276.5 354.5 L 276.5 372.5 L 259.5 372.5 Z M 950.5 563.5 L 968.5 563.5 L 968.5 571.5 L 950.5 571.5 Z M 1394.5 563.5 L 1412.5 563.5 L 1412.5 581.5 L 1394.5 581.5 Z M 950.5 571.5 L 968.5 571.5 L 968.5 581.5 L 950.5 581.5 Z M 210.5 697.5 L 227.5 697.5 L 227.5 714.5 L 210.5 714.5 Z M 1691.5 697.5 L 1708.5 697.5 L 1708.5 714.5 L 1691.5 714.5 Z M 1641.5 697.5 L 1659.5 697.5 L 1659.5 714.5 L 1641.5 714.5 Z M 1592.5 697.5 L 1609.5 697.5 L 1609.5 714.5 L 1592.5 714.5 Z M 1542.5 697.5 L 1560.5 697.5 L 1560.5 714.5 L 1542.5 714.5 Z M 1493.5 697.5 L 1511.5 697.5 L 1511.5 714.5 L 1493.5 714.5 Z M 1444.5 697.5 L 1461.5 697.5 L 1461.5 714.5 L 1444.5 714.5 Z M 1394.5 697.5 L 1412.5 697.5 L 1412.5 714.5 L 1394.5 714.5 Z M 1345.5 697.5 L 1362.5 697.5 L 1362.5 714.5 L 1345.5 714.5 Z M 1296.5 697.5 L 1313.5 697.5 L 1313.5 714.5 L 1296.5 714.5 Z M 1246.5 697.5 L 1264.5 697.5 L 1264.5 714.5 L 1246.5 714.5 Z M 1197.5 697.5 L 1214.5 697.5 L 1214.5 714.5 L 1197.5 714.5 Z M 1148.5 697.5 L 1165.5 697.5 L 1165.5 714.5 L 1148.5 714.5 Z M 1098.5 697.5 L 1116.5 697.5 L 1116.5 714.5 L 1098.5 714.5 Z M 1049.5 697.5 L 1066.5 697.5 L 1066.5 714.5 L 1049.5 714.5 Z M 999.5 697.5 L 1017.5 697.5 L 1017.5 714.5 L 999.5 714.5 Z M 950.5 697.5 L 968.5 697.5 L 968.5 714.5 L 950.5 714.5 Z M 901.5 697.5 L 918.5 697.5 L 918.5 714.5 L 901.5 714.5 Z M 851.5 697.5 L 869.5 697.5 L 869.5 714.5 L 851.5 714.5 Z M 802.5 697.5 L 819.5 697.5 L 819.5 714.5 L 802.5 714.5 Z M 753.5 697.5 L 770.5 697.5 L 770.5 714.5 L 753.5 714.5 Z M 703.5 697.5 L 721.5 697.5 L 721.5 714.5 L 703.5 714.5 Z M 654.5 697.5 L 671.5 697.5 L 671.5 714.5 L 654.5 714.5 Z M 604.5 697.5 L 622.5 697.5 L 622.5 714.5 L 604.5 714.5 Z M 555.5 697.5 L 573.5 697.5 L 573.5 714.5 L 555.5 714.5 Z M 506.5 697.5 L 523.5 697.5 L 523.5 714.5 L 506.5 714.5 Z M 456.5 697.5 L 474.5 697.5 L 474.5 714.5 L 456.5 714.5 Z M 407.5 697.5 L 425.5 697.5 L 425.5 714.5 L 407.5 714.5 Z M 358.5 697.5 L 375.5 697.5 L 375.5 714.5 L 358.5 714.5 Z M 308.5 697.5 L 326.5 697.5 L 326.5 714.5 L 308.5 714.5 Z M 259.5 697.5 L 276.5 697.5 L 276.5 714.5 L 259.5 714.5 Z M 259.5 697.5 "/>
 </clipPath>
-<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image426"/>
+  <use xlink:href="#image453"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface420">
+<g id="surface447">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -210,6 +210,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1710.089844 507.792969 L 1708.703125 509.5 L 1705.613281 506.9375 L 1704.730469 507.410156 L 1703.84375 507.761719 L 1702.933594 508.058594 L 1701.960938 508.261719 L 1700.988281 508.378906 L 1699.988281 508.441406 L 1698.632812 508.351562 L 1697.367188 508.144531 L 1696.1875 507.792969 L 1695.066406 507.320312 L 1694.007812 506.703125 L 1693.066406 505.90625 L 1692.210938 505.050781 L 1691.476562 504.082031 L 1690.886719 503.019531 L 1690.386719 501.871094 L 1690.003906 500.632812 L 1689.765625 499.28125 L 1689.707031 498.957031 L 1689.679688 498.601562 L 1689.648438 498.277344 L 1689.621094 497.925781 L 1689.621094 497.1875 L 1689.679688 495.714844 L 1689.882812 494.300781 L 1690.207031 493.007812 L 1690.679688 491.769531 L 1691.269531 490.621094 L 1692.035156 489.558594 L 1692.800781 488.707031 L 1693.683594 487.941406 L 1694.65625 487.292969 L 1695.6875 486.792969 L 1696.804688 486.378906 L 1698.042969 486.085938 L 1698.335938 486.054688 L 1698.660156 486.027344 L 1698.984375 485.996094 L 1699.308594 485.96875 L 1699.632812 485.96875 L 1699.988281 485.9375 L 1701.3125 486.027344 L 1702.578125 486.230469 L 1703.757812 486.585938 L 1704.875 487.058594 L 1705.9375 487.675781 L 1706.90625 488.441406 L 1707.734375 489.324219 L 1708.46875 490.265625 L 1709.058594 491.296875 L 1709.558594 492.445312 L 1709.941406 493.683594 L 1710.207031 494.980469 L 1710.234375 495.363281 L 1710.265625 495.714844 L 1710.296875 496.070312 L 1710.324219 496.421875 L 1710.324219 496.777344 L 1710.355469 497.128906 L 1710.265625 498.777344 L 1710 500.339844 L 1709.589844 501.785156 L 1709 503.136719 L 1708.234375 504.375 L 1707.320312 505.523438 Z M 1702.667969 501.722656 L 1705.289062 503.875 L 1705.996094 502.992188 L 1706.585938 501.988281 L 1707.027344 500.898438 L 1707.351562 499.75 L 1707.527344 498.515625 L 1707.613281 497.160156 L 1707.554688 495.921875 L 1707.378906 494.742188 L 1707.085938 493.652344 L 1706.703125 492.652344 L 1706.203125 491.710938 L 1705.582031 490.855469 L 1704.875 490.148438 L 1704.140625 489.558594 L 1703.316406 489.089844 L 1702.429688 488.734375 L 1701.460938 488.5 L 1700.457031 488.351562 L 1699.988281 488.351562 L 1698.925781 488.441406 L 1697.925781 488.617188 L 1696.984375 488.914062 L 1696.128906 489.355469 L 1695.332031 489.914062 L 1694.625 490.589844 L 1693.949219 491.386719 L 1693.417969 492.269531 L 1692.976562 493.242188 L 1692.652344 494.300781 L 1692.445312 495.449219 L 1692.359375 496.6875 L 1692.359375 497.1875 L 1692.386719 498.484375 L 1692.566406 499.664062 L 1692.859375 500.753906 L 1693.242188 501.785156 L 1693.773438 502.726562 L 1694.421875 503.550781 L 1695.097656 504.285156 L 1695.863281 504.875 L 1696.6875 505.347656 L 1697.570312 505.671875 L 1698.542969 505.90625 L 1699.574219 505.996094 L 1699.632812 506.023438 L 1700.488281 506.023438 L 1701.046875 505.964844 L 1701.605469 505.847656 L 1702.136719 505.730469 L 1702.667969 505.554688 L 1703.226562 505.316406 L 1703.257812 505.316406 L 1703.316406 505.289062 L 1703.34375 505.257812 L 1703.402344 505.257812 L 1703.433594 505.230469 L 1703.492188 505.199219 L 1701.3125 503.375 Z M 1702.667969 501.722656 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1691 592 L 1708 592 M 1691 574 L 1708 574 M 1691 574 L 1691 592 M 1708 574 L 1708 592 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1691 592 L 1708 592 M 1691 574 L 1708 574 M 1708 592 L 1708 574 M 1691 592 L 1691 574 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 194 369 L 194 378 M 189 374 L 198 374 M 193 375 L 195 375 M 193 373 L 195 373 M 193 373 L 193 375 M 195 373 L 195 375 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.svg b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.svg
index a2ff2d1..0eed47c 100644
--- a/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.svg
+++ b/cells/sdfstp/sky130_fd_sc_hs__sdfstp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 354.5 L 1743.5 354.5 L 1743.5 534.5 L 174.5 534.5 Z M 174.5 354.5 "/>
 </clipPath>
-<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image447" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image420"/>
+  <use xlink:href="#image447"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 192.5 671.5 L 1725.5 671.5 L 1725.5 695.5 L 192.5 695.5 Z M 192.5 671.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image420"/>
+  <use xlink:href="#image447"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 670.5 615.5 L 684.5 615.5 L 684.5 656.5 L 670.5 656.5 Z M 736.5 615.5 L 750.5 615.5 L 750.5 656.5 L 736.5 656.5 Z M 773.5 615.5 L 788.5 615.5 L 788.5 656.5 L 773.5 656.5 Z M 380.5 619.5 L 394.5 619.5 L 394.5 659.5 L 380.5 659.5 Z M 323.5 619.5 L 338.5 619.5 L 338.5 659.5 L 323.5 659.5 Z M 285.5 619.5 L 300.5 619.5 L 300.5 659.5 L 285.5 659.5 Z M 1372.5 619.5 L 1387.5 619.5 L 1387.5 659.5 L 1372.5 659.5 Z M 1308.5 619.5 L 1322.5 619.5 L 1322.5 659.5 L 1308.5 659.5 Z M 1255.5 619.5 L 1270.5 619.5 L 1270.5 659.5 L 1255.5 659.5 Z M 1218.5 619.5 L 1232.5 619.5 L 1232.5 659.5 L 1218.5 659.5 Z M 915.5 619.5 L 929.5 619.5 L 929.5 659.5 L 915.5 659.5 Z M 233.5 619.5 L 248.5 619.5 L 248.5 659.5 L 233.5 659.5 Z M 1663.5 588.5 L 1678.5 588.5 L 1678.5 659.5 L 1663.5 659.5 Z M 1517.5 588.5 L 1531.5 588.5 L 1531.5 659.5 L 1517.5 659.5 Z M 518.5 588.5 L 533.5 588.5 L 533.5 659.5 L 518.5 659.5 Z M 1127.5 597.5 L 1141.5 597.5 L 1141.5 659.5 L 1127.5 659.5 Z M 1031.5 597.5 L 1045.5 597.5 L 1045.5 659.5 L 1031.5 659.5 Z M 989.5 597.5 L 1004.5 597.5 L 1004.5 659.5 L 989.5 659.5 Z M 1168.5 597.5 L 1183.5 597.5 L 1183.5 659.5 L 1168.5 659.5 Z M 877.5 619.5 L 892.5 619.5 L 892.5 659.5 L 877.5 659.5 Z M 566.5 588.5 L 581.5 588.5 L 581.5 659.5 L 566.5 659.5 Z M 1622.5 588.5 L 1636.5 588.5 L 1636.5 659.5 L 1622.5 659.5 Z M 1573.5 588.5 L 1588.5 588.5 L 1588.5 659.5 L 1573.5 659.5 Z M 417.5 619.5 L 432.5 619.5 L 432.5 659.5 L 417.5 659.5 Z M 1468.5 588.5 L 1483.5 588.5 L 1483.5 659.5 L 1468.5 659.5 Z M 1468.5 588.5 "/>
 </clipPath>
-<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image448" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image421"/>
+  <use xlink:href="#image448"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1397.5 409.5 L 1412.5 409.5 L 1412.5 449.5 L 1397.5 449.5 Z M 1299.5 409.5 L 1314.5 409.5 L 1314.5 449.5 L 1299.5 449.5 Z M 1256.5 409.5 L 1270.5 409.5 L 1270.5 449.5 L 1256.5 449.5 Z M 1195.5 409.5 L 1210.5 409.5 L 1210.5 449.5 L 1195.5 449.5 Z M 729.5 415.5 L 744.5 415.5 L 744.5 456.5 L 729.5 456.5 Z M 378.5 409.5 L 393.5 409.5 L 393.5 471.5 L 378.5 471.5 Z M 317.5 409.5 L 332.5 409.5 L 332.5 471.5 L 317.5 471.5 Z M 277.5 409.5 L 291.5 409.5 L 291.5 471.5 L 277.5 471.5 Z M 233.5 409.5 L 248.5 409.5 L 248.5 471.5 L 233.5 471.5 Z M 419.5 409.5 L 433.5 409.5 L 433.5 471.5 L 419.5 471.5 Z M 896.5 433.5 L 910.5 433.5 L 910.5 474.5 L 896.5 474.5 Z M 849.5 433.5 L 864.5 433.5 L 864.5 474.5 L 849.5 474.5 Z M 778.5 433.5 L 793.5 433.5 L 793.5 474.5 L 778.5 474.5 Z M 678.5 433.5 L 692.5 433.5 L 692.5 474.5 L 678.5 474.5 Z M 1103.5 409.5 L 1117.5 409.5 L 1117.5 490.5 L 1103.5 490.5 Z M 1146.5 409.5 L 1161.5 409.5 L 1161.5 490.5 L 1146.5 490.5 Z M 1446.5 409.5 L 1460.5 409.5 L 1460.5 490.5 L 1446.5 490.5 Z M 1489.5 409.5 L 1504.5 409.5 L 1504.5 490.5 L 1489.5 490.5 Z M 1005.5 433.5 L 1020.5 433.5 L 1020.5 515.5 L 1005.5 515.5 Z M 962.5 433.5 L 976.5 433.5 L 976.5 515.5 L 962.5 515.5 Z M 568.5 409.5 L 583.5 409.5 L 583.5 517.5 L 568.5 517.5 Z M 525.5 409.5 L 539.5 409.5 L 539.5 517.5 L 525.5 517.5 Z M 1538.5 409.5 L 1553.5 409.5 L 1553.5 517.5 L 1538.5 517.5 Z M 1669.5 409.5 L 1684.5 409.5 L 1684.5 517.5 L 1669.5 517.5 Z M 1625.5 409.5 L 1640.5 409.5 L 1640.5 517.5 L 1625.5 517.5 Z M 1582.5 409.5 L 1596.5 409.5 L 1596.5 517.5 L 1582.5 517.5 Z M 1582.5 409.5 "/>
 </clipPath>
-<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image449" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image422"/>
+  <use xlink:href="#image449"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 207.5 365.5 L 224.5 365.5 L 224.5 381.5 L 207.5 381.5 Z M 1694.5 365.5 L 1710.5 365.5 L 1710.5 381.5 L 1694.5 381.5 Z M 1647.5 365.5 L 1664.5 365.5 L 1664.5 381.5 L 1647.5 381.5 Z M 1601.5 365.5 L 1617.5 365.5 L 1617.5 381.5 L 1601.5 381.5 Z M 1554.5 365.5 L 1571.5 365.5 L 1571.5 381.5 L 1554.5 381.5 Z M 1508.5 365.5 L 1524.5 365.5 L 1524.5 381.5 L 1508.5 381.5 Z M 1461.5 365.5 L 1478.5 365.5 L 1478.5 381.5 L 1461.5 381.5 Z M 1415.5 365.5 L 1431.5 365.5 L 1431.5 381.5 L 1415.5 381.5 Z M 1369.5 365.5 L 1385.5 365.5 L 1385.5 381.5 L 1369.5 381.5 Z M 1322.5 365.5 L 1339.5 365.5 L 1339.5 381.5 L 1322.5 381.5 Z M 1276.5 365.5 L 1292.5 365.5 L 1292.5 381.5 L 1276.5 381.5 Z M 1229.5 365.5 L 1246.5 365.5 L 1246.5 381.5 L 1229.5 381.5 Z M 1183.5 365.5 L 1199.5 365.5 L 1199.5 381.5 L 1183.5 381.5 Z M 1136.5 365.5 L 1153.5 365.5 L 1153.5 381.5 L 1136.5 381.5 Z M 1090.5 365.5 L 1106.5 365.5 L 1106.5 381.5 L 1090.5 381.5 Z M 1043.5 365.5 L 1060.5 365.5 L 1060.5 381.5 L 1043.5 381.5 Z M 997.5 365.5 L 1013.5 365.5 L 1013.5 381.5 L 997.5 381.5 Z M 951.5 365.5 L 967.5 365.5 L 967.5 381.5 L 951.5 381.5 Z M 904.5 365.5 L 921.5 365.5 L 921.5 381.5 L 904.5 381.5 Z M 858.5 365.5 L 874.5 365.5 L 874.5 381.5 L 858.5 381.5 Z M 811.5 365.5 L 828.5 365.5 L 828.5 381.5 L 811.5 381.5 Z M 765.5 365.5 L 781.5 365.5 L 781.5 381.5 L 765.5 381.5 Z M 718.5 365.5 L 735.5 365.5 L 735.5 381.5 L 718.5 381.5 Z M 672.5 365.5 L 688.5 365.5 L 688.5 381.5 L 672.5 381.5 Z M 625.5 365.5 L 642.5 365.5 L 642.5 381.5 L 625.5 381.5 Z M 579.5 365.5 L 595.5 365.5 L 595.5 381.5 L 579.5 381.5 Z M 533.5 365.5 L 549.5 365.5 L 549.5 381.5 L 533.5 381.5 Z M 486.5 365.5 L 503.5 365.5 L 503.5 381.5 L 486.5 381.5 Z M 440.5 365.5 L 456.5 365.5 L 456.5 381.5 L 440.5 381.5 Z M 393.5 365.5 L 410.5 365.5 L 410.5 381.5 L 393.5 381.5 Z M 347.5 365.5 L 363.5 365.5 L 363.5 381.5 L 347.5 381.5 Z M 300.5 365.5 L 317.5 365.5 L 317.5 381.5 L 300.5 381.5 Z M 254.5 365.5 L 270.5 365.5 L 270.5 381.5 L 254.5 381.5 Z M 1322.5 526.5 L 1339.5 526.5 L 1339.5 529.5 L 1322.5 529.5 Z M 904.5 526.5 L 921.5 526.5 L 921.5 531.5 L 904.5 531.5 Z M 904.5 531.5 L 921.5 531.5 L 921.5 542.5 L 904.5 542.5 Z M 1322.5 529.5 L 1339.5 529.5 L 1339.5 542.5 L 1322.5 542.5 Z M 207.5 687.5 L 224.5 687.5 L 224.5 703.5 L 207.5 703.5 Z M 1694.5 687.5 L 1710.5 687.5 L 1710.5 703.5 L 1694.5 703.5 Z M 1647.5 687.5 L 1664.5 687.5 L 1664.5 703.5 L 1647.5 703.5 Z M 1601.5 687.5 L 1617.5 687.5 L 1617.5 703.5 L 1601.5 703.5 Z M 1554.5 687.5 L 1571.5 687.5 L 1571.5 703.5 L 1554.5 703.5 Z M 1508.5 687.5 L 1524.5 687.5 L 1524.5 703.5 L 1508.5 703.5 Z M 1461.5 687.5 L 1478.5 687.5 L 1478.5 703.5 L 1461.5 703.5 Z M 1415.5 687.5 L 1431.5 687.5 L 1431.5 703.5 L 1415.5 703.5 Z M 1369.5 687.5 L 1385.5 687.5 L 1385.5 703.5 L 1369.5 703.5 Z M 1322.5 687.5 L 1339.5 687.5 L 1339.5 703.5 L 1322.5 703.5 Z M 1276.5 687.5 L 1292.5 687.5 L 1292.5 703.5 L 1276.5 703.5 Z M 1229.5 687.5 L 1246.5 687.5 L 1246.5 703.5 L 1229.5 703.5 Z M 1183.5 687.5 L 1199.5 687.5 L 1199.5 703.5 L 1183.5 703.5 Z M 1136.5 687.5 L 1153.5 687.5 L 1153.5 703.5 L 1136.5 703.5 Z M 1090.5 687.5 L 1106.5 687.5 L 1106.5 703.5 L 1090.5 703.5 Z M 1043.5 687.5 L 1060.5 687.5 L 1060.5 703.5 L 1043.5 703.5 Z M 997.5 687.5 L 1013.5 687.5 L 1013.5 703.5 L 997.5 703.5 Z M 951.5 687.5 L 967.5 687.5 L 967.5 703.5 L 951.5 703.5 Z M 904.5 687.5 L 921.5 687.5 L 921.5 703.5 L 904.5 703.5 Z M 858.5 687.5 L 874.5 687.5 L 874.5 703.5 L 858.5 703.5 Z M 811.5 687.5 L 828.5 687.5 L 828.5 703.5 L 811.5 703.5 Z M 765.5 687.5 L 781.5 687.5 L 781.5 703.5 L 765.5 703.5 Z M 718.5 687.5 L 735.5 687.5 L 735.5 703.5 L 718.5 703.5 Z M 672.5 687.5 L 688.5 687.5 L 688.5 703.5 L 672.5 703.5 Z M 625.5 687.5 L 642.5 687.5 L 642.5 703.5 L 625.5 703.5 Z M 579.5 687.5 L 595.5 687.5 L 595.5 703.5 L 579.5 703.5 Z M 533.5 687.5 L 549.5 687.5 L 549.5 703.5 L 533.5 703.5 Z M 486.5 687.5 L 503.5 687.5 L 503.5 703.5 L 486.5 703.5 Z M 440.5 687.5 L 456.5 687.5 L 456.5 703.5 L 440.5 703.5 Z M 393.5 687.5 L 410.5 687.5 L 410.5 703.5 L 393.5 703.5 Z M 347.5 687.5 L 363.5 687.5 L 363.5 703.5 L 347.5 703.5 Z M 300.5 687.5 L 317.5 687.5 L 317.5 703.5 L 300.5 703.5 Z M 254.5 687.5 L 270.5 687.5 L 270.5 703.5 L 254.5 703.5 Z M 254.5 687.5 "/>
 </clipPath>
-<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image450" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image423"/>
+  <use xlink:href="#image450"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface417">
+<g id="surface444">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -207,6 +207,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1713.0625 544.875 L 1711.742188 546.5 L 1708.796875 544.058594 L 1707.957031 544.507812 L 1707.113281 544.84375 L 1706.246094 545.125 L 1705.320312 545.320312 L 1704.394531 545.433594 L 1703.441406 545.488281 L 1702.148438 545.40625 L 1700.941406 545.210938 L 1699.820312 544.875 L 1698.753906 544.425781 L 1697.746094 543.835938 L 1696.847656 543.078125 L 1696.035156 542.265625 L 1695.332031 541.339844 L 1694.773438 540.328125 L 1694.296875 539.234375 L 1693.929688 538.058594 L 1693.707031 536.765625 L 1693.648438 536.457031 L 1693.621094 536.121094 L 1693.59375 535.8125 L 1693.566406 535.476562 L 1693.566406 534.773438 L 1693.621094 533.371094 L 1693.820312 532.027344 L 1694.125 530.792969 L 1694.574219 529.613281 L 1695.136719 528.519531 L 1695.867188 527.511719 L 1696.59375 526.695312 L 1697.4375 525.96875 L 1698.363281 525.351562 L 1699.34375 524.875 L 1700.410156 524.480469 L 1701.589844 524.199219 L 1701.867188 524.171875 L 1702.484375 524.117188 L 1702.792969 524.085938 L 1703.101562 524.085938 L 1703.441406 524.058594 L 1704.703125 524.144531 L 1705.90625 524.339844 L 1707.03125 524.675781 L 1708.097656 525.125 L 1709.105469 525.714844 L 1710.03125 526.445312 L 1710.816406 527.285156 L 1711.519531 528.183594 L 1712.078125 529.164062 L 1712.554688 530.257812 L 1712.921875 531.4375 L 1713.171875 532.671875 L 1713.203125 533.035156 L 1713.257812 533.707031 L 1713.285156 534.046875 L 1713.285156 534.382812 L 1713.3125 534.71875 L 1713.230469 536.289062 L 1712.976562 537.777344 L 1712.585938 539.152344 L 1712.023438 540.441406 L 1711.292969 541.621094 L 1710.425781 542.714844 Z M 1705.992188 539.09375 L 1708.488281 541.140625 L 1709.160156 540.300781 L 1709.722656 539.347656 L 1710.144531 538.308594 L 1710.453125 537.214844 L 1710.621094 536.039062 L 1710.703125 534.746094 L 1710.648438 533.570312 L 1710.480469 532.445312 L 1710.199219 531.410156 L 1709.835938 530.457031 L 1709.359375 529.558594 L 1708.769531 528.742188 L 1708.097656 528.070312 L 1707.394531 527.511719 L 1706.609375 527.0625 L 1705.769531 526.722656 L 1704.84375 526.5 L 1703.886719 526.359375 L 1703.441406 526.359375 L 1702.429688 526.445312 L 1701.476562 526.613281 L 1700.578125 526.894531 L 1699.765625 527.3125 L 1699.007812 527.847656 L 1698.335938 528.492188 L 1697.6875 529.25 L 1697.183594 530.089844 L 1696.765625 531.015625 L 1696.457031 532.027344 L 1696.257812 533.121094 L 1696.175781 534.296875 L 1696.175781 534.773438 L 1696.203125 536.007812 L 1696.371094 537.132812 L 1696.652344 538.167969 L 1697.015625 539.152344 L 1697.519531 540.046875 L 1698.136719 540.832031 L 1698.785156 541.535156 L 1699.511719 542.097656 L 1700.296875 542.542969 L 1701.140625 542.851562 L 1702.066406 543.078125 L 1703.046875 543.160156 L 1703.101562 543.191406 L 1703.917969 543.191406 L 1704.449219 543.132812 L 1704.984375 543.023438 L 1705.488281 542.910156 L 1705.992188 542.742188 L 1706.523438 542.515625 L 1706.554688 542.515625 L 1706.609375 542.488281 L 1706.636719 542.460938 L 1706.695312 542.460938 L 1706.722656 542.433594 L 1706.777344 542.40625 L 1704.703125 540.664062 Z M 1705.992188 539.09375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1694 553 L 1710 553 M 1694 537 L 1710 537 M 1694 537 L 1694 553 M 1710 537 L 1710 553 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1694 553 L 1710 553 M 1694 537 L 1710 537 M 1710 553 L 1710 537 M 1694 553 L 1694 537 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 192 379 L 192 388 M 187 384 L 196 384 M 191 385 L 193 385 M 191 383 L 193 383 M 191 383 L 191 385 M 193 383 L 193 385 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.svg b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.svg
index 0122a49..233fde8 100644
--- a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.svg
+++ b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 308.5 L 1743.5 308.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 308.5 "/>
 </clipPath>
-<image id="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image445" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image417"/>
+  <use xlink:href="#image445"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 197.5 708.5 L 1720.5 708.5 L 1720.5 738.5 L 197.5 738.5 Z M 197.5 708.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image417"/>
+  <use xlink:href="#image445"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 802.5 625.5 L 820.5 625.5 L 820.5 677.5 L 802.5 677.5 Z M 885.5 625.5 L 903.5 625.5 L 903.5 677.5 L 885.5 677.5 Z M 959.5 625.5 L 977.5 625.5 L 977.5 677.5 L 959.5 677.5 Z M 1584.5 602.5 L 1602.5 602.5 L 1602.5 680.5 L 1584.5 680.5 Z M 312.5 641.5 L 330.5 641.5 L 330.5 692.5 L 312.5 692.5 Z M 1248.5 641.5 L 1267.5 641.5 L 1267.5 692.5 L 1248.5 692.5 Z M 1204.5 641.5 L 1223.5 641.5 L 1223.5 692.5 L 1204.5 692.5 Z M 251.5 641.5 L 269.5 641.5 L 269.5 692.5 L 251.5 692.5 Z M 1059.5 625.5 L 1077.5 625.5 L 1077.5 692.5 L 1059.5 692.5 Z M 1650.5 602.5 L 1669.5 602.5 L 1669.5 692.5 L 1650.5 692.5 Z M 684.5 602.5 L 702.5 602.5 L 702.5 692.5 L 684.5 692.5 Z M 552.5 602.5 L 571.5 602.5 L 571.5 692.5 L 552.5 692.5 Z M 1112.5 625.5 L 1130.5 625.5 L 1130.5 692.5 L 1112.5 692.5 Z M 1342.5 625.5 L 1361.5 625.5 L 1361.5 692.5 L 1342.5 692.5 Z M 491.5 641.5 L 510.5 641.5 L 510.5 692.5 L 491.5 692.5 Z M 444.5 641.5 L 462.5 641.5 L 462.5 692.5 L 444.5 692.5 Z M 1463.5 602.5 L 1481.5 602.5 L 1481.5 692.5 L 1463.5 692.5 Z M 360.5 641.5 L 378.5 641.5 L 378.5 692.5 L 360.5 692.5 Z M 360.5 641.5 "/>
 </clipPath>
-<image id="image418" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image446" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image418"/>
+  <use xlink:href="#image446"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1262.5 376.5 L 1280.5 376.5 L 1280.5 428.5 L 1262.5 428.5 Z M 1211.5 376.5 L 1229.5 376.5 L 1229.5 428.5 L 1211.5 428.5 Z M 899.5 384.5 L 917.5 384.5 L 917.5 435.5 L 899.5 435.5 Z M 844.5 384.5 L 862.5 384.5 L 862.5 435.5 L 844.5 435.5 Z M 957.5 384.5 L 976.5 384.5 L 976.5 435.5 L 957.5 435.5 Z M 493.5 376.5 L 511.5 376.5 L 511.5 455.5 L 493.5 455.5 Z M 427.5 376.5 L 446.5 376.5 L 446.5 455.5 L 427.5 455.5 Z M 260.5 376.5 L 278.5 376.5 L 278.5 455.5 L 260.5 455.5 Z M 321.5 376.5 L 339.5 376.5 L 339.5 455.5 L 321.5 455.5 Z M 372.5 376.5 L 391.5 376.5 L 391.5 455.5 L 372.5 455.5 Z M 1145.5 376.5 L 1164.5 376.5 L 1164.5 479.5 L 1145.5 479.5 Z M 1033.5 376.5 L 1051.5 376.5 L 1051.5 479.5 L 1033.5 479.5 Z M 1589.5 389.5 L 1607.5 389.5 L 1607.5 492.5 L 1589.5 492.5 Z M 1352.5 376.5 L 1370.5 376.5 L 1370.5 498.5 L 1352.5 498.5 Z M 1470.5 376.5 L 1489.5 376.5 L 1489.5 513.5 L 1470.5 513.5 Z M 580.5 376.5 L 598.5 376.5 L 598.5 513.5 L 580.5 513.5 Z M 1650.5 376.5 L 1669.5 376.5 L 1669.5 513.5 L 1650.5 513.5 Z M 724.5 376.5 L 743.5 376.5 L 743.5 513.5 L 724.5 513.5 Z M 724.5 376.5 "/>
 </clipPath>
-<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image447" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image419"/>
+  <use xlink:href="#image447"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 216.5 321.5 L 237.5 321.5 L 237.5 342.5 L 216.5 342.5 Z M 1680.5 321.5 L 1701.5 321.5 L 1701.5 342.5 L 1680.5 342.5 Z M 1622.5 321.5 L 1642.5 321.5 L 1642.5 342.5 L 1622.5 342.5 Z M 1563.5 321.5 L 1584.5 321.5 L 1584.5 342.5 L 1563.5 342.5 Z M 1505.5 321.5 L 1525.5 321.5 L 1525.5 342.5 L 1505.5 342.5 Z M 1446.5 321.5 L 1467.5 321.5 L 1467.5 342.5 L 1446.5 342.5 Z M 1387.5 321.5 L 1408.5 321.5 L 1408.5 342.5 L 1387.5 342.5 Z M 1329.5 321.5 L 1350.5 321.5 L 1350.5 342.5 L 1329.5 342.5 Z M 1270.5 321.5 L 1291.5 321.5 L 1291.5 342.5 L 1270.5 342.5 Z M 1212.5 321.5 L 1232.5 321.5 L 1232.5 342.5 L 1212.5 342.5 Z M 1153.5 321.5 L 1174.5 321.5 L 1174.5 342.5 L 1153.5 342.5 Z M 1095.5 321.5 L 1115.5 321.5 L 1115.5 342.5 L 1095.5 342.5 Z M 1036.5 321.5 L 1057.5 321.5 L 1057.5 342.5 L 1036.5 342.5 Z M 977.5 321.5 L 998.5 321.5 L 998.5 342.5 L 977.5 342.5 Z M 919.5 321.5 L 940.5 321.5 L 940.5 342.5 L 919.5 342.5 Z M 860.5 321.5 L 881.5 321.5 L 881.5 342.5 L 860.5 342.5 Z M 802.5 321.5 L 823.5 321.5 L 823.5 342.5 L 802.5 342.5 Z M 743.5 321.5 L 764.5 321.5 L 764.5 342.5 L 743.5 342.5 Z M 685.5 321.5 L 705.5 321.5 L 705.5 342.5 L 685.5 342.5 Z M 626.5 321.5 L 647.5 321.5 L 647.5 342.5 L 626.5 342.5 Z M 568.5 321.5 L 588.5 321.5 L 588.5 342.5 L 568.5 342.5 Z M 509.5 321.5 L 530.5 321.5 L 530.5 342.5 L 509.5 342.5 Z M 450.5 321.5 L 471.5 321.5 L 471.5 342.5 L 450.5 342.5 Z M 392.5 321.5 L 413.5 321.5 L 413.5 342.5 L 392.5 342.5 Z M 333.5 321.5 L 354.5 321.5 L 354.5 342.5 L 333.5 342.5 Z M 275.5 321.5 L 295.5 321.5 L 295.5 342.5 L 275.5 342.5 Z M 216.5 727.5 L 237.5 727.5 L 237.5 748.5 L 216.5 748.5 Z M 1680.5 727.5 L 1701.5 727.5 L 1701.5 748.5 L 1680.5 748.5 Z M 1622.5 727.5 L 1642.5 727.5 L 1642.5 748.5 L 1622.5 748.5 Z M 1563.5 727.5 L 1584.5 727.5 L 1584.5 748.5 L 1563.5 748.5 Z M 1505.5 727.5 L 1525.5 727.5 L 1525.5 748.5 L 1505.5 748.5 Z M 1446.5 727.5 L 1467.5 727.5 L 1467.5 748.5 L 1446.5 748.5 Z M 1387.5 727.5 L 1408.5 727.5 L 1408.5 748.5 L 1387.5 748.5 Z M 1329.5 727.5 L 1350.5 727.5 L 1350.5 748.5 L 1329.5 748.5 Z M 1270.5 727.5 L 1291.5 727.5 L 1291.5 748.5 L 1270.5 748.5 Z M 1212.5 727.5 L 1232.5 727.5 L 1232.5 748.5 L 1212.5 748.5 Z M 1153.5 727.5 L 1174.5 727.5 L 1174.5 748.5 L 1153.5 748.5 Z M 1095.5 727.5 L 1115.5 727.5 L 1115.5 748.5 L 1095.5 748.5 Z M 1036.5 727.5 L 1057.5 727.5 L 1057.5 748.5 L 1036.5 748.5 Z M 977.5 727.5 L 998.5 727.5 L 998.5 748.5 L 977.5 748.5 Z M 919.5 727.5 L 940.5 727.5 L 940.5 748.5 L 919.5 748.5 Z M 860.5 727.5 L 881.5 727.5 L 881.5 748.5 L 860.5 748.5 Z M 802.5 727.5 L 823.5 727.5 L 823.5 748.5 L 802.5 748.5 Z M 743.5 727.5 L 764.5 727.5 L 764.5 748.5 L 743.5 748.5 Z M 685.5 727.5 L 705.5 727.5 L 705.5 748.5 L 685.5 748.5 Z M 626.5 727.5 L 647.5 727.5 L 647.5 748.5 L 626.5 748.5 Z M 568.5 727.5 L 588.5 727.5 L 588.5 748.5 L 568.5 748.5 Z M 509.5 727.5 L 530.5 727.5 L 530.5 748.5 L 509.5 748.5 Z M 450.5 727.5 L 471.5 727.5 L 471.5 748.5 L 450.5 748.5 Z M 392.5 727.5 L 413.5 727.5 L 413.5 748.5 L 392.5 748.5 Z M 333.5 727.5 L 354.5 727.5 L 354.5 748.5 L 333.5 748.5 Z M 275.5 727.5 L 295.5 727.5 L 295.5 748.5 L 275.5 748.5 Z M 275.5 727.5 "/>
 </clipPath>
-<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image448" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image420"/>
+  <use xlink:href="#image448"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface414">
+<g id="surface442">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -218,6 +218,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 535.253906 502.695312 L 535.253906 477.132812 L 545.105469 477.132812 L 546.648438 477.238281 L 548.085938 477.519531 L 549.417969 478.007812 L 550.644531 478.640625 L 551.734375 479.515625 L 552.75 480.535156 L 553.589844 481.761719 L 554.292969 483.09375 L 554.820312 484.601562 L 555.203125 486.214844 L 555.414062 488.003906 L 555.519531 489.894531 L 555.414062 491.894531 L 555.167969 493.753906 L 554.75 495.433594 L 554.1875 496.976562 L 553.449219 498.347656 L 552.539062 499.539062 L 551.558594 500.519531 L 550.46875 501.292969 L 549.277344 501.921875 L 547.980469 502.34375 L 546.578125 502.625 L 545.105469 502.695312 Z M 538.515625 499.820312 L 544.542969 499.820312 L 546.15625 499.714844 L 547.59375 499.328125 L 548.859375 498.660156 L 549.910156 497.785156 L 550.75 496.59375 L 551.453125 495.15625 L 551.664062 494.417969 L 551.875 493.648438 L 552.046875 492.804688 L 552.152344 491.894531 L 552.222656 490.949219 L 552.257812 489.929688 L 552.117188 487.652344 L 551.769531 485.652344 L 551.136719 483.933594 L 550.296875 482.566406 L 549.207031 481.445312 L 547.875 480.640625 L 547.386719 480.464844 L 546.859375 480.289062 L 546.296875 480.183594 L 545.738281 480.078125 L 544.542969 480.007812 L 538.515625 480.007812 Z M 538.515625 499.820312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 509 600 L 530 600 M 509 579 L 530 579 M 509 579 L 509 600 M 530 579 L 530 600 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 509 600 L 530 600 M 509 579 L 530 579 M 530 600 L 530 579 M 509 600 L 509 579 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 197 336 L 197 345 M 192 341 L 201 341 M 196 342 L 198 342 M 196 340 L 198 340 M 196 340 L 196 342 M 198 340 L 198 342 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.svg b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.svg
index 17986ce..2515db3 100644
--- a/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.svg
+++ b/cells/sdfxbp/sky130_fd_sc_hs__sdfxbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 324.5 L 1743.5 324.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 324.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 196.5 695.5 L 1722.5 695.5 L 1722.5 723.5 L 196.5 723.5 Z M 196.5 695.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1548.5 595.5 L 1565.5 595.5 L 1565.5 668.5 L 1548.5 668.5 Z M 758.5 621.5 L 775.5 621.5 L 775.5 668.5 L 758.5 668.5 Z M 844.5 621.5 L 861.5 621.5 L 861.5 668.5 L 844.5 668.5 Z M 1606.5 595.5 L 1623.5 595.5 L 1623.5 679.5 L 1606.5 679.5 Z M 1657.5 595.5 L 1674.5 595.5 L 1674.5 679.5 L 1657.5 679.5 Z M 248.5 634.5 L 265.5 634.5 L 265.5 681.5 L 248.5 681.5 Z M 1123.5 634.5 L 1140.5 634.5 L 1140.5 681.5 L 1123.5 681.5 Z M 1167.5 634.5 L 1184.5 634.5 L 1184.5 681.5 L 1167.5 681.5 Z M 901.5 634.5 L 918.5 634.5 L 918.5 681.5 L 901.5 681.5 Z M 536.5 597.5 L 553.5 597.5 L 553.5 681.5 L 536.5 681.5 Z M 1387.5 597.5 L 1404.5 597.5 L 1404.5 681.5 L 1387.5 681.5 Z M 988.5 619.5 L 1005.5 619.5 L 1005.5 681.5 L 988.5 681.5 Z M 1036.5 619.5 L 1053.5 619.5 L 1053.5 681.5 L 1036.5 681.5 Z M 1267.5 597.5 L 1284.5 597.5 L 1284.5 681.5 L 1267.5 681.5 Z M 649.5 597.5 L 666.5 597.5 L 666.5 681.5 L 649.5 681.5 Z M 434.5 634.5 L 451.5 634.5 L 451.5 681.5 L 434.5 681.5 Z M 478.5 634.5 L 495.5 634.5 L 495.5 681.5 L 478.5 681.5 Z M 1436.5 597.5 L 1453.5 597.5 L 1453.5 681.5 L 1436.5 681.5 Z M 305.5 634.5 L 322.5 634.5 L 322.5 681.5 L 305.5 681.5 Z M 349.5 634.5 L 366.5 634.5 L 366.5 681.5 L 349.5 681.5 Z M 349.5 634.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1186.5 387.5 L 1203.5 387.5 L 1203.5 435.5 L 1186.5 435.5 Z M 1139.5 387.5 L 1156.5 387.5 L 1156.5 435.5 L 1139.5 435.5 Z M 917.5 392.5 L 934.5 392.5 L 934.5 440.5 L 917.5 440.5 Z M 869.5 392.5 L 886.5 392.5 L 886.5 440.5 L 869.5 440.5 Z M 809.5 392.5 L 826.5 392.5 L 826.5 440.5 L 809.5 440.5 Z M 419.5 393.5 L 436.5 393.5 L 436.5 466.5 L 419.5 466.5 Z M 361.5 393.5 L 378.5 393.5 L 378.5 466.5 L 361.5 466.5 Z M 314.5 393.5 L 331.5 393.5 L 331.5 466.5 L 314.5 466.5 Z M 263.5 393.5 L 280.5 393.5 L 280.5 466.5 L 263.5 466.5 Z M 474.5 393.5 L 491.5 393.5 L 491.5 466.5 L 474.5 466.5 Z M 1078.5 387.5 L 1095.5 387.5 L 1095.5 483.5 L 1078.5 483.5 Z M 988.5 387.5 L 1005.5 387.5 L 1005.5 483.5 L 988.5 483.5 Z M 1270.5 387.5 L 1287.5 387.5 L 1287.5 501.5 L 1270.5 501.5 Z M 1657.5 387.5 L 1674.5 387.5 L 1674.5 514.5 L 1657.5 514.5 Z M 1546.5 401.5 L 1563.5 401.5 L 1563.5 514.5 L 1546.5 514.5 Z M 1434.5 387.5 L 1451.5 387.5 L 1451.5 514.5 L 1434.5 514.5 Z M 1606.5 387.5 L 1623.5 387.5 L 1623.5 514.5 L 1606.5 514.5 Z M 554.5 387.5 L 571.5 387.5 L 571.5 514.5 L 554.5 514.5 Z M 694.5 387.5 L 711.5 387.5 L 711.5 514.5 L 694.5 514.5 Z M 1383.5 387.5 L 1400.5 387.5 L 1400.5 514.5 L 1383.5 514.5 Z M 1383.5 387.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 213.5 336.5 L 232.5 336.5 L 232.5 355.5 L 213.5 355.5 Z M 1685.5 336.5 L 1704.5 336.5 L 1704.5 355.5 L 1685.5 355.5 Z M 1630.5 336.5 L 1649.5 336.5 L 1649.5 355.5 L 1630.5 355.5 Z M 1576.5 336.5 L 1595.5 336.5 L 1595.5 355.5 L 1576.5 355.5 Z M 1521.5 336.5 L 1540.5 336.5 L 1540.5 355.5 L 1521.5 355.5 Z M 1467.5 336.5 L 1486.5 336.5 L 1486.5 355.5 L 1467.5 355.5 Z M 1412.5 336.5 L 1431.5 336.5 L 1431.5 355.5 L 1412.5 355.5 Z M 1358.5 336.5 L 1377.5 336.5 L 1377.5 355.5 L 1358.5 355.5 Z M 1303.5 336.5 L 1322.5 336.5 L 1322.5 355.5 L 1303.5 355.5 Z M 1249.5 336.5 L 1268.5 336.5 L 1268.5 355.5 L 1249.5 355.5 Z M 1194.5 336.5 L 1213.5 336.5 L 1213.5 355.5 L 1194.5 355.5 Z M 1140.5 336.5 L 1159.5 336.5 L 1159.5 355.5 L 1140.5 355.5 Z M 1085.5 336.5 L 1104.5 336.5 L 1104.5 355.5 L 1085.5 355.5 Z M 1031.5 336.5 L 1050.5 336.5 L 1050.5 355.5 L 1031.5 355.5 Z M 976.5 336.5 L 995.5 336.5 L 995.5 355.5 L 976.5 355.5 Z M 922.5 336.5 L 941.5 336.5 L 941.5 355.5 L 922.5 355.5 Z M 867.5 336.5 L 886.5 336.5 L 886.5 355.5 L 867.5 355.5 Z M 813.5 336.5 L 832.5 336.5 L 832.5 355.5 L 813.5 355.5 Z M 758.5 336.5 L 777.5 336.5 L 777.5 355.5 L 758.5 355.5 Z M 704.5 336.5 L 723.5 336.5 L 723.5 355.5 L 704.5 355.5 Z M 649.5 336.5 L 668.5 336.5 L 668.5 355.5 L 649.5 355.5 Z M 595.5 336.5 L 614.5 336.5 L 614.5 355.5 L 595.5 355.5 Z M 540.5 336.5 L 559.5 336.5 L 559.5 355.5 L 540.5 355.5 Z M 486.5 336.5 L 505.5 336.5 L 505.5 355.5 L 486.5 355.5 Z M 431.5 336.5 L 450.5 336.5 L 450.5 355.5 L 431.5 355.5 Z M 377.5 336.5 L 396.5 336.5 L 396.5 355.5 L 377.5 355.5 Z M 322.5 336.5 L 341.5 336.5 L 341.5 355.5 L 322.5 355.5 Z M 268.5 336.5 L 287.5 336.5 L 287.5 355.5 L 268.5 355.5 Z M 213.5 714.5 L 232.5 714.5 L 232.5 733.5 L 213.5 733.5 Z M 1685.5 714.5 L 1704.5 714.5 L 1704.5 733.5 L 1685.5 733.5 Z M 1630.5 714.5 L 1649.5 714.5 L 1649.5 733.5 L 1630.5 733.5 Z M 1576.5 714.5 L 1595.5 714.5 L 1595.5 733.5 L 1576.5 733.5 Z M 1521.5 714.5 L 1540.5 714.5 L 1540.5 733.5 L 1521.5 733.5 Z M 1467.5 714.5 L 1486.5 714.5 L 1486.5 733.5 L 1467.5 733.5 Z M 1412.5 714.5 L 1431.5 714.5 L 1431.5 733.5 L 1412.5 733.5 Z M 1358.5 714.5 L 1377.5 714.5 L 1377.5 733.5 L 1358.5 733.5 Z M 1303.5 714.5 L 1322.5 714.5 L 1322.5 733.5 L 1303.5 733.5 Z M 1249.5 714.5 L 1268.5 714.5 L 1268.5 733.5 L 1249.5 733.5 Z M 1194.5 714.5 L 1213.5 714.5 L 1213.5 733.5 L 1194.5 733.5 Z M 1140.5 714.5 L 1159.5 714.5 L 1159.5 733.5 L 1140.5 733.5 Z M 1085.5 714.5 L 1104.5 714.5 L 1104.5 733.5 L 1085.5 733.5 Z M 1031.5 714.5 L 1050.5 714.5 L 1050.5 733.5 L 1031.5 733.5 Z M 976.5 714.5 L 995.5 714.5 L 995.5 733.5 L 976.5 733.5 Z M 922.5 714.5 L 941.5 714.5 L 941.5 733.5 L 922.5 733.5 Z M 867.5 714.5 L 886.5 714.5 L 886.5 733.5 L 867.5 733.5 Z M 813.5 714.5 L 832.5 714.5 L 832.5 733.5 L 813.5 733.5 Z M 758.5 714.5 L 777.5 714.5 L 777.5 733.5 L 758.5 733.5 Z M 704.5 714.5 L 723.5 714.5 L 723.5 733.5 L 704.5 733.5 Z M 649.5 714.5 L 668.5 714.5 L 668.5 733.5 L 649.5 733.5 Z M 595.5 714.5 L 614.5 714.5 L 614.5 733.5 L 595.5 733.5 Z M 540.5 714.5 L 559.5 714.5 L 559.5 733.5 L 540.5 733.5 Z M 486.5 714.5 L 505.5 714.5 L 505.5 733.5 L 486.5 733.5 Z M 431.5 714.5 L 450.5 714.5 L 450.5 733.5 L 431.5 733.5 Z M 377.5 714.5 L 396.5 714.5 L 396.5 733.5 L 377.5 733.5 Z M 322.5 714.5 L 341.5 714.5 L 341.5 733.5 L 322.5 733.5 Z M 268.5 714.5 L 287.5 714.5 L 287.5 733.5 L 268.5 733.5 Z M 268.5 714.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface370">
+<g id="surface399">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -193,6 +193,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 1729.082031 480.039062 L 1729.082031 504.574219 L 1725.546875 504.574219 L 1712.855469 484.683594 L 1712.855469 504.574219 L 1709.894531 504.574219 L 1709.894531 480.039062 L 1713.292969 480.039062 L 1726.117188 500.097656 L 1726.117188 480.039062 Z M 1729.082031 480.039062 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1685 596 L 1704 596 M 1685 577 L 1704 577 M 1685 577 L 1685 596 M 1704 577 L 1704 596 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1685 596 L 1704 596 M 1685 577 L 1704 577 M 1704 596 L 1704 577 M 1685 596 L 1685 577 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 196 351 L 196 360 M 191 356 L 200 356 M 195 357 L 197 357 M 195 355 L 197 355 M 195 355 L 195 357 M 197 355 L 197 357 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.svg b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.svg
index 4ffc869..d17f4b9 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.svg
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 535.5 L 174.5 535.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <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 200.5 730.5 L 1717.5 730.5 L 1717.5 764.5 L 200.5 764.5 Z M 200.5 730.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#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 1393.5 637.5 L 1414.5 637.5 L 1414.5 695.5 L 1393.5 695.5 Z M 879.5 637.5 L 900.5 637.5 L 900.5 695.5 L 879.5 695.5 Z M 973.5 637.5 L 993.5 637.5 L 993.5 695.5 L 973.5 695.5 Z M 1052.5 637.5 L 1072.5 637.5 L 1072.5 695.5 L 1052.5 695.5 Z M 1340.5 637.5 L 1360.5 637.5 L 1360.5 695.5 L 1340.5 695.5 Z M 1640.5 608.5 L 1661.5 608.5 L 1661.5 710.5 L 1640.5 710.5 Z M 1224.5 637.5 L 1245.5 637.5 L 1245.5 713.5 L 1224.5 713.5 Z M 1164.5 637.5 L 1185.5 637.5 L 1185.5 713.5 L 1164.5 713.5 Z M 613.5 611.5 L 633.5 611.5 L 633.5 713.5 L 613.5 713.5 Z M 1509.5 637.5 L 1530.5 637.5 L 1530.5 713.5 L 1509.5 713.5 Z M 264.5 655.5 L 284.5 655.5 L 284.5 713.5 L 264.5 713.5 Z M 749.5 611.5 L 769.5 611.5 L 769.5 713.5 L 749.5 713.5 Z M 387.5 655.5 L 407.5 655.5 L 407.5 713.5 L 387.5 713.5 Z M 489.5 655.5 L 510.5 655.5 L 510.5 713.5 L 489.5 713.5 Z M 543.5 655.5 L 563.5 655.5 L 563.5 713.5 L 543.5 713.5 Z M 333.5 655.5 L 354.5 655.5 L 354.5 713.5 L 333.5 713.5 Z M 333.5 655.5 "/>
 </clipPath>
-<image id="image361" 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="#image361"/>
+  <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 1397.5 357.5 L 1418.5 357.5 L 1418.5 415.5 L 1397.5 415.5 Z M 1340.5 357.5 L 1360.5 357.5 L 1360.5 415.5 L 1340.5 415.5 Z M 1006.5 357.5 L 1026.5 357.5 L 1026.5 415.5 L 1006.5 415.5 Z M 937.5 357.5 L 958.5 357.5 L 958.5 415.5 L 937.5 415.5 Z M 1061.5 357.5 L 1081.5 357.5 L 1081.5 415.5 L 1061.5 415.5 Z M 343.5 357.5 L 364.5 357.5 L 364.5 445.5 L 343.5 445.5 Z M 275.5 357.5 L 295.5 357.5 L 295.5 445.5 L 275.5 445.5 Z M 463.5 357.5 L 484.5 357.5 L 484.5 445.5 L 463.5 445.5 Z M 537.5 357.5 L 558.5 357.5 L 558.5 445.5 L 537.5 445.5 Z M 401.5 357.5 L 422.5 357.5 L 422.5 445.5 L 401.5 445.5 Z M 1146.5 357.5 L 1166.5 357.5 L 1166.5 472.5 L 1146.5 472.5 Z M 1500.5 357.5 L 1520.5 357.5 L 1520.5 472.5 L 1500.5 472.5 Z M 1243.5 357.5 L 1263.5 357.5 L 1263.5 472.5 L 1243.5 472.5 Z M 1638.5 357.5 L 1659.5 357.5 L 1659.5 511.5 L 1638.5 511.5 Z M 635.5 357.5 L 655.5 357.5 L 655.5 511.5 L 635.5 511.5 Z M 798.5 357.5 L 819.5 357.5 L 819.5 511.5 L 798.5 511.5 Z M 798.5 357.5 "/>
 </clipPath>
-<image id="image362" 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="#image362"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 222.5 294.5 L 245.5 294.5 L 245.5 318.5 L 222.5 318.5 Z M 1673.5 294.5 L 1696.5 294.5 L 1696.5 318.5 L 1673.5 318.5 Z M 1607.5 294.5 L 1630.5 294.5 L 1630.5 318.5 L 1607.5 318.5 Z M 1541.5 294.5 L 1564.5 294.5 L 1564.5 318.5 L 1541.5 318.5 Z M 1475.5 294.5 L 1498.5 294.5 L 1498.5 318.5 L 1475.5 318.5 Z M 1409.5 294.5 L 1432.5 294.5 L 1432.5 318.5 L 1409.5 318.5 Z M 1343.5 294.5 L 1366.5 294.5 L 1366.5 318.5 L 1343.5 318.5 Z M 1277.5 294.5 L 1300.5 294.5 L 1300.5 318.5 L 1277.5 318.5 Z M 1211.5 294.5 L 1234.5 294.5 L 1234.5 318.5 L 1211.5 318.5 Z M 1145.5 294.5 L 1168.5 294.5 L 1168.5 318.5 L 1145.5 318.5 Z M 1079.5 294.5 L 1103.5 294.5 L 1103.5 318.5 L 1079.5 318.5 Z M 1013.5 294.5 L 1037.5 294.5 L 1037.5 318.5 L 1013.5 318.5 Z M 947.5 294.5 L 971.5 294.5 L 971.5 318.5 L 947.5 318.5 Z M 881.5 294.5 L 905.5 294.5 L 905.5 318.5 L 881.5 318.5 Z M 815.5 294.5 L 839.5 294.5 L 839.5 318.5 L 815.5 318.5 Z M 749.5 294.5 L 773.5 294.5 L 773.5 318.5 L 749.5 318.5 Z M 683.5 294.5 L 707.5 294.5 L 707.5 318.5 L 683.5 318.5 Z M 617.5 294.5 L 641.5 294.5 L 641.5 318.5 L 617.5 318.5 Z M 552.5 294.5 L 575.5 294.5 L 575.5 318.5 L 552.5 318.5 Z M 486.5 294.5 L 509.5 294.5 L 509.5 318.5 L 486.5 318.5 Z M 420.5 294.5 L 443.5 294.5 L 443.5 318.5 L 420.5 318.5 Z M 354.5 294.5 L 377.5 294.5 L 377.5 318.5 L 354.5 318.5 Z M 288.5 294.5 L 311.5 294.5 L 311.5 318.5 L 288.5 318.5 Z M 222.5 752.5 L 245.5 752.5 L 245.5 775.5 L 222.5 775.5 Z M 1673.5 752.5 L 1696.5 752.5 L 1696.5 775.5 L 1673.5 775.5 Z M 1607.5 752.5 L 1630.5 752.5 L 1630.5 775.5 L 1607.5 775.5 Z M 1541.5 752.5 L 1564.5 752.5 L 1564.5 775.5 L 1541.5 775.5 Z M 1475.5 752.5 L 1498.5 752.5 L 1498.5 775.5 L 1475.5 775.5 Z M 1409.5 752.5 L 1432.5 752.5 L 1432.5 775.5 L 1409.5 775.5 Z M 1343.5 752.5 L 1366.5 752.5 L 1366.5 775.5 L 1343.5 775.5 Z M 1277.5 752.5 L 1300.5 752.5 L 1300.5 775.5 L 1277.5 775.5 Z M 1211.5 752.5 L 1234.5 752.5 L 1234.5 775.5 L 1211.5 775.5 Z M 1145.5 752.5 L 1168.5 752.5 L 1168.5 775.5 L 1145.5 775.5 Z M 1079.5 752.5 L 1103.5 752.5 L 1103.5 775.5 L 1079.5 775.5 Z M 1013.5 752.5 L 1037.5 752.5 L 1037.5 775.5 L 1013.5 775.5 Z M 947.5 752.5 L 971.5 752.5 L 971.5 775.5 L 947.5 775.5 Z M 881.5 752.5 L 905.5 752.5 L 905.5 775.5 L 881.5 775.5 Z M 815.5 752.5 L 839.5 752.5 L 839.5 775.5 L 815.5 775.5 Z M 749.5 752.5 L 773.5 752.5 L 773.5 775.5 L 749.5 775.5 Z M 683.5 752.5 L 707.5 752.5 L 707.5 775.5 L 683.5 775.5 Z M 617.5 752.5 L 641.5 752.5 L 641.5 775.5 L 617.5 775.5 Z M 552.5 752.5 L 575.5 752.5 L 575.5 775.5 L 552.5 775.5 Z M 486.5 752.5 L 509.5 752.5 L 509.5 775.5 L 486.5 775.5 Z M 420.5 752.5 L 443.5 752.5 L 443.5 775.5 L 420.5 775.5 Z M 354.5 752.5 L 377.5 752.5 L 377.5 775.5 L 354.5 775.5 Z M 288.5 752.5 L 311.5 752.5 L 311.5 775.5 L 288.5 775.5 Z M 288.5 752.5 "/>
 </clipPath>
-<image id="image363" 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="#image363"/>
+  <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="surface357">
+<g id="surface384">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -193,6 +193,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 356.121094 549.5 L 356.121094 519.847656 L 367.550781 519.847656 L 369.339844 519.972656 L 371.007812 520.296875 L 372.550781 520.867188 L 373.976562 521.597656 L 375.234375 522.613281 L 376.414062 523.792969 L 377.390625 525.21875 L 378.207031 526.765625 L 378.816406 528.511719 L 379.261719 530.382812 L 379.507812 532.457031 L 379.628906 534.652344 L 379.507812 536.972656 L 379.222656 539.128906 L 378.734375 541.082031 L 378.082031 542.871094 L 377.230469 544.457031 L 376.171875 545.839844 L 375.03125 546.976562 L 373.773438 547.875 L 372.390625 548.605469 L 370.882812 549.09375 L 369.257812 549.417969 L 367.550781 549.5 Z M 359.902344 546.164062 L 366.898438 546.164062 L 368.769531 546.042969 L 370.4375 545.59375 L 371.902344 544.824219 L 373.121094 543.804688 L 374.097656 542.421875 L 374.910156 540.753906 L 375.15625 539.902344 L 375.398438 539.007812 L 375.601562 538.03125 L 375.722656 536.972656 L 375.804688 535.875 L 375.847656 534.695312 L 375.683594 532.050781 L 375.277344 529.734375 L 374.542969 527.738281 L 373.570312 526.152344 L 372.308594 524.851562 L 370.761719 523.917969 L 370.191406 523.714844 L 369.582031 523.511719 L 368.933594 523.386719 L 368.28125 523.265625 L 367.589844 523.226562 L 366.898438 523.183594 L 359.902344 523.183594 Z M 359.902344 546.164062 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 354 556 L 377 556 M 354 533 L 377 533 M 354 533 L 354 556 M 377 533 L 377 556 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 354 556 L 377 556 M 354 533 L 377 533 M 377 556 L 377 533 M 354 556 L 354 533 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 200 310 L 200 319 M 195 315 L 204 315 M 199 316 L 201 316 M 199 314 L 201 314 M 199 314 L 199 316 M 201 314 L 201 316 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.svg b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.svg
index c1624cb..15120d2 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.svg
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 299.5 L 1744.5 299.5 L 1744.5 535.5 L 174.5 535.5 Z M 174.5 299.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 198.5 715.5 L 1719.5 715.5 L 1719.5 746.5 L 198.5 746.5 Z M 198.5 715.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 841.5 629.5 L 860.5 629.5 L 860.5 682.5 L 841.5 682.5 Z M 952.5 629.5 L 971.5 629.5 L 971.5 682.5 L 952.5 682.5 Z M 1024.5 629.5 L 1043.5 629.5 L 1043.5 682.5 L 1024.5 682.5 Z M 321.5 645.5 L 340.5 645.5 L 340.5 699.5 L 321.5 699.5 Z M 1361.5 645.5 L 1380.5 645.5 L 1380.5 699.5 L 1361.5 699.5 Z M 1312.5 645.5 L 1331.5 645.5 L 1331.5 699.5 L 1312.5 699.5 Z M 257.5 645.5 L 276.5 645.5 L 276.5 699.5 L 257.5 699.5 Z M 509.5 645.5 L 528.5 645.5 L 528.5 699.5 L 509.5 699.5 Z M 581.5 605.5 L 600.5 605.5 L 600.5 699.5 L 581.5 699.5 Z M 1425.5 605.5 L 1444.5 605.5 L 1444.5 699.5 L 1425.5 699.5 Z M 1644.5 605.5 L 1663.5 605.5 L 1663.5 699.5 L 1644.5 699.5 Z M 1247.5 629.5 L 1266.5 629.5 L 1266.5 699.5 L 1247.5 699.5 Z M 1141.5 629.5 L 1160.5 629.5 L 1160.5 699.5 L 1141.5 699.5 Z M 459.5 645.5 L 478.5 645.5 L 478.5 699.5 L 459.5 699.5 Z M 716.5 605.5 L 735.5 605.5 L 735.5 699.5 L 716.5 699.5 Z M 1584.5 605.5 L 1603.5 605.5 L 1603.5 699.5 L 1584.5 699.5 Z M 370.5 645.5 L 389.5 645.5 L 389.5 699.5 L 370.5 699.5 Z M 370.5 645.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 1016.5 370.5 L 1035.5 370.5 L 1035.5 424.5 L 1016.5 424.5 Z M 946.5 370.5 L 965.5 370.5 L 965.5 424.5 L 946.5 424.5 Z M 889.5 370.5 L 908.5 370.5 L 908.5 424.5 L 889.5 424.5 Z M 1359.5 378.5 L 1378.5 378.5 L 1378.5 431.5 L 1359.5 431.5 Z M 1259.5 378.5 L 1278.5 378.5 L 1278.5 431.5 L 1259.5 431.5 Z M 511.5 377.5 L 530.5 377.5 L 530.5 458.5 L 511.5 458.5 Z M 458.5 377.5 L 477.5 377.5 L 477.5 458.5 L 458.5 458.5 Z M 369.5 377.5 L 388.5 377.5 L 388.5 458.5 L 369.5 458.5 Z M 316.5 377.5 L 335.5 377.5 L 335.5 458.5 L 316.5 458.5 Z M 253.5 377.5 L 272.5 377.5 L 272.5 458.5 L 253.5 458.5 Z M 1102.5 370.5 L 1121.5 370.5 L 1121.5 477.5 L 1102.5 477.5 Z M 1188.5 370.5 L 1207.5 370.5 L 1207.5 477.5 L 1188.5 477.5 Z M 1461.5 378.5 L 1480.5 378.5 L 1480.5 505.5 L 1461.5 505.5 Z M 1589.5 370.5 L 1608.5 370.5 L 1608.5 512.5 L 1589.5 512.5 Z M 761.5 370.5 L 780.5 370.5 L 780.5 512.5 L 761.5 512.5 Z M 605.5 370.5 L 624.5 370.5 L 624.5 512.5 L 605.5 512.5 Z M 1646.5 370.5 L 1665.5 370.5 L 1665.5 512.5 L 1646.5 512.5 Z M 1646.5 370.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 218.5 313.5 L 239.5 313.5 L 239.5 334.5 L 218.5 334.5 Z M 1678.5 313.5 L 1700.5 313.5 L 1700.5 334.5 L 1678.5 334.5 Z M 1617.5 313.5 L 1639.5 313.5 L 1639.5 334.5 L 1617.5 334.5 Z M 1557.5 313.5 L 1578.5 313.5 L 1578.5 334.5 L 1557.5 334.5 Z M 1496.5 313.5 L 1517.5 313.5 L 1517.5 334.5 L 1496.5 334.5 Z M 1435.5 313.5 L 1456.5 313.5 L 1456.5 334.5 L 1435.5 334.5 Z M 1374.5 313.5 L 1396.5 313.5 L 1396.5 334.5 L 1374.5 334.5 Z M 1313.5 313.5 L 1335.5 313.5 L 1335.5 334.5 L 1313.5 334.5 Z M 1252.5 313.5 L 1274.5 313.5 L 1274.5 334.5 L 1252.5 334.5 Z M 1192.5 313.5 L 1213.5 313.5 L 1213.5 334.5 L 1192.5 334.5 Z M 1131.5 313.5 L 1152.5 313.5 L 1152.5 334.5 L 1131.5 334.5 Z M 1070.5 313.5 L 1091.5 313.5 L 1091.5 334.5 L 1070.5 334.5 Z M 1009.5 313.5 L 1031.5 313.5 L 1031.5 334.5 L 1009.5 334.5 Z M 948.5 313.5 L 970.5 313.5 L 970.5 334.5 L 948.5 334.5 Z M 887.5 313.5 L 909.5 313.5 L 909.5 334.5 L 887.5 334.5 Z M 826.5 313.5 L 848.5 313.5 L 848.5 334.5 L 826.5 334.5 Z M 766.5 313.5 L 787.5 313.5 L 787.5 334.5 L 766.5 334.5 Z M 705.5 313.5 L 726.5 313.5 L 726.5 334.5 L 705.5 334.5 Z M 644.5 313.5 L 665.5 313.5 L 665.5 334.5 L 644.5 334.5 Z M 583.5 313.5 L 605.5 313.5 L 605.5 334.5 L 583.5 334.5 Z M 522.5 313.5 L 544.5 313.5 L 544.5 334.5 L 522.5 334.5 Z M 461.5 313.5 L 483.5 313.5 L 483.5 334.5 L 461.5 334.5 Z M 400.5 313.5 L 422.5 313.5 L 422.5 334.5 L 400.5 334.5 Z M 340.5 313.5 L 361.5 313.5 L 361.5 334.5 L 340.5 334.5 Z M 279.5 313.5 L 300.5 313.5 L 300.5 334.5 L 279.5 334.5 Z M 218.5 735.5 L 239.5 735.5 L 239.5 756.5 L 218.5 756.5 Z M 1678.5 735.5 L 1700.5 735.5 L 1700.5 756.5 L 1678.5 756.5 Z M 1617.5 735.5 L 1639.5 735.5 L 1639.5 756.5 L 1617.5 756.5 Z M 1557.5 735.5 L 1578.5 735.5 L 1578.5 756.5 L 1557.5 756.5 Z M 1496.5 735.5 L 1517.5 735.5 L 1517.5 756.5 L 1496.5 756.5 Z M 1435.5 735.5 L 1456.5 735.5 L 1456.5 756.5 L 1435.5 756.5 Z M 1374.5 735.5 L 1396.5 735.5 L 1396.5 756.5 L 1374.5 756.5 Z M 1313.5 735.5 L 1335.5 735.5 L 1335.5 756.5 L 1313.5 756.5 Z M 1252.5 735.5 L 1274.5 735.5 L 1274.5 756.5 L 1252.5 756.5 Z M 1192.5 735.5 L 1213.5 735.5 L 1213.5 756.5 L 1192.5 756.5 Z M 1131.5 735.5 L 1152.5 735.5 L 1152.5 756.5 L 1131.5 756.5 Z M 1070.5 735.5 L 1091.5 735.5 L 1091.5 756.5 L 1070.5 756.5 Z M 1009.5 735.5 L 1031.5 735.5 L 1031.5 756.5 L 1009.5 756.5 Z M 948.5 735.5 L 970.5 735.5 L 970.5 756.5 L 948.5 756.5 Z M 887.5 735.5 L 909.5 735.5 L 909.5 756.5 L 887.5 756.5 Z M 826.5 735.5 L 848.5 735.5 L 848.5 756.5 L 826.5 756.5 Z M 766.5 735.5 L 787.5 735.5 L 787.5 756.5 L 766.5 756.5 Z M 705.5 735.5 L 726.5 735.5 L 726.5 756.5 L 705.5 756.5 Z M 644.5 735.5 L 665.5 735.5 L 665.5 756.5 L 644.5 756.5 Z M 583.5 735.5 L 605.5 735.5 L 605.5 756.5 L 583.5 756.5 Z M 522.5 735.5 L 544.5 735.5 L 544.5 756.5 L 522.5 756.5 Z M 461.5 735.5 L 483.5 735.5 L 483.5 756.5 L 461.5 756.5 Z M 400.5 735.5 L 422.5 735.5 L 422.5 756.5 L 400.5 756.5 Z M 340.5 735.5 L 361.5 735.5 L 361.5 756.5 L 340.5 756.5 Z M 279.5 735.5 L 300.5 735.5 L 300.5 756.5 L 279.5 756.5 Z M 279.5 735.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface355">
+<g id="surface383">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -186,6 +186,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1642.230469 407.386719 L 1640.515625 409.5 L 1636.6875 406.328125 L 1635.59375 406.910156 L 1634.5 407.347656 L 1633.367188 407.714844 L 1632.164062 407.96875 L 1630.960938 408.113281 L 1629.722656 408.1875 L 1628.042969 408.078125 L 1626.476562 407.824219 L 1625.015625 407.386719 L 1623.632812 406.800781 L 1622.320312 406.035156 L 1621.152344 405.050781 L 1620.09375 403.992188 L 1619.183594 402.789062 L 1618.453125 401.476562 L 1617.832031 400.054688 L 1617.359375 398.523438 L 1617.066406 396.847656 L 1616.996094 396.445312 L 1616.957031 396.007812 L 1616.921875 395.605469 L 1616.886719 395.167969 L 1616.886719 394.257812 L 1616.957031 392.433594 L 1617.214844 390.683594 L 1617.613281 389.078125 L 1618.199219 387.546875 L 1618.929688 386.125 L 1619.875 384.8125 L 1620.824219 383.753906 L 1621.917969 382.808594 L 1623.121094 382.003906 L 1624.398438 381.386719 L 1625.785156 380.875 L 1627.316406 380.511719 L 1627.679688 380.472656 L 1628.082031 380.4375 L 1628.480469 380.402344 L 1628.882812 380.363281 L 1629.285156 380.363281 L 1629.722656 380.328125 L 1631.363281 380.4375 L 1632.929688 380.691406 L 1634.390625 381.128906 L 1635.773438 381.714844 L 1637.085938 382.480469 L 1638.292969 383.425781 L 1639.3125 384.519531 L 1640.222656 385.6875 L 1640.953125 386.964844 L 1641.574219 388.386719 L 1642.046875 389.917969 L 1642.375 391.523438 L 1642.410156 391.996094 L 1642.449219 392.433594 L 1642.519531 393.308594 L 1642.519531 393.746094 L 1642.558594 394.183594 L 1642.449219 396.226562 L 1642.121094 398.160156 L 1641.609375 399.945312 L 1640.878906 401.625 L 1639.933594 403.15625 L 1638.800781 404.578125 Z M 1633.039062 399.875 L 1636.285156 402.535156 L 1637.160156 401.441406 L 1637.890625 400.203125 L 1638.4375 398.851562 L 1638.839844 397.429688 L 1639.058594 395.898438 L 1639.167969 394.222656 L 1639.09375 392.6875 L 1638.875 391.230469 L 1638.511719 389.882812 L 1638.035156 388.640625 L 1637.414062 387.476562 L 1636.648438 386.417969 L 1635.773438 385.542969 L 1634.863281 384.8125 L 1633.84375 384.230469 L 1632.75 383.792969 L 1631.542969 383.5 L 1630.304688 383.316406 L 1629.722656 383.316406 L 1628.410156 383.425781 L 1627.167969 383.644531 L 1626.003906 384.011719 L 1624.945312 384.558594 L 1623.960938 385.25 L 1623.085938 386.089844 L 1622.246094 387.074219 L 1621.589844 388.167969 L 1621.042969 389.371094 L 1620.640625 390.683594 L 1620.386719 392.105469 L 1620.277344 393.636719 L 1620.277344 394.257812 L 1620.3125 395.863281 L 1620.53125 397.320312 L 1620.898438 398.667969 L 1621.371094 399.945312 L 1622.027344 401.113281 L 1622.828125 402.132812 L 1623.667969 403.046875 L 1624.617188 403.773438 L 1625.636719 404.359375 L 1626.730469 404.757812 L 1627.933594 405.050781 L 1629.210938 405.160156 L 1629.285156 405.195312 L 1630.339844 405.195312 L 1631.035156 405.125 L 1631.726562 404.976562 L 1632.382812 404.832031 L 1633.039062 404.613281 L 1633.734375 404.320312 L 1633.769531 404.320312 L 1633.84375 404.285156 L 1633.878906 404.25 L 1633.953125 404.25 L 1633.988281 404.210938 L 1634.0625 404.175781 L 1631.363281 401.914062 Z M 1633.039062 399.875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1617 696 L 1639 696 M 1617 674 L 1639 674 M 1617 674 L 1617 696 M 1639 674 L 1639 696 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1617 696 L 1639 696 M 1617 674 L 1639 674 M 1639 696 L 1639 674 M 1617 696 L 1617 674 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 198 328 L 198 337 M 193 333 L 202 333 M 197 334 L 199 334 M 197 332 L 199 332 M 197 332 L 197 334 M 199 332 L 199 334 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.svg b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.svg
index e188a0b..1d92df5 100644
--- a/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.svg
+++ b/cells/sdfxtp/sky130_fd_sc_hs__sdfxtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 308.5 L 1743.5 308.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 308.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 197.5 708.5 L 1720.5 708.5 L 1720.5 738.5 L 197.5 738.5 Z M 197.5 708.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 805.5 625.5 L 823.5 625.5 L 823.5 677.5 L 805.5 677.5 Z M 888.5 625.5 L 906.5 625.5 L 906.5 677.5 L 888.5 677.5 Z M 964.5 625.5 L 982.5 625.5 L 982.5 677.5 L 964.5 677.5 Z M 363.5 641.5 L 381.5 641.5 L 381.5 692.5 L 363.5 692.5 Z M 315.5 641.5 L 333.5 641.5 L 333.5 692.5 L 315.5 692.5 Z M 254.5 641.5 L 272.5 641.5 L 272.5 692.5 L 254.5 692.5 Z M 1304.5 641.5 L 1322.5 641.5 L 1322.5 692.5 L 1304.5 692.5 Z M 1256.5 641.5 L 1275.5 641.5 L 1275.5 692.5 L 1256.5 692.5 Z M 1147.5 625.5 L 1165.5 625.5 L 1165.5 692.5 L 1147.5 692.5 Z M 1076.5 625.5 L 1095.5 625.5 L 1095.5 692.5 L 1076.5 692.5 Z M 1650.5 602.5 L 1669.5 602.5 L 1669.5 692.5 L 1650.5 692.5 Z M 1483.5 602.5 L 1501.5 602.5 L 1501.5 692.5 L 1483.5 692.5 Z M 1598.5 602.5 L 1616.5 602.5 L 1616.5 692.5 L 1598.5 692.5 Z M 684.5 602.5 L 702.5 602.5 L 702.5 692.5 L 684.5 692.5 Z M 563.5 602.5 L 582.5 602.5 L 582.5 692.5 L 563.5 692.5 Z M 502.5 641.5 L 521.5 641.5 L 521.5 692.5 L 502.5 692.5 Z M 1425.5 602.5 L 1443.5 602.5 L 1443.5 692.5 L 1425.5 692.5 Z M 1545.5 602.5 L 1564.5 602.5 L 1564.5 692.5 L 1545.5 692.5 Z M 455.5 641.5 L 473.5 641.5 L 473.5 692.5 L 455.5 692.5 Z M 455.5 641.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 920.5 378.5 L 938.5 378.5 L 938.5 429.5 L 920.5 429.5 Z M 865.5 378.5 L 883.5 378.5 L 883.5 429.5 L 865.5 429.5 Z M 985.5 378.5 L 1004.5 378.5 L 1004.5 429.5 L 985.5 429.5 Z M 1255.5 396.5 L 1273.5 396.5 L 1273.5 447.5 L 1255.5 447.5 Z M 1306.5 396.5 L 1325.5 396.5 L 1325.5 447.5 L 1306.5 447.5 Z M 430.5 376.5 L 449.5 376.5 L 449.5 455.5 L 430.5 455.5 Z M 324.5 376.5 L 342.5 376.5 L 342.5 455.5 L 324.5 455.5 Z M 496.5 376.5 L 514.5 376.5 L 514.5 455.5 L 496.5 455.5 Z M 263.5 376.5 L 281.5 376.5 L 281.5 455.5 L 263.5 455.5 Z M 375.5 376.5 L 394.5 376.5 L 394.5 455.5 L 375.5 455.5 Z M 1189.5 377.5 L 1207.5 377.5 L 1207.5 480.5 L 1189.5 480.5 Z M 1061.5 377.5 L 1079.5 377.5 L 1079.5 480.5 L 1061.5 480.5 Z M 1423.5 396.5 L 1441.5 396.5 L 1441.5 498.5 L 1423.5 498.5 Z M 1368.5 396.5 L 1386.5 396.5 L 1386.5 498.5 L 1368.5 498.5 Z M 1484.5 376.5 L 1503.5 376.5 L 1503.5 513.5 L 1484.5 513.5 Z M 586.5 376.5 L 605.5 376.5 L 605.5 513.5 L 586.5 513.5 Z M 1539.5 376.5 L 1558.5 376.5 L 1558.5 513.5 L 1539.5 513.5 Z M 741.5 376.5 L 760.5 376.5 L 760.5 513.5 L 741.5 513.5 Z M 1649.5 376.5 L 1667.5 376.5 L 1667.5 513.5 L 1649.5 513.5 Z M 1594.5 376.5 L 1613.5 376.5 L 1613.5 513.5 L 1594.5 513.5 Z M 1594.5 376.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 216.5 321.5 L 237.5 321.5 L 237.5 342.5 L 216.5 342.5 Z M 1680.5 321.5 L 1701.5 321.5 L 1701.5 342.5 L 1680.5 342.5 Z M 1622.5 321.5 L 1642.5 321.5 L 1642.5 342.5 L 1622.5 342.5 Z M 1563.5 321.5 L 1584.5 321.5 L 1584.5 342.5 L 1563.5 342.5 Z M 1505.5 321.5 L 1525.5 321.5 L 1525.5 342.5 L 1505.5 342.5 Z M 1446.5 321.5 L 1467.5 321.5 L 1467.5 342.5 L 1446.5 342.5 Z M 1387.5 321.5 L 1408.5 321.5 L 1408.5 342.5 L 1387.5 342.5 Z M 1329.5 321.5 L 1350.5 321.5 L 1350.5 342.5 L 1329.5 342.5 Z M 1270.5 321.5 L 1291.5 321.5 L 1291.5 342.5 L 1270.5 342.5 Z M 1212.5 321.5 L 1232.5 321.5 L 1232.5 342.5 L 1212.5 342.5 Z M 1153.5 321.5 L 1174.5 321.5 L 1174.5 342.5 L 1153.5 342.5 Z M 1095.5 321.5 L 1115.5 321.5 L 1115.5 342.5 L 1095.5 342.5 Z M 1036.5 321.5 L 1057.5 321.5 L 1057.5 342.5 L 1036.5 342.5 Z M 977.5 321.5 L 998.5 321.5 L 998.5 342.5 L 977.5 342.5 Z M 919.5 321.5 L 940.5 321.5 L 940.5 342.5 L 919.5 342.5 Z M 860.5 321.5 L 881.5 321.5 L 881.5 342.5 L 860.5 342.5 Z M 802.5 321.5 L 823.5 321.5 L 823.5 342.5 L 802.5 342.5 Z M 743.5 321.5 L 764.5 321.5 L 764.5 342.5 L 743.5 342.5 Z M 685.5 321.5 L 705.5 321.5 L 705.5 342.5 L 685.5 342.5 Z M 626.5 321.5 L 647.5 321.5 L 647.5 342.5 L 626.5 342.5 Z M 568.5 321.5 L 588.5 321.5 L 588.5 342.5 L 568.5 342.5 Z M 509.5 321.5 L 530.5 321.5 L 530.5 342.5 L 509.5 342.5 Z M 450.5 321.5 L 471.5 321.5 L 471.5 342.5 L 450.5 342.5 Z M 392.5 321.5 L 413.5 321.5 L 413.5 342.5 L 392.5 342.5 Z M 333.5 321.5 L 354.5 321.5 L 354.5 342.5 L 333.5 342.5 Z M 275.5 321.5 L 295.5 321.5 L 295.5 342.5 L 275.5 342.5 Z M 216.5 727.5 L 237.5 727.5 L 237.5 748.5 L 216.5 748.5 Z M 1680.5 727.5 L 1701.5 727.5 L 1701.5 748.5 L 1680.5 748.5 Z M 1622.5 727.5 L 1642.5 727.5 L 1642.5 748.5 L 1622.5 748.5 Z M 1563.5 727.5 L 1584.5 727.5 L 1584.5 748.5 L 1563.5 748.5 Z M 1505.5 727.5 L 1525.5 727.5 L 1525.5 748.5 L 1505.5 748.5 Z M 1446.5 727.5 L 1467.5 727.5 L 1467.5 748.5 L 1446.5 748.5 Z M 1387.5 727.5 L 1408.5 727.5 L 1408.5 748.5 L 1387.5 748.5 Z M 1329.5 727.5 L 1350.5 727.5 L 1350.5 748.5 L 1329.5 748.5 Z M 1270.5 727.5 L 1291.5 727.5 L 1291.5 748.5 L 1270.5 748.5 Z M 1212.5 727.5 L 1232.5 727.5 L 1232.5 748.5 L 1212.5 748.5 Z M 1153.5 727.5 L 1174.5 727.5 L 1174.5 748.5 L 1153.5 748.5 Z M 1095.5 727.5 L 1115.5 727.5 L 1115.5 748.5 L 1095.5 748.5 Z M 1036.5 727.5 L 1057.5 727.5 L 1057.5 748.5 L 1036.5 748.5 Z M 977.5 727.5 L 998.5 727.5 L 998.5 748.5 L 977.5 748.5 Z M 919.5 727.5 L 940.5 727.5 L 940.5 748.5 L 919.5 748.5 Z M 860.5 727.5 L 881.5 727.5 L 881.5 748.5 L 860.5 748.5 Z M 802.5 727.5 L 823.5 727.5 L 823.5 748.5 L 802.5 748.5 Z M 743.5 727.5 L 764.5 727.5 L 764.5 748.5 L 743.5 748.5 Z M 685.5 727.5 L 705.5 727.5 L 705.5 748.5 L 685.5 748.5 Z M 626.5 727.5 L 647.5 727.5 L 647.5 748.5 L 626.5 748.5 Z M 568.5 727.5 L 588.5 727.5 L 588.5 748.5 L 568.5 748.5 Z M 509.5 727.5 L 530.5 727.5 L 530.5 748.5 L 509.5 748.5 Z M 450.5 727.5 L 471.5 727.5 L 471.5 748.5 L 450.5 748.5 Z M 392.5 727.5 L 413.5 727.5 L 413.5 748.5 L 392.5 748.5 Z M 333.5 727.5 L 354.5 727.5 L 354.5 748.5 L 333.5 748.5 Z M 275.5 727.5 L 295.5 727.5 L 295.5 748.5 L 275.5 748.5 Z M 275.5 727.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface349">
+<g id="surface377">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1704.203125 593.464844 L 1702.554688 595.5 L 1698.871094 592.449219 L 1697.820312 593.011719 L 1696.769531 593.429688 L 1695.679688 593.78125 L 1694.523438 594.027344 L 1693.367188 594.167969 L 1692.175781 594.238281 L 1690.5625 594.132812 L 1689.054688 593.886719 L 1687.652344 593.464844 L 1686.320312 592.90625 L 1685.058594 592.167969 L 1683.933594 591.222656 L 1682.917969 590.207031 L 1682.042969 589.046875 L 1681.339844 587.785156 L 1680.742188 586.417969 L 1680.289062 584.945312 L 1680.007812 583.332031 L 1679.9375 582.949219 L 1679.902344 582.527344 L 1679.867188 582.140625 L 1679.832031 581.71875 L 1679.832031 580.84375 L 1679.902344 579.089844 L 1680.148438 577.40625 L 1680.535156 575.863281 L 1681.09375 574.390625 L 1681.796875 573.023438 L 1682.707031 571.761719 L 1683.621094 570.746094 L 1684.671875 569.832031 L 1685.828125 569.0625 L 1687.054688 568.464844 L 1688.386719 567.976562 L 1689.859375 567.625 L 1690.210938 567.589844 L 1690.984375 567.519531 L 1691.367188 567.484375 L 1691.753906 567.484375 L 1692.175781 567.449219 L 1693.753906 567.554688 L 1695.261719 567.800781 L 1696.664062 568.222656 L 1697.996094 568.78125 L 1699.257812 569.519531 L 1700.414062 570.429688 L 1701.394531 571.480469 L 1702.273438 572.605469 L 1702.972656 573.832031 L 1703.570312 575.199219 L 1704.027344 576.671875 L 1704.339844 578.214844 L 1704.375 578.667969 L 1704.480469 579.933594 L 1704.480469 580.351562 L 1704.515625 580.773438 L 1704.410156 582.738281 L 1704.097656 584.59375 L 1703.605469 586.3125 L 1702.902344 587.925781 L 1701.992188 589.398438 L 1700.90625 590.765625 Z M 1695.367188 586.242188 L 1698.484375 588.804688 L 1699.328125 587.75 L 1700.027344 586.558594 L 1700.554688 585.261719 L 1700.941406 583.894531 L 1701.152344 582.421875 L 1701.257812 580.808594 L 1701.1875 579.335938 L 1700.976562 577.933594 L 1700.625 576.636719 L 1700.167969 575.445312 L 1699.574219 574.320312 L 1698.835938 573.304688 L 1697.996094 572.464844 L 1697.117188 571.761719 L 1696.136719 571.203125 L 1695.085938 570.78125 L 1693.929688 570.5 L 1692.734375 570.324219 L 1692.175781 570.324219 L 1690.914062 570.429688 L 1689.71875 570.640625 L 1688.597656 570.992188 L 1687.582031 571.515625 L 1686.632812 572.183594 L 1685.792969 572.988281 L 1684.988281 573.9375 L 1684.355469 574.988281 L 1683.828125 576.144531 L 1683.445312 577.40625 L 1683.199219 578.773438 L 1683.09375 580.246094 L 1683.09375 580.84375 L 1683.128906 582.386719 L 1683.339844 583.789062 L 1683.6875 585.085938 L 1684.144531 586.3125 L 1684.777344 587.433594 L 1685.546875 588.417969 L 1686.355469 589.292969 L 1687.265625 589.996094 L 1688.246094 590.554688 L 1689.300781 590.941406 L 1690.457031 591.222656 L 1691.683594 591.328125 L 1691.753906 591.363281 L 1692.769531 591.363281 L 1693.4375 591.292969 L 1694.101562 591.152344 L 1694.734375 591.011719 L 1695.367188 590.800781 L 1696.03125 590.519531 L 1696.066406 590.519531 L 1696.136719 590.484375 L 1696.171875 590.449219 L 1696.242188 590.449219 L 1696.277344 590.414062 L 1696.347656 590.378906 L 1693.753906 588.207031 Z M 1695.367188 586.242188 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1680 510 L 1701 510 M 1680 489 L 1701 489 M 1680 489 L 1680 510 M 1701 489 L 1701 510 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1680 510 L 1701 510 M 1680 489 L 1701 489 M 1701 510 L 1701 489 M 1680 510 L 1680 489 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 197 336 L 197 345 M 192 341 L 201 341 M 196 342 L 198 342 M 196 340 L 198 340 M 196 340 L 196 342 M 198 340 L 198 342 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.svg b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.svg
index 631e411..2ea9293 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.svg
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 537.5 L 174.5 537.5 Z M 972.5 537.5 L 1181.5 537.5 L 1181.5 552.5 L 972.5 552.5 Z M 972.5 537.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 211.5 812.5 L 1706.5 812.5 L 1706.5 860.5 L 211.5 860.5 Z M 211.5 812.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="#image355"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 293.5 644.5 L 322.5 644.5 L 322.5 751.5 L 293.5 751.5 Z M 377.5 644.5 L 406.5 644.5 L 406.5 751.5 L 377.5 751.5 Z M 1387.5 644.5 L 1416.5 644.5 L 1416.5 769.5 L 1387.5 769.5 Z M 1317.5 644.5 L 1346.5 644.5 L 1346.5 769.5 L 1317.5 769.5 Z M 831.5 700.5 L 860.5 700.5 L 860.5 782.5 L 831.5 782.5 Z M 901.5 700.5 L 930.5 700.5 L 930.5 782.5 L 901.5 782.5 Z M 492.5 644.5 L 521.5 644.5 L 521.5 788.5 L 492.5 788.5 Z M 1224.5 644.5 L 1254.5 644.5 L 1254.5 788.5 L 1224.5 788.5 Z M 1596.5 644.5 L 1625.5 644.5 L 1625.5 788.5 L 1596.5 788.5 Z M 733.5 681.5 L 762.5 681.5 L 762.5 788.5 L 733.5 788.5 Z M 1034.5 644.5 L 1063.5 644.5 L 1063.5 788.5 L 1034.5 788.5 Z M 1034.5 644.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 885.5 299.5 L 914.5 299.5 L 914.5 381.5 L 885.5 381.5 Z M 961.5 299.5 L 990.5 299.5 L 990.5 381.5 L 961.5 381.5 Z M 295.5 284.5 L 324.5 284.5 L 324.5 447.5 L 295.5 447.5 Z M 371.5 284.5 L 400.5 284.5 L 400.5 447.5 L 371.5 447.5 Z M 1391.5 304.5 L 1420.5 304.5 L 1420.5 468.5 L 1391.5 468.5 Z M 1256.5 304.5 L 1285.5 304.5 L 1285.5 468.5 L 1256.5 468.5 Z M 1478.5 304.5 L 1508.5 304.5 L 1508.5 468.5 L 1478.5 468.5 Z M 781.5 328.5 L 810.5 328.5 L 810.5 491.5 L 781.5 491.5 Z M 584.5 338.5 L 613.5 338.5 L 613.5 502.5 L 584.5 502.5 Z M 1577.5 284.5 L 1606.5 284.5 L 1606.5 502.5 L 1577.5 502.5 Z M 1059.5 299.5 L 1088.5 299.5 L 1088.5 517.5 L 1059.5 517.5 Z M 1059.5 299.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 241.5 195.5 L 274.5 195.5 L 274.5 228.5 L 241.5 228.5 Z M 1643.5 195.5 L 1676.5 195.5 L 1676.5 228.5 L 1643.5 228.5 Z M 1550.5 195.5 L 1583.5 195.5 L 1583.5 228.5 L 1550.5 228.5 Z M 1456.5 195.5 L 1489.5 195.5 L 1489.5 228.5 L 1456.5 228.5 Z M 1363.5 195.5 L 1396.5 195.5 L 1396.5 228.5 L 1363.5 228.5 Z M 1269.5 195.5 L 1302.5 195.5 L 1302.5 228.5 L 1269.5 228.5 Z M 1176.5 195.5 L 1209.5 195.5 L 1209.5 228.5 L 1176.5 228.5 Z M 1082.5 195.5 L 1115.5 195.5 L 1115.5 228.5 L 1082.5 228.5 Z M 989.5 195.5 L 1022.5 195.5 L 1022.5 228.5 L 989.5 228.5 Z M 895.5 195.5 L 929.5 195.5 L 929.5 228.5 L 895.5 228.5 Z M 802.5 195.5 L 835.5 195.5 L 835.5 228.5 L 802.5 228.5 Z M 709.5 195.5 L 742.5 195.5 L 742.5 228.5 L 709.5 228.5 Z M 615.5 195.5 L 648.5 195.5 L 648.5 228.5 L 615.5 228.5 Z M 522.5 195.5 L 555.5 195.5 L 555.5 228.5 L 522.5 228.5 Z M 428.5 195.5 L 461.5 195.5 L 461.5 228.5 L 428.5 228.5 Z M 335.5 195.5 L 368.5 195.5 L 368.5 228.5 L 335.5 228.5 Z M 241.5 843.5 L 274.5 843.5 L 274.5 877.5 L 241.5 877.5 Z M 1643.5 843.5 L 1676.5 843.5 L 1676.5 877.5 L 1643.5 877.5 Z M 1550.5 843.5 L 1583.5 843.5 L 1583.5 877.5 L 1550.5 877.5 Z M 1456.5 843.5 L 1489.5 843.5 L 1489.5 877.5 L 1456.5 877.5 Z M 1363.5 843.5 L 1396.5 843.5 L 1396.5 877.5 L 1363.5 877.5 Z M 1269.5 843.5 L 1302.5 843.5 L 1302.5 877.5 L 1269.5 877.5 Z M 1176.5 843.5 L 1209.5 843.5 L 1209.5 877.5 L 1176.5 877.5 Z M 1082.5 843.5 L 1115.5 843.5 L 1115.5 877.5 L 1082.5 877.5 Z M 989.5 843.5 L 1022.5 843.5 L 1022.5 877.5 L 989.5 877.5 Z M 895.5 843.5 L 929.5 843.5 L 929.5 877.5 L 895.5 877.5 Z M 802.5 843.5 L 835.5 843.5 L 835.5 877.5 L 802.5 877.5 Z M 709.5 843.5 L 742.5 843.5 L 742.5 877.5 L 709.5 877.5 Z M 615.5 843.5 L 648.5 843.5 L 648.5 877.5 L 615.5 877.5 Z M 522.5 843.5 L 555.5 843.5 L 555.5 877.5 L 522.5 877.5 Z M 428.5 843.5 L 461.5 843.5 L 461.5 877.5 L 428.5 877.5 Z M 335.5 843.5 L 368.5 843.5 L 368.5 877.5 L 335.5 877.5 Z M 335.5 843.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface326">
+<g id="surface352">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,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 292.78125 538.085938 L 292.78125 552.460938 L 317.507812 552.460938 L 317.507812 557.175781 L 287.433594 557.175781 L 287.433594 515.257812 L 316.472656 515.257812 L 316.472656 519.972656 L 292.78125 519.972656 L 292.78125 533.371094 L 315.609375 533.371094 L 315.609375 538.085938 Z M 292.78125 538.085938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 241 560 L 274 560 M 241 527 L 274 527 M 241 527 L 241 560 M 274 527 L 274 560 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 241 560 L 274 560 M 241 527 L 274 527 M 274 560 L 274 527 M 241 560 L 241 527 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 214 L 211 223 M 206 219 L 215 219 M 210 220 L 212 220 M 210 218 L 212 218 M 210 218 L 210 220 M 212 218 L 212 220 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.svg b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.svg
index 3b3659c..d82859e 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.svg
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 915.5 537.5 L 1292.5 537.5 L 1292.5 555.5 L 915.5 555.5 Z M 915.5 537.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 365.5 638.5 L 393.5 638.5 L 393.5 739.5 L 365.5 739.5 Z M 286.5 638.5 L 314.5 638.5 L 314.5 739.5 L 286.5 739.5 Z M 1008.5 631.5 L 1035.5 631.5 L 1035.5 767.5 L 1008.5 767.5 Z M 811.5 690.5 L 839.5 690.5 L 839.5 767.5 L 811.5 767.5 Z M 883.5 690.5 L 910.5 690.5 L 910.5 767.5 L 883.5 767.5 Z M 1190.5 638.5 L 1217.5 638.5 L 1217.5 774.5 L 1190.5 774.5 Z M 474.5 638.5 L 501.5 638.5 L 501.5 774.5 L 474.5 774.5 Z M 1349.5 638.5 L 1376.5 638.5 L 1376.5 774.5 L 1349.5 774.5 Z M 1527.5 638.5 L 1555.5 638.5 L 1555.5 774.5 L 1527.5 774.5 Z M 1606.5 638.5 L 1634.5 638.5 L 1634.5 774.5 L 1606.5 774.5 Z M 1283.5 638.5 L 1310.5 638.5 L 1310.5 774.5 L 1283.5 774.5 Z M 715.5 673.5 L 742.5 673.5 L 742.5 774.5 L 715.5 774.5 Z M 715.5 673.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 904.5 350.5 L 932.5 350.5 L 932.5 427.5 L 904.5 427.5 Z M 832.5 350.5 L 860.5 350.5 L 860.5 427.5 L 832.5 427.5 Z M 286.5 298.5 L 314.5 298.5 L 314.5 452.5 L 286.5 452.5 Z M 358.5 298.5 L 386.5 298.5 L 386.5 452.5 L 358.5 452.5 Z M 736.5 339.5 L 763.5 339.5 L 763.5 493.5 L 736.5 493.5 Z M 1402.5 314.5 L 1430.5 314.5 L 1430.5 498.5 L 1402.5 498.5 Z M 1280.5 314.5 L 1308.5 314.5 L 1308.5 498.5 L 1280.5 498.5 Z M 554.5 349.5 L 581.5 349.5 L 581.5 504.5 L 554.5 504.5 Z M 1592.5 298.5 L 1620.5 298.5 L 1620.5 504.5 L 1592.5 504.5 Z M 1510.5 298.5 L 1537.5 298.5 L 1537.5 504.5 L 1510.5 504.5 Z M 1001.5 309.5 L 1028.5 309.5 L 1028.5 515.5 L 1001.5 515.5 Z M 1183.5 367.5 L 1210.5 367.5 L 1210.5 522.5 L 1183.5 522.5 Z M 1183.5 367.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface327">
+<g id="surface354">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -173,6 +173,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 287.375 537.082031 L 287.375 550.757812 L 310.898438 550.757812 L 310.898438 555.242188 L 282.289062 555.242188 L 282.289062 515.367188 L 309.914062 515.367188 L 309.914062 519.851562 L 287.375 519.851562 L 287.375 532.597656 L 309.09375 532.597656 L 309.09375 537.082031 Z M 287.375 537.082031 "/>
 <path style="fill:none;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 559 L 269 559 M 238 528 L 269 528 M 238 528 L 238 559 M 269 528 L 269 559 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 559 L 269 559 M 238 528 L 269 528 M 269 559 L 269 528 M 238 559 L 238 528 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.svg b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.svg
index e0181f3..0127267 100644
--- a/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.svg
+++ b/cells/sdlclkp/sky130_fd_sc_hs__sdlclkp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 536.5 L 174.5 536.5 Z M 422.5 536.5 L 1048.5 536.5 L 1048.5 538.5 L 422.5 538.5 Z M 875.5 538.5 L 1048.5 538.5 L 1048.5 549.5 L 875.5 549.5 Z M 875.5 538.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 204.5 758.5 L 1714.5 758.5 L 1714.5 797.5 L 204.5 797.5 Z M 204.5 758.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 274.5 598.5 L 297.5 598.5 L 297.5 685.5 L 274.5 685.5 Z M 348.5 598.5 L 372.5 598.5 L 372.5 685.5 L 348.5 685.5 Z M 459.5 598.5 L 482.5 598.5 L 482.5 714.5 L 459.5 714.5 Z M 679.5 652.5 L 702.5 652.5 L 702.5 739.5 L 679.5 739.5 Z M 1413.5 622.5 L 1437.5 622.5 L 1437.5 739.5 L 1413.5 739.5 Z M 1257.5 622.5 L 1281.5 622.5 L 1281.5 739.5 L 1257.5 739.5 Z M 1196.5 622.5 L 1220.5 622.5 L 1220.5 739.5 L 1196.5 739.5 Z M 1117.5 622.5 L 1141.5 622.5 L 1141.5 739.5 L 1117.5 739.5 Z M 962.5 622.5 L 985.5 622.5 L 985.5 739.5 L 962.5 739.5 Z M 1624.5 622.5 L 1647.5 622.5 L 1647.5 739.5 L 1624.5 739.5 Z M 1556.5 622.5 L 1580.5 622.5 L 1580.5 739.5 L 1556.5 739.5 Z M 1489.5 622.5 L 1512.5 622.5 L 1512.5 739.5 L 1489.5 739.5 Z M 765.5 673.5 L 789.5 673.5 L 789.5 739.5 L 765.5 739.5 Z M 827.5 673.5 L 850.5 673.5 L 850.5 739.5 L 827.5 739.5 Z M 827.5 673.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 863.5 373.5 L 887.5 373.5 L 887.5 439.5 L 863.5 439.5 Z M 797.5 373.5 L 821.5 373.5 L 821.5 439.5 L 797.5 439.5 Z M 541.5 331.5 L 565.5 331.5 L 565.5 464.5 L 541.5 464.5 Z M 337.5 354.5 L 361.5 354.5 L 361.5 486.5 L 337.5 486.5 Z M 271.5 354.5 L 295.5 354.5 L 295.5 486.5 L 271.5 486.5 Z M 713.5 367.5 L 737.5 367.5 L 737.5 499.5 L 713.5 499.5 Z M 1295.5 331.5 L 1319.5 331.5 L 1319.5 508.5 L 1295.5 508.5 Z M 1374.5 331.5 L 1397.5 331.5 L 1397.5 508.5 L 1374.5 508.5 Z M 1194.5 331.5 L 1217.5 331.5 L 1217.5 508.5 L 1194.5 508.5 Z M 1110.5 376.5 L 1133.5 376.5 L 1133.5 508.5 L 1110.5 508.5 Z M 1622.5 331.5 L 1645.5 331.5 L 1645.5 508.5 L 1622.5 508.5 Z M 1544.5 331.5 L 1567.5 331.5 L 1567.5 508.5 L 1544.5 508.5 Z M 1465.5 331.5 L 1489.5 331.5 L 1489.5 508.5 L 1465.5 508.5 Z M 950.5 345.5 L 974.5 345.5 L 974.5 521.5 L 950.5 521.5 Z M 950.5 345.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 228.5 260.5 L 255.5 260.5 L 255.5 287.5 L 228.5 287.5 Z M 1662.5 260.5 L 1689.5 260.5 L 1689.5 287.5 L 1662.5 287.5 Z M 1587.5 260.5 L 1614.5 260.5 L 1614.5 287.5 L 1587.5 287.5 Z M 1511.5 260.5 L 1538.5 260.5 L 1538.5 287.5 L 1511.5 287.5 Z M 1436.5 260.5 L 1463.5 260.5 L 1463.5 287.5 L 1436.5 287.5 Z M 1360.5 260.5 L 1387.5 260.5 L 1387.5 287.5 L 1360.5 287.5 Z M 1285.5 260.5 L 1312.5 260.5 L 1312.5 287.5 L 1285.5 287.5 Z M 1209.5 260.5 L 1236.5 260.5 L 1236.5 287.5 L 1209.5 287.5 Z M 1134.5 260.5 L 1161.5 260.5 L 1161.5 287.5 L 1134.5 287.5 Z M 1059.5 260.5 L 1085.5 260.5 L 1085.5 287.5 L 1059.5 287.5 Z M 983.5 260.5 L 1010.5 260.5 L 1010.5 287.5 L 983.5 287.5 Z M 908.5 260.5 L 934.5 260.5 L 934.5 287.5 L 908.5 287.5 Z M 832.5 260.5 L 859.5 260.5 L 859.5 287.5 L 832.5 287.5 Z M 757.5 260.5 L 783.5 260.5 L 783.5 287.5 L 757.5 287.5 Z M 681.5 260.5 L 708.5 260.5 L 708.5 287.5 L 681.5 287.5 Z M 606.5 260.5 L 632.5 260.5 L 632.5 287.5 L 606.5 287.5 Z M 530.5 260.5 L 557.5 260.5 L 557.5 287.5 L 530.5 287.5 Z M 455.5 260.5 L 481.5 260.5 L 481.5 287.5 L 455.5 287.5 Z M 379.5 260.5 L 406.5 260.5 L 406.5 287.5 L 379.5 287.5 Z M 304.5 260.5 L 330.5 260.5 L 330.5 287.5 L 304.5 287.5 Z M 228.5 784.5 L 255.5 784.5 L 255.5 810.5 L 228.5 810.5 Z M 1662.5 784.5 L 1689.5 784.5 L 1689.5 810.5 L 1662.5 810.5 Z M 1587.5 784.5 L 1614.5 784.5 L 1614.5 810.5 L 1587.5 810.5 Z M 1511.5 784.5 L 1538.5 784.5 L 1538.5 810.5 L 1511.5 810.5 Z M 1436.5 784.5 L 1463.5 784.5 L 1463.5 810.5 L 1436.5 810.5 Z M 1360.5 784.5 L 1387.5 784.5 L 1387.5 810.5 L 1360.5 810.5 Z M 1285.5 784.5 L 1312.5 784.5 L 1312.5 810.5 L 1285.5 810.5 Z M 1209.5 784.5 L 1236.5 784.5 L 1236.5 810.5 L 1209.5 810.5 Z M 1134.5 784.5 L 1161.5 784.5 L 1161.5 810.5 L 1134.5 810.5 Z M 1059.5 784.5 L 1085.5 784.5 L 1085.5 810.5 L 1059.5 810.5 Z M 983.5 784.5 L 1010.5 784.5 L 1010.5 810.5 L 983.5 810.5 Z M 908.5 784.5 L 934.5 784.5 L 934.5 810.5 L 908.5 810.5 Z M 832.5 784.5 L 859.5 784.5 L 859.5 810.5 L 832.5 810.5 Z M 757.5 784.5 L 783.5 784.5 L 783.5 810.5 L 757.5 810.5 Z M 681.5 784.5 L 708.5 784.5 L 708.5 810.5 L 681.5 810.5 Z M 606.5 784.5 L 632.5 784.5 L 632.5 810.5 L 606.5 810.5 Z M 530.5 784.5 L 557.5 784.5 L 557.5 810.5 L 530.5 810.5 Z M 455.5 784.5 L 481.5 784.5 L 481.5 810.5 L 455.5 810.5 Z M 379.5 784.5 L 406.5 784.5 L 406.5 810.5 L 379.5 810.5 Z M 304.5 784.5 L 330.5 784.5 L 330.5 810.5 L 304.5 810.5 Z M 304.5 784.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>
@@ -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 1642.480469 598.632812 L 1642.480469 610.433594 L 1638.175781 610.433594 L 1638.175781 576.695312 L 1642.480469 576.695312 L 1642.480469 593.773438 L 1659.28125 576.695312 L 1664.835938 576.695312 L 1651.089844 590.441406 L 1664.972656 610.433594 L 1659.882812 610.433594 L 1647.988281 593.125 Z M 1642.480469 598.632812 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1587 499 L 1614 499 M 1587 472 L 1614 472 M 1587 472 L 1587 499 M 1614 472 L 1614 499 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1587 499 L 1614 499 M 1587 472 L 1614 472 M 1614 499 L 1614 472 M 1587 499 L 1587 472 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204 277 L 204 286 M 199 282 L 208 282 M 203 283 L 205 283 M 203 281 L 205 281 M 203 281 L 203 283 M 205 281 L 205 283 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.svg b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.svg
index 3599b40..f1d781f 100644
--- a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.svg
+++ b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 360.5 L 1744.5 360.5 L 1744.5 534.5 L 174.5 534.5 Z M 174.5 360.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 192.5 667.5 L 1726.5 667.5 L 1726.5 690.5 L 192.5 690.5 Z M 192.5 667.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 720.5 592.5 L 734.5 592.5 L 734.5 632.5 L 720.5 632.5 Z M 683.5 592.5 L 697.5 592.5 L 697.5 632.5 L 683.5 632.5 Z M 635.5 592.5 L 649.5 592.5 L 649.5 632.5 L 635.5 632.5 Z M 1119.5 595.5 L 1133.5 595.5 L 1133.5 635.5 L 1119.5 635.5 Z M 999.5 595.5 L 1013.5 595.5 L 1013.5 635.5 L 999.5 635.5 Z M 1068.5 595.5 L 1083.5 595.5 L 1083.5 635.5 L 1068.5 635.5 Z M 506.5 598.5 L 520.5 598.5 L 520.5 637.5 L 506.5 637.5 Z M 465.5 598.5 L 479.5 598.5 L 479.5 637.5 L 465.5 637.5 Z M 429.5 598.5 L 443.5 598.5 L 443.5 637.5 L 429.5 637.5 Z M 382.5 598.5 L 396.5 598.5 L 396.5 637.5 L 382.5 637.5 Z M 289.5 609.5 L 303.5 609.5 L 303.5 648.5 L 289.5 648.5 Z M 252.5 609.5 L 266.5 609.5 L 266.5 648.5 L 252.5 648.5 Z M 1672.5 584.5 L 1686.5 584.5 L 1686.5 654.5 L 1672.5 654.5 Z M 1608.5 584.5 L 1622.5 584.5 L 1622.5 654.5 L 1608.5 654.5 Z M 813.5 586.5 L 827.5 586.5 L 827.5 656.5 L 813.5 656.5 Z M 1515.5 595.5 L 1529.5 595.5 L 1529.5 656.5 L 1515.5 656.5 Z M 1335.5 595.5 L 1349.5 595.5 L 1349.5 656.5 L 1335.5 656.5 Z M 1301.5 595.5 L 1316.5 595.5 L 1316.5 656.5 L 1301.5 656.5 Z M 1196.5 595.5 L 1210.5 595.5 L 1210.5 656.5 L 1196.5 656.5 Z M 1420.5 616.5 L 1434.5 616.5 L 1434.5 656.5 L 1420.5 656.5 Z M 906.5 586.5 L 920.5 586.5 L 920.5 656.5 L 906.5 656.5 Z M 1383.5 616.5 L 1397.5 616.5 L 1397.5 656.5 L 1383.5 656.5 Z M 1383.5 616.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 1461.5 412.5 L 1475.5 412.5 L 1475.5 452.5 L 1461.5 452.5 Z M 1422.5 412.5 L 1436.5 412.5 L 1436.5 452.5 L 1422.5 452.5 Z M 1126.5 412.5 L 1140.5 412.5 L 1140.5 452.5 L 1126.5 452.5 Z M 1085.5 412.5 L 1099.5 412.5 L 1099.5 452.5 L 1085.5 452.5 Z M 1038.5 412.5 L 1052.5 412.5 L 1052.5 452.5 L 1038.5 452.5 Z M 375.5 412.5 L 390.5 412.5 L 390.5 472.5 L 375.5 472.5 Z M 269.5 412.5 L 283.5 412.5 L 283.5 472.5 L 269.5 472.5 Z M 233.5 412.5 L 247.5 412.5 L 247.5 472.5 L 233.5 472.5 Z M 439.5 412.5 L 453.5 412.5 L 453.5 472.5 L 439.5 472.5 Z M 521.5 412.5 L 535.5 412.5 L 535.5 472.5 L 521.5 472.5 Z M 479.5 412.5 L 493.5 412.5 L 493.5 472.5 L 479.5 472.5 Z M 622.5 413.5 L 636.5 413.5 L 636.5 473.5 L 622.5 473.5 Z M 717.5 413.5 L 731.5 413.5 L 731.5 473.5 L 717.5 473.5 Z M 680.5 413.5 L 694.5 413.5 L 694.5 473.5 L 680.5 473.5 Z M 1177.5 424.5 L 1191.5 424.5 L 1191.5 503.5 L 1177.5 503.5 Z M 1528.5 412.5 L 1542.5 412.5 L 1542.5 506.5 L 1528.5 506.5 Z M 1280.5 412.5 L 1294.5 412.5 L 1294.5 506.5 L 1280.5 506.5 Z M 1371.5 412.5 L 1386.5 412.5 L 1386.5 506.5 L 1371.5 506.5 Z M 942.5 412.5 L 956.5 412.5 L 956.5 517.5 L 942.5 517.5 Z M 811.5 412.5 L 826.5 412.5 L 826.5 517.5 L 811.5 517.5 Z M 1670.5 412.5 L 1684.5 412.5 L 1684.5 517.5 L 1670.5 517.5 Z M 1623.5 412.5 L 1637.5 412.5 L 1637.5 517.5 L 1623.5 517.5 Z M 1623.5 412.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 207.5 369.5 L 223.5 369.5 L 223.5 385.5 L 207.5 385.5 Z M 1695.5 369.5 L 1711.5 369.5 L 1711.5 385.5 L 1695.5 385.5 Z M 1650.5 369.5 L 1666.5 369.5 L 1666.5 385.5 L 1650.5 385.5 Z M 1605.5 369.5 L 1621.5 369.5 L 1621.5 385.5 L 1605.5 385.5 Z M 1560.5 369.5 L 1576.5 369.5 L 1576.5 385.5 L 1560.5 385.5 Z M 1515.5 369.5 L 1531.5 369.5 L 1531.5 385.5 L 1515.5 385.5 Z M 1470.5 369.5 L 1486.5 369.5 L 1486.5 385.5 L 1470.5 385.5 Z M 1425.5 369.5 L 1441.5 369.5 L 1441.5 385.5 L 1425.5 385.5 Z M 1379.5 369.5 L 1395.5 369.5 L 1395.5 385.5 L 1379.5 385.5 Z M 1334.5 369.5 L 1350.5 369.5 L 1350.5 385.5 L 1334.5 385.5 Z M 1289.5 369.5 L 1305.5 369.5 L 1305.5 385.5 L 1289.5 385.5 Z M 1244.5 369.5 L 1260.5 369.5 L 1260.5 385.5 L 1244.5 385.5 Z M 1199.5 369.5 L 1215.5 369.5 L 1215.5 385.5 L 1199.5 385.5 Z M 1154.5 369.5 L 1170.5 369.5 L 1170.5 385.5 L 1154.5 385.5 Z M 1109.5 369.5 L 1125.5 369.5 L 1125.5 385.5 L 1109.5 385.5 Z M 1064.5 369.5 L 1080.5 369.5 L 1080.5 385.5 L 1064.5 385.5 Z M 1019.5 369.5 L 1035.5 369.5 L 1035.5 385.5 L 1019.5 385.5 Z M 974.5 369.5 L 990.5 369.5 L 990.5 385.5 L 974.5 385.5 Z M 928.5 369.5 L 944.5 369.5 L 944.5 385.5 L 928.5 385.5 Z M 883.5 369.5 L 899.5 369.5 L 899.5 385.5 L 883.5 385.5 Z M 838.5 369.5 L 854.5 369.5 L 854.5 385.5 L 838.5 385.5 Z M 793.5 369.5 L 809.5 369.5 L 809.5 385.5 L 793.5 385.5 Z M 748.5 369.5 L 764.5 369.5 L 764.5 385.5 L 748.5 385.5 Z M 703.5 369.5 L 719.5 369.5 L 719.5 385.5 L 703.5 385.5 Z M 658.5 369.5 L 674.5 369.5 L 674.5 385.5 L 658.5 385.5 Z M 613.5 369.5 L 629.5 369.5 L 629.5 385.5 L 613.5 385.5 Z M 568.5 369.5 L 584.5 369.5 L 584.5 385.5 L 568.5 385.5 Z M 523.5 369.5 L 539.5 369.5 L 539.5 385.5 L 523.5 385.5 Z M 477.5 369.5 L 493.5 369.5 L 493.5 385.5 L 477.5 385.5 Z M 432.5 369.5 L 448.5 369.5 L 448.5 385.5 L 432.5 385.5 Z M 387.5 369.5 L 403.5 369.5 L 403.5 385.5 L 387.5 385.5 Z M 342.5 369.5 L 358.5 369.5 L 358.5 385.5 L 342.5 385.5 Z M 297.5 369.5 L 313.5 369.5 L 313.5 385.5 L 297.5 385.5 Z M 252.5 369.5 L 268.5 369.5 L 268.5 385.5 L 252.5 385.5 Z M 477.5 491.5 L 493.5 491.5 L 493.5 507.5 L 477.5 507.5 Z M 1515.5 491.5 L 1531.5 491.5 L 1531.5 507.5 L 1515.5 507.5 Z M 207.5 682.5 L 223.5 682.5 L 223.5 698.5 L 207.5 698.5 Z M 1695.5 682.5 L 1711.5 682.5 L 1711.5 698.5 L 1695.5 698.5 Z M 1650.5 682.5 L 1666.5 682.5 L 1666.5 698.5 L 1650.5 698.5 Z M 1605.5 682.5 L 1621.5 682.5 L 1621.5 698.5 L 1605.5 698.5 Z M 1560.5 682.5 L 1576.5 682.5 L 1576.5 698.5 L 1560.5 698.5 Z M 1515.5 682.5 L 1531.5 682.5 L 1531.5 698.5 L 1515.5 698.5 Z M 1470.5 682.5 L 1486.5 682.5 L 1486.5 698.5 L 1470.5 698.5 Z M 1425.5 682.5 L 1441.5 682.5 L 1441.5 698.5 L 1425.5 698.5 Z M 1379.5 682.5 L 1395.5 682.5 L 1395.5 698.5 L 1379.5 698.5 Z M 1334.5 682.5 L 1350.5 682.5 L 1350.5 698.5 L 1334.5 698.5 Z M 1289.5 682.5 L 1305.5 682.5 L 1305.5 698.5 L 1289.5 698.5 Z M 1244.5 682.5 L 1260.5 682.5 L 1260.5 698.5 L 1244.5 698.5 Z M 1199.5 682.5 L 1215.5 682.5 L 1215.5 698.5 L 1199.5 698.5 Z M 1154.5 682.5 L 1170.5 682.5 L 1170.5 698.5 L 1154.5 698.5 Z M 1109.5 682.5 L 1125.5 682.5 L 1125.5 698.5 L 1109.5 698.5 Z M 1064.5 682.5 L 1080.5 682.5 L 1080.5 698.5 L 1064.5 698.5 Z M 1019.5 682.5 L 1035.5 682.5 L 1035.5 698.5 L 1019.5 698.5 Z M 974.5 682.5 L 990.5 682.5 L 990.5 698.5 L 974.5 698.5 Z M 928.5 682.5 L 944.5 682.5 L 944.5 698.5 L 928.5 698.5 Z M 883.5 682.5 L 899.5 682.5 L 899.5 698.5 L 883.5 698.5 Z M 838.5 682.5 L 854.5 682.5 L 854.5 698.5 L 838.5 698.5 Z M 793.5 682.5 L 809.5 682.5 L 809.5 698.5 L 793.5 698.5 Z M 748.5 682.5 L 764.5 682.5 L 764.5 698.5 L 748.5 698.5 Z M 703.5 682.5 L 719.5 682.5 L 719.5 698.5 L 703.5 698.5 Z M 658.5 682.5 L 674.5 682.5 L 674.5 698.5 L 658.5 698.5 Z M 613.5 682.5 L 629.5 682.5 L 629.5 698.5 L 613.5 698.5 Z M 568.5 682.5 L 584.5 682.5 L 584.5 698.5 L 568.5 698.5 Z M 523.5 682.5 L 539.5 682.5 L 539.5 698.5 L 523.5 698.5 Z M 477.5 682.5 L 493.5 682.5 L 493.5 698.5 L 477.5 698.5 Z M 432.5 682.5 L 448.5 682.5 L 448.5 698.5 L 432.5 698.5 Z M 387.5 682.5 L 403.5 682.5 L 403.5 698.5 L 387.5 698.5 Z M 342.5 682.5 L 358.5 682.5 L 358.5 698.5 L 342.5 698.5 Z M 297.5 682.5 L 313.5 682.5 L 313.5 698.5 L 297.5 698.5 Z M 252.5 682.5 L 268.5 682.5 L 268.5 698.5 L 252.5 698.5 Z M 252.5 682.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>
@@ -203,6 +203,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 253.871094 544.5 L 253.871094 525.074219 L 261.359375 525.074219 L 262.53125 525.152344 L 263.625 525.367188 L 264.636719 525.738281 L 265.570312 526.21875 L 266.394531 526.886719 L 267.167969 527.660156 L 267.808594 528.589844 L 268.339844 529.605469 L 268.742188 530.75 L 269.035156 531.976562 L 269.195312 533.335938 L 269.273438 534.773438 L 269.195312 536.292969 L 269.007812 537.703125 L 268.6875 538.984375 L 268.261719 540.15625 L 267.703125 541.195312 L 267.007812 542.101562 L 266.261719 542.847656 L 265.4375 543.433594 L 264.53125 543.914062 L 263.542969 544.234375 L 262.480469 544.445312 L 261.359375 544.5 Z M 256.351562 542.316406 L 260.933594 542.316406 L 262.160156 542.234375 L 263.25 541.941406 L 264.210938 541.433594 L 265.011719 540.769531 L 265.648438 539.863281 L 266.183594 538.769531 L 266.34375 538.210938 L 266.503906 537.625 L 266.636719 536.984375 L 266.714844 536.292969 L 266.769531 535.574219 L 266.796875 534.800781 L 266.6875 533.066406 L 266.421875 531.550781 L 265.941406 530.242188 L 265.304688 529.203125 L 264.476562 528.351562 L 263.464844 527.738281 L 263.09375 527.605469 L 262.691406 527.472656 L 262.265625 527.390625 L 261.839844 527.3125 L 260.933594 527.257812 L 256.351562 527.257812 Z M 256.351562 542.316406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 252 553 L 268 553 M 252 537 L 268 537 M 252 537 L 252 553 M 268 537 L 268 553 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 553 L 268 553 M 252 537 L 268 537 M 268 553 L 268 537 M 252 553 L 252 537 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 192 384 L 192 393 M 187 389 L 196 389 M 191 390 L 193 390 M 191 388 L 193 388 M 191 388 L 191 390 M 193 388 L 193 390 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.svg b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.svg
index fa70048..a53aadc 100644
--- a/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.svg
+++ b/cells/sedfxbp/sky130_fd_sc_hs__sedfxbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 369.5 L 1744.5 369.5 L 1744.5 534.5 L 174.5 534.5 Z M 174.5 369.5 "/>
 </clipPath>
-<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image410"/>
+  <use xlink:href="#image439"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 191.5 660.5 L 1727.5 660.5 L 1727.5 682.5 L 191.5 682.5 Z M 191.5 660.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image410"/>
+  <use xlink:href="#image439"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 697.5 589.5 L 711.5 589.5 L 711.5 626.5 L 697.5 626.5 Z M 615.5 589.5 L 628.5 589.5 L 628.5 626.5 L 615.5 626.5 Z M 663.5 589.5 L 676.5 589.5 L 676.5 626.5 L 663.5 626.5 Z M 447.5 594.5 L 460.5 594.5 L 460.5 632.5 L 447.5 632.5 Z M 368.5 594.5 L 381.5 594.5 L 381.5 632.5 L 368.5 632.5 Z M 412.5 594.5 L 425.5 594.5 L 425.5 632.5 L 412.5 632.5 Z M 485.5 594.5 L 498.5 594.5 L 498.5 632.5 L 485.5 632.5 Z M 1031.5 601.5 L 1044.5 601.5 L 1044.5 639.5 L 1031.5 639.5 Z M 970.5 601.5 L 984.5 601.5 L 984.5 639.5 L 970.5 639.5 Z M 1086.5 601.5 L 1099.5 601.5 L 1099.5 639.5 L 1086.5 639.5 Z M 1557.5 583.5 L 1570.5 583.5 L 1570.5 649.5 L 1557.5 649.5 Z M 795.5 583.5 L 808.5 583.5 L 808.5 649.5 L 795.5 649.5 Z M 1153.5 592.5 L 1166.5 592.5 L 1166.5 649.5 L 1153.5 649.5 Z M 1252.5 592.5 L 1265.5 592.5 L 1265.5 649.5 L 1252.5 649.5 Z M 1284.5 592.5 L 1297.5 592.5 L 1297.5 649.5 L 1284.5 649.5 Z M 1329.5 612.5 L 1342.5 612.5 L 1342.5 649.5 L 1329.5 649.5 Z M 275.5 612.5 L 288.5 612.5 L 288.5 649.5 L 275.5 649.5 Z M 1364.5 612.5 L 1377.5 612.5 L 1377.5 649.5 L 1364.5 649.5 Z M 883.5 583.5 L 896.5 583.5 L 896.5 649.5 L 883.5 649.5 Z M 1672.5 583.5 L 1685.5 583.5 L 1685.5 649.5 L 1672.5 649.5 Z M 1633.5 583.5 L 1647.5 583.5 L 1647.5 649.5 L 1633.5 649.5 Z M 1469.5 583.5 L 1482.5 583.5 L 1482.5 649.5 L 1469.5 649.5 Z M 241.5 612.5 L 254.5 612.5 L 254.5 649.5 L 241.5 649.5 Z M 1595.5 583.5 L 1609.5 583.5 L 1609.5 649.5 L 1595.5 649.5 Z M 1595.5 583.5 "/>
 </clipPath>
-<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image440" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image411"/>
+  <use xlink:href="#image440"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1402.5 419.5 L 1416.5 419.5 L 1416.5 456.5 L 1402.5 456.5 Z M 1087.5 419.5 L 1100.5 419.5 L 1100.5 456.5 L 1087.5 456.5 Z M 1042.5 419.5 L 1055.5 419.5 L 1055.5 456.5 L 1042.5 456.5 Z M 1365.5 419.5 L 1378.5 419.5 L 1378.5 456.5 L 1365.5 456.5 Z M 1002.5 419.5 L 1015.5 419.5 L 1015.5 456.5 L 1002.5 456.5 Z M 237.5 419.5 L 250.5 419.5 L 250.5 476.5 L 237.5 476.5 Z M 509.5 420.5 L 523.5 420.5 L 523.5 476.5 L 509.5 476.5 Z M 469.5 420.5 L 483.5 420.5 L 483.5 476.5 L 469.5 476.5 Z M 435.5 420.5 L 448.5 420.5 L 448.5 476.5 L 435.5 476.5 Z M 374.5 420.5 L 388.5 420.5 L 388.5 476.5 L 374.5 476.5 Z M 274.5 419.5 L 287.5 419.5 L 287.5 476.5 L 274.5 476.5 Z M 600.5 424.5 L 613.5 424.5 L 613.5 480.5 L 600.5 480.5 Z M 699.5 424.5 L 712.5 424.5 L 712.5 480.5 L 699.5 480.5 Z M 661.5 424.5 L 675.5 424.5 L 675.5 480.5 L 661.5 480.5 Z M 1135.5 430.5 L 1149.5 430.5 L 1149.5 505.5 L 1135.5 505.5 Z M 1233.5 419.5 L 1246.5 419.5 L 1246.5 508.5 L 1233.5 508.5 Z M 1318.5 419.5 L 1331.5 419.5 L 1331.5 508.5 L 1318.5 508.5 Z M 1555.5 419.5 L 1569.5 419.5 L 1569.5 518.5 L 1555.5 518.5 Z M 1595.5 419.5 L 1609.5 419.5 L 1609.5 518.5 L 1595.5 518.5 Z M 788.5 419.5 L 802.5 419.5 L 802.5 518.5 L 788.5 518.5 Z M 912.5 419.5 L 925.5 419.5 L 925.5 518.5 L 912.5 518.5 Z M 1675.5 419.5 L 1688.5 419.5 L 1688.5 518.5 L 1675.5 518.5 Z M 1465.5 419.5 L 1479.5 419.5 L 1479.5 518.5 L 1465.5 518.5 Z M 1635.5 419.5 L 1649.5 419.5 L 1649.5 518.5 L 1635.5 518.5 Z M 1635.5 419.5 "/>
 </clipPath>
-<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image441" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image412"/>
+  <use xlink:href="#image441"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 205.5 378.5 L 220.5 378.5 L 220.5 393.5 L 205.5 393.5 Z M 1698.5 378.5 L 1713.5 378.5 L 1713.5 393.5 L 1698.5 393.5 Z M 1655.5 378.5 L 1670.5 378.5 L 1670.5 393.5 L 1655.5 393.5 Z M 1613.5 378.5 L 1628.5 378.5 L 1628.5 393.5 L 1613.5 393.5 Z M 1570.5 378.5 L 1585.5 378.5 L 1585.5 393.5 L 1570.5 393.5 Z M 1527.5 378.5 L 1542.5 378.5 L 1542.5 393.5 L 1527.5 393.5 Z M 1485.5 378.5 L 1500.5 378.5 L 1500.5 393.5 L 1485.5 393.5 Z M 1442.5 378.5 L 1457.5 378.5 L 1457.5 393.5 L 1442.5 393.5 Z M 1399.5 378.5 L 1414.5 378.5 L 1414.5 393.5 L 1399.5 393.5 Z M 1357.5 378.5 L 1372.5 378.5 L 1372.5 393.5 L 1357.5 393.5 Z M 1314.5 378.5 L 1329.5 378.5 L 1329.5 393.5 L 1314.5 393.5 Z M 1271.5 378.5 L 1286.5 378.5 L 1286.5 393.5 L 1271.5 393.5 Z M 1229.5 378.5 L 1244.5 378.5 L 1244.5 393.5 L 1229.5 393.5 Z M 1186.5 378.5 L 1201.5 378.5 L 1201.5 393.5 L 1186.5 393.5 Z M 1143.5 378.5 L 1158.5 378.5 L 1158.5 393.5 L 1143.5 393.5 Z M 1101.5 378.5 L 1116.5 378.5 L 1116.5 393.5 L 1101.5 393.5 Z M 1058.5 378.5 L 1073.5 378.5 L 1073.5 393.5 L 1058.5 393.5 Z M 1015.5 378.5 L 1030.5 378.5 L 1030.5 393.5 L 1015.5 393.5 Z M 973.5 378.5 L 988.5 378.5 L 988.5 393.5 L 973.5 393.5 Z M 930.5 378.5 L 945.5 378.5 L 945.5 393.5 L 930.5 393.5 Z M 887.5 378.5 L 903.5 378.5 L 903.5 393.5 L 887.5 393.5 Z M 845.5 378.5 L 860.5 378.5 L 860.5 393.5 L 845.5 393.5 Z M 802.5 378.5 L 817.5 378.5 L 817.5 393.5 L 802.5 393.5 Z M 759.5 378.5 L 775.5 378.5 L 775.5 393.5 L 759.5 393.5 Z M 717.5 378.5 L 732.5 378.5 L 732.5 393.5 L 717.5 393.5 Z M 674.5 378.5 L 689.5 378.5 L 689.5 393.5 L 674.5 393.5 Z M 631.5 378.5 L 647.5 378.5 L 647.5 393.5 L 631.5 393.5 Z M 589.5 378.5 L 604.5 378.5 L 604.5 393.5 L 589.5 393.5 Z M 546.5 378.5 L 561.5 378.5 L 561.5 393.5 L 546.5 393.5 Z M 504.5 378.5 L 519.5 378.5 L 519.5 393.5 L 504.5 393.5 Z M 461.5 378.5 L 476.5 378.5 L 476.5 393.5 L 461.5 393.5 Z M 418.5 378.5 L 433.5 378.5 L 433.5 393.5 L 418.5 393.5 Z M 376.5 378.5 L 391.5 378.5 L 391.5 393.5 L 376.5 393.5 Z M 333.5 378.5 L 348.5 378.5 L 348.5 393.5 L 333.5 393.5 Z M 290.5 378.5 L 305.5 378.5 L 305.5 393.5 L 290.5 393.5 Z M 248.5 378.5 L 263.5 378.5 L 263.5 393.5 L 248.5 393.5 Z M 461.5 526.5 L 476.5 526.5 L 476.5 540.5 L 461.5 540.5 Z M 1527.5 526.5 L 1542.5 526.5 L 1542.5 541.5 L 1527.5 541.5 Z M 461.5 540.5 L 476.5 540.5 L 476.5 541.5 L 461.5 541.5 Z M 205.5 674.5 L 220.5 674.5 L 220.5 689.5 L 205.5 689.5 Z M 1698.5 674.5 L 1713.5 674.5 L 1713.5 689.5 L 1698.5 689.5 Z M 1655.5 674.5 L 1670.5 674.5 L 1670.5 689.5 L 1655.5 689.5 Z M 1613.5 674.5 L 1628.5 674.5 L 1628.5 689.5 L 1613.5 689.5 Z M 1570.5 674.5 L 1585.5 674.5 L 1585.5 689.5 L 1570.5 689.5 Z M 1527.5 674.5 L 1542.5 674.5 L 1542.5 689.5 L 1527.5 689.5 Z M 1485.5 674.5 L 1500.5 674.5 L 1500.5 689.5 L 1485.5 689.5 Z M 1442.5 674.5 L 1457.5 674.5 L 1457.5 689.5 L 1442.5 689.5 Z M 1399.5 674.5 L 1414.5 674.5 L 1414.5 689.5 L 1399.5 689.5 Z M 1357.5 674.5 L 1372.5 674.5 L 1372.5 689.5 L 1357.5 689.5 Z M 1314.5 674.5 L 1329.5 674.5 L 1329.5 689.5 L 1314.5 689.5 Z M 1271.5 674.5 L 1286.5 674.5 L 1286.5 689.5 L 1271.5 689.5 Z M 1229.5 674.5 L 1244.5 674.5 L 1244.5 689.5 L 1229.5 689.5 Z M 1186.5 674.5 L 1201.5 674.5 L 1201.5 689.5 L 1186.5 689.5 Z M 1143.5 674.5 L 1158.5 674.5 L 1158.5 689.5 L 1143.5 689.5 Z M 1101.5 674.5 L 1116.5 674.5 L 1116.5 689.5 L 1101.5 689.5 Z M 1058.5 674.5 L 1073.5 674.5 L 1073.5 689.5 L 1058.5 689.5 Z M 1015.5 674.5 L 1030.5 674.5 L 1030.5 689.5 L 1015.5 689.5 Z M 973.5 674.5 L 988.5 674.5 L 988.5 689.5 L 973.5 689.5 Z M 930.5 674.5 L 945.5 674.5 L 945.5 689.5 L 930.5 689.5 Z M 887.5 674.5 L 903.5 674.5 L 903.5 689.5 L 887.5 689.5 Z M 845.5 674.5 L 860.5 674.5 L 860.5 689.5 L 845.5 689.5 Z M 802.5 674.5 L 817.5 674.5 L 817.5 689.5 L 802.5 689.5 Z M 759.5 674.5 L 775.5 674.5 L 775.5 689.5 L 759.5 689.5 Z M 717.5 674.5 L 732.5 674.5 L 732.5 689.5 L 717.5 689.5 Z M 674.5 674.5 L 689.5 674.5 L 689.5 689.5 L 674.5 689.5 Z M 631.5 674.5 L 647.5 674.5 L 647.5 689.5 L 631.5 689.5 Z M 589.5 674.5 L 604.5 674.5 L 604.5 689.5 L 589.5 689.5 Z M 546.5 674.5 L 561.5 674.5 L 561.5 689.5 L 546.5 689.5 Z M 504.5 674.5 L 519.5 674.5 L 519.5 689.5 L 504.5 689.5 Z M 461.5 674.5 L 476.5 674.5 L 476.5 689.5 L 461.5 689.5 Z M 418.5 674.5 L 433.5 674.5 L 433.5 689.5 L 418.5 689.5 Z M 376.5 674.5 L 391.5 674.5 L 391.5 689.5 L 376.5 689.5 Z M 333.5 674.5 L 348.5 674.5 L 348.5 689.5 L 333.5 689.5 Z M 290.5 674.5 L 305.5 674.5 L 305.5 689.5 L 290.5 689.5 Z M 248.5 674.5 L 263.5 674.5 L 263.5 689.5 L 248.5 689.5 Z M 248.5 674.5 "/>
 </clipPath>
-<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image442" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image413"/>
+  <use xlink:href="#image442"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface407">
+<g id="surface436">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -219,6 +219,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 346.320312 535.117188 L 346.320312 541.429688 L 357.175781 541.429688 L 357.175781 543.5 L 343.972656 543.5 L 343.972656 525.097656 L 356.722656 525.097656 L 356.722656 527.167969 L 346.320312 527.167969 L 346.320312 533.046875 L 356.34375 533.046875 L 356.34375 535.117188 Z M 346.320312 535.117188 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 333 553 L 348 553 M 333 538 L 348 538 M 333 538 L 333 553 M 348 538 L 348 553 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 333 553 L 348 553 M 333 538 L 348 538 M 348 553 L 348 538 M 333 553 L 333 538 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 191 392 L 191 401 M 186 397 L 195 397 M 190 398 L 192 398 M 190 396 L 192 396 M 190 396 L 190 398 M 192 396 L 192 398 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.svg b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.svg
index 51dfe30..775992d 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.svg
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 349.5 L 1743.5 349.5 L 1743.5 534.5 L 174.5 534.5 Z M 793.5 534.5 L 899.5 534.5 L 899.5 540.5 L 793.5 540.5 Z M 793.5 534.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image397"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 193.5 676.5 L 1724.5 676.5 L 1724.5 700.5 L 193.5 700.5 Z M 193.5 676.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="#image397"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 689.5 596.5 L 704.5 596.5 L 704.5 638.5 L 689.5 638.5 Z M 725.5 596.5 L 740.5 596.5 L 740.5 638.5 L 725.5 638.5 Z M 646.5 596.5 L 661.5 596.5 L 661.5 638.5 L 646.5 638.5 Z M 430.5 603.5 L 445.5 603.5 L 445.5 645.5 L 430.5 645.5 Z M 511.5 603.5 L 526.5 603.5 L 526.5 645.5 L 511.5 645.5 Z M 387.5 603.5 L 402.5 603.5 L 402.5 645.5 L 387.5 645.5 Z M 468.5 603.5 L 483.5 603.5 L 483.5 645.5 L 468.5 645.5 Z M 1145.5 610.5 L 1160.5 610.5 L 1160.5 652.5 L 1145.5 652.5 Z M 1087.5 610.5 L 1102.5 610.5 L 1102.5 652.5 L 1087.5 652.5 Z M 1019.5 610.5 L 1034.5 610.5 L 1034.5 652.5 L 1019.5 652.5 Z M 922.5 589.5 L 937.5 589.5 L 937.5 663.5 L 922.5 663.5 Z M 249.5 621.5 L 264.5 621.5 L 264.5 663.5 L 249.5 663.5 Z M 1667.5 589.5 L 1682.5 589.5 L 1682.5 663.5 L 1667.5 663.5 Z M 1220.5 599.5 L 1235.5 599.5 L 1235.5 663.5 L 1220.5 663.5 Z M 823.5 589.5 L 838.5 589.5 L 838.5 663.5 L 823.5 663.5 Z M 1367.5 599.5 L 1382.5 599.5 L 1382.5 663.5 L 1367.5 663.5 Z M 288.5 621.5 L 303.5 621.5 L 303.5 663.5 L 288.5 663.5 Z M 1457.5 621.5 L 1472.5 621.5 L 1472.5 663.5 L 1457.5 663.5 Z M 1418.5 621.5 L 1433.5 621.5 L 1433.5 663.5 L 1418.5 663.5 Z M 1569.5 621.5 L 1584.5 621.5 L 1584.5 663.5 L 1569.5 663.5 Z M 1331.5 599.5 L 1346.5 599.5 L 1346.5 663.5 L 1331.5 663.5 Z M 1331.5 599.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image398"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1500.5 405.5 L 1515.5 405.5 L 1515.5 447.5 L 1500.5 447.5 Z M 1458.5 405.5 L 1473.5 405.5 L 1473.5 447.5 L 1458.5 447.5 Z M 1120.5 405.5 L 1135.5 405.5 L 1135.5 447.5 L 1120.5 447.5 Z M 1070.5 405.5 L 1085.5 405.5 L 1085.5 447.5 L 1070.5 447.5 Z M 1163.5 405.5 L 1178.5 405.5 L 1178.5 447.5 L 1163.5 447.5 Z M 235.5 405.5 L 250.5 405.5 L 250.5 469.5 L 235.5 469.5 Z M 538.5 405.5 L 553.5 405.5 L 553.5 469.5 L 538.5 469.5 Z M 274.5 405.5 L 288.5 405.5 L 288.5 469.5 L 274.5 469.5 Z M 386.5 405.5 L 401.5 405.5 L 401.5 469.5 L 386.5 469.5 Z M 493.5 405.5 L 508.5 405.5 L 508.5 469.5 L 493.5 469.5 Z M 454.5 405.5 L 469.5 405.5 L 469.5 469.5 L 454.5 469.5 Z M 1571.5 405.5 L 1586.5 405.5 L 1586.5 469.5 L 1571.5 469.5 Z M 635.5 409.5 L 650.5 409.5 L 650.5 473.5 L 635.5 473.5 Z M 742.5 409.5 L 757.5 409.5 L 757.5 473.5 L 742.5 473.5 Z M 703.5 409.5 L 718.5 409.5 L 718.5 473.5 L 703.5 473.5 Z M 1215.5 418.5 L 1230.5 418.5 L 1230.5 502.5 L 1215.5 502.5 Z M 1311.5 405.5 L 1326.5 405.5 L 1326.5 505.5 L 1311.5 505.5 Z M 1405.5 405.5 L 1420.5 405.5 L 1420.5 505.5 L 1405.5 505.5 Z M 1667.5 405.5 L 1682.5 405.5 L 1682.5 517.5 L 1667.5 517.5 Z M 973.5 405.5 L 988.5 405.5 L 988.5 517.5 L 973.5 517.5 Z M 838.5 411.5 L 853.5 411.5 L 853.5 523.5 L 838.5 523.5 Z M 838.5 411.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image399"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 208.5 360.5 L 225.5 360.5 L 225.5 376.5 L 208.5 376.5 Z M 1692.5 360.5 L 1709.5 360.5 L 1709.5 376.5 L 1692.5 376.5 Z M 1644.5 360.5 L 1661.5 360.5 L 1661.5 376.5 L 1644.5 376.5 Z M 1596.5 360.5 L 1613.5 360.5 L 1613.5 376.5 L 1596.5 376.5 Z M 1548.5 360.5 L 1565.5 360.5 L 1565.5 376.5 L 1548.5 376.5 Z M 1500.5 360.5 L 1517.5 360.5 L 1517.5 376.5 L 1500.5 376.5 Z M 1453.5 360.5 L 1470.5 360.5 L 1470.5 376.5 L 1453.5 376.5 Z M 1405.5 360.5 L 1422.5 360.5 L 1422.5 376.5 L 1405.5 376.5 Z M 1357.5 360.5 L 1374.5 360.5 L 1374.5 376.5 L 1357.5 376.5 Z M 1309.5 360.5 L 1326.5 360.5 L 1326.5 376.5 L 1309.5 376.5 Z M 1261.5 360.5 L 1278.5 360.5 L 1278.5 376.5 L 1261.5 376.5 Z M 1213.5 360.5 L 1230.5 360.5 L 1230.5 376.5 L 1213.5 376.5 Z M 1165.5 360.5 L 1182.5 360.5 L 1182.5 376.5 L 1165.5 376.5 Z M 1118.5 360.5 L 1135.5 360.5 L 1135.5 376.5 L 1118.5 376.5 Z M 1070.5 360.5 L 1087.5 360.5 L 1087.5 376.5 L 1070.5 376.5 Z M 1022.5 360.5 L 1039.5 360.5 L 1039.5 376.5 L 1022.5 376.5 Z M 974.5 360.5 L 991.5 360.5 L 991.5 376.5 L 974.5 376.5 Z M 926.5 360.5 L 943.5 360.5 L 943.5 376.5 L 926.5 376.5 Z M 878.5 360.5 L 895.5 360.5 L 895.5 376.5 L 878.5 376.5 Z M 830.5 360.5 L 847.5 360.5 L 847.5 376.5 L 830.5 376.5 Z M 783.5 360.5 L 799.5 360.5 L 799.5 376.5 L 783.5 376.5 Z M 735.5 360.5 L 752.5 360.5 L 752.5 376.5 L 735.5 376.5 Z M 687.5 360.5 L 704.5 360.5 L 704.5 376.5 L 687.5 376.5 Z M 639.5 360.5 L 656.5 360.5 L 656.5 376.5 L 639.5 376.5 Z M 591.5 360.5 L 608.5 360.5 L 608.5 376.5 L 591.5 376.5 Z M 543.5 360.5 L 560.5 360.5 L 560.5 376.5 L 543.5 376.5 Z M 495.5 360.5 L 512.5 360.5 L 512.5 376.5 L 495.5 376.5 Z M 448.5 360.5 L 464.5 360.5 L 464.5 376.5 L 448.5 376.5 Z M 400.5 360.5 L 417.5 360.5 L 417.5 376.5 L 400.5 376.5 Z M 352.5 360.5 L 369.5 360.5 L 369.5 376.5 L 352.5 376.5 Z M 304.5 360.5 L 321.5 360.5 L 321.5 376.5 L 304.5 376.5 Z M 256.5 360.5 L 273.5 360.5 L 273.5 376.5 L 256.5 376.5 Z M 448.5 526.5 L 464.5 526.5 L 464.5 542.5 L 448.5 542.5 Z M 1596.5 526.5 L 1613.5 526.5 L 1613.5 542.5 L 1596.5 542.5 Z M 208.5 692.5 L 225.5 692.5 L 225.5 708.5 L 208.5 708.5 Z M 1692.5 692.5 L 1709.5 692.5 L 1709.5 708.5 L 1692.5 708.5 Z M 1644.5 692.5 L 1661.5 692.5 L 1661.5 708.5 L 1644.5 708.5 Z M 1596.5 692.5 L 1613.5 692.5 L 1613.5 708.5 L 1596.5 708.5 Z M 1548.5 692.5 L 1565.5 692.5 L 1565.5 708.5 L 1548.5 708.5 Z M 1500.5 692.5 L 1517.5 692.5 L 1517.5 708.5 L 1500.5 708.5 Z M 1453.5 692.5 L 1470.5 692.5 L 1470.5 708.5 L 1453.5 708.5 Z M 1405.5 692.5 L 1422.5 692.5 L 1422.5 708.5 L 1405.5 708.5 Z M 1357.5 692.5 L 1374.5 692.5 L 1374.5 708.5 L 1357.5 708.5 Z M 1309.5 692.5 L 1326.5 692.5 L 1326.5 708.5 L 1309.5 708.5 Z M 1261.5 692.5 L 1278.5 692.5 L 1278.5 708.5 L 1261.5 708.5 Z M 1213.5 692.5 L 1230.5 692.5 L 1230.5 708.5 L 1213.5 708.5 Z M 1165.5 692.5 L 1182.5 692.5 L 1182.5 708.5 L 1165.5 708.5 Z M 1118.5 692.5 L 1135.5 692.5 L 1135.5 708.5 L 1118.5 708.5 Z M 1070.5 692.5 L 1087.5 692.5 L 1087.5 708.5 L 1070.5 708.5 Z M 1022.5 692.5 L 1039.5 692.5 L 1039.5 708.5 L 1022.5 708.5 Z M 974.5 692.5 L 991.5 692.5 L 991.5 708.5 L 974.5 708.5 Z M 926.5 692.5 L 943.5 692.5 L 943.5 708.5 L 926.5 708.5 Z M 878.5 692.5 L 895.5 692.5 L 895.5 708.5 L 878.5 708.5 Z M 830.5 692.5 L 847.5 692.5 L 847.5 708.5 L 830.5 708.5 Z M 783.5 692.5 L 799.5 692.5 L 799.5 708.5 L 783.5 708.5 Z M 735.5 692.5 L 752.5 692.5 L 752.5 708.5 L 735.5 708.5 Z M 687.5 692.5 L 704.5 692.5 L 704.5 708.5 L 687.5 708.5 Z M 639.5 692.5 L 656.5 692.5 L 656.5 708.5 L 639.5 708.5 Z M 591.5 692.5 L 608.5 692.5 L 608.5 708.5 L 591.5 708.5 Z M 543.5 692.5 L 560.5 692.5 L 560.5 708.5 L 543.5 708.5 Z M 495.5 692.5 L 512.5 692.5 L 512.5 708.5 L 495.5 708.5 Z M 448.5 692.5 L 464.5 692.5 L 464.5 708.5 L 448.5 708.5 Z M 400.5 692.5 L 417.5 692.5 L 417.5 708.5 L 400.5 708.5 Z M 352.5 692.5 L 369.5 692.5 L 369.5 708.5 L 352.5 708.5 Z M 304.5 692.5 L 321.5 692.5 L 321.5 708.5 L 304.5 708.5 Z M 256.5 692.5 L 273.5 692.5 L 273.5 708.5 L 256.5 708.5 Z M 256.5 692.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image400"/>
 </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="surface394">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -200,6 +200,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 258.121094 545.5 L 258.121094 524.027344 L 266.398438 524.027344 L 267.695312 524.117188 L 268.902344 524.351562 L 270.019531 524.765625 L 271.050781 525.296875 L 271.964844 526.03125 L 272.820312 526.886719 L 273.523438 527.917969 L 274.113281 529.035156 L 274.554688 530.300781 L 274.878906 531.65625 L 275.058594 533.160156 L 275.144531 534.75 L 275.058594 536.429688 L 274.851562 537.988281 L 274.496094 539.402344 L 274.027344 540.699219 L 273.40625 541.847656 L 272.640625 542.847656 L 271.816406 543.675781 L 270.902344 544.320312 L 269.902344 544.851562 L 268.8125 545.207031 L 267.632812 545.441406 L 266.398438 545.5 Z M 260.859375 543.085938 L 265.925781 543.085938 L 267.28125 542.996094 L 268.488281 542.671875 L 269.550781 542.113281 L 270.433594 541.375 L 271.140625 540.375 L 271.730469 539.167969 L 271.90625 538.550781 L 272.082031 537.902344 L 272.230469 537.195312 L 272.316406 536.429688 L 272.375 535.632812 L 272.40625 534.777344 L 272.289062 532.863281 L 271.992188 531.1875 L 271.464844 529.742188 L 270.757812 528.59375 L 269.84375 527.652344 L 268.722656 526.972656 L 268.3125 526.828125 L 267.871094 526.679688 L 267.398438 526.589844 L 266.929688 526.503906 L 266.425781 526.472656 L 265.925781 526.445312 L 260.859375 526.445312 Z M 260.859375 543.085938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 256 553 L 273 553 M 256 537 L 273 537 M 256 537 L 256 553 M 273 537 L 273 553 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 256 553 L 273 553 M 256 537 L 273 537 M 273 553 L 273 537 M 256 553 L 256 537 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 193 374 L 193 383 M 188 379 L 197 379 M 192 380 L 194 380 M 192 378 L 194 378 M 192 378 L 192 380 M 194 378 L 194 380 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.svg b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.svg
index a9e7140..593a19a 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.svg
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 360.5 L 1744.5 360.5 L 1744.5 534.5 L 174.5 534.5 Z M 775.5 534.5 L 879.5 534.5 L 879.5 536.5 L 775.5 536.5 Z M 775.5 534.5 "/>
 </clipPath>
-<image id="image356" 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="#image356"/>
+  <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 192.5 667.5 L 1726.5 667.5 L 1726.5 690.5 L 192.5 690.5 Z M 192.5 667.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 714.5 592.5 L 728.5 592.5 L 728.5 632.5 L 714.5 632.5 Z M 680.5 592.5 L 694.5 592.5 L 694.5 632.5 L 680.5 632.5 Z M 633.5 592.5 L 647.5 592.5 L 647.5 632.5 L 633.5 632.5 Z M 413.5 598.5 L 427.5 598.5 L 427.5 637.5 L 413.5 637.5 Z M 373.5 598.5 L 387.5 598.5 L 387.5 637.5 L 373.5 637.5 Z M 450.5 598.5 L 464.5 598.5 L 464.5 637.5 L 450.5 637.5 Z M 504.5 598.5 L 518.5 598.5 L 518.5 637.5 L 504.5 637.5 Z M 1122.5 605.5 L 1136.5 605.5 L 1136.5 645.5 L 1122.5 645.5 Z M 1058.5 605.5 L 1072.5 605.5 L 1072.5 645.5 L 1058.5 645.5 Z M 994.5 605.5 L 1008.5 605.5 L 1008.5 645.5 L 994.5 645.5 Z M 243.5 616.5 L 257.5 616.5 L 257.5 656.5 L 243.5 656.5 Z M 901.5 586.5 L 915.5 586.5 L 915.5 656.5 L 901.5 656.5 Z M 808.5 586.5 L 822.5 586.5 L 822.5 656.5 L 808.5 656.5 Z M 1195.5 595.5 L 1209.5 595.5 L 1209.5 656.5 L 1195.5 656.5 Z M 1340.5 595.5 L 1355.5 595.5 L 1355.5 656.5 L 1340.5 656.5 Z M 1526.5 616.5 L 1540.5 616.5 L 1540.5 656.5 L 1526.5 656.5 Z M 1666.5 586.5 L 1680.5 586.5 L 1680.5 656.5 L 1666.5 656.5 Z M 1422.5 616.5 L 1436.5 616.5 L 1436.5 656.5 L 1422.5 656.5 Z M 1625.5 586.5 L 1639.5 586.5 L 1639.5 656.5 L 1625.5 656.5 Z M 1307.5 595.5 L 1321.5 595.5 L 1321.5 656.5 L 1307.5 656.5 Z M 280.5 616.5 L 294.5 616.5 L 294.5 656.5 L 280.5 656.5 Z M 1385.5 616.5 L 1399.5 616.5 L 1399.5 656.5 L 1385.5 656.5 Z M 1385.5 616.5 "/>
 </clipPath>
-<image id="image357" 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="#image357"/>
+  <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 1466.5 412.5 L 1480.5 412.5 L 1480.5 452.5 L 1466.5 452.5 Z M 1426.5 412.5 L 1441.5 412.5 L 1441.5 452.5 L 1426.5 452.5 Z M 1139.5 412.5 L 1153.5 412.5 L 1153.5 452.5 L 1139.5 452.5 Z M 1088.5 412.5 L 1102.5 412.5 L 1102.5 452.5 L 1088.5 452.5 Z M 1045.5 412.5 L 1060.5 412.5 L 1060.5 452.5 L 1045.5 452.5 Z M 1533.5 412.5 L 1547.5 412.5 L 1547.5 472.5 L 1533.5 472.5 Z M 278.5 412.5 L 292.5 412.5 L 292.5 472.5 L 278.5 472.5 Z M 239.5 412.5 L 253.5 412.5 L 253.5 472.5 L 239.5 472.5 Z M 448.5 413.5 L 462.5 413.5 L 462.5 473.5 L 448.5 473.5 Z M 384.5 413.5 L 399.5 413.5 L 399.5 473.5 L 384.5 473.5 Z M 527.5 413.5 L 541.5 413.5 L 541.5 473.5 L 527.5 473.5 Z M 485.5 413.5 L 499.5 413.5 L 499.5 473.5 L 485.5 473.5 Z M 621.5 416.5 L 635.5 416.5 L 635.5 477.5 L 621.5 477.5 Z M 725.5 416.5 L 739.5 416.5 L 739.5 477.5 L 725.5 477.5 Z M 685.5 416.5 L 699.5 416.5 L 699.5 477.5 L 685.5 477.5 Z M 1190.5 424.5 L 1204.5 424.5 L 1204.5 503.5 L 1190.5 503.5 Z M 1285.5 412.5 L 1300.5 412.5 L 1300.5 506.5 L 1285.5 506.5 Z M 1376.5 412.5 L 1390.5 412.5 L 1390.5 506.5 L 1376.5 506.5 Z M 951.5 412.5 L 965.5 412.5 L 965.5 517.5 L 951.5 517.5 Z M 1628.5 412.5 L 1642.5 412.5 L 1642.5 517.5 L 1628.5 517.5 Z M 1671.5 412.5 L 1685.5 412.5 L 1685.5 517.5 L 1671.5 517.5 Z M 820.5 414.5 L 834.5 414.5 L 834.5 519.5 L 820.5 519.5 Z M 820.5 414.5 "/>
 </clipPath>
-<image id="image358" 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="#image358"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 207.5 369.5 L 223.5 369.5 L 223.5 385.5 L 207.5 385.5 Z M 1695.5 369.5 L 1711.5 369.5 L 1711.5 385.5 L 1695.5 385.5 Z M 1650.5 369.5 L 1666.5 369.5 L 1666.5 385.5 L 1650.5 385.5 Z M 1605.5 369.5 L 1621.5 369.5 L 1621.5 385.5 L 1605.5 385.5 Z M 1560.5 369.5 L 1576.5 369.5 L 1576.5 385.5 L 1560.5 385.5 Z M 1515.5 369.5 L 1531.5 369.5 L 1531.5 385.5 L 1515.5 385.5 Z M 1470.5 369.5 L 1486.5 369.5 L 1486.5 385.5 L 1470.5 385.5 Z M 1425.5 369.5 L 1441.5 369.5 L 1441.5 385.5 L 1425.5 385.5 Z M 1379.5 369.5 L 1395.5 369.5 L 1395.5 385.5 L 1379.5 385.5 Z M 1334.5 369.5 L 1350.5 369.5 L 1350.5 385.5 L 1334.5 385.5 Z M 1289.5 369.5 L 1305.5 369.5 L 1305.5 385.5 L 1289.5 385.5 Z M 1244.5 369.5 L 1260.5 369.5 L 1260.5 385.5 L 1244.5 385.5 Z M 1199.5 369.5 L 1215.5 369.5 L 1215.5 385.5 L 1199.5 385.5 Z M 1154.5 369.5 L 1170.5 369.5 L 1170.5 385.5 L 1154.5 385.5 Z M 1109.5 369.5 L 1125.5 369.5 L 1125.5 385.5 L 1109.5 385.5 Z M 1064.5 369.5 L 1080.5 369.5 L 1080.5 385.5 L 1064.5 385.5 Z M 1019.5 369.5 L 1035.5 369.5 L 1035.5 385.5 L 1019.5 385.5 Z M 974.5 369.5 L 990.5 369.5 L 990.5 385.5 L 974.5 385.5 Z M 928.5 369.5 L 944.5 369.5 L 944.5 385.5 L 928.5 385.5 Z M 883.5 369.5 L 899.5 369.5 L 899.5 385.5 L 883.5 385.5 Z M 838.5 369.5 L 854.5 369.5 L 854.5 385.5 L 838.5 385.5 Z M 793.5 369.5 L 809.5 369.5 L 809.5 385.5 L 793.5 385.5 Z M 748.5 369.5 L 764.5 369.5 L 764.5 385.5 L 748.5 385.5 Z M 703.5 369.5 L 719.5 369.5 L 719.5 385.5 L 703.5 385.5 Z M 658.5 369.5 L 674.5 369.5 L 674.5 385.5 L 658.5 385.5 Z M 613.5 369.5 L 629.5 369.5 L 629.5 385.5 L 613.5 385.5 Z M 568.5 369.5 L 584.5 369.5 L 584.5 385.5 L 568.5 385.5 Z M 523.5 369.5 L 539.5 369.5 L 539.5 385.5 L 523.5 385.5 Z M 477.5 369.5 L 493.5 369.5 L 493.5 385.5 L 477.5 385.5 Z M 432.5 369.5 L 448.5 369.5 L 448.5 385.5 L 432.5 385.5 Z M 387.5 369.5 L 403.5 369.5 L 403.5 385.5 L 387.5 385.5 Z M 342.5 369.5 L 358.5 369.5 L 358.5 385.5 L 342.5 385.5 Z M 297.5 369.5 L 313.5 369.5 L 313.5 385.5 L 297.5 385.5 Z M 252.5 369.5 L 268.5 369.5 L 268.5 385.5 L 252.5 385.5 Z M 432.5 526.5 L 448.5 526.5 L 448.5 542.5 L 432.5 542.5 Z M 1605.5 526.5 L 1621.5 526.5 L 1621.5 542.5 L 1605.5 542.5 Z M 207.5 682.5 L 223.5 682.5 L 223.5 698.5 L 207.5 698.5 Z M 1695.5 682.5 L 1711.5 682.5 L 1711.5 698.5 L 1695.5 698.5 Z M 1650.5 682.5 L 1666.5 682.5 L 1666.5 698.5 L 1650.5 698.5 Z M 1605.5 682.5 L 1621.5 682.5 L 1621.5 698.5 L 1605.5 698.5 Z M 1560.5 682.5 L 1576.5 682.5 L 1576.5 698.5 L 1560.5 698.5 Z M 1515.5 682.5 L 1531.5 682.5 L 1531.5 698.5 L 1515.5 698.5 Z M 1470.5 682.5 L 1486.5 682.5 L 1486.5 698.5 L 1470.5 698.5 Z M 1425.5 682.5 L 1441.5 682.5 L 1441.5 698.5 L 1425.5 698.5 Z M 1379.5 682.5 L 1395.5 682.5 L 1395.5 698.5 L 1379.5 698.5 Z M 1334.5 682.5 L 1350.5 682.5 L 1350.5 698.5 L 1334.5 698.5 Z M 1289.5 682.5 L 1305.5 682.5 L 1305.5 698.5 L 1289.5 698.5 Z M 1244.5 682.5 L 1260.5 682.5 L 1260.5 698.5 L 1244.5 698.5 Z M 1199.5 682.5 L 1215.5 682.5 L 1215.5 698.5 L 1199.5 698.5 Z M 1154.5 682.5 L 1170.5 682.5 L 1170.5 698.5 L 1154.5 698.5 Z M 1109.5 682.5 L 1125.5 682.5 L 1125.5 698.5 L 1109.5 698.5 Z M 1064.5 682.5 L 1080.5 682.5 L 1080.5 698.5 L 1064.5 698.5 Z M 1019.5 682.5 L 1035.5 682.5 L 1035.5 698.5 L 1019.5 698.5 Z M 974.5 682.5 L 990.5 682.5 L 990.5 698.5 L 974.5 698.5 Z M 928.5 682.5 L 944.5 682.5 L 944.5 698.5 L 928.5 698.5 Z M 883.5 682.5 L 899.5 682.5 L 899.5 698.5 L 883.5 698.5 Z M 838.5 682.5 L 854.5 682.5 L 854.5 698.5 L 838.5 698.5 Z M 793.5 682.5 L 809.5 682.5 L 809.5 698.5 L 793.5 698.5 Z M 748.5 682.5 L 764.5 682.5 L 764.5 698.5 L 748.5 698.5 Z M 703.5 682.5 L 719.5 682.5 L 719.5 698.5 L 703.5 698.5 Z M 658.5 682.5 L 674.5 682.5 L 674.5 698.5 L 658.5 698.5 Z M 613.5 682.5 L 629.5 682.5 L 629.5 698.5 L 613.5 698.5 Z M 568.5 682.5 L 584.5 682.5 L 584.5 698.5 L 568.5 698.5 Z M 523.5 682.5 L 539.5 682.5 L 539.5 698.5 L 523.5 698.5 Z M 477.5 682.5 L 493.5 682.5 L 493.5 698.5 L 477.5 698.5 Z M 432.5 682.5 L 448.5 682.5 L 448.5 698.5 L 432.5 698.5 Z M 387.5 682.5 L 403.5 682.5 L 403.5 698.5 L 387.5 698.5 Z M 342.5 682.5 L 358.5 682.5 L 358.5 698.5 L 342.5 698.5 Z M 297.5 682.5 L 313.5 682.5 L 313.5 698.5 L 297.5 698.5 Z M 252.5 682.5 L 268.5 682.5 L 268.5 698.5 L 252.5 698.5 Z M 252.5 682.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <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="surface353">
+<g id="surface381">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -185,6 +185,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 1713.03125 543.953125 L 1711.78125 545.5 L 1708.984375 543.179688 L 1708.183594 543.609375 L 1707.382812 543.929688 L 1706.558594 544.195312 L 1705.679688 544.378906 L 1704.796875 544.488281 L 1703.894531 544.539062 L 1702.667969 544.460938 L 1701.519531 544.273438 L 1700.457031 543.953125 L 1699.441406 543.527344 L 1698.484375 542.96875 L 1697.628906 542.25 L 1696.859375 541.476562 L 1696.191406 540.597656 L 1695.660156 539.636719 L 1695.207031 538.597656 L 1694.859375 537.480469 L 1694.644531 536.253906 L 1694.59375 535.960938 L 1694.566406 535.640625 L 1694.539062 535.347656 L 1694.511719 535.027344 L 1694.511719 534.359375 L 1694.566406 533.027344 L 1694.753906 531.75 L 1695.046875 530.578125 L 1695.472656 529.457031 L 1696.003906 528.417969 L 1696.699219 527.460938 L 1697.390625 526.6875 L 1698.191406 525.992188 L 1699.070312 525.40625 L 1700.003906 524.953125 L 1701.015625 524.582031 L 1702.132812 524.316406 L 1702.402344 524.289062 L 1703.28125 524.207031 L 1703.574219 524.207031 L 1703.894531 524.179688 L 1705.09375 524.261719 L 1706.238281 524.449219 L 1707.304688 524.769531 L 1708.316406 525.195312 L 1709.277344 525.753906 L 1710.15625 526.445312 L 1710.902344 527.246094 L 1711.566406 528.097656 L 1712.101562 529.03125 L 1712.554688 530.070312 L 1712.898438 531.191406 L 1713.140625 532.363281 L 1713.167969 532.707031 L 1713.191406 533.027344 L 1713.246094 533.667969 L 1713.246094 533.988281 L 1713.273438 534.308594 L 1713.191406 535.800781 L 1712.953125 537.210938 L 1712.578125 538.519531 L 1712.046875 539.742188 L 1711.355469 540.863281 L 1710.527344 541.902344 Z M 1706.316406 538.464844 L 1708.6875 540.410156 L 1709.328125 539.609375 L 1709.863281 538.703125 L 1710.261719 537.71875 L 1710.554688 536.679688 L 1710.714844 535.558594 L 1710.792969 534.335938 L 1710.742188 533.214844 L 1710.582031 532.148438 L 1710.316406 531.164062 L 1709.96875 530.257812 L 1709.515625 529.40625 L 1708.957031 528.632812 L 1708.316406 527.992188 L 1707.648438 527.460938 L 1706.902344 527.03125 L 1706.105469 526.714844 L 1705.226562 526.5 L 1704.320312 526.367188 L 1703.894531 526.367188 L 1702.933594 526.445312 L 1702.027344 526.605469 L 1701.175781 526.875 L 1700.402344 527.273438 L 1699.683594 527.777344 L 1699.042969 528.390625 L 1698.429688 529.113281 L 1697.949219 529.910156 L 1697.550781 530.789062 L 1697.257812 531.75 L 1697.070312 532.789062 L 1696.992188 533.90625 L 1696.992188 534.359375 L 1697.015625 535.535156 L 1697.175781 536.597656 L 1697.445312 537.585938 L 1697.789062 538.519531 L 1698.269531 539.371094 L 1698.855469 540.117188 L 1699.46875 540.785156 L 1700.160156 541.316406 L 1700.90625 541.742188 L 1701.707031 542.035156 L 1702.585938 542.25 L 1703.519531 542.328125 L 1703.574219 542.355469 L 1704.347656 542.355469 L 1704.851562 542.300781 L 1705.359375 542.195312 L 1705.839844 542.089844 L 1706.316406 541.929688 L 1706.824219 541.714844 L 1706.851562 541.714844 L 1706.902344 541.6875 L 1706.929688 541.664062 L 1706.984375 541.664062 L 1707.011719 541.636719 L 1707.0625 541.609375 L 1705.09375 539.957031 Z M 1706.316406 538.464844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1695 553 L 1711 553 M 1695 537 L 1711 537 M 1695 537 L 1695 553 M 1711 537 L 1711 553 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1695 553 L 1711 553 M 1695 537 L 1711 537 M 1711 553 L 1711 537 M 1695 553 L 1695 537 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 192 384 L 192 393 M 187 389 L 196 389 M 191 390 L 193 390 M 191 388 L 193 388 M 191 388 L 191 390 M 193 388 L 193 390 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.svg b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.svg
index 42cddad..5c83235 100644
--- a/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.svg
+++ b/cells/sedfxtp/sky130_fd_sc_hs__sedfxtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 364.5 L 1743.5 364.5 L 1743.5 534.5 L 174.5 534.5 Z M 750.5 534.5 L 847.5 534.5 L 847.5 537.5 L 750.5 537.5 Z M 750.5 534.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <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 191.5 664.5 L 1726.5 664.5 L 1726.5 686.5 L 191.5 686.5 Z M 191.5 664.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#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 687.5 590.5 L 701.5 590.5 L 701.5 629.5 L 687.5 629.5 Z M 655.5 590.5 L 668.5 590.5 L 668.5 629.5 L 655.5 629.5 Z M 615.5 590.5 L 629.5 590.5 L 629.5 629.5 L 615.5 629.5 Z M 1589.5 565.5 L 1603.5 565.5 L 1603.5 633.5 L 1589.5 633.5 Z M 1675.5 565.5 L 1689.5 565.5 L 1689.5 633.5 L 1675.5 633.5 Z M 1635.5 565.5 L 1648.5 565.5 L 1648.5 633.5 L 1635.5 633.5 Z M 1550.5 565.5 L 1563.5 565.5 L 1563.5 633.5 L 1550.5 633.5 Z M 440.5 596.5 L 454.5 596.5 L 454.5 634.5 L 440.5 634.5 Z M 480.5 596.5 L 493.5 596.5 L 493.5 634.5 L 480.5 634.5 Z M 405.5 596.5 L 418.5 596.5 L 418.5 634.5 L 405.5 634.5 Z M 365.5 596.5 L 379.5 596.5 L 379.5 634.5 L 365.5 634.5 Z M 980.5 603.5 L 993.5 603.5 L 993.5 642.5 L 980.5 642.5 Z M 1026.5 611.5 L 1040.5 611.5 L 1040.5 650.5 L 1026.5 650.5 Z M 1141.5 591.5 L 1155.5 591.5 L 1155.5 650.5 L 1141.5 650.5 Z M 1079.5 611.5 L 1093.5 611.5 L 1093.5 650.5 L 1079.5 650.5 Z M 867.5 585.5 L 881.5 585.5 L 881.5 652.5 L 867.5 652.5 Z M 275.5 614.5 L 289.5 614.5 L 289.5 652.5 L 275.5 652.5 Z M 1354.5 614.5 L 1368.5 614.5 L 1368.5 652.5 L 1354.5 652.5 Z M 1319.5 614.5 L 1332.5 614.5 L 1332.5 652.5 L 1319.5 652.5 Z M 239.5 614.5 L 253.5 614.5 L 253.5 652.5 L 239.5 652.5 Z M 777.5 585.5 L 791.5 585.5 L 791.5 652.5 L 777.5 652.5 Z M 1459.5 614.5 L 1473.5 614.5 L 1473.5 652.5 L 1459.5 652.5 Z M 1275.5 594.5 L 1289.5 594.5 L 1289.5 652.5 L 1275.5 652.5 Z M 1242.5 594.5 L 1256.5 594.5 L 1256.5 652.5 L 1242.5 652.5 Z M 1242.5 594.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <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 1397.5 416.5 L 1411.5 416.5 L 1411.5 454.5 L 1397.5 454.5 Z M 1089.5 416.5 L 1103.5 416.5 L 1103.5 454.5 L 1089.5 454.5 Z M 1045.5 416.5 L 1059.5 416.5 L 1059.5 454.5 L 1045.5 454.5 Z M 1359.5 416.5 L 1373.5 416.5 L 1373.5 454.5 L 1359.5 454.5 Z M 1004.5 416.5 L 1018.5 416.5 L 1018.5 454.5 L 1004.5 454.5 Z M 439.5 416.5 L 453.5 416.5 L 453.5 474.5 L 439.5 474.5 Z M 377.5 416.5 L 391.5 416.5 L 391.5 474.5 L 377.5 474.5 Z M 274.5 416.5 L 287.5 416.5 L 287.5 474.5 L 274.5 474.5 Z M 235.5 416.5 L 249.5 416.5 L 249.5 474.5 L 235.5 474.5 Z M 1462.5 416.5 L 1476.5 416.5 L 1476.5 474.5 L 1462.5 474.5 Z M 516.5 416.5 L 529.5 416.5 L 529.5 474.5 L 516.5 474.5 Z M 475.5 416.5 L 488.5 416.5 L 488.5 474.5 L 475.5 474.5 Z M 605.5 420.5 L 618.5 420.5 L 618.5 478.5 L 605.5 478.5 Z M 703.5 420.5 L 716.5 420.5 L 716.5 478.5 L 703.5 478.5 Z M 667.5 420.5 L 681.5 420.5 L 681.5 478.5 L 667.5 478.5 Z M 1136.5 427.5 L 1150.5 427.5 L 1150.5 504.5 L 1136.5 504.5 Z M 1225.5 416.5 L 1238.5 416.5 L 1238.5 507.5 L 1225.5 507.5 Z M 1312.5 416.5 L 1326.5 416.5 L 1326.5 507.5 L 1312.5 507.5 Z M 1633.5 416.5 L 1647.5 416.5 L 1647.5 518.5 L 1633.5 518.5 Z M 1674.5 416.5 L 1688.5 416.5 L 1688.5 518.5 L 1674.5 518.5 Z M 1592.5 416.5 L 1605.5 416.5 L 1605.5 518.5 L 1592.5 518.5 Z M 915.5 416.5 L 929.5 416.5 L 929.5 518.5 L 915.5 518.5 Z M 1551.5 416.5 L 1564.5 416.5 L 1564.5 518.5 L 1551.5 518.5 Z M 792.5 419.5 L 806.5 419.5 L 806.5 521.5 L 792.5 521.5 Z M 792.5 419.5 "/>
 </clipPath>
-<image id="image361" 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="#image361"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 206.5 374.5 L 221.5 374.5 L 221.5 390.5 L 206.5 390.5 Z M 1696.5 374.5 L 1712.5 374.5 L 1712.5 390.5 L 1696.5 390.5 Z M 1652.5 374.5 L 1668.5 374.5 L 1668.5 390.5 L 1652.5 390.5 Z M 1609.5 374.5 L 1624.5 374.5 L 1624.5 390.5 L 1609.5 390.5 Z M 1565.5 374.5 L 1580.5 374.5 L 1580.5 390.5 L 1565.5 390.5 Z M 1521.5 374.5 L 1536.5 374.5 L 1536.5 390.5 L 1521.5 390.5 Z M 1477.5 374.5 L 1493.5 374.5 L 1493.5 390.5 L 1477.5 390.5 Z M 1433.5 374.5 L 1449.5 374.5 L 1449.5 390.5 L 1433.5 390.5 Z M 1389.5 374.5 L 1405.5 374.5 L 1405.5 390.5 L 1389.5 390.5 Z M 1346.5 374.5 L 1361.5 374.5 L 1361.5 390.5 L 1346.5 390.5 Z M 1302.5 374.5 L 1317.5 374.5 L 1317.5 390.5 L 1302.5 390.5 Z M 1258.5 374.5 L 1273.5 374.5 L 1273.5 390.5 L 1258.5 390.5 Z M 1214.5 374.5 L 1230.5 374.5 L 1230.5 390.5 L 1214.5 390.5 Z M 1170.5 374.5 L 1186.5 374.5 L 1186.5 390.5 L 1170.5 390.5 Z M 1126.5 374.5 L 1142.5 374.5 L 1142.5 390.5 L 1126.5 390.5 Z M 1083.5 374.5 L 1098.5 374.5 L 1098.5 390.5 L 1083.5 390.5 Z M 1039.5 374.5 L 1054.5 374.5 L 1054.5 390.5 L 1039.5 390.5 Z M 995.5 374.5 L 1010.5 374.5 L 1010.5 390.5 L 995.5 390.5 Z M 951.5 374.5 L 967.5 374.5 L 967.5 390.5 L 951.5 390.5 Z M 907.5 374.5 L 923.5 374.5 L 923.5 390.5 L 907.5 390.5 Z M 863.5 374.5 L 879.5 374.5 L 879.5 390.5 L 863.5 390.5 Z M 819.5 374.5 L 835.5 374.5 L 835.5 390.5 L 819.5 390.5 Z M 776.5 374.5 L 791.5 374.5 L 791.5 390.5 L 776.5 390.5 Z M 732.5 374.5 L 747.5 374.5 L 747.5 390.5 L 732.5 390.5 Z M 688.5 374.5 L 703.5 374.5 L 703.5 390.5 L 688.5 390.5 Z M 644.5 374.5 L 660.5 374.5 L 660.5 390.5 L 644.5 390.5 Z M 600.5 374.5 L 616.5 374.5 L 616.5 390.5 L 600.5 390.5 Z M 556.5 374.5 L 572.5 374.5 L 572.5 390.5 L 556.5 390.5 Z M 513.5 374.5 L 528.5 374.5 L 528.5 390.5 L 513.5 390.5 Z M 469.5 374.5 L 484.5 374.5 L 484.5 390.5 L 469.5 390.5 Z M 425.5 374.5 L 440.5 374.5 L 440.5 390.5 L 425.5 390.5 Z M 381.5 374.5 L 397.5 374.5 L 397.5 390.5 L 381.5 390.5 Z M 337.5 374.5 L 353.5 374.5 L 353.5 390.5 L 337.5 390.5 Z M 293.5 374.5 L 309.5 374.5 L 309.5 390.5 L 293.5 390.5 Z M 249.5 374.5 L 265.5 374.5 L 265.5 390.5 L 249.5 390.5 Z M 425.5 526.5 L 440.5 526.5 L 440.5 542.5 L 425.5 542.5 Z M 1521.5 526.5 L 1536.5 526.5 L 1536.5 542.5 L 1521.5 542.5 Z M 206.5 678.5 L 221.5 678.5 L 221.5 694.5 L 206.5 694.5 Z M 1696.5 678.5 L 1712.5 678.5 L 1712.5 694.5 L 1696.5 694.5 Z M 1652.5 678.5 L 1668.5 678.5 L 1668.5 694.5 L 1652.5 694.5 Z M 1609.5 678.5 L 1624.5 678.5 L 1624.5 694.5 L 1609.5 694.5 Z M 1565.5 678.5 L 1580.5 678.5 L 1580.5 694.5 L 1565.5 694.5 Z M 1521.5 678.5 L 1536.5 678.5 L 1536.5 694.5 L 1521.5 694.5 Z M 1477.5 678.5 L 1493.5 678.5 L 1493.5 694.5 L 1477.5 694.5 Z M 1433.5 678.5 L 1449.5 678.5 L 1449.5 694.5 L 1433.5 694.5 Z M 1389.5 678.5 L 1405.5 678.5 L 1405.5 694.5 L 1389.5 694.5 Z M 1346.5 678.5 L 1361.5 678.5 L 1361.5 694.5 L 1346.5 694.5 Z M 1302.5 678.5 L 1317.5 678.5 L 1317.5 694.5 L 1302.5 694.5 Z M 1258.5 678.5 L 1273.5 678.5 L 1273.5 694.5 L 1258.5 694.5 Z M 1214.5 678.5 L 1230.5 678.5 L 1230.5 694.5 L 1214.5 694.5 Z M 1170.5 678.5 L 1186.5 678.5 L 1186.5 694.5 L 1170.5 694.5 Z M 1126.5 678.5 L 1142.5 678.5 L 1142.5 694.5 L 1126.5 694.5 Z M 1083.5 678.5 L 1098.5 678.5 L 1098.5 694.5 L 1083.5 694.5 Z M 1039.5 678.5 L 1054.5 678.5 L 1054.5 694.5 L 1039.5 694.5 Z M 995.5 678.5 L 1010.5 678.5 L 1010.5 694.5 L 995.5 694.5 Z M 951.5 678.5 L 967.5 678.5 L 967.5 694.5 L 951.5 694.5 Z M 907.5 678.5 L 923.5 678.5 L 923.5 694.5 L 907.5 694.5 Z M 863.5 678.5 L 879.5 678.5 L 879.5 694.5 L 863.5 694.5 Z M 819.5 678.5 L 835.5 678.5 L 835.5 694.5 L 819.5 694.5 Z M 776.5 678.5 L 791.5 678.5 L 791.5 694.5 L 776.5 694.5 Z M 732.5 678.5 L 747.5 678.5 L 747.5 694.5 L 732.5 694.5 Z M 688.5 678.5 L 703.5 678.5 L 703.5 694.5 L 688.5 694.5 Z M 644.5 678.5 L 660.5 678.5 L 660.5 694.5 L 644.5 694.5 Z M 600.5 678.5 L 616.5 678.5 L 616.5 694.5 L 600.5 694.5 Z M 556.5 678.5 L 572.5 678.5 L 572.5 694.5 L 556.5 694.5 Z M 513.5 678.5 L 528.5 678.5 L 528.5 694.5 L 513.5 694.5 Z M 469.5 678.5 L 484.5 678.5 L 484.5 694.5 L 469.5 694.5 Z M 425.5 678.5 L 440.5 678.5 L 440.5 694.5 L 425.5 694.5 Z M 381.5 678.5 L 397.5 678.5 L 397.5 694.5 L 381.5 694.5 Z M 337.5 678.5 L 353.5 678.5 L 353.5 694.5 L 337.5 694.5 Z M 293.5 678.5 L 309.5 678.5 L 309.5 694.5 L 293.5 694.5 Z M 249.5 678.5 L 265.5 678.5 L 265.5 694.5 L 249.5 694.5 Z M 249.5 678.5 "/>
 </clipPath>
-<image id="image362" 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="#image362"/>
+  <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="surface356">
+<g id="surface384">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1714.03125 509.953125 L 1712.78125 511.5 L 1709.984375 509.179688 L 1709.183594 509.609375 L 1708.382812 509.929688 L 1707.558594 510.195312 L 1706.679688 510.378906 L 1705.796875 510.488281 L 1704.894531 510.539062 L 1703.667969 510.460938 L 1702.519531 510.273438 L 1701.457031 509.953125 L 1700.441406 509.527344 L 1699.484375 508.96875 L 1698.628906 508.25 L 1697.859375 507.476562 L 1697.191406 506.597656 L 1696.660156 505.636719 L 1696.207031 504.597656 L 1695.859375 503.480469 L 1695.644531 502.253906 L 1695.59375 501.960938 L 1695.566406 501.640625 L 1695.539062 501.347656 L 1695.511719 501.027344 L 1695.511719 500.359375 L 1695.566406 499.027344 L 1695.753906 497.75 L 1696.046875 496.578125 L 1696.472656 495.457031 L 1697.003906 494.417969 L 1697.699219 493.460938 L 1698.390625 492.6875 L 1699.191406 491.992188 L 1700.070312 491.40625 L 1701.003906 490.953125 L 1702.015625 490.582031 L 1703.132812 490.316406 L 1703.402344 490.289062 L 1704.28125 490.207031 L 1704.574219 490.207031 L 1704.894531 490.179688 L 1706.09375 490.261719 L 1707.238281 490.449219 L 1708.304688 490.769531 L 1709.316406 491.195312 L 1710.277344 491.753906 L 1711.15625 492.445312 L 1711.902344 493.246094 L 1712.566406 494.097656 L 1713.101562 495.03125 L 1713.554688 496.070312 L 1713.898438 497.191406 L 1714.140625 498.363281 L 1714.167969 498.707031 L 1714.191406 499.027344 L 1714.246094 499.667969 L 1714.246094 499.988281 L 1714.273438 500.308594 L 1714.191406 501.800781 L 1713.953125 503.210938 L 1713.578125 504.519531 L 1713.046875 505.742188 L 1712.355469 506.863281 L 1711.527344 507.902344 Z M 1707.316406 504.464844 L 1709.6875 506.410156 L 1710.328125 505.609375 L 1710.863281 504.703125 L 1711.261719 503.71875 L 1711.554688 502.679688 L 1711.714844 501.558594 L 1711.792969 500.335938 L 1711.742188 499.214844 L 1711.582031 498.148438 L 1711.316406 497.164062 L 1710.96875 496.257812 L 1710.515625 495.40625 L 1709.957031 494.632812 L 1709.316406 493.992188 L 1708.648438 493.460938 L 1707.902344 493.03125 L 1707.105469 492.714844 L 1706.226562 492.5 L 1705.320312 492.367188 L 1704.894531 492.367188 L 1703.933594 492.445312 L 1703.027344 492.605469 L 1702.175781 492.875 L 1701.402344 493.273438 L 1700.683594 493.777344 L 1700.042969 494.390625 L 1699.429688 495.113281 L 1698.949219 495.910156 L 1698.550781 496.789062 L 1698.257812 497.75 L 1698.070312 498.789062 L 1697.992188 499.90625 L 1697.992188 500.359375 L 1698.015625 501.535156 L 1698.175781 502.597656 L 1698.445312 503.585938 L 1698.789062 504.519531 L 1699.269531 505.371094 L 1699.855469 506.117188 L 1700.46875 506.785156 L 1701.160156 507.316406 L 1701.90625 507.742188 L 1702.707031 508.035156 L 1703.585938 508.25 L 1704.519531 508.328125 L 1704.574219 508.355469 L 1705.347656 508.355469 L 1705.851562 508.300781 L 1706.359375 508.195312 L 1706.839844 508.089844 L 1707.316406 507.929688 L 1707.824219 507.714844 L 1707.851562 507.714844 L 1707.902344 507.6875 L 1707.929688 507.664062 L 1707.984375 507.664062 L 1708.011719 507.636719 L 1708.0625 507.609375 L 1706.09375 505.957031 Z M 1707.316406 504.464844 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1696 587 L 1712 587 M 1696 571 L 1712 571 M 1696 571 L 1696 587 M 1712 571 L 1712 587 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1696 587 L 1712 587 M 1696 571 L 1712 571 M 1712 587 L 1712 571 M 1696 587 L 1696 571 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 191 388 L 191 397 M 186 393 L 195 393 M 190 394 L 192 394 M 190 392 L 192 392 M 190 392 L 190 394 M 192 392 L 192 394 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tap/sky130_fd_sc_hs__tap_1.svg b/cells/tap/sky130_fd_sc_hs__tap_1.svg
index 0aa2ccc..fd1566a 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_1.svg
+++ b/cells/tap/sky130_fd_sc_hs__tap_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 867.5 111.5 L 1064.5 111.5 L 1064.5 538.5 L 867.5 538.5 Z M 867.5 111.5 "/>
 </clipPath>
-<image id="image308" 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="#image308"/>
+  <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 910.5 862.5 L 1020.5 862.5 L 1020.5 918.5 L 910.5 918.5 Z M 910.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" 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="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -26,9 +26,9 @@
 <clipPath id="clip4">
   <path d="M 946.5 228.5 L 985.5 228.5 L 985.5 256.5 L 946.5 256.5 Z M 946.5 256.5 L 985.5 256.5 L 985.5 295.5 L 946.5 295.5 Z M 946.5 295.5 L 985.5 295.5 L 985.5 354.5 L 946.5 354.5 Z M 946.5 354.5 L 985.5 354.5 L 985.5 393.5 L 946.5 393.5 Z M 946.5 393.5 L 985.5 393.5 L 985.5 421.5 L 946.5 421.5 Z M 946.5 393.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 946.5 656.5 L 985.5 656.5 L 985.5 683.5 L 946.5 683.5 Z M 946.5 683.5 L 985.5 683.5 L 985.5 722.5 L 946.5 722.5 Z M 946.5 722.5 L 985.5 722.5 L 985.5 778.5 L 946.5 778.5 Z M 946.5 778.5 L 985.5 778.5 L 985.5 817.5 L 946.5 817.5 Z M 946.5 817.5 L 985.5 817.5 L 985.5 845.5 L 946.5 845.5 Z M 946.5 817.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -51,15 +51,15 @@
 <clipPath id="clip8">
   <path d="M 946.5 136.5 L 985.5 136.5 L 985.5 174.5 L 946.5 174.5 Z M 946.5 899.5 L 985.5 899.5 L 985.5 938.5 L 946.5 938.5 Z M 946.5 899.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface305">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -142,6 +142,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 999.976562 904.597656 L 999.976562 875.96875 L 1011.011719 875.96875 L 1012.738281 876.085938 L 1014.351562 876.402344 L 1015.84375 876.949219 L 1017.214844 877.65625 L 1018.433594 878.640625 L 1019.574219 879.777344 L 1020.515625 881.152344 L 1021.300781 882.644531 L 1021.890625 884.332031 L 1022.320312 886.140625 L 1022.558594 888.140625 L 1022.675781 890.261719 L 1022.558594 892.5 L 1022.28125 894.582031 L 1021.8125 896.46875 L 1021.183594 898.195312 L 1020.359375 899.726562 L 1019.335938 901.0625 L 1018.238281 902.160156 L 1017.019531 903.027344 L 1015.683594 903.734375 L 1014.230469 904.203125 L 1012.660156 904.519531 L 1011.011719 904.597656 Z M 1003.628906 901.375 L 1010.382812 901.375 L 1012.191406 901.257812 L 1013.800781 900.828125 L 1015.214844 900.082031 L 1016.390625 899.097656 L 1017.335938 897.765625 L 1018.121094 896.152344 L 1018.355469 895.328125 L 1018.589844 894.464844 L 1018.789062 893.523438 L 1018.90625 892.5 L 1018.984375 891.441406 L 1019.023438 890.300781 L 1018.867188 887.75 L 1018.472656 885.511719 L 1017.765625 883.585938 L 1016.824219 882.054688 L 1015.605469 880.796875 L 1014.113281 879.894531 L 1013.566406 879.699219 L 1012.976562 879.503906 L 1012.347656 879.386719 L 1011.71875 879.265625 L 1010.382812 879.1875 L 1003.628906 879.1875 Z M 1003.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 910 217 L 1020 217 M 910 161 L 1020 161 M 910 161 L 910 217 M 1020 161 L 1020 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 910 217 L 1020 217 M 910 161 L 1020 161 M 1020 217 L 1020 161 M 910 217 L 910 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 910 156 L 910 165 M 905 161 L 914 161 M 909 162 L 911 162 M 909 160 L 911 160 M 909 160 L 909 162 M 911 160 L 911 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tap/sky130_fd_sc_hs__tap_2.svg b/cells/tap/sky130_fd_sc_hs__tap_2.svg
index 5c002be..397d3e4 100644
--- a/cells/tap/sky130_fd_sc_hs__tap_2.svg
+++ b/cells/tap/sky130_fd_sc_hs__tap_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 538.5 L 812.5 538.5 Z M 812.5 111.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 855.5 862.5 L 1075.5 862.5 L 1075.5 918.5 L 855.5 918.5 Z M 855.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image363"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -26,9 +26,9 @@
 <clipPath id="clip4">
   <path d="M 891.5 228.5 L 1040.5 228.5 L 1040.5 256.5 L 891.5 256.5 Z M 891.5 256.5 L 1040.5 256.5 L 1040.5 295.5 L 891.5 295.5 Z M 891.5 295.5 L 1040.5 295.5 L 1040.5 354.5 L 891.5 354.5 Z M 891.5 354.5 L 1040.5 354.5 L 1040.5 393.5 L 891.5 393.5 Z M 891.5 393.5 L 1040.5 393.5 L 1040.5 421.5 L 891.5 421.5 Z M 891.5 393.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image416" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image364"/>
+  <use xlink:href="#image416"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 891.5 656.5 L 1040.5 656.5 L 1040.5 683.5 L 891.5 683.5 Z M 891.5 683.5 L 1040.5 683.5 L 1040.5 722.5 L 891.5 722.5 Z M 891.5 722.5 L 1040.5 722.5 L 1040.5 778.5 L 891.5 778.5 Z M 891.5 778.5 L 1040.5 778.5 L 1040.5 817.5 L 891.5 817.5 Z M 891.5 817.5 L 1040.5 817.5 L 1040.5 845.5 L 891.5 845.5 Z M 891.5 817.5 "/>
 </clipPath>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image364"/>
+  <use xlink:href="#image416"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -51,15 +51,15 @@
 <clipPath id="clip8">
   <path d="M 891.5 136.5 L 930.5 136.5 L 930.5 174.5 L 891.5 174.5 Z M 1001.5 136.5 L 1040.5 136.5 L 1040.5 174.5 L 1001.5 174.5 Z M 891.5 899.5 L 930.5 899.5 L 930.5 938.5 L 891.5 938.5 Z M 1001.5 899.5 L 1040.5 899.5 L 1040.5 938.5 L 1001.5 938.5 Z M 1001.5 899.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image417"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface360">
+<g id="surface412">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,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 999.976562 904.597656 L 999.976562 875.96875 L 1011.011719 875.96875 L 1012.738281 876.085938 L 1014.351562 876.402344 L 1015.84375 876.949219 L 1017.214844 877.65625 L 1018.433594 878.640625 L 1019.574219 879.777344 L 1020.515625 881.152344 L 1021.300781 882.644531 L 1021.890625 884.332031 L 1022.320312 886.140625 L 1022.558594 888.140625 L 1022.675781 890.261719 L 1022.558594 892.5 L 1022.28125 894.582031 L 1021.8125 896.46875 L 1021.183594 898.195312 L 1020.359375 899.726562 L 1019.335938 901.0625 L 1018.238281 902.160156 L 1017.019531 903.027344 L 1015.683594 903.734375 L 1014.230469 904.203125 L 1012.660156 904.519531 L 1011.011719 904.597656 Z M 1003.628906 901.375 L 1010.382812 901.375 L 1012.191406 901.257812 L 1013.800781 900.828125 L 1015.214844 900.082031 L 1016.390625 899.097656 L 1017.335938 897.765625 L 1018.121094 896.152344 L 1018.355469 895.328125 L 1018.589844 894.464844 L 1018.789062 893.523438 L 1018.90625 892.5 L 1018.984375 891.441406 L 1019.023438 890.300781 L 1018.867188 887.75 L 1018.472656 885.511719 L 1017.765625 883.585938 L 1016.824219 882.054688 L 1015.605469 880.796875 L 1014.113281 879.894531 L 1013.566406 879.699219 L 1012.976562 879.503906 L 1012.347656 879.386719 L 1011.71875 879.265625 L 1010.382812 879.1875 L 1003.628906 879.1875 Z M 1003.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 855 217 L 1075 217 M 855 161 L 1075 161 M 855 161 L 855 217 M 1075 161 L 1075 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 217 L 1075 217 M 855 161 L 1075 161 M 1075 217 L 1075 161 M 855 217 L 855 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 156 L 855 165 M 850 161 L 859 161 M 854 162 L 856 162 M 854 160 L 856 160 M 854 160 L 854 162 M 856 160 L 856 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.svg b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.svg
index fab2efb..dee474b 100644
--- a/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.svg
+++ b/cells/tapmet1/sky130_fd_sc_hs__tapmet1_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 538.5 L 812.5 538.5 Z M 812.5 111.5 "/>
 </clipPath>
-<image id="image275" 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="#image275"/>
+  <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 855.5 862.5 L 1075.5 862.5 L 1075.5 918.5 L 855.5 918.5 Z M 855.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -26,9 +26,9 @@
 <clipPath id="clip4">
   <path d="M 891.5 228.5 L 1040.5 228.5 L 1040.5 256.5 L 891.5 256.5 Z M 891.5 256.5 L 1040.5 256.5 L 1040.5 295.5 L 891.5 295.5 Z M 891.5 295.5 L 1040.5 295.5 L 1040.5 354.5 L 891.5 354.5 Z M 891.5 354.5 L 1040.5 354.5 L 1040.5 393.5 L 891.5 393.5 Z M 891.5 393.5 L 1040.5 393.5 L 1040.5 421.5 L 891.5 421.5 Z M 891.5 393.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 891.5 656.5 L 1040.5 656.5 L 1040.5 683.5 L 891.5 683.5 Z M 891.5 683.5 L 1040.5 683.5 L 1040.5 722.5 L 891.5 722.5 Z M 891.5 722.5 L 1040.5 722.5 L 1040.5 778.5 L 891.5 778.5 Z M 891.5 778.5 L 1040.5 778.5 L 1040.5 817.5 L 891.5 817.5 Z M 891.5 817.5 L 1040.5 817.5 L 1040.5 845.5 L 891.5 845.5 Z M 891.5 817.5 "/>
 </clipPath>
 <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="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -51,15 +51,15 @@
 <clipPath id="clip8">
   <path d="M 891.5 136.5 L 930.5 136.5 L 930.5 174.5 L 891.5 174.5 Z M 1001.5 136.5 L 1040.5 136.5 L 1040.5 174.5 L 1001.5 174.5 Z M 1001.5 263.5 L 1040.5 263.5 L 1040.5 295.5 L 1001.5 295.5 Z M 1001.5 295.5 L 1040.5 295.5 L 1040.5 302.5 L 1001.5 302.5 Z M 891.5 772.5 L 930.5 772.5 L 930.5 778.5 L 891.5 778.5 Z M 891.5 778.5 L 930.5 778.5 L 930.5 810.5 L 891.5 810.5 Z M 891.5 899.5 L 930.5 899.5 L 930.5 938.5 L 891.5 938.5 Z M 1001.5 899.5 L 1040.5 899.5 L 1040.5 938.5 L 1001.5 938.5 Z M 1001.5 899.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface272">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -122,6 +122,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 999.976562 904.597656 L 999.976562 875.96875 L 1011.011719 875.96875 L 1012.738281 876.085938 L 1014.351562 876.402344 L 1015.84375 876.949219 L 1017.214844 877.65625 L 1018.433594 878.640625 L 1019.574219 879.777344 L 1020.515625 881.152344 L 1021.300781 882.644531 L 1021.890625 884.332031 L 1022.320312 886.140625 L 1022.558594 888.140625 L 1022.675781 890.261719 L 1022.558594 892.5 L 1022.28125 894.582031 L 1021.8125 896.46875 L 1021.183594 898.195312 L 1020.359375 899.726562 L 1019.335938 901.0625 L 1018.238281 902.160156 L 1017.019531 903.027344 L 1015.683594 903.734375 L 1014.230469 904.203125 L 1012.660156 904.519531 L 1011.011719 904.597656 Z M 1003.628906 901.375 L 1010.382812 901.375 L 1012.191406 901.257812 L 1013.800781 900.828125 L 1015.214844 900.082031 L 1016.390625 899.097656 L 1017.335938 897.765625 L 1018.121094 896.152344 L 1018.355469 895.328125 L 1018.589844 894.464844 L 1018.789062 893.523438 L 1018.90625 892.5 L 1018.984375 891.441406 L 1019.023438 890.300781 L 1018.867188 887.75 L 1018.472656 885.511719 L 1017.765625 883.585938 L 1016.824219 882.054688 L 1015.605469 880.796875 L 1014.113281 879.894531 L 1013.566406 879.699219 L 1012.976562 879.503906 L 1012.347656 879.386719 L 1011.71875 879.265625 L 1010.382812 879.1875 L 1003.628906 879.1875 Z M 1003.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 855 217 L 1075 217 M 855 161 L 1075 161 M 855 161 L 855 217 M 1075 161 L 1075 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 217 L 1075 217 M 855 161 L 1075 161 M 1075 217 L 1075 161 M 855 217 L 855 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 855 156 L 855 165 M 850 161 L 859 161 M 854 162 L 856 162 M 854 160 L 856 160 M 854 160 L 854 162 M 856 160 L 856 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.svg b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.svg
index 5f19fe1..16da47a 100644
--- a/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.svg
+++ b/cells/tapvgnd/sky130_fd_sc_hs__tapvgnd_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 867.5 111.5 L 1064.5 111.5 L 1064.5 538.5 L 867.5 538.5 Z M 867.5 111.5 "/>
 </clipPath>
-<image id="image235" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image264" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image235"/>
+  <use xlink:href="#image264"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,9 +17,9 @@
 <clipPath id="clip3">
   <path d="M 946.5 228.5 L 985.5 228.5 L 985.5 256.5 L 946.5 256.5 Z M 946.5 256.5 L 985.5 256.5 L 985.5 295.5 L 946.5 295.5 Z M 946.5 295.5 L 985.5 295.5 L 985.5 354.5 L 946.5 354.5 Z M 946.5 354.5 L 985.5 354.5 L 985.5 393.5 L 946.5 393.5 Z M 946.5 393.5 L 985.5 393.5 L 985.5 421.5 L 946.5 421.5 Z M 946.5 393.5 "/>
 </clipPath>
-<image id="image236" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image236"/>
+  <use xlink:href="#image265"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -28,7 +28,7 @@
   <path d="M 946.5 656.5 L 985.5 656.5 L 985.5 683.5 L 946.5 683.5 Z M 946.5 683.5 L 985.5 683.5 L 985.5 722.5 L 946.5 722.5 Z M 946.5 722.5 L 985.5 722.5 L 985.5 778.5 L 946.5 778.5 Z M 946.5 778.5 L 985.5 778.5 L 985.5 817.5 L 946.5 817.5 Z M 946.5 817.5 L 985.5 817.5 L 985.5 845.5 L 946.5 845.5 Z M 946.5 817.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image236"/>
+  <use xlink:href="#image265"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -42,15 +42,15 @@
 <clipPath id="clip7">
   <path d="M 946.5 136.5 L 985.5 136.5 L 985.5 174.5 L 946.5 174.5 Z M 946.5 263.5 L 985.5 263.5 L 985.5 295.5 L 946.5 295.5 Z M 946.5 295.5 L 985.5 295.5 L 985.5 302.5 L 946.5 302.5 Z M 946.5 899.5 L 985.5 899.5 L 985.5 938.5 L 946.5 938.5 Z M 946.5 899.5 "/>
 </clipPath>
-<image id="image237" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image237"/>
+  <use xlink:href="#image266"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface232">
+<g id="surface261">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -94,6 +94,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 999.976562 904.597656 L 999.976562 875.96875 L 1011.011719 875.96875 L 1012.738281 876.085938 L 1014.351562 876.402344 L 1015.84375 876.949219 L 1017.214844 877.65625 L 1018.433594 878.640625 L 1019.574219 879.777344 L 1020.515625 881.152344 L 1021.300781 882.644531 L 1021.890625 884.332031 L 1022.320312 886.140625 L 1022.558594 888.140625 L 1022.675781 890.261719 L 1022.558594 892.5 L 1022.28125 894.582031 L 1021.8125 896.46875 L 1021.183594 898.195312 L 1020.359375 899.726562 L 1019.335938 901.0625 L 1018.238281 902.160156 L 1017.019531 903.027344 L 1015.683594 903.734375 L 1014.230469 904.203125 L 1012.660156 904.519531 L 1011.011719 904.597656 Z M 1003.628906 901.375 L 1010.382812 901.375 L 1012.191406 901.257812 L 1013.800781 900.828125 L 1015.214844 900.082031 L 1016.390625 899.097656 L 1017.335938 897.765625 L 1018.121094 896.152344 L 1018.355469 895.328125 L 1018.589844 894.464844 L 1018.789062 893.523438 L 1018.90625 892.5 L 1018.984375 891.441406 L 1019.023438 890.300781 L 1018.867188 887.75 L 1018.472656 885.511719 L 1017.765625 883.585938 L 1016.824219 882.054688 L 1015.605469 880.796875 L 1014.113281 879.894531 L 1013.566406 879.699219 L 1012.976562 879.503906 L 1012.347656 879.386719 L 1011.71875 879.265625 L 1010.382812 879.1875 L 1003.628906 879.1875 Z M 1003.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 910 217 L 1020 217 M 910 161 L 1020 161 M 910 161 L 910 217 M 1020 161 L 1020 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 910 217 L 1020 217 M 910 161 L 1020 161 M 1020 217 L 1020 161 M 910 217 L 910 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 910 156 L 910 165 M 905 161 L 914 161 M 909 162 L 911 162 M 909 160 L 911 160 M 909 160 L 909 162 M 911 160 L 911 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.svg b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.svg
index d10ceb0..9170bee 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.svg
+++ b/cells/tapvgnd2/sky130_fd_sc_hs__tapvgnd2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 867.5 111.5 L 1064.5 111.5 L 1064.5 538.5 L 867.5 538.5 Z M 867.5 111.5 "/>
 </clipPath>
-<image id="image236" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image236"/>
+  <use xlink:href="#image266"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,9 +17,9 @@
 <clipPath id="clip3">
   <path d="M 946.5 228.5 L 985.5 228.5 L 985.5 256.5 L 946.5 256.5 Z M 946.5 256.5 L 985.5 256.5 L 985.5 295.5 L 946.5 295.5 Z M 946.5 295.5 L 985.5 295.5 L 985.5 354.5 L 946.5 354.5 Z M 946.5 354.5 L 985.5 354.5 L 985.5 393.5 L 946.5 393.5 Z M 946.5 393.5 L 985.5 393.5 L 985.5 421.5 L 946.5 421.5 Z M 946.5 393.5 "/>
 </clipPath>
-<image id="image237" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image237"/>
+  <use xlink:href="#image267"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -28,7 +28,7 @@
   <path d="M 946.5 656.5 L 985.5 656.5 L 985.5 683.5 L 946.5 683.5 Z M 946.5 683.5 L 985.5 683.5 L 985.5 722.5 L 946.5 722.5 Z M 946.5 722.5 L 985.5 722.5 L 985.5 778.5 L 946.5 778.5 Z M 946.5 778.5 L 985.5 778.5 L 985.5 817.5 L 946.5 817.5 Z M 946.5 817.5 L 985.5 817.5 L 985.5 845.5 L 946.5 845.5 Z M 946.5 817.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image237"/>
+  <use xlink:href="#image267"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -42,15 +42,15 @@
 <clipPath id="clip7">
   <path d="M 946.5 136.5 L 985.5 136.5 L 985.5 174.5 L 946.5 174.5 Z M 946.5 348.5 L 985.5 348.5 L 985.5 354.5 L 946.5 354.5 Z M 946.5 354.5 L 985.5 354.5 L 985.5 386.5 L 946.5 386.5 Z M 946.5 899.5 L 985.5 899.5 L 985.5 938.5 L 946.5 938.5 Z M 946.5 899.5 "/>
 </clipPath>
-<image id="image238" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image268" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image238"/>
+  <use xlink:href="#image268"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface233">
+<g id="surface263">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -94,6 +94,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 999.976562 904.597656 L 999.976562 875.96875 L 1011.011719 875.96875 L 1012.738281 876.085938 L 1014.351562 876.402344 L 1015.84375 876.949219 L 1017.214844 877.65625 L 1018.433594 878.640625 L 1019.574219 879.777344 L 1020.515625 881.152344 L 1021.300781 882.644531 L 1021.890625 884.332031 L 1022.320312 886.140625 L 1022.558594 888.140625 L 1022.675781 890.261719 L 1022.558594 892.5 L 1022.28125 894.582031 L 1021.8125 896.46875 L 1021.183594 898.195312 L 1020.359375 899.726562 L 1019.335938 901.0625 L 1018.238281 902.160156 L 1017.019531 903.027344 L 1015.683594 903.734375 L 1014.230469 904.203125 L 1012.660156 904.519531 L 1011.011719 904.597656 Z M 1003.628906 901.375 L 1010.382812 901.375 L 1012.191406 901.257812 L 1013.800781 900.828125 L 1015.214844 900.082031 L 1016.390625 899.097656 L 1017.335938 897.765625 L 1018.121094 896.152344 L 1018.355469 895.328125 L 1018.589844 894.464844 L 1018.789062 893.523438 L 1018.90625 892.5 L 1018.984375 891.441406 L 1019.023438 890.300781 L 1018.867188 887.75 L 1018.472656 885.511719 L 1017.765625 883.585938 L 1016.824219 882.054688 L 1015.605469 880.796875 L 1014.113281 879.894531 L 1013.566406 879.699219 L 1012.976562 879.503906 L 1012.347656 879.386719 L 1011.71875 879.265625 L 1010.382812 879.1875 L 1003.628906 879.1875 Z M 1003.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 910 217 L 1020 217 M 910 161 L 1020 161 M 910 161 L 910 217 M 1020 161 L 1020 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 910 217 L 1020 217 M 910 161 L 1020 161 M 1020 217 L 1020 161 M 910 217 L 910 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 910 156 L 910 165 M 905 161 L 914 161 M 909 162 L 911 162 M 909 160 L 911 160 M 909 160 L 909 162 M 911 160 L 911 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.svg b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.svg
index 0065eee..f06f97f 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.svg
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hs__tapvpwrvgnd_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 867.5 111.5 L 1064.5 111.5 L 1064.5 538.5 L 867.5 538.5 Z M 867.5 111.5 "/>
 </clipPath>
-<image id="image228" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image258" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image228"/>
+  <use xlink:href="#image258"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -17,9 +17,9 @@
 <clipPath id="clip3">
   <path d="M 946.5 228.5 L 985.5 228.5 L 985.5 256.5 L 946.5 256.5 Z M 946.5 256.5 L 985.5 256.5 L 985.5 295.5 L 946.5 295.5 Z M 946.5 295.5 L 985.5 295.5 L 985.5 354.5 L 946.5 354.5 Z M 946.5 354.5 L 985.5 354.5 L 985.5 393.5 L 946.5 393.5 Z M 946.5 393.5 L 985.5 393.5 L 985.5 421.5 L 946.5 421.5 Z M 946.5 393.5 "/>
 </clipPath>
-<image id="image229" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image259" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image229"/>
+  <use xlink:href="#image259"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -28,7 +28,7 @@
   <path d="M 946.5 656.5 L 985.5 656.5 L 985.5 683.5 L 946.5 683.5 Z M 946.5 683.5 L 985.5 683.5 L 985.5 722.5 L 946.5 722.5 Z M 946.5 722.5 L 985.5 722.5 L 985.5 778.5 L 946.5 778.5 Z M 946.5 778.5 L 985.5 778.5 L 985.5 817.5 L 946.5 817.5 Z M 946.5 817.5 L 985.5 817.5 L 985.5 845.5 L 946.5 845.5 Z M 946.5 817.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image229"/>
+  <use xlink:href="#image259"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -42,15 +42,15 @@
 <clipPath id="clip7">
   <path d="M 946.5 136.5 L 985.5 136.5 L 985.5 174.5 L 946.5 174.5 Z M 946.5 899.5 L 985.5 899.5 L 985.5 938.5 L 946.5 938.5 Z M 946.5 899.5 "/>
 </clipPath>
-<image id="image230" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image260" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image230"/>
+  <use xlink:href="#image260"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface225">
+<g id="surface255">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -89,6 +89,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 999.976562 904.597656 L 999.976562 875.96875 L 1011.011719 875.96875 L 1012.738281 876.085938 L 1014.351562 876.402344 L 1015.84375 876.949219 L 1017.214844 877.65625 L 1018.433594 878.640625 L 1019.574219 879.777344 L 1020.515625 881.152344 L 1021.300781 882.644531 L 1021.890625 884.332031 L 1022.320312 886.140625 L 1022.558594 888.140625 L 1022.675781 890.261719 L 1022.558594 892.5 L 1022.28125 894.582031 L 1021.8125 896.46875 L 1021.183594 898.195312 L 1020.359375 899.726562 L 1019.335938 901.0625 L 1018.238281 902.160156 L 1017.019531 903.027344 L 1015.683594 903.734375 L 1014.230469 904.203125 L 1012.660156 904.519531 L 1011.011719 904.597656 Z M 1003.628906 901.375 L 1010.382812 901.375 L 1012.191406 901.257812 L 1013.800781 900.828125 L 1015.214844 900.082031 L 1016.390625 899.097656 L 1017.335938 897.765625 L 1018.121094 896.152344 L 1018.355469 895.328125 L 1018.589844 894.464844 L 1018.789062 893.523438 L 1018.90625 892.5 L 1018.984375 891.441406 L 1019.023438 890.300781 L 1018.867188 887.75 L 1018.472656 885.511719 L 1017.765625 883.585938 L 1016.824219 882.054688 L 1015.605469 880.796875 L 1014.113281 879.894531 L 1013.566406 879.699219 L 1012.976562 879.503906 L 1012.347656 879.386719 L 1011.71875 879.265625 L 1010.382812 879.1875 L 1003.628906 879.1875 Z M 1003.628906 901.375 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 910 217 L 1020 217 M 910 161 L 1020 161 M 910 161 L 910 217 M 1020 161 L 1020 217 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 910 217 L 1020 217 M 910 161 L 1020 161 M 1020 217 L 1020 161 M 910 217 L 910 161 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 910 156 L 910 165 M 905 161 L 914 161 M 909 162 L 911 162 M 909 160 L 911 160 M 909 160 L 909 162 M 911 160 L 911 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_1.svg b/cells/xnor2/sky130_fd_sc_hs__xnor2_1.svg
index 70cd07d..22c13e5 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_1.svg
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 538.5 L 533.5 538.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 577.5 862.5 L 1347.5 862.5 L 1347.5 918.5 L 577.5 918.5 Z M 577.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image304"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 671.5 635.5 L 705.5 635.5 L 705.5 782.5 L 671.5 782.5 Z M 753.5 635.5 L 788.5 635.5 L 788.5 782.5 L 753.5 782.5 Z M 1107.5 664.5 L 1142.5 664.5 L 1142.5 833.5 L 1107.5 833.5 Z M 976.5 664.5 L 1010.5 664.5 L 1010.5 833.5 L 976.5 833.5 Z M 1206.5 664.5 L 1240.5 664.5 L 1240.5 833.5 L 1206.5 833.5 Z M 1206.5 664.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 701.5 284.5 L 735.5 284.5 L 735.5 477.5 L 701.5 477.5 Z M 804.5 284.5 L 838.5 284.5 L 838.5 477.5 L 804.5 477.5 Z M 1200.5 240.5 L 1235.5 240.5 L 1235.5 496.5 L 1200.5 496.5 Z M 973.5 240.5 L 1008.5 240.5 L 1008.5 496.5 L 973.5 496.5 Z M 1070.5 240.5 L 1104.5 240.5 L 1104.5 496.5 L 1070.5 496.5 Z M 1070.5 240.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 612.5 136.5 L 651.5 136.5 L 651.5 174.5 L 612.5 174.5 Z M 1272.5 136.5 L 1311.5 136.5 L 1311.5 174.5 L 1272.5 174.5 Z M 1162.5 136.5 L 1201.5 136.5 L 1201.5 174.5 L 1162.5 174.5 Z M 1052.5 136.5 L 1091.5 136.5 L 1091.5 174.5 L 1052.5 174.5 Z M 942.5 136.5 L 981.5 136.5 L 981.5 174.5 L 942.5 174.5 Z M 832.5 136.5 L 871.5 136.5 L 871.5 174.5 L 832.5 174.5 Z M 722.5 136.5 L 761.5 136.5 L 761.5 174.5 L 722.5 174.5 Z M 612.5 899.5 L 651.5 899.5 L 651.5 938.5 L 612.5 938.5 Z M 1272.5 899.5 L 1311.5 899.5 L 1311.5 938.5 L 1272.5 938.5 Z M 1162.5 899.5 L 1201.5 899.5 L 1201.5 938.5 L 1162.5 938.5 Z M 1052.5 899.5 L 1091.5 899.5 L 1091.5 938.5 L 1052.5 938.5 Z M 942.5 899.5 L 981.5 899.5 L 981.5 938.5 L 942.5 938.5 Z M 832.5 899.5 L 871.5 899.5 L 871.5 938.5 L 832.5 938.5 Z M 722.5 899.5 L 761.5 899.5 L 761.5 938.5 L 722.5 938.5 Z M 722.5 899.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface272">
+<g id="surface301">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -148,6 +148,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 873.441406 547.496094 L 873.304688 549.652344 L 872.96875 551.605469 L 872.363281 553.421875 L 871.554688 555.039062 L 870.480469 556.585938 L 869.199219 557.933594 L 867.785156 559.078125 L 866.304688 559.953125 L 864.621094 560.625 L 862.871094 561.164062 L 860.988281 561.433594 L 858.96875 561.5 L 836.820312 561.5 L 836.820312 512.421875 L 856.746094 512.421875 L 859.640625 512.625 L 862.199219 513.097656 L 864.488281 513.902344 L 866.441406 515.046875 L 868.121094 516.53125 L 869.46875 518.347656 L 870.007812 519.355469 L 870.480469 520.433594 L 870.816406 521.445312 L 871.085938 522.589844 L 871.21875 523.734375 L 871.285156 524.878906 L 871.085938 527.300781 L 870.480469 529.386719 L 869.535156 531.339844 L 868.191406 532.957031 L 866.507812 534.4375 L 864.488281 535.582031 L 866.441406 536.457031 L 868.121094 537.398438 L 869.605469 538.476562 L 870.816406 539.6875 L 871.757812 540.96875 L 872.5 542.3125 L 872.769531 543.121094 L 872.96875 543.929688 L 873.171875 544.738281 L 873.304688 545.679688 L 873.375 546.554688 Z M 865.027344 525.753906 L 864.824219 523.734375 L 864.21875 522.050781 L 863.277344 520.570312 L 861.929688 519.492188 L 860.246094 518.683594 L 858.160156 518.144531 L 857.6875 518.144531 L 857.214844 518.078125 L 856.746094 518.011719 L 855.667969 518.011719 L 855.195312 517.941406 L 843.078125 517.941406 L 843.078125 533.5625 L 855.195312 533.5625 L 857.6875 533.425781 L 859.84375 533.023438 L 861.660156 532.28125 L 863.007812 531.273438 L 864.082031 529.925781 L 864.757812 528.3125 L 864.824219 527.972656 L 864.957031 527.167969 L 864.957031 526.222656 Z M 858.359375 555.980469 L 860.246094 555.914062 L 861.929688 555.507812 L 863.410156 554.835938 L 864.621094 553.960938 L 865.632812 552.816406 L 866.441406 551.402344 L 866.640625 550.863281 L 866.777344 550.257812 L 866.976562 549.585938 L 867.046875 548.976562 L 867.113281 548.304688 L 867.179688 547.566406 L 867.046875 546.082031 L 866.777344 544.667969 L 866.304688 543.457031 L 865.632812 542.3125 L 864.757812 541.371094 L 863.746094 540.496094 L 863.007812 540.09375 L 862.199219 539.753906 L 861.324219 539.484375 L 860.378906 539.285156 L 859.371094 539.148438 L 858.359375 539.082031 L 843.078125 539.082031 L 843.078125 555.980469 Z M 858.359375 555.980469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 832 562 L 871 562 M 832 523 L 871 523 M 832 523 L 832 562 M 871 523 L 871 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 832 562 L 871 562 M 832 523 L 871 523 M 871 562 L 871 523 M 832 562 L 832 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 577 156 L 577 165 M 572 161 L 581 161 M 576 162 L 578 162 M 576 160 L 578 160 M 576 160 L 576 162 M 578 160 L 578 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_2.svg b/cells/xnor2/sky130_fd_sc_hs__xnor2_2.svg
index 40bff94..a3a5296 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_2.svg
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 538.5 L 312.5 538.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 356.5 862.5 L 1566.5 862.5 L 1566.5 918.5 L 356.5 918.5 Z M 356.5 862.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="#image307"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1435.5 664.5 L 1470.5 664.5 L 1470.5 833.5 L 1435.5 833.5 Z M 494.5 664.5 L 529.5 664.5 L 529.5 833.5 L 494.5 833.5 Z M 584.5 664.5 L 618.5 664.5 L 618.5 833.5 L 584.5 833.5 Z M 811.5 664.5 L 845.5 664.5 L 845.5 833.5 L 811.5 833.5 Z M 958.5 664.5 L 993.5 664.5 L 993.5 833.5 L 958.5 833.5 Z M 1057.5 664.5 L 1091.5 664.5 L 1091.5 833.5 L 1057.5 833.5 Z M 1193.5 664.5 L 1228.5 664.5 L 1228.5 833.5 L 1193.5 833.5 Z M 1297.5 664.5 L 1331.5 664.5 L 1331.5 833.5 L 1297.5 833.5 Z M 1297.5 664.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1300.5 240.5 L 1334.5 240.5 L 1334.5 496.5 L 1300.5 496.5 Z M 587.5 267.5 L 622.5 267.5 L 622.5 496.5 L 587.5 496.5 Z M 474.5 267.5 L 508.5 267.5 L 508.5 496.5 L 474.5 496.5 Z M 1197.5 240.5 L 1231.5 240.5 L 1231.5 496.5 L 1197.5 496.5 Z M 1052.5 240.5 L 1087.5 240.5 L 1087.5 496.5 L 1052.5 496.5 Z M 910.5 240.5 L 945.5 240.5 L 945.5 496.5 L 910.5 496.5 Z M 807.5 240.5 L 842.5 240.5 L 842.5 496.5 L 807.5 496.5 Z M 1415.5 240.5 L 1449.5 240.5 L 1449.5 496.5 L 1415.5 496.5 Z M 1415.5 240.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 391.5 136.5 L 430.5 136.5 L 430.5 174.5 L 391.5 174.5 Z M 1491.5 136.5 L 1530.5 136.5 L 1530.5 174.5 L 1491.5 174.5 Z M 1381.5 136.5 L 1420.5 136.5 L 1420.5 174.5 L 1381.5 174.5 Z M 1271.5 136.5 L 1310.5 136.5 L 1310.5 174.5 L 1271.5 174.5 Z M 1161.5 136.5 L 1200.5 136.5 L 1200.5 174.5 L 1161.5 174.5 Z M 1051.5 136.5 L 1090.5 136.5 L 1090.5 174.5 L 1051.5 174.5 Z M 941.5 136.5 L 980.5 136.5 L 980.5 174.5 L 941.5 174.5 Z M 831.5 136.5 L 870.5 136.5 L 870.5 174.5 L 831.5 174.5 Z M 721.5 136.5 L 760.5 136.5 L 760.5 174.5 L 721.5 174.5 Z M 611.5 136.5 L 650.5 136.5 L 650.5 174.5 L 611.5 174.5 Z M 501.5 136.5 L 540.5 136.5 L 540.5 174.5 L 501.5 174.5 Z M 501.5 602.5 L 540.5 602.5 L 540.5 620.5 L 501.5 620.5 Z M 1051.5 602.5 L 1090.5 602.5 L 1090.5 620.5 L 1051.5 620.5 Z M 1051.5 620.5 L 1090.5 620.5 L 1090.5 641.5 L 1051.5 641.5 Z M 501.5 620.5 L 540.5 620.5 L 540.5 641.5 L 501.5 641.5 Z M 391.5 899.5 L 430.5 899.5 L 430.5 938.5 L 391.5 938.5 Z M 1491.5 899.5 L 1530.5 899.5 L 1530.5 938.5 L 1491.5 938.5 Z M 1381.5 899.5 L 1420.5 899.5 L 1420.5 938.5 L 1381.5 938.5 Z M 1271.5 899.5 L 1310.5 899.5 L 1310.5 938.5 L 1271.5 938.5 Z M 1161.5 899.5 L 1200.5 899.5 L 1200.5 938.5 L 1161.5 938.5 Z M 1051.5 899.5 L 1090.5 899.5 L 1090.5 938.5 L 1051.5 938.5 Z M 941.5 899.5 L 980.5 899.5 L 980.5 938.5 L 941.5 938.5 Z M 831.5 899.5 L 870.5 899.5 L 870.5 938.5 L 831.5 938.5 Z M 721.5 899.5 L 760.5 899.5 L 760.5 938.5 L 721.5 938.5 Z M 611.5 899.5 L 650.5 899.5 L 650.5 938.5 L 611.5 938.5 Z M 501.5 899.5 L 540.5 899.5 L 540.5 938.5 L 501.5 938.5 Z M 501.5 899.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface275">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1411.410156 546.757812 L 1392.492188 546.757812 L 1387.308594 561.5 L 1380.644531 561.5 L 1398.148438 512.421875 L 1406.226562 512.421875 L 1423.460938 561.5 L 1416.460938 561.5 Z M 1409.660156 541.503906 L 1402.121094 519.15625 L 1394.042969 541.503906 Z M 1409.660156 541.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1381 562 L 1420 562 M 1381 523 L 1420 523 M 1381 523 L 1381 562 M 1420 523 L 1420 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1381 562 L 1420 562 M 1381 523 L 1420 523 M 1420 562 L 1420 523 M 1381 562 L 1381 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 356 156 L 356 165 M 351 161 L 360 161 M 355 162 L 357 162 M 355 160 L 357 160 M 355 160 L 355 162 M 357 160 L 357 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor2/sky130_fd_sc_hs__xnor2_4.svg b/cells/xnor2/sky130_fd_sc_hs__xnor2_4.svg
index 7f1bdcd..2fe4f91 100644
--- a/cells/xnor2/sky130_fd_sc_hs__xnor2_4.svg
+++ b/cells/xnor2/sky130_fd_sc_hs__xnor2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 536.5 L 175.5 536.5 Z M 175.5 229.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1346.5 627.5 L 1371.5 627.5 L 1371.5 749.5 L 1346.5 749.5 Z M 512.5 643.5 L 536.5 643.5 L 536.5 749.5 L 512.5 749.5 Z M 429.5 643.5 L 454.5 643.5 L 454.5 749.5 L 429.5 749.5 Z M 358.5 643.5 L 383.5 643.5 L 383.5 749.5 L 358.5 749.5 Z M 275.5 643.5 L 300.5 643.5 L 300.5 749.5 L 275.5 749.5 Z M 1275.5 627.5 L 1300.5 627.5 L 1300.5 749.5 L 1275.5 749.5 Z M 1178.5 627.5 L 1203.5 627.5 L 1203.5 749.5 L 1178.5 749.5 Z M 1107.5 627.5 L 1132.5 627.5 L 1132.5 749.5 L 1107.5 749.5 Z M 1009.5 627.5 L 1034.5 627.5 L 1034.5 749.5 L 1009.5 749.5 Z M 927.5 627.5 L 952.5 627.5 L 952.5 749.5 L 927.5 749.5 Z M 856.5 627.5 L 881.5 627.5 L 881.5 749.5 L 856.5 749.5 Z M 758.5 627.5 L 782.5 627.5 L 782.5 749.5 L 758.5 749.5 Z M 675.5 627.5 L 700.5 627.5 L 700.5 749.5 L 675.5 749.5 Z M 1618.5 627.5 L 1643.5 627.5 L 1643.5 749.5 L 1618.5 749.5 Z M 1521.5 627.5 L 1545.5 627.5 L 1545.5 749.5 L 1521.5 749.5 Z M 1449.5 627.5 L 1474.5 627.5 L 1474.5 749.5 L 1449.5 749.5 Z M 1449.5 627.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1468.5 321.5 L 1492.5 321.5 L 1492.5 506.5 L 1468.5 506.5 Z M 426.5 368.5 L 450.5 368.5 L 450.5 506.5 L 426.5 506.5 Z M 351.5 368.5 L 376.5 368.5 L 376.5 506.5 L 351.5 506.5 Z M 277.5 368.5 L 302.5 368.5 L 302.5 506.5 L 277.5 506.5 Z M 500.5 368.5 L 525.5 368.5 L 525.5 506.5 L 500.5 506.5 Z M 1393.5 321.5 L 1418.5 321.5 L 1418.5 506.5 L 1393.5 506.5 Z M 1217.5 321.5 L 1241.5 321.5 L 1241.5 506.5 L 1217.5 506.5 Z M 1142.5 321.5 L 1167.5 321.5 L 1167.5 506.5 L 1142.5 506.5 Z M 1039.5 321.5 L 1064.5 321.5 L 1064.5 506.5 L 1039.5 506.5 Z M 678.5 321.5 L 703.5 321.5 L 703.5 506.5 L 678.5 506.5 Z M 604.5 321.5 L 629.5 321.5 L 629.5 506.5 L 604.5 506.5 Z M 1319.5 321.5 L 1344.5 321.5 L 1344.5 506.5 L 1319.5 506.5 Z M 1616.5 321.5 L 1641.5 321.5 L 1641.5 506.5 L 1616.5 506.5 Z M 1542.5 321.5 L 1567.5 321.5 L 1567.5 506.5 L 1542.5 506.5 Z M 1542.5 321.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 390.5 521.5 L 418.5 521.5 L 418.5 549.5 L 390.5 549.5 Z M 945.5 521.5 L 973.5 521.5 L 973.5 549.5 L 945.5 549.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface327">
+<g id="surface357">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -172,6 +172,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 966.769531 542.75 L 952.972656 542.75 L 949.195312 553.5 L 944.335938 553.5 L 957.097656 517.714844 L 962.988281 517.714844 L 975.554688 553.5 L 970.449219 553.5 Z M 965.492188 538.921875 L 959.992188 522.625 L 954.101562 538.921875 Z M 965.492188 538.921875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 945 558 L 973 558 M 945 530 L 973 530 M 945 530 L 945 558 M 973 530 L 973 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 945 558 L 973 558 M 945 530 L 973 530 M 973 558 L 973 530 M 945 558 L 945 530 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_1.svg b/cells/xnor3/sky130_fd_sc_hs__xnor3_1.svg
index dc42703..2e7ec8e 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_1.svg
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 537.5 L 174.5 537.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 209.5 797.5 L 1709.5 797.5 L 1709.5 842.5 L 209.5 842.5 Z M 209.5 797.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1316.5 613.5 L 1343.5 613.5 L 1343.5 690.5 L 1316.5 690.5 Z M 395.5 616.5 L 422.5 616.5 L 422.5 693.5 L 395.5 693.5 Z M 1407.5 613.5 L 1434.5 613.5 L 1434.5 731.5 L 1407.5 731.5 Z M 1498.5 613.5 L 1525.5 613.5 L 1525.5 731.5 L 1498.5 731.5 Z M 1213.5 613.5 L 1240.5 613.5 L 1240.5 731.5 L 1213.5 731.5 Z M 1604.5 613.5 L 1632.5 613.5 L 1632.5 731.5 L 1604.5 731.5 Z M 1109.5 613.5 L 1137.5 613.5 L 1137.5 731.5 L 1109.5 731.5 Z M 904.5 614.5 L 932.5 614.5 L 932.5 750.5 L 904.5 750.5 Z M 286.5 616.5 L 314.5 616.5 L 314.5 752.5 L 286.5 752.5 Z M 694.5 656.5 L 722.5 656.5 L 722.5 774.5 L 694.5 774.5 Z M 603.5 656.5 L 630.5 656.5 L 630.5 774.5 L 603.5 774.5 Z M 603.5 656.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 708.5 325.5 L 736.5 325.5 L 736.5 480.5 L 708.5 480.5 Z M 597.5 325.5 L 625.5 325.5 L 625.5 480.5 L 597.5 480.5 Z M 1205.5 372.5 L 1232.5 372.5 L 1232.5 490.5 L 1205.5 490.5 Z M 1602.5 306.5 L 1629.5 306.5 L 1629.5 490.5 L 1602.5 490.5 Z M 1287.5 372.5 L 1315.5 372.5 L 1315.5 490.5 L 1287.5 490.5 Z M 1503.5 306.5 L 1531.5 306.5 L 1531.5 490.5 L 1503.5 490.5 Z M 1404.5 335.5 L 1432.5 335.5 L 1432.5 490.5 L 1404.5 490.5 Z M 1106.5 344.5 L 1134.5 344.5 L 1134.5 499.5 L 1106.5 499.5 Z M 411.5 386.5 L 439.5 386.5 L 439.5 504.5 L 411.5 504.5 Z M 286.5 298.5 L 314.5 298.5 L 314.5 504.5 L 286.5 504.5 Z M 905.5 298.5 L 932.5 298.5 L 932.5 504.5 L 905.5 504.5 Z M 905.5 298.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 238.5 214.5 L 269.5 214.5 L 269.5 245.5 L 238.5 245.5 Z M 1649.5 214.5 L 1681.5 214.5 L 1681.5 245.5 L 1649.5 245.5 Z M 1561.5 214.5 L 1592.5 214.5 L 1592.5 245.5 L 1561.5 245.5 Z M 1473.5 214.5 L 1504.5 214.5 L 1504.5 245.5 L 1473.5 245.5 Z M 1385.5 214.5 L 1416.5 214.5 L 1416.5 245.5 L 1385.5 245.5 Z M 1296.5 214.5 L 1328.5 214.5 L 1328.5 245.5 L 1296.5 245.5 Z M 1208.5 214.5 L 1239.5 214.5 L 1239.5 245.5 L 1208.5 245.5 Z M 1120.5 214.5 L 1151.5 214.5 L 1151.5 245.5 L 1120.5 245.5 Z M 1032.5 214.5 L 1063.5 214.5 L 1063.5 245.5 L 1032.5 245.5 Z M 944.5 214.5 L 975.5 214.5 L 975.5 245.5 L 944.5 245.5 Z M 855.5 214.5 L 887.5 214.5 L 887.5 245.5 L 855.5 245.5 Z M 767.5 214.5 L 798.5 214.5 L 798.5 245.5 L 767.5 245.5 Z M 679.5 214.5 L 710.5 214.5 L 710.5 245.5 L 679.5 245.5 Z M 591.5 214.5 L 622.5 214.5 L 622.5 245.5 L 591.5 245.5 Z M 502.5 214.5 L 534.5 214.5 L 534.5 245.5 L 502.5 245.5 Z M 414.5 214.5 L 445.5 214.5 L 445.5 245.5 L 414.5 245.5 Z M 326.5 214.5 L 357.5 214.5 L 357.5 245.5 L 326.5 245.5 Z M 591.5 588.5 L 622.5 588.5 L 622.5 619.5 L 591.5 619.5 Z M 1649.5 588.5 L 1681.5 588.5 L 1681.5 619.5 L 1649.5 619.5 Z M 1296.5 588.5 L 1328.5 588.5 L 1328.5 619.5 L 1296.5 619.5 Z M 1208.5 588.5 L 1239.5 588.5 L 1239.5 619.5 L 1208.5 619.5 Z M 238.5 826.5 L 269.5 826.5 L 269.5 857.5 L 238.5 857.5 Z M 1649.5 826.5 L 1681.5 826.5 L 1681.5 857.5 L 1649.5 857.5 Z M 1561.5 826.5 L 1592.5 826.5 L 1592.5 857.5 L 1561.5 857.5 Z M 1473.5 826.5 L 1504.5 826.5 L 1504.5 857.5 L 1473.5 857.5 Z M 1385.5 826.5 L 1416.5 826.5 L 1416.5 857.5 L 1385.5 857.5 Z M 1296.5 826.5 L 1328.5 826.5 L 1328.5 857.5 L 1296.5 857.5 Z M 1208.5 826.5 L 1239.5 826.5 L 1239.5 857.5 L 1208.5 857.5 Z M 1120.5 826.5 L 1151.5 826.5 L 1151.5 857.5 L 1120.5 857.5 Z M 1032.5 826.5 L 1063.5 826.5 L 1063.5 857.5 L 1032.5 857.5 Z M 944.5 826.5 L 975.5 826.5 L 975.5 857.5 L 944.5 857.5 Z M 855.5 826.5 L 887.5 826.5 L 887.5 857.5 L 855.5 857.5 Z M 767.5 826.5 L 798.5 826.5 L 798.5 857.5 L 767.5 857.5 Z M 679.5 826.5 L 710.5 826.5 L 710.5 857.5 L 679.5 857.5 Z M 591.5 826.5 L 622.5 826.5 L 622.5 857.5 L 591.5 857.5 Z M 502.5 826.5 L 534.5 826.5 L 534.5 857.5 L 502.5 857.5 Z M 414.5 826.5 L 445.5 826.5 L 445.5 857.5 L 414.5 857.5 Z M 326.5 826.5 L 357.5 826.5 L 357.5 857.5 L 326.5 857.5 Z M 326.5 826.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface277">
+<g id="surface305">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 1497.425781 543.519531 L 1482.058594 543.519531 L 1477.84375 555.5 L 1472.429688 555.5 L 1486.652344 515.625 L 1493.214844 515.625 L 1507.21875 555.5 L 1501.53125 555.5 Z M 1496.003906 539.253906 L 1489.878906 521.09375 L 1483.316406 539.253906 Z M 1496.003906 539.253906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1473 559 L 1504 559 M 1473 528 L 1504 528 M 1473 528 L 1473 559 M 1504 528 L 1504 559 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1473 559 L 1504 559 M 1473 528 L 1504 528 M 1504 559 L 1504 528 M 1473 559 L 1473 528 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 209 232 L 209 241 M 204 237 L 213 237 M 208 238 L 210 238 M 208 236 L 210 236 M 208 236 L 208 238 M 210 236 L 210 238 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_2.svg b/cells/xnor3/sky130_fd_sc_hs__xnor3_2.svg
index 3102add..21dd91f 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_2.svg
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 552.5 605.5 L 579.5 605.5 L 579.5 678.5 L 552.5 678.5 Z M 1372.5 611.5 L 1398.5 611.5 L 1398.5 684.5 L 1372.5 684.5 Z M 728.5 605.5 L 754.5 605.5 L 754.5 716.5 L 728.5 716.5 Z M 641.5 605.5 L 667.5 605.5 L 667.5 716.5 L 641.5 716.5 Z M 1536.5 611.5 L 1562.5 611.5 L 1562.5 740.5 L 1536.5 740.5 Z M 1611.5 611.5 L 1637.5 611.5 L 1637.5 740.5 L 1611.5 740.5 Z M 914.5 619.5 L 940.5 619.5 L 940.5 748.5 L 914.5 748.5 Z M 287.5 643.5 L 313.5 643.5 L 313.5 755.5 L 287.5 755.5 Z M 467.5 643.5 L 493.5 643.5 L 493.5 755.5 L 467.5 755.5 Z M 376.5 643.5 L 402.5 643.5 L 402.5 755.5 L 376.5 755.5 Z M 1187.5 649.5 L 1214.5 649.5 L 1214.5 761.5 L 1187.5 761.5 Z M 1100.5 649.5 L 1127.5 649.5 L 1127.5 761.5 L 1100.5 761.5 Z M 1100.5 649.5 "/>
 </clipPath>
-<image id="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1133.5 332.5 L 1159.5 332.5 L 1159.5 478.5 L 1133.5 478.5 Z M 1240.5 332.5 L 1266.5 332.5 L 1266.5 478.5 L 1240.5 478.5 Z M 658.5 389.5 L 684.5 389.5 L 684.5 501.5 L 658.5 501.5 Z M 282.5 327.5 L 308.5 327.5 L 308.5 501.5 L 282.5 501.5 Z M 752.5 355.5 L 778.5 355.5 L 778.5 501.5 L 752.5 501.5 Z M 470.5 355.5 L 496.5 355.5 L 496.5 501.5 L 470.5 501.5 Z M 576.5 389.5 L 602.5 389.5 L 602.5 501.5 L 576.5 501.5 Z M 376.5 327.5 L 402.5 327.5 L 402.5 501.5 L 376.5 501.5 Z M 945.5 310.5 L 971.5 310.5 L 971.5 505.5 L 945.5 505.5 Z M 1610.5 310.5 L 1636.5 310.5 L 1636.5 505.5 L 1610.5 505.5 Z M 1532.5 310.5 L 1558.5 310.5 L 1558.5 505.5 L 1532.5 505.5 Z M 1414.5 394.5 L 1440.5 394.5 L 1440.5 505.5 L 1414.5 505.5 Z M 1414.5 394.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 585.5 L 264.5 585.5 L 264.5 615.5 L 234.5 615.5 Z M 1069.5 585.5 L 1099.5 585.5 L 1099.5 615.5 L 1069.5 615.5 Z M 652.5 585.5 L 681.5 585.5 L 681.5 615.5 L 652.5 615.5 Z M 485.5 585.5 L 514.5 585.5 L 514.5 615.5 L 485.5 615.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface278">
+<g id="surface307">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,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 423.433594 543.441406 L 409.246094 543.441406 L 405.355469 554.5 L 400.359375 554.5 L 413.484375 517.691406 L 419.542969 517.691406 L 432.46875 554.5 L 427.21875 554.5 Z M 422.121094 539.503906 L 416.464844 522.742188 L 410.40625 539.503906 Z M 422.121094 539.503906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 401 558 L 431 558 M 401 529 L 431 529 M 401 529 L 401 558 M 431 529 L 431 558 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 401 558 L 431 558 M 401 529 L 431 529 M 431 558 L 431 529 M 401 558 L 401 529 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xnor3/sky130_fd_sc_hs__xnor3_4.svg b/cells/xnor3/sky130_fd_sc_hs__xnor3_4.svg
index d1feca5..3cedf56 100644
--- a/cells/xnor3/sky130_fd_sc_hs__xnor3_4.svg
+++ b/cells/xnor3/sky130_fd_sc_hs__xnor3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 257.5 L 1744.5 257.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 257.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 203.5 748.5 L 1715.5 748.5 L 1715.5 785.5 L 203.5 785.5 Z M 203.5 748.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1207.5 600.5 L 1230.5 600.5 L 1230.5 663.5 L 1207.5 663.5 Z M 585.5 598.5 L 607.5 598.5 L 607.5 694.5 L 585.5 694.5 Z M 652.5 598.5 L 675.5 598.5 L 675.5 694.5 L 652.5 694.5 Z M 493.5 631.5 L 515.5 631.5 L 515.5 694.5 L 493.5 694.5 Z M 1501.5 600.5 L 1523.5 600.5 L 1523.5 711.5 L 1501.5 711.5 Z M 1630.5 600.5 L 1652.5 600.5 L 1652.5 711.5 L 1630.5 711.5 Z M 1565.5 600.5 L 1588.5 600.5 L 1588.5 711.5 L 1565.5 711.5 Z M 1436.5 600.5 L 1459.5 600.5 L 1459.5 711.5 L 1436.5 711.5 Z M 813.5 607.5 L 835.5 607.5 L 835.5 718.5 L 813.5 718.5 Z M 421.5 631.5 L 444.5 631.5 L 444.5 727.5 L 421.5 727.5 Z M 274.5 631.5 L 296.5 631.5 L 296.5 727.5 L 274.5 727.5 Z M 349.5 631.5 L 371.5 631.5 L 371.5 727.5 L 349.5 727.5 Z M 973.5 633.5 L 996.5 633.5 L 996.5 729.5 L 973.5 729.5 Z M 1057.5 633.5 L 1079.5 633.5 L 1079.5 729.5 L 1057.5 729.5 Z M 1057.5 633.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1086.5 360.5 L 1108.5 360.5 L 1108.5 486.5 L 1086.5 486.5 Z M 993.5 360.5 L 1015.5 360.5 L 1015.5 486.5 L 993.5 486.5 Z M 596.5 409.5 L 619.5 409.5 L 619.5 505.5 L 596.5 505.5 Z M 343.5 355.5 L 365.5 355.5 L 365.5 505.5 L 343.5 505.5 Z M 424.5 379.5 L 446.5 379.5 L 446.5 505.5 L 424.5 505.5 Z M 673.5 379.5 L 695.5 379.5 L 695.5 505.5 L 673.5 505.5 Z M 268.5 355.5 L 290.5 355.5 L 290.5 505.5 L 268.5 505.5 Z M 529.5 409.5 L 551.5 409.5 L 551.5 505.5 L 529.5 505.5 Z M 1492.5 341.5 L 1515.5 341.5 L 1515.5 509.5 L 1492.5 509.5 Z M 1560.5 341.5 L 1582.5 341.5 L 1582.5 509.5 L 1560.5 509.5 Z M 1627.5 341.5 L 1650.5 341.5 L 1650.5 509.5 L 1627.5 509.5 Z M 1245.5 413.5 L 1267.5 413.5 L 1267.5 509.5 L 1245.5 509.5 Z M 841.5 341.5 L 864.5 341.5 L 864.5 509.5 L 841.5 509.5 Z M 1425.5 341.5 L 1447.5 341.5 L 1447.5 509.5 L 1425.5 509.5 Z M 1425.5 341.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 226.5 272.5 L 252.5 272.5 L 252.5 298.5 L 226.5 298.5 Z M 1666.5 272.5 L 1692.5 272.5 L 1692.5 298.5 L 1666.5 298.5 Z M 1594.5 272.5 L 1620.5 272.5 L 1620.5 298.5 L 1594.5 298.5 Z M 1522.5 272.5 L 1548.5 272.5 L 1548.5 298.5 L 1522.5 298.5 Z M 1450.5 272.5 L 1476.5 272.5 L 1476.5 298.5 L 1450.5 298.5 Z M 1378.5 272.5 L 1404.5 272.5 L 1404.5 298.5 L 1378.5 298.5 Z M 1306.5 272.5 L 1332.5 272.5 L 1332.5 298.5 L 1306.5 298.5 Z M 1234.5 272.5 L 1260.5 272.5 L 1260.5 298.5 L 1234.5 298.5 Z M 1162.5 272.5 L 1188.5 272.5 L 1188.5 298.5 L 1162.5 298.5 Z M 1090.5 272.5 L 1116.5 272.5 L 1116.5 298.5 L 1090.5 298.5 Z M 1018.5 272.5 L 1044.5 272.5 L 1044.5 298.5 L 1018.5 298.5 Z M 946.5 272.5 L 972.5 272.5 L 972.5 298.5 L 946.5 298.5 Z M 874.5 272.5 L 900.5 272.5 L 900.5 298.5 L 874.5 298.5 Z M 802.5 272.5 L 828.5 272.5 L 828.5 298.5 L 802.5 298.5 Z M 730.5 272.5 L 756.5 272.5 L 756.5 298.5 L 730.5 298.5 Z M 658.5 272.5 L 684.5 272.5 L 684.5 298.5 L 658.5 298.5 Z M 586.5 272.5 L 612.5 272.5 L 612.5 298.5 L 586.5 298.5 Z M 514.5 272.5 L 540.5 272.5 L 540.5 298.5 L 514.5 298.5 Z M 442.5 272.5 L 468.5 272.5 L 468.5 298.5 L 442.5 298.5 Z M 370.5 272.5 L 396.5 272.5 L 396.5 298.5 L 370.5 298.5 Z M 298.5 272.5 L 324.5 272.5 L 324.5 298.5 L 298.5 298.5 Z M 226.5 467.5 L 252.5 467.5 L 252.5 470.5 L 226.5 470.5 Z M 514.5 467.5 L 540.5 467.5 L 540.5 473.5 L 514.5 473.5 Z M 946.5 467.5 L 972.5 467.5 L 972.5 477.5 L 946.5 477.5 Z M 226.5 470.5 L 252.5 470.5 L 252.5 492.5 L 226.5 492.5 Z M 442.5 467.5 L 468.5 467.5 L 468.5 492.5 L 442.5 492.5 Z M 946.5 477.5 L 972.5 477.5 L 972.5 492.5 L 946.5 492.5 Z M 514.5 473.5 L 540.5 473.5 L 540.5 492.5 L 514.5 492.5 Z M 226.5 772.5 L 252.5 772.5 L 252.5 797.5 L 226.5 797.5 Z M 1666.5 772.5 L 1692.5 772.5 L 1692.5 797.5 L 1666.5 797.5 Z M 1594.5 772.5 L 1620.5 772.5 L 1620.5 797.5 L 1594.5 797.5 Z M 1522.5 772.5 L 1548.5 772.5 L 1548.5 797.5 L 1522.5 797.5 Z M 1450.5 772.5 L 1476.5 772.5 L 1476.5 797.5 L 1450.5 797.5 Z M 1378.5 772.5 L 1404.5 772.5 L 1404.5 797.5 L 1378.5 797.5 Z M 1306.5 772.5 L 1332.5 772.5 L 1332.5 797.5 L 1306.5 797.5 Z M 1234.5 772.5 L 1260.5 772.5 L 1260.5 797.5 L 1234.5 797.5 Z M 1162.5 772.5 L 1188.5 772.5 L 1188.5 797.5 L 1162.5 797.5 Z M 1090.5 772.5 L 1116.5 772.5 L 1116.5 797.5 L 1090.5 797.5 Z M 1018.5 772.5 L 1044.5 772.5 L 1044.5 797.5 L 1018.5 797.5 Z M 946.5 772.5 L 972.5 772.5 L 972.5 797.5 L 946.5 797.5 Z M 874.5 772.5 L 900.5 772.5 L 900.5 797.5 L 874.5 797.5 Z M 802.5 772.5 L 828.5 772.5 L 828.5 797.5 L 802.5 797.5 Z M 730.5 772.5 L 756.5 772.5 L 756.5 797.5 L 730.5 797.5 Z M 658.5 772.5 L 684.5 772.5 L 684.5 797.5 L 658.5 797.5 Z M 586.5 772.5 L 612.5 772.5 L 612.5 797.5 L 586.5 797.5 Z M 514.5 772.5 L 540.5 772.5 L 540.5 797.5 L 514.5 797.5 Z M 442.5 772.5 L 468.5 772.5 L 468.5 797.5 L 442.5 797.5 Z M 370.5 772.5 L 396.5 772.5 L 396.5 797.5 L 370.5 797.5 Z M 298.5 772.5 L 324.5 772.5 L 324.5 797.5 L 298.5 797.5 Z M 298.5 772.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 390.109375 541.976562 L 377.890625 541.976562 L 374.542969 551.5 L 370.238281 551.5 L 381.542969 519.804688 L 386.761719 519.804688 L 397.890625 551.5 L 393.371094 551.5 Z M 388.976562 538.585938 L 384.109375 524.152344 L 378.890625 538.585938 Z M 388.976562 538.585938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 370 557 L 396 557 M 370 531 L 396 531 M 370 531 L 370 557 M 396 531 L 396 557 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 557 L 396 557 M 370 531 L 396 531 M 396 557 L 396 531 M 370 557 L 370 531 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 203 289 L 203 298 M 198 294 L 207 294 M 202 295 L 204 295 M 202 293 L 204 293 M 202 293 L 202 295 M 204 293 L 204 295 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_1.svg b/cells/xor2/sky130_fd_sc_hs__xor2_1.svg
index d02e5bd..3cf296b 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_1.svg
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 538.5 L 478.5 538.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 522.5 862.5 L 1402.5 862.5 L 1402.5 918.5 L 522.5 918.5 Z M 522.5 862.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 892.5 649.5 L 926.5 649.5 L 926.5 775.5 L 892.5 775.5 Z M 710.5 649.5 L 744.5 649.5 L 744.5 775.5 L 710.5 775.5 Z M 1098.5 649.5 L 1133.5 649.5 L 1133.5 818.5 L 1098.5 818.5 Z M 1009.5 649.5 L 1043.5 649.5 L 1043.5 818.5 L 1009.5 818.5 Z M 1229.5 649.5 L 1263.5 649.5 L 1263.5 818.5 L 1229.5 818.5 Z M 1229.5 649.5 "/>
 </clipPath>
-<image id="image278" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image278"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 765.5 240.5 L 799.5 240.5 L 799.5 469.5 L 765.5 469.5 Z M 669.5 240.5 L 703.5 240.5 L 703.5 469.5 L 669.5 469.5 Z M 1136.5 240.5 L 1170.5 240.5 L 1170.5 496.5 L 1136.5 496.5 Z M 1005.5 240.5 L 1040.5 240.5 L 1040.5 496.5 L 1005.5 496.5 Z M 1251.5 240.5 L 1285.5 240.5 L 1285.5 496.5 L 1251.5 496.5 Z M 1251.5 240.5 "/>
 </clipPath>
-<image id="image279" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image279"/>
+  <use xlink:href="#image308"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 557.5 136.5 L 596.5 136.5 L 596.5 174.5 L 557.5 174.5 Z M 1327.5 136.5 L 1366.5 136.5 L 1366.5 174.5 L 1327.5 174.5 Z M 1217.5 136.5 L 1256.5 136.5 L 1256.5 174.5 L 1217.5 174.5 Z M 1107.5 136.5 L 1146.5 136.5 L 1146.5 174.5 L 1107.5 174.5 Z M 997.5 136.5 L 1036.5 136.5 L 1036.5 174.5 L 997.5 174.5 Z M 887.5 136.5 L 926.5 136.5 L 926.5 174.5 L 887.5 174.5 Z M 777.5 136.5 L 816.5 136.5 L 816.5 174.5 L 777.5 174.5 Z M 667.5 136.5 L 706.5 136.5 L 706.5 174.5 L 667.5 174.5 Z M 557.5 899.5 L 596.5 899.5 L 596.5 938.5 L 557.5 938.5 Z M 1327.5 899.5 L 1366.5 899.5 L 1366.5 938.5 L 1327.5 938.5 Z M 1217.5 899.5 L 1256.5 899.5 L 1256.5 938.5 L 1217.5 938.5 Z M 1107.5 899.5 L 1146.5 899.5 L 1146.5 938.5 L 1107.5 938.5 Z M 997.5 899.5 L 1036.5 899.5 L 1036.5 938.5 L 997.5 938.5 Z M 887.5 899.5 L 926.5 899.5 L 926.5 938.5 L 887.5 938.5 Z M 777.5 899.5 L 816.5 899.5 L 816.5 938.5 L 777.5 938.5 Z M 667.5 899.5 L 706.5 899.5 L 706.5 938.5 L 667.5 938.5 Z M 667.5 899.5 "/>
 </clipPath>
-<image id="image280" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image280"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface274">
+<g id="surface303">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1131.824219 706.320312 L 1149.191406 731.5 L 1141.449219 731.5 L 1128.050781 711.035156 L 1114.589844 731.5 L 1106.980469 731.5 L 1124.351562 706.320312 L 1108.058594 682.421875 L 1115.664062 682.421875 L 1128.253906 701.675781 L 1140.910156 682.421875 L 1148.382812 682.421875 Z M 1131.824219 706.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1107 392 L 1146 392 M 1107 353 L 1146 353 M 1107 353 L 1107 392 M 1146 353 L 1146 392 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1107 392 L 1146 392 M 1107 353 L 1146 353 M 1146 392 L 1146 353 M 1107 392 L 1107 353 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 156 L 522 165 M 517 161 L 526 161 M 521 162 L 523 162 M 521 160 L 523 160 M 521 160 L 521 162 M 523 160 L 523 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_2.svg b/cells/xor2/sky130_fd_sc_hs__xor2_2.svg
index bb6bfae..6c07d21 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_2.svg
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 538.5 L 367.5 538.5 Z M 367.5 111.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 411.5 862.5 L 1511.5 862.5 L 1511.5 918.5 L 411.5 918.5 Z M 411.5 862.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 1244.5 664.5 L 1278.5 664.5 L 1278.5 833.5 L 1244.5 833.5 Z M 685.5 687.5 L 719.5 687.5 L 719.5 833.5 L 685.5 833.5 Z M 586.5 687.5 L 620.5 687.5 L 620.5 833.5 L 586.5 833.5 Z M 1145.5 664.5 L 1180.5 664.5 L 1180.5 833.5 L 1145.5 833.5 Z M 932.5 664.5 L 967.5 664.5 L 967.5 833.5 L 932.5 833.5 Z M 834.5 664.5 L 868.5 664.5 L 868.5 833.5 L 834.5 833.5 Z M 1380.5 664.5 L 1415.5 664.5 L 1415.5 833.5 L 1380.5 833.5 Z M 1380.5 664.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 606.5 240.5 L 640.5 240.5 L 640.5 469.5 L 606.5 469.5 Z M 509.5 240.5 L 544.5 240.5 L 544.5 469.5 L 509.5 469.5 Z M 1158.5 240.5 L 1192.5 240.5 L 1192.5 496.5 L 1158.5 496.5 Z M 837.5 240.5 L 871.5 240.5 L 871.5 496.5 L 837.5 496.5 Z M 952.5 240.5 L 986.5 240.5 L 986.5 496.5 L 952.5 496.5 Z M 1261.5 240.5 L 1295.5 240.5 L 1295.5 496.5 L 1261.5 496.5 Z M 1376.5 240.5 L 1410.5 240.5 L 1410.5 496.5 L 1376.5 496.5 Z M 1055.5 240.5 L 1089.5 240.5 L 1089.5 496.5 L 1055.5 496.5 Z M 1055.5 240.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 446.5 136.5 L 485.5 136.5 L 485.5 174.5 L 446.5 174.5 Z M 1436.5 136.5 L 1475.5 136.5 L 1475.5 174.5 L 1436.5 174.5 Z M 1326.5 136.5 L 1365.5 136.5 L 1365.5 174.5 L 1326.5 174.5 Z M 1216.5 136.5 L 1255.5 136.5 L 1255.5 174.5 L 1216.5 174.5 Z M 1106.5 136.5 L 1145.5 136.5 L 1145.5 174.5 L 1106.5 174.5 Z M 996.5 136.5 L 1035.5 136.5 L 1035.5 174.5 L 996.5 174.5 Z M 886.5 136.5 L 925.5 136.5 L 925.5 174.5 L 886.5 174.5 Z M 776.5 136.5 L 815.5 136.5 L 815.5 174.5 L 776.5 174.5 Z M 666.5 136.5 L 705.5 136.5 L 705.5 174.5 L 666.5 174.5 Z M 556.5 136.5 L 595.5 136.5 L 595.5 174.5 L 556.5 174.5 Z M 446.5 899.5 L 485.5 899.5 L 485.5 938.5 L 446.5 938.5 Z M 1436.5 899.5 L 1475.5 899.5 L 1475.5 938.5 L 1436.5 938.5 Z M 1326.5 899.5 L 1365.5 899.5 L 1365.5 938.5 L 1326.5 938.5 Z M 1216.5 899.5 L 1255.5 899.5 L 1255.5 938.5 L 1216.5 938.5 Z M 1106.5 899.5 L 1145.5 899.5 L 1145.5 938.5 L 1106.5 938.5 Z M 996.5 899.5 L 1035.5 899.5 L 1035.5 938.5 L 996.5 938.5 Z M 886.5 899.5 L 925.5 899.5 L 925.5 938.5 L 886.5 938.5 Z M 776.5 899.5 L 815.5 899.5 L 815.5 938.5 L 776.5 938.5 Z M 666.5 899.5 L 705.5 899.5 L 705.5 938.5 L 666.5 938.5 Z M 556.5 899.5 L 595.5 899.5 L 595.5 938.5 L 556.5 938.5 Z M 556.5 899.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>
@@ -157,6 +157,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 1460.824219 536.320312 L 1478.191406 561.5 L 1470.449219 561.5 L 1457.050781 541.035156 L 1443.589844 561.5 L 1435.980469 561.5 L 1453.351562 536.320312 L 1437.058594 512.421875 L 1444.664062 512.421875 L 1457.253906 531.675781 L 1469.910156 512.421875 L 1477.382812 512.421875 Z M 1460.824219 536.320312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1436 562 L 1475 562 M 1436 523 L 1475 523 M 1436 523 L 1436 562 M 1475 523 L 1475 562 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1436 562 L 1475 562 M 1436 523 L 1475 523 M 1475 562 L 1475 523 M 1436 562 L 1436 523 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 411 156 L 411 165 M 406 161 L 415 161 M 410 162 L 412 162 M 410 160 L 412 160 M 410 160 L 410 162 M 412 160 L 412 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor2/sky130_fd_sc_hs__xor2_4.svg b/cells/xor2/sky130_fd_sc_hs__xor2_4.svg
index 450bbc2..106821a 100644
--- a/cells/xor2/sky130_fd_sc_hs__xor2_4.svg
+++ b/cells/xor2/sky130_fd_sc_hs__xor2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 213.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 207.5 783.5 L 1710.5 783.5 L 1710.5 825.5 L 207.5 825.5 Z M 207.5 783.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 320.5 611.5 L 346.5 611.5 L 346.5 740.5 L 320.5 740.5 Z M 395.5 611.5 L 421.5 611.5 L 421.5 740.5 L 395.5 740.5 Z M 592.5 611.5 L 618.5 611.5 L 618.5 740.5 L 592.5 740.5 Z M 694.5 611.5 L 720.5 611.5 L 720.5 740.5 L 694.5 740.5 Z M 498.5 611.5 L 524.5 611.5 L 524.5 740.5 L 498.5 740.5 Z M 819.5 611.5 L 845.5 611.5 L 845.5 740.5 L 819.5 740.5 Z M 1197.5 632.5 L 1223.5 632.5 L 1223.5 761.5 L 1197.5 761.5 Z M 1122.5 632.5 L 1148.5 632.5 L 1148.5 761.5 L 1122.5 761.5 Z M 1020.5 632.5 L 1046.5 632.5 L 1046.5 761.5 L 1020.5 761.5 Z M 1374.5 632.5 L 1401.5 632.5 L 1401.5 761.5 L 1374.5 761.5 Z M 1536.5 632.5 L 1562.5 632.5 L 1562.5 761.5 L 1536.5 761.5 Z M 1611.5 632.5 L 1637.5 632.5 L 1637.5 761.5 L 1611.5 761.5 Z M 1300.5 632.5 L 1326.5 632.5 L 1326.5 761.5 L 1300.5 761.5 Z M 1449.5 632.5 L 1475.5 632.5 L 1475.5 761.5 L 1449.5 761.5 Z M 1449.5 632.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 533.5 310.5 L 559.5 310.5 L 559.5 484.5 L 533.5 484.5 Z M 290.5 310.5 L 316.5 310.5 L 316.5 484.5 L 290.5 484.5 Z M 455.5 310.5 L 481.5 310.5 L 481.5 484.5 L 455.5 484.5 Z M 377.5 310.5 L 403.5 310.5 L 403.5 484.5 L 377.5 484.5 Z M 1197.5 310.5 L 1223.5 310.5 L 1223.5 505.5 L 1197.5 505.5 Z M 703.5 310.5 L 729.5 310.5 L 729.5 505.5 L 703.5 505.5 Z M 781.5 310.5 L 807.5 310.5 L 807.5 505.5 L 781.5 505.5 Z M 860.5 310.5 L 886.5 310.5 L 886.5 505.5 L 860.5 505.5 Z M 938.5 310.5 L 964.5 310.5 L 964.5 505.5 L 938.5 505.5 Z M 1376.5 310.5 L 1402.5 310.5 L 1402.5 505.5 L 1376.5 505.5 Z M 1611.5 310.5 L 1637.5 310.5 L 1637.5 505.5 L 1611.5 505.5 Z M 1455.5 310.5 L 1481.5 310.5 L 1481.5 505.5 L 1455.5 505.5 Z M 1298.5 310.5 L 1324.5 310.5 L 1324.5 505.5 L 1298.5 505.5 Z M 1533.5 310.5 L 1559.5 310.5 L 1559.5 505.5 L 1533.5 505.5 Z M 1119.5 310.5 L 1145.5 310.5 L 1145.5 505.5 L 1119.5 505.5 Z M 1016.5 310.5 L 1042.5 310.5 L 1042.5 505.5 L 1016.5 505.5 Z M 1016.5 310.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 234.5 231.5 L 264.5 231.5 L 264.5 261.5 L 234.5 261.5 Z M 1654.5 231.5 L 1683.5 231.5 L 1683.5 261.5 L 1654.5 261.5 Z M 1570.5 231.5 L 1600.5 231.5 L 1600.5 261.5 L 1570.5 261.5 Z M 1487.5 231.5 L 1516.5 231.5 L 1516.5 261.5 L 1487.5 261.5 Z M 1403.5 231.5 L 1433.5 231.5 L 1433.5 261.5 L 1403.5 261.5 Z M 1320.5 231.5 L 1349.5 231.5 L 1349.5 261.5 L 1320.5 261.5 Z M 1236.5 231.5 L 1266.5 231.5 L 1266.5 261.5 L 1236.5 261.5 Z M 1153.5 231.5 L 1182.5 231.5 L 1182.5 261.5 L 1153.5 261.5 Z M 1069.5 231.5 L 1099.5 231.5 L 1099.5 261.5 L 1069.5 261.5 Z M 986.5 231.5 L 1015.5 231.5 L 1015.5 261.5 L 986.5 261.5 Z M 902.5 231.5 L 932.5 231.5 L 932.5 261.5 L 902.5 261.5 Z M 819.5 231.5 L 848.5 231.5 L 848.5 261.5 L 819.5 261.5 Z M 735.5 231.5 L 765.5 231.5 L 765.5 261.5 L 735.5 261.5 Z M 652.5 231.5 L 681.5 231.5 L 681.5 261.5 L 652.5 261.5 Z M 568.5 231.5 L 598.5 231.5 L 598.5 261.5 L 568.5 261.5 Z M 485.5 231.5 L 514.5 231.5 L 514.5 261.5 L 485.5 261.5 Z M 401.5 231.5 L 431.5 231.5 L 431.5 261.5 L 401.5 261.5 Z M 318.5 231.5 L 347.5 231.5 L 347.5 261.5 L 318.5 261.5 Z M 234.5 810.5 L 264.5 810.5 L 264.5 840.5 L 234.5 840.5 Z M 1654.5 810.5 L 1683.5 810.5 L 1683.5 840.5 L 1654.5 840.5 Z M 1570.5 810.5 L 1600.5 810.5 L 1600.5 840.5 L 1570.5 840.5 Z M 1487.5 810.5 L 1516.5 810.5 L 1516.5 840.5 L 1487.5 840.5 Z M 1403.5 810.5 L 1433.5 810.5 L 1433.5 840.5 L 1403.5 840.5 Z M 1320.5 810.5 L 1349.5 810.5 L 1349.5 840.5 L 1320.5 840.5 Z M 1236.5 810.5 L 1266.5 810.5 L 1266.5 840.5 L 1236.5 840.5 Z M 1153.5 810.5 L 1182.5 810.5 L 1182.5 840.5 L 1153.5 840.5 Z M 1069.5 810.5 L 1099.5 810.5 L 1099.5 840.5 L 1069.5 840.5 Z M 986.5 810.5 L 1015.5 810.5 L 1015.5 840.5 L 986.5 840.5 Z M 902.5 810.5 L 932.5 810.5 L 932.5 840.5 L 902.5 840.5 Z M 819.5 810.5 L 848.5 810.5 L 848.5 840.5 L 819.5 840.5 Z M 735.5 810.5 L 765.5 810.5 L 765.5 840.5 L 735.5 840.5 Z M 652.5 810.5 L 681.5 810.5 L 681.5 840.5 L 652.5 840.5 Z M 568.5 810.5 L 598.5 810.5 L 598.5 840.5 L 568.5 840.5 Z M 485.5 810.5 L 514.5 810.5 L 514.5 840.5 L 485.5 840.5 Z M 401.5 810.5 L 431.5 810.5 L 431.5 840.5 L 401.5 840.5 Z M 318.5 810.5 L 347.5 810.5 L 347.5 840.5 L 318.5 840.5 Z M 318.5 810.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 920.242188 406.617188 L 933.269531 425.5 L 927.460938 425.5 L 917.414062 410.152344 L 907.316406 425.5 L 901.609375 425.5 L 914.636719 406.617188 L 902.417969 388.691406 L 908.125 388.691406 L 917.566406 403.132812 L 927.058594 388.691406 L 932.664062 388.691406 Z M 920.242188 406.617188 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 902 687 L 932 687 M 902 657 L 932 657 M 902 657 L 902 687 M 932 657 L 932 687 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 902 687 L 932 687 M 902 657 L 932 657 M 932 687 L 932 657 M 902 687 L 902 657 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 207 249 L 207 258 M 202 254 L 211 254 M 206 255 L 208 255 M 206 253 L 208 253 M 206 253 L 206 255 M 208 253 L 208 255 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_1.svg b/cells/xor3/sky130_fd_sc_hs__xor3_1.svg
index ff84514..2f701a3 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_1.svg
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 536.5 L 175.5 536.5 Z M 175.5 229.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 206.5 770.5 L 1712.5 770.5 L 1712.5 810.5 L 206.5 810.5 Z M 206.5 770.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 275.5 594.5 L 300.5 594.5 L 300.5 700.5 L 275.5 700.5 Z M 412.5 594.5 L 437.5 594.5 L 437.5 700.5 L 412.5 700.5 Z M 607.5 634.5 L 632.5 634.5 L 632.5 703.5 L 607.5 703.5 Z M 815.5 601.5 L 840.5 601.5 L 840.5 707.5 L 815.5 707.5 Z M 1210.5 605.5 L 1235.5 605.5 L 1235.5 710.5 L 1210.5 710.5 Z M 1322.5 605.5 L 1347.5 605.5 L 1347.5 710.5 L 1322.5 710.5 Z M 525.5 634.5 L 550.5 634.5 L 550.5 739.5 L 525.5 739.5 Z M 718.5 634.5 L 743.5 634.5 L 743.5 739.5 L 718.5 739.5 Z M 1618.5 619.5 L 1643.5 619.5 L 1643.5 741.5 L 1618.5 741.5 Z M 1534.5 672.5 L 1558.5 672.5 L 1558.5 741.5 L 1534.5 741.5 Z M 1009.5 627.5 L 1033.5 627.5 L 1033.5 749.5 L 1009.5 749.5 Z M 1009.5 627.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1309.5 345.5 L 1334.5 345.5 L 1334.5 483.5 L 1309.5 483.5 Z M 1184.5 345.5 L 1209.5 345.5 L 1209.5 483.5 L 1184.5 483.5 Z M 659.5 381.5 L 684.5 381.5 L 684.5 487.5 L 659.5 487.5 Z M 303.5 321.5 L 327.5 321.5 L 327.5 487.5 L 303.5 487.5 Z M 582.5 381.5 L 607.5 381.5 L 607.5 487.5 L 582.5 487.5 Z M 410.5 321.5 L 435.5 321.5 L 435.5 487.5 L 410.5 487.5 Z M 498.5 348.5 L 523.5 348.5 L 523.5 487.5 L 498.5 487.5 Z M 748.5 359.5 L 772.5 359.5 L 772.5 497.5 L 748.5 497.5 Z M 1502.5 397.5 L 1527.5 397.5 L 1527.5 502.5 L 1502.5 502.5 Z M 1616.5 321.5 L 1641.5 321.5 L 1641.5 506.5 L 1616.5 506.5 Z M 1001.5 321.5 L 1026.5 321.5 L 1026.5 506.5 L 1001.5 506.5 Z M 1001.5 321.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 232.5 246.5 L 260.5 246.5 L 260.5 274.5 L 232.5 274.5 Z M 1658.5 246.5 L 1686.5 246.5 L 1686.5 274.5 L 1658.5 274.5 Z M 1579.5 246.5 L 1607.5 246.5 L 1607.5 274.5 L 1579.5 274.5 Z M 1500.5 246.5 L 1528.5 246.5 L 1528.5 274.5 L 1500.5 274.5 Z M 1421.5 246.5 L 1449.5 246.5 L 1449.5 274.5 L 1421.5 274.5 Z M 1341.5 246.5 L 1369.5 246.5 L 1369.5 274.5 L 1341.5 274.5 Z M 1262.5 246.5 L 1290.5 246.5 L 1290.5 274.5 L 1262.5 274.5 Z M 1183.5 246.5 L 1211.5 246.5 L 1211.5 274.5 L 1183.5 274.5 Z M 1104.5 246.5 L 1132.5 246.5 L 1132.5 274.5 L 1104.5 274.5 Z M 1024.5 246.5 L 1052.5 246.5 L 1052.5 274.5 L 1024.5 274.5 Z M 945.5 246.5 L 973.5 246.5 L 973.5 274.5 L 945.5 274.5 Z M 866.5 246.5 L 894.5 246.5 L 894.5 274.5 L 866.5 274.5 Z M 787.5 246.5 L 815.5 246.5 L 815.5 274.5 L 787.5 274.5 Z M 707.5 246.5 L 735.5 246.5 L 735.5 274.5 L 707.5 274.5 Z M 628.5 246.5 L 656.5 246.5 L 656.5 274.5 L 628.5 274.5 Z M 549.5 246.5 L 577.5 246.5 L 577.5 274.5 L 549.5 274.5 Z M 469.5 246.5 L 498.5 246.5 L 498.5 274.5 L 469.5 274.5 Z M 390.5 246.5 L 418.5 246.5 L 418.5 274.5 L 390.5 274.5 Z M 311.5 246.5 L 339.5 246.5 L 339.5 274.5 L 311.5 274.5 Z M 1579.5 521.5 L 1607.5 521.5 L 1607.5 546.5 L 1579.5 546.5 Z M 1579.5 546.5 L 1607.5 546.5 L 1607.5 549.5 L 1579.5 549.5 Z M 1104.5 521.5 L 1132.5 521.5 L 1132.5 549.5 L 1104.5 549.5 Z M 1262.5 521.5 L 1290.5 521.5 L 1290.5 549.5 L 1262.5 549.5 Z M 707.5 521.5 L 735.5 521.5 L 735.5 549.5 L 707.5 549.5 Z M 232.5 796.5 L 260.5 796.5 L 260.5 824.5 L 232.5 824.5 Z M 1658.5 796.5 L 1686.5 796.5 L 1686.5 824.5 L 1658.5 824.5 Z M 1579.5 796.5 L 1607.5 796.5 L 1607.5 824.5 L 1579.5 824.5 Z M 1500.5 796.5 L 1528.5 796.5 L 1528.5 824.5 L 1500.5 824.5 Z M 1421.5 796.5 L 1449.5 796.5 L 1449.5 824.5 L 1421.5 824.5 Z M 1341.5 796.5 L 1369.5 796.5 L 1369.5 824.5 L 1341.5 824.5 Z M 1262.5 796.5 L 1290.5 796.5 L 1290.5 824.5 L 1262.5 824.5 Z M 1183.5 796.5 L 1211.5 796.5 L 1211.5 824.5 L 1183.5 824.5 Z M 1104.5 796.5 L 1132.5 796.5 L 1132.5 824.5 L 1104.5 824.5 Z M 1024.5 796.5 L 1052.5 796.5 L 1052.5 824.5 L 1024.5 824.5 Z M 945.5 796.5 L 973.5 796.5 L 973.5 824.5 L 945.5 824.5 Z M 866.5 796.5 L 894.5 796.5 L 894.5 824.5 L 866.5 824.5 Z M 787.5 796.5 L 815.5 796.5 L 815.5 824.5 L 787.5 824.5 Z M 707.5 796.5 L 735.5 796.5 L 735.5 824.5 L 707.5 824.5 Z M 628.5 796.5 L 656.5 796.5 L 656.5 824.5 L 628.5 824.5 Z M 549.5 796.5 L 577.5 796.5 L 577.5 824.5 L 549.5 824.5 Z M 469.5 796.5 L 498.5 796.5 L 498.5 824.5 L 469.5 824.5 Z M 390.5 796.5 L 418.5 796.5 L 418.5 824.5 L 390.5 824.5 Z M 311.5 796.5 L 339.5 796.5 L 339.5 824.5 L 311.5 824.5 Z M 311.5 796.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 1676.695312 352.140625 L 1689.359375 370.5 L 1683.714844 370.5 L 1673.945312 355.578125 L 1664.125 370.5 L 1658.578125 370.5 L 1671.246094 352.140625 L 1659.367188 334.714844 L 1664.914062 334.714844 L 1674.09375 348.753906 L 1683.320312 334.714844 L 1688.769531 334.714844 Z M 1676.695312 352.140625 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1658 741 L 1686 741 M 1658 713 L 1686 713 M 1658 713 L 1658 741 M 1686 713 L 1686 741 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1658 741 L 1686 741 M 1658 713 L 1686 713 M 1686 741 L 1686 713 M 1658 741 L 1658 713 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 264 L 206 273 M 201 269 L 210 269 M 205 270 L 207 270 M 205 268 L 207 268 M 205 268 L 205 270 M 207 268 L 207 270 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_2.svg b/cells/xor3/sky130_fd_sc_hs__xor3_2.svg
index f24d38e..9337ec8 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_2.svg
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 243.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 204.5 758.5 L 1714.5 758.5 L 1714.5 797.5 L 204.5 797.5 Z M 204.5 758.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 586.5 607.5 L 610.5 607.5 L 610.5 674.5 L 586.5 674.5 Z M 400.5 591.5 L 424.5 591.5 L 424.5 692.5 L 400.5 692.5 Z M 270.5 591.5 L 293.5 591.5 L 293.5 692.5 L 270.5 692.5 Z M 784.5 598.5 L 808.5 598.5 L 808.5 699.5 L 784.5 699.5 Z M 1267.5 601.5 L 1290.5 601.5 L 1290.5 702.5 L 1267.5 702.5 Z M 691.5 607.5 L 715.5 607.5 L 715.5 708.5 L 691.5 708.5 Z M 507.5 607.5 L 531.5 607.5 L 531.5 708.5 L 507.5 708.5 Z M 1160.5 612.5 L 1184.5 612.5 L 1184.5 713.5 L 1160.5 713.5 Z M 1553.5 619.5 L 1577.5 619.5 L 1577.5 736.5 L 1553.5 736.5 Z M 1462.5 670.5 L 1485.5 670.5 L 1485.5 736.5 L 1462.5 736.5 Z M 1621.5 619.5 L 1644.5 619.5 L 1644.5 736.5 L 1621.5 736.5 Z M 968.5 622.5 L 992.5 622.5 L 992.5 739.5 L 968.5 739.5 Z M 968.5 622.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1120.5 331.5 L 1143.5 331.5 L 1143.5 464.5 L 1120.5 464.5 Z M 1239.5 331.5 L 1263.5 331.5 L 1263.5 464.5 L 1239.5 464.5 Z M 552.5 367.5 L 576.5 367.5 L 576.5 468.5 L 552.5 468.5 Z M 623.5 367.5 L 646.5 367.5 L 646.5 468.5 L 623.5 468.5 Z M 473.5 335.5 L 496.5 335.5 L 496.5 468.5 L 473.5 468.5 Z M 389.5 335.5 L 412.5 335.5 L 412.5 493.5 L 389.5 493.5 Z M 295.5 335.5 L 319.5 335.5 L 319.5 493.5 L 295.5 493.5 Z M 707.5 367.5 L 731.5 367.5 L 731.5 499.5 L 707.5 499.5 Z M 1411.5 407.5 L 1434.5 407.5 L 1434.5 508.5 L 1411.5 508.5 Z M 961.5 331.5 L 985.5 331.5 L 985.5 508.5 L 961.5 508.5 Z M 1622.5 331.5 L 1646.5 331.5 L 1646.5 508.5 L 1622.5 508.5 Z M 1552.5 331.5 L 1575.5 331.5 L 1575.5 508.5 L 1552.5 508.5 Z M 1552.5 331.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 228.5 260.5 L 255.5 260.5 L 255.5 287.5 L 228.5 287.5 Z M 1662.5 260.5 L 1689.5 260.5 L 1689.5 287.5 L 1662.5 287.5 Z M 1587.5 260.5 L 1614.5 260.5 L 1614.5 287.5 L 1587.5 287.5 Z M 1511.5 260.5 L 1538.5 260.5 L 1538.5 287.5 L 1511.5 287.5 Z M 1436.5 260.5 L 1463.5 260.5 L 1463.5 287.5 L 1436.5 287.5 Z M 1360.5 260.5 L 1387.5 260.5 L 1387.5 287.5 L 1360.5 287.5 Z M 1285.5 260.5 L 1312.5 260.5 L 1312.5 287.5 L 1285.5 287.5 Z M 1209.5 260.5 L 1236.5 260.5 L 1236.5 287.5 L 1209.5 287.5 Z M 1134.5 260.5 L 1161.5 260.5 L 1161.5 287.5 L 1134.5 287.5 Z M 1059.5 260.5 L 1085.5 260.5 L 1085.5 287.5 L 1059.5 287.5 Z M 983.5 260.5 L 1010.5 260.5 L 1010.5 287.5 L 983.5 287.5 Z M 908.5 260.5 L 934.5 260.5 L 934.5 287.5 L 908.5 287.5 Z M 832.5 260.5 L 859.5 260.5 L 859.5 287.5 L 832.5 287.5 Z M 757.5 260.5 L 783.5 260.5 L 783.5 287.5 L 757.5 287.5 Z M 681.5 260.5 L 708.5 260.5 L 708.5 287.5 L 681.5 287.5 Z M 606.5 260.5 L 632.5 260.5 L 632.5 287.5 L 606.5 287.5 Z M 530.5 260.5 L 557.5 260.5 L 557.5 287.5 L 530.5 287.5 Z M 455.5 260.5 L 481.5 260.5 L 481.5 287.5 L 455.5 287.5 Z M 379.5 260.5 L 406.5 260.5 L 406.5 287.5 L 379.5 287.5 Z M 304.5 260.5 L 330.5 260.5 L 330.5 287.5 L 304.5 287.5 Z M 681.5 464.5 L 708.5 464.5 L 708.5 475.5 L 681.5 475.5 Z M 1209.5 464.5 L 1236.5 464.5 L 1236.5 490.5 L 1209.5 490.5 Z M 1059.5 464.5 L 1085.5 464.5 L 1085.5 490.5 L 1059.5 490.5 Z M 1511.5 464.5 L 1538.5 464.5 L 1538.5 490.5 L 1511.5 490.5 Z M 681.5 475.5 L 708.5 475.5 L 708.5 490.5 L 681.5 490.5 Z M 228.5 784.5 L 255.5 784.5 L 255.5 810.5 L 228.5 810.5 Z M 1662.5 784.5 L 1689.5 784.5 L 1689.5 810.5 L 1662.5 810.5 Z M 1587.5 784.5 L 1614.5 784.5 L 1614.5 810.5 L 1587.5 810.5 Z M 1511.5 784.5 L 1538.5 784.5 L 1538.5 810.5 L 1511.5 810.5 Z M 1436.5 784.5 L 1463.5 784.5 L 1463.5 810.5 L 1436.5 810.5 Z M 1360.5 784.5 L 1387.5 784.5 L 1387.5 810.5 L 1360.5 810.5 Z M 1285.5 784.5 L 1312.5 784.5 L 1312.5 810.5 L 1285.5 810.5 Z M 1209.5 784.5 L 1236.5 784.5 L 1236.5 810.5 L 1209.5 810.5 Z M 1134.5 784.5 L 1161.5 784.5 L 1161.5 810.5 L 1134.5 810.5 Z M 1059.5 784.5 L 1085.5 784.5 L 1085.5 810.5 L 1059.5 810.5 Z M 983.5 784.5 L 1010.5 784.5 L 1010.5 810.5 L 983.5 810.5 Z M 908.5 784.5 L 934.5 784.5 L 934.5 810.5 L 908.5 810.5 Z M 832.5 784.5 L 859.5 784.5 L 859.5 810.5 L 832.5 810.5 Z M 757.5 784.5 L 783.5 784.5 L 783.5 810.5 L 757.5 810.5 Z M 681.5 784.5 L 708.5 784.5 L 708.5 810.5 L 681.5 810.5 Z M 606.5 784.5 L 632.5 784.5 L 632.5 810.5 L 606.5 810.5 Z M 530.5 784.5 L 557.5 784.5 L 557.5 810.5 L 530.5 810.5 Z M 455.5 784.5 L 481.5 784.5 L 481.5 810.5 L 455.5 810.5 Z M 379.5 784.5 L 406.5 784.5 L 406.5 810.5 L 379.5 810.5 Z M 304.5 784.5 L 330.5 784.5 L 330.5 810.5 L 304.5 810.5 Z M 304.5 784.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface292">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -169,6 +169,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 1603.597656 360.191406 L 1615.539062 377.5 L 1610.214844 377.5 L 1601.003906 363.429688 L 1591.75 377.5 L 1586.519531 377.5 L 1598.460938 360.191406 L 1587.257812 343.757812 L 1592.488281 343.757812 L 1601.144531 356.996094 L 1609.84375 343.757812 L 1614.984375 343.757812 Z M 1603.597656 360.191406 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1587 732 L 1614 732 M 1587 705 L 1614 705 M 1587 705 L 1587 732 M 1614 705 L 1614 732 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1587 732 L 1614 732 M 1587 705 L 1614 705 M 1614 732 L 1614 705 M 1587 732 L 1587 705 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 204 277 L 204 286 M 199 282 L 208 282 M 203 283 L 205 283 M 203 281 L 205 281 M 203 281 L 203 283 M 205 281 L 205 283 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/xor3/sky130_fd_sc_hs__xor3_4.svg b/cells/xor3/sky130_fd_sc_hs__xor3_4.svg
index 7e18cea..946ff3c 100644
--- a/cells/xor3/sky130_fd_sc_hs__xor3_4.svg
+++ b/cells/xor3/sky130_fd_sc_hs__xor3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 269.5 L 1743.5 269.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 269.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 201.5 739.5 L 1716.5 739.5 L 1716.5 774.5 L 201.5 774.5 Z M 201.5 739.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 550.5 597.5 L 571.5 597.5 L 571.5 658.5 L 550.5 658.5 Z M 720.5 592.5 L 742.5 592.5 L 742.5 684.5 L 720.5 684.5 Z M 1162.5 594.5 L 1183.5 594.5 L 1183.5 686.5 L 1162.5 686.5 Z M 1064.5 594.5 L 1086.5 594.5 L 1086.5 686.5 L 1064.5 686.5 Z M 357.5 597.5 L 379.5 597.5 L 379.5 689.5 L 357.5 689.5 Z M 636.5 597.5 L 657.5 597.5 L 657.5 689.5 L 636.5 689.5 Z M 478.5 597.5 L 499.5 597.5 L 499.5 689.5 L 478.5 689.5 Z M 261.5 597.5 L 283.5 597.5 L 283.5 689.5 L 261.5 689.5 Z M 889.5 615.5 L 911.5 615.5 L 911.5 721.5 L 889.5 721.5 Z M 1512.5 615.5 L 1533.5 615.5 L 1533.5 721.5 L 1512.5 721.5 Z M 1450.5 615.5 L 1472.5 615.5 L 1472.5 721.5 L 1450.5 721.5 Z M 1367.5 660.5 L 1388.5 660.5 L 1388.5 721.5 L 1367.5 721.5 Z M 1573.5 615.5 L 1595.5 615.5 L 1595.5 721.5 L 1573.5 721.5 Z M 1635.5 615.5 L 1657.5 615.5 L 1657.5 721.5 L 1635.5 721.5 Z M 1635.5 615.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 573.5 382.5 L 595.5 382.5 L 595.5 474.5 L 573.5 474.5 Z M 1298.5 388.5 L 1319.5 388.5 L 1319.5 480.5 L 1298.5 480.5 Z M 334.5 349.5 L 356.5 349.5 L 356.5 493.5 L 334.5 493.5 Z M 411.5 372.5 L 433.5 372.5 L 433.5 493.5 L 411.5 493.5 Z M 263.5 349.5 L 284.5 349.5 L 284.5 493.5 L 263.5 493.5 Z M 488.5 401.5 L 510.5 401.5 L 510.5 493.5 L 488.5 493.5 Z M 1151.5 375.5 L 1172.5 375.5 L 1172.5 495.5 L 1151.5 495.5 Z M 1053.5 375.5 L 1075.5 375.5 L 1075.5 495.5 L 1053.5 495.5 Z M 650.5 381.5 L 672.5 381.5 L 672.5 502.5 L 650.5 502.5 Z M 885.5 349.5 L 907.5 349.5 L 907.5 510.5 L 885.5 510.5 Z M 1633.5 349.5 L 1654.5 349.5 L 1654.5 510.5 L 1633.5 510.5 Z M 1428.5 349.5 L 1449.5 349.5 L 1449.5 510.5 L 1428.5 510.5 Z M 1568.5 349.5 L 1590.5 349.5 L 1590.5 510.5 L 1568.5 510.5 Z M 1492.5 349.5 L 1514.5 349.5 L 1514.5 510.5 L 1492.5 510.5 Z M 1492.5 349.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;"/>
@@ -64,15 +64,15 @@
 <clipPath id="clip12">
   <path d="M 223.5 284.5 L 248.5 284.5 L 248.5 308.5 L 223.5 308.5 Z M 1670.5 284.5 L 1694.5 284.5 L 1694.5 308.5 L 1670.5 308.5 Z M 1601.5 284.5 L 1625.5 284.5 L 1625.5 308.5 L 1601.5 308.5 Z M 1532.5 284.5 L 1556.5 284.5 L 1556.5 308.5 L 1532.5 308.5 Z M 1463.5 284.5 L 1487.5 284.5 L 1487.5 308.5 L 1463.5 308.5 Z M 1394.5 284.5 L 1418.5 284.5 L 1418.5 308.5 L 1394.5 308.5 Z M 1325.5 284.5 L 1350.5 284.5 L 1350.5 308.5 L 1325.5 308.5 Z M 1256.5 284.5 L 1281.5 284.5 L 1281.5 308.5 L 1256.5 308.5 Z M 1187.5 284.5 L 1212.5 284.5 L 1212.5 308.5 L 1187.5 308.5 Z M 1119.5 284.5 L 1143.5 284.5 L 1143.5 308.5 L 1119.5 308.5 Z M 1050.5 284.5 L 1074.5 284.5 L 1074.5 308.5 L 1050.5 308.5 Z M 981.5 284.5 L 1005.5 284.5 L 1005.5 308.5 L 981.5 308.5 Z M 912.5 284.5 L 936.5 284.5 L 936.5 308.5 L 912.5 308.5 Z M 843.5 284.5 L 867.5 284.5 L 867.5 308.5 L 843.5 308.5 Z M 774.5 284.5 L 799.5 284.5 L 799.5 308.5 L 774.5 308.5 Z M 705.5 284.5 L 730.5 284.5 L 730.5 308.5 L 705.5 308.5 Z M 636.5 284.5 L 661.5 284.5 L 661.5 308.5 L 636.5 308.5 Z M 568.5 284.5 L 592.5 284.5 L 592.5 308.5 L 568.5 308.5 Z M 499.5 284.5 L 523.5 284.5 L 523.5 308.5 L 499.5 308.5 Z M 430.5 284.5 L 454.5 284.5 L 454.5 308.5 L 430.5 308.5 Z M 361.5 284.5 L 385.5 284.5 L 385.5 308.5 L 361.5 308.5 Z M 292.5 284.5 L 317.5 284.5 L 317.5 308.5 L 292.5 308.5 Z M 981.5 470.5 L 1005.5 470.5 L 1005.5 487.5 L 981.5 487.5 Z M 1119.5 470.5 L 1143.5 470.5 L 1143.5 487.5 L 1119.5 487.5 Z M 568.5 470.5 L 592.5 470.5 L 592.5 494.5 L 568.5 494.5 Z M 1394.5 470.5 L 1418.5 470.5 L 1418.5 494.5 L 1394.5 494.5 Z M 1119.5 487.5 L 1143.5 487.5 L 1143.5 494.5 L 1119.5 494.5 Z M 981.5 487.5 L 1005.5 487.5 L 1005.5 494.5 L 981.5 494.5 Z M 223.5 762.5 L 248.5 762.5 L 248.5 786.5 L 223.5 786.5 Z M 1670.5 762.5 L 1694.5 762.5 L 1694.5 786.5 L 1670.5 786.5 Z M 1601.5 762.5 L 1625.5 762.5 L 1625.5 786.5 L 1601.5 786.5 Z M 1532.5 762.5 L 1556.5 762.5 L 1556.5 786.5 L 1532.5 786.5 Z M 1463.5 762.5 L 1487.5 762.5 L 1487.5 786.5 L 1463.5 786.5 Z M 1394.5 762.5 L 1418.5 762.5 L 1418.5 786.5 L 1394.5 786.5 Z M 1325.5 762.5 L 1350.5 762.5 L 1350.5 786.5 L 1325.5 786.5 Z M 1256.5 762.5 L 1281.5 762.5 L 1281.5 786.5 L 1256.5 786.5 Z M 1187.5 762.5 L 1212.5 762.5 L 1212.5 786.5 L 1187.5 786.5 Z M 1119.5 762.5 L 1143.5 762.5 L 1143.5 786.5 L 1119.5 786.5 Z M 1050.5 762.5 L 1074.5 762.5 L 1074.5 786.5 L 1050.5 786.5 Z M 981.5 762.5 L 1005.5 762.5 L 1005.5 786.5 L 981.5 786.5 Z M 912.5 762.5 L 936.5 762.5 L 936.5 786.5 L 912.5 786.5 Z M 843.5 762.5 L 867.5 762.5 L 867.5 786.5 L 843.5 786.5 Z M 774.5 762.5 L 799.5 762.5 L 799.5 786.5 L 774.5 786.5 Z M 705.5 762.5 L 730.5 762.5 L 730.5 786.5 L 705.5 786.5 Z M 636.5 762.5 L 661.5 762.5 L 661.5 786.5 L 636.5 786.5 Z M 568.5 762.5 L 592.5 762.5 L 592.5 786.5 L 568.5 786.5 Z M 499.5 762.5 L 523.5 762.5 L 523.5 786.5 L 499.5 786.5 Z M 430.5 762.5 L 454.5 762.5 L 454.5 786.5 L 430.5 786.5 Z M 361.5 762.5 L 385.5 762.5 L 385.5 786.5 L 361.5 786.5 Z M 292.5 762.5 L 317.5 762.5 L 317.5 786.5 L 292.5 786.5 Z M 292.5 762.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>
@@ -160,6 +160,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 380.445312 594.285156 L 368.621094 594.285156 L 365.378906 603.5 L 361.214844 603.5 L 372.15625 572.828125 L 377.203125 572.828125 L 387.976562 603.5 L 383.597656 603.5 Z M 379.351562 591.003906 L 374.636719 577.035156 L 369.589844 591.003906 Z M 379.351562 591.003906 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 361 503 L 385 503 M 361 479 L 385 479 M 361 479 L 361 503 M 385 479 L 385 503 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 361 503 L 385 503 M 361 479 L 385 479 M 385 503 L 385 479 M 361 503 L 361 479 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 201 300 L 201 309 M 196 305 L 205 305 M 200 306 L 202 306 M 200 304 L 202 304 M 200 304 L 200 306 M 202 304 L 202 306 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>