diff --git a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.svg b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.svg
index fc7b1af..6d2f799 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_0.svg
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image416" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image388"/>
+  <use xlink:href="#image416"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image388"/>
+  <use xlink:href="#image416"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1237.5 768.5 L 1271.5 768.5 L 1271.5 864.5 L 1237.5 864.5 Z M 673.5 768.5 L 708.5 768.5 L 708.5 864.5 L 673.5 864.5 Z M 772.5 768.5 L 806.5 768.5 L 806.5 864.5 L 772.5 864.5 Z M 870.5 768.5 L 905.5 768.5 L 905.5 864.5 L 870.5 864.5 Z M 1056.5 768.5 L 1090.5 768.5 L 1090.5 864.5 L 1056.5 864.5 Z M 1154.5 768.5 L 1189.5 768.5 L 1189.5 864.5 L 1154.5 864.5 Z M 1154.5 768.5 "/>
 </clipPath>
-<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image389"/>
+  <use xlink:href="#image417"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 614.5 218.5 L 648.5 218.5 L 648.5 365.5 L 614.5 365.5 Z M 1270.5 226.5 L 1305.5 226.5 L 1305.5 373.5 L 1270.5 373.5 Z M 1172.5 226.5 L 1206.5 226.5 L 1206.5 373.5 L 1172.5 373.5 Z M 1024.5 226.5 L 1058.5 226.5 L 1058.5 373.5 L 1024.5 373.5 Z M 934.5 226.5 L 969.5 226.5 L 969.5 373.5 L 934.5 373.5 Z M 845.5 226.5 L 879.5 226.5 L 879.5 373.5 L 845.5 373.5 Z M 845.5 226.5 "/>
 </clipPath>
-<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image418" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image390"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface385">
+<g id="surface413">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/a2111o/sky130_fd_sc_lp__a2111o_1.svg b/cells/a2111o/sky130_fd_sc_lp__a2111o_1.svg
index 32e334a..7e95367 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_1.svg
+++ b/cells/a2111o/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.5 111.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 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="#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 1286.5 670.5 L 1321.5 670.5 L 1321.5 862.5 L 1286.5 862.5 Z M 596.5 670.5 L 631.5 670.5 L 631.5 862.5 L 596.5 862.5 Z M 796.5 670.5 L 830.5 670.5 L 830.5 862.5 L 796.5 862.5 Z M 894.5 670.5 L 929.5 670.5 L 929.5 862.5 L 894.5 862.5 Z M 1018.5 670.5 L 1052.5 670.5 L 1052.5 862.5 L 1018.5 862.5 Z M 1204.5 670.5 L 1238.5 670.5 L 1238.5 862.5 L 1204.5 862.5 Z M 1204.5 670.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 1293.5 209.5 L 1327.5 209.5 L 1327.5 498.5 L 1293.5 498.5 Z M 587.5 209.5 L 622.5 209.5 L 622.5 498.5 L 587.5 498.5 Z M 805.5 209.5 L 839.5 209.5 L 839.5 498.5 L 805.5 498.5 Z M 894.5 209.5 L 929.5 209.5 L 929.5 498.5 L 894.5 498.5 Z M 1018.5 209.5 L 1052.5 209.5 L 1052.5 498.5 L 1018.5 498.5 Z M 1195.5 209.5 L 1229.5 209.5 L 1229.5 498.5 L 1195.5 498.5 Z M 1195.5 209.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 882.476562 527.503906 L 871.90625 527.503906 L 871.90625 523.261719 L 873.722656 523.058594 L 875.339844 522.789062 L 876.753906 522.453125 L 877.964844 522.183594 L 878.972656 521.847656 L 879.847656 521.445312 L 880.523438 521.039062 L 881.128906 520.570312 L 881.667969 520.03125 L 882.207031 519.355469 L 882.675781 518.617188 L 883.148438 517.742188 L 883.351562 517.269531 L 883.550781 516.730469 L 883.753906 516.125 L 884.023438 515.386719 L 884.226562 514.644531 L 884.496094 513.769531 L 888.398438 513.769531 L 888.398438 561.5 L 882.476562 561.5 Z M 882.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 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/a2111o/sky130_fd_sc_lp__a2111o_2.svg b/cells/a2111o/sky130_fd_sc_lp__a2111o_2.svg
index a29db71..7e0fc31 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_2.svg
+++ b/cells/a2111o/sky130_fd_sc_lp__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 539.5 L 367.5 539.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="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="#image376"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1319.5 670.5 L 1354.5 670.5 L 1354.5 862.5 L 1319.5 862.5 Z M 528.5 670.5 L 562.5 670.5 L 562.5 862.5 L 528.5 862.5 Z M 626.5 670.5 L 661.5 670.5 L 661.5 862.5 L 626.5 862.5 Z M 866.5 670.5 L 900.5 670.5 L 900.5 862.5 L 866.5 862.5 Z M 964.5 670.5 L 999.5 670.5 L 999.5 862.5 L 964.5 862.5 Z M 1085.5 670.5 L 1119.5 670.5 L 1119.5 862.5 L 1085.5 862.5 Z M 1196.5 670.5 L 1230.5 670.5 L 1230.5 862.5 L 1196.5 862.5 Z M 1196.5 670.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask2">
 <rect 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 209.5 L 1354.5 209.5 L 1354.5 498.5 L 1319.5 498.5 Z M 509.5 209.5 L 544.5 209.5 L 544.5 498.5 L 509.5 498.5 Z M 608.5 209.5 L 642.5 209.5 L 642.5 498.5 L 608.5 498.5 Z M 866.5 209.5 L 900.5 209.5 L 900.5 498.5 L 866.5 498.5 Z M 948.5 209.5 L 983.5 209.5 L 983.5 498.5 L 948.5 498.5 Z M 1072.5 209.5 L 1106.5 209.5 L 1106.5 498.5 L 1072.5 498.5 Z M 1196.5 209.5 L 1230.5 209.5 L 1230.5 498.5 L 1196.5 498.5 Z M 1196.5 209.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface373">
+<g id="surface401">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -215,6 +215,5 @@
 <path style=" 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.476562 527.503906 L 925.90625 527.503906 L 925.90625 523.261719 L 927.722656 523.058594 L 929.339844 522.789062 L 930.753906 522.453125 L 931.964844 522.183594 L 932.972656 521.847656 L 933.847656 521.445312 L 934.523438 521.039062 L 935.128906 520.570312 L 935.667969 520.03125 L 936.207031 519.355469 L 936.675781 518.617188 L 937.148438 517.742188 L 937.351562 517.269531 L 937.550781 516.730469 L 937.753906 516.125 L 938.023438 515.386719 L 938.226562 514.644531 L 938.496094 513.769531 L 942.398438 513.769531 L 942.398438 561.5 L 936.476562 561.5 Z M 936.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 886 562 L 925 562 M 886 523 L 925 523 M 886 523 L 886 562 M 925 523 L 925 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 886 562 L 925 562 M 886 523 L 925 523 M 925 562 L 925 523 M 886 562 L 886 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/a2111o/sky130_fd_sc_lp__a2111o_4.svg b/cells/a2111o/sky130_fd_sc_lp__a2111o_4.svg
index 0e371e5..a9e2ede 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_4.svg
+++ b/cells/a2111o/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 646.5 538.5 L 1117.5 538.5 L 1117.5 554.5 L 646.5 554.5 Z M 646.5 538.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image326"/>
+  <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 1585.5 644.5 L 1613.5 644.5 L 1613.5 799.5 L 1585.5 799.5 Z M 329.5 644.5 L 356.5 644.5 L 356.5 799.5 L 329.5 799.5 Z M 408.5 644.5 L 435.5 644.5 L 435.5 799.5 L 408.5 799.5 Z M 487.5 644.5 L 514.5 644.5 L 514.5 799.5 L 487.5 799.5 Z M 580.5 644.5 L 608.5 644.5 L 608.5 799.5 L 580.5 799.5 Z M 660.5 644.5 L 687.5 644.5 L 687.5 799.5 L 660.5 799.5 Z M 850.5 644.5 L 877.5 644.5 L 877.5 799.5 L 850.5 799.5 Z M 929.5 644.5 L 956.5 644.5 L 956.5 799.5 L 929.5 799.5 Z M 1008.5 644.5 L 1035.5 644.5 L 1035.5 799.5 L 1008.5 799.5 Z M 1190.5 644.5 L 1217.5 644.5 L 1217.5 799.5 L 1190.5 799.5 Z M 1269.5 644.5 L 1296.5 644.5 L 1296.5 799.5 L 1269.5 799.5 Z M 1348.5 644.5 L 1376.5 644.5 L 1376.5 799.5 L 1348.5 799.5 Z M 1427.5 644.5 L 1455.5 644.5 L 1455.5 799.5 L 1427.5 799.5 Z M 1506.5 644.5 L 1534.5 644.5 L 1534.5 799.5 L 1506.5 799.5 Z M 1506.5 644.5 "/>
 </clipPath>
-<image id="image327" 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="#image327"/>
+  <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 316.5 273.5 L 343.5 273.5 L 343.5 504.5 L 316.5 504.5 Z M 395.5 273.5 L 422.5 273.5 L 422.5 504.5 L 395.5 504.5 Z M 553.5 273.5 L 580.5 273.5 L 580.5 504.5 L 553.5 504.5 Z M 1427.5 273.5 L 1455.5 273.5 L 1455.5 504.5 L 1427.5 504.5 Z M 1190.5 273.5 L 1217.5 273.5 L 1217.5 504.5 L 1190.5 504.5 Z M 1506.5 273.5 L 1534.5 273.5 L 1534.5 504.5 L 1506.5 504.5 Z M 1269.5 273.5 L 1296.5 273.5 L 1296.5 504.5 L 1269.5 504.5 Z M 474.5 273.5 L 501.5 273.5 L 501.5 504.5 L 474.5 504.5 Z M 1348.5 273.5 L 1376.5 273.5 L 1376.5 504.5 L 1348.5 504.5 Z M 1585.5 273.5 L 1613.5 273.5 L 1613.5 504.5 L 1585.5 504.5 Z M 929.5 289.5 L 956.5 289.5 L 956.5 521.5 L 929.5 521.5 Z M 1008.5 289.5 L 1035.5 289.5 L 1035.5 521.5 L 1008.5 521.5 Z M 807.5 289.5 L 834.5 289.5 L 834.5 521.5 L 807.5 521.5 Z M 728.5 289.5 L 755.5 289.5 L 755.5 521.5 L 728.5 521.5 Z M 728.5 289.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image329" 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="#image329"/>
+  <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="surface323">
+<g id="surface352">
 <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 1669.886719 535.042969 L 1684 555.5 L 1677.707031 555.5 L 1666.824219 538.871094 L 1655.882812 555.5 L 1649.703125 555.5 L 1663.816406 535.042969 L 1650.578125 515.625 L 1656.757812 515.625 L 1666.988281 531.269531 L 1677.269531 515.625 L 1683.34375 515.625 Z M 1669.886719 535.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 559 L 1681 559 M 1649 528 L 1681 528 M 1649 528 L 1649 559 M 1681 528 L 1681 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 1649 559 L 1681 559 M 1649 528 L 1681 528 M 1681 559 L 1681 528 M 1649 559 L 1649 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/a2111o/sky130_fd_sc_lp__a2111o_lp.svg b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.svg
index c93dad6..093151f 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.svg
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.5 111.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 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="#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 1217.5 757.5 L 1252.5 757.5 L 1252.5 853.5 L 1217.5 853.5 Z M 1316.5 757.5 L 1350.5 757.5 L 1350.5 853.5 L 1316.5 853.5 Z M 1135.5 757.5 L 1169.5 757.5 L 1169.5 853.5 L 1135.5 853.5 Z M 1405.5 757.5 L 1440.5 757.5 L 1440.5 853.5 L 1405.5 853.5 Z M 722.5 768.5 L 757.5 768.5 L 757.5 864.5 L 722.5 864.5 Z M 903.5 768.5 L 938.5 768.5 L 938.5 864.5 L 903.5 864.5 Z M 821.5 768.5 L 855.5 768.5 L 855.5 864.5 L 821.5 864.5 Z M 640.5 768.5 L 674.5 768.5 L 674.5 864.5 L 640.5 864.5 Z M 452.5 768.5 L 486.5 768.5 L 486.5 864.5 L 452.5 864.5 Z M 541.5 768.5 L 576.5 768.5 L 576.5 864.5 L 541.5 864.5 Z M 541.5 768.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 452.5 220.5 L 509.5 220.5 L 509.5 449.5 L 452.5 449.5 Z M 564.5 220.5 L 622.5 220.5 L 622.5 449.5 L 564.5 449.5 Z M 1267.5 220.5 L 1324.5 220.5 L 1324.5 449.5 L 1267.5 449.5 Z M 1145.5 220.5 L 1203.5 220.5 L 1203.5 449.5 L 1145.5 449.5 Z M 1405.5 220.5 L 1463.5 220.5 L 1463.5 449.5 L 1405.5 449.5 Z M 846.5 242.5 L 903.5 242.5 L 903.5 471.5 L 846.5 471.5 Z M 846.5 242.5 "/>
 </clipPath>
-<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image387"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 965.824219 451.320312 L 983.191406 476.5 L 975.449219 476.5 L 962.050781 456.035156 L 948.589844 476.5 L 940.980469 476.5 L 958.351562 451.320312 L 942.058594 427.421875 L 949.664062 427.421875 L 962.253906 446.675781 L 974.910156 427.421875 L 982.382812 427.421875 Z M 965.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 941 647 L 980 647 M 941 608 L 980 608 M 941 608 L 941 647 M 980 608 L 980 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 941 647 L 980 647 M 941 608 L 980 608 M 980 647 L 980 608 M 941 647 L 941 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/a2111o/sky130_fd_sc_lp__a2111o_m.svg b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.svg
index d3f61bb..44c27f8 100644
--- a/cells/a2111o/sky130_fd_sc_lp__a2111o_m.svg
+++ b/cells/a2111o/sky130_fd_sc_lp__a2111o_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.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 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="#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 1201.5 768.5 L 1236.5 768.5 L 1236.5 864.5 L 1201.5 864.5 Z M 674.5 768.5 L 709.5 768.5 L 709.5 864.5 L 674.5 864.5 Z M 823.5 768.5 L 858.5 768.5 L 858.5 864.5 L 823.5 864.5 Z M 922.5 768.5 L 956.5 768.5 L 956.5 864.5 L 922.5 864.5 Z M 1020.5 768.5 L 1055.5 768.5 L 1055.5 864.5 L 1020.5 864.5 Z M 1119.5 768.5 L 1153.5 768.5 L 1153.5 864.5 L 1119.5 864.5 Z M 1119.5 768.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 674.5 241.5 L 709.5 241.5 L 709.5 337.5 L 674.5 337.5 Z M 848.5 399.5 L 883.5 399.5 L 883.5 495.5 L 848.5 495.5 Z M 1220.5 399.5 L 1254.5 399.5 L 1254.5 495.5 L 1220.5 495.5 Z M 1112.5 399.5 L 1146.5 399.5 L 1146.5 495.5 L 1112.5 495.5 Z M 1013.5 399.5 L 1048.5 399.5 L 1048.5 495.5 L 1013.5 495.5 Z M 931.5 399.5 L 965.5 399.5 L 965.5 495.5 L 931.5 495.5 Z M 931.5 399.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/a2111oi/sky130_fd_sc_lp__a2111oi_0.svg b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.svg
index 224486b..4b687bf 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.svg
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1120.5 768.5 L 1154.5 768.5 L 1154.5 864.5 L 1120.5 864.5 Z M 726.5 768.5 L 760.5 768.5 L 760.5 864.5 L 726.5 864.5 Z M 824.5 768.5 L 859.5 768.5 L 859.5 864.5 L 824.5 864.5 Z M 939.5 768.5 L 973.5 768.5 L 973.5 864.5 L 939.5 864.5 Z M 1038.5 768.5 L 1072.5 768.5 L 1072.5 864.5 L 1038.5 864.5 Z M 1038.5 768.5 "/>
 </clipPath>
-<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1127.5 218.5 L 1161.5 218.5 L 1161.5 365.5 L 1127.5 365.5 Z M 742.5 218.5 L 776.5 218.5 L 776.5 365.5 L 742.5 365.5 Z M 824.5 218.5 L 859.5 218.5 L 859.5 365.5 L 824.5 365.5 Z M 907.5 218.5 L 941.5 218.5 L 941.5 365.5 L 907.5 365.5 Z M 1005.5 218.5 L 1040.5 218.5 L 1040.5 365.5 L 1005.5 365.5 Z M 1005.5 218.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface395">
+<g id="surface423">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -226,6 +226,5 @@
 <path style=" 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/a2111oi/sky130_fd_sc_lp__a2111oi_1.svg b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.svg
index 85b0db6..108522f 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_1.svg
+++ b/cells/a2111oi/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.5 111.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 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="#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 1197.5 672.5 L 1231.5 672.5 L 1231.5 864.5 L 1197.5 864.5 Z M 680.5 672.5 L 714.5 672.5 L 714.5 864.5 L 680.5 864.5 Z M 805.5 672.5 L 839.5 672.5 L 839.5 864.5 L 805.5 864.5 Z M 984.5 672.5 L 1018.5 672.5 L 1018.5 864.5 L 984.5 864.5 Z M 1114.5 672.5 L 1149.5 672.5 L 1149.5 864.5 L 1114.5 864.5 Z M 1114.5 672.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 1197.5 209.5 L 1231.5 209.5 L 1231.5 498.5 L 1197.5 498.5 Z M 722.5 209.5 L 757.5 209.5 L 757.5 498.5 L 722.5 498.5 Z M 832.5 209.5 L 867.5 209.5 L 867.5 498.5 L 832.5 498.5 Z M 936.5 209.5 L 970.5 209.5 L 970.5 498.5 L 936.5 498.5 Z M 1066.5 209.5 L 1101.5 209.5 L 1101.5 498.5 L 1066.5 498.5 Z M 1066.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1186.554688 712.246094 L 1186.554688 731.5 L 1180.292969 731.5 L 1180.292969 712.246094 L 1161.375 682.421875 L 1169.117188 682.421875 L 1183.523438 706.320312 L 1197.527344 682.421875 L 1205 682.421875 Z M 1186.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 1162 392 L 1201 392 M 1162 353 L 1201 353 M 1162 353 L 1162 392 M 1201 353 L 1201 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 1162 392 L 1201 392 M 1162 353 L 1201 353 M 1201 392 L 1201 353 M 1162 392 L 1162 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/a2111oi/sky130_fd_sc_lp__a2111oi_2.svg b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.svg
index adf0a6c..5a6c09e 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_2.svg
+++ b/cells/a2111oi/sky130_fd_sc_lp__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 539.5 L 256.5 539.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="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 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="#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 1421.5 672.5 L 1456.5 672.5 L 1456.5 864.5 L 1421.5 864.5 Z M 397.5 672.5 L 431.5 672.5 L 431.5 864.5 L 397.5 864.5 Z M 496.5 672.5 L 530.5 672.5 L 530.5 864.5 L 496.5 864.5 Z M 594.5 672.5 L 628.5 672.5 L 628.5 864.5 L 594.5 864.5 Z M 718.5 672.5 L 752.5 672.5 L 752.5 864.5 L 718.5 864.5 Z M 827.5 672.5 L 861.5 672.5 L 861.5 864.5 L 827.5 864.5 Z M 950.5 672.5 L 985.5 672.5 L 985.5 864.5 L 950.5 864.5 Z M 1049.5 672.5 L 1083.5 672.5 L 1083.5 864.5 L 1049.5 864.5 Z M 1209.5 672.5 L 1244.5 672.5 L 1244.5 864.5 L 1209.5 864.5 Z M 1323.5 672.5 L 1357.5 672.5 L 1357.5 864.5 L 1323.5 864.5 Z M 1323.5 672.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 1421.5 209.5 L 1456.5 209.5 L 1456.5 498.5 L 1421.5 498.5 Z M 397.5 209.5 L 431.5 209.5 L 431.5 498.5 L 397.5 498.5 Z M 496.5 209.5 L 530.5 209.5 L 530.5 498.5 L 496.5 498.5 Z M 594.5 209.5 L 628.5 209.5 L 628.5 498.5 L 594.5 498.5 Z M 693.5 209.5 L 727.5 209.5 L 727.5 498.5 L 693.5 498.5 Z M 800.5 209.5 L 835.5 209.5 L 835.5 498.5 L 800.5 498.5 Z M 899.5 209.5 L 933.5 209.5 L 933.5 498.5 L 899.5 498.5 Z M 1117.5 209.5 L 1151.5 209.5 L 1151.5 498.5 L 1117.5 498.5 Z M 1215.5 209.5 L 1250.5 209.5 L 1250.5 498.5 L 1215.5 498.5 Z M 1314.5 209.5 L 1348.5 209.5 L 1348.5 498.5 L 1314.5 498.5 Z M 1314.5 209.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/a2111oi/sky130_fd_sc_lp__a2111oi_4.svg b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.svg
index 7015796..069e984 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_4.svg
+++ b/cells/a2111oi/sky130_fd_sc_lp__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="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image369"/>
+  <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 1612.5 623.5 L 1635.5 623.5 L 1635.5 749.5 L 1612.5 749.5 Z M 263.5 623.5 L 286.5 623.5 L 286.5 749.5 L 263.5 749.5 Z M 328.5 623.5 L 350.5 623.5 L 350.5 749.5 L 328.5 749.5 Z M 392.5 623.5 L 415.5 623.5 L 415.5 749.5 L 392.5 749.5 Z M 457.5 623.5 L 479.5 623.5 L 479.5 749.5 L 457.5 749.5 Z M 521.5 623.5 L 544.5 623.5 L 544.5 749.5 L 521.5 749.5 Z M 586.5 623.5 L 608.5 623.5 L 608.5 749.5 L 586.5 749.5 Z M 650.5 623.5 L 673.5 623.5 L 673.5 749.5 L 650.5 749.5 Z M 715.5 623.5 L 737.5 623.5 L 737.5 749.5 L 715.5 749.5 Z M 796.5 623.5 L 818.5 623.5 L 818.5 749.5 L 796.5 749.5 Z M 860.5 623.5 L 883.5 623.5 L 883.5 749.5 L 860.5 749.5 Z M 925.5 623.5 L 947.5 623.5 L 947.5 749.5 L 925.5 749.5 Z M 989.5 623.5 L 1012.5 623.5 L 1012.5 749.5 L 989.5 749.5 Z M 1147.5 623.5 L 1169.5 623.5 L 1169.5 749.5 L 1147.5 749.5 Z M 1211.5 623.5 L 1234.5 623.5 L 1234.5 749.5 L 1211.5 749.5 Z M 1276.5 623.5 L 1298.5 623.5 L 1298.5 749.5 L 1276.5 749.5 Z M 1340.5 623.5 L 1363.5 623.5 L 1363.5 749.5 L 1340.5 749.5 Z M 1419.5 623.5 L 1441.5 623.5 L 1441.5 749.5 L 1419.5 749.5 Z M 1483.5 623.5 L 1506.5 623.5 L 1506.5 749.5 L 1483.5 749.5 Z M 1548.5 623.5 L 1570.5 623.5 L 1570.5 749.5 L 1548.5 749.5 Z M 1548.5 623.5 "/>
 </clipPath>
-<image id="image370" 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="#image370"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1601.5 320.5 L 1624.5 320.5 L 1624.5 509.5 L 1601.5 509.5 Z M 263.5 320.5 L 286.5 320.5 L 286.5 509.5 L 263.5 509.5 Z M 328.5 320.5 L 350.5 320.5 L 350.5 509.5 L 328.5 509.5 Z M 392.5 320.5 L 415.5 320.5 L 415.5 509.5 L 392.5 509.5 Z M 457.5 320.5 L 479.5 320.5 L 479.5 509.5 L 457.5 509.5 Z M 521.5 320.5 L 544.5 320.5 L 544.5 509.5 L 521.5 509.5 Z M 586.5 320.5 L 608.5 320.5 L 608.5 509.5 L 586.5 509.5 Z M 650.5 320.5 L 673.5 320.5 L 673.5 509.5 L 650.5 509.5 Z M 715.5 320.5 L 737.5 320.5 L 737.5 509.5 L 715.5 509.5 Z M 857.5 320.5 L 880.5 320.5 L 880.5 509.5 L 857.5 509.5 Z M 922.5 320.5 L 944.5 320.5 L 944.5 509.5 L 922.5 509.5 Z M 986.5 320.5 L 1009.5 320.5 L 1009.5 509.5 L 986.5 509.5 Z M 1051.5 320.5 L 1073.5 320.5 L 1073.5 509.5 L 1051.5 509.5 Z M 1115.5 320.5 L 1138.5 320.5 L 1138.5 509.5 L 1115.5 509.5 Z M 1180.5 320.5 L 1202.5 320.5 L 1202.5 509.5 L 1180.5 509.5 Z M 1244.5 320.5 L 1267.5 320.5 L 1267.5 509.5 L 1244.5 509.5 Z M 1312.5 320.5 L 1334.5 320.5 L 1334.5 509.5 L 1312.5 509.5 Z M 1394.5 320.5 L 1417.5 320.5 L 1417.5 509.5 L 1394.5 509.5 Z M 1459.5 320.5 L 1481.5 320.5 L 1481.5 509.5 L 1459.5 509.5 Z M 1537.5 320.5 L 1559.5 320.5 L 1559.5 509.5 L 1537.5 509.5 Z M 1537.5 320.5 "/>
 </clipPath>
-<image id="image371" 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="#image371"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image372" 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="#image372"/>
+  <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="surface366">
+<g id="surface395">
 <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 475.109375 584.542969 L 468.28125 584.542969 L 468.28125 581.804688 L 469.457031 581.675781 L 470.5 581.5 L 471.414062 581.28125 L 472.195312 581.109375 L 472.847656 580.890625 L 473.414062 580.628906 L 473.847656 580.371094 L 474.238281 580.066406 L 474.585938 579.71875 L 474.933594 579.28125 L 475.238281 578.804688 L 475.542969 578.238281 L 475.675781 577.933594 L 475.804688 577.585938 L 475.933594 577.195312 L 476.109375 576.71875 L 476.238281 576.238281 L 476.414062 575.675781 L 478.933594 575.675781 L 478.933594 606.5 L 475.109375 606.5 Z M 475.109375 584.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 442 501 L 468 501 M 442 476 L 468 476 M 442 476 L 442 501 M 468 476 L 468 501 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 442 501 L 468 501 M 442 476 L 468 476 M 468 501 L 468 476 M 442 501 L 442 476 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/a2111oi/sky130_fd_sc_lp__a2111oi_lp.svg b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.svg
index 02a1eec..cd8234f 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.svg
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image383"/>
+  <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 576.5 757.5 L 610.5 757.5 L 610.5 853.5 L 576.5 853.5 Z M 665.5 757.5 L 699.5 757.5 L 699.5 853.5 L 665.5 853.5 Z M 846.5 757.5 L 881.5 757.5 L 881.5 853.5 L 846.5 853.5 Z M 764.5 757.5 L 798.5 757.5 L 798.5 853.5 L 764.5 853.5 Z M 1066.5 768.5 L 1101.5 768.5 L 1101.5 864.5 L 1066.5 864.5 Z M 1330.5 768.5 L 1364.5 768.5 L 1364.5 864.5 L 1330.5 864.5 Z M 1149.5 768.5 L 1183.5 768.5 L 1183.5 864.5 L 1149.5 864.5 Z M 1247.5 768.5 L 1282.5 768.5 L 1282.5 864.5 L 1247.5 864.5 Z M 1247.5 768.5 "/>
 </clipPath>
-<image id="image384" 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="#image384"/>
+  <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 1270.5 220.5 L 1327.5 220.5 L 1327.5 449.5 L 1270.5 449.5 Z M 560.5 220.5 L 617.5 220.5 L 617.5 449.5 L 560.5 449.5 Z M 681.5 220.5 L 738.5 220.5 L 738.5 449.5 L 681.5 449.5 Z M 1027.5 220.5 L 1085.5 220.5 L 1085.5 449.5 L 1027.5 449.5 Z M 1140.5 220.5 L 1197.5 220.5 L 1197.5 449.5 L 1140.5 449.5 Z M 1140.5 220.5 "/>
 </clipPath>
-<image id="image385" 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="#image385"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image386" 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="#image386"/>
+  <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="surface380">
+<g id="surface408">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -213,6 +213,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1186.554688 796.246094 L 1186.554688 815.5 L 1180.292969 815.5 L 1180.292969 796.246094 L 1161.375 766.421875 L 1169.117188 766.421875 L 1183.523438 790.320312 L 1197.527344 766.421875 L 1205 766.421875 Z M 1186.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 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 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/a2111oi/sky130_fd_sc_lp__a2111oi_m.svg b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.svg
index 4d34791..0e78145 100644
--- a/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.svg
+++ b/cells/a2111oi/sky130_fd_sc_lp__a2111oi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image384"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1133.5 768.5 L 1167.5 768.5 L 1167.5 864.5 L 1133.5 864.5 Z M 720.5 768.5 L 755.5 768.5 L 755.5 864.5 L 720.5 864.5 Z M 819.5 768.5 L 853.5 768.5 L 853.5 864.5 L 819.5 864.5 Z M 952.5 768.5 L 986.5 768.5 L 986.5 864.5 L 952.5 864.5 Z M 1050.5 768.5 L 1085.5 768.5 L 1085.5 864.5 L 1050.5 864.5 Z M 1050.5 768.5 "/>
 </clipPath>
-<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1133.5 211.5 L 1167.5 211.5 L 1167.5 307.5 L 1133.5 307.5 Z M 720.5 211.5 L 755.5 211.5 L 755.5 307.5 L 720.5 307.5 Z M 803.5 211.5 L 837.5 211.5 L 837.5 307.5 L 803.5 307.5 Z M 885.5 211.5 L 920.5 211.5 L 920.5 307.5 L 885.5 307.5 Z M 984.5 211.5 L 1018.5 211.5 L 1018.5 307.5 L 984.5 307.5 Z M 984.5 211.5 "/>
 </clipPath>
-<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image386"/>
+  <use xlink:href="#image414"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image387"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface381">
+<g id="surface409">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -213,6 +213,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 772.476562 273.503906 L 761.90625 273.503906 L 761.90625 269.261719 L 763.722656 269.058594 L 765.339844 268.789062 L 766.753906 268.453125 L 767.964844 268.183594 L 768.972656 267.847656 L 769.847656 267.445312 L 770.523438 267.039062 L 771.128906 266.570312 L 771.667969 266.03125 L 772.207031 265.355469 L 772.675781 264.617188 L 773.148438 263.742188 L 773.351562 263.269531 L 773.550781 262.730469 L 773.753906 262.125 L 774.023438 261.386719 L 774.226562 260.644531 L 774.496094 259.769531 L 778.398438 259.769531 L 778.398438 307.5 L 772.476562 307.5 Z M 772.476562 273.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 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/a211o/sky130_fd_sc_lp__a211o_0.svg b/cells/a211o/sky130_fd_sc_lp__a211o_0.svg
index c0d1007..1bc291f 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_0.svg
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 1204.5 753.5 L 1238.5 753.5 L 1238.5 849.5 L 1204.5 849.5 Z M 670.5 753.5 L 704.5 753.5 L 704.5 849.5 L 670.5 849.5 Z M 846.5 753.5 L 881.5 753.5 L 881.5 849.5 L 846.5 849.5 Z M 929.5 753.5 L 963.5 753.5 L 963.5 849.5 L 929.5 849.5 Z M 1027.5 753.5 L 1062.5 753.5 L 1062.5 849.5 L 1027.5 849.5 Z M 1027.5 753.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 1101.5 219.5 L 1135.5 219.5 L 1135.5 366.5 L 1101.5 366.5 Z M 894.5 219.5 L 929.5 219.5 L 929.5 366.5 L 894.5 366.5 Z M 1183.5 219.5 L 1217.5 219.5 L 1217.5 366.5 L 1183.5 366.5 Z M 1002.5 219.5 L 1036.5 219.5 L 1036.5 366.5 L 1002.5 366.5 Z M 669.5 267.5 L 703.5 267.5 L 703.5 414.5 L 669.5 414.5 Z M 669.5 267.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/a211o/sky130_fd_sc_lp__a211o_1.svg b/cells/a211o/sky130_fd_sc_lp__a211o_1.svg
index 5b6f0af..ee53ab0 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_1.svg
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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 1216.5 672.5 L 1251.5 672.5 L 1251.5 864.5 L 1216.5 864.5 Z M 678.5 672.5 L 712.5 672.5 L 712.5 864.5 L 678.5 864.5 Z M 879.5 672.5 L 914.5 672.5 L 914.5 864.5 L 879.5 864.5 Z M 969.5 672.5 L 1003.5 672.5 L 1003.5 864.5 L 969.5 864.5 Z M 1099.5 672.5 L 1134.5 672.5 L 1134.5 864.5 L 1099.5 864.5 Z M 1099.5 672.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 1216.5 209.5 L 1251.5 209.5 L 1251.5 498.5 L 1216.5 498.5 Z M 669.5 209.5 L 703.5 209.5 L 703.5 498.5 L 669.5 498.5 Z M 886.5 209.5 L 921.5 209.5 L 921.5 498.5 L 886.5 498.5 Z M 1003.5 209.5 L 1038.5 209.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1120.5 209.5 L 1154.5 209.5 L 1154.5 498.5 L 1120.5 498.5 Z M 1120.5 209.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 861.703125 615.332031 L 862.242188 610.28125 L 863.652344 606.175781 L 865.875 602.941406 L 868.90625 600.652344 L 872.742188 599.242188 L 877.457031 598.769531 L 879.609375 598.902344 L 881.695312 599.242188 L 883.648438 599.777344 L 885.398438 600.585938 L 887.015625 601.597656 L 888.5625 602.742188 L 889.773438 604.15625 L 890.851562 605.636719 L 891.660156 607.25 L 892.265625 608.933594 L 892.601562 610.820312 L 892.738281 612.773438 L 892.46875 615.53125 L 891.726562 618.089844 L 890.449219 620.445312 L 888.699219 622.667969 L 886.410156 624.753906 L 883.648438 626.574219 L 882.640625 627.179688 L 875.90625 630.8125 L 874.15625 631.824219 L 872.609375 632.832031 L 871.261719 633.84375 L 870.183594 634.851562 L 869.242188 635.863281 L 868.570312 636.875 L 868.230469 637.480469 L 867.960938 638.015625 L 867.761719 638.691406 L 867.558594 639.296875 L 867.355469 639.96875 L 867.289062 640.644531 L 892.402344 640.644531 L 892.402344 646.5 L 860.625 646.5 L 860.757812 644.144531 L 861.097656 641.988281 L 861.5 639.96875 L 862.039062 638.21875 L 862.644531 636.535156 L 863.386719 635.054688 L 864.191406 633.777344 L 865.203125 632.496094 L 866.414062 631.21875 L 867.761719 630.007812 L 869.308594 628.792969 L 871.125 627.582031 L 871.53125 627.3125 L 872.003906 627.042969 L 872.472656 626.707031 L 872.945312 626.4375 L 873.484375 626.167969 L 874.023438 625.832031 L 880.214844 622.332031 L 882.167969 621.050781 L 883.785156 619.640625 L 885.0625 618.15625 L 885.9375 616.542969 L 886.476562 614.792969 L 886.679688 612.90625 L 886.542969 611.628906 L 886.339844 610.347656 L 885.871094 609.203125 L 885.332031 608.125 L 884.523438 607.183594 L 883.648438 606.242188 L 882.707031 605.570312 L 881.765625 604.960938 L 880.6875 604.558594 L 879.609375 604.222656 L 878.464844 604.019531 L 877.253906 603.953125 L 874.628906 604.289062 L 872.40625 605.097656 L 870.589844 606.511719 L 869.242188 608.464844 L 868.300781 611.023438 L 867.761719 614.050781 L 867.695312 614.320312 L 867.695312 614.722656 L 867.625 614.925781 L 867.625 615.332031 Z M 861.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 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 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/a211o/sky130_fd_sc_lp__a211o_2.svg b/cells/a211o/sky130_fd_sc_lp__a211o_2.svg
index 1a88a7c..e3e6df4 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_2.svg
+++ b/cells/a211o/sky130_fd_sc_lp__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 539.5 L 478.5 539.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="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 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="#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 1260.5 672.5 L 1294.5 672.5 L 1294.5 864.5 L 1260.5 864.5 Z M 614.5 672.5 L 648.5 672.5 L 648.5 864.5 L 614.5 864.5 Z M 712.5 672.5 L 746.5 672.5 L 746.5 864.5 L 712.5 864.5 Z M 930.5 672.5 L 964.5 672.5 L 964.5 864.5 L 930.5 864.5 Z M 1012.5 672.5 L 1047.5 672.5 L 1047.5 864.5 L 1012.5 864.5 Z M 1161.5 672.5 L 1196.5 672.5 L 1196.5 864.5 L 1161.5 864.5 Z M 1161.5 672.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 1260.5 209.5 L 1294.5 209.5 L 1294.5 498.5 L 1260.5 498.5 Z M 614.5 209.5 L 648.5 209.5 L 648.5 498.5 L 614.5 498.5 Z M 712.5 209.5 L 746.5 209.5 L 746.5 498.5 L 712.5 498.5 Z M 930.5 209.5 L 964.5 209.5 L 964.5 498.5 L 930.5 498.5 Z M 1054.5 209.5 L 1088.5 209.5 L 1088.5 498.5 L 1054.5 498.5 Z M 1164.5 209.5 L 1198.5 209.5 L 1198.5 498.5 L 1164.5 498.5 Z M 1164.5 209.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1378.476562 611.953125 L 1367.90625 611.953125 L 1367.90625 607.714844 L 1369.722656 607.511719 L 1371.339844 607.242188 L 1372.753906 606.90625 L 1373.964844 606.636719 L 1374.972656 606.300781 L 1375.847656 605.894531 L 1376.523438 605.492188 L 1377.128906 605.019531 L 1377.667969 604.480469 L 1378.207031 603.808594 L 1378.675781 603.066406 L 1379.148438 602.191406 L 1379.351562 601.722656 L 1379.550781 601.183594 L 1379.753906 600.578125 L 1380.023438 599.835938 L 1380.226562 599.097656 L 1380.496094 598.222656 L 1384.398438 598.222656 L 1384.398438 645.953125 L 1378.476562 645.953125 Z M 1378.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 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/a211o/sky130_fd_sc_lp__a211o_4.svg b/cells/a211o/sky130_fd_sc_lp__a211o_4.svg
index 202e4cc..36ff1b7 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_4.svg
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 539.5 L 174.5 539.5 Z M 174.5 127.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 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="#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 1580.5 667.5 L 1613.5 667.5 L 1613.5 852.5 L 1580.5 852.5 Z M 453.5 667.5 L 486.5 667.5 L 486.5 852.5 L 453.5 852.5 Z M 548.5 667.5 L 581.5 667.5 L 581.5 852.5 L 548.5 852.5 Z M 643.5 667.5 L 676.5 667.5 L 676.5 852.5 L 643.5 852.5 Z M 741.5 667.5 L 774.5 667.5 L 774.5 852.5 L 741.5 852.5 Z M 836.5 667.5 L 869.5 667.5 L 869.5 852.5 L 836.5 852.5 Z M 934.5 667.5 L 968.5 667.5 L 968.5 852.5 L 934.5 852.5 Z M 1029.5 667.5 L 1063.5 667.5 L 1063.5 852.5 L 1029.5 852.5 Z M 1124.5 667.5 L 1158.5 667.5 L 1158.5 852.5 L 1124.5 852.5 Z M 1295.5 667.5 L 1328.5 667.5 L 1328.5 852.5 L 1295.5 852.5 Z M 1390.5 667.5 L 1423.5 667.5 L 1423.5 852.5 L 1390.5 852.5 Z M 1485.5 667.5 L 1518.5 667.5 L 1518.5 852.5 L 1485.5 852.5 Z M 1485.5 667.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 1580.5 220.5 L 1613.5 220.5 L 1613.5 499.5 L 1580.5 499.5 Z M 330.5 220.5 L 363.5 220.5 L 363.5 499.5 L 330.5 499.5 Z M 425.5 220.5 L 458.5 220.5 L 458.5 499.5 L 425.5 499.5 Z M 520.5 220.5 L 553.5 220.5 L 553.5 499.5 L 520.5 499.5 Z M 615.5 220.5 L 648.5 220.5 L 648.5 499.5 L 615.5 499.5 Z M 857.5 220.5 L 890.5 220.5 L 890.5 499.5 L 857.5 499.5 Z M 952.5 220.5 L 985.5 220.5 L 985.5 499.5 L 952.5 499.5 Z M 1047.5 220.5 L 1080.5 220.5 L 1080.5 499.5 L 1047.5 499.5 Z M 1151.5 220.5 L 1184.5 220.5 L 1184.5 499.5 L 1151.5 499.5 Z M 1270.5 220.5 L 1303.5 220.5 L 1303.5 499.5 L 1270.5 499.5 Z M 1390.5 220.5 L 1423.5 220.5 L 1423.5 499.5 L 1390.5 499.5 Z M 1485.5 220.5 L 1518.5 220.5 L 1518.5 499.5 L 1485.5 499.5 Z M 1485.5 220.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/a211o/sky130_fd_sc_lp__a211o_lp.svg b/cells/a211o/sky130_fd_sc_lp__a211o_lp.svg
index d1339da..16d7837 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_lp.svg
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1269.5 757.5 L 1303.5 757.5 L 1303.5 853.5 L 1269.5 853.5 Z M 636.5 757.5 L 671.5 757.5 L 671.5 853.5 L 636.5 853.5 Z M 726.5 757.5 L 760.5 757.5 L 760.5 853.5 L 726.5 853.5 Z M 824.5 757.5 L 859.5 757.5 L 859.5 853.5 L 824.5 853.5 Z M 907.5 757.5 L 941.5 757.5 L 941.5 853.5 L 907.5 853.5 Z M 1005.5 757.5 L 1040.5 757.5 L 1040.5 853.5 L 1005.5 853.5 Z M 1088.5 757.5 L 1122.5 757.5 L 1122.5 853.5 L 1088.5 853.5 Z M 1187.5 757.5 L 1221.5 757.5 L 1221.5 853.5 L 1187.5 853.5 Z M 1187.5 757.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 1246.5 220.5 L 1303.5 220.5 L 1303.5 449.5 L 1246.5 449.5 Z M 620.5 220.5 L 678.5 220.5 L 678.5 449.5 L 620.5 449.5 Z M 753.5 220.5 L 811.5 220.5 L 811.5 449.5 L 753.5 449.5 Z M 875.5 220.5 L 932.5 220.5 L 932.5 449.5 L 875.5 449.5 Z M 996.5 220.5 L 1054.5 220.5 L 1054.5 449.5 L 996.5 449.5 Z M 996.5 220.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/a211o/sky130_fd_sc_lp__a211o_m.svg b/cells/a211o/sky130_fd_sc_lp__a211o_m.svg
index 17282ed..a8e6a8a 100644
--- a/cells/a211o/sky130_fd_sc_lp__a211o_m.svg
+++ b/cells/a211o/sky130_fd_sc_lp__a211o_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="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 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="#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 1209.5 656.5 L 1244.5 656.5 L 1244.5 752.5 L 1209.5 752.5 Z M 679.5 656.5 L 713.5 656.5 L 713.5 752.5 L 679.5 752.5 Z M 911.5 656.5 L 946.5 656.5 L 946.5 752.5 L 911.5 752.5 Z M 994.5 656.5 L 1028.5 656.5 L 1028.5 752.5 L 994.5 752.5 Z M 1093.5 656.5 L 1127.5 656.5 L 1127.5 752.5 L 1093.5 752.5 Z M 1093.5 656.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 671.5 209.5 L 705.5 209.5 L 705.5 305.5 L 671.5 305.5 Z M 895.5 376.5 L 930.5 376.5 L 930.5 472.5 L 895.5 472.5 Z M 1175.5 376.5 L 1209.5 376.5 L 1209.5 472.5 L 1175.5 472.5 Z M 1093.5 376.5 L 1127.5 376.5 L 1127.5 472.5 L 1093.5 472.5 Z M 994.5 376.5 L 1028.5 376.5 L 1028.5 472.5 L 994.5 472.5 Z M 994.5 376.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/a211oi/sky130_fd_sc_lp__a211oi_0.svg b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.svg
index ae3304a..78dbc8b 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_0.svg
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.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 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="#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 1055.5 768.5 L 1089.5 768.5 L 1089.5 864.5 L 1055.5 864.5 Z M 768.5 768.5 L 803.5 768.5 L 803.5 864.5 L 768.5 864.5 Z M 858.5 768.5 L 892.5 768.5 L 892.5 864.5 L 858.5 864.5 Z M 956.5 768.5 L 991.5 768.5 L 991.5 864.5 L 956.5 864.5 Z M 956.5 768.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 1046.5 218.5 L 1080.5 218.5 L 1080.5 365.5 L 1046.5 365.5 Z M 759.5 218.5 L 793.5 218.5 L 793.5 365.5 L 759.5 365.5 Z M 858.5 218.5 L 892.5 218.5 L 892.5 365.5 L 858.5 365.5 Z M 956.5 218.5 L 991.5 218.5 L 991.5 365.5 L 956.5 365.5 Z M 956.5 218.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1242.554688 712.246094 L 1242.554688 731.5 L 1236.292969 731.5 L 1236.292969 712.246094 L 1217.375 682.421875 L 1225.117188 682.421875 L 1239.523438 706.320312 L 1253.527344 682.421875 L 1261 682.421875 Z M 1242.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 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/a211oi/sky130_fd_sc_lp__a211oi_1.svg b/cells/a211oi/sky130_fd_sc_lp__a211oi_1.svg
index afb6912..758608d 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_1.svg
+++ b/cells/a211oi/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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="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 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="#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 1055.5 670.5 L 1089.5 670.5 L 1089.5 862.5 L 1055.5 862.5 Z M 725.5 670.5 L 759.5 670.5 L 759.5 862.5 L 725.5 862.5 Z M 807.5 670.5 L 842.5 670.5 L 842.5 862.5 L 807.5 862.5 Z M 931.5 670.5 L 965.5 670.5 L 965.5 862.5 L 931.5 862.5 Z M 931.5 670.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 1055.5 209.5 L 1089.5 209.5 L 1089.5 498.5 L 1055.5 498.5 Z M 725.5 209.5 L 759.5 209.5 L 759.5 498.5 L 725.5 498.5 Z M 848.5 209.5 L 883.5 209.5 L 883.5 498.5 L 848.5 498.5 Z M 972.5 209.5 L 1007.5 209.5 L 1007.5 498.5 L 972.5 498.5 Z M 972.5 209.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1159.476562 526.953125 L 1148.90625 526.953125 L 1148.90625 522.714844 L 1150.722656 522.511719 L 1152.339844 522.242188 L 1153.753906 521.90625 L 1154.964844 521.636719 L 1155.972656 521.300781 L 1156.847656 520.894531 L 1157.523438 520.492188 L 1158.128906 520.019531 L 1158.667969 519.480469 L 1159.207031 518.808594 L 1159.675781 518.066406 L 1160.148438 517.191406 L 1160.351562 516.722656 L 1160.550781 516.183594 L 1160.753906 515.578125 L 1161.023438 514.835938 L 1161.226562 514.097656 L 1161.496094 513.222656 L 1165.398438 513.222656 L 1165.398438 560.953125 L 1159.476562 560.953125 Z M 1159.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 1109 562 L 1148 562 M 1109 523 L 1148 523 M 1109 523 L 1109 562 M 1148 523 L 1148 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 1109 562 L 1148 562 M 1109 523 L 1148 523 M 1148 562 L 1148 523 M 1109 562 L 1109 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_lp__a211oi_2.svg b/cells/a211oi/sky130_fd_sc_lp__a211oi_2.svg
index a1bfcaf..8b24d8b 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_2.svg
+++ b/cells/a211oi/sky130_fd_sc_lp__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 539.5 L 367.5 539.5 Z M 367.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 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="#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 1266.5 651.5 L 1300.5 651.5 L 1300.5 844.5 L 1266.5 844.5 Z M 1382.5 651.5 L 1417.5 651.5 L 1417.5 844.5 L 1382.5 844.5 Z M 1032.5 651.5 L 1066.5 651.5 L 1066.5 844.5 L 1032.5 844.5 Z M 1167.5 651.5 L 1201.5 651.5 L 1201.5 844.5 L 1167.5 844.5 Z M 814.5 670.5 L 848.5 670.5 L 848.5 862.5 L 814.5 862.5 Z M 617.5 670.5 L 651.5 670.5 L 651.5 862.5 L 617.5 862.5 Z M 716.5 670.5 L 750.5 670.5 L 750.5 862.5 L 716.5 862.5 Z M 518.5 670.5 L 553.5 670.5 L 553.5 862.5 L 518.5 862.5 Z M 518.5 670.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 1364.5 209.5 L 1399.5 209.5 L 1399.5 498.5 L 1364.5 498.5 Z M 518.5 209.5 L 553.5 209.5 L 553.5 498.5 L 518.5 498.5 Z M 617.5 209.5 L 651.5 209.5 L 651.5 498.5 L 617.5 498.5 Z M 716.5 209.5 L 750.5 209.5 L 750.5 498.5 L 716.5 498.5 Z M 814.5 209.5 L 848.5 209.5 L 848.5 498.5 L 814.5 498.5 Z M 1068.5 209.5 L 1103.5 209.5 L 1103.5 498.5 L 1068.5 498.5 Z M 1167.5 209.5 L 1201.5 209.5 L 1201.5 498.5 L 1167.5 498.5 Z M 1266.5 209.5 L 1300.5 209.5 L 1300.5 498.5 L 1266.5 498.5 Z M 1266.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 497.476562 526.953125 L 486.90625 526.953125 L 486.90625 522.714844 L 488.722656 522.511719 L 490.339844 522.242188 L 491.753906 521.90625 L 492.964844 521.636719 L 493.972656 521.300781 L 494.847656 520.894531 L 495.523438 520.492188 L 496.128906 520.019531 L 496.667969 519.480469 L 497.207031 518.808594 L 497.675781 518.066406 L 498.148438 517.191406 L 498.351562 516.722656 L 498.550781 516.183594 L 498.753906 515.578125 L 499.023438 514.835938 L 499.226562 514.097656 L 499.496094 513.222656 L 503.398438 513.222656 L 503.398438 560.953125 L 497.476562 560.953125 Z M 497.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 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/a211oi/sky130_fd_sc_lp__a211oi_4.svg b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.svg
index 513c6be..41b35b9 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_4.svg
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image339" 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="#image339"/>
+  <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 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="#image339"/>
+  <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 1570.5 651.5 L 1599.5 651.5 L 1599.5 814.5 L 1570.5 814.5 Z M 293.5 651.5 L 322.5 651.5 L 322.5 814.5 L 293.5 814.5 Z M 377.5 651.5 L 406.5 651.5 L 406.5 814.5 L 377.5 814.5 Z M 460.5 651.5 L 490.5 651.5 L 490.5 814.5 L 460.5 814.5 Z M 544.5 651.5 L 573.5 651.5 L 573.5 814.5 L 544.5 814.5 Z M 628.5 651.5 L 657.5 651.5 L 657.5 814.5 L 628.5 814.5 Z M 711.5 651.5 L 741.5 651.5 L 741.5 814.5 L 711.5 814.5 Z M 795.5 651.5 L 824.5 651.5 L 824.5 814.5 L 795.5 814.5 Z M 879.5 651.5 L 908.5 651.5 L 908.5 814.5 L 879.5 814.5 Z M 984.5 651.5 L 1013.5 651.5 L 1013.5 814.5 L 984.5 814.5 Z M 1068.5 651.5 L 1097.5 651.5 L 1097.5 814.5 L 1068.5 814.5 Z M 1151.5 651.5 L 1181.5 651.5 L 1181.5 814.5 L 1151.5 814.5 Z M 1235.5 651.5 L 1264.5 651.5 L 1264.5 814.5 L 1235.5 814.5 Z M 1319.5 651.5 L 1348.5 651.5 L 1348.5 814.5 L 1319.5 814.5 Z M 1403.5 651.5 L 1432.5 651.5 L 1432.5 814.5 L 1403.5 814.5 Z M 1486.5 651.5 L 1515.5 651.5 L 1515.5 814.5 L 1486.5 814.5 Z M 1486.5 651.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1572.5 258.5 L 1601.5 258.5 L 1601.5 503.5 L 1572.5 503.5 Z M 307.5 258.5 L 336.5 258.5 L 336.5 503.5 L 307.5 503.5 Z M 390.5 258.5 L 419.5 258.5 L 419.5 503.5 L 390.5 503.5 Z M 474.5 258.5 L 503.5 258.5 L 503.5 503.5 L 474.5 503.5 Z M 558.5 258.5 L 587.5 258.5 L 587.5 503.5 L 558.5 503.5 Z M 641.5 258.5 L 671.5 258.5 L 671.5 503.5 L 641.5 503.5 Z M 725.5 258.5 L 754.5 258.5 L 754.5 503.5 L 725.5 503.5 Z M 809.5 258.5 L 838.5 258.5 L 838.5 503.5 L 809.5 503.5 Z M 902.5 258.5 L 931.5 258.5 L 931.5 503.5 L 902.5 503.5 Z M 986.5 258.5 L 1015.5 258.5 L 1015.5 503.5 L 986.5 503.5 Z M 1070.5 258.5 L 1099.5 258.5 L 1099.5 503.5 L 1070.5 503.5 Z M 1153.5 258.5 L 1183.5 258.5 L 1183.5 503.5 L 1153.5 503.5 Z M 1237.5 258.5 L 1266.5 258.5 L 1266.5 503.5 L 1237.5 503.5 Z M 1321.5 258.5 L 1350.5 258.5 L 1350.5 503.5 L 1321.5 503.5 Z M 1405.5 258.5 L 1434.5 258.5 L 1434.5 503.5 L 1405.5 503.5 Z M 1488.5 258.5 L 1517.5 258.5 L 1517.5 503.5 L 1488.5 503.5 Z M 1488.5 258.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface365">
 <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 1217.691406 600.460938 L 1208.664062 600.460938 L 1208.664062 596.839844 L 1210.214844 596.664062 L 1211.59375 596.433594 L 1212.804688 596.148438 L 1213.839844 595.917969 L 1214.699219 595.628906 L 1215.449219 595.285156 L 1216.023438 594.941406 L 1216.539062 594.539062 L 1217 594.078125 L 1217.460938 593.503906 L 1217.863281 592.871094 L 1218.265625 592.121094 L 1218.4375 591.71875 L 1218.609375 591.261719 L 1218.785156 590.742188 L 1219.011719 590.109375 L 1219.1875 589.476562 L 1219.414062 588.730469 L 1222.75 588.730469 L 1222.75 629.5 L 1217.691406 629.5 Z M 1217.691406 600.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 1176 488 L 1209 488 M 1176 455 L 1209 455 M 1176 455 L 1176 488 M 1209 455 L 1209 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 1176 488 L 1209 488 M 1176 455 L 1209 455 M 1209 488 L 1209 455 M 1176 488 L 1176 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/a211oi/sky130_fd_sc_lp__a211oi_lp.svg b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.svg
index a39af44..5927483 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.svg
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask 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="#image377"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1160.5 757.5 L 1195.5 757.5 L 1195.5 853.5 L 1160.5 853.5 Z M 699.5 757.5 L 734.5 757.5 L 734.5 853.5 L 699.5 853.5 Z M 782.5 757.5 L 816.5 757.5 L 816.5 853.5 L 782.5 853.5 Z M 881.5 757.5 L 915.5 757.5 L 915.5 853.5 L 881.5 853.5 Z M 963.5 757.5 L 997.5 757.5 L 997.5 853.5 L 963.5 853.5 Z M 1062.5 757.5 L 1096.5 757.5 L 1096.5 853.5 L 1062.5 853.5 Z M 1062.5 757.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask2">
 <rect 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 220.5 L 1217.5 220.5 L 1217.5 449.5 L 1160.5 449.5 Z M 727.5 220.5 L 784.5 220.5 L 784.5 449.5 L 727.5 449.5 Z M 839.5 220.5 L 897.5 220.5 L 897.5 449.5 L 839.5 449.5 Z M 970.5 220.5 L 1027.5 220.5 L 1027.5 449.5 L 970.5 449.5 Z M 970.5 220.5 "/>
 </clipPath>
-<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image380"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface374">
+<g id="surface402">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -215,6 +215,5 @@
 <path style=" 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 530.332031 L 1302.242188 525.28125 L 1303.652344 521.175781 L 1305.875 517.941406 L 1308.90625 515.652344 L 1312.742188 514.242188 L 1317.457031 513.769531 L 1319.609375 513.902344 L 1321.695312 514.242188 L 1323.648438 514.777344 L 1325.398438 515.585938 L 1327.015625 516.597656 L 1328.5625 517.742188 L 1329.773438 519.15625 L 1330.851562 520.636719 L 1331.660156 522.25 L 1332.265625 523.933594 L 1332.601562 525.820312 L 1332.738281 527.773438 L 1332.46875 530.53125 L 1331.726562 533.089844 L 1330.449219 535.445312 L 1328.699219 537.667969 L 1326.410156 539.753906 L 1323.648438 541.574219 L 1322.640625 542.179688 L 1315.90625 545.8125 L 1314.15625 546.824219 L 1312.609375 547.832031 L 1311.261719 548.84375 L 1310.183594 549.851562 L 1309.242188 550.863281 L 1308.570312 551.875 L 1308.230469 552.480469 L 1307.960938 553.015625 L 1307.761719 553.691406 L 1307.558594 554.296875 L 1307.355469 554.96875 L 1307.289062 555.644531 L 1332.402344 555.644531 L 1332.402344 561.5 L 1300.625 561.5 L 1300.757812 559.144531 L 1301.097656 556.988281 L 1301.5 554.96875 L 1302.039062 553.21875 L 1302.644531 551.535156 L 1303.386719 550.054688 L 1304.191406 548.777344 L 1305.203125 547.496094 L 1306.414062 546.21875 L 1307.761719 545.007812 L 1309.308594 543.792969 L 1311.125 542.582031 L 1311.53125 542.3125 L 1312.003906 542.042969 L 1312.472656 541.707031 L 1312.945312 541.4375 L 1313.484375 541.167969 L 1314.023438 540.832031 L 1320.214844 537.332031 L 1322.167969 536.050781 L 1323.785156 534.640625 L 1325.0625 533.15625 L 1325.9375 531.542969 L 1326.476562 529.792969 L 1326.679688 527.90625 L 1326.542969 526.628906 L 1326.339844 525.347656 L 1325.871094 524.203125 L 1325.332031 523.125 L 1324.523438 522.183594 L 1323.648438 521.242188 L 1322.707031 520.570312 L 1321.765625 519.960938 L 1320.6875 519.558594 L 1319.609375 519.222656 L 1318.464844 519.019531 L 1317.253906 518.953125 L 1314.628906 519.289062 L 1312.40625 520.097656 L 1310.589844 521.511719 L 1309.242188 523.464844 L 1308.300781 526.023438 L 1307.761719 529.050781 L 1307.695312 529.320312 L 1307.695312 529.722656 L 1307.625 529.925781 L 1307.625 530.332031 Z M 1301.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 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/a211oi/sky130_fd_sc_lp__a211oi_m.svg b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.svg
index 210459a..f8407fd6 100644
--- a/cells/a211oi/sky130_fd_sc_lp__a211oi_m.svg
+++ b/cells/a211oi/sky130_fd_sc_lp__a211oi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1110.5 768.5 L 1144.5 768.5 L 1144.5 864.5 L 1110.5 864.5 Z M 780.5 768.5 L 814.5 768.5 L 814.5 864.5 L 780.5 864.5 Z M 862.5 768.5 L 897.5 768.5 L 897.5 864.5 L 862.5 864.5 Z M 986.5 768.5 L 1020.5 768.5 L 1020.5 864.5 L 986.5 864.5 Z M 986.5 768.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 1110.5 399.5 L 1144.5 399.5 L 1144.5 495.5 L 1110.5 495.5 Z M 780.5 399.5 L 814.5 399.5 L 814.5 495.5 L 780.5 495.5 Z M 903.5 399.5 L 938.5 399.5 L 938.5 495.5 L 903.5 495.5 Z M 1013.5 399.5 L 1048.5 399.5 L 1048.5 495.5 L 1013.5 495.5 Z M 1013.5 399.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1104.476562 272.953125 L 1093.90625 272.953125 L 1093.90625 268.714844 L 1095.722656 268.511719 L 1097.339844 268.242188 L 1098.753906 267.90625 L 1099.964844 267.636719 L 1100.972656 267.300781 L 1101.847656 266.894531 L 1102.523438 266.492188 L 1103.128906 266.019531 L 1103.667969 265.480469 L 1104.207031 264.808594 L 1104.675781 264.066406 L 1105.148438 263.191406 L 1105.351562 262.722656 L 1105.550781 262.183594 L 1105.753906 261.578125 L 1106.023438 260.835938 L 1106.226562 260.097656 L 1106.496094 259.222656 L 1110.398438 259.222656 L 1110.398438 306.953125 L 1104.476562 306.953125 Z M 1104.476562 272.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 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/a21bo/sky130_fd_sc_lp__a21bo_0.svg b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.svg
index dd60754..1c1962d 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_0.svg
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.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 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="#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 1220.5 762.5 L 1254.5 762.5 L 1254.5 859.5 L 1220.5 859.5 Z M 646.5 762.5 L 680.5 762.5 L 680.5 859.5 L 646.5 859.5 Z M 744.5 762.5 L 779.5 762.5 L 779.5 859.5 L 744.5 859.5 Z M 1000.5 762.5 L 1034.5 762.5 L 1034.5 859.5 L 1000.5 859.5 Z M 1098.5 762.5 L 1133.5 762.5 L 1133.5 859.5 L 1098.5 859.5 Z M 1098.5 762.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 735.5 219.5 L 769.5 219.5 L 769.5 315.5 L 735.5 315.5 Z M 615.5 219.5 L 649.5 219.5 L 649.5 366.5 L 615.5 366.5 Z M 1121.5 247.5 L 1156.5 247.5 L 1156.5 393.5 L 1121.5 393.5 Z M 1023.5 247.5 L 1057.5 247.5 L 1057.5 393.5 L 1023.5 393.5 Z M 1220.5 247.5 L 1254.5 247.5 L 1254.5 393.5 L 1220.5 393.5 Z M 1220.5 247.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/a21bo/sky130_fd_sc_lp__a21bo_1.svg b/cells/a21bo/sky130_fd_sc_lp__a21bo_1.svg
index 0161287..08db499 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_1.svg
+++ b/cells/a21bo/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.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 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="#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 765.5 647.5 L 799.5 647.5 L 799.5 743.5 L 765.5 743.5 Z M 614.5 647.5 L 648.5 647.5 L 648.5 839.5 L 614.5 839.5 Z M 1125.5 672.5 L 1159.5 672.5 L 1159.5 864.5 L 1125.5 864.5 Z M 987.5 672.5 L 1022.5 672.5 L 1022.5 864.5 L 987.5 864.5 Z M 1207.5 672.5 L 1242.5 672.5 L 1242.5 864.5 L 1207.5 864.5 Z M 1207.5 672.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 639.5 209.5 L 673.5 209.5 L 673.5 498.5 L 639.5 498.5 Z M 759.5 401.5 L 793.5 401.5 L 793.5 498.5 L 759.5 498.5 Z M 1086.5 209.5 L 1120.5 209.5 L 1120.5 498.5 L 1086.5 498.5 Z M 987.5 209.5 L 1022.5 209.5 L 1022.5 498.5 L 987.5 498.5 Z M 1207.5 209.5 L 1242.5 209.5 L 1242.5 498.5 L 1207.5 498.5 Z M 1207.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 581.824219 366.320312 L 599.191406 391.5 L 591.449219 391.5 L 578.050781 371.035156 L 564.589844 391.5 L 556.980469 391.5 L 574.351562 366.320312 L 558.058594 342.421875 L 565.664062 342.421875 L 578.253906 361.675781 L 590.910156 342.421875 L 598.382812 342.421875 Z M 581.824219 366.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 731 L 596 731 M 557 693 L 596 693 M 557 693 L 557 731 M 596 693 L 596 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 557 731 L 596 731 M 557 693 L 596 693 M 596 731 L 596 693 M 557 731 L 557 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 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_lp__a21bo_2.svg b/cells/a21bo/sky130_fd_sc_lp__a21bo_2.svg
index ffec412..2d7646e 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_2.svg
+++ b/cells/a21bo/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 836.5 647.5 L 870.5 647.5 L 870.5 743.5 L 836.5 743.5 Z M 716.5 647.5 L 750.5 647.5 L 750.5 839.5 L 716.5 839.5 Z M 617.5 647.5 L 651.5 647.5 L 651.5 839.5 L 617.5 839.5 Z M 1070.5 672.5 L 1104.5 672.5 L 1104.5 864.5 L 1070.5 864.5 Z M 1168.5 672.5 L 1203.5 672.5 L 1203.5 864.5 L 1168.5 864.5 Z M 1276.5 672.5 L 1310.5 672.5 L 1310.5 864.5 L 1276.5 864.5 Z M 1276.5 672.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 617.5 209.5 L 651.5 209.5 L 651.5 498.5 L 617.5 498.5 Z M 840.5 401.5 L 875.5 401.5 L 875.5 498.5 L 840.5 498.5 Z M 1168.5 209.5 L 1203.5 209.5 L 1203.5 498.5 L 1168.5 498.5 Z M 1070.5 209.5 L 1104.5 209.5 L 1104.5 498.5 L 1070.5 498.5 Z M 1276.5 209.5 L 1310.5 209.5 L 1310.5 498.5 L 1276.5 498.5 Z M 716.5 209.5 L 750.5 209.5 L 750.5 498.5 L 716.5 498.5 Z M 716.5 209.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface361">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/a21bo/sky130_fd_sc_lp__a21bo_4.svg b/cells/a21bo/sky130_fd_sc_lp__a21bo_4.svg
index a9c0811..752a7b6 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_4.svg
+++ b/cells/a21bo/sky130_fd_sc_lp__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 539.5 L 201.5 539.5 Z M 201.5 111.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 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="#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 1546.5 672.5 L 1581.5 672.5 L 1581.5 864.5 L 1546.5 864.5 Z M 353.5 672.5 L 388.5 672.5 L 388.5 864.5 L 353.5 864.5 Z M 530.5 672.5 L 564.5 672.5 L 564.5 864.5 L 530.5 864.5 Z M 628.5 672.5 L 663.5 672.5 L 663.5 864.5 L 628.5 864.5 Z M 727.5 672.5 L 761.5 672.5 L 761.5 864.5 L 727.5 864.5 Z M 828.5 672.5 L 862.5 672.5 L 862.5 864.5 L 828.5 864.5 Z M 1035.5 672.5 L 1070.5 672.5 L 1070.5 864.5 L 1035.5 864.5 Z M 1134.5 672.5 L 1168.5 672.5 L 1168.5 864.5 L 1134.5 864.5 Z M 1251.5 672.5 L 1285.5 672.5 L 1285.5 864.5 L 1251.5 864.5 Z M 1349.5 672.5 L 1384.5 672.5 L 1384.5 864.5 L 1349.5 864.5 Z M 1448.5 672.5 L 1482.5 672.5 L 1482.5 864.5 L 1448.5 864.5 Z M 1448.5 672.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 1546.5 209.5 L 1581.5 209.5 L 1581.5 498.5 L 1546.5 498.5 Z M 361.5 209.5 L 396.5 209.5 L 396.5 498.5 L 361.5 498.5 Z M 460.5 209.5 L 494.5 209.5 L 494.5 498.5 L 460.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 657.5 209.5 L 691.5 209.5 L 691.5 498.5 L 657.5 498.5 Z M 756.5 209.5 L 790.5 209.5 L 790.5 498.5 L 756.5 498.5 Z M 1044.5 209.5 L 1079.5 209.5 L 1079.5 498.5 L 1044.5 498.5 Z M 1143.5 209.5 L 1177.5 209.5 L 1177.5 498.5 L 1143.5 498.5 Z M 1242.5 209.5 L 1276.5 209.5 L 1276.5 498.5 L 1242.5 498.5 Z M 1349.5 209.5 L 1384.5 209.5 L 1384.5 498.5 L 1349.5 498.5 Z M 1448.5 209.5 L 1482.5 209.5 L 1482.5 498.5 L 1448.5 498.5 Z M 1448.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 492.550781 512.574219 L 492.550781 561.652344 L 485.484375 561.652344 L 460.101562 521.863281 L 460.101562 561.652344 L 454.179688 561.652344 L 454.179688 512.574219 L 460.976562 512.574219 L 486.628906 552.699219 L 486.628906 512.574219 Z M 492.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 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/a21bo/sky130_fd_sc_lp__a21bo_lp.svg b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.svg
index 39737ec..2c47a73 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.svg
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1251.5 759.5 L 1285.5 759.5 L 1285.5 855.5 L 1251.5 855.5 Z M 618.5 759.5 L 653.5 759.5 L 653.5 855.5 L 618.5 855.5 Z M 701.5 759.5 L 735.5 759.5 L 735.5 855.5 L 701.5 855.5 Z M 799.5 759.5 L 834.5 759.5 L 834.5 855.5 L 799.5 855.5 Z M 889.5 759.5 L 923.5 759.5 L 923.5 855.5 L 889.5 855.5 Z M 987.5 759.5 L 1022.5 759.5 L 1022.5 855.5 L 987.5 855.5 Z M 1070.5 759.5 L 1104.5 759.5 L 1104.5 855.5 L 1070.5 855.5 Z M 1168.5 759.5 L 1203.5 759.5 L 1203.5 855.5 L 1168.5 855.5 Z M 1168.5 759.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1125.5 209.5 L 1182.5 209.5 L 1182.5 438.5 L 1125.5 438.5 Z M 1246.5 209.5 L 1303.5 209.5 L 1303.5 438.5 L 1246.5 438.5 Z M 630.5 220.5 L 687.5 220.5 L 687.5 449.5 L 630.5 449.5 Z M 875.5 220.5 L 932.5 220.5 L 932.5 449.5 L 875.5 449.5 Z M 753.5 220.5 L 811.5 220.5 L 811.5 449.5 L 753.5 449.5 Z M 753.5 220.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -157,6 +157,5 @@
 <path style=" 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 790.320312 L 599.191406 815.5 L 591.449219 815.5 L 578.050781 795.035156 L 564.589844 815.5 L 556.980469 815.5 L 574.351562 790.320312 L 558.058594 766.421875 L 565.664062 766.421875 L 578.253906 785.675781 L 590.910156 766.421875 L 598.382812 766.421875 Z M 581.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 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_lp__a21bo_m.svg b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.svg
index f7bd4e5..8bfd480 100644
--- a/cells/a21bo/sky130_fd_sc_lp__a21bo_m.svg
+++ b/cells/a21bo/sky130_fd_sc_lp__a21bo_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image399"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 669.5 710.5 L 703.5 710.5 L 703.5 806.5 L 669.5 806.5 Z M 767.5 710.5 L 801.5 710.5 L 801.5 806.5 L 767.5 806.5 Z M 1114.5 768.5 L 1149.5 768.5 L 1149.5 864.5 L 1114.5 864.5 Z M 997.5 768.5 L 1032.5 768.5 L 1032.5 864.5 L 997.5 864.5 Z M 1204.5 768.5 L 1238.5 768.5 L 1238.5 864.5 L 1204.5 864.5 Z M 1204.5 768.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 669.5 216.5 L 703.5 216.5 L 703.5 312.5 L 669.5 312.5 Z M 767.5 216.5 L 801.5 216.5 L 801.5 312.5 L 767.5 312.5 Z M 1023.5 319.5 L 1057.5 319.5 L 1057.5 415.5 L 1023.5 415.5 Z M 1220.5 319.5 L 1254.5 319.5 L 1254.5 415.5 L 1220.5 415.5 Z M 1121.5 319.5 L 1156.5 319.5 L 1156.5 415.5 L 1121.5 415.5 Z M 1121.5 319.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image402"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface396">
+<g id="surface425">
 <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 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/a21boi/sky130_fd_sc_lp__a21boi_0.svg b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.svg
index 1997553..ee4a899 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_0.svg
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image351" 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="#image351"/>
+  <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 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="#image351"/>
+  <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 1082.5 768.5 L 1117.5 768.5 L 1117.5 864.5 L 1082.5 864.5 Z M 725.5 768.5 L 759.5 768.5 L 759.5 864.5 L 725.5 864.5 Z M 901.5 768.5 L 936.5 768.5 L 936.5 864.5 L 901.5 864.5 Z M 1000.5 768.5 L 1034.5 768.5 L 1034.5 864.5 L 1000.5 864.5 Z M 1000.5 768.5 "/>
 </clipPath>
-<image id="image352" 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="#image352"/>
+  <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 725.5 235.5 L 759.5 235.5 L 759.5 331.5 L 725.5 331.5 Z M 970.5 218.5 L 1004.5 218.5 L 1004.5 365.5 L 970.5 365.5 Z M 1068.5 218.5 L 1103.5 218.5 L 1103.5 365.5 L 1068.5 365.5 Z M 1167.5 218.5 L 1201.5 218.5 L 1201.5 365.5 L 1167.5 365.5 Z M 1167.5 218.5 "/>
 </clipPath>
-<image id="image353" 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="#image353"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image354" 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="#image354"/>
+  <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="surface348">
+<g id="surface377">
 <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 912.554688 372.246094 L 912.554688 391.5 L 906.292969 391.5 L 906.292969 372.246094 L 887.375 342.421875 L 895.117188 342.421875 L 909.523438 366.320312 L 923.527344 342.421875 L 931 342.421875 Z M 912.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 889 731 L 928 731 M 889 693 L 928 693 M 889 693 L 889 731 M 928 693 L 928 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 889 731 L 928 731 M 889 693 L 928 693 M 928 731 L 928 693 M 889 731 L 889 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 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/a21boi/sky130_fd_sc_lp__a21boi_1.svg b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.svg
index ae4690d..8658dbd 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_1.svg
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image354" 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="#image354"/>
+  <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 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="#image354"/>
+  <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 1165.5 672.5 L 1199.5 672.5 L 1199.5 864.5 L 1165.5 864.5 Z M 800.5 768.5 L 835.5 768.5 L 835.5 864.5 L 800.5 864.5 Z M 1034.5 672.5 L 1068.5 672.5 L 1068.5 864.5 L 1034.5 864.5 Z M 921.5 672.5 L 955.5 672.5 L 955.5 864.5 L 921.5 864.5 Z M 921.5 672.5 "/>
 </clipPath>
-<image id="image355" 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="#image355"/>
+  <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 725.5 240.5 L 759.5 240.5 L 759.5 336.5 L 725.5 336.5 Z M 945.5 209.5 L 979.5 209.5 L 979.5 498.5 L 945.5 498.5 Z M 1043.5 209.5 L 1078.5 209.5 L 1078.5 498.5 L 1043.5 498.5 Z M 1165.5 209.5 L 1199.5 209.5 L 1199.5 498.5 L 1165.5 498.5 Z M 1165.5 209.5 "/>
 </clipPath>
-<image id="image356" 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="#image356"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image357" 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="#image357"/>
+  <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="surface351">
+<g id="surface380">
 <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 770.550781 427.574219 L 770.550781 476.652344 L 763.484375 476.652344 L 738.101562 436.863281 L 738.101562 476.652344 L 732.179688 476.652344 L 732.179688 427.574219 L 738.976562 427.574219 L 764.628906 467.699219 L 764.628906 427.574219 Z M 770.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 669 647 L 708 647 M 669 608 L 708 608 M 669 608 L 669 647 M 708 608 L 708 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 669 647 L 708 647 M 669 608 L 708 608 M 708 647 L 708 608 M 669 647 L 669 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 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/a21boi/sky130_fd_sc_lp__a21boi_2.svg b/cells/a21boi/sky130_fd_sc_lp__a21boi_2.svg
index d424459..1732d9a 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_2.svg
+++ b/cells/a21boi/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image381"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask 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="#image381"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask1">
 <rect 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 651.5 L 1258.5 651.5 L 1258.5 844.5 L 1223.5 844.5 Z M 672.5 747.5 L 706.5 747.5 L 706.5 844.5 L 672.5 844.5 Z M 1322.5 651.5 L 1356.5 651.5 L 1356.5 844.5 L 1322.5 844.5 Z M 1106.5 651.5 L 1141.5 651.5 L 1141.5 844.5 L 1106.5 844.5 Z M 1008.5 651.5 L 1042.5 651.5 L 1042.5 844.5 L 1008.5 844.5 Z M 891.5 651.5 L 925.5 651.5 L 925.5 844.5 L 891.5 844.5 Z M 792.5 651.5 L 827.5 651.5 L 827.5 844.5 L 792.5 844.5 Z M 792.5 651.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image411"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 569.5 249.5 L 603.5 249.5 L 603.5 345.5 L 569.5 345.5 Z M 891.5 209.5 L 925.5 209.5 L 925.5 498.5 L 891.5 498.5 Z M 1322.5 209.5 L 1356.5 209.5 L 1356.5 498.5 L 1322.5 498.5 Z M 1125.5 209.5 L 1159.5 209.5 L 1159.5 498.5 L 1125.5 498.5 Z M 989.5 209.5 L 1024.5 209.5 L 1024.5 498.5 L 989.5 498.5 Z M 1223.5 209.5 L 1258.5 209.5 L 1258.5 498.5 L 1223.5 498.5 Z M 792.5 209.5 L 827.5 209.5 L 827.5 498.5 L 792.5 498.5 Z M 792.5 209.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image412"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image413"/>
 </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="surface407">
 <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 604.550781 342.574219 L 604.550781 391.652344 L 597.484375 391.652344 L 572.101562 351.863281 L 572.101562 391.652344 L 566.179688 391.652344 L 566.179688 342.574219 L 572.976562 342.574219 L 598.628906 382.699219 L 598.628906 342.574219 Z M 604.550781 342.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 502 731 L 541 731 M 502 693 L 541 693 M 502 693 L 502 731 M 541 693 L 541 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 502 731 L 541 731 M 502 693 L 541 693 M 541 731 L 541 693 M 502 731 L 502 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 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_lp__a21boi_4.svg b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.svg
index 3a7797c..83b24b0 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_4.svg
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 539.5 L 174.5 539.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image370"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1575.5 667.5 L 1608.5 667.5 L 1608.5 852.5 L 1575.5 852.5 Z M 356.5 667.5 L 389.5 667.5 L 389.5 852.5 L 356.5 852.5 Z M 455.5 667.5 L 488.5 667.5 L 488.5 852.5 L 455.5 852.5 Z M 550.5 667.5 L 583.5 667.5 L 583.5 852.5 L 550.5 852.5 Z M 645.5 667.5 L 678.5 667.5 L 678.5 852.5 L 645.5 852.5 Z M 740.5 667.5 L 773.5 667.5 L 773.5 852.5 L 740.5 852.5 Z M 910.5 667.5 L 943.5 667.5 L 943.5 852.5 L 910.5 852.5 Z M 1005.5 667.5 L 1038.5 667.5 L 1038.5 852.5 L 1005.5 852.5 Z M 1100.5 667.5 L 1133.5 667.5 L 1133.5 852.5 L 1100.5 852.5 Z M 1195.5 667.5 L 1228.5 667.5 L 1228.5 852.5 L 1195.5 852.5 Z M 1290.5 667.5 L 1323.5 667.5 L 1323.5 852.5 L 1290.5 852.5 Z M 1385.5 667.5 L 1418.5 667.5 L 1418.5 852.5 L 1385.5 852.5 Z M 1480.5 667.5 L 1513.5 667.5 L 1513.5 852.5 L 1480.5 852.5 Z M 1480.5 667.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1575.5 220.5 L 1608.5 220.5 L 1608.5 499.5 L 1575.5 499.5 Z M 311.5 220.5 L 345.5 220.5 L 345.5 499.5 L 311.5 499.5 Z M 521.5 220.5 L 554.5 220.5 L 554.5 499.5 L 521.5 499.5 Z M 616.5 220.5 L 649.5 220.5 L 649.5 499.5 L 616.5 499.5 Z M 711.5 220.5 L 744.5 220.5 L 744.5 499.5 L 711.5 499.5 Z M 806.5 220.5 L 839.5 220.5 L 839.5 499.5 L 806.5 499.5 Z M 908.5 220.5 L 941.5 220.5 L 941.5 499.5 L 908.5 499.5 Z M 1005.5 220.5 L 1038.5 220.5 L 1038.5 499.5 L 1005.5 499.5 Z M 1100.5 220.5 L 1133.5 220.5 L 1133.5 499.5 L 1100.5 499.5 Z M 1195.5 220.5 L 1228.5 220.5 L 1228.5 499.5 L 1195.5 499.5 Z M 1290.5 220.5 L 1323.5 220.5 L 1323.5 499.5 L 1290.5 499.5 Z M 1385.5 220.5 L 1418.5 220.5 L 1418.5 499.5 L 1385.5 499.5 Z M 1480.5 220.5 L 1513.5 220.5 L 1513.5 499.5 L 1480.5 499.5 Z M 1480.5 220.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface367">
+<g id="surface397">
 <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 803.46875 460.046875 L 803.46875 478.5 L 797.46875 478.5 L 797.46875 460.046875 L 779.339844 431.46875 L 786.757812 431.46875 L 800.566406 454.371094 L 813.984375 431.46875 L 821.144531 431.46875 Z M 803.46875 460.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 781 643 L 818 643 M 781 606 L 818 606 M 781 606 L 781 643 M 818 606 L 818 643 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 781 643 L 818 643 M 781 606 L 818 606 M 818 643 L 818 606 M 781 643 L 781 606 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/a21boi/sky130_fd_sc_lp__a21boi_lp.svg b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.svg
index 65c8d56..64fc40e 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.svg
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image312"/>
+  <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 1213.5 768.5 L 1247.5 768.5 L 1247.5 864.5 L 1213.5 864.5 Z M 740.5 768.5 L 774.5 768.5 L 774.5 864.5 L 740.5 864.5 Z M 829.5 768.5 L 863.5 768.5 L 863.5 864.5 L 829.5 864.5 Z M 928.5 768.5 L 962.5 768.5 L 962.5 864.5 L 928.5 864.5 Z M 1010.5 768.5 L 1044.5 768.5 L 1044.5 864.5 L 1010.5 864.5 Z M 1130.5 768.5 L 1165.5 768.5 L 1165.5 864.5 L 1130.5 864.5 Z M 1130.5 768.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <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 1190.5 220.5 L 1247.5 220.5 L 1247.5 449.5 L 1190.5 449.5 Z M 675.5 220.5 L 733.5 220.5 L 733.5 449.5 L 675.5 449.5 Z M 797.5 220.5 L 854.5 220.5 L 854.5 449.5 L 797.5 449.5 Z M 918.5 220.5 L 976.5 220.5 L 976.5 449.5 L 918.5 449.5 Z M 918.5 220.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image315" 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="#image315"/>
+  <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="surface309">
+<g id="surface338">
 <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 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 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_lp__a21boi_m.svg b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.svg
index 9554f14..b8c404a 100644
--- a/cells/a21boi/sky130_fd_sc_lp__a21boi_m.svg
+++ b/cells/a21boi/sky130_fd_sc_lp__a21boi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 1088.5 768.5 L 1122.5 768.5 L 1122.5 864.5 L 1088.5 864.5 Z M 757.5 768.5 L 791.5 768.5 L 791.5 864.5 L 757.5 864.5 Z M 855.5 768.5 L 890.5 768.5 L 890.5 864.5 L 855.5 864.5 Z M 954.5 768.5 L 988.5 768.5 L 988.5 864.5 L 954.5 864.5 Z M 954.5 768.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 725.5 209.5 L 759.5 209.5 L 759.5 305.5 L 725.5 305.5 Z M 949.5 369.5 L 984.5 369.5 L 984.5 466.5 L 949.5 466.5 Z M 1146.5 369.5 L 1181.5 369.5 L 1181.5 466.5 L 1146.5 466.5 Z M 1048.5 369.5 L 1082.5 369.5 L 1082.5 466.5 L 1048.5 466.5 Z M 1048.5 369.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 912.554688 457.246094 L 912.554688 476.5 L 906.292969 476.5 L 906.292969 457.246094 L 887.375 427.421875 L 895.117188 427.421875 L 909.523438 451.320312 L 923.527344 427.421875 L 931 427.421875 Z M 912.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 889 647 L 928 647 M 889 608 L 928 608 M 889 608 L 889 647 M 928 608 L 928 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 889 647 L 928 647 M 889 608 L 928 608 M 928 647 L 928 608 M 889 647 L 889 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 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/a21o/sky130_fd_sc_lp__a21o_0.svg b/cells/a21o/sky130_fd_sc_lp__a21o_0.svg
index d4a2726..ffd2702 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_0.svg
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 1152.5 768.5 L 1187.5 768.5 L 1187.5 864.5 L 1152.5 864.5 Z M 837.5 768.5 L 871.5 768.5 L 871.5 864.5 L 837.5 864.5 Z M 949.5 768.5 L 984.5 768.5 L 984.5 864.5 L 949.5 864.5 Z M 1063.5 768.5 L 1097.5 768.5 L 1097.5 864.5 L 1063.5 864.5 Z M 1063.5 768.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 725.5 218.5 L 759.5 218.5 L 759.5 365.5 L 725.5 365.5 Z M 1161.5 229.5 L 1196.5 229.5 L 1196.5 376.5 L 1161.5 376.5 Z M 1063.5 229.5 L 1097.5 229.5 L 1097.5 376.5 L 1063.5 376.5 Z M 964.5 229.5 L 999.5 229.5 L 999.5 376.5 L 964.5 376.5 Z M 964.5 229.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 692.824219 282.320312 L 710.191406 307.5 L 702.449219 307.5 L 689.050781 287.035156 L 675.589844 307.5 L 667.980469 307.5 L 685.351562 282.320312 L 669.058594 258.421875 L 676.664062 258.421875 L 689.253906 277.675781 L 701.910156 258.421875 L 709.382812 258.421875 Z M 692.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 669 816 L 708 816 M 669 777 L 708 777 M 669 777 L 669 816 M 708 777 L 708 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 669 816 L 708 816 M 669 777 L 708 777 M 708 816 L 708 777 M 669 816 L 669 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/a21o/sky130_fd_sc_lp__a21o_1.svg b/cells/a21o/sky130_fd_sc_lp__a21o_1.svg
index 96a88a2..cdeaec7 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_1.svg
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 1162.5 672.5 L 1197.5 672.5 L 1197.5 864.5 L 1162.5 864.5 Z M 726.5 672.5 L 760.5 672.5 L 760.5 864.5 L 726.5 864.5 Z M 907.5 672.5 L 941.5 672.5 L 941.5 864.5 L 907.5 864.5 Z M 1032.5 672.5 L 1066.5 672.5 L 1066.5 864.5 L 1032.5 864.5 Z M 1032.5 672.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 1162.5 209.5 L 1197.5 209.5 L 1197.5 498.5 L 1162.5 498.5 Z M 725.5 209.5 L 759.5 209.5 L 759.5 498.5 L 725.5 498.5 Z M 942.5 209.5 L 977.5 209.5 L 977.5 498.5 L 942.5 498.5 Z M 1041.5 209.5 L 1075.5 209.5 L 1075.5 498.5 L 1041.5 498.5 Z M 1041.5 209.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/a21o/sky130_fd_sc_lp__a21o_2.svg b/cells/a21o/sky130_fd_sc_lp__a21o_2.svg
index 4ad2bc2..c68ca90 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_2.svg
+++ b/cells/a21o/sky130_fd_sc_lp__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 539.5 L 533.5 539.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 1198.5 672.5 L 1232.5 672.5 L 1232.5 864.5 L 1198.5 864.5 Z M 714.5 672.5 L 749.5 672.5 L 749.5 864.5 L 714.5 864.5 Z M 813.5 672.5 L 847.5 672.5 L 847.5 864.5 L 813.5 864.5 Z M 925.5 672.5 L 960.5 672.5 L 960.5 864.5 L 925.5 864.5 Z M 1074.5 672.5 L 1109.5 672.5 L 1109.5 864.5 L 1074.5 864.5 Z M 1074.5 672.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 1198.5 209.5 L 1232.5 209.5 L 1232.5 498.5 L 1198.5 498.5 Z M 675.5 209.5 L 710.5 209.5 L 710.5 498.5 L 675.5 498.5 Z M 774.5 209.5 L 808.5 209.5 L 808.5 498.5 L 774.5 498.5 Z M 992.5 209.5 L 1026.5 209.5 L 1026.5 498.5 L 992.5 498.5 Z M 1090.5 209.5 L 1125.5 209.5 L 1125.5 498.5 L 1090.5 498.5 Z M 1090.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 990.773438 527.503906 L 980.203125 527.503906 L 980.203125 523.261719 L 982.019531 523.058594 L 983.636719 522.789062 L 985.050781 522.453125 L 986.261719 522.183594 L 987.269531 521.847656 L 988.148438 521.445312 L 988.820312 521.039062 L 989.425781 520.570312 L 989.964844 520.03125 L 990.503906 519.355469 L 990.972656 518.617188 L 991.445312 517.742188 L 991.648438 517.269531 L 991.847656 516.730469 L 992.050781 516.125 L 992.320312 515.386719 L 992.523438 514.644531 L 992.792969 513.769531 L 996.695312 513.769531 L 996.695312 561.5 L 990.773438 561.5 Z M 990.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 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/a21o/sky130_fd_sc_lp__a21o_4.svg b/cells/a21o/sky130_fd_sc_lp__a21o_4.svg
index 53df1b2..f76a777 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_4.svg
+++ b/cells/a21o/sky130_fd_sc_lp__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 539.5 L 256.5 539.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 1468.5 670.5 L 1503.5 670.5 L 1503.5 862.5 L 1468.5 862.5 Z M 481.5 670.5 L 515.5 670.5 L 515.5 862.5 L 481.5 862.5 Z M 579.5 670.5 L 614.5 670.5 L 614.5 862.5 L 579.5 862.5 Z M 678.5 670.5 L 712.5 670.5 L 712.5 862.5 L 678.5 862.5 Z M 776.5 670.5 L 811.5 670.5 L 811.5 862.5 L 776.5 862.5 Z M 967.5 670.5 L 1001.5 670.5 L 1001.5 862.5 L 967.5 862.5 Z M 1065.5 670.5 L 1099.5 670.5 L 1099.5 862.5 L 1065.5 862.5 Z M 1173.5 670.5 L 1207.5 670.5 L 1207.5 862.5 L 1173.5 862.5 Z M 1271.5 670.5 L 1306.5 670.5 L 1306.5 862.5 L 1271.5 862.5 Z M 1370.5 670.5 L 1404.5 670.5 L 1404.5 862.5 L 1370.5 862.5 Z M 1370.5 670.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 1468.5 209.5 L 1503.5 209.5 L 1503.5 498.5 L 1468.5 498.5 Z M 453.5 209.5 L 487.5 209.5 L 487.5 498.5 L 453.5 498.5 Z M 552.5 209.5 L 586.5 209.5 L 586.5 498.5 L 552.5 498.5 Z M 650.5 209.5 L 685.5 209.5 L 685.5 498.5 L 650.5 498.5 Z M 749.5 209.5 L 783.5 209.5 L 783.5 498.5 L 749.5 498.5 Z M 967.5 209.5 L 1001.5 209.5 L 1001.5 498.5 L 967.5 498.5 Z M 1065.5 209.5 L 1099.5 209.5 L 1099.5 498.5 L 1065.5 498.5 Z M 1164.5 209.5 L 1198.5 209.5 L 1198.5 498.5 L 1164.5 498.5 Z M 1271.5 209.5 L 1306.5 209.5 L 1306.5 498.5 L 1271.5 498.5 Z M 1370.5 209.5 L 1404.5 209.5 L 1404.5 498.5 L 1370.5 498.5 Z M 1370.5 209.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 469.824219 621.320312 L 487.191406 646.5 L 479.449219 646.5 L 466.050781 626.035156 L 452.589844 646.5 L 444.980469 646.5 L 462.351562 621.320312 L 446.058594 597.421875 L 453.664062 597.421875 L 466.253906 616.675781 L 478.910156 597.421875 L 486.382812 597.421875 Z M 469.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 445 477 L 484 477 M 445 438 L 484 438 M 445 438 L 445 477 M 484 438 L 484 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 445 477 L 484 477 M 445 438 L 484 438 M 484 477 L 484 438 M 445 477 L 445 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/a21o/sky130_fd_sc_lp__a21o_lp.svg b/cells/a21o/sky130_fd_sc_lp__a21o_lp.svg
index a70dc5a..fb06eea 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_lp.svg
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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 1193.5 757.5 L 1228.5 757.5 L 1228.5 853.5 L 1193.5 853.5 Z M 703.5 757.5 L 737.5 757.5 L 737.5 853.5 L 703.5 853.5 Z M 792.5 757.5 L 827.5 757.5 L 827.5 853.5 L 792.5 853.5 Z M 923.5 757.5 L 957.5 757.5 L 957.5 853.5 L 923.5 853.5 Z M 1005.5 757.5 L 1040.5 757.5 L 1040.5 853.5 L 1005.5 853.5 Z M 1104.5 757.5 L 1138.5 757.5 L 1138.5 853.5 L 1104.5 853.5 Z M 1104.5 757.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 680.5 220.5 L 737.5 220.5 L 737.5 449.5 L 680.5 449.5 Z M 801.5 220.5 L 859.5 220.5 L 859.5 449.5 L 801.5 449.5 Z M 923.5 220.5 L 980.5 220.5 L 980.5 449.5 L 923.5 449.5 Z M 1193.5 235.5 L 1251.5 235.5 L 1251.5 464.5 L 1193.5 464.5 Z M 1193.5 235.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 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 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_lp__a21o_m.svg b/cells/a21o/sky130_fd_sc_lp__a21o_m.svg
index b8b657a..0bdd9d6 100644
--- a/cells/a21o/sky130_fd_sc_lp__a21o_m.svg
+++ b/cells/a21o/sky130_fd_sc_lp__a21o_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.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 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="#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 1066.5 768.5 L 1101.5 768.5 L 1101.5 864.5 L 1066.5 864.5 Z M 787.5 768.5 L 821.5 768.5 L 821.5 864.5 L 787.5 864.5 Z M 885.5 768.5 L 920.5 768.5 L 920.5 864.5 L 885.5 864.5 Z M 984.5 768.5 L 1018.5 768.5 L 1018.5 864.5 L 984.5 864.5 Z M 984.5 768.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 725.5 209.5 L 759.5 209.5 L 759.5 305.5 L 725.5 305.5 Z M 1167.5 240.5 L 1201.5 240.5 L 1201.5 336.5 L 1167.5 336.5 Z M 1068.5 240.5 L 1103.5 240.5 L 1103.5 336.5 L 1068.5 336.5 Z M 970.5 240.5 L 1004.5 240.5 L 1004.5 336.5 L 970.5 336.5 Z M 970.5 240.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 692.824219 282.320312 L 710.191406 307.5 L 702.449219 307.5 L 689.050781 287.035156 L 675.589844 307.5 L 667.980469 307.5 L 685.351562 282.320312 L 669.058594 258.421875 L 676.664062 258.421875 L 689.253906 277.675781 L 701.910156 258.421875 L 709.382812 258.421875 Z M 692.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 669 816 L 708 816 M 669 777 L 708 777 M 669 777 L 669 816 M 708 777 L 708 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 669 816 L 708 816 M 669 777 L 708 777 M 708 816 L 708 777 M 669 816 L 669 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/a21oi/sky130_fd_sc_lp__a21oi_0.svg b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.svg
index 70dd26e..41740b7 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_0.svg
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <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 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="#image332"/>
+  <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 1054.5 768.5 L 1088.5 768.5 L 1088.5 864.5 L 1054.5 864.5 Z M 866.5 768.5 L 900.5 768.5 L 900.5 864.5 L 866.5 864.5 Z M 955.5 768.5 L 989.5 768.5 L 989.5 864.5 L 955.5 864.5 Z M 955.5 768.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <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 1054.5 229.5 L 1088.5 229.5 L 1088.5 376.5 L 1054.5 376.5 Z M 856.5 229.5 L 891.5 229.5 L 891.5 376.5 L 856.5 376.5 Z M 955.5 229.5 L 989.5 229.5 L 989.5 376.5 L 955.5 376.5 Z M 955.5 229.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image335" 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="#image335"/>
+  <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="surface329">
+<g id="surface357">
 <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 1133.554688 288.246094 L 1133.554688 307.5 L 1127.292969 307.5 L 1127.292969 288.246094 L 1108.375 258.421875 L 1116.117188 258.421875 L 1130.523438 282.320312 L 1144.527344 258.421875 L 1152 258.421875 Z M 1133.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 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/a21oi/sky130_fd_sc_lp__a21oi_1.svg b/cells/a21oi/sky130_fd_sc_lp__a21oi_1.svg
index 7488825..7862fd4 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_1.svg
+++ b/cells/a21oi/sky130_fd_sc_lp__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 539.5 L 701.5 539.5 Z M 701.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="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 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="#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 1049.5 647.5 L 1083.5 647.5 L 1083.5 839.5 L 1049.5 839.5 Z M 836.5 647.5 L 870.5 647.5 L 870.5 839.5 L 836.5 839.5 Z M 925.5 647.5 L 960.5 647.5 L 960.5 839.5 L 925.5 839.5 Z M 925.5 647.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 1049.5 209.5 L 1083.5 209.5 L 1083.5 498.5 L 1049.5 498.5 Z M 836.5 209.5 L 870.5 209.5 L 870.5 498.5 L 836.5 498.5 Z M 950.5 209.5 L 985.5 209.5 L 985.5 498.5 L 950.5 498.5 Z M 950.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1133.554688 372.246094 L 1133.554688 391.5 L 1127.292969 391.5 L 1127.292969 372.246094 L 1108.375 342.421875 L 1116.117188 342.421875 L 1130.523438 366.320312 L 1144.527344 342.421875 L 1152 342.421875 Z M 1133.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 1110 731 L 1149 731 M 1110 693 L 1149 693 M 1110 693 L 1110 731 M 1149 693 L 1149 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 1110 731 L 1149 731 M 1110 693 L 1149 693 M 1149 731 L 1149 693 M 1110 731 L 1110 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 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_lp__a21oi_2.svg b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.svg
index e6d2aff..b767bc6 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_2.svg
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1170.5 672.5 L 1205.5 672.5 L 1205.5 864.5 L 1170.5 864.5 Z M 669.5 672.5 L 703.5 672.5 L 703.5 864.5 L 669.5 864.5 Z M 767.5 672.5 L 801.5 672.5 L 801.5 864.5 L 767.5 864.5 Z M 866.5 672.5 L 900.5 672.5 L 900.5 864.5 L 866.5 864.5 Z M 964.5 672.5 L 999.5 672.5 L 999.5 864.5 L 964.5 864.5 Z M 1072.5 672.5 L 1106.5 672.5 L 1106.5 864.5 L 1072.5 864.5 Z M 1072.5 672.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1170.5 209.5 L 1205.5 209.5 L 1205.5 498.5 L 1170.5 498.5 Z M 669.5 209.5 L 703.5 209.5 L 703.5 498.5 L 669.5 498.5 Z M 767.5 209.5 L 801.5 209.5 L 801.5 498.5 L 767.5 498.5 Z M 866.5 209.5 L 900.5 209.5 L 900.5 498.5 L 866.5 498.5 Z M 973.5 209.5 L 1008.5 209.5 L 1008.5 498.5 L 973.5 498.5 Z M 1072.5 209.5 L 1106.5 209.5 L 1106.5 498.5 L 1072.5 498.5 Z M 1072.5 209.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1296.554688 542.246094 L 1296.554688 561.5 L 1290.292969 561.5 L 1290.292969 542.246094 L 1271.375 512.421875 L 1279.117188 512.421875 L 1293.523438 536.320312 L 1307.527344 512.421875 L 1315 512.421875 Z M 1296.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 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/a21oi/sky130_fd_sc_lp__a21oi_4.svg b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.svg
index f5e2cd8..ba47af7 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_4.svg
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 256.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="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image342"/>
+  <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 1486.5 672.5 L 1520.5 672.5 L 1520.5 864.5 L 1486.5 864.5 Z M 392.5 672.5 L 427.5 672.5 L 427.5 864.5 L 392.5 864.5 Z M 491.5 672.5 L 525.5 672.5 L 525.5 864.5 L 491.5 864.5 Z M 589.5 672.5 L 624.5 672.5 L 624.5 864.5 L 589.5 864.5 Z M 688.5 672.5 L 722.5 672.5 L 722.5 864.5 L 688.5 864.5 Z M 787.5 672.5 L 821.5 672.5 L 821.5 864.5 L 787.5 864.5 Z M 885.5 672.5 L 920.5 672.5 L 920.5 864.5 L 885.5 864.5 Z M 984.5 672.5 L 1018.5 672.5 L 1018.5 864.5 L 984.5 864.5 Z M 1082.5 672.5 L 1117.5 672.5 L 1117.5 864.5 L 1082.5 864.5 Z M 1190.5 672.5 L 1224.5 672.5 L 1224.5 864.5 L 1190.5 864.5 Z M 1289.5 672.5 L 1323.5 672.5 L 1323.5 864.5 L 1289.5 864.5 Z M 1387.5 672.5 L 1421.5 672.5 L 1421.5 864.5 L 1387.5 864.5 Z M 1387.5 672.5 "/>
 </clipPath>
-<image id="image343" 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="#image343"/>
+  <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 1486.5 209.5 L 1520.5 209.5 L 1520.5 498.5 L 1486.5 498.5 Z M 392.5 209.5 L 427.5 209.5 L 427.5 498.5 L 392.5 498.5 Z M 491.5 209.5 L 525.5 209.5 L 525.5 498.5 L 491.5 498.5 Z M 589.5 209.5 L 624.5 209.5 L 624.5 498.5 L 589.5 498.5 Z M 688.5 209.5 L 722.5 209.5 L 722.5 498.5 L 688.5 498.5 Z M 787.5 209.5 L 821.5 209.5 L 821.5 498.5 L 787.5 498.5 Z M 885.5 209.5 L 920.5 209.5 L 920.5 498.5 L 885.5 498.5 Z M 984.5 209.5 L 1018.5 209.5 L 1018.5 498.5 L 984.5 498.5 Z M 1091.5 209.5 L 1126.5 209.5 L 1126.5 498.5 L 1091.5 498.5 Z M 1190.5 209.5 L 1224.5 209.5 L 1224.5 498.5 L 1190.5 498.5 Z M 1289.5 209.5 L 1323.5 209.5 L 1323.5 498.5 L 1289.5 498.5 Z M 1387.5 209.5 L 1421.5 209.5 L 1421.5 498.5 L 1387.5 498.5 Z M 1387.5 209.5 "/>
 </clipPath>
-<image id="image344" 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="#image344"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image345" 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="#image345"/>
+  <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="surface339">
+<g id="surface368">
 <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 1239.554688 712.246094 L 1239.554688 731.5 L 1233.292969 731.5 L 1233.292969 712.246094 L 1214.375 682.421875 L 1222.117188 682.421875 L 1236.523438 706.320312 L 1250.527344 682.421875 L 1258 682.421875 Z M 1239.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 1215 392 L 1254 392 M 1215 353 L 1254 353 M 1215 353 L 1215 392 M 1254 353 L 1254 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 1215 392 L 1254 392 M 1215 353 L 1254 353 M 1254 392 L 1254 353 M 1215 392 L 1215 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/a21oi/sky130_fd_sc_lp__a21oi_lp.svg b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.svg
index a2e876d..02cb6cc 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.svg
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1107.5 768.5 L 1142.5 768.5 L 1142.5 864.5 L 1107.5 864.5 Z M 805.5 768.5 L 839.5 768.5 L 839.5 864.5 L 805.5 864.5 Z M 894.5 768.5 L 929.5 768.5 L 929.5 864.5 L 894.5 864.5 Z M 1025.5 768.5 L 1059.5 768.5 L 1059.5 864.5 L 1025.5 864.5 Z M 1025.5 768.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1032.5 220.5 L 1089.5 220.5 L 1089.5 449.5 L 1032.5 449.5 Z M 789.5 220.5 L 846.5 220.5 L 846.5 449.5 L 789.5 449.5 Z M 910.5 220.5 L 968.5 220.5 L 968.5 449.5 L 910.5 449.5 Z M 910.5 220.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <path style=" 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.554688 288.246094 L 1187.554688 307.5 L 1181.292969 307.5 L 1181.292969 288.246094 L 1162.375 258.421875 L 1170.117188 258.421875 L 1184.523438 282.320312 L 1198.527344 258.421875 L 1206 258.421875 Z M 1187.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 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/a21oi/sky130_fd_sc_lp__a21oi_m.svg b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.svg
index aeec478..4ae74e4 100644
--- a/cells/a21oi/sky130_fd_sc_lp__a21oi_m.svg
+++ b/cells/a21oi/sky130_fd_sc_lp__a21oi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image330"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1043.5 768.5 L 1078.5 768.5 L 1078.5 864.5 L 1043.5 864.5 Z M 845.5 768.5 L 879.5 768.5 L 879.5 864.5 L 845.5 864.5 Z M 928.5 768.5 L 962.5 768.5 L 962.5 864.5 L 928.5 864.5 Z M 928.5 768.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1033.5 244.5 L 1067.5 244.5 L 1067.5 341.5 L 1033.5 341.5 Z M 836.5 244.5 L 870.5 244.5 L 870.5 341.5 L 836.5 341.5 Z M 934.5 244.5 L 969.5 244.5 L 969.5 341.5 L 934.5 341.5 Z M 934.5 244.5 "/>
 </clipPath>
-<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface327">
+<g id="surface355">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 808.703125 445.332031 L 809.242188 440.28125 L 810.652344 436.175781 L 812.875 432.941406 L 815.90625 430.652344 L 819.742188 429.242188 L 824.457031 428.769531 L 826.609375 428.902344 L 828.695312 429.242188 L 830.648438 429.777344 L 832.398438 430.585938 L 834.015625 431.597656 L 835.5625 432.742188 L 836.773438 434.15625 L 837.851562 435.636719 L 838.660156 437.25 L 839.265625 438.933594 L 839.601562 440.820312 L 839.738281 442.773438 L 839.46875 445.53125 L 838.726562 448.089844 L 837.449219 450.445312 L 835.699219 452.667969 L 833.410156 454.753906 L 830.648438 456.574219 L 829.640625 457.179688 L 822.90625 460.8125 L 821.15625 461.824219 L 819.609375 462.832031 L 818.261719 463.84375 L 817.183594 464.851562 L 816.242188 465.863281 L 815.570312 466.875 L 815.230469 467.480469 L 814.960938 468.015625 L 814.761719 468.691406 L 814.558594 469.296875 L 814.355469 469.96875 L 814.289062 470.644531 L 839.402344 470.644531 L 839.402344 476.5 L 807.625 476.5 L 807.757812 474.144531 L 808.097656 471.988281 L 808.5 469.96875 L 809.039062 468.21875 L 809.644531 466.535156 L 810.386719 465.054688 L 811.191406 463.777344 L 812.203125 462.496094 L 813.414062 461.21875 L 814.761719 460.007812 L 816.308594 458.792969 L 818.125 457.582031 L 818.53125 457.3125 L 819.003906 457.042969 L 819.472656 456.707031 L 819.945312 456.4375 L 820.484375 456.167969 L 821.023438 455.832031 L 827.214844 452.332031 L 829.167969 451.050781 L 830.785156 449.640625 L 832.0625 448.15625 L 832.9375 446.542969 L 833.476562 444.792969 L 833.679688 442.90625 L 833.542969 441.628906 L 833.339844 440.347656 L 832.871094 439.203125 L 832.332031 438.125 L 831.523438 437.183594 L 830.648438 436.242188 L 829.707031 435.570312 L 828.765625 434.960938 L 827.6875 434.558594 L 826.609375 434.222656 L 825.464844 434.019531 L 824.253906 433.953125 L 821.628906 434.289062 L 819.40625 435.097656 L 817.589844 436.511719 L 816.242188 438.464844 L 815.300781 441.023438 L 814.761719 444.050781 L 814.695312 444.320312 L 814.695312 444.722656 L 814.625 444.925781 L 814.625 445.332031 Z M 808.703125 445.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 780 647 L 819 647 M 780 608 L 819 608 M 780 608 L 780 647 M 819 608 L 819 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 780 647 L 819 647 M 780 608 L 819 608 M 819 647 L 819 608 M 780 647 L 780 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/a221o/sky130_fd_sc_lp__a221o_0.svg b/cells/a221o/sky130_fd_sc_lp__a221o_0.svg
index 18dcf12..dee0159 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_0.svg
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1237.5 768.5 L 1271.5 768.5 L 1271.5 864.5 L 1237.5 864.5 Z M 639.5 768.5 L 673.5 768.5 L 673.5 864.5 L 639.5 864.5 Z M 769.5 768.5 L 804.5 768.5 L 804.5 864.5 L 769.5 864.5 Z M 852.5 768.5 L 886.5 768.5 L 886.5 864.5 L 852.5 864.5 Z M 1031.5 768.5 L 1065.5 768.5 L 1065.5 864.5 L 1031.5 864.5 Z M 1113.5 768.5 L 1148.5 768.5 L 1148.5 864.5 L 1113.5 864.5 Z M 1113.5 768.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 632.5 217.5 L 666.5 217.5 L 666.5 364.5 L 632.5 364.5 Z M 735.5 217.5 L 769.5 217.5 L 769.5 364.5 L 735.5 364.5 Z M 834.5 217.5 L 868.5 217.5 L 868.5 364.5 L 834.5 364.5 Z M 1056.5 280.5 L 1090.5 280.5 L 1090.5 427.5 L 1056.5 427.5 Z M 1154.5 280.5 L 1189.5 280.5 L 1189.5 427.5 L 1154.5 427.5 Z M 1269.5 280.5 L 1303.5 280.5 L 1303.5 427.5 L 1269.5 427.5 Z M 1269.5 280.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface341">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <path style=" 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 621.320312 L 599.191406 646.5 L 591.449219 646.5 L 578.050781 626.035156 L 564.589844 646.5 L 556.980469 646.5 L 574.351562 621.320312 L 558.058594 597.421875 L 565.664062 597.421875 L 578.253906 616.675781 L 590.910156 597.421875 L 598.382812 597.421875 Z M 581.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 557 477 L 596 477 M 557 438 L 596 438 M 557 438 L 557 477 M 596 438 L 596 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 557 477 L 596 477 M 557 438 L 596 438 M 596 477 L 596 438 M 557 477 L 557 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/a221o/sky130_fd_sc_lp__a221o_1.svg b/cells/a221o/sky130_fd_sc_lp__a221o_1.svg
index 7c573e2..8c191ce 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_1.svg
+++ b/cells/a221o/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.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="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 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="#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 1272.5 672.5 L 1307.5 672.5 L 1307.5 864.5 L 1272.5 864.5 Z M 559.5 672.5 L 593.5 672.5 L 593.5 864.5 L 559.5 864.5 Z M 735.5 672.5 L 769.5 672.5 L 769.5 864.5 L 735.5 864.5 Z M 835.5 672.5 L 869.5 672.5 L 869.5 864.5 L 835.5 864.5 Z M 1052.5 672.5 L 1087.5 672.5 L 1087.5 864.5 L 1052.5 864.5 Z M 1135.5 672.5 L 1169.5 672.5 L 1169.5 864.5 L 1135.5 864.5 Z M 1135.5 672.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 1272.5 209.5 L 1307.5 209.5 L 1307.5 498.5 L 1272.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 735.5 209.5 L 769.5 209.5 L 769.5 498.5 L 735.5 498.5 Z M 835.5 209.5 L 869.5 209.5 L 869.5 498.5 L 835.5 498.5 Z M 1052.5 209.5 L 1087.5 209.5 L 1087.5 498.5 L 1052.5 498.5 Z M 1169.5 209.5 L 1204.5 209.5 L 1204.5 498.5 L 1169.5 498.5 Z M 1169.5 209.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface343">
+<g id="surface371">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -195,6 +195,5 @@
 <path style=" 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/a221o/sky130_fd_sc_lp__a221o_2.svg b/cells/a221o/sky130_fd_sc_lp__a221o_2.svg
index 5ed051a..7916d64 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_2.svg
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.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 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="#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 867.5 665.5 L 901.5 665.5 L 901.5 857.5 L 867.5 857.5 Z M 784.5 665.5 L 819.5 665.5 L 819.5 857.5 L 784.5 857.5 Z M 509.5 665.5 L 544.5 665.5 L 544.5 857.5 L 509.5 857.5 Z M 608.5 665.5 L 642.5 665.5 L 642.5 857.5 L 608.5 857.5 Z M 1125.5 670.5 L 1159.5 670.5 L 1159.5 862.5 L 1125.5 862.5 Z M 1331.5 670.5 L 1365.5 670.5 L 1365.5 862.5 L 1331.5 862.5 Z M 1223.5 670.5 L 1258.5 670.5 L 1258.5 862.5 L 1223.5 862.5 Z M 1223.5 670.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 1331.5 209.5 L 1365.5 209.5 L 1365.5 498.5 L 1331.5 498.5 Z M 509.5 209.5 L 544.5 209.5 L 544.5 498.5 L 509.5 498.5 Z M 608.5 209.5 L 642.5 209.5 L 642.5 498.5 L 608.5 498.5 Z M 759.5 209.5 L 793.5 209.5 L 793.5 498.5 L 759.5 498.5 Z M 866.5 209.5 L 900.5 209.5 L 900.5 498.5 L 866.5 498.5 Z M 1125.5 209.5 L 1159.5 209.5 L 1159.5 498.5 L 1125.5 498.5 Z M 1223.5 209.5 L 1258.5 209.5 L 1258.5 498.5 L 1223.5 498.5 Z M 1223.5 209.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1157.476562 526.953125 L 1146.90625 526.953125 L 1146.90625 522.714844 L 1148.722656 522.511719 L 1150.339844 522.242188 L 1151.753906 521.90625 L 1152.964844 521.636719 L 1153.972656 521.300781 L 1154.847656 520.894531 L 1155.523438 520.492188 L 1156.128906 520.019531 L 1156.667969 519.480469 L 1157.207031 518.808594 L 1157.675781 518.066406 L 1158.148438 517.191406 L 1158.351562 516.722656 L 1158.550781 516.183594 L 1158.753906 515.578125 L 1159.023438 514.835938 L 1159.226562 514.097656 L 1159.496094 513.222656 L 1163.398438 513.222656 L 1163.398438 560.953125 L 1157.476562 560.953125 Z M 1157.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 1106 562 L 1145 562 M 1106 523 L 1145 523 M 1106 523 L 1106 562 M 1145 523 L 1145 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 1106 562 L 1145 562 M 1106 523 L 1145 523 M 1145 562 L 1145 523 M 1106 562 L 1106 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/a221o/sky130_fd_sc_lp__a221o_4.svg b/cells/a221o/sky130_fd_sc_lp__a221o_4.svg
index 026aee4..56e7501 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_4.svg
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image326"/>
+  <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 1583.5 649.5 L 1612.5 649.5 L 1612.5 812.5 L 1583.5 812.5 Z M 1499.5 649.5 L 1528.5 649.5 L 1528.5 812.5 L 1499.5 812.5 Z M 376.5 651.5 L 405.5 651.5 L 405.5 814.5 L 376.5 814.5 Z M 459.5 651.5 L 489.5 651.5 L 489.5 814.5 L 459.5 814.5 Z M 543.5 651.5 L 572.5 651.5 L 572.5 814.5 L 543.5 814.5 Z M 627.5 651.5 L 656.5 651.5 L 656.5 814.5 L 627.5 814.5 Z M 711.5 651.5 L 740.5 651.5 L 740.5 814.5 L 711.5 814.5 Z M 895.5 651.5 L 925.5 651.5 L 925.5 814.5 L 895.5 814.5 Z M 979.5 651.5 L 1008.5 651.5 L 1008.5 814.5 L 979.5 814.5 Z M 1063.5 651.5 L 1092.5 651.5 L 1092.5 814.5 L 1063.5 814.5 Z M 1147.5 651.5 L 1176.5 651.5 L 1176.5 814.5 L 1147.5 814.5 Z M 1230.5 651.5 L 1259.5 651.5 L 1259.5 814.5 L 1230.5 814.5 Z M 1314.5 651.5 L 1343.5 651.5 L 1343.5 814.5 L 1314.5 814.5 Z M 292.5 651.5 L 321.5 651.5 L 321.5 814.5 L 292.5 814.5 Z M 292.5 651.5 "/>
 </clipPath>
-<image id="image327" 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="#image327"/>
+  <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 1481.5 258.5 L 1511.5 258.5 L 1511.5 503.5 L 1481.5 503.5 Z M 292.5 258.5 L 321.5 258.5 L 321.5 503.5 L 292.5 503.5 Z M 376.5 258.5 L 405.5 258.5 L 405.5 503.5 L 376.5 503.5 Z M 459.5 258.5 L 489.5 258.5 L 489.5 503.5 L 459.5 503.5 Z M 543.5 258.5 L 572.5 258.5 L 572.5 503.5 L 543.5 503.5 Z M 627.5 258.5 L 656.5 258.5 L 656.5 503.5 L 627.5 503.5 Z M 711.5 258.5 L 740.5 258.5 L 740.5 503.5 L 711.5 503.5 Z M 794.5 258.5 L 823.5 258.5 L 823.5 503.5 L 794.5 503.5 Z M 878.5 258.5 L 907.5 258.5 L 907.5 503.5 L 878.5 503.5 Z M 1063.5 258.5 L 1092.5 258.5 L 1092.5 503.5 L 1063.5 503.5 Z M 1147.5 258.5 L 1176.5 258.5 L 1176.5 503.5 L 1147.5 503.5 Z M 1230.5 258.5 L 1259.5 258.5 L 1259.5 503.5 L 1230.5 503.5 Z M 1314.5 258.5 L 1343.5 258.5 L 1343.5 503.5 L 1314.5 503.5 Z M 1398.5 258.5 L 1427.5 258.5 L 1427.5 503.5 L 1398.5 503.5 Z M 1398.5 258.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image329" 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="#image329"/>
+  <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="surface323">
+<g id="surface352">
 <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 262.984375 535.992188 L 277.820312 557.5 L 271.207031 557.5 L 259.765625 540.019531 L 248.261719 557.5 L 241.765625 557.5 L 256.601562 535.992188 L 242.683594 515.578125 L 249.183594 515.578125 L 259.9375 532.027344 L 270.746094 515.578125 L 277.128906 515.578125 Z M 262.984375 535.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 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/a221o/sky130_fd_sc_lp__a221o_lp.svg b/cells/a221o/sky130_fd_sc_lp__a221o_lp.svg
index 4024100..2edb48a 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_lp.svg
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1334.5 746.5 L 1369.5 746.5 L 1369.5 843.5 L 1334.5 843.5 Z M 562.5 746.5 L 596.5 746.5 L 596.5 843.5 L 562.5 843.5 Z M 644.5 746.5 L 679.5 746.5 L 679.5 843.5 L 644.5 843.5 Z M 761.5 746.5 L 796.5 746.5 L 796.5 843.5 L 761.5 843.5 Z M 851.5 746.5 L 885.5 746.5 L 885.5 843.5 L 851.5 843.5 Z M 1043.5 746.5 L 1078.5 746.5 L 1078.5 843.5 L 1043.5 843.5 Z M 1133.5 746.5 L 1167.5 746.5 L 1167.5 843.5 L 1133.5 843.5 Z M 1252.5 746.5 L 1286.5 746.5 L 1286.5 843.5 L 1252.5 843.5 Z M 1252.5 746.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 539.5 209.5 L 596.5 209.5 L 596.5 438.5 L 539.5 438.5 Z M 722.5 209.5 L 780.5 209.5 L 780.5 438.5 L 722.5 438.5 Z M 844.5 209.5 L 901.5 209.5 L 901.5 438.5 L 844.5 438.5 Z M 1101.5 231.5 L 1158.5 231.5 L 1158.5 460.5 L 1101.5 460.5 Z M 1222.5 231.5 L 1279.5 231.5 L 1279.5 460.5 L 1222.5 460.5 Z M 1344.5 231.5 L 1401.5 231.5 L 1401.5 460.5 L 1344.5 460.5 Z M 1344.5 231.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface334">
+<g id="surface362">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -188,6 +188,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1377.476562 526.953125 L 1366.90625 526.953125 L 1366.90625 522.714844 L 1368.722656 522.511719 L 1370.339844 522.242188 L 1371.753906 521.90625 L 1372.964844 521.636719 L 1373.972656 521.300781 L 1374.847656 520.894531 L 1375.523438 520.492188 L 1376.128906 520.019531 L 1376.667969 519.480469 L 1377.207031 518.808594 L 1377.675781 518.066406 L 1378.148438 517.191406 L 1378.351562 516.722656 L 1378.550781 516.183594 L 1378.753906 515.578125 L 1379.023438 514.835938 L 1379.226562 514.097656 L 1379.496094 513.222656 L 1383.398438 513.222656 L 1383.398438 560.953125 L 1377.476562 560.953125 Z M 1377.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 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/a221o/sky130_fd_sc_lp__a221o_m.svg b/cells/a221o/sky130_fd_sc_lp__a221o_m.svg
index ce0d5da..84c831b 100644
--- a/cells/a221o/sky130_fd_sc_lp__a221o_m.svg
+++ b/cells/a221o/sky130_fd_sc_lp__a221o_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1216.5 768.5 L 1251.5 768.5 L 1251.5 864.5 L 1216.5 864.5 Z M 669.5 768.5 L 703.5 768.5 L 703.5 864.5 L 669.5 864.5 Z M 767.5 768.5 L 801.5 768.5 L 801.5 864.5 L 767.5 864.5 Z M 850.5 768.5 L 884.5 768.5 L 884.5 864.5 L 850.5 864.5 Z M 1000.5 768.5 L 1034.5 768.5 L 1034.5 864.5 L 1000.5 864.5 Z M 1082.5 768.5 L 1117.5 768.5 L 1117.5 864.5 L 1082.5 864.5 Z M 1082.5 768.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 711.5 209.5 L 745.5 209.5 L 745.5 305.5 L 711.5 305.5 Z M 908.5 209.5 L 942.5 209.5 L 942.5 305.5 L 908.5 305.5 Z M 810.5 209.5 L 844.5 209.5 L 844.5 305.5 L 810.5 305.5 Z M 1024.5 367.5 L 1058.5 367.5 L 1058.5 463.5 L 1024.5 463.5 Z M 1221.5 367.5 L 1255.5 367.5 L 1255.5 463.5 L 1221.5 463.5 Z M 1122.5 367.5 L 1157.5 367.5 L 1157.5 463.5 L 1122.5 463.5 Z M 1122.5 367.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/a221oi/sky130_fd_sc_lp__a221oi_0.svg b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.svg
index 6c076d4..ca967c3 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_0.svg
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1099.5 768.5 L 1134.5 768.5 L 1134.5 864.5 L 1099.5 864.5 Z M 674.5 768.5 L 709.5 768.5 L 709.5 864.5 L 674.5 864.5 Z M 804.5 768.5 L 838.5 768.5 L 838.5 864.5 L 804.5 864.5 Z M 893.5 768.5 L 928.5 768.5 L 928.5 864.5 L 893.5 864.5 Z M 1010.5 768.5 L 1044.5 768.5 L 1044.5 864.5 L 1010.5 864.5 Z M 1010.5 768.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1177.5 213.5 L 1212.5 213.5 L 1212.5 360.5 L 1177.5 360.5 Z M 721.5 213.5 L 756.5 213.5 L 756.5 360.5 L 721.5 360.5 Z M 820.5 213.5 L 854.5 213.5 L 854.5 360.5 L 820.5 360.5 Z M 948.5 213.5 L 983.5 213.5 L 983.5 360.5 L 948.5 360.5 Z M 1063.5 213.5 L 1097.5 213.5 L 1097.5 360.5 L 1063.5 360.5 Z M 1063.5 213.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface362">
+<g id="surface390">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 636.554688 627.246094 L 636.554688 646.5 L 630.292969 646.5 L 630.292969 627.246094 L 611.375 597.421875 L 619.117188 597.421875 L 633.523438 621.320312 L 647.527344 597.421875 L 655 597.421875 Z M 636.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 612 477 L 651 477 M 612 438 L 651 438 M 612 438 L 612 477 M 651 438 L 651 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 612 477 L 651 477 M 612 438 L 651 438 M 651 477 L 651 438 M 612 477 L 612 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/a221oi/sky130_fd_sc_lp__a221oi_1.svg b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.svg
index 9bf6fc0..9ff8953 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_1.svg
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1216.5 672.5 L 1251.5 672.5 L 1251.5 864.5 L 1216.5 864.5 Z M 706.5 672.5 L 741.5 672.5 L 741.5 864.5 L 706.5 864.5 Z M 886.5 672.5 L 921.5 672.5 L 921.5 864.5 L 886.5 864.5 Z M 969.5 672.5 L 1003.5 672.5 L 1003.5 864.5 L 969.5 864.5 Z M 1093.5 672.5 L 1127.5 672.5 L 1127.5 864.5 L 1093.5 864.5 Z M 1093.5 672.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1216.5 209.5 L 1251.5 209.5 L 1251.5 498.5 L 1216.5 498.5 Z M 669.5 209.5 L 703.5 209.5 L 703.5 498.5 L 669.5 498.5 Z M 886.5 209.5 L 921.5 209.5 L 921.5 498.5 L 886.5 498.5 Z M 989.5 209.5 L 1024.5 209.5 L 1024.5 498.5 L 989.5 498.5 Z M 1099.5 209.5 L 1134.5 209.5 L 1134.5 498.5 L 1099.5 498.5 Z M 1099.5 209.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 861.703125 615.332031 L 862.242188 610.28125 L 863.652344 606.175781 L 865.875 602.941406 L 868.90625 600.652344 L 872.742188 599.242188 L 877.457031 598.769531 L 879.609375 598.902344 L 881.695312 599.242188 L 883.648438 599.777344 L 885.398438 600.585938 L 887.015625 601.597656 L 888.5625 602.742188 L 889.773438 604.15625 L 890.851562 605.636719 L 891.660156 607.25 L 892.265625 608.933594 L 892.601562 610.820312 L 892.738281 612.773438 L 892.46875 615.53125 L 891.726562 618.089844 L 890.449219 620.445312 L 888.699219 622.667969 L 886.410156 624.753906 L 883.648438 626.574219 L 882.640625 627.179688 L 875.90625 630.8125 L 874.15625 631.824219 L 872.609375 632.832031 L 871.261719 633.84375 L 870.183594 634.851562 L 869.242188 635.863281 L 868.570312 636.875 L 868.230469 637.480469 L 867.960938 638.015625 L 867.761719 638.691406 L 867.558594 639.296875 L 867.355469 639.96875 L 867.289062 640.644531 L 892.402344 640.644531 L 892.402344 646.5 L 860.625 646.5 L 860.757812 644.144531 L 861.097656 641.988281 L 861.5 639.96875 L 862.039062 638.21875 L 862.644531 636.535156 L 863.386719 635.054688 L 864.191406 633.777344 L 865.203125 632.496094 L 866.414062 631.21875 L 867.761719 630.007812 L 869.308594 628.792969 L 871.125 627.582031 L 871.53125 627.3125 L 872.003906 627.042969 L 872.472656 626.707031 L 872.945312 626.4375 L 873.484375 626.167969 L 874.023438 625.832031 L 880.214844 622.332031 L 882.167969 621.050781 L 883.785156 619.640625 L 885.0625 618.15625 L 885.9375 616.542969 L 886.476562 614.792969 L 886.679688 612.90625 L 886.542969 611.628906 L 886.339844 610.347656 L 885.871094 609.203125 L 885.332031 608.125 L 884.523438 607.183594 L 883.648438 606.242188 L 882.707031 605.570312 L 881.765625 604.960938 L 880.6875 604.558594 L 879.609375 604.222656 L 878.464844 604.019531 L 877.253906 603.953125 L 874.628906 604.289062 L 872.40625 605.097656 L 870.589844 606.511719 L 869.242188 608.464844 L 868.300781 611.023438 L 867.761719 614.050781 L 867.695312 614.320312 L 867.695312 614.722656 L 867.625 614.925781 L 867.625 615.332031 Z M 861.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 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 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/a221oi/sky130_fd_sc_lp__a221oi_2.svg b/cells/a221oi/sky130_fd_sc_lp__a221oi_2.svg
index 0688f89..5c60d63 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_2.svg
+++ b/cells/a221oi/sky130_fd_sc_lp__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 539.5 L 256.5 539.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image350" 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="#image350"/>
+  <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 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="#image350"/>
+  <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 1432.5 672.5 L 1466.5 672.5 L 1466.5 864.5 L 1432.5 864.5 Z M 416.5 672.5 L 451.5 672.5 L 451.5 864.5 L 416.5 864.5 Z M 515.5 672.5 L 549.5 672.5 L 549.5 864.5 L 515.5 864.5 Z M 705.5 672.5 L 740.5 672.5 L 740.5 864.5 L 705.5 864.5 Z M 804.5 672.5 L 838.5 672.5 L 838.5 864.5 L 804.5 864.5 Z M 902.5 672.5 L 937.5 672.5 L 937.5 864.5 L 902.5 864.5 Z M 1001.5 672.5 L 1035.5 672.5 L 1035.5 864.5 L 1001.5 864.5 Z M 1136.5 672.5 L 1170.5 672.5 L 1170.5 864.5 L 1136.5 864.5 Z M 1235.5 672.5 L 1269.5 672.5 L 1269.5 864.5 L 1235.5 864.5 Z M 1333.5 672.5 L 1368.5 672.5 L 1368.5 864.5 L 1333.5 864.5 Z M 1333.5 672.5 "/>
 </clipPath>
-<image id="image351" 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="#image351"/>
+  <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 1432.5 209.5 L 1466.5 209.5 L 1466.5 498.5 L 1432.5 498.5 Z M 391.5 209.5 L 426.5 209.5 L 426.5 498.5 L 391.5 498.5 Z M 490.5 209.5 L 524.5 209.5 L 524.5 498.5 L 490.5 498.5 Z M 708.5 209.5 L 742.5 209.5 L 742.5 498.5 L 708.5 498.5 Z M 806.5 209.5 L 840.5 209.5 L 840.5 498.5 L 806.5 498.5 Z M 905.5 209.5 L 939.5 209.5 L 939.5 498.5 L 905.5 498.5 Z M 1003.5 209.5 L 1038.5 209.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1111.5 209.5 L 1145.5 209.5 L 1145.5 498.5 L 1111.5 498.5 Z M 1235.5 209.5 L 1269.5 209.5 L 1269.5 498.5 L 1235.5 498.5 Z M 1333.5 209.5 L 1368.5 209.5 L 1368.5 498.5 L 1333.5 498.5 Z M 1333.5 209.5 "/>
 </clipPath>
-<image id="image352" 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="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image353" 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="#image353"/>
+  <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="surface347">
+<g id="surface375">
 <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 803.703125 530.332031 L 804.242188 525.28125 L 805.652344 521.175781 L 807.875 517.941406 L 810.90625 515.652344 L 814.742188 514.242188 L 819.457031 513.769531 L 821.609375 513.902344 L 823.695312 514.242188 L 825.648438 514.777344 L 827.398438 515.585938 L 829.015625 516.597656 L 830.5625 517.742188 L 831.773438 519.15625 L 832.851562 520.636719 L 833.660156 522.25 L 834.265625 523.933594 L 834.601562 525.820312 L 834.738281 527.773438 L 834.46875 530.53125 L 833.726562 533.089844 L 832.449219 535.445312 L 830.699219 537.667969 L 828.410156 539.753906 L 825.648438 541.574219 L 824.640625 542.179688 L 817.90625 545.8125 L 816.15625 546.824219 L 814.609375 547.832031 L 813.261719 548.84375 L 812.183594 549.851562 L 811.242188 550.863281 L 810.570312 551.875 L 810.230469 552.480469 L 809.960938 553.015625 L 809.761719 553.691406 L 809.558594 554.296875 L 809.355469 554.96875 L 809.289062 555.644531 L 834.402344 555.644531 L 834.402344 561.5 L 802.625 561.5 L 802.757812 559.144531 L 803.097656 556.988281 L 803.5 554.96875 L 804.039062 553.21875 L 804.644531 551.535156 L 805.386719 550.054688 L 806.191406 548.777344 L 807.203125 547.496094 L 808.414062 546.21875 L 809.761719 545.007812 L 811.308594 543.792969 L 813.125 542.582031 L 813.53125 542.3125 L 814.003906 542.042969 L 814.472656 541.707031 L 814.945312 541.4375 L 815.484375 541.167969 L 816.023438 540.832031 L 822.214844 537.332031 L 824.167969 536.050781 L 825.785156 534.640625 L 827.0625 533.15625 L 827.9375 531.542969 L 828.476562 529.792969 L 828.679688 527.90625 L 828.542969 526.628906 L 828.339844 525.347656 L 827.871094 524.203125 L 827.332031 523.125 L 826.523438 522.183594 L 825.648438 521.242188 L 824.707031 520.570312 L 823.765625 519.960938 L 822.6875 519.558594 L 821.609375 519.222656 L 820.464844 519.019531 L 819.253906 518.953125 L 816.628906 519.289062 L 814.40625 520.097656 L 812.589844 521.511719 L 811.242188 523.464844 L 810.300781 526.023438 L 809.761719 529.050781 L 809.695312 529.320312 L 809.695312 529.722656 L 809.625 529.925781 L 809.625 530.332031 Z M 803.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 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/a221oi/sky130_fd_sc_lp__a221oi_4.svg b/cells/a221oi/sky130_fd_sc_lp__a221oi_4.svg
index 0038944..3698867 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_4.svg
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_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="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image381"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask 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="#image381"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1633.5 623.5 L 1655.5 623.5 L 1655.5 749.5 L 1633.5 749.5 Z M 332.5 623.5 L 355.5 623.5 L 355.5 749.5 L 332.5 749.5 Z M 397.5 623.5 L 419.5 623.5 L 419.5 749.5 L 397.5 749.5 Z M 461.5 623.5 L 484.5 623.5 L 484.5 749.5 L 461.5 749.5 Z M 526.5 623.5 L 548.5 623.5 L 548.5 749.5 L 526.5 749.5 Z M 590.5 623.5 L 613.5 623.5 L 613.5 749.5 L 590.5 749.5 Z M 655.5 623.5 L 677.5 623.5 L 677.5 749.5 L 655.5 749.5 Z M 719.5 623.5 L 742.5 623.5 L 742.5 749.5 L 719.5 749.5 Z M 826.5 623.5 L 848.5 623.5 L 848.5 749.5 L 826.5 749.5 Z M 890.5 623.5 L 913.5 623.5 L 913.5 749.5 L 890.5 749.5 Z M 955.5 623.5 L 977.5 623.5 L 977.5 749.5 L 955.5 749.5 Z M 1019.5 623.5 L 1042.5 623.5 L 1042.5 749.5 L 1019.5 749.5 Z M 1105.5 623.5 L 1127.5 623.5 L 1127.5 749.5 L 1105.5 749.5 Z M 1181.5 623.5 L 1204.5 623.5 L 1204.5 749.5 L 1181.5 749.5 Z M 1246.5 623.5 L 1268.5 623.5 L 1268.5 749.5 L 1246.5 749.5 Z M 1310.5 623.5 L 1333.5 623.5 L 1333.5 749.5 L 1310.5 749.5 Z M 1375.5 623.5 L 1397.5 623.5 L 1397.5 749.5 L 1375.5 749.5 Z M 1439.5 623.5 L 1462.5 623.5 L 1462.5 749.5 L 1439.5 749.5 Z M 1504.5 623.5 L 1526.5 623.5 L 1526.5 749.5 L 1504.5 749.5 Z M 1568.5 623.5 L 1591.5 623.5 L 1591.5 749.5 L 1568.5 749.5 Z M 1568.5 623.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image411"/>
 </pattern>
 <mask id="mask2">
 <rect 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 320.5 L 1655.5 320.5 L 1655.5 509.5 L 1633.5 509.5 Z M 307.5 320.5 L 329.5 320.5 L 329.5 509.5 L 307.5 509.5 Z M 371.5 320.5 L 394.5 320.5 L 394.5 509.5 L 371.5 509.5 Z M 436.5 320.5 L 458.5 320.5 L 458.5 509.5 L 436.5 509.5 Z M 500.5 320.5 L 523.5 320.5 L 523.5 509.5 L 500.5 509.5 Z M 643.5 320.5 L 665.5 320.5 L 665.5 509.5 L 643.5 509.5 Z M 707.5 320.5 L 730.5 320.5 L 730.5 509.5 L 707.5 509.5 Z M 772.5 320.5 L 794.5 320.5 L 794.5 509.5 L 772.5 509.5 Z M 836.5 320.5 L 859.5 320.5 L 859.5 509.5 L 836.5 509.5 Z M 901.5 320.5 L 923.5 320.5 L 923.5 509.5 L 901.5 509.5 Z M 965.5 320.5 L 988.5 320.5 L 988.5 509.5 L 965.5 509.5 Z M 1030.5 320.5 L 1052.5 320.5 L 1052.5 509.5 L 1030.5 509.5 Z M 1094.5 320.5 L 1117.5 320.5 L 1117.5 509.5 L 1094.5 509.5 Z M 1177.5 320.5 L 1199.5 320.5 L 1199.5 509.5 L 1177.5 509.5 Z M 1246.5 320.5 L 1268.5 320.5 L 1268.5 509.5 L 1246.5 509.5 Z M 1310.5 320.5 L 1333.5 320.5 L 1333.5 509.5 L 1310.5 509.5 Z M 1375.5 320.5 L 1397.5 320.5 L 1397.5 509.5 L 1375.5 509.5 Z M 1439.5 320.5 L 1462.5 320.5 L 1462.5 509.5 L 1439.5 509.5 Z M 1504.5 320.5 L 1526.5 320.5 L 1526.5 509.5 L 1504.5 509.5 Z M 1568.5 320.5 L 1591.5 320.5 L 1591.5 509.5 L 1568.5 509.5 Z M 1568.5 320.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image412"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 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="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image413"/>
 </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="surface407">
 <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 1108.628906 531.371094 L 1108.976562 528.109375 L 1109.890625 525.457031 L 1111.324219 523.371094 L 1113.28125 521.890625 L 1115.761719 520.976562 L 1118.804688 520.675781 L 1120.195312 520.761719 L 1121.542969 520.976562 L 1122.804688 521.324219 L 1123.933594 521.847656 L 1124.976562 522.5 L 1125.976562 523.238281 L 1126.761719 524.152344 L 1127.457031 525.109375 L 1127.976562 526.152344 L 1128.371094 527.238281 L 1128.585938 528.457031 L 1128.675781 529.71875 L 1128.5 531.5 L 1128.023438 533.152344 L 1127.195312 534.675781 L 1126.066406 536.109375 L 1124.585938 537.457031 L 1122.804688 538.628906 L 1122.152344 539.023438 L 1117.804688 541.371094 L 1116.675781 542.023438 L 1115.675781 542.675781 L 1114.804688 543.324219 L 1114.109375 543.976562 L 1113.5 544.628906 L 1113.066406 545.28125 L 1112.847656 545.675781 L 1112.675781 546.023438 L 1112.542969 546.457031 L 1112.414062 546.847656 L 1112.28125 547.28125 L 1112.238281 547.71875 L 1128.457031 547.71875 L 1128.457031 551.5 L 1107.933594 551.5 L 1108.023438 549.976562 L 1108.238281 548.585938 L 1108.5 547.28125 L 1108.847656 546.152344 L 1109.238281 545.066406 L 1109.71875 544.109375 L 1110.238281 543.28125 L 1110.890625 542.457031 L 1111.675781 541.628906 L 1112.542969 540.847656 L 1113.542969 540.066406 L 1114.71875 539.28125 L 1114.976562 539.109375 L 1115.28125 538.933594 L 1115.585938 538.71875 L 1115.890625 538.542969 L 1116.238281 538.371094 L 1116.585938 538.152344 L 1120.585938 535.890625 L 1121.847656 535.066406 L 1122.890625 534.152344 L 1123.71875 533.195312 L 1124.28125 532.152344 L 1124.628906 531.023438 L 1124.761719 529.804688 L 1124.675781 528.976562 L 1124.542969 528.152344 L 1124.238281 527.414062 L 1123.890625 526.71875 L 1123.371094 526.109375 L 1122.804688 525.5 L 1122.195312 525.066406 L 1121.585938 524.675781 L 1120.890625 524.414062 L 1120.195312 524.195312 L 1119.457031 524.066406 L 1118.675781 524.023438 L 1116.976562 524.238281 L 1115.542969 524.761719 L 1114.371094 525.675781 L 1113.5 526.933594 L 1112.890625 528.585938 L 1112.542969 530.542969 L 1112.5 530.71875 L 1112.5 530.976562 L 1112.457031 531.109375 L 1112.457031 531.371094 Z M 1108.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 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/a221oi/sky130_fd_sc_lp__a221oi_lp.svg b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.svg
index f76c955..e868f7c 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.svg
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image344"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1245.5 767.5 L 1279.5 767.5 L 1279.5 863.5 L 1245.5 863.5 Z M 665.5 767.5 L 699.5 767.5 L 699.5 863.5 L 665.5 863.5 Z M 755.5 767.5 L 789.5 767.5 L 789.5 863.5 L 755.5 863.5 Z M 878.5 767.5 L 913.5 767.5 L 913.5 863.5 L 878.5 863.5 Z M 968.5 767.5 L 1002.5 767.5 L 1002.5 863.5 L 968.5 863.5 Z M 1162.5 767.5 L 1197.5 767.5 L 1197.5 863.5 L 1162.5 863.5 Z M 1162.5 767.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1204.5 217.5 L 1261.5 217.5 L 1261.5 446.5 L 1204.5 446.5 Z M 651.5 217.5 L 709.5 217.5 L 709.5 446.5 L 651.5 446.5 Z M 773.5 217.5 L 830.5 217.5 L 830.5 446.5 L 773.5 446.5 Z M 961.5 217.5 L 1018.5 217.5 L 1018.5 446.5 L 961.5 446.5 Z M 1082.5 217.5 L 1140.5 217.5 L 1140.5 446.5 L 1082.5 446.5 Z M 1082.5 217.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface341">
+<g id="surface369">
 <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 696.703125 530.332031 L 697.242188 525.28125 L 698.652344 521.175781 L 700.875 517.941406 L 703.90625 515.652344 L 707.742188 514.242188 L 712.457031 513.769531 L 714.609375 513.902344 L 716.695312 514.242188 L 718.648438 514.777344 L 720.398438 515.585938 L 722.015625 516.597656 L 723.5625 517.742188 L 724.773438 519.15625 L 725.851562 520.636719 L 726.660156 522.25 L 727.265625 523.933594 L 727.601562 525.820312 L 727.738281 527.773438 L 727.46875 530.53125 L 726.726562 533.089844 L 725.449219 535.445312 L 723.699219 537.667969 L 721.410156 539.753906 L 718.648438 541.574219 L 717.640625 542.179688 L 710.90625 545.8125 L 709.15625 546.824219 L 707.609375 547.832031 L 706.261719 548.84375 L 705.183594 549.851562 L 704.242188 550.863281 L 703.570312 551.875 L 703.230469 552.480469 L 702.960938 553.015625 L 702.761719 553.691406 L 702.558594 554.296875 L 702.355469 554.96875 L 702.289062 555.644531 L 727.402344 555.644531 L 727.402344 561.5 L 695.625 561.5 L 695.757812 559.144531 L 696.097656 556.988281 L 696.5 554.96875 L 697.039062 553.21875 L 697.644531 551.535156 L 698.386719 550.054688 L 699.191406 548.777344 L 700.203125 547.496094 L 701.414062 546.21875 L 702.761719 545.007812 L 704.308594 543.792969 L 706.125 542.582031 L 706.53125 542.3125 L 707.003906 542.042969 L 707.472656 541.707031 L 707.945312 541.4375 L 708.484375 541.167969 L 709.023438 540.832031 L 715.214844 537.332031 L 717.167969 536.050781 L 718.785156 534.640625 L 720.0625 533.15625 L 720.9375 531.542969 L 721.476562 529.792969 L 721.679688 527.90625 L 721.542969 526.628906 L 721.339844 525.347656 L 720.871094 524.203125 L 720.332031 523.125 L 719.523438 522.183594 L 718.648438 521.242188 L 717.707031 520.570312 L 716.765625 519.960938 L 715.6875 519.558594 L 714.609375 519.222656 L 713.464844 519.019531 L 712.253906 518.953125 L 709.628906 519.289062 L 707.40625 520.097656 L 705.589844 521.511719 L 704.242188 523.464844 L 703.300781 526.023438 L 702.761719 529.050781 L 702.695312 529.320312 L 702.695312 529.722656 L 702.625 529.925781 L 702.625 530.332031 Z M 696.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 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/a221oi/sky130_fd_sc_lp__a221oi_m.svg b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.svg
index faa67e0..25f021c 100644
--- a/cells/a221oi/sky130_fd_sc_lp__a221oi_m.svg
+++ b/cells/a221oi/sky130_fd_sc_lp__a221oi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 1090.5 759.5 L 1125.5 759.5 L 1125.5 855.5 L 1090.5 855.5 Z M 703.5 759.5 L 737.5 759.5 L 737.5 855.5 L 703.5 855.5 Z M 801.5 759.5 L 836.5 759.5 L 836.5 855.5 L 801.5 855.5 Z M 884.5 759.5 L 918.5 759.5 L 918.5 855.5 L 884.5 855.5 Z M 1008.5 759.5 L 1042.5 759.5 L 1042.5 855.5 L 1008.5 855.5 Z M 1008.5 759.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 1221.5 209.5 L 1255.5 209.5 L 1255.5 305.5 L 1221.5 305.5 Z M 783.5 209.5 L 818.5 209.5 L 818.5 305.5 L 783.5 305.5 Z M 882.5 209.5 L 916.5 209.5 L 916.5 305.5 L 882.5 305.5 Z M 980.5 209.5 L 1015.5 209.5 L 1015.5 305.5 L 980.5 305.5 Z M 1122.5 209.5 L 1157.5 209.5 L 1157.5 305.5 L 1122.5 305.5 Z M 1122.5 209.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1076.554688 712.246094 L 1076.554688 731.5 L 1070.292969 731.5 L 1070.292969 712.246094 L 1051.375 682.421875 L 1059.117188 682.421875 L 1073.523438 706.320312 L 1087.527344 682.421875 L 1095 682.421875 Z M 1076.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 1052 392 L 1091 392 M 1052 353 L 1091 353 M 1052 353 L 1052 392 M 1091 353 L 1091 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 1052 392 L 1091 392 M 1052 353 L 1091 353 M 1091 392 L 1091 353 M 1052 392 L 1052 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/a22o/sky130_fd_sc_lp__a22o_0.svg b/cells/a22o/sky130_fd_sc_lp__a22o_0.svg
index 9baa540..2ca3c8d 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_0.svg
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="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 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="#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 1101.5 768.5 L 1135.5 768.5 L 1135.5 864.5 L 1101.5 864.5 Z M 691.5 768.5 L 726.5 768.5 L 726.5 864.5 L 691.5 864.5 Z M 812.5 768.5 L 846.5 768.5 L 846.5 864.5 L 812.5 864.5 Z M 894.5 768.5 L 929.5 768.5 L 929.5 864.5 L 894.5 864.5 Z M 1018.5 768.5 L 1052.5 768.5 L 1052.5 864.5 L 1018.5 864.5 Z M 1018.5 768.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 1190.5 209.5 L 1224.5 209.5 L 1224.5 356.5 L 1190.5 356.5 Z M 711.5 209.5 L 745.5 209.5 L 745.5 356.5 L 711.5 356.5 Z M 837.5 209.5 L 871.5 209.5 L 871.5 356.5 L 837.5 356.5 Z M 936.5 209.5 L 970.5 209.5 L 970.5 356.5 L 936.5 356.5 Z M 1059.5 209.5 L 1094.5 209.5 L 1094.5 356.5 L 1059.5 356.5 Z M 1059.5 209.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface343">
+<g id="surface371">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -195,6 +195,5 @@
 <path style=" 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/a22o/sky130_fd_sc_lp__a22o_1.svg b/cells/a22o/sky130_fd_sc_lp__a22o_1.svg
index 2162767..75b5220 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_1.svg
+++ b/cells/a22o/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.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="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1216.5 661.5 L 1251.5 661.5 L 1251.5 854.5 L 1216.5 854.5 Z M 687.5 661.5 L 721.5 661.5 L 721.5 854.5 L 687.5 854.5 Z M 879.5 661.5 L 914.5 661.5 L 914.5 854.5 L 879.5 854.5 Z M 969.5 661.5 L 1003.5 661.5 L 1003.5 854.5 L 969.5 854.5 Z M 1093.5 661.5 L 1127.5 661.5 L 1127.5 854.5 L 1093.5 854.5 Z M 1093.5 661.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1216.5 209.5 L 1251.5 209.5 L 1251.5 498.5 L 1216.5 498.5 Z M 669.5 209.5 L 703.5 209.5 L 703.5 498.5 L 669.5 498.5 Z M 886.5 209.5 L 921.5 209.5 L 921.5 498.5 L 886.5 498.5 Z M 989.5 209.5 L 1024.5 209.5 L 1024.5 498.5 L 989.5 498.5 Z M 1093.5 209.5 L 1127.5 209.5 L 1127.5 498.5 L 1093.5 498.5 Z M 1093.5 209.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 861.703125 615.332031 L 862.242188 610.28125 L 863.652344 606.175781 L 865.875 602.941406 L 868.90625 600.652344 L 872.742188 599.242188 L 877.457031 598.769531 L 879.609375 598.902344 L 881.695312 599.242188 L 883.648438 599.777344 L 885.398438 600.585938 L 887.015625 601.597656 L 888.5625 602.742188 L 889.773438 604.15625 L 890.851562 605.636719 L 891.660156 607.25 L 892.265625 608.933594 L 892.601562 610.820312 L 892.738281 612.773438 L 892.46875 615.53125 L 891.726562 618.089844 L 890.449219 620.445312 L 888.699219 622.667969 L 886.410156 624.753906 L 883.648438 626.574219 L 882.640625 627.179688 L 875.90625 630.8125 L 874.15625 631.824219 L 872.609375 632.832031 L 871.261719 633.84375 L 870.183594 634.851562 L 869.242188 635.863281 L 868.570312 636.875 L 868.230469 637.480469 L 867.960938 638.015625 L 867.761719 638.691406 L 867.558594 639.296875 L 867.355469 639.96875 L 867.289062 640.644531 L 892.402344 640.644531 L 892.402344 646.5 L 860.625 646.5 L 860.757812 644.144531 L 861.097656 641.988281 L 861.5 639.96875 L 862.039062 638.21875 L 862.644531 636.535156 L 863.386719 635.054688 L 864.191406 633.777344 L 865.203125 632.496094 L 866.414062 631.21875 L 867.761719 630.007812 L 869.308594 628.792969 L 871.125 627.582031 L 871.53125 627.3125 L 872.003906 627.042969 L 872.472656 626.707031 L 872.945312 626.4375 L 873.484375 626.167969 L 874.023438 625.832031 L 880.214844 622.332031 L 882.167969 621.050781 L 883.785156 619.640625 L 885.0625 618.15625 L 885.9375 616.542969 L 886.476562 614.792969 L 886.679688 612.90625 L 886.542969 611.628906 L 886.339844 610.347656 L 885.871094 609.203125 L 885.332031 608.125 L 884.523438 607.183594 L 883.648438 606.242188 L 882.707031 605.570312 L 881.765625 604.960938 L 880.6875 604.558594 L 879.609375 604.222656 L 878.464844 604.019531 L 877.253906 603.953125 L 874.628906 604.289062 L 872.40625 605.097656 L 870.589844 606.511719 L 869.242188 608.464844 L 868.300781 611.023438 L 867.761719 614.050781 L 867.695312 614.320312 L 867.695312 614.722656 L 867.625 614.925781 L 867.625 615.332031 Z M 861.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 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 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_lp__a22o_2.svg b/cells/a22o/sky130_fd_sc_lp__a22o_2.svg
index 1756f11..4c21789 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_2.svg
+++ b/cells/a22o/sky130_fd_sc_lp__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 539.5 L 478.5 539.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="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 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="#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 1269.5 670.5 L 1303.5 670.5 L 1303.5 862.5 L 1269.5 862.5 Z M 647.5 670.5 L 681.5 670.5 L 681.5 862.5 L 647.5 862.5 Z M 745.5 670.5 L 780.5 670.5 L 780.5 862.5 L 745.5 862.5 Z M 877.5 670.5 L 911.5 670.5 L 911.5 862.5 L 877.5 862.5 Z M 960.5 670.5 L 994.5 670.5 L 994.5 862.5 L 960.5 862.5 Z M 1187.5 670.5 L 1221.5 670.5 L 1221.5 862.5 L 1187.5 862.5 Z M 1187.5 670.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 1276.5 209.5 L 1310.5 209.5 L 1310.5 498.5 L 1276.5 498.5 Z M 630.5 209.5 L 664.5 209.5 L 664.5 498.5 L 630.5 498.5 Z M 728.5 209.5 L 763.5 209.5 L 763.5 498.5 L 728.5 498.5 Z M 861.5 209.5 L 895.5 209.5 L 895.5 498.5 L 861.5 498.5 Z M 960.5 209.5 L 994.5 209.5 L 994.5 498.5 L 960.5 498.5 Z M 1177.5 209.5 L 1212.5 209.5 L 1212.5 498.5 L 1177.5 498.5 Z M 1177.5 209.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -160,6 +160,5 @@
 <path style=" 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 442.503906 L 1035.203125 442.503906 L 1035.203125 438.261719 L 1037.019531 438.058594 L 1038.636719 437.789062 L 1040.050781 437.453125 L 1041.261719 437.183594 L 1042.269531 436.847656 L 1043.148438 436.445312 L 1043.820312 436.039062 L 1044.425781 435.570312 L 1044.964844 435.03125 L 1045.503906 434.355469 L 1045.972656 433.617188 L 1046.445312 432.742188 L 1046.648438 432.269531 L 1046.847656 431.730469 L 1047.050781 431.125 L 1047.320312 430.386719 L 1047.523438 429.644531 L 1047.792969 428.769531 L 1051.695312 428.769531 L 1051.695312 476.5 L 1045.773438 476.5 Z M 1045.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 997 647 L 1036 647 M 997 608 L 1036 608 M 997 608 L 997 647 M 1036 608 L 1036 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 997 647 L 1036 647 M 997 608 L 1036 608 M 1036 647 L 1036 608 M 997 647 L 997 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/a22o/sky130_fd_sc_lp__a22o_4.svg b/cells/a22o/sky130_fd_sc_lp__a22o_4.svg
index f49b29a..aec08ab 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_4.svg
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 539.5 L 174.5 539.5 Z M 174.5 127.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 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="#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 1580.5 667.5 L 1613.5 667.5 L 1613.5 852.5 L 1580.5 852.5 Z M 485.5 667.5 L 518.5 667.5 L 518.5 852.5 L 485.5 852.5 Z M 580.5 667.5 L 613.5 667.5 L 613.5 852.5 L 580.5 852.5 Z M 675.5 667.5 L 708.5 667.5 L 708.5 852.5 L 675.5 852.5 Z M 770.5 667.5 L 803.5 667.5 L 803.5 852.5 L 770.5 852.5 Z M 881.5 667.5 L 915.5 667.5 L 915.5 852.5 L 881.5 852.5 Z M 976.5 667.5 L 1010.5 667.5 L 1010.5 852.5 L 976.5 852.5 Z M 1071.5 667.5 L 1105.5 667.5 L 1105.5 852.5 L 1071.5 852.5 Z M 1166.5 667.5 L 1200.5 667.5 L 1200.5 852.5 L 1166.5 852.5 Z M 1295.5 667.5 L 1328.5 667.5 L 1328.5 852.5 L 1295.5 852.5 Z M 1390.5 667.5 L 1423.5 667.5 L 1423.5 852.5 L 1390.5 852.5 Z M 1485.5 667.5 L 1518.5 667.5 L 1518.5 852.5 L 1485.5 852.5 Z M 1485.5 667.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 1580.5 220.5 L 1613.5 220.5 L 1613.5 499.5 L 1580.5 499.5 Z M 385.5 220.5 L 419.5 220.5 L 419.5 499.5 L 385.5 499.5 Z M 480.5 220.5 L 514.5 220.5 L 514.5 499.5 L 480.5 499.5 Z M 575.5 220.5 L 609.5 220.5 L 609.5 499.5 L 575.5 499.5 Z M 670.5 220.5 L 704.5 220.5 L 704.5 499.5 L 670.5 499.5 Z M 881.5 220.5 L 915.5 220.5 L 915.5 499.5 L 881.5 499.5 Z M 976.5 220.5 L 1010.5 220.5 L 1010.5 499.5 L 976.5 499.5 Z M 1071.5 220.5 L 1105.5 220.5 L 1105.5 499.5 L 1071.5 499.5 Z M 1166.5 220.5 L 1200.5 220.5 L 1200.5 499.5 L 1166.5 499.5 Z M 1277.5 220.5 L 1310.5 220.5 L 1310.5 499.5 L 1277.5 499.5 Z M 1390.5 220.5 L 1423.5 220.5 L 1423.5 499.5 L 1390.5 499.5 Z M 1485.5 220.5 L 1518.5 220.5 L 1518.5 499.5 L 1485.5 499.5 Z M 1485.5 220.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/a22o/sky130_fd_sc_lp__a22o_lp.svg b/cells/a22o/sky130_fd_sc_lp__a22o_lp.svg
index 51befde..702cb71 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_lp.svg
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1271.5 768.5 L 1306.5 768.5 L 1306.5 864.5 L 1271.5 864.5 Z M 745.5 768.5 L 780.5 768.5 L 780.5 864.5 L 745.5 864.5 Z M 835.5 768.5 L 869.5 768.5 L 869.5 864.5 L 835.5 864.5 Z M 933.5 768.5 L 968.5 768.5 L 968.5 864.5 L 933.5 864.5 Z M 1064.5 768.5 L 1098.5 768.5 L 1098.5 864.5 L 1064.5 864.5 Z M 1182.5 768.5 L 1216.5 768.5 L 1216.5 864.5 L 1182.5 864.5 Z M 1182.5 768.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 1230.5 220.5 L 1287.5 220.5 L 1287.5 449.5 L 1230.5 449.5 Z M 622.5 220.5 L 679.5 220.5 L 679.5 449.5 L 622.5 449.5 Z M 743.5 220.5 L 800.5 220.5 L 800.5 449.5 L 743.5 449.5 Z M 934.5 220.5 L 992.5 220.5 L 992.5 449.5 L 934.5 449.5 Z M 1056.5 220.5 L 1113.5 220.5 L 1113.5 449.5 L 1056.5 449.5 Z M 1056.5 220.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface313">
+<g id="surface341">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -171,6 +171,5 @@
 <path style=" 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/a22o/sky130_fd_sc_lp__a22o_m.svg b/cells/a22o/sky130_fd_sc_lp__a22o_m.svg
index 0517fec..51ac9cd 100644
--- a/cells/a22o/sky130_fd_sc_lp__a22o_m.svg
+++ b/cells/a22o/sky130_fd_sc_lp__a22o_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image347" 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="#image347"/>
+  <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 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="#image347"/>
+  <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 1135.5 679.5 L 1169.5 679.5 L 1169.5 775.5 L 1135.5 775.5 Z M 722.5 679.5 L 757.5 679.5 L 757.5 775.5 L 722.5 775.5 Z M 846.5 679.5 L 881.5 679.5 L 881.5 775.5 L 846.5 775.5 Z M 929.5 679.5 L 963.5 679.5 L 963.5 775.5 L 929.5 775.5 Z M 1052.5 679.5 L 1087.5 679.5 L 1087.5 775.5 L 1052.5 775.5 Z M 1052.5 679.5 "/>
 </clipPath>
-<image id="image348" 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="#image348"/>
+  <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 1096.5 239.5 L 1130.5 239.5 L 1130.5 335.5 L 1096.5 335.5 Z M 1195.5 239.5 L 1229.5 239.5 L 1229.5 335.5 L 1195.5 335.5 Z M 711.5 248.5 L 745.5 248.5 L 745.5 344.5 L 711.5 344.5 Z M 945.5 248.5 L 979.5 248.5 L 979.5 344.5 L 945.5 344.5 Z M 846.5 248.5 L 881.5 248.5 L 881.5 344.5 L 846.5 344.5 Z M 846.5 248.5 "/>
 </clipPath>
-<image id="image349" 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="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image350" 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="#image350"/>
+  <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="surface344">
+<g id="surface372">
 <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 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/a22oi/sky130_fd_sc_lp__a22oi_0.svg b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.svg
index d3643a8..eb1adaf 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_0.svg
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <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 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="#image332"/>
+  <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 1088.5 768.5 L 1122.5 768.5 L 1122.5 864.5 L 1088.5 864.5 Z M 792.5 768.5 L 827.5 768.5 L 827.5 864.5 L 792.5 864.5 Z M 875.5 768.5 L 909.5 768.5 L 909.5 864.5 L 875.5 864.5 Z M 1005.5 768.5 L 1040.5 768.5 L 1040.5 864.5 L 1005.5 864.5 Z M 1005.5 768.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <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 1104.5 307.5 L 1138.5 307.5 L 1138.5 454.5 L 1104.5 454.5 Z M 808.5 307.5 L 843.5 307.5 L 843.5 454.5 L 808.5 454.5 Z M 907.5 307.5 L 941.5 307.5 L 941.5 454.5 L 907.5 454.5 Z M 1005.5 307.5 L 1040.5 307.5 L 1040.5 454.5 L 1005.5 454.5 Z M 1005.5 307.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image335" 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="#image335"/>
+  <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="surface329">
+<g id="surface357">
 <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 857.554688 372.246094 L 857.554688 391.5 L 851.292969 391.5 L 851.292969 372.246094 L 832.375 342.421875 L 840.117188 342.421875 L 854.523438 366.320312 L 868.527344 342.421875 L 876 342.421875 Z M 857.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 834 731 L 873 731 M 834 693 L 873 693 M 834 693 L 834 731 M 873 693 L 873 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 834 731 L 873 731 M 834 693 L 873 693 M 873 731 L 873 693 M 834 731 L 834 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 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/a22oi/sky130_fd_sc_lp__a22oi_1.svg b/cells/a22oi/sky130_fd_sc_lp__a22oi_1.svg
index 2c5735e..9c9fc7d 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_1.svg
+++ b/cells/a22oi/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image347" 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="#image347"/>
+  <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 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="#image347"/>
+  <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 1102.5 647.5 L 1136.5 647.5 L 1136.5 839.5 L 1102.5 839.5 Z M 768.5 647.5 L 803.5 647.5 L 803.5 839.5 L 768.5 839.5 Z M 851.5 647.5 L 885.5 647.5 L 885.5 839.5 L 851.5 839.5 Z M 978.5 647.5 L 1012.5 647.5 L 1012.5 839.5 L 978.5 839.5 Z M 978.5 647.5 "/>
 </clipPath>
-<image id="image348" 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="#image348"/>
+  <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 1154.5 209.5 L 1189.5 209.5 L 1189.5 498.5 L 1154.5 498.5 Z M 768.5 209.5 L 803.5 209.5 L 803.5 498.5 L 768.5 498.5 Z M 867.5 209.5 L 901.5 209.5 L 901.5 498.5 L 867.5 498.5 Z M 978.5 209.5 L 1012.5 209.5 L 1012.5 498.5 L 978.5 498.5 Z M 978.5 209.5 "/>
 </clipPath>
-<image id="image349" 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="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image350" 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="#image350"/>
+  <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="surface344">
+<g id="surface372">
 <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 1137.703125 615.332031 L 1138.242188 610.28125 L 1139.652344 606.175781 L 1141.875 602.941406 L 1144.90625 600.652344 L 1148.742188 599.242188 L 1153.457031 598.769531 L 1155.609375 598.902344 L 1157.695312 599.242188 L 1159.648438 599.777344 L 1161.398438 600.585938 L 1163.015625 601.597656 L 1164.5625 602.742188 L 1165.773438 604.15625 L 1166.851562 605.636719 L 1167.660156 607.25 L 1168.265625 608.933594 L 1168.601562 610.820312 L 1168.738281 612.773438 L 1168.46875 615.53125 L 1167.726562 618.089844 L 1166.449219 620.445312 L 1164.699219 622.667969 L 1162.410156 624.753906 L 1159.648438 626.574219 L 1158.640625 627.179688 L 1151.90625 630.8125 L 1150.15625 631.824219 L 1148.609375 632.832031 L 1147.261719 633.84375 L 1146.183594 634.851562 L 1145.242188 635.863281 L 1144.570312 636.875 L 1144.230469 637.480469 L 1143.960938 638.015625 L 1143.761719 638.691406 L 1143.558594 639.296875 L 1143.355469 639.96875 L 1143.289062 640.644531 L 1168.402344 640.644531 L 1168.402344 646.5 L 1136.625 646.5 L 1136.757812 644.144531 L 1137.097656 641.988281 L 1137.5 639.96875 L 1138.039062 638.21875 L 1138.644531 636.535156 L 1139.386719 635.054688 L 1140.191406 633.777344 L 1141.203125 632.496094 L 1142.414062 631.21875 L 1143.761719 630.007812 L 1145.308594 628.792969 L 1147.125 627.582031 L 1147.53125 627.3125 L 1148.003906 627.042969 L 1148.472656 626.707031 L 1148.945312 626.4375 L 1149.484375 626.167969 L 1150.023438 625.832031 L 1156.214844 622.332031 L 1158.167969 621.050781 L 1159.785156 619.640625 L 1161.0625 618.15625 L 1161.9375 616.542969 L 1162.476562 614.792969 L 1162.679688 612.90625 L 1162.542969 611.628906 L 1162.339844 610.347656 L 1161.871094 609.203125 L 1161.332031 608.125 L 1160.523438 607.183594 L 1159.648438 606.242188 L 1158.707031 605.570312 L 1157.765625 604.960938 L 1156.6875 604.558594 L 1155.609375 604.222656 L 1154.464844 604.019531 L 1153.253906 603.953125 L 1150.628906 604.289062 L 1148.40625 605.097656 L 1146.589844 606.511719 L 1145.242188 608.464844 L 1144.300781 611.023438 L 1143.761719 614.050781 L 1143.695312 614.320312 L 1143.695312 614.722656 L 1143.625 614.925781 L 1143.625 615.332031 Z M 1137.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 1109 477 L 1148 477 M 1109 438 L 1148 438 M 1109 438 L 1109 477 M 1148 438 L 1148 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 1109 477 L 1148 477 M 1109 438 L 1148 438 M 1148 477 L 1148 438 M 1109 477 L 1109 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/a22oi/sky130_fd_sc_lp__a22oi_2.svg b/cells/a22oi/sky130_fd_sc_lp__a22oi_2.svg
index d804990..b8b7daa 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_2.svg
+++ b/cells/a22oi/sky130_fd_sc_lp__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 539.5 L 367.5 539.5 Z M 367.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 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="#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 1379.5 672.5 L 1413.5 672.5 L 1413.5 864.5 L 1379.5 864.5 Z M 581.5 672.5 L 616.5 672.5 L 616.5 864.5 L 581.5 864.5 Z M 680.5 672.5 L 714.5 672.5 L 714.5 864.5 L 680.5 864.5 Z M 815.5 672.5 L 850.5 672.5 L 850.5 864.5 L 815.5 864.5 Z M 914.5 672.5 L 948.5 672.5 L 948.5 864.5 L 914.5 864.5 Z M 1058.5 672.5 L 1093.5 672.5 L 1093.5 864.5 L 1058.5 864.5 Z M 1182.5 672.5 L 1216.5 672.5 L 1216.5 864.5 L 1182.5 864.5 Z M 1280.5 672.5 L 1315.5 672.5 L 1315.5 864.5 L 1280.5 864.5 Z M 1280.5 672.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 1379.5 209.5 L 1413.5 209.5 L 1413.5 498.5 L 1379.5 498.5 Z M 528.5 209.5 L 562.5 209.5 L 562.5 498.5 L 528.5 498.5 Z M 675.5 209.5 L 710.5 209.5 L 710.5 498.5 L 675.5 498.5 Z M 774.5 209.5 L 808.5 209.5 L 808.5 498.5 L 774.5 498.5 Z M 976.5 209.5 L 1010.5 209.5 L 1010.5 498.5 L 976.5 498.5 Z M 1074.5 209.5 L 1109.5 209.5 L 1109.5 498.5 L 1074.5 498.5 Z M 1182.5 209.5 L 1216.5 209.5 L 1216.5 498.5 L 1182.5 498.5 Z M 1280.5 209.5 L 1315.5 209.5 L 1315.5 498.5 L 1280.5 498.5 Z M 1280.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1020.554688 457.246094 L 1020.554688 476.5 L 1014.292969 476.5 L 1014.292969 457.246094 L 995.375 427.421875 L 1003.117188 427.421875 L 1017.523438 451.320312 L 1031.527344 427.421875 L 1039 427.421875 Z M 1020.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 996 647 L 1035 647 M 996 608 L 1035 608 M 996 608 L 996 647 M 1035 608 L 1035 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 996 647 L 1035 647 M 996 608 L 1035 608 M 1035 647 L 1035 608 M 996 647 L 996 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/a22oi/sky130_fd_sc_lp__a22oi_4.svg b/cells/a22oi/sky130_fd_sc_lp__a22oi_4.svg
index 6847200..6528126 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_4.svg
+++ b/cells/a22oi/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="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="#image378"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 316.5 628.5 L 343.5 628.5 L 343.5 782.5 L 316.5 782.5 Z M 395.5 628.5 L 422.5 628.5 L 422.5 782.5 L 395.5 782.5 Z M 553.5 628.5 L 580.5 628.5 L 580.5 782.5 L 553.5 782.5 Z M 880.5 628.5 L 908.5 628.5 L 908.5 782.5 L 880.5 782.5 Z M 643.5 628.5 L 671.5 628.5 L 671.5 782.5 L 643.5 782.5 Z M 474.5 628.5 L 501.5 628.5 L 501.5 782.5 L 474.5 782.5 Z M 722.5 628.5 L 750.5 628.5 L 750.5 782.5 L 722.5 782.5 Z M 801.5 628.5 L 829.5 628.5 L 829.5 782.5 L 801.5 782.5 Z M 1055.5 644.5 L 1082.5 644.5 L 1082.5 799.5 L 1055.5 799.5 Z M 1608.5 644.5 L 1636.5 644.5 L 1636.5 799.5 L 1608.5 799.5 Z M 1213.5 644.5 L 1240.5 644.5 L 1240.5 799.5 L 1213.5 799.5 Z M 1292.5 644.5 L 1319.5 644.5 L 1319.5 799.5 L 1292.5 799.5 Z M 1450.5 644.5 L 1478.5 644.5 L 1478.5 799.5 L 1450.5 799.5 Z M 1529.5 644.5 L 1557.5 644.5 L 1557.5 799.5 L 1529.5 799.5 Z M 1134.5 644.5 L 1161.5 644.5 L 1161.5 799.5 L 1134.5 799.5 Z M 1371.5 644.5 L 1399.5 644.5 L 1399.5 799.5 L 1371.5 799.5 Z M 1371.5 644.5 "/>
 </clipPath>
-<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1568.5 273.5 L 1595.5 273.5 L 1595.5 504.5 L 1568.5 504.5 Z M 340.5 273.5 L 367.5 273.5 L 367.5 504.5 L 340.5 504.5 Z M 419.5 273.5 L 446.5 273.5 L 446.5 504.5 L 419.5 504.5 Z M 498.5 273.5 L 525.5 273.5 L 525.5 504.5 L 498.5 504.5 Z M 577.5 273.5 L 604.5 273.5 L 604.5 504.5 L 577.5 504.5 Z M 656.5 273.5 L 683.5 273.5 L 683.5 504.5 L 656.5 504.5 Z M 735.5 273.5 L 762.5 273.5 L 762.5 504.5 L 735.5 504.5 Z M 829.5 273.5 L 856.5 273.5 L 856.5 504.5 L 829.5 504.5 Z M 908.5 273.5 L 935.5 273.5 L 935.5 504.5 L 908.5 504.5 Z M 1006.5 273.5 L 1034.5 273.5 L 1034.5 504.5 L 1006.5 504.5 Z M 1085.5 273.5 L 1113.5 273.5 L 1113.5 504.5 L 1085.5 504.5 Z M 1164.5 273.5 L 1192.5 273.5 L 1192.5 504.5 L 1164.5 504.5 Z M 1251.5 273.5 L 1279.5 273.5 L 1279.5 504.5 L 1251.5 504.5 Z M 1330.5 273.5 L 1358.5 273.5 L 1358.5 504.5 L 1330.5 504.5 Z M 1410.5 273.5 L 1437.5 273.5 L 1437.5 504.5 L 1410.5 504.5 Z M 1489.5 273.5 L 1516.5 273.5 L 1516.5 504.5 L 1489.5 504.5 Z M 1489.5 273.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 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="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface375">
+<g id="surface404">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -213,6 +213,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 614.664062 598.175781 L 615.101562 594.070312 L 616.25 590.734375 L 618.054688 588.109375 L 620.515625 586.25 L 623.632812 585.101562 L 627.464844 584.71875 L 629.214844 584.828125 L 630.910156 585.101562 L 632.496094 585.539062 L 633.917969 586.195312 L 635.230469 587.015625 L 636.488281 587.945312 L 637.472656 589.09375 L 638.347656 590.296875 L 639.003906 591.609375 L 639.496094 592.976562 L 639.769531 594.511719 L 639.878906 596.097656 L 639.660156 598.339844 L 639.058594 600.417969 L 638.019531 602.332031 L 636.597656 604.136719 L 634.738281 605.832031 L 632.496094 607.308594 L 631.675781 607.800781 L 626.207031 610.753906 L 624.785156 611.574219 L 623.523438 612.394531 L 622.429688 613.214844 L 621.554688 614.039062 L 620.789062 614.859375 L 620.242188 615.679688 L 619.96875 616.171875 L 619.75 616.609375 L 619.585938 617.15625 L 619.421875 617.648438 L 619.257812 618.195312 L 619.203125 618.742188 L 639.605469 618.742188 L 639.605469 623.5 L 613.789062 623.5 L 613.898438 621.585938 L 614.171875 619.835938 L 614.5 618.195312 L 614.9375 616.773438 L 615.429688 615.40625 L 616.03125 614.203125 L 616.6875 613.160156 L 617.507812 612.121094 L 618.492188 611.082031 L 619.585938 610.097656 L 620.84375 609.113281 L 622.648438 607.910156 L 623.03125 607.691406 L 623.414062 607.417969 L 623.796875 607.199219 L 624.234375 606.980469 L 624.675781 606.707031 L 629.707031 603.863281 L 631.292969 602.824219 L 632.605469 601.675781 L 633.644531 600.472656 L 634.355469 599.160156 L 634.792969 597.738281 L 634.957031 596.207031 L 634.847656 595.167969 L 634.683594 594.125 L 634.300781 593.195312 L 633.863281 592.320312 L 633.207031 591.554688 L 632.496094 590.789062 L 631.730469 590.242188 L 630.964844 589.75 L 630.089844 589.421875 L 629.214844 589.148438 L 628.285156 588.984375 L 627.300781 588.929688 L 625.167969 589.203125 L 623.359375 589.859375 L 621.882812 591.007812 L 620.789062 592.59375 L 620.023438 594.675781 L 619.585938 597.136719 L 619.53125 597.355469 L 619.53125 597.683594 L 619.476562 597.847656 L 619.476562 598.175781 Z M 614.664062 598.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 591 491 L 622 491 M 591 460 L 622 460 M 591 460 L 591 491 M 622 460 L 622 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 591 491 L 622 491 M 591 460 L 622 460 M 622 491 L 622 460 M 591 491 L 591 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/a22oi/sky130_fd_sc_lp__a22oi_lp.svg b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.svg
index a019081..0c7c121 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.svg
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1138.5 768.5 L 1173.5 768.5 L 1173.5 864.5 L 1138.5 864.5 Z M 795.5 768.5 L 829.5 768.5 L 829.5 864.5 L 795.5 864.5 Z M 884.5 768.5 L 918.5 768.5 L 918.5 864.5 L 884.5 864.5 Z M 1008.5 768.5 L 1042.5 768.5 L 1042.5 864.5 L 1008.5 864.5 Z M 1008.5 768.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1138.5 220.5 L 1196.5 220.5 L 1196.5 449.5 L 1138.5 449.5 Z M 772.5 220.5 L 829.5 220.5 L 829.5 449.5 L 772.5 449.5 Z M 893.5 220.5 L 950.5 220.5 L 950.5 449.5 L 893.5 449.5 Z M 1015.5 220.5 L 1072.5 220.5 L 1072.5 449.5 L 1015.5 449.5 Z M 1015.5 220.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 692.554688 542.246094 L 692.554688 561.5 L 686.292969 561.5 L 686.292969 542.246094 L 667.375 512.421875 L 675.117188 512.421875 L 689.523438 536.320312 L 703.527344 512.421875 L 711 512.421875 Z M 692.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 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/a22oi/sky130_fd_sc_lp__a22oi_m.svg b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.svg
index ea5f8cc..e483427 100644
--- a/cells/a22oi/sky130_fd_sc_lp__a22oi_m.svg
+++ b/cells/a22oi/sky130_fd_sc_lp__a22oi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image378" 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="#image378"/>
+  <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 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="#image378"/>
+  <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 1096.5 768.5 L 1130.5 768.5 L 1130.5 864.5 L 1096.5 864.5 Z M 806.5 768.5 L 840.5 768.5 L 840.5 864.5 L 806.5 864.5 Z M 889.5 768.5 L 923.5 768.5 L 923.5 864.5 L 889.5 864.5 Z M 1013.5 768.5 L 1048.5 768.5 L 1048.5 864.5 L 1013.5 864.5 Z M 1013.5 768.5 "/>
 </clipPath>
-<image id="image379" 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="#image379"/>
+  <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 1112.5 254.5 L 1146.5 254.5 L 1146.5 350.5 L 1112.5 350.5 Z M 816.5 254.5 L 851.5 254.5 L 851.5 350.5 L 816.5 350.5 Z M 915.5 254.5 L 949.5 254.5 L 949.5 350.5 L 915.5 350.5 Z M 1013.5 254.5 L 1048.5 254.5 L 1048.5 350.5 L 1013.5 350.5 Z M 1013.5 254.5 "/>
 </clipPath>
-<image id="image380" 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="#image380"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image381" 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="#image381"/>
+  <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="surface375">
+<g id="surface403">
 <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 857.554688 372.246094 L 857.554688 391.5 L 851.292969 391.5 L 851.292969 372.246094 L 832.375 342.421875 L 840.117188 342.421875 L 854.523438 366.320312 L 868.527344 342.421875 L 876 342.421875 Z M 857.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 834 731 L 873 731 M 834 693 L 873 693 M 834 693 L 834 731 M 873 693 L 873 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 834 731 L 873 731 M 834 693 L 873 693 M 873 731 L 873 693 M 834 731 L 834 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 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/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.svg b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.svg
index d405057..8d64d08 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.svg
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask 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="#image398"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1176.5 768.5 L 1211.5 768.5 L 1211.5 864.5 L 1176.5 864.5 Z M 661.5 768.5 L 695.5 768.5 L 695.5 864.5 L 661.5 864.5 Z M 759.5 768.5 L 793.5 768.5 L 793.5 864.5 L 759.5 864.5 Z M 860.5 768.5 L 894.5 768.5 L 894.5 864.5 L 860.5 864.5 Z M 988.5 768.5 L 1023.5 768.5 L 1023.5 864.5 L 988.5 864.5 Z M 1087.5 768.5 L 1121.5 768.5 L 1121.5 864.5 L 1087.5 864.5 Z M 1087.5 768.5 "/>
 </clipPath>
-<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1177.5 209.5 L 1212.5 209.5 L 1212.5 305.5 L 1177.5 305.5 Z M 1276.5 209.5 L 1310.5 209.5 L 1310.5 305.5 L 1276.5 305.5 Z M 1079.5 209.5 L 1113.5 209.5 L 1113.5 305.5 L 1079.5 305.5 Z M 618.5 210.5 L 653.5 210.5 L 653.5 357.5 L 618.5 357.5 Z M 832.5 260.5 L 867.5 260.5 L 867.5 357.5 L 832.5 357.5 Z M 743.5 260.5 L 777.5 260.5 L 777.5 357.5 L 743.5 357.5 Z M 743.5 260.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface395">
+<g id="surface424">
 <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 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/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.svg b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.svg
index 55a5e38..e1da963 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.svg
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask 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="#image398"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 640.5 672.5 L 674.5 672.5 L 674.5 864.5 L 640.5 864.5 Z M 1231.5 768.5 L 1266.5 768.5 L 1266.5 864.5 L 1231.5 864.5 Z M 1142.5 768.5 L 1176.5 768.5 L 1176.5 864.5 L 1142.5 864.5 Z M 1043.5 768.5 L 1078.5 768.5 L 1078.5 864.5 L 1043.5 864.5 Z M 909.5 768.5 L 944.5 768.5 L 944.5 864.5 L 909.5 864.5 Z M 798.5 768.5 L 832.5 768.5 L 832.5 864.5 L 798.5 864.5 Z M 798.5 768.5 "/>
 </clipPath>
-<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1066.5 216.5 L 1101.5 216.5 L 1101.5 312.5 L 1066.5 312.5 Z M 1263.5 216.5 L 1298.5 216.5 L 1298.5 312.5 L 1263.5 312.5 Z M 1165.5 216.5 L 1199.5 216.5 L 1199.5 312.5 L 1165.5 312.5 Z M 662.5 209.5 L 696.5 209.5 L 696.5 498.5 L 662.5 498.5 Z M 887.5 401.5 L 922.5 401.5 L 922.5 498.5 L 887.5 498.5 Z M 798.5 401.5 L 832.5 401.5 L 832.5 498.5 L 798.5 498.5 Z M 798.5 401.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface395">
+<g id="surface424">
 <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 1375.773438 442.503906 L 1365.203125 442.503906 L 1365.203125 438.261719 L 1367.019531 438.058594 L 1368.636719 437.789062 L 1370.050781 437.453125 L 1371.261719 437.183594 L 1372.269531 436.847656 L 1373.148438 436.445312 L 1373.820312 436.039062 L 1374.425781 435.570312 L 1374.964844 435.03125 L 1375.503906 434.355469 L 1375.972656 433.617188 L 1376.445312 432.742188 L 1376.648438 432.269531 L 1376.847656 431.730469 L 1377.050781 431.125 L 1377.320312 430.386719 L 1377.523438 429.644531 L 1377.792969 428.769531 L 1381.695312 428.769531 L 1381.695312 476.5 L 1375.773438 476.5 Z M 1375.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 1327 647 L 1366 647 M 1327 608 L 1366 608 M 1327 608 L 1327 647 M 1366 608 L 1366 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 1327 647 L 1366 647 M 1327 608 L 1366 608 M 1366 647 L 1366 608 M 1327 647 L 1327 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/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.svg b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.svg
index 6363935..f76e19d 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.svg
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.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 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="#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 1077.5 672.5 L 1111.5 672.5 L 1111.5 768.5 L 1077.5 768.5 Z M 600.5 672.5 L 634.5 672.5 L 634.5 768.5 L 600.5 768.5 Z M 978.5 672.5 L 1012.5 672.5 L 1012.5 768.5 L 978.5 768.5 Z M 781.5 672.5 L 815.5 672.5 L 815.5 768.5 L 781.5 768.5 Z M 682.5 672.5 L 717.5 672.5 L 717.5 768.5 L 682.5 768.5 Z M 1197.5 672.5 L 1231.5 672.5 L 1231.5 864.5 L 1197.5 864.5 Z M 1295.5 672.5 L 1330.5 672.5 L 1330.5 864.5 L 1295.5 864.5 Z M 1295.5 672.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 765.5 220.5 L 799.5 220.5 L 799.5 367.5 L 765.5 367.5 Z M 666.5 220.5 L 701.5 220.5 L 701.5 367.5 L 666.5 367.5 Z M 559.5 220.5 L 593.5 220.5 L 593.5 367.5 L 559.5 367.5 Z M 983.5 351.5 L 1017.5 351.5 L 1017.5 498.5 L 983.5 498.5 Z M 1295.5 209.5 L 1330.5 209.5 L 1330.5 498.5 L 1295.5 498.5 Z M 1197.5 209.5 L 1231.5 209.5 L 1231.5 498.5 L 1197.5 498.5 Z M 1065.5 351.5 L 1099.5 351.5 L 1099.5 498.5 L 1065.5 498.5 Z M 1065.5 351.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 550.773438 442.503906 L 540.203125 442.503906 L 540.203125 438.261719 L 542.019531 438.058594 L 543.636719 437.789062 L 545.050781 437.453125 L 546.261719 437.183594 L 547.269531 436.847656 L 548.148438 436.445312 L 548.820312 436.039062 L 549.425781 435.570312 L 549.964844 435.03125 L 550.503906 434.355469 L 550.972656 433.617188 L 551.445312 432.742188 L 551.648438 432.269531 L 551.847656 431.730469 L 552.050781 431.125 L 552.320312 430.386719 L 552.523438 429.644531 L 552.792969 428.769531 L 556.695312 428.769531 L 556.695312 476.5 L 550.773438 476.5 Z M 550.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 502 647 L 541 647 M 502 608 L 541 608 M 502 608 L 502 647 M 541 608 L 541 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 502 647 L 541 647 M 502 608 L 541 608 M 541 647 L 541 608 M 502 647 L 502 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/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.svg b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.svg
index 8857cc9..c19b233 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_4.svg
+++ b/cells/a2bb2o/sky130_fd_sc_lp__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 538.5 L 174.5 538.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 1583.5 658.5 L 1614.5 658.5 L 1614.5 832.5 L 1583.5 832.5 Z M 301.5 658.5 L 332.5 658.5 L 332.5 832.5 L 301.5 832.5 Z M 390.5 658.5 L 421.5 658.5 L 421.5 832.5 L 390.5 832.5 Z M 479.5 658.5 L 510.5 658.5 L 510.5 832.5 L 479.5 832.5 Z M 568.5 658.5 L 599.5 658.5 L 599.5 832.5 L 568.5 832.5 Z M 665.5 658.5 L 696.5 658.5 L 696.5 832.5 L 665.5 832.5 Z M 754.5 658.5 L 785.5 658.5 L 785.5 832.5 L 754.5 832.5 Z M 914.5 658.5 L 945.5 658.5 L 945.5 832.5 L 914.5 832.5 Z M 1004.5 658.5 L 1035.5 658.5 L 1035.5 832.5 L 1004.5 832.5 Z M 1125.5 658.5 L 1156.5 658.5 L 1156.5 832.5 L 1125.5 832.5 Z M 1214.5 658.5 L 1245.5 658.5 L 1245.5 832.5 L 1214.5 832.5 Z M 1315.5 658.5 L 1347.5 658.5 L 1347.5 832.5 L 1315.5 832.5 Z M 1404.5 658.5 L 1436.5 658.5 L 1436.5 832.5 L 1404.5 832.5 Z M 1494.5 658.5 L 1525.5 658.5 L 1525.5 832.5 L 1494.5 832.5 Z M 1494.5 658.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 1590.5 240.5 L 1621.5 240.5 L 1621.5 501.5 L 1590.5 501.5 Z M 301.5 240.5 L 332.5 240.5 L 332.5 501.5 L 301.5 501.5 Z M 390.5 240.5 L 421.5 240.5 L 421.5 501.5 L 390.5 501.5 Z M 479.5 240.5 L 510.5 240.5 L 510.5 501.5 L 479.5 501.5 Z M 576.5 240.5 L 607.5 240.5 L 607.5 501.5 L 576.5 501.5 Z M 665.5 240.5 L 696.5 240.5 L 696.5 501.5 L 665.5 501.5 Z M 754.5 240.5 L 785.5 240.5 L 785.5 501.5 L 754.5 501.5 Z M 951.5 240.5 L 982.5 240.5 L 982.5 501.5 L 951.5 501.5 Z M 1040.5 240.5 L 1071.5 240.5 L 1071.5 501.5 L 1040.5 501.5 Z M 1129.5 240.5 L 1160.5 240.5 L 1160.5 501.5 L 1129.5 501.5 Z M 1218.5 240.5 L 1249.5 240.5 L 1249.5 501.5 L 1218.5 501.5 Z M 1321.5 240.5 L 1352.5 240.5 L 1352.5 501.5 L 1321.5 501.5 Z M 1412.5 240.5 L 1443.5 240.5 L 1443.5 501.5 L 1412.5 501.5 Z M 1501.5 240.5 L 1532.5 240.5 L 1532.5 501.5 L 1501.5 501.5 Z M 1501.5 240.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 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/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.svg b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.svg
index 4258cbe..70abee5 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.svg
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image418" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image389"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image389"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1254.5 737.5 L 1289.5 737.5 L 1289.5 833.5 L 1254.5 833.5 Z M 1353.5 737.5 L 1387.5 737.5 L 1387.5 833.5 L 1353.5 833.5 Z M 1172.5 737.5 L 1206.5 737.5 L 1206.5 833.5 L 1172.5 833.5 Z M 991.5 737.5 L 1025.5 737.5 L 1025.5 833.5 L 991.5 833.5 Z M 1435.5 737.5 L 1470.5 737.5 L 1470.5 833.5 L 1435.5 833.5 Z M 1073.5 737.5 L 1107.5 737.5 L 1107.5 833.5 L 1073.5 833.5 Z M 583.5 757.5 L 617.5 757.5 L 617.5 853.5 L 583.5 853.5 Z M 681.5 757.5 L 716.5 757.5 L 716.5 853.5 L 681.5 853.5 Z M 764.5 757.5 L 798.5 757.5 L 798.5 853.5 L 764.5 853.5 Z M 493.5 757.5 L 528.5 757.5 L 528.5 853.5 L 493.5 853.5 Z M 493.5 757.5 "/>
 </clipPath>
-<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image390"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1321.5 220.5 L 1378.5 220.5 L 1378.5 449.5 L 1321.5 449.5 Z M 1208.5 220.5 L 1266.5 220.5 L 1266.5 449.5 L 1208.5 449.5 Z M 1050.5 220.5 L 1107.5 220.5 L 1107.5 449.5 L 1050.5 449.5 Z M 719.5 221.5 L 776.5 221.5 L 776.5 451.5 L 719.5 451.5 Z M 592.5 221.5 L 649.5 221.5 L 649.5 451.5 L 592.5 451.5 Z M 470.5 221.5 L 528.5 221.5 L 528.5 451.5 L 470.5 451.5 Z M 470.5 221.5 "/>
 </clipPath>
-<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image420"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image392"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface386">
+<g id="surface415">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1075.824219 451.320312 L 1093.191406 476.5 L 1085.449219 476.5 L 1072.050781 456.035156 L 1058.589844 476.5 L 1050.980469 476.5 L 1068.351562 451.320312 L 1052.058594 427.421875 L 1059.664062 427.421875 L 1072.253906 446.675781 L 1084.910156 427.421875 L 1092.382812 427.421875 Z M 1075.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 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/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.svg b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.svg
index aa15156..05ae8e6 100644
--- a/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.svg
+++ b/cells/a2bb2o/sky130_fd_sc_lp__a2bb2o_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image465" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image494" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image465"/>
+  <use xlink:href="#image494"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image465"/>
+  <use xlink:href="#image494"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1243.5 679.5 L 1277.5 679.5 L 1277.5 775.5 L 1243.5 775.5 Z M 630.5 679.5 L 664.5 679.5 L 664.5 775.5 L 630.5 775.5 Z M 728.5 679.5 L 763.5 679.5 L 763.5 775.5 L 728.5 775.5 Z M 863.5 679.5 L 898.5 679.5 L 898.5 775.5 L 863.5 775.5 Z M 962.5 679.5 L 996.5 679.5 L 996.5 775.5 L 962.5 775.5 Z M 1119.5 679.5 L 1153.5 679.5 L 1153.5 775.5 L 1119.5 775.5 Z M 1119.5 679.5 "/>
 </clipPath>
-<image id="image466" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image495" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image466"/>
+  <use xlink:href="#image495"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 644.5 209.5 L 679.5 209.5 L 679.5 305.5 L 644.5 305.5 Z M 826.5 209.5 L 860.5 209.5 L 860.5 305.5 L 826.5 305.5 Z M 743.5 209.5 L 777.5 209.5 L 777.5 305.5 L 743.5 305.5 Z M 1036.5 330.5 L 1071.5 330.5 L 1071.5 427.5 L 1036.5 427.5 Z M 1250.5 330.5 L 1284.5 330.5 L 1284.5 427.5 L 1250.5 427.5 Z M 1135.5 330.5 L 1169.5 330.5 L 1169.5 427.5 L 1135.5 427.5 Z M 1135.5 330.5 "/>
 </clipPath>
-<image id="image467" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image496" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image467"/>
+  <use xlink:href="#image496"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image468" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image497" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image468"/>
+  <use xlink:href="#image497"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface462">
+<g id="surface491">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -244,6 +244,5 @@
 <path style=" 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/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.svg b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.svg
index 0233150..a5d6855 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image369"/>
+  <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 1215.5 768.5 L 1250.5 768.5 L 1250.5 864.5 L 1215.5 864.5 Z M 669.5 768.5 L 703.5 768.5 L 703.5 864.5 L 669.5 864.5 Z M 767.5 768.5 L 801.5 768.5 L 801.5 864.5 L 767.5 864.5 Z M 995.5 768.5 L 1030.5 768.5 L 1030.5 864.5 L 995.5 864.5 Z M 1094.5 768.5 L 1128.5 768.5 L 1128.5 864.5 L 1094.5 864.5 Z M 1094.5 768.5 "/>
 </clipPath>
-<image id="image370" 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="#image370"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 669.5 282.5 L 703.5 282.5 L 703.5 429.5 L 669.5 429.5 Z M 751.5 282.5 L 785.5 282.5 L 785.5 429.5 L 751.5 429.5 Z M 1122.5 328.5 L 1157.5 328.5 L 1157.5 475.5 L 1122.5 475.5 Z M 1024.5 328.5 L 1058.5 328.5 L 1058.5 475.5 L 1024.5 475.5 Z M 1221.5 328.5 L 1255.5 328.5 L 1255.5 475.5 L 1221.5 475.5 Z M 1221.5 328.5 "/>
 </clipPath>
-<image id="image371" 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="#image371"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image372" 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="#image372"/>
+  <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="surface366">
+<g id="surface395">
 <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 966.554688 288.246094 L 966.554688 307.5 L 960.292969 307.5 L 960.292969 288.246094 L 941.375 258.421875 L 949.117188 258.421875 L 963.523438 282.320312 L 977.527344 258.421875 L 985 258.421875 Z M 966.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 942 816 L 981 816 M 942 777 L 981 777 M 942 777 L 942 816 M 981 777 L 981 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 942 816 L 981 816 M 942 777 L 981 777 M 981 816 L 981 777 M 942 816 L 942 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/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.svg b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.svg
index d4c09f9..48c26de 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_1.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image357"/>
+  <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 1199.5 672.5 L 1234.5 672.5 L 1234.5 864.5 L 1199.5 864.5 Z M 672.5 672.5 L 706.5 672.5 L 706.5 864.5 L 672.5 864.5 Z M 771.5 672.5 L 805.5 672.5 L 805.5 864.5 L 771.5 864.5 Z M 979.5 672.5 L 1013.5 672.5 L 1013.5 864.5 L 979.5 864.5 Z M 1078.5 672.5 L 1112.5 672.5 L 1112.5 864.5 L 1078.5 864.5 Z M 1078.5 672.5 "/>
 </clipPath>
-<image id="image358" 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="#image358"/>
+  <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 1205.5 209.5 L 1239.5 209.5 L 1239.5 498.5 L 1205.5 498.5 Z M 672.5 209.5 L 706.5 209.5 L 706.5 498.5 L 672.5 498.5 Z M 761.5 209.5 L 796.5 209.5 L 796.5 498.5 L 761.5 498.5 Z M 979.5 209.5 L 1013.5 209.5 L 1013.5 498.5 L 979.5 498.5 Z M 1079.5 209.5 L 1113.5 209.5 L 1113.5 498.5 L 1079.5 498.5 Z M 1079.5 209.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image360" 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="#image360"/>
+  <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="surface354">
+<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 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 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_lp__a2bb2oi_2.svg b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.svg
index 48993d1..e7c3226 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 256.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="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="#image333"/>
+  <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="#image333"/>
+  <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 1457.5 651.5 L 1491.5 651.5 L 1491.5 844.5 L 1457.5 844.5 Z M 395.5 651.5 L 429.5 651.5 L 429.5 844.5 L 395.5 844.5 Z M 493.5 651.5 L 528.5 651.5 L 528.5 844.5 L 493.5 844.5 Z M 592.5 651.5 L 626.5 651.5 L 626.5 844.5 L 592.5 844.5 Z M 709.5 651.5 L 743.5 651.5 L 743.5 844.5 L 709.5 844.5 Z M 826.5 651.5 L 860.5 651.5 L 860.5 844.5 L 826.5 844.5 Z M 924.5 651.5 L 958.5 651.5 L 958.5 844.5 L 924.5 844.5 Z M 1161.5 651.5 L 1196.5 651.5 L 1196.5 844.5 L 1161.5 844.5 Z M 1260.5 651.5 L 1294.5 651.5 L 1294.5 844.5 L 1260.5 844.5 Z M 1358.5 651.5 L 1393.5 651.5 L 1393.5 844.5 L 1358.5 844.5 Z M 1358.5 651.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <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 1457.5 209.5 L 1491.5 209.5 L 1491.5 498.5 L 1457.5 498.5 Z M 395.5 209.5 L 429.5 209.5 L 429.5 498.5 L 395.5 498.5 Z M 493.5 209.5 L 528.5 209.5 L 528.5 498.5 L 493.5 498.5 Z M 592.5 209.5 L 626.5 209.5 L 626.5 498.5 L 592.5 498.5 Z M 727.5 209.5 L 761.5 209.5 L 761.5 498.5 L 727.5 498.5 Z M 826.5 209.5 L 860.5 209.5 L 860.5 498.5 L 826.5 498.5 Z M 924.5 209.5 L 958.5 209.5 L 958.5 498.5 L 924.5 498.5 Z M 1161.5 209.5 L 1196.5 209.5 L 1196.5 498.5 L 1161.5 498.5 Z M 1260.5 209.5 L 1294.5 209.5 L 1294.5 498.5 L 1260.5 498.5 Z M 1358.5 209.5 L 1393.5 209.5 L 1393.5 498.5 L 1358.5 498.5 Z M 1358.5 209.5 "/>
 </clipPath>
-<image id="image335" 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="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image336" 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="#image336"/>
+  <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="surface330">
+<g id="surface359">
 <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 909.554688 712.246094 L 909.554688 731.5 L 903.292969 731.5 L 903.292969 712.246094 L 884.375 682.421875 L 892.117188 682.421875 L 906.523438 706.320312 L 920.527344 682.421875 L 928 682.421875 Z M 909.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 885 392 L 924 392 M 885 353 L 924 353 M 885 353 L 885 392 M 924 353 L 924 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 885 392 L 924 392 M 885 353 L 924 353 M 924 392 L 924 353 M 885 392 L 885 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/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.svg b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.svg
index ffc729a..34718dd 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_4.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_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="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image373"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1615.5 623.5 L 1637.5 623.5 L 1637.5 749.5 L 1615.5 749.5 Z M 298.5 623.5 L 321.5 623.5 L 321.5 749.5 L 298.5 749.5 Z M 363.5 623.5 L 385.5 623.5 L 385.5 749.5 L 363.5 749.5 Z M 427.5 623.5 L 450.5 623.5 L 450.5 749.5 L 427.5 749.5 Z M 492.5 623.5 L 514.5 623.5 L 514.5 749.5 L 492.5 749.5 Z M 556.5 623.5 L 579.5 623.5 L 579.5 749.5 L 556.5 749.5 Z M 621.5 623.5 L 643.5 623.5 L 643.5 749.5 L 621.5 749.5 Z M 685.5 623.5 L 708.5 623.5 L 708.5 749.5 L 685.5 749.5 Z M 750.5 623.5 L 772.5 623.5 L 772.5 749.5 L 750.5 749.5 Z M 827.5 623.5 L 850.5 623.5 L 850.5 749.5 L 827.5 749.5 Z M 892.5 623.5 L 914.5 623.5 L 914.5 749.5 L 892.5 749.5 Z M 956.5 623.5 L 979.5 623.5 L 979.5 749.5 L 956.5 749.5 Z M 1021.5 623.5 L 1043.5 623.5 L 1043.5 749.5 L 1021.5 749.5 Z M 1085.5 623.5 L 1108.5 623.5 L 1108.5 749.5 L 1085.5 749.5 Z M 1150.5 623.5 L 1172.5 623.5 L 1172.5 749.5 L 1150.5 749.5 Z M 1214.5 623.5 L 1237.5 623.5 L 1237.5 749.5 L 1214.5 749.5 Z M 1279.5 623.5 L 1301.5 623.5 L 1301.5 749.5 L 1279.5 749.5 Z M 1421.5 623.5 L 1444.5 623.5 L 1444.5 749.5 L 1421.5 749.5 Z M 1486.5 623.5 L 1508.5 623.5 L 1508.5 749.5 L 1486.5 749.5 Z M 1550.5 623.5 L 1573.5 623.5 L 1573.5 749.5 L 1550.5 749.5 Z M 1550.5 623.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1625.5 320.5 L 1648.5 320.5 L 1648.5 509.5 L 1625.5 509.5 Z M 298.5 320.5 L 320.5 320.5 L 320.5 509.5 L 298.5 509.5 Z M 362.5 320.5 L 385.5 320.5 L 385.5 509.5 L 362.5 509.5 Z M 427.5 320.5 L 449.5 320.5 L 449.5 509.5 L 427.5 509.5 Z M 491.5 320.5 L 514.5 320.5 L 514.5 509.5 L 491.5 509.5 Z M 556.5 320.5 L 578.5 320.5 L 578.5 509.5 L 556.5 509.5 Z M 620.5 320.5 L 643.5 320.5 L 643.5 509.5 L 620.5 509.5 Z M 685.5 320.5 L 707.5 320.5 L 707.5 509.5 L 685.5 509.5 Z M 773.5 320.5 L 796.5 320.5 L 796.5 509.5 L 773.5 509.5 Z M 838.5 320.5 L 860.5 320.5 L 860.5 509.5 L 838.5 509.5 Z M 902.5 320.5 L 925.5 320.5 L 925.5 509.5 L 902.5 509.5 Z M 967.5 320.5 L 989.5 320.5 L 989.5 509.5 L 967.5 509.5 Z M 1031.5 320.5 L 1054.5 320.5 L 1054.5 509.5 L 1031.5 509.5 Z M 1174.5 320.5 L 1196.5 320.5 L 1196.5 509.5 L 1174.5 509.5 Z M 1238.5 320.5 L 1261.5 320.5 L 1261.5 509.5 L 1238.5 509.5 Z M 1303.5 320.5 L 1325.5 320.5 L 1325.5 509.5 L 1303.5 509.5 Z M 1367.5 320.5 L 1390.5 320.5 L 1390.5 509.5 L 1367.5 509.5 Z M 1432.5 320.5 L 1454.5 320.5 L 1454.5 509.5 L 1432.5 509.5 Z M 1496.5 320.5 L 1519.5 320.5 L 1519.5 509.5 L 1496.5 509.5 Z M 1561.5 320.5 L 1583.5 320.5 L 1583.5 509.5 L 1561.5 509.5 Z M 1561.5 320.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 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="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image406"/>
 </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="surface400">
 <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 1034.324219 594.066406 L 1034.324219 606.5 L 1030.28125 606.5 L 1030.28125 594.066406 L 1018.066406 574.804688 L 1023.066406 574.804688 L 1032.371094 590.238281 L 1041.414062 574.804688 L 1046.238281 574.804688 Z M 1034.324219 594.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 501 L 1044 501 M 1018 476 L 1044 476 M 1018 476 L 1018 501 M 1044 476 L 1044 501 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1018 501 L 1044 501 M 1018 476 L 1044 476 M 1044 501 L 1044 476 M 1018 501 L 1018 476 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.svg b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.svg
index 8033c57..abdb09a 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 948.5 539.5 L 1219.5 539.5 L 1219.5 571.5 L 948.5 571.5 Z M 948.5 539.5 "/>
 </clipPath>
-<image id="image363" 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="#image363"/>
+  <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 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="#image363"/>
+  <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 1262.5 768.5 L 1297.5 768.5 L 1297.5 864.5 L 1262.5 864.5 Z M 627.5 768.5 L 662.5 768.5 L 662.5 864.5 L 627.5 864.5 Z M 717.5 768.5 L 751.5 768.5 L 751.5 864.5 L 717.5 864.5 Z M 815.5 768.5 L 850.5 768.5 L 850.5 864.5 L 815.5 864.5 Z M 898.5 768.5 L 932.5 768.5 L 932.5 864.5 L 898.5 864.5 Z M 999.5 768.5 L 1033.5 768.5 L 1033.5 864.5 L 999.5 864.5 Z M 1081.5 768.5 L 1115.5 768.5 L 1115.5 864.5 L 1081.5 864.5 Z M 1180.5 768.5 L 1214.5 768.5 L 1214.5 864.5 L 1180.5 864.5 Z M 1180.5 768.5 "/>
 </clipPath>
-<image id="image364" 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="#image364"/>
+  <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 563.5 220.5 L 620.5 220.5 L 620.5 449.5 L 563.5 449.5 Z M 685.5 220.5 L 742.5 220.5 L 742.5 449.5 L 685.5 449.5 Z M 1305.5 220.5 L 1362.5 220.5 L 1362.5 449.5 L 1305.5 449.5 Z M 806.5 220.5 L 863.5 220.5 L 863.5 449.5 L 806.5 449.5 Z M 1055.5 301.5 L 1112.5 301.5 L 1112.5 530.5 L 1055.5 530.5 Z M 1055.5 301.5 "/>
 </clipPath>
-<image id="image365" 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="#image365"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image366" 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="#image366"/>
+  <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="surface360">
+<g id="surface389">
 <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 856.554688 796.246094 L 856.554688 815.5 L 850.292969 815.5 L 850.292969 796.246094 L 831.375 766.421875 L 839.117188 766.421875 L 853.523438 790.320312 L 867.527344 766.421875 L 875 766.421875 Z M 856.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 832 307 L 871 307 M 832 269 L 871 269 M 832 269 L 832 307 M 871 269 L 871 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 832 307 L 871 307 M 832 269 L 871 269 M 871 307 L 871 269 M 832 307 L 832 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/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.svg b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.svg
index 32f342d..71f25e6 100644
--- a/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.svg
+++ b/cells/a2bb2oi/sky130_fd_sc_lp__a2bb2oi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image468" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image439"/>
+  <use xlink:href="#image468"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image439"/>
+  <use xlink:href="#image468"/>
 </pattern>
 <mask id="mask1">
 <rect 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 768.5 L 1220.5 768.5 L 1220.5 864.5 L 1185.5 864.5 Z M 774.5 768.5 L 808.5 768.5 L 808.5 864.5 L 774.5 864.5 Z M 873.5 768.5 L 907.5 768.5 L 907.5 864.5 L 873.5 864.5 Z M 979.5 768.5 L 1013.5 768.5 L 1013.5 864.5 L 979.5 864.5 Z M 1078.5 768.5 L 1112.5 768.5 L 1112.5 864.5 L 1078.5 864.5 Z M 1078.5 768.5 "/>
 </clipPath>
-<image id="image440" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image469" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image440"/>
+  <use xlink:href="#image469"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 694.5 229.5 L 728.5 229.5 L 728.5 326.5 L 694.5 326.5 Z M 776.5 229.5 L 811.5 229.5 L 811.5 326.5 L 776.5 326.5 Z M 1004.5 378.5 L 1039.5 378.5 L 1039.5 475.5 L 1004.5 475.5 Z M 1201.5 378.5 L 1236.5 378.5 L 1236.5 475.5 L 1201.5 475.5 Z M 1103.5 378.5 L 1137.5 378.5 L 1137.5 475.5 L 1103.5 475.5 Z M 1103.5 378.5 "/>
 </clipPath>
-<image id="image441" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image470" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image441"/>
+  <use xlink:href="#image470"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image442" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image471" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image442"/>
+  <use xlink:href="#image471"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface436">
+<g id="surface465">
 <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 966.554688 457.246094 L 966.554688 476.5 L 960.292969 476.5 L 960.292969 457.246094 L 941.375 427.421875 L 949.117188 427.421875 L 963.523438 451.320312 L 977.527344 427.421875 L 985 427.421875 Z M 966.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 942 647 L 981 647 M 942 608 L 981 608 M 942 608 L 942 647 M 981 608 L 981 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 942 647 L 981 647 M 942 608 L 981 608 M 981 647 L 981 608 M 942 647 L 942 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/a311o/sky130_fd_sc_lp__a311o_0.svg b/cells/a311o/sky130_fd_sc_lp__a311o_0.svg
index 74532e6..26ef88a 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_0.svg
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image369"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1253.5 767.5 L 1287.5 767.5 L 1287.5 863.5 L 1253.5 863.5 Z M 646.5 767.5 L 680.5 767.5 L 680.5 863.5 L 646.5 863.5 Z M 769.5 767.5 L 804.5 767.5 L 804.5 863.5 L 769.5 863.5 Z M 866.5 767.5 L 900.5 767.5 L 900.5 863.5 L 866.5 863.5 Z M 989.5 767.5 L 1024.5 767.5 L 1024.5 863.5 L 989.5 863.5 Z M 1154.5 767.5 L 1189.5 767.5 L 1189.5 863.5 L 1154.5 863.5 Z M 1154.5 767.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1209.5 215.5 L 1244.5 215.5 L 1244.5 361.5 L 1209.5 361.5 Z M 646.5 215.5 L 680.5 215.5 L 680.5 361.5 L 646.5 361.5 Z M 744.5 215.5 L 779.5 215.5 L 779.5 361.5 L 744.5 361.5 Z M 852.5 215.5 L 886.5 215.5 L 886.5 361.5 L 852.5 361.5 Z M 1028.5 215.5 L 1063.5 215.5 L 1063.5 361.5 L 1028.5 361.5 Z M 1127.5 215.5 L 1161.5 215.5 L 1161.5 361.5 L 1127.5 361.5 Z M 1127.5 215.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface366">
+<g id="surface393">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 581.824219 621.320312 L 599.191406 646.5 L 591.449219 646.5 L 578.050781 626.035156 L 564.589844 646.5 L 556.980469 646.5 L 574.351562 621.320312 L 558.058594 597.421875 L 565.664062 597.421875 L 578.253906 616.675781 L 590.910156 597.421875 L 598.382812 597.421875 Z M 581.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 557 477 L 596 477 M 557 438 L 596 438 M 557 438 L 557 477 M 596 438 L 596 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 557 477 L 596 477 M 557 438 L 596 438 M 596 477 L 596 438 M 557 477 L 557 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/a311o/sky130_fd_sc_lp__a311o_1.svg b/cells/a311o/sky130_fd_sc_lp__a311o_1.svg
index 259bc39..f410e89 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_1.svg
+++ b/cells/a311o/sky130_fd_sc_lp__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 539.5 L 478.5 539.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="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 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="#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 1268.5 672.5 L 1302.5 672.5 L 1302.5 864.5 L 1268.5 864.5 Z M 614.5 672.5 L 648.5 672.5 L 648.5 864.5 L 614.5 864.5 Z M 800.5 672.5 L 835.5 672.5 L 835.5 864.5 L 800.5 864.5 Z M 903.5 672.5 L 938.5 672.5 L 938.5 864.5 L 903.5 864.5 Z M 1007.5 672.5 L 1041.5 672.5 L 1041.5 864.5 L 1007.5 864.5 Z M 1144.5 672.5 L 1178.5 672.5 L 1178.5 864.5 L 1144.5 864.5 Z M 1144.5 672.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 1268.5 209.5 L 1302.5 209.5 L 1302.5 498.5 L 1268.5 498.5 Z M 670.5 209.5 L 704.5 209.5 L 704.5 498.5 L 670.5 498.5 Z M 784.5 209.5 L 819.5 209.5 L 819.5 498.5 L 784.5 498.5 Z M 883.5 209.5 L 917.5 209.5 L 917.5 498.5 L 883.5 498.5 Z M 1062.5 209.5 L 1096.5 209.5 L 1096.5 498.5 L 1062.5 498.5 Z M 1185.5 209.5 L 1220.5 209.5 L 1220.5 498.5 L 1185.5 498.5 Z M 1185.5 209.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/a311o/sky130_fd_sc_lp__a311o_2.svg b/cells/a311o/sky130_fd_sc_lp__a311o_2.svg
index e03c1ed..8f9c586 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_2.svg
+++ b/cells/a311o/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.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="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1293.5 672.5 L 1327.5 672.5 L 1327.5 864.5 L 1293.5 864.5 Z M 564.5 672.5 L 599.5 672.5 L 599.5 864.5 L 564.5 864.5 Z M 663.5 672.5 L 697.5 672.5 L 697.5 864.5 L 663.5 864.5 Z M 839.5 672.5 L 874.5 672.5 L 874.5 864.5 L 839.5 864.5 Z M 922.5 672.5 L 956.5 672.5 L 956.5 864.5 L 922.5 864.5 Z M 1046.5 672.5 L 1080.5 672.5 L 1080.5 864.5 L 1046.5 864.5 Z M 1169.5 672.5 L 1204.5 672.5 L 1204.5 864.5 L 1169.5 864.5 Z M 1169.5 672.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1293.5 209.5 L 1327.5 209.5 L 1327.5 498.5 L 1293.5 498.5 Z M 581.5 209.5 L 616.5 209.5 L 616.5 498.5 L 581.5 498.5 Z M 680.5 209.5 L 714.5 209.5 L 714.5 498.5 L 680.5 498.5 Z M 823.5 209.5 L 858.5 209.5 L 858.5 498.5 L 823.5 498.5 Z M 922.5 209.5 L 956.5 209.5 L 956.5 498.5 L 922.5 498.5 Z M 1087.5 209.5 L 1121.5 209.5 L 1121.5 498.5 L 1087.5 498.5 Z M 1185.5 209.5 L 1220.5 209.5 L 1220.5 498.5 L 1185.5 498.5 Z M 1185.5 209.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1433.476562 611.953125 L 1422.90625 611.953125 L 1422.90625 607.714844 L 1424.722656 607.511719 L 1426.339844 607.242188 L 1427.753906 606.90625 L 1428.964844 606.636719 L 1429.972656 606.300781 L 1430.847656 605.894531 L 1431.523438 605.492188 L 1432.128906 605.019531 L 1432.667969 604.480469 L 1433.207031 603.808594 L 1433.675781 603.066406 L 1434.148438 602.191406 L 1434.351562 601.722656 L 1434.550781 601.183594 L 1434.753906 600.578125 L 1435.023438 599.835938 L 1435.226562 599.097656 L 1435.496094 598.222656 L 1439.398438 598.222656 L 1439.398438 645.953125 L 1433.476562 645.953125 Z M 1433.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 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/a311o/sky130_fd_sc_lp__a311o_4.svg b/cells/a311o/sky130_fd_sc_lp__a311o_4.svg
index ac65898..19b1ca4 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_4.svg
+++ b/cells/a311o/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 664.5 538.5 L 1094.5 538.5 L 1094.5 550.5 L 664.5 550.5 Z M 664.5 538.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#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 1430.5 629.5 L 1459.5 629.5 L 1459.5 793.5 L 1430.5 793.5 Z M 1514.5 629.5 L 1543.5 629.5 L 1543.5 793.5 L 1514.5 793.5 Z M 1332.5 629.5 L 1361.5 629.5 L 1361.5 793.5 L 1332.5 793.5 Z M 1597.5 629.5 L 1626.5 629.5 L 1626.5 793.5 L 1597.5 793.5 Z M 635.5 651.5 L 664.5 651.5 L 664.5 814.5 L 635.5 814.5 Z M 1119.5 651.5 L 1149.5 651.5 L 1149.5 814.5 L 1119.5 814.5 Z M 1036.5 651.5 L 1065.5 651.5 L 1065.5 814.5 L 1036.5 814.5 Z M 886.5 651.5 L 915.5 651.5 L 915.5 814.5 L 886.5 814.5 Z M 802.5 651.5 L 831.5 651.5 L 831.5 814.5 L 802.5 814.5 Z M 718.5 651.5 L 747.5 651.5 L 747.5 814.5 L 718.5 814.5 Z M 549.5 651.5 L 578.5 651.5 L 578.5 814.5 L 549.5 814.5 Z M 465.5 651.5 L 494.5 651.5 L 494.5 814.5 L 465.5 814.5 Z M 290.5 651.5 L 319.5 651.5 L 319.5 814.5 L 290.5 814.5 Z M 374.5 651.5 L 403.5 651.5 L 403.5 814.5 L 374.5 814.5 Z M 374.5 651.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1597.5 258.5 L 1626.5 258.5 L 1626.5 503.5 L 1597.5 503.5 Z M 1514.5 258.5 L 1543.5 258.5 L 1543.5 503.5 L 1514.5 503.5 Z M 1332.5 258.5 L 1361.5 258.5 L 1361.5 503.5 L 1332.5 503.5 Z M 549.5 258.5 L 578.5 258.5 L 578.5 503.5 L 549.5 503.5 Z M 290.5 258.5 L 319.5 258.5 L 319.5 503.5 L 290.5 503.5 Z M 374.5 258.5 L 403.5 258.5 L 403.5 503.5 L 374.5 503.5 Z M 457.5 258.5 L 487.5 258.5 L 487.5 503.5 L 457.5 503.5 Z M 1248.5 258.5 L 1277.5 258.5 L 1277.5 503.5 L 1248.5 503.5 Z M 1080.5 258.5 L 1110.5 258.5 L 1110.5 503.5 L 1080.5 503.5 Z M 1164.5 258.5 L 1193.5 258.5 L 1193.5 503.5 L 1164.5 503.5 Z M 1415.5 258.5 L 1444.5 258.5 L 1444.5 503.5 L 1415.5 503.5 Z M 960.5 269.5 L 989.5 269.5 L 989.5 514.5 L 960.5 514.5 Z M 853.5 269.5 L 882.5 269.5 L 882.5 514.5 L 853.5 514.5 Z M 769.5 269.5 L 798.5 269.5 L 798.5 514.5 L 769.5 514.5 Z M 769.5 269.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 284.851562 528.136719 L 275.824219 528.136719 L 275.824219 524.515625 L 277.378906 524.34375 L 278.757812 524.113281 L 279.964844 523.824219 L 281 523.59375 L 281.863281 523.308594 L 282.609375 522.960938 L 283.1875 522.617188 L 283.703125 522.214844 L 284.164062 521.753906 L 284.625 521.179688 L 285.027344 520.546875 L 285.429688 519.800781 L 285.601562 519.398438 L 285.773438 518.9375 L 285.945312 518.421875 L 286.175781 517.789062 L 286.347656 517.15625 L 286.578125 516.40625 L 289.914062 516.40625 L 289.914062 557.175781 L 284.851562 557.175781 Z M 284.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 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/a311o/sky130_fd_sc_lp__a311o_lp.svg b/cells/a311o/sky130_fd_sc_lp__a311o_lp.svg
index 6309097..ea86c04 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_lp.svg
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image324" 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="#image324"/>
+  <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 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="#image324"/>
+  <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 1310.5 768.5 L 1345.5 768.5 L 1345.5 864.5 L 1310.5 864.5 Z M 564.5 768.5 L 599.5 768.5 L 599.5 864.5 L 564.5 864.5 Z M 647.5 768.5 L 681.5 768.5 L 681.5 864.5 L 647.5 864.5 Z M 769.5 768.5 L 804.5 768.5 L 804.5 864.5 L 769.5 864.5 Z M 859.5 768.5 L 893.5 768.5 L 893.5 864.5 L 859.5 864.5 Z M 948.5 768.5 L 983.5 768.5 L 983.5 864.5 L 948.5 864.5 Z M 1047.5 768.5 L 1081.5 768.5 L 1081.5 864.5 L 1047.5 864.5 Z M 1129.5 768.5 L 1164.5 768.5 L 1164.5 864.5 L 1129.5 864.5 Z M 1228.5 768.5 L 1262.5 768.5 L 1262.5 864.5 L 1228.5 864.5 Z M 1228.5 768.5 "/>
 </clipPath>
-<image id="image325" 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="#image325"/>
+  <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 1270.5 215.5 L 1327.5 215.5 L 1327.5 444.5 L 1270.5 444.5 Z M 583.5 215.5 L 640.5 215.5 L 640.5 444.5 L 583.5 444.5 Z M 704.5 215.5 L 761.5 215.5 L 761.5 444.5 L 704.5 444.5 Z M 826.5 215.5 L 883.5 215.5 L 883.5 444.5 L 826.5 444.5 Z M 971.5 215.5 L 1028.5 215.5 L 1028.5 444.5 L 971.5 444.5 Z M 1093.5 215.5 L 1150.5 215.5 L 1150.5 444.5 L 1093.5 444.5 Z M 1093.5 215.5 "/>
 </clipPath>
-<image id="image326" 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="#image326"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image327" 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="#image327"/>
+  <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="surface321">
+<g id="surface348">
 <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 636.824219 790.320312 L 654.191406 815.5 L 646.449219 815.5 L 633.050781 795.035156 L 619.589844 815.5 L 611.980469 815.5 L 629.351562 790.320312 L 613.058594 766.421875 L 620.664062 766.421875 L 633.253906 785.675781 L 645.910156 766.421875 L 653.382812 766.421875 Z M 636.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 612 307 L 651 307 M 612 269 L 651 269 M 612 269 L 612 307 M 651 269 L 651 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 612 307 L 651 307 M 612 269 L 651 269 M 651 307 L 651 269 M 612 307 L 612 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/a311o/sky130_fd_sc_lp__a311o_m.svg b/cells/a311o/sky130_fd_sc_lp__a311o_m.svg
index 02df14b..4637205 100644
--- a/cells/a311o/sky130_fd_sc_lp__a311o_m.svg
+++ b/cells/a311o/sky130_fd_sc_lp__a311o_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image352"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1182.5 767.5 L 1216.5 767.5 L 1216.5 863.5 L 1182.5 863.5 Z M 687.5 767.5 L 721.5 767.5 L 721.5 863.5 L 687.5 863.5 Z M 795.5 767.5 L 829.5 767.5 L 829.5 863.5 L 795.5 863.5 Z M 877.5 767.5 L 911.5 767.5 L 911.5 863.5 L 877.5 863.5 Z M 960.5 767.5 L 994.5 767.5 L 994.5 863.5 L 960.5 863.5 Z M 1058.5 767.5 L 1093.5 767.5 L 1093.5 863.5 L 1058.5 863.5 Z M 1058.5 767.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1182.5 360.5 L 1216.5 360.5 L 1216.5 456.5 L 1182.5 456.5 Z M 669.5 360.5 L 703.5 360.5 L 703.5 456.5 L 669.5 456.5 Z M 767.5 360.5 L 801.5 360.5 L 801.5 456.5 L 767.5 456.5 Z M 866.5 360.5 L 900.5 360.5 L 900.5 456.5 L 866.5 456.5 Z M 1001.5 360.5 L 1035.5 360.5 L 1035.5 456.5 L 1001.5 456.5 Z M 1099.5 360.5 L 1134.5 360.5 L 1134.5 456.5 L 1099.5 456.5 Z M 1099.5 360.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface349">
+<g id="surface376">
 <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 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/a311oi/sky130_fd_sc_lp__a311oi_0.svg b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.svg
index 722ad77..62e5516 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_0.svg
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image382"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1196.5 768.5 L 1230.5 768.5 L 1230.5 864.5 L 1196.5 864.5 Z M 749.5 768.5 L 783.5 768.5 L 783.5 864.5 L 749.5 864.5 Z M 831.5 768.5 L 866.5 768.5 L 866.5 864.5 L 831.5 864.5 Z M 914.5 768.5 L 948.5 768.5 L 948.5 864.5 L 914.5 864.5 Z M 1019.5 768.5 L 1054.5 768.5 L 1054.5 864.5 L 1019.5 864.5 Z M 1019.5 768.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1120.5 229.5 L 1154.5 229.5 L 1154.5 376.5 L 1120.5 376.5 Z M 724.5 229.5 L 758.5 229.5 L 758.5 376.5 L 724.5 376.5 Z M 822.5 229.5 L 856.5 229.5 L 856.5 376.5 L 822.5 376.5 Z M 921.5 229.5 L 955.5 229.5 L 955.5 376.5 L 921.5 376.5 Z M 1038.5 229.5 L 1072.5 229.5 L 1072.5 376.5 L 1038.5 376.5 Z M 1038.5 229.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface379">
+<g id="surface406">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1296.554688 457.246094 L 1296.554688 476.5 L 1290.292969 476.5 L 1290.292969 457.246094 L 1271.375 427.421875 L 1279.117188 427.421875 L 1293.523438 451.320312 L 1307.527344 427.421875 L 1315 427.421875 Z M 1296.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 1272 647 L 1311 647 M 1272 608 L 1311 608 M 1272 608 L 1272 647 M 1311 608 L 1311 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 1272 647 L 1311 647 M 1272 608 L 1311 608 M 1311 647 L 1311 608 M 1272 647 L 1272 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/a311oi/sky130_fd_sc_lp__a311oi_1.svg b/cells/a311oi/sky130_fd_sc_lp__a311oi_1.svg
index 8996e44..86d3860 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_1.svg
+++ b/cells/a311oi/sky130_fd_sc_lp__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 539.5 L 533.5 539.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="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 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="#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 1221.5 672.5 L 1255.5 672.5 L 1255.5 864.5 L 1221.5 864.5 Z M 750.5 672.5 L 784.5 672.5 L 784.5 864.5 L 750.5 864.5 Z M 852.5 672.5 L 886.5 672.5 L 886.5 864.5 L 852.5 864.5 Z M 956.5 672.5 L 991.5 672.5 L 991.5 864.5 L 956.5 864.5 Z M 1087.5 672.5 L 1121.5 672.5 L 1121.5 864.5 L 1087.5 864.5 Z M 1087.5 672.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 1221.5 209.5 L 1255.5 209.5 L 1255.5 498.5 L 1221.5 498.5 Z M 750.5 209.5 L 784.5 209.5 L 784.5 498.5 L 750.5 498.5 Z M 854.5 209.5 L 889.5 209.5 L 889.5 498.5 L 854.5 498.5 Z M 1004.5 209.5 L 1039.5 209.5 L 1039.5 498.5 L 1004.5 498.5 Z M 1138.5 209.5 L 1173.5 209.5 L 1173.5 498.5 L 1138.5 498.5 Z M 1138.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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_lp__a311oi_2.svg b/cells/a311oi/sky130_fd_sc_lp__a311oi_2.svg
index d20b1ae..cc4e1f0 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_2.svg
+++ b/cells/a311oi/sky130_fd_sc_lp__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 539.5 L 256.5 539.5 Z M 256.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="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 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="#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 716.5 647.5 L 750.5 647.5 L 750.5 839.5 L 716.5 839.5 Z M 617.5 647.5 L 651.5 647.5 L 651.5 839.5 L 617.5 839.5 Z M 420.5 647.5 L 454.5 647.5 L 454.5 839.5 L 420.5 839.5 Z M 518.5 647.5 L 553.5 647.5 L 553.5 839.5 L 518.5 839.5 Z M 1292.5 651.5 L 1326.5 651.5 L 1326.5 844.5 L 1292.5 844.5 Z M 1390.5 651.5 L 1425.5 651.5 L 1425.5 844.5 L 1390.5 844.5 Z M 1489.5 651.5 L 1523.5 651.5 L 1523.5 844.5 L 1489.5 844.5 Z M 996.5 651.5 L 1031.5 651.5 L 1031.5 844.5 L 996.5 844.5 Z M 1193.5 651.5 L 1228.5 651.5 L 1228.5 844.5 L 1193.5 844.5 Z M 1095.5 651.5 L 1129.5 651.5 L 1129.5 844.5 L 1095.5 844.5 Z M 1095.5 651.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 1489.5 209.5 L 1523.5 209.5 L 1523.5 498.5 L 1489.5 498.5 Z M 420.5 209.5 L 454.5 209.5 L 454.5 498.5 L 420.5 498.5 Z M 518.5 209.5 L 553.5 209.5 L 553.5 498.5 L 518.5 498.5 Z M 617.5 209.5 L 651.5 209.5 L 651.5 498.5 L 617.5 498.5 Z M 716.5 209.5 L 750.5 209.5 L 750.5 498.5 L 716.5 498.5 Z M 868.5 209.5 L 902.5 209.5 L 902.5 498.5 L 868.5 498.5 Z M 967.5 209.5 L 1001.5 209.5 L 1001.5 498.5 L 967.5 498.5 Z M 1193.5 209.5 L 1228.5 209.5 L 1228.5 498.5 L 1193.5 498.5 Z M 1292.5 209.5 L 1326.5 209.5 L 1326.5 498.5 L 1292.5 498.5 Z M 1390.5 209.5 L 1425.5 209.5 L 1425.5 498.5 L 1390.5 498.5 Z M 1390.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1596.476562 526.953125 L 1585.90625 526.953125 L 1585.90625 522.714844 L 1587.722656 522.511719 L 1589.339844 522.242188 L 1590.753906 521.90625 L 1591.964844 521.636719 L 1592.972656 521.300781 L 1593.847656 520.894531 L 1594.523438 520.492188 L 1595.128906 520.019531 L 1595.667969 519.480469 L 1596.207031 518.808594 L 1596.675781 518.066406 L 1597.148438 517.191406 L 1597.351562 516.722656 L 1597.550781 516.183594 L 1597.753906 515.578125 L 1598.023438 514.835938 L 1598.226562 514.097656 L 1598.496094 513.222656 L 1602.398438 513.222656 L 1602.398438 560.953125 L 1596.476562 560.953125 Z M 1596.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 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/a311oi/sky130_fd_sc_lp__a311oi_4.svg b/cells/a311oi/sky130_fd_sc_lp__a311oi_4.svg
index dbb47fb..2fa69ad 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_4.svg
+++ b/cells/a311oi/sky130_fd_sc_lp__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="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image383"/>
+  <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 1583.5 623.5 L 1606.5 623.5 L 1606.5 749.5 L 1583.5 749.5 Z M 263.5 623.5 L 286.5 623.5 L 286.5 749.5 L 263.5 749.5 Z M 328.5 623.5 L 350.5 623.5 L 350.5 749.5 L 328.5 749.5 Z M 392.5 623.5 L 415.5 623.5 L 415.5 749.5 L 392.5 749.5 Z M 457.5 623.5 L 479.5 623.5 L 479.5 749.5 L 457.5 749.5 Z M 521.5 623.5 L 544.5 623.5 L 544.5 749.5 L 521.5 749.5 Z M 586.5 623.5 L 608.5 623.5 L 608.5 749.5 L 586.5 749.5 Z M 650.5 623.5 L 673.5 623.5 L 673.5 749.5 L 650.5 749.5 Z M 715.5 623.5 L 737.5 623.5 L 737.5 749.5 L 715.5 749.5 Z M 857.5 623.5 L 880.5 623.5 L 880.5 749.5 L 857.5 749.5 Z M 922.5 623.5 L 944.5 623.5 L 944.5 749.5 L 922.5 749.5 Z M 986.5 623.5 L 1009.5 623.5 L 1009.5 749.5 L 986.5 749.5 Z M 1051.5 623.5 L 1073.5 623.5 L 1073.5 749.5 L 1051.5 749.5 Z M 1117.5 623.5 L 1139.5 623.5 L 1139.5 749.5 L 1117.5 749.5 Z M 1181.5 623.5 L 1204.5 623.5 L 1204.5 749.5 L 1181.5 749.5 Z M 1246.5 623.5 L 1268.5 623.5 L 1268.5 749.5 L 1246.5 749.5 Z M 1325.5 623.5 L 1348.5 623.5 L 1348.5 749.5 L 1325.5 749.5 Z M 1390.5 623.5 L 1412.5 623.5 L 1412.5 749.5 L 1390.5 749.5 Z M 1454.5 623.5 L 1477.5 623.5 L 1477.5 749.5 L 1454.5 749.5 Z M 1519.5 623.5 L 1541.5 623.5 L 1541.5 749.5 L 1519.5 749.5 Z M 1519.5 623.5 "/>
 </clipPath>
-<image id="image384" 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="#image384"/>
+  <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 1594.5 320.5 L 1616.5 320.5 L 1616.5 509.5 L 1594.5 509.5 Z M 274.5 320.5 L 296.5 320.5 L 296.5 509.5 L 274.5 509.5 Z M 338.5 320.5 L 361.5 320.5 L 361.5 509.5 L 338.5 509.5 Z M 403.5 320.5 L 425.5 320.5 L 425.5 509.5 L 403.5 509.5 Z M 467.5 320.5 L 490.5 320.5 L 490.5 509.5 L 467.5 509.5 Z M 532.5 320.5 L 554.5 320.5 L 554.5 509.5 L 532.5 509.5 Z M 596.5 320.5 L 619.5 320.5 L 619.5 509.5 L 596.5 509.5 Z M 661.5 320.5 L 683.5 320.5 L 683.5 509.5 L 661.5 509.5 Z M 725.5 320.5 L 748.5 320.5 L 748.5 509.5 L 725.5 509.5 Z M 806.5 320.5 L 829.5 320.5 L 829.5 509.5 L 806.5 509.5 Z M 871.5 320.5 L 893.5 320.5 L 893.5 509.5 L 871.5 509.5 Z M 935.5 320.5 L 958.5 320.5 L 958.5 509.5 L 935.5 509.5 Z M 1000.5 320.5 L 1022.5 320.5 L 1022.5 509.5 L 1000.5 509.5 Z M 1142.5 320.5 L 1165.5 320.5 L 1165.5 509.5 L 1142.5 509.5 Z M 1207.5 320.5 L 1229.5 320.5 L 1229.5 509.5 L 1207.5 509.5 Z M 1271.5 320.5 L 1294.5 320.5 L 1294.5 509.5 L 1271.5 509.5 Z M 1336.5 320.5 L 1358.5 320.5 L 1358.5 509.5 L 1336.5 509.5 Z M 1400.5 320.5 L 1423.5 320.5 L 1423.5 509.5 L 1400.5 509.5 Z M 1465.5 320.5 L 1487.5 320.5 L 1487.5 509.5 L 1465.5 509.5 Z M 1529.5 320.5 L 1552.5 320.5 L 1552.5 509.5 L 1529.5 509.5 Z M 1529.5 320.5 "/>
 </clipPath>
-<image id="image385" 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="#image385"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 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="image386" 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="#image386"/>
+  <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="surface380">
+<g id="surface408">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -213,6 +213,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 818.324219 594.066406 L 818.324219 606.5 L 814.28125 606.5 L 814.28125 594.066406 L 802.066406 574.804688 L 807.066406 574.804688 L 816.371094 590.238281 L 825.414062 574.804688 L 830.238281 574.804688 Z M 818.324219 594.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 802 501 L 828 501 M 802 476 L 828 476 M 802 476 L 802 501 M 828 476 L 828 501 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 802 501 L 828 501 M 802 476 L 828 476 M 828 501 L 828 476 M 802 501 L 802 476 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/a311oi/sky130_fd_sc_lp__a311oi_lp.svg b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.svg
index 4d19d75..cddb8b6 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.svg
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="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 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="#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 1216.5 768.5 L 1251.5 768.5 L 1251.5 864.5 L 1216.5 864.5 Z M 675.5 768.5 L 710.5 768.5 L 710.5 864.5 L 675.5 864.5 Z M 765.5 768.5 L 799.5 768.5 L 799.5 864.5 L 765.5 864.5 Z M 854.5 768.5 L 889.5 768.5 L 889.5 864.5 L 854.5 864.5 Z M 953.5 768.5 L 987.5 768.5 L 987.5 864.5 L 953.5 864.5 Z M 1035.5 768.5 L 1070.5 768.5 L 1070.5 864.5 L 1035.5 864.5 Z M 1134.5 768.5 L 1168.5 768.5 L 1168.5 864.5 L 1134.5 864.5 Z M 1134.5 768.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 1164.5 220.5 L 1221.5 220.5 L 1221.5 449.5 L 1164.5 449.5 Z M 673.5 220.5 L 730.5 220.5 L 730.5 449.5 L 673.5 449.5 Z M 795.5 220.5 L 852.5 220.5 L 852.5 449.5 L 795.5 449.5 Z M 921.5 220.5 L 978.5 220.5 L 978.5 449.5 L 921.5 449.5 Z M 1042.5 220.5 L 1099.5 220.5 L 1099.5 449.5 L 1042.5 449.5 Z M 1042.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1296.554688 712.246094 L 1296.554688 731.5 L 1290.292969 731.5 L 1290.292969 712.246094 L 1271.375 682.421875 L 1279.117188 682.421875 L 1293.523438 706.320312 L 1307.527344 682.421875 L 1315 682.421875 Z M 1296.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 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/a311oi/sky130_fd_sc_lp__a311oi_m.svg b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.svg
index 9b0df6e..823ff56 100644
--- a/cells/a311oi/sky130_fd_sc_lp__a311oi_m.svg
+++ b/cells/a311oi/sky130_fd_sc_lp__a311oi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image446" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image419"/>
+  <use xlink:href="#image446"/>
 </pattern>
 <mask 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="#image419"/>
+  <use xlink:href="#image446"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1133.5 763.5 L 1167.5 763.5 L 1167.5 860.5 L 1133.5 860.5 Z M 771.5 763.5 L 805.5 763.5 L 805.5 860.5 L 771.5 860.5 Z M 853.5 763.5 L 887.5 763.5 L 887.5 860.5 L 853.5 860.5 Z M 936.5 763.5 L 970.5 763.5 L 970.5 860.5 L 936.5 860.5 Z M 1034.5 763.5 L 1068.5 763.5 L 1068.5 860.5 L 1034.5 860.5 Z M 1034.5 763.5 "/>
 </clipPath>
-<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image447" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1140.5 209.5 L 1174.5 209.5 L 1174.5 305.5 L 1140.5 305.5 Z M 761.5 209.5 L 796.5 209.5 L 796.5 305.5 L 761.5 305.5 Z M 860.5 209.5 L 894.5 209.5 L 894.5 305.5 L 860.5 305.5 Z M 958.5 209.5 L 993.5 209.5 L 993.5 305.5 L 958.5 305.5 Z M 1057.5 209.5 L 1091.5 209.5 L 1091.5 305.5 L 1057.5 305.5 Z M 1057.5 209.5 "/>
 </clipPath>
-<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image448" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image449" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image422"/>
+  <use xlink:href="#image449"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface416">
+<g id="surface443">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -243,6 +243,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1296.554688 288.246094 L 1296.554688 307.5 L 1290.292969 307.5 L 1290.292969 288.246094 L 1271.375 258.421875 L 1279.117188 258.421875 L 1293.523438 282.320312 L 1307.527344 258.421875 L 1315 258.421875 Z M 1296.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 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/a31o/sky130_fd_sc_lp__a31o_0.svg b/cells/a31o/sky130_fd_sc_lp__a31o_0.svg
index 00f84ad..5238362 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_0.svg
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="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="#image333"/>
+  <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 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="#image333"/>
+  <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 1184.5 765.5 L 1219.5 765.5 L 1219.5 861.5 L 1184.5 861.5 Z M 698.5 765.5 L 733.5 765.5 L 733.5 861.5 L 698.5 861.5 Z M 854.5 765.5 L 889.5 765.5 L 889.5 861.5 L 854.5 861.5 Z M 956.5 765.5 L 991.5 765.5 L 991.5 861.5 L 956.5 861.5 Z M 1060.5 765.5 L 1095.5 765.5 L 1095.5 861.5 L 1060.5 861.5 Z M 1060.5 765.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <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 1143.5 218.5 L 1177.5 218.5 L 1177.5 365.5 L 1143.5 365.5 Z M 749.5 218.5 L 783.5 218.5 L 783.5 365.5 L 749.5 365.5 Z M 847.5 218.5 L 882.5 218.5 L 882.5 365.5 L 847.5 365.5 Z M 946.5 218.5 L 980.5 218.5 L 980.5 365.5 L 946.5 365.5 Z M 1044.5 218.5 L 1079.5 218.5 L 1079.5 365.5 L 1044.5 365.5 Z M 1044.5 218.5 "/>
 </clipPath>
-<image id="image335" 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="#image335"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image336" 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="#image336"/>
+  <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="surface330">
+<g id="surface357">
 <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 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/a31o/sky130_fd_sc_lp__a31o_1.svg b/cells/a31o/sky130_fd_sc_lp__a31o_1.svg
index a4c3224..acb31b8 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_1.svg
+++ b/cells/a31o/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.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="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="#image333"/>
+  <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 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="#image333"/>
+  <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 1188.5 672.5 L 1222.5 672.5 L 1222.5 864.5 L 1188.5 864.5 Z M 669.5 672.5 L 703.5 672.5 L 703.5 864.5 L 669.5 864.5 Z M 851.5 672.5 L 885.5 672.5 L 885.5 864.5 L 851.5 864.5 Z M 940.5 672.5 L 975.5 672.5 L 975.5 864.5 L 940.5 864.5 Z M 1064.5 672.5 L 1098.5 672.5 L 1098.5 864.5 L 1064.5 864.5 Z M 1064.5 672.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <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 1188.5 209.5 L 1222.5 209.5 L 1222.5 498.5 L 1188.5 498.5 Z M 678.5 209.5 L 712.5 209.5 L 712.5 498.5 L 678.5 498.5 Z M 851.5 209.5 L 885.5 209.5 L 885.5 498.5 L 851.5 498.5 Z M 962.5 209.5 L 996.5 209.5 L 996.5 498.5 L 962.5 498.5 Z M 1089.5 209.5 L 1123.5 209.5 L 1123.5 498.5 L 1089.5 498.5 Z M 1089.5 209.5 "/>
 </clipPath>
-<image id="image335" 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="#image335"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image336" 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="#image336"/>
+  <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="surface330">
+<g id="surface357">
 <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 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/a31o/sky130_fd_sc_lp__a31o_2.svg b/cells/a31o/sky130_fd_sc_lp__a31o_2.svg
index 4af5719..69e45a3 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_2.svg
+++ b/cells/a31o/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.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 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="#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 1224.5 670.5 L 1259.5 670.5 L 1259.5 862.5 L 1224.5 862.5 Z M 619.5 670.5 L 654.5 670.5 L 654.5 862.5 L 619.5 862.5 Z M 718.5 670.5 L 752.5 670.5 L 752.5 862.5 L 718.5 862.5 Z M 894.5 670.5 L 929.5 670.5 L 929.5 862.5 L 894.5 862.5 Z M 977.5 670.5 L 1011.5 670.5 L 1011.5 862.5 L 977.5 862.5 Z M 1101.5 670.5 L 1135.5 670.5 L 1135.5 862.5 L 1101.5 862.5 Z M 1101.5 670.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 1224.5 209.5 L 1259.5 209.5 L 1259.5 498.5 L 1224.5 498.5 Z M 664.5 209.5 L 698.5 209.5 L 698.5 498.5 L 664.5 498.5 Z M 763.5 209.5 L 797.5 209.5 L 797.5 498.5 L 763.5 498.5 Z M 879.5 209.5 L 914.5 209.5 L 914.5 498.5 L 879.5 498.5 Z M 978.5 209.5 L 1012.5 209.5 L 1012.5 498.5 L 978.5 498.5 Z M 1126.5 209.5 L 1160.5 209.5 L 1160.5 498.5 L 1126.5 498.5 Z M 1126.5 209.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1375.773438 612.503906 L 1365.203125 612.503906 L 1365.203125 608.261719 L 1367.019531 608.058594 L 1368.636719 607.789062 L 1370.050781 607.453125 L 1371.261719 607.183594 L 1372.269531 606.847656 L 1373.148438 606.445312 L 1373.820312 606.039062 L 1374.425781 605.570312 L 1374.964844 605.03125 L 1375.503906 604.355469 L 1375.972656 603.617188 L 1376.445312 602.742188 L 1376.648438 602.269531 L 1376.847656 601.730469 L 1377.050781 601.125 L 1377.320312 600.386719 L 1377.523438 599.644531 L 1377.792969 598.769531 L 1381.695312 598.769531 L 1381.695312 646.5 L 1375.773438 646.5 Z M 1375.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 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/a31o/sky130_fd_sc_lp__a31o_4.svg b/cells/a31o/sky130_fd_sc_lp__a31o_4.svg
index 076a18d..095a6ec 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_4.svg
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 539.5 L 174.5 539.5 Z M 174.5 127.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 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="#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 1580.5 645.5 L 1613.5 645.5 L 1613.5 830.5 L 1580.5 830.5 Z M 1390.5 645.5 L 1423.5 645.5 L 1423.5 830.5 L 1390.5 830.5 Z M 1295.5 645.5 L 1328.5 645.5 L 1328.5 830.5 L 1295.5 830.5 Z M 1485.5 645.5 L 1518.5 645.5 L 1518.5 830.5 L 1485.5 830.5 Z M 736.5 667.5 L 769.5 667.5 L 769.5 852.5 L 736.5 852.5 Z M 1080.5 667.5 L 1113.5 667.5 L 1113.5 852.5 L 1080.5 852.5 Z M 985.5 667.5 L 1018.5 667.5 L 1018.5 852.5 L 985.5 852.5 Z M 873.5 667.5 L 906.5 667.5 L 906.5 852.5 L 873.5 852.5 Z M 641.5 667.5 L 674.5 667.5 L 674.5 852.5 L 641.5 852.5 Z M 305.5 667.5 L 338.5 667.5 L 338.5 852.5 L 305.5 852.5 Z M 400.5 667.5 L 433.5 667.5 L 433.5 852.5 L 400.5 852.5 Z M 495.5 667.5 L 528.5 667.5 L 528.5 852.5 L 495.5 852.5 Z M 495.5 667.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 1580.5 220.5 L 1613.5 220.5 L 1613.5 499.5 L 1580.5 499.5 Z M 305.5 220.5 L 338.5 220.5 L 338.5 499.5 L 305.5 499.5 Z M 400.5 220.5 L 433.5 220.5 L 433.5 499.5 L 400.5 499.5 Z M 716.5 220.5 L 749.5 220.5 L 749.5 499.5 L 716.5 499.5 Z M 811.5 220.5 L 844.5 220.5 L 844.5 499.5 L 811.5 499.5 Z M 906.5 220.5 L 939.5 220.5 L 939.5 499.5 L 906.5 499.5 Z M 1001.5 220.5 L 1034.5 220.5 L 1034.5 499.5 L 1001.5 499.5 Z M 1096.5 220.5 L 1129.5 220.5 L 1129.5 499.5 L 1096.5 499.5 Z M 1191.5 220.5 L 1224.5 220.5 L 1224.5 499.5 L 1191.5 499.5 Z M 1295.5 220.5 L 1328.5 220.5 L 1328.5 499.5 L 1295.5 499.5 Z M 1390.5 220.5 L 1423.5 220.5 L 1423.5 499.5 L 1390.5 499.5 Z M 1485.5 220.5 L 1518.5 220.5 L 1518.5 499.5 L 1485.5 499.5 Z M 1485.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 486.726562 536.371094 L 503.371094 560.5 L 495.953125 560.5 L 483.113281 540.886719 L 470.210938 560.5 L 462.917969 560.5 L 479.566406 536.371094 L 463.953125 513.46875 L 471.242188 513.46875 L 483.304688 531.917969 L 495.433594 513.46875 L 502.597656 513.46875 Z M 486.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 463 561 L 500 561 M 463 524 L 500 524 M 463 524 L 463 561 M 500 524 L 500 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 463 561 L 500 561 M 463 524 L 500 524 M 500 561 L 500 524 M 463 561 L 463 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/a31o/sky130_fd_sc_lp__a31o_lp.svg b/cells/a31o/sky130_fd_sc_lp__a31o_lp.svg
index 3a88b0d..663a646 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_lp.svg
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="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 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="#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 1216.5 758.5 L 1251.5 758.5 L 1251.5 854.5 L 1216.5 854.5 Z M 675.5 758.5 L 710.5 758.5 L 710.5 854.5 L 675.5 854.5 Z M 758.5 758.5 L 792.5 758.5 L 792.5 854.5 L 758.5 854.5 Z M 856.5 758.5 L 891.5 758.5 L 891.5 854.5 L 856.5 854.5 Z M 946.5 758.5 L 980.5 758.5 L 980.5 854.5 L 946.5 854.5 Z M 1035.5 758.5 L 1070.5 758.5 L 1070.5 854.5 L 1035.5 854.5 Z M 1134.5 758.5 L 1168.5 758.5 L 1168.5 854.5 L 1134.5 854.5 Z M 1134.5 758.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 1183.5 220.5 L 1240.5 220.5 L 1240.5 449.5 L 1183.5 449.5 Z M 697.5 220.5 L 755.5 220.5 L 755.5 449.5 L 697.5 449.5 Z M 819.5 220.5 L 876.5 220.5 L 876.5 449.5 L 819.5 449.5 Z M 940.5 220.5 L 997.5 220.5 L 997.5 449.5 L 940.5 449.5 Z M 1062.5 220.5 L 1119.5 220.5 L 1119.5 449.5 L 1062.5 449.5 Z M 1062.5 220.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface330">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <path style=" 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.773438 612.503906 L 760.203125 612.503906 L 760.203125 608.261719 L 762.019531 608.058594 L 763.636719 607.789062 L 765.050781 607.453125 L 766.261719 607.183594 L 767.269531 606.847656 L 768.148438 606.445312 L 768.820312 606.039062 L 769.425781 605.570312 L 769.964844 605.03125 L 770.503906 604.355469 L 770.972656 603.617188 L 771.445312 602.742188 L 771.648438 602.269531 L 771.847656 601.730469 L 772.050781 601.125 L 772.320312 600.386719 L 772.523438 599.644531 L 772.792969 598.769531 L 776.695312 598.769531 L 776.695312 646.5 L 770.773438 646.5 Z M 770.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 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/a31o/sky130_fd_sc_lp__a31o_m.svg b/cells/a31o/sky130_fd_sc_lp__a31o_m.svg
index f521b7b..2b5f26f 100644
--- a/cells/a31o/sky130_fd_sc_lp__a31o_m.svg
+++ b/cells/a31o/sky130_fd_sc_lp__a31o_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image352"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1129.5 746.5 L 1164.5 746.5 L 1164.5 843.5 L 1129.5 843.5 Z M 751.5 746.5 L 785.5 746.5 L 785.5 843.5 L 751.5 843.5 Z M 866.5 746.5 L 900.5 746.5 L 900.5 843.5 L 866.5 843.5 Z M 948.5 746.5 L 983.5 746.5 L 983.5 843.5 L 948.5 843.5 Z M 1031.5 746.5 L 1065.5 746.5 L 1065.5 843.5 L 1031.5 843.5 Z M 1031.5 746.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1152.5 235.5 L 1187.5 235.5 L 1187.5 331.5 L 1152.5 331.5 Z M 758.5 235.5 L 792.5 235.5 L 792.5 331.5 L 758.5 331.5 Z M 856.5 235.5 L 891.5 235.5 L 891.5 331.5 L 856.5 331.5 Z M 955.5 235.5 L 989.5 235.5 L 989.5 331.5 L 955.5 331.5 Z M 1054.5 235.5 L 1088.5 235.5 L 1088.5 331.5 L 1054.5 331.5 Z M 1054.5 235.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface349">
+<g id="surface376">
 <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 636.824219 706.320312 L 654.191406 731.5 L 646.449219 731.5 L 633.050781 711.035156 L 619.589844 731.5 L 611.980469 731.5 L 629.351562 706.320312 L 613.058594 682.421875 L 620.664062 682.421875 L 633.253906 701.675781 L 645.910156 682.421875 L 653.382812 682.421875 Z M 636.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 612 392 L 651 392 M 612 353 L 651 353 M 612 353 L 612 392 M 651 353 L 651 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 612 392 L 651 392 M 612 353 L 651 353 M 651 392 L 651 353 M 612 392 L 612 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/a31oi/sky130_fd_sc_lp__a31oi_0.svg b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.svg
index 1ef1951..40ecd13 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_0.svg
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image352"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1104.5 768.5 L 1138.5 768.5 L 1138.5 864.5 L 1104.5 864.5 Z M 795.5 768.5 L 829.5 768.5 L 829.5 864.5 L 795.5 864.5 Z M 884.5 768.5 L 918.5 768.5 L 918.5 864.5 L 884.5 864.5 Z M 973.5 768.5 L 1008.5 768.5 L 1008.5 864.5 L 973.5 864.5 Z M 973.5 768.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1075.5 229.5 L 1110.5 229.5 L 1110.5 376.5 L 1075.5 376.5 Z M 780.5 229.5 L 814.5 229.5 L 814.5 376.5 L 780.5 376.5 Z M 878.5 229.5 L 913.5 229.5 L 913.5 376.5 L 878.5 376.5 Z M 977.5 229.5 L 1011.5 229.5 L 1011.5 376.5 L 977.5 376.5 Z M 977.5 229.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface349">
+<g id="surface376">
 <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 1187.554688 372.246094 L 1187.554688 391.5 L 1181.292969 391.5 L 1181.292969 372.246094 L 1162.375 342.421875 L 1170.117188 342.421875 L 1184.523438 366.320312 L 1198.527344 342.421875 L 1206 342.421875 Z M 1187.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 1164 731 L 1203 731 M 1164 693 L 1203 693 M 1164 693 L 1164 731 M 1203 693 L 1203 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 1164 731 L 1203 731 M 1164 693 L 1203 693 M 1203 731 L 1203 693 M 1164 731 L 1164 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 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/a31oi/sky130_fd_sc_lp__a31oi_1.svg b/cells/a31oi/sky130_fd_sc_lp__a31oi_1.svg
index 8fb30d0..50b23eb 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_1.svg
+++ b/cells/a31oi/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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="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="#image310"/>
+  <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 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="#image310"/>
+  <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 1104.5 672.5 L 1138.5 672.5 L 1138.5 864.5 L 1104.5 864.5 Z M 772.5 672.5 L 806.5 672.5 L 806.5 864.5 L 772.5 864.5 Z M 854.5 672.5 L 889.5 672.5 L 889.5 864.5 L 854.5 864.5 Z M 980.5 672.5 L 1015.5 672.5 L 1015.5 864.5 L 980.5 864.5 Z M 980.5 672.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <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 1104.5 209.5 L 1138.5 209.5 L 1138.5 498.5 L 1104.5 498.5 Z M 772.5 209.5 L 806.5 209.5 L 806.5 498.5 L 772.5 498.5 Z M 870.5 209.5 L 905.5 209.5 L 905.5 498.5 L 870.5 498.5 Z M 1005.5 209.5 L 1040.5 209.5 L 1040.5 498.5 L 1005.5 498.5 Z M 1005.5 209.5 "/>
 </clipPath>
-<image id="image312" 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="#image312"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image313" 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="#image313"/>
+  <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="surface307">
+<g id="surface334">
 <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 1242.554688 372.246094 L 1242.554688 391.5 L 1236.292969 391.5 L 1236.292969 372.246094 L 1217.375 342.421875 L 1225.117188 342.421875 L 1239.523438 366.320312 L 1253.527344 342.421875 L 1261 342.421875 Z M 1242.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 1219 731 L 1258 731 M 1219 693 L 1258 693 M 1219 693 L 1219 731 M 1258 693 L 1258 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 1219 731 L 1258 731 M 1219 693 L 1258 693 M 1258 731 L 1258 693 M 1219 731 L 1219 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 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_lp__a31oi_2.svg b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.svg
index bcbd4ac..6bfd966 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_2.svg
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.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="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image314"/>
+  <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 1330.5 647.5 L 1364.5 647.5 L 1364.5 839.5 L 1330.5 839.5 Z M 502.5 647.5 L 537.5 647.5 L 537.5 839.5 L 502.5 839.5 Z M 601.5 647.5 L 635.5 647.5 L 635.5 839.5 L 601.5 839.5 Z M 699.5 647.5 L 734.5 647.5 L 734.5 839.5 L 699.5 839.5 Z M 798.5 647.5 L 832.5 647.5 L 832.5 839.5 L 798.5 839.5 Z M 1017.5 647.5 L 1051.5 647.5 L 1051.5 839.5 L 1017.5 839.5 Z M 1133.5 647.5 L 1167.5 647.5 L 1167.5 839.5 L 1133.5 839.5 Z M 1231.5 647.5 L 1266.5 647.5 L 1266.5 839.5 L 1231.5 839.5 Z M 1231.5 647.5 "/>
 </clipPath>
-<image id="image315" 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="#image315"/>
+  <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 1330.5 209.5 L 1364.5 209.5 L 1364.5 498.5 L 1330.5 498.5 Z M 502.5 209.5 L 537.5 209.5 L 537.5 498.5 L 502.5 498.5 Z M 601.5 209.5 L 635.5 209.5 L 635.5 498.5 L 601.5 498.5 Z M 699.5 209.5 L 734.5 209.5 L 734.5 498.5 L 699.5 498.5 Z M 816.5 209.5 L 851.5 209.5 L 851.5 498.5 L 816.5 498.5 Z M 915.5 209.5 L 949.5 209.5 L 949.5 498.5 L 915.5 498.5 Z M 1133.5 209.5 L 1167.5 209.5 L 1167.5 498.5 L 1133.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 1231.5 209.5 "/>
 </clipPath>
-<image id="image316" 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="#image316"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image317" 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="#image317"/>
+  <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="surface311">
+<g id="surface339">
 <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 1484.773438 527.503906 L 1474.203125 527.503906 L 1474.203125 523.261719 L 1476.019531 523.058594 L 1477.636719 522.789062 L 1479.050781 522.453125 L 1480.261719 522.183594 L 1481.269531 521.847656 L 1482.148438 521.445312 L 1482.820312 521.039062 L 1483.425781 520.570312 L 1483.964844 520.03125 L 1484.503906 519.355469 L 1484.972656 518.617188 L 1485.445312 517.742188 L 1485.648438 517.269531 L 1485.847656 516.730469 L 1486.050781 516.125 L 1486.320312 515.386719 L 1486.523438 514.644531 L 1486.792969 513.769531 L 1490.695312 513.769531 L 1490.695312 561.5 L 1484.773438 561.5 Z M 1484.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 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/a31oi/sky130_fd_sc_lp__a31oi_4.svg b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.svg
index 202a734..609b34e 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_4.svg
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image374" 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="#image374"/>
+  <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 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="#image374"/>
+  <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 865.5 624.5 L 893.5 624.5 L 893.5 778.5 L 865.5 778.5 Z M 772.5 624.5 L 799.5 624.5 L 799.5 778.5 L 772.5 778.5 Z M 599.5 624.5 L 626.5 624.5 L 626.5 778.5 L 599.5 778.5 Z M 283.5 624.5 L 310.5 624.5 L 310.5 778.5 L 283.5 778.5 Z M 520.5 624.5 L 547.5 624.5 L 547.5 778.5 L 520.5 778.5 Z M 678.5 624.5 L 705.5 624.5 L 705.5 778.5 L 678.5 778.5 Z M 441.5 624.5 L 468.5 624.5 L 468.5 778.5 L 441.5 778.5 Z M 362.5 624.5 L 389.5 624.5 L 389.5 778.5 L 362.5 778.5 Z M 1608.5 628.5 L 1636.5 628.5 L 1636.5 782.5 L 1608.5 782.5 Z M 1055.5 628.5 L 1082.5 628.5 L 1082.5 782.5 L 1055.5 782.5 Z M 1450.5 628.5 L 1478.5 628.5 L 1478.5 782.5 L 1450.5 782.5 Z M 1371.5 628.5 L 1399.5 628.5 L 1399.5 782.5 L 1371.5 782.5 Z M 1213.5 628.5 L 1240.5 628.5 L 1240.5 782.5 L 1213.5 782.5 Z M 1134.5 628.5 L 1161.5 628.5 L 1161.5 782.5 L 1134.5 782.5 Z M 1529.5 628.5 L 1557.5 628.5 L 1557.5 782.5 L 1529.5 782.5 Z M 1292.5 628.5 L 1319.5 628.5 L 1319.5 782.5 L 1292.5 782.5 Z M 1292.5 628.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1595.5 273.5 L 1623.5 273.5 L 1623.5 504.5 L 1595.5 504.5 Z M 296.5 273.5 L 323.5 273.5 L 323.5 504.5 L 296.5 504.5 Z M 375.5 273.5 L 402.5 273.5 L 402.5 504.5 L 375.5 504.5 Z M 454.5 273.5 L 481.5 273.5 L 481.5 504.5 L 454.5 504.5 Z M 533.5 273.5 L 560.5 273.5 L 560.5 504.5 L 533.5 504.5 Z M 612.5 273.5 L 639.5 273.5 L 639.5 504.5 L 612.5 504.5 Z M 691.5 273.5 L 718.5 273.5 L 718.5 504.5 L 691.5 504.5 Z M 770.5 273.5 L 797.5 273.5 L 797.5 504.5 L 770.5 504.5 Z M 948.5 273.5 L 976.5 273.5 L 976.5 504.5 L 948.5 504.5 Z M 1027.5 273.5 L 1055.5 273.5 L 1055.5 504.5 L 1027.5 504.5 Z M 1106.5 273.5 L 1134.5 273.5 L 1134.5 504.5 L 1106.5 504.5 Z M 1185.5 273.5 L 1213.5 273.5 L 1213.5 504.5 L 1185.5 504.5 Z M 1264.5 273.5 L 1292.5 273.5 L 1292.5 504.5 L 1264.5 504.5 Z M 1358.5 273.5 L 1386.5 273.5 L 1386.5 504.5 L 1358.5 504.5 Z M 1437.5 273.5 L 1465.5 273.5 L 1465.5 504.5 L 1437.5 504.5 Z M 1516.5 273.5 L 1544.5 273.5 L 1544.5 504.5 L 1516.5 504.5 Z M 1516.5 273.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 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="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface371">
+<g id="surface399">
 <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 1051.667969 471.855469 L 1051.667969 487.5 L 1046.582031 487.5 L 1046.582031 471.855469 L 1031.210938 447.625 L 1037.5 447.625 L 1049.207031 467.042969 L 1060.585938 447.625 L 1066.65625 447.625 Z M 1051.667969 471.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 627 L 1063 627 M 1032 596 L 1063 596 M 1032 596 L 1032 627 M 1063 596 L 1063 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 1032 627 L 1063 627 M 1032 596 L 1063 596 M 1063 627 L 1063 596 M 1032 627 L 1032 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/a31oi/sky130_fd_sc_lp__a31oi_lp.svg b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.svg
index e07231c..ccb6b25 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.svg
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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="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 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="#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 1159.5 768.5 L 1193.5 768.5 L 1193.5 864.5 L 1159.5 864.5 Z M 799.5 768.5 L 834.5 768.5 L 834.5 864.5 L 799.5 864.5 Z M 889.5 768.5 L 923.5 768.5 L 923.5 864.5 L 889.5 864.5 Z M 978.5 768.5 L 1012.5 768.5 L 1012.5 864.5 L 978.5 864.5 Z M 1077.5 768.5 L 1111.5 768.5 L 1111.5 864.5 L 1077.5 864.5 Z M 1077.5 768.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 1109.5 220.5 L 1166.5 220.5 L 1166.5 449.5 L 1109.5 449.5 Z M 735.5 220.5 L 792.5 220.5 L 792.5 449.5 L 735.5 449.5 Z M 856.5 220.5 L 914.5 220.5 L 914.5 449.5 L 856.5 449.5 Z M 987.5 220.5 L 1044.5 220.5 L 1044.5 449.5 L 987.5 449.5 Z M 987.5 220.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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 1156.773438 527.503906 L 1146.203125 527.503906 L 1146.203125 523.261719 L 1148.019531 523.058594 L 1149.636719 522.789062 L 1151.050781 522.453125 L 1152.261719 522.183594 L 1153.269531 521.847656 L 1154.148438 521.445312 L 1154.820312 521.039062 L 1155.425781 520.570312 L 1155.964844 520.03125 L 1156.503906 519.355469 L 1156.972656 518.617188 L 1157.445312 517.742188 L 1157.648438 517.269531 L 1157.847656 516.730469 L 1158.050781 516.125 L 1158.320312 515.386719 L 1158.523438 514.644531 L 1158.792969 513.769531 L 1162.695312 513.769531 L 1162.695312 561.5 L 1156.773438 561.5 Z M 1156.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 1109 562 L 1148 562 M 1109 523 L 1148 523 M 1109 523 L 1109 562 M 1148 523 L 1148 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 1109 562 L 1148 562 M 1109 523 L 1148 523 M 1148 562 L 1148 523 M 1109 562 L 1109 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/a31oi/sky130_fd_sc_lp__a31oi_m.svg b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.svg
index 28e9615..61101f5 100644
--- a/cells/a31oi/sky130_fd_sc_lp__a31oi_m.svg
+++ b/cells/a31oi/sky130_fd_sc_lp__a31oi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask 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="#image377"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1145.5 728.5 L 1180.5 728.5 L 1180.5 824.5 L 1145.5 824.5 Z M 815.5 728.5 L 850.5 728.5 L 850.5 824.5 L 815.5 824.5 Z M 898.5 728.5 L 932.5 728.5 L 932.5 824.5 L 898.5 824.5 Z M 980.5 728.5 L 1015.5 728.5 L 1015.5 824.5 L 980.5 824.5 Z M 980.5 728.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1088.5 249.5 L 1122.5 249.5 L 1122.5 345.5 L 1088.5 345.5 Z M 792.5 249.5 L 827.5 249.5 L 827.5 345.5 L 792.5 345.5 Z M 891.5 249.5 L 925.5 249.5 L 925.5 345.5 L 891.5 345.5 Z M 989.5 249.5 L 1024.5 249.5 L 1024.5 345.5 L 989.5 345.5 Z M 989.5 249.5 "/>
 </clipPath>
-<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface374">
+<g id="surface401">
 <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 1242.554688 627.246094 L 1242.554688 646.5 L 1236.292969 646.5 L 1236.292969 627.246094 L 1217.375 597.421875 L 1225.117188 597.421875 L 1239.523438 621.320312 L 1253.527344 597.421875 L 1261 597.421875 Z M 1242.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 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/a32o/sky130_fd_sc_lp__a32o_0.svg b/cells/a32o/sky130_fd_sc_lp__a32o_0.svg
index 798b2e3..a67226b 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_0.svg
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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="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 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="#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 1256.5 768.5 L 1291.5 768.5 L 1291.5 864.5 L 1256.5 864.5 Z M 614.5 768.5 L 648.5 768.5 L 648.5 864.5 L 614.5 864.5 Z M 803.5 768.5 L 837.5 768.5 L 837.5 864.5 L 803.5 864.5 Z M 903.5 768.5 L 938.5 768.5 L 938.5 864.5 L 903.5 864.5 Z M 1009.5 768.5 L 1043.5 768.5 L 1043.5 864.5 L 1009.5 864.5 Z M 1133.5 768.5 L 1167.5 768.5 L 1167.5 864.5 L 1133.5 864.5 Z M 1133.5 768.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 1238.5 280.5 L 1272.5 280.5 L 1272.5 427.5 L 1238.5 427.5 Z M 697.5 280.5 L 732.5 280.5 L 732.5 427.5 L 697.5 427.5 Z M 796.5 280.5 L 830.5 280.5 L 830.5 427.5 L 796.5 427.5 Z M 916.5 280.5 L 950.5 280.5 L 950.5 427.5 L 916.5 427.5 Z M 1036.5 280.5 L 1071.5 280.5 L 1071.5 427.5 L 1036.5 427.5 Z M 1140.5 280.5 L 1174.5 280.5 L 1174.5 427.5 L 1140.5 427.5 Z M 1140.5 280.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface343">
+<g id="surface371">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -195,6 +195,5 @@
 <path style=" 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/a32o/sky130_fd_sc_lp__a32o_1.svg b/cells/a32o/sky130_fd_sc_lp__a32o_1.svg
index 3ee6b6d..270614d 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_1.svg
+++ b/cells/a32o/sky130_fd_sc_lp__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 539.5 L 478.5 539.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 1268.5 672.5 L 1302.5 672.5 L 1302.5 864.5 L 1268.5 864.5 Z M 614.5 672.5 L 648.5 672.5 L 648.5 864.5 L 614.5 864.5 Z M 789.5 672.5 L 823.5 672.5 L 823.5 864.5 L 789.5 864.5 Z M 895.5 672.5 L 930.5 672.5 L 930.5 864.5 L 895.5 864.5 Z M 1007.5 672.5 L 1041.5 672.5 L 1041.5 864.5 L 1007.5 864.5 Z M 1185.5 672.5 L 1220.5 672.5 L 1220.5 864.5 L 1185.5 864.5 Z M 1185.5 672.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 1268.5 209.5 L 1302.5 209.5 L 1302.5 498.5 L 1268.5 498.5 Z M 657.5 209.5 L 691.5 209.5 L 691.5 498.5 L 657.5 498.5 Z M 773.5 209.5 L 807.5 209.5 L 807.5 498.5 L 773.5 498.5 Z M 871.5 209.5 L 906.5 209.5 L 906.5 498.5 L 871.5 498.5 Z M 1062.5 209.5 L 1096.5 209.5 L 1096.5 498.5 L 1062.5 498.5 Z M 1160.5 209.5 L 1195.5 209.5 L 1195.5 498.5 L 1160.5 498.5 Z M 1160.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 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/a32o/sky130_fd_sc_lp__a32o_2.svg b/cells/a32o/sky130_fd_sc_lp__a32o_2.svg
index b0c99f9..feb138b 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_2.svg
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.5 111.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 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="#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 1347.5 672.5 L 1381.5 672.5 L 1381.5 864.5 L 1347.5 864.5 Z M 569.5 672.5 L 603.5 672.5 L 603.5 864.5 L 569.5 864.5 Z M 667.5 672.5 L 702.5 672.5 L 702.5 864.5 L 667.5 864.5 Z M 871.5 672.5 L 906.5 672.5 L 906.5 864.5 L 871.5 864.5 Z M 954.5 672.5 L 988.5 672.5 L 988.5 864.5 L 954.5 864.5 Z M 1099.5 672.5 L 1134.5 672.5 L 1134.5 864.5 L 1099.5 864.5 Z M 1223.5 672.5 L 1258.5 672.5 L 1258.5 864.5 L 1223.5 864.5 Z M 1223.5 672.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 1347.5 209.5 L 1381.5 209.5 L 1381.5 498.5 L 1347.5 498.5 Z M 534.5 209.5 L 569.5 209.5 L 569.5 498.5 L 534.5 498.5 Z M 633.5 209.5 L 667.5 209.5 L 667.5 498.5 L 633.5 498.5 Z M 867.5 209.5 L 901.5 209.5 L 901.5 498.5 L 867.5 498.5 Z M 965.5 209.5 L 1000.5 209.5 L 1000.5 498.5 L 965.5 498.5 Z M 1128.5 209.5 L 1162.5 209.5 L 1162.5 498.5 L 1128.5 498.5 Z M 1248.5 209.5 L 1283.5 209.5 L 1283.5 498.5 L 1248.5 498.5 Z M 1248.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 805.703125 530.332031 L 806.242188 525.28125 L 807.652344 521.175781 L 809.875 517.941406 L 812.90625 515.652344 L 816.742188 514.242188 L 821.457031 513.769531 L 823.609375 513.902344 L 825.695312 514.242188 L 827.648438 514.777344 L 829.398438 515.585938 L 831.015625 516.597656 L 832.5625 517.742188 L 833.773438 519.15625 L 834.851562 520.636719 L 835.660156 522.25 L 836.265625 523.933594 L 836.601562 525.820312 L 836.738281 527.773438 L 836.46875 530.53125 L 835.726562 533.089844 L 834.449219 535.445312 L 832.699219 537.667969 L 830.410156 539.753906 L 827.648438 541.574219 L 826.640625 542.179688 L 819.90625 545.8125 L 818.15625 546.824219 L 816.609375 547.832031 L 815.261719 548.84375 L 814.183594 549.851562 L 813.242188 550.863281 L 812.570312 551.875 L 812.230469 552.480469 L 811.960938 553.015625 L 811.761719 553.691406 L 811.558594 554.296875 L 811.355469 554.96875 L 811.289062 555.644531 L 836.402344 555.644531 L 836.402344 561.5 L 804.625 561.5 L 804.757812 559.144531 L 805.097656 556.988281 L 805.5 554.96875 L 806.039062 553.21875 L 806.644531 551.535156 L 807.386719 550.054688 L 808.191406 548.777344 L 809.203125 547.496094 L 810.414062 546.21875 L 811.761719 545.007812 L 813.308594 543.792969 L 815.125 542.582031 L 815.53125 542.3125 L 816.003906 542.042969 L 816.472656 541.707031 L 816.945312 541.4375 L 817.484375 541.167969 L 818.023438 540.832031 L 824.214844 537.332031 L 826.167969 536.050781 L 827.785156 534.640625 L 829.0625 533.15625 L 829.9375 531.542969 L 830.476562 529.792969 L 830.679688 527.90625 L 830.542969 526.628906 L 830.339844 525.347656 L 829.871094 524.203125 L 829.332031 523.125 L 828.523438 522.183594 L 827.648438 521.242188 L 826.707031 520.570312 L 825.765625 519.960938 L 824.6875 519.558594 L 823.609375 519.222656 L 822.464844 519.019531 L 821.253906 518.953125 L 818.628906 519.289062 L 816.40625 520.097656 L 814.589844 521.511719 L 813.242188 523.464844 L 812.300781 526.023438 L 811.761719 529.050781 L 811.695312 529.320312 L 811.695312 529.722656 L 811.625 529.925781 L 811.625 530.332031 Z M 805.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 776 562 L 815 562 M 776 523 L 815 523 M 776 523 L 776 562 M 815 523 L 815 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 776 562 L 815 562 M 776 523 L 815 523 M 815 562 L 815 523 M 776 562 L 776 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/a32o/sky130_fd_sc_lp__a32o_4.svg b/cells/a32o/sky130_fd_sc_lp__a32o_4.svg
index 2c4761f..ff4a376 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_4.svg
+++ b/cells/a32o/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image326"/>
+  <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 1447.5 628.5 L 1475.5 628.5 L 1475.5 782.5 L 1447.5 782.5 Z M 1526.5 628.5 L 1554.5 628.5 L 1554.5 782.5 L 1526.5 782.5 Z M 1368.5 628.5 L 1396.5 628.5 L 1396.5 782.5 L 1368.5 782.5 Z M 1605.5 628.5 L 1633.5 628.5 L 1633.5 782.5 L 1605.5 782.5 Z M 651.5 644.5 L 679.5 644.5 L 679.5 799.5 L 651.5 799.5 Z M 1194.5 644.5 L 1221.5 644.5 L 1221.5 799.5 L 1194.5 799.5 Z M 1114.5 644.5 L 1142.5 644.5 L 1142.5 799.5 L 1114.5 799.5 Z M 1035.5 644.5 L 1063.5 644.5 L 1063.5 799.5 L 1035.5 799.5 Z M 956.5 644.5 L 984.5 644.5 L 984.5 799.5 L 956.5 799.5 Z M 730.5 644.5 L 758.5 644.5 L 758.5 799.5 L 730.5 799.5 Z M 539.5 644.5 L 567.5 644.5 L 567.5 799.5 L 539.5 799.5 Z M 460.5 644.5 L 488.5 644.5 L 488.5 799.5 L 460.5 799.5 Z M 302.5 644.5 L 330.5 644.5 L 330.5 799.5 L 302.5 799.5 Z M 381.5 644.5 L 409.5 644.5 L 409.5 799.5 L 381.5 799.5 Z M 381.5 644.5 "/>
 </clipPath>
-<image id="image327" 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="#image327"/>
+  <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 1603.5 273.5 L 1631.5 273.5 L 1631.5 504.5 L 1603.5 504.5 Z M 335.5 273.5 L 363.5 273.5 L 363.5 504.5 L 335.5 504.5 Z M 414.5 273.5 L 442.5 273.5 L 442.5 504.5 L 414.5 504.5 Z M 493.5 273.5 L 521.5 273.5 L 521.5 504.5 L 493.5 504.5 Z M 572.5 273.5 L 600.5 273.5 L 600.5 504.5 L 572.5 504.5 Z M 651.5 273.5 L 679.5 273.5 L 679.5 504.5 L 651.5 504.5 Z M 730.5 273.5 L 758.5 273.5 L 758.5 504.5 L 730.5 504.5 Z M 997.5 273.5 L 1024.5 273.5 L 1024.5 504.5 L 997.5 504.5 Z M 1076.5 273.5 L 1103.5 273.5 L 1103.5 504.5 L 1076.5 504.5 Z M 1155.5 273.5 L 1183.5 273.5 L 1183.5 504.5 L 1155.5 504.5 Z M 1245.5 273.5 L 1273.5 273.5 L 1273.5 504.5 L 1245.5 504.5 Z M 1324.5 273.5 L 1352.5 273.5 L 1352.5 504.5 L 1324.5 504.5 Z M 1418.5 273.5 L 1445.5 273.5 L 1445.5 504.5 L 1418.5 504.5 Z M 1524.5 273.5 L 1552.5 273.5 L 1552.5 504.5 L 1524.5 504.5 Z M 1524.5 273.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image329" 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="#image329"/>
+  <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="surface323">
+<g id="surface352">
 <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 257.886719 535.042969 L 272 555.5 L 265.707031 555.5 L 254.824219 538.871094 L 243.882812 555.5 L 237.703125 555.5 L 251.816406 535.042969 L 238.578125 515.625 L 244.757812 515.625 L 254.988281 531.269531 L 265.269531 515.625 L 271.34375 515.625 Z M 257.886719 535.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 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/a32o/sky130_fd_sc_lp__a32o_lp.svg b/cells/a32o/sky130_fd_sc_lp__a32o_lp.svg
index cfbb7c6..e16baed 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_lp.svg
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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 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="#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 1303.5 660.5 L 1338.5 660.5 L 1338.5 757.5 L 1303.5 757.5 Z M 589.5 660.5 L 624.5 660.5 L 624.5 757.5 L 589.5 757.5 Z M 679.5 660.5 L 713.5 660.5 L 713.5 757.5 L 679.5 757.5 Z M 810.5 660.5 L 844.5 660.5 L 844.5 757.5 L 810.5 757.5 Z M 940.5 660.5 L 975.5 660.5 L 975.5 757.5 L 940.5 757.5 Z M 1071.5 660.5 L 1105.5 660.5 L 1105.5 757.5 L 1071.5 757.5 Z M 1214.5 660.5 L 1248.5 660.5 L 1248.5 757.5 L 1214.5 757.5 Z M 1214.5 660.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 1303.5 209.5 L 1361.5 209.5 L 1361.5 438.5 L 1303.5 438.5 Z M 567.5 209.5 L 624.5 209.5 L 624.5 438.5 L 567.5 438.5 Z M 688.5 209.5 L 745.5 209.5 L 745.5 438.5 L 688.5 438.5 Z M 810.5 209.5 L 867.5 209.5 L 867.5 438.5 L 810.5 438.5 Z M 949.5 209.5 L 1007.5 209.5 L 1007.5 438.5 L 949.5 438.5 Z M 1071.5 209.5 L 1128.5 209.5 L 1128.5 438.5 L 1071.5 438.5 Z M 1071.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/a32o/sky130_fd_sc_lp__a32o_m.svg b/cells/a32o/sky130_fd_sc_lp__a32o_m.svg
index ff0e012..3f6fe05 100644
--- a/cells/a32o/sky130_fd_sc_lp__a32o_m.svg
+++ b/cells/a32o/sky130_fd_sc_lp__a32o_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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 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="#image341"/>
+  <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 1216.5 768.5 L 1251.5 768.5 L 1251.5 864.5 L 1216.5 864.5 Z M 680.5 768.5 L 714.5 768.5 L 714.5 864.5 L 680.5 864.5 Z M 804.5 768.5 L 838.5 768.5 L 838.5 864.5 L 804.5 864.5 Z M 886.5 768.5 L 921.5 768.5 L 921.5 864.5 L 886.5 864.5 Z M 1010.5 768.5 L 1044.5 768.5 L 1044.5 864.5 L 1010.5 864.5 Z M 1134.5 768.5 L 1168.5 768.5 L 1168.5 864.5 L 1134.5 864.5 Z M 1134.5 768.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1198.5 381.5 L 1232.5 381.5 L 1232.5 477.5 L 1198.5 477.5 Z M 687.5 381.5 L 721.5 381.5 L 721.5 477.5 L 687.5 477.5 Z M 804.5 381.5 L 838.5 381.5 L 838.5 477.5 L 804.5 477.5 Z M 902.5 381.5 L 937.5 381.5 L 937.5 477.5 L 902.5 477.5 Z M 1001.5 381.5 L 1035.5 381.5 L 1035.5 477.5 L 1001.5 477.5 Z M 1099.5 381.5 L 1134.5 381.5 L 1134.5 477.5 L 1099.5 477.5 Z M 1099.5 381.5 "/>
 </clipPath>
-<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface338">
+<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 636.824219 706.320312 L 654.191406 731.5 L 646.449219 731.5 L 633.050781 711.035156 L 619.589844 731.5 L 611.980469 731.5 L 629.351562 706.320312 L 613.058594 682.421875 L 620.664062 682.421875 L 633.253906 701.675781 L 645.910156 682.421875 L 653.382812 682.421875 Z M 636.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 612 392 L 651 392 M 612 353 L 651 353 M 612 353 L 612 392 M 651 353 L 651 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 612 392 L 651 392 M 612 353 L 651 353 M 651 392 L 651 353 M 612 392 L 612 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/a32oi/sky130_fd_sc_lp__a32oi_0.svg b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.svg
index 55b1a04..4516ac2 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_0.svg
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1178.5 768.5 L 1213.5 768.5 L 1213.5 864.5 L 1178.5 864.5 Z M 704.5 768.5 L 738.5 768.5 L 738.5 864.5 L 704.5 864.5 Z M 793.5 768.5 L 828.5 768.5 L 828.5 864.5 L 793.5 864.5 Z M 924.5 768.5 L 958.5 768.5 L 958.5 864.5 L 924.5 864.5 Z M 1055.5 768.5 L 1089.5 768.5 L 1089.5 864.5 L 1055.5 864.5 Z M 1055.5 768.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1152.5 317.5 L 1187.5 317.5 L 1187.5 463.5 L 1152.5 463.5 Z M 680.5 317.5 L 714.5 317.5 L 714.5 463.5 L 680.5 463.5 Z M 779.5 317.5 L 813.5 317.5 L 813.5 463.5 L 779.5 463.5 Z M 877.5 317.5 L 911.5 317.5 L 911.5 463.5 L 877.5 463.5 Z M 1054.5 317.5 L 1088.5 317.5 L 1088.5 463.5 L 1054.5 463.5 Z M 1054.5 317.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface365">
+<g id="surface393">
 <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 746.554688 372.246094 L 746.554688 391.5 L 740.292969 391.5 L 740.292969 372.246094 L 721.375 342.421875 L 729.117188 342.421875 L 743.523438 366.320312 L 757.527344 342.421875 L 765 342.421875 Z M 746.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 722 731 L 761 731 M 722 693 L 761 693 M 722 693 L 722 731 M 761 693 L 761 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 722 731 L 761 731 M 722 693 L 761 693 M 761 731 L 761 693 M 722 731 L 722 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 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_lp__a32oi_1.svg b/cells/a32oi/sky130_fd_sc_lp__a32oi_1.svg
index 7fcaaf6..451a459 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_1.svg
+++ b/cells/a32oi/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image371"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1175.5 647.5 L 1209.5 647.5 L 1209.5 839.5 L 1175.5 839.5 Z M 704.5 647.5 L 738.5 647.5 L 738.5 839.5 L 704.5 839.5 Z M 790.5 647.5 L 824.5 647.5 L 824.5 839.5 L 790.5 839.5 Z M 916.5 647.5 L 950.5 647.5 L 950.5 839.5 L 916.5 839.5 Z M 1040.5 647.5 L 1074.5 647.5 L 1074.5 839.5 L 1040.5 839.5 Z M 1040.5 647.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1191.5 209.5 L 1225.5 209.5 L 1225.5 498.5 L 1191.5 498.5 Z M 704.5 209.5 L 738.5 209.5 L 738.5 498.5 L 704.5 498.5 Z M 803.5 209.5 L 837.5 209.5 L 837.5 498.5 L 803.5 498.5 Z M 916.5 209.5 L 950.5 209.5 L 950.5 498.5 L 916.5 498.5 Z M 1093.5 209.5 L 1127.5 209.5 L 1127.5 498.5 L 1093.5 498.5 Z M 1093.5 209.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface368">
+<g id="surface396">
 <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 1206.511719 603.40625 L 1204.292969 603.605469 L 1202.40625 604.078125 L 1200.859375 604.886719 L 1199.578125 606.03125 L 1198.636719 607.511719 L 1197.960938 609.328125 L 1197.761719 609.933594 L 1197.625 610.609375 L 1197.558594 611.28125 L 1197.492188 612.089844 L 1197.425781 612.828125 L 1197.425781 613.636719 L 1191.5 613.636719 L 1191.769531 609.867188 L 1192.644531 606.636719 L 1193.921875 603.941406 L 1195.808594 601.722656 L 1198.097656 600.039062 L 1200.992188 598.894531 L 1201.800781 598.691406 L 1202.675781 598.558594 L 1203.550781 598.421875 L 1205.433594 598.289062 L 1206.445312 598.222656 L 1208.9375 598.355469 L 1211.292969 598.757812 L 1213.378906 599.433594 L 1215.265625 600.308594 L 1216.878906 601.519531 L 1218.292969 602.933594 L 1219.101562 604.144531 L 1219.773438 605.355469 L 1220.3125 606.703125 L 1220.648438 608.183594 L 1220.851562 609.734375 L 1220.988281 611.347656 L 1220.785156 613.703125 L 1220.246094 615.722656 L 1219.304688 617.476562 L 1218.023438 619.023438 L 1216.339844 620.300781 L 1214.320312 621.246094 L 1216.003906 621.917969 L 1217.484375 622.726562 L 1218.765625 623.601562 L 1219.84375 624.609375 L 1220.71875 625.753906 L 1221.390625 626.96875 L 1221.660156 627.773438 L 1221.929688 628.648438 L 1222.132812 629.59375 L 1222.265625 630.535156 L 1222.332031 631.542969 L 1222.402344 632.621094 L 1222.265625 634.910156 L 1221.863281 636.996094 L 1221.1875 638.882812 L 1220.3125 640.699219 L 1219.167969 642.316406 L 1217.753906 643.730469 L 1216.207031 644.875 L 1214.523438 645.816406 L 1212.707031 646.488281 L 1210.6875 647.027344 L 1208.53125 647.367188 L 1206.242188 647.5 L 1202.609375 647.230469 L 1199.511719 646.421875 L 1196.820312 645.210938 L 1194.597656 643.394531 L 1192.847656 641.105469 L 1191.632812 638.277344 L 1191.296875 637.402344 L 1191.097656 636.390625 L 1190.894531 635.382812 L 1190.691406 634.371094 L 1190.558594 633.296875 L 1190.488281 632.082031 L 1196.414062 632.082031 L 1196.683594 634.507812 L 1197.222656 636.59375 L 1198.03125 638.34375 L 1199.105469 639.757812 L 1200.453125 640.902344 L 1202.136719 641.644531 L 1202.742188 641.84375 L 1203.414062 641.980469 L 1204.089844 642.113281 L 1204.828125 642.179688 L 1205.570312 642.25 L 1206.445312 642.25 L 1208.261719 642.179688 L 1209.945312 641.84375 L 1211.425781 641.304688 L 1212.773438 640.566406 L 1213.917969 639.554688 L 1214.859375 638.34375 L 1215.265625 637.605469 L 1215.667969 636.730469 L 1215.9375 635.785156 L 1216.140625 634.84375 L 1216.273438 633.832031 L 1216.339844 632.6875 L 1216.070312 630.265625 L 1215.398438 628.246094 L 1214.253906 626.5625 L 1212.640625 625.351562 L 1210.550781 624.542969 L 1207.992188 624.070312 L 1206.648438 624.070312 L 1206.445312 624.003906 L 1203.953125 624.070312 L 1203.214844 624.070312 L 1203.214844 619.023438 L 1205.234375 618.957031 L 1207.050781 618.820312 L 1208.667969 618.621094 L 1210.011719 618.351562 L 1211.15625 618.011719 L 1212.167969 617.542969 L 1212.976562 616.9375 L 1213.648438 616.128906 L 1214.1875 615.253906 L 1214.589844 614.175781 L 1214.792969 612.964844 L 1214.929688 611.550781 L 1214.792969 610.070312 L 1214.523438 608.65625 L 1214.050781 607.445312 L 1213.378906 606.367188 L 1212.503906 605.425781 L 1211.425781 604.617188 L 1210.6875 604.28125 L 1209.878906 603.941406 L 1209.136719 603.742188 L 1208.261719 603.539062 Z M 1206.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 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 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_lp__a32oi_2.svg b/cells/a32oi/sky130_fd_sc_lp__a32oi_2.svg
index d335939..7249f38 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_2.svg
+++ b/cells/a32oi/sky130_fd_sc_lp__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 539.5 L 201.5 539.5 Z M 201.5 111.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 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="#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 355.5 651.5 L 389.5 651.5 L 389.5 844.5 L 355.5 844.5 Z M 453.5 651.5 L 487.5 651.5 L 487.5 844.5 L 453.5 844.5 Z M 650.5 651.5 L 685.5 651.5 L 685.5 844.5 L 650.5 844.5 Z M 1200.5 651.5 L 1235.5 651.5 L 1235.5 844.5 L 1200.5 844.5 Z M 1102.5 651.5 L 1136.5 651.5 L 1136.5 844.5 L 1102.5 844.5 Z M 1003.5 651.5 L 1038.5 651.5 L 1038.5 844.5 L 1003.5 844.5 Z M 905.5 651.5 L 939.5 651.5 L 939.5 844.5 L 905.5 844.5 Z M 552.5 651.5 L 586.5 651.5 L 586.5 844.5 L 552.5 844.5 Z M 1436.5 670.5 L 1471.5 670.5 L 1471.5 862.5 L 1436.5 862.5 Z M 1535.5 670.5 L 1569.5 670.5 L 1569.5 862.5 L 1535.5 862.5 Z M 1535.5 670.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 1501.5 209.5 L 1535.5 209.5 L 1535.5 498.5 L 1501.5 498.5 Z M 355.5 209.5 L 389.5 209.5 L 389.5 498.5 L 355.5 498.5 Z M 453.5 209.5 L 487.5 209.5 L 487.5 498.5 L 453.5 498.5 Z M 552.5 209.5 L 586.5 209.5 L 586.5 498.5 L 552.5 498.5 Z M 650.5 209.5 L 685.5 209.5 L 685.5 498.5 L 650.5 498.5 Z M 803.5 209.5 L 837.5 209.5 L 837.5 498.5 L 803.5 498.5 Z M 1003.5 209.5 L 1038.5 209.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1120.5 209.5 L 1154.5 209.5 L 1154.5 498.5 L 1120.5 498.5 Z M 1303.5 209.5 L 1338.5 209.5 L 1338.5 498.5 L 1303.5 498.5 Z M 1402.5 209.5 L 1436.5 209.5 L 1436.5 498.5 L 1402.5 498.5 Z M 1402.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 308.703125 530.332031 L 309.242188 525.28125 L 310.652344 521.175781 L 312.875 517.941406 L 315.90625 515.652344 L 319.742188 514.242188 L 324.457031 513.769531 L 326.609375 513.902344 L 328.695312 514.242188 L 330.648438 514.777344 L 332.398438 515.585938 L 334.015625 516.597656 L 335.5625 517.742188 L 336.773438 519.15625 L 337.851562 520.636719 L 338.660156 522.25 L 339.265625 523.933594 L 339.601562 525.820312 L 339.738281 527.773438 L 339.46875 530.53125 L 338.726562 533.089844 L 337.449219 535.445312 L 335.699219 537.667969 L 333.410156 539.753906 L 330.648438 541.574219 L 329.640625 542.179688 L 322.90625 545.8125 L 321.15625 546.824219 L 319.609375 547.832031 L 318.261719 548.84375 L 317.183594 549.851562 L 316.242188 550.863281 L 315.570312 551.875 L 315.230469 552.480469 L 314.960938 553.015625 L 314.761719 553.691406 L 314.558594 554.296875 L 314.355469 554.96875 L 314.289062 555.644531 L 339.402344 555.644531 L 339.402344 561.5 L 307.625 561.5 L 307.757812 559.144531 L 308.097656 556.988281 L 308.5 554.96875 L 309.039062 553.21875 L 309.644531 551.535156 L 310.386719 550.054688 L 311.191406 548.777344 L 312.203125 547.496094 L 313.414062 546.21875 L 314.761719 545.007812 L 316.308594 543.792969 L 318.125 542.582031 L 318.53125 542.3125 L 319.003906 542.042969 L 319.472656 541.707031 L 319.945312 541.4375 L 320.484375 541.167969 L 321.023438 540.832031 L 327.214844 537.332031 L 329.167969 536.050781 L 330.785156 534.640625 L 332.0625 533.15625 L 332.9375 531.542969 L 333.476562 529.792969 L 333.679688 527.90625 L 333.542969 526.628906 L 333.339844 525.347656 L 332.871094 524.203125 L 332.332031 523.125 L 331.523438 522.183594 L 330.648438 521.242188 L 329.707031 520.570312 L 328.765625 519.960938 L 327.6875 519.558594 L 326.609375 519.222656 L 325.464844 519.019531 L 324.253906 518.953125 L 321.628906 519.289062 L 319.40625 520.097656 L 317.589844 521.511719 L 316.242188 523.464844 L 315.300781 526.023438 L 314.761719 529.050781 L 314.695312 529.320312 L 314.695312 529.722656 L 314.625 529.925781 L 314.625 530.332031 Z M 308.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 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/a32oi/sky130_fd_sc_lp__a32oi_4.svg b/cells/a32oi/sky130_fd_sc_lp__a32oi_4.svg
index 9cade48..3dd9110 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_4.svg
+++ b/cells/a32oi/sky130_fd_sc_lp__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="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image408"/>
+  <use xlink:href="#image437"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image408"/>
+  <use xlink:href="#image437"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1595.5 620.5 L 1616.5 620.5 L 1616.5 740.5 L 1595.5 740.5 Z M 259.5 620.5 L 281.5 620.5 L 281.5 740.5 L 259.5 740.5 Z M 321.5 620.5 L 342.5 620.5 L 342.5 740.5 L 321.5 740.5 Z M 383.5 620.5 L 404.5 620.5 L 404.5 740.5 L 383.5 740.5 Z M 444.5 620.5 L 466.5 620.5 L 466.5 740.5 L 444.5 740.5 Z M 506.5 620.5 L 527.5 620.5 L 527.5 740.5 L 506.5 740.5 Z M 568.5 620.5 L 589.5 620.5 L 589.5 740.5 L 568.5 740.5 Z M 629.5 620.5 L 651.5 620.5 L 651.5 740.5 L 629.5 740.5 Z M 691.5 620.5 L 713.5 620.5 L 713.5 740.5 L 691.5 740.5 Z M 842.5 620.5 L 863.5 620.5 L 863.5 740.5 L 842.5 740.5 Z M 903.5 620.5 L 925.5 620.5 L 925.5 740.5 L 903.5 740.5 Z M 965.5 620.5 L 987.5 620.5 L 987.5 740.5 L 965.5 740.5 Z M 1027.5 620.5 L 1048.5 620.5 L 1048.5 740.5 L 1027.5 740.5 Z M 1088.5 620.5 L 1110.5 620.5 L 1110.5 740.5 L 1088.5 740.5 Z M 1150.5 620.5 L 1172.5 620.5 L 1172.5 740.5 L 1150.5 740.5 Z M 1212.5 620.5 L 1233.5 620.5 L 1233.5 740.5 L 1212.5 740.5 Z M 1274.5 620.5 L 1295.5 620.5 L 1295.5 740.5 L 1274.5 740.5 Z M 1410.5 620.5 L 1431.5 620.5 L 1431.5 740.5 L 1410.5 740.5 Z M 1472.5 620.5 L 1493.5 620.5 L 1493.5 740.5 L 1472.5 740.5 Z M 1533.5 620.5 L 1555.5 620.5 L 1555.5 740.5 L 1533.5 740.5 Z M 1533.5 620.5 "/>
 </clipPath>
-<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image409"/>
+  <use xlink:href="#image438"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1558.5 330.5 L 1579.5 330.5 L 1579.5 510.5 L 1558.5 510.5 Z M 269.5 330.5 L 291.5 330.5 L 291.5 510.5 L 269.5 510.5 Z M 331.5 330.5 L 352.5 330.5 L 352.5 510.5 L 331.5 510.5 Z M 393.5 330.5 L 414.5 330.5 L 414.5 510.5 L 393.5 510.5 Z M 454.5 330.5 L 476.5 330.5 L 476.5 510.5 L 454.5 510.5 Z M 516.5 330.5 L 537.5 330.5 L 537.5 510.5 L 516.5 510.5 Z M 578.5 330.5 L 599.5 330.5 L 599.5 510.5 L 578.5 510.5 Z M 639.5 330.5 L 661.5 330.5 L 661.5 510.5 L 639.5 510.5 Z M 701.5 330.5 L 723.5 330.5 L 723.5 510.5 L 701.5 510.5 Z M 779.5 330.5 L 800.5 330.5 L 800.5 510.5 L 779.5 510.5 Z M 840.5 330.5 L 862.5 330.5 L 862.5 510.5 L 840.5 510.5 Z M 902.5 330.5 L 923.5 330.5 L 923.5 510.5 L 902.5 510.5 Z M 1012.5 330.5 L 1034.5 330.5 L 1034.5 510.5 L 1012.5 510.5 Z M 1074.5 330.5 L 1096.5 330.5 L 1096.5 510.5 L 1074.5 510.5 Z M 1187.5 330.5 L 1209.5 330.5 L 1209.5 510.5 L 1187.5 510.5 Z M 1249.5 330.5 L 1271.5 330.5 L 1271.5 510.5 L 1249.5 510.5 Z M 1311.5 330.5 L 1332.5 330.5 L 1332.5 510.5 L 1311.5 510.5 Z M 1373.5 330.5 L 1394.5 330.5 L 1394.5 510.5 L 1373.5 510.5 Z M 1434.5 330.5 L 1456.5 330.5 L 1456.5 510.5 L 1434.5 510.5 Z M 1496.5 330.5 L 1517.5 330.5 L 1517.5 510.5 L 1496.5 510.5 Z M 1496.5 330.5 "/>
 </clipPath>
-<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image410"/>
+  <use xlink:href="#image439"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image440" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image411"/>
+  <use xlink:href="#image440"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface405">
+<g id="surface434">
 <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 448.625 584.019531 L 448.960938 580.863281 L 449.847656 578.296875 L 451.234375 576.277344 L 453.128906 574.847656 L 455.527344 573.960938 L 458.472656 573.667969 L 459.820312 573.753906 L 461.121094 573.960938 L 462.34375 574.300781 L 463.4375 574.804688 L 464.445312 575.433594 L 465.414062 576.152344 L 466.171875 577.035156 L 466.84375 577.960938 L 467.351562 578.96875 L 467.730469 580.023438 L 467.9375 581.199219 L 468.023438 582.421875 L 467.855469 584.144531 L 467.390625 585.742188 L 466.59375 587.214844 L 465.5 588.605469 L 464.066406 589.910156 L 462.34375 591.046875 L 461.710938 591.425781 L 457.503906 593.695312 L 456.410156 594.328125 L 455.441406 594.957031 L 454.601562 595.589844 L 453.929688 596.222656 L 453.339844 596.851562 L 452.917969 597.484375 L 452.707031 597.863281 L 452.539062 598.199219 L 452.414062 598.621094 L 452.285156 598.996094 L 452.160156 599.417969 L 452.117188 599.839844 L 467.8125 599.839844 L 467.8125 603.5 L 447.953125 603.5 L 448.039062 602.027344 L 448.246094 600.679688 L 448.5 599.417969 L 448.835938 598.324219 L 449.214844 597.273438 L 449.679688 596.347656 L 450.183594 595.546875 L 450.8125 594.75 L 451.570312 593.949219 L 452.414062 593.191406 L 453.378906 592.433594 L 454.515625 591.675781 L 454.769531 591.507812 L 455.0625 591.339844 L 455.359375 591.128906 L 455.652344 590.960938 L 455.988281 590.792969 L 456.324219 590.582031 L 460.195312 588.394531 L 461.417969 587.59375 L 462.425781 586.710938 L 463.226562 585.785156 L 463.773438 584.777344 L 464.109375 583.683594 L 464.234375 582.503906 L 464.152344 581.703125 L 464.027344 580.90625 L 463.730469 580.191406 L 463.394531 579.515625 L 462.890625 578.929688 L 462.34375 578.339844 L 461.753906 577.917969 L 461.164062 577.539062 L 460.492188 577.285156 L 459.820312 577.078125 L 459.101562 576.949219 L 458.347656 576.90625 L 456.703125 577.117188 L 455.316406 577.625 L 454.179688 578.507812 L 453.339844 579.726562 L 452.75 581.324219 L 452.414062 583.21875 L 452.371094 583.386719 L 452.371094 583.640625 L 452.328125 583.765625 L 452.328125 584.019531 Z M 448.625 584.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 430 503 L 454 503 M 430 479 L 454 479 M 430 479 L 430 503 M 454 479 L 454 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 430 503 L 454 503 M 430 479 L 454 479 M 454 503 L 454 479 M 430 503 L 430 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>
diff --git a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.svg b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.svg
index 430824c..1870dbb 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.svg
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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 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="#image341"/>
+  <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 1165.5 768.5 L 1199.5 768.5 L 1199.5 864.5 L 1165.5 864.5 Z M 703.5 768.5 L 737.5 768.5 L 737.5 864.5 L 703.5 864.5 Z M 792.5 768.5 L 827.5 768.5 L 827.5 864.5 L 792.5 864.5 Z M 952.5 768.5 L 986.5 768.5 L 986.5 864.5 L 952.5 864.5 Z M 1075.5 768.5 L 1110.5 768.5 L 1110.5 864.5 L 1075.5 864.5 Z M 1075.5 768.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1192.5 220.5 L 1250.5 220.5 L 1250.5 449.5 L 1192.5 449.5 Z M 706.5 220.5 L 764.5 220.5 L 764.5 449.5 L 706.5 449.5 Z M 828.5 220.5 L 885.5 220.5 L 885.5 449.5 L 828.5 449.5 Z M 949.5 220.5 L 1007.5 220.5 L 1007.5 449.5 L 949.5 449.5 Z M 1071.5 220.5 L 1128.5 220.5 L 1128.5 449.5 L 1071.5 449.5 Z M 1071.5 220.5 "/>
 </clipPath>
-<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface338">
+<g id="surface366">
 <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 636.554688 542.246094 L 636.554688 561.5 L 630.292969 561.5 L 630.292969 542.246094 L 611.375 512.421875 L 619.117188 512.421875 L 633.523438 536.320312 L 647.527344 512.421875 L 655 512.421875 Z M 636.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 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/a32oi/sky130_fd_sc_lp__a32oi_m.svg b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.svg
index beebec2..72cdbf4 100644
--- a/cells/a32oi/sky130_fd_sc_lp__a32oi_m.svg
+++ b/cells/a32oi/sky130_fd_sc_lp__a32oi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image442" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image414"/>
+  <use xlink:href="#image442"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image414"/>
+  <use xlink:href="#image442"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1114.5 768.5 L 1149.5 768.5 L 1149.5 864.5 L 1114.5 864.5 Z M 717.5 768.5 L 751.5 768.5 L 751.5 864.5 L 717.5 864.5 Z M 799.5 768.5 L 834.5 768.5 L 834.5 864.5 L 799.5 864.5 Z M 908.5 768.5 L 942.5 768.5 L 942.5 864.5 L 908.5 864.5 Z M 1032.5 768.5 L 1066.5 768.5 L 1066.5 864.5 L 1032.5 864.5 Z M 1032.5 768.5 "/>
 </clipPath>
-<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image443" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image415"/>
+  <use xlink:href="#image443"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1133.5 249.5 L 1167.5 249.5 L 1167.5 345.5 L 1133.5 345.5 Z M 702.5 249.5 L 736.5 249.5 L 736.5 345.5 L 702.5 345.5 Z M 800.5 249.5 L 835.5 249.5 L 835.5 345.5 L 800.5 345.5 Z M 917.5 249.5 L 952.5 249.5 L 952.5 345.5 L 917.5 345.5 Z M 1034.5 249.5 L 1068.5 249.5 L 1068.5 345.5 L 1034.5 345.5 Z M 1034.5 249.5 "/>
 </clipPath>
-<image id="image416" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image444" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image416"/>
+  <use xlink:href="#image444"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image445" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image417"/>
+  <use xlink:href="#image445"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface411">
+<g id="surface439">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 746.554688 712.246094 L 746.554688 731.5 L 740.292969 731.5 L 740.292969 712.246094 L 721.375 682.421875 L 729.117188 682.421875 L 743.523438 706.320312 L 757.527344 682.421875 L 765 682.421875 Z M 746.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 722 392 L 761 392 M 722 353 L 761 353 M 722 353 L 722 392 M 761 353 L 761 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 722 392 L 761 392 M 722 353 L 761 353 M 761 392 L 761 353 M 722 392 L 722 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/a41o/sky130_fd_sc_lp__a41o_0.svg b/cells/a41o/sky130_fd_sc_lp__a41o_0.svg
index 67dd82d..5d5b6f2 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_0.svg
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="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="#image376"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1217.5 768.5 L 1252.5 768.5 L 1252.5 864.5 L 1217.5 864.5 Z M 654.5 768.5 L 688.5 768.5 L 688.5 864.5 L 654.5 864.5 Z M 752.5 768.5 L 787.5 768.5 L 787.5 864.5 L 752.5 864.5 Z M 929.5 768.5 L 963.5 768.5 L 963.5 864.5 L 929.5 864.5 Z M 1034.5 768.5 L 1068.5 768.5 L 1068.5 864.5 L 1034.5 864.5 Z M 1135.5 768.5 L 1169.5 768.5 L 1169.5 864.5 L 1135.5 864.5 Z M 1135.5 768.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 614.5 220.5 L 648.5 220.5 L 648.5 367.5 L 614.5 367.5 Z M 1255.5 229.5 L 1290.5 229.5 L 1290.5 376.5 L 1255.5 376.5 Z M 1151.5 229.5 L 1185.5 229.5 L 1185.5 376.5 L 1151.5 376.5 Z M 1052.5 229.5 L 1087.5 229.5 L 1087.5 376.5 L 1052.5 376.5 Z M 954.5 229.5 L 988.5 229.5 L 988.5 376.5 L 954.5 376.5 Z M 855.5 229.5 L 890.5 229.5 L 890.5 376.5 L 855.5 376.5 Z M 855.5 229.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface373">
+<g id="surface401">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -215,6 +215,5 @@
 <path style=" 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/a41o/sky130_fd_sc_lp__a41o_1.svg b/cells/a41o/sky130_fd_sc_lp__a41o_1.svg
index 60b3750..a3e63da 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_1.svg
+++ b/cells/a41o/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="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="#image376"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask1">
 <rect 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 672.5 L 1345.5 672.5 L 1345.5 864.5 L 1310.5 864.5 Z M 606.5 672.5 L 640.5 672.5 L 640.5 864.5 L 606.5 864.5 Z M 818.5 672.5 L 852.5 672.5 L 852.5 864.5 L 818.5 864.5 Z M 980.5 672.5 L 1015.5 672.5 L 1015.5 864.5 L 980.5 864.5 Z M 1063.5 672.5 L 1097.5 672.5 L 1097.5 864.5 L 1063.5 864.5 Z M 1187.5 672.5 L 1221.5 672.5 L 1221.5 864.5 L 1187.5 864.5 Z M 1187.5 672.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask2">
 <rect 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 209.5 L 1345.5 209.5 L 1345.5 498.5 L 1310.5 498.5 Z M 596.5 209.5 L 631.5 209.5 L 631.5 498.5 L 596.5 498.5 Z M 829.5 209.5 L 863.5 209.5 L 863.5 498.5 L 829.5 498.5 Z M 928.5 209.5 L 962.5 209.5 L 962.5 498.5 L 928.5 498.5 Z M 1104.5 209.5 L 1138.5 209.5 L 1138.5 498.5 L 1104.5 498.5 Z M 1203.5 209.5 L 1237.5 209.5 L 1237.5 498.5 L 1203.5 498.5 Z M 1203.5 209.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface373">
+<g id="surface401">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -215,6 +215,5 @@
 <path style=" 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 612.503906 L 870.203125 612.503906 L 870.203125 608.261719 L 872.019531 608.058594 L 873.636719 607.789062 L 875.050781 607.453125 L 876.261719 607.183594 L 877.269531 606.847656 L 878.148438 606.445312 L 878.820312 606.039062 L 879.425781 605.570312 L 879.964844 605.03125 L 880.503906 604.355469 L 880.972656 603.617188 L 881.445312 602.742188 L 881.648438 602.269531 L 881.847656 601.730469 L 882.050781 601.125 L 882.320312 600.386719 L 882.523438 599.644531 L 882.792969 598.769531 L 886.695312 598.769531 L 886.695312 646.5 L 880.773438 646.5 Z M 880.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 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/a41o/sky130_fd_sc_lp__a41o_2.svg b/cells/a41o/sky130_fd_sc_lp__a41o_2.svg
index d08d05d..b605ba6 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_2.svg
+++ b/cells/a41o/sky130_fd_sc_lp__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 539.5 L 367.5 539.5 Z M 367.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 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="#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 514.5 635.5 L 548.5 635.5 L 548.5 828.5 L 514.5 828.5 Z M 612.5 635.5 L 647.5 635.5 L 647.5 828.5 L 612.5 828.5 Z M 1225.5 670.5 L 1260.5 670.5 L 1260.5 862.5 L 1225.5 862.5 Z M 1102.5 670.5 L 1136.5 670.5 L 1136.5 862.5 L 1102.5 862.5 Z M 1019.5 670.5 L 1054.5 670.5 L 1054.5 862.5 L 1019.5 862.5 Z M 895.5 670.5 L 930.5 670.5 L 930.5 862.5 L 895.5 862.5 Z M 1349.5 670.5 L 1384.5 670.5 L 1384.5 862.5 L 1349.5 862.5 Z M 1349.5 670.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 1349.5 209.5 L 1384.5 209.5 L 1384.5 498.5 L 1349.5 498.5 Z M 514.5 209.5 L 548.5 209.5 L 548.5 498.5 L 514.5 498.5 Z M 612.5 209.5 L 647.5 209.5 L 647.5 498.5 L 612.5 498.5 Z M 895.5 209.5 L 930.5 209.5 L 930.5 498.5 L 895.5 498.5 Z M 994.5 209.5 L 1028.5 209.5 L 1028.5 498.5 L 994.5 498.5 Z M 1102.5 209.5 L 1136.5 209.5 L 1136.5 498.5 L 1102.5 498.5 Z M 1251.5 209.5 L 1285.5 209.5 L 1285.5 498.5 L 1251.5 498.5 Z M 1251.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 934.773438 527.503906 L 924.203125 527.503906 L 924.203125 523.261719 L 926.019531 523.058594 L 927.636719 522.789062 L 929.050781 522.453125 L 930.261719 522.183594 L 931.269531 521.847656 L 932.148438 521.445312 L 932.820312 521.039062 L 933.425781 520.570312 L 933.964844 520.03125 L 934.503906 519.355469 L 934.972656 518.617188 L 935.445312 517.742188 L 935.648438 517.269531 L 935.847656 516.730469 L 936.050781 516.125 L 936.320312 515.386719 L 936.523438 514.644531 L 936.792969 513.769531 L 940.695312 513.769531 L 940.695312 561.5 L 934.773438 561.5 Z M 934.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 886 562 L 925 562 M 886 523 L 925 523 M 886 523 L 886 562 M 925 523 L 925 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 886 562 L 925 562 M 886 523 L 925 523 M 925 562 L 925 523 M 886 562 L 886 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/a41o/sky130_fd_sc_lp__a41o_4.svg b/cells/a41o/sky130_fd_sc_lp__a41o_4.svg
index 7a4c139..8986bc4 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_4.svg
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.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 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="#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 727.5 649.5 L 756.5 649.5 L 756.5 812.5 L 727.5 812.5 Z M 643.5 649.5 L 673.5 649.5 L 673.5 812.5 L 643.5 812.5 Z M 476.5 649.5 L 505.5 649.5 L 505.5 812.5 L 476.5 812.5 Z M 392.5 649.5 L 421.5 649.5 L 421.5 812.5 L 392.5 812.5 Z M 560.5 649.5 L 589.5 649.5 L 589.5 812.5 L 560.5 812.5 Z M 309.5 649.5 L 338.5 649.5 L 338.5 812.5 L 309.5 812.5 Z M 1432.5 651.5 L 1461.5 651.5 L 1461.5 814.5 L 1432.5 814.5 Z M 1515.5 651.5 L 1545.5 651.5 L 1545.5 814.5 L 1515.5 814.5 Z M 1599.5 651.5 L 1628.5 651.5 L 1628.5 814.5 L 1599.5 814.5 Z M 1163.5 651.5 L 1192.5 651.5 L 1192.5 814.5 L 1163.5 814.5 Z M 996.5 651.5 L 1025.5 651.5 L 1025.5 814.5 L 996.5 814.5 Z M 912.5 651.5 L 941.5 651.5 L 941.5 814.5 L 912.5 814.5 Z M 1348.5 651.5 L 1377.5 651.5 L 1377.5 814.5 L 1348.5 814.5 Z M 1079.5 651.5 L 1109.5 651.5 L 1109.5 814.5 L 1079.5 814.5 Z M 1079.5 651.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 1507.5 258.5 L 1536.5 258.5 L 1536.5 503.5 L 1507.5 503.5 Z M 309.5 258.5 L 338.5 258.5 L 338.5 503.5 L 309.5 503.5 Z M 392.5 258.5 L 421.5 258.5 L 421.5 503.5 L 392.5 503.5 Z M 476.5 258.5 L 505.5 258.5 L 505.5 503.5 L 476.5 503.5 Z M 560.5 258.5 L 589.5 258.5 L 589.5 503.5 L 560.5 503.5 Z M 745.5 258.5 L 774.5 258.5 L 774.5 503.5 L 745.5 503.5 Z M 828.5 258.5 L 857.5 258.5 L 857.5 503.5 L 828.5 503.5 Z M 912.5 258.5 L 941.5 258.5 L 941.5 503.5 L 912.5 503.5 Z M 996.5 258.5 L 1025.5 258.5 L 1025.5 503.5 L 996.5 503.5 Z M 1079.5 258.5 L 1109.5 258.5 L 1109.5 503.5 L 1079.5 503.5 Z M 1172.5 258.5 L 1201.5 258.5 L 1201.5 503.5 L 1172.5 503.5 Z M 1256.5 258.5 L 1285.5 258.5 L 1285.5 503.5 L 1256.5 503.5 Z M 1339.5 258.5 L 1368.5 258.5 L 1368.5 503.5 L 1339.5 503.5 Z M 1423.5 258.5 L 1452.5 258.5 L 1452.5 503.5 L 1423.5 503.5 Z M 1423.5 258.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 262.984375 535.992188 L 277.820312 557.5 L 271.207031 557.5 L 259.765625 540.019531 L 248.261719 557.5 L 241.765625 557.5 L 256.601562 535.992188 L 242.683594 515.578125 L 249.183594 515.578125 L 259.9375 532.027344 L 270.746094 515.578125 L 277.128906 515.578125 Z M 262.984375 535.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 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/a41o/sky130_fd_sc_lp__a41o_lp.svg b/cells/a41o/sky130_fd_sc_lp__a41o_lp.svg
index 581ba2f..d925d2f 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_lp.svg
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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 1317.5 768.5 L 1352.5 768.5 L 1352.5 864.5 L 1317.5 864.5 Z M 579.5 768.5 L 614.5 768.5 L 614.5 864.5 L 579.5 864.5 Z M 669.5 768.5 L 703.5 768.5 L 703.5 864.5 L 669.5 864.5 Z M 792.5 768.5 L 827.5 768.5 L 827.5 864.5 L 792.5 864.5 Z M 923.5 768.5 L 957.5 768.5 L 957.5 864.5 L 923.5 864.5 Z M 1054.5 768.5 L 1088.5 768.5 L 1088.5 864.5 L 1054.5 864.5 Z M 1136.5 768.5 L 1170.5 768.5 L 1170.5 864.5 L 1136.5 864.5 Z M 1235.5 768.5 L 1269.5 768.5 L 1269.5 864.5 L 1235.5 864.5 Z M 1235.5 768.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 1303.5 220.5 L 1361.5 220.5 L 1361.5 449.5 L 1303.5 449.5 Z M 563.5 220.5 L 620.5 220.5 L 620.5 449.5 L 563.5 449.5 Z M 685.5 220.5 L 742.5 220.5 L 742.5 449.5 L 685.5 449.5 Z M 806.5 220.5 L 863.5 220.5 L 863.5 449.5 L 806.5 449.5 Z M 932.5 220.5 L 989.5 220.5 L 989.5 449.5 L 932.5 449.5 Z M 1054.5 220.5 L 1111.5 220.5 L 1111.5 449.5 L 1054.5 449.5 Z M 1054.5 220.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 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 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_lp__a41o_m.svg b/cells/a41o/sky130_fd_sc_lp__a41o_m.svg
index 51b9d93..f0da908 100644
--- a/cells/a41o/sky130_fd_sc_lp__a41o_m.svg
+++ b/cells/a41o/sky130_fd_sc_lp__a41o_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image413" 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="#image413"/>
+  <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 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="#image413"/>
+  <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 1201.5 768.5 L 1236.5 768.5 L 1236.5 864.5 L 1201.5 864.5 Z M 662.5 768.5 L 696.5 768.5 L 696.5 864.5 L 662.5 864.5 Z M 760.5 768.5 L 795.5 768.5 L 795.5 864.5 L 760.5 864.5 Z M 871.5 768.5 L 906.5 768.5 L 906.5 864.5 L 871.5 864.5 Z M 995.5 768.5 L 1030.5 768.5 L 1030.5 864.5 L 995.5 864.5 Z M 1119.5 768.5 L 1153.5 768.5 L 1153.5 864.5 L 1119.5 864.5 Z M 1119.5 768.5 "/>
 </clipPath>
-<image id="image414" 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="#image414"/>
+  <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 614.5 209.5 L 648.5 209.5 L 648.5 305.5 L 614.5 305.5 Z M 1225.5 240.5 L 1260.5 240.5 L 1260.5 336.5 L 1225.5 336.5 Z M 1127.5 240.5 L 1161.5 240.5 L 1161.5 336.5 L 1127.5 336.5 Z M 1028.5 240.5 L 1063.5 240.5 L 1063.5 336.5 L 1028.5 336.5 Z M 930.5 240.5 L 964.5 240.5 L 964.5 336.5 L 930.5 336.5 Z M 831.5 240.5 L 866.5 240.5 L 866.5 336.5 L 831.5 336.5 Z M 831.5 240.5 "/>
 </clipPath>
-<image id="image415" 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="#image415"/>
+  <use xlink:href="#image443"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image416" 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="#image416"/>
+  <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="surface410">
+<g id="surface438">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -239,6 +239,5 @@
 <path style=" 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/a41oi/sky130_fd_sc_lp__a41oi_0.svg b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.svg
index c042540..b43d888 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_0.svg
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1170.5 768.5 L 1205.5 768.5 L 1205.5 864.5 L 1170.5 864.5 Z M 689.5 768.5 L 724.5 768.5 L 724.5 864.5 L 689.5 864.5 Z M 806.5 768.5 L 840.5 768.5 L 840.5 864.5 L 806.5 864.5 Z M 909.5 768.5 L 944.5 768.5 L 944.5 864.5 L 909.5 864.5 Z M 1040.5 768.5 L 1074.5 768.5 L 1074.5 864.5 L 1040.5 864.5 Z M 1040.5 768.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1138.5 223.5 L 1173.5 223.5 L 1173.5 369.5 L 1138.5 369.5 Z M 744.5 223.5 L 779.5 223.5 L 779.5 369.5 L 744.5 369.5 Z M 843.5 223.5 L 877.5 223.5 L 877.5 369.5 L 843.5 369.5 Z M 941.5 223.5 L 976.5 223.5 L 976.5 369.5 L 941.5 369.5 Z M 1040.5 223.5 L 1074.5 223.5 L 1074.5 369.5 L 1040.5 369.5 Z M 1040.5 223.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface365">
+<g id="surface393">
 <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 1319.351562 550.054688 L 1299.222656 550.054688 L 1299.222656 543.792969 L 1320.898438 513.769531 L 1325.273438 513.769531 L 1325.273438 544.738281 L 1332.34375 544.738281 L 1332.34375 550.054688 L 1325.273438 550.054688 L 1325.273438 561.5 L 1319.351562 561.5 Z M 1319.351562 544.738281 L 1319.351562 523.867188 L 1304.40625 544.738281 Z M 1319.351562 544.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 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/a41oi/sky130_fd_sc_lp__a41oi_1.svg b/cells/a41oi/sky130_fd_sc_lp__a41oi_1.svg
index 411f65f..8b306d5 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_1.svg
+++ b/cells/a41oi/sky130_fd_sc_lp__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 539.5 L 533.5 539.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="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 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="#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 1221.5 672.5 L 1255.5 672.5 L 1255.5 864.5 L 1221.5 864.5 Z M 689.5 672.5 L 724.5 672.5 L 724.5 864.5 L 689.5 864.5 Z M 891.5 672.5 L 925.5 672.5 L 925.5 864.5 L 891.5 864.5 Z M 989.5 672.5 L 1024.5 672.5 L 1024.5 864.5 L 989.5 864.5 Z M 1120.5 672.5 L 1154.5 672.5 L 1154.5 864.5 L 1120.5 864.5 Z M 1120.5 672.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 1221.5 209.5 L 1255.5 209.5 L 1255.5 498.5 L 1221.5 498.5 Z M 689.5 209.5 L 724.5 209.5 L 724.5 498.5 L 689.5 498.5 Z M 800.5 209.5 L 835.5 209.5 L 835.5 498.5 L 800.5 498.5 Z M 1015.5 209.5 L 1049.5 209.5 L 1049.5 498.5 L 1015.5 498.5 Z M 1113.5 209.5 L 1148.5 209.5 L 1148.5 498.5 L 1113.5 498.5 Z M 1113.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 744.699219 540.269531 L 744.699219 551.5 L 741.046875 551.5 L 741.046875 540.269531 L 730.011719 522.871094 L 734.527344 522.871094 L 742.929688 536.8125 L 751.097656 522.871094 L 755.457031 522.871094 Z M 744.699219 540.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 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 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_lp__a41oi_2.svg b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.svg
index 871c891..b7f8ffd 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_2.svg
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 539.5 L 201.5 539.5 Z M 201.5 111.5 "/>
 </clipPath>
-<image id="image339" 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="#image339"/>
+  <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 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="#image339"/>
+  <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 1323.5 647.5 L 1357.5 647.5 L 1357.5 839.5 L 1323.5 839.5 Z M 1421.5 647.5 L 1456.5 647.5 L 1456.5 839.5 L 1421.5 839.5 Z M 773.5 647.5 L 807.5 647.5 L 807.5 839.5 L 773.5 839.5 Z M 1520.5 647.5 L 1554.5 647.5 L 1554.5 839.5 L 1520.5 839.5 Z M 1224.5 647.5 L 1259.5 647.5 L 1259.5 839.5 L 1224.5 839.5 Z M 970.5 647.5 L 1004.5 647.5 L 1004.5 839.5 L 970.5 839.5 Z M 871.5 647.5 L 906.5 647.5 L 906.5 839.5 L 871.5 839.5 Z M 674.5 647.5 L 709.5 647.5 L 709.5 839.5 L 674.5 839.5 Z M 452.5 672.5 L 486.5 672.5 L 486.5 864.5 L 452.5 864.5 Z M 353.5 672.5 L 388.5 672.5 L 388.5 864.5 L 353.5 864.5 Z M 353.5 672.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1520.5 209.5 L 1554.5 209.5 L 1554.5 498.5 L 1520.5 498.5 Z M 423.5 209.5 L 458.5 209.5 L 458.5 498.5 L 423.5 498.5 Z M 522.5 209.5 L 556.5 209.5 L 556.5 498.5 L 522.5 498.5 Z M 620.5 209.5 L 655.5 209.5 L 655.5 498.5 L 620.5 498.5 Z M 757.5 209.5 L 791.5 209.5 L 791.5 498.5 L 757.5 498.5 Z M 855.5 209.5 L 890.5 209.5 L 890.5 498.5 L 855.5 498.5 Z M 1087.5 209.5 L 1121.5 209.5 L 1121.5 498.5 L 1087.5 498.5 Z M 1185.5 209.5 L 1220.5 209.5 L 1220.5 498.5 L 1185.5 498.5 Z M 1323.5 209.5 L 1357.5 209.5 L 1357.5 498.5 L 1323.5 498.5 Z M 1421.5 209.5 L 1456.5 209.5 L 1456.5 498.5 L 1421.5 498.5 Z M 1421.5 209.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface365">
 <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 438.773438 527.503906 L 428.203125 527.503906 L 428.203125 523.261719 L 430.019531 523.058594 L 431.636719 522.789062 L 433.050781 522.453125 L 434.261719 522.183594 L 435.269531 521.847656 L 436.148438 521.445312 L 436.820312 521.039062 L 437.425781 520.570312 L 437.964844 520.03125 L 438.503906 519.355469 L 438.972656 518.617188 L 439.445312 517.742188 L 439.648438 517.269531 L 439.847656 516.730469 L 440.050781 516.125 L 440.320312 515.386719 L 440.523438 514.644531 L 440.792969 513.769531 L 444.695312 513.769531 L 444.695312 561.5 L 438.773438 561.5 Z M 438.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 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/a41oi/sky130_fd_sc_lp__a41oi_4.svg b/cells/a41oi/sky130_fd_sc_lp__a41oi_4.svg
index a1cc879..0343811 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_4.svg
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_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="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 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="#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 1597.5 607.5 L 1619.5 607.5 L 1619.5 727.5 L 1597.5 727.5 Z M 1535.5 607.5 L 1557.5 607.5 L 1557.5 727.5 L 1535.5 727.5 Z M 1412.5 607.5 L 1434.5 607.5 L 1434.5 727.5 L 1412.5 727.5 Z M 1165.5 607.5 L 1187.5 607.5 L 1187.5 727.5 L 1165.5 727.5 Z M 582.5 607.5 L 603.5 607.5 L 603.5 727.5 L 582.5 727.5 Z M 1025.5 607.5 L 1047.5 607.5 L 1047.5 727.5 L 1025.5 727.5 Z M 644.5 607.5 L 665.5 607.5 L 665.5 727.5 L 644.5 727.5 Z M 705.5 607.5 L 727.5 607.5 L 727.5 727.5 L 705.5 727.5 Z M 767.5 607.5 L 789.5 607.5 L 789.5 727.5 L 767.5 727.5 Z M 840.5 607.5 L 862.5 607.5 L 862.5 727.5 L 840.5 727.5 Z M 902.5 607.5 L 923.5 607.5 L 923.5 727.5 L 902.5 727.5 Z M 1350.5 607.5 L 1372.5 607.5 L 1372.5 727.5 L 1350.5 727.5 Z M 964.5 607.5 L 985.5 607.5 L 985.5 727.5 L 964.5 727.5 Z M 1474.5 607.5 L 1495.5 607.5 L 1495.5 727.5 L 1474.5 727.5 Z M 1227.5 607.5 L 1248.5 607.5 L 1248.5 727.5 L 1227.5 727.5 Z M 1289.5 607.5 L 1310.5 607.5 L 1310.5 727.5 L 1289.5 727.5 Z M 258.5 620.5 L 280.5 620.5 L 280.5 740.5 L 258.5 740.5 Z M 444.5 620.5 L 465.5 620.5 L 465.5 740.5 L 444.5 740.5 Z M 320.5 620.5 L 342.5 620.5 L 342.5 740.5 L 320.5 740.5 Z M 382.5 620.5 L 403.5 620.5 L 403.5 740.5 L 382.5 740.5 Z M 382.5 620.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 1595.5 330.5 L 1616.5 330.5 L 1616.5 510.5 L 1595.5 510.5 Z M 261.5 330.5 L 282.5 330.5 L 282.5 510.5 L 261.5 510.5 Z M 322.5 330.5 L 344.5 330.5 L 344.5 510.5 L 322.5 510.5 Z M 384.5 330.5 L 405.5 330.5 L 405.5 510.5 L 384.5 510.5 Z M 446.5 330.5 L 467.5 330.5 L 467.5 510.5 L 446.5 510.5 Z M 507.5 330.5 L 529.5 330.5 L 529.5 510.5 L 507.5 510.5 Z M 572.5 330.5 L 593.5 330.5 L 593.5 510.5 L 572.5 510.5 Z M 634.5 330.5 L 655.5 330.5 L 655.5 510.5 L 634.5 510.5 Z M 757.5 330.5 L 779.5 330.5 L 779.5 510.5 L 757.5 510.5 Z M 819.5 330.5 L 840.5 330.5 L 840.5 510.5 L 819.5 510.5 Z M 880.5 330.5 L 902.5 330.5 L 902.5 510.5 L 880.5 510.5 Z M 942.5 330.5 L 964.5 330.5 L 964.5 510.5 L 942.5 510.5 Z M 1027.5 330.5 L 1048.5 330.5 L 1048.5 510.5 L 1027.5 510.5 Z M 1088.5 330.5 L 1110.5 330.5 L 1110.5 510.5 L 1088.5 510.5 Z M 1150.5 330.5 L 1172.5 330.5 L 1172.5 510.5 L 1150.5 510.5 Z M 1212.5 330.5 L 1233.5 330.5 L 1233.5 510.5 L 1212.5 510.5 Z M 1348.5 330.5 L 1370.5 330.5 L 1370.5 510.5 L 1348.5 510.5 Z M 1410.5 330.5 L 1431.5 330.5 L 1431.5 510.5 L 1410.5 510.5 Z M 1472.5 330.5 L 1493.5 330.5 L 1493.5 510.5 L 1472.5 510.5 Z M 1533.5 330.5 L 1555.5 330.5 L 1555.5 510.5 L 1533.5 510.5 Z M 1533.5 330.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 460.421875 582.25 L 453.8125 582.25 L 453.8125 579.601562 L 454.949219 579.476562 L 455.960938 579.304688 L 456.84375 579.097656 L 457.601562 578.929688 L 458.230469 578.71875 L 458.777344 578.464844 L 459.199219 578.210938 L 459.578125 577.917969 L 459.914062 577.582031 L 460.25 577.160156 L 460.546875 576.699219 L 460.839844 576.152344 L 460.96875 575.855469 L 461.09375 575.519531 L 461.21875 575.140625 L 461.386719 574.679688 L 461.515625 574.214844 L 461.683594 573.667969 L 464.121094 573.667969 L 464.121094 603.5 L 460.421875 603.5 Z M 460.421875 582.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 430 503 L 454 503 M 430 479 L 454 479 M 430 479 L 430 503 M 454 479 L 454 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 430 503 L 454 503 M 430 479 L 454 479 M 454 503 L 454 479 M 430 503 L 430 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>
diff --git a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.svg b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.svg
index c8f46d7..977c9b4 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.svg
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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 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="#image341"/>
+  <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 1214.5 768.5 L 1248.5 768.5 L 1248.5 864.5 L 1214.5 864.5 Z M 737.5 768.5 L 772.5 768.5 L 772.5 864.5 L 737.5 864.5 Z M 827.5 768.5 L 861.5 768.5 L 861.5 864.5 L 827.5 864.5 Z M 916.5 768.5 L 950.5 768.5 L 950.5 864.5 L 916.5 864.5 Z M 1033.5 768.5 L 1067.5 768.5 L 1067.5 864.5 L 1033.5 864.5 Z M 1132.5 768.5 L 1166.5 768.5 L 1166.5 864.5 L 1132.5 864.5 Z M 1132.5 768.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect 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 220.5 L 1221.5 220.5 L 1221.5 449.5 L 1164.5 449.5 Z M 673.5 220.5 L 730.5 220.5 L 730.5 449.5 L 673.5 449.5 Z M 795.5 220.5 L 852.5 220.5 L 852.5 449.5 L 795.5 449.5 Z M 916.5 220.5 L 973.5 220.5 L 973.5 449.5 L 916.5 449.5 Z M 1042.5 220.5 L 1099.5 220.5 L 1099.5 449.5 L 1042.5 449.5 Z M 1042.5 220.5 "/>
 </clipPath>
-<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface338">
+<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 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/a41oi/sky130_fd_sc_lp__a41oi_m.svg b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.svg
index 47e6fde..e051189 100644
--- a/cells/a41oi/sky130_fd_sc_lp__a41oi_m.svg
+++ b/cells/a41oi/sky130_fd_sc_lp__a41oi_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.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 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="#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 1159.5 768.5 L 1193.5 768.5 L 1193.5 864.5 L 1159.5 864.5 Z M 788.5 768.5 L 822.5 768.5 L 822.5 864.5 L 788.5 864.5 Z M 886.5 768.5 L 921.5 768.5 L 921.5 864.5 L 886.5 864.5 Z M 969.5 768.5 L 1003.5 768.5 L 1003.5 864.5 L 969.5 864.5 Z M 1077.5 768.5 L 1111.5 768.5 L 1111.5 864.5 L 1077.5 864.5 Z M 1077.5 768.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 1150.5 213.5 L 1184.5 213.5 L 1184.5 310.5 L 1150.5 310.5 Z M 756.5 213.5 L 790.5 213.5 L 790.5 310.5 L 756.5 310.5 Z M 854.5 213.5 L 889.5 213.5 L 889.5 310.5 L 854.5 310.5 Z M 953.5 213.5 L 987.5 213.5 L 987.5 310.5 L 953.5 310.5 Z M 1051.5 213.5 L 1086.5 213.5 L 1086.5 310.5 L 1051.5 310.5 Z M 1051.5 213.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 636.554688 288.246094 L 636.554688 307.5 L 630.292969 307.5 L 630.292969 288.246094 L 611.375 258.421875 L 619.117188 258.421875 L 633.523438 282.320312 L 647.527344 258.421875 L 655 258.421875 Z M 636.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 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/and2/sky130_fd_sc_lp__and2_0.svg b/cells/and2/sky130_fd_sc_lp__and2_0.svg
index 2ed1e4b..dc5afb0 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_0.svg
+++ b/cells/and2/sky130_fd_sc_lp__and2_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1002.5 768.5 L 1036.5 768.5 L 1036.5 864.5 L 1002.5 864.5 Z M 821.5 768.5 L 855.5 768.5 L 855.5 864.5 L 821.5 864.5 Z M 903.5 768.5 L 938.5 768.5 L 938.5 864.5 L 903.5 864.5 Z M 903.5 768.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1096.5 223.5 L 1130.5 223.5 L 1130.5 369.5 L 1096.5 369.5 Z M 821.5 273.5 L 855.5 273.5 L 855.5 369.5 L 821.5 369.5 Z M 920.5 273.5 L 954.5 273.5 L 954.5 369.5 L 920.5 369.5 Z M 920.5 273.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface301">
+<g id="surface329">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1187.824219 706.320312 L 1205.191406 731.5 L 1197.449219 731.5 L 1184.050781 711.035156 L 1170.589844 731.5 L 1162.980469 731.5 L 1180.351562 706.320312 L 1164.058594 682.421875 L 1171.664062 682.421875 L 1184.253906 701.675781 L 1196.910156 682.421875 L 1204.382812 682.421875 Z M 1187.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 1164 392 L 1203 392 M 1164 353 L 1203 353 M 1164 353 L 1164 392 M 1203 353 L 1203 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 1164 392 L 1203 392 M 1164 353 L 1203 353 M 1203 392 L 1203 353 M 1164 392 L 1164 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 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_lp__and2_1.svg b/cells/and2/sky130_fd_sc_lp__and2_1.svg
index a80ef3b..e521f7f 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_1.svg
+++ b/cells/and2/sky130_fd_sc_lp__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 539.5 L 644.5 539.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 937.5 672.5 L 971.5 672.5 L 971.5 768.5 L 937.5 768.5 Z M 854.5 672.5 L 889.5 672.5 L 889.5 768.5 L 854.5 768.5 Z M 1060.5 672.5 L 1095.5 672.5 L 1095.5 864.5 L 1060.5 864.5 Z M 1060.5 672.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 978.5 384.5 L 1012.5 384.5 L 1012.5 480.5 L 978.5 480.5 Z M 854.5 384.5 L 889.5 384.5 L 889.5 480.5 L 854.5 480.5 Z M 1112.5 209.5 L 1146.5 209.5 L 1146.5 498.5 L 1112.5 498.5 Z M 1112.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 863.410156 546.757812 L 844.492188 546.757812 L 839.308594 561.5 L 832.644531 561.5 L 850.148438 512.421875 L 858.226562 512.421875 L 875.460938 561.5 L 868.460938 561.5 Z M 861.660156 541.503906 L 854.121094 519.15625 L 846.042969 541.503906 Z M 861.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 834 562 L 873 562 M 834 523 L 873 523 M 834 523 L 834 562 M 873 523 L 873 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 834 562 L 873 562 M 834 523 L 873 523 M 873 562 L 873 523 M 834 562 L 834 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/and2/sky130_fd_sc_lp__and2_2.svg b/cells/and2/sky130_fd_sc_lp__and2_2.svg
index 2973cfa..9b398e8 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_2.svg
+++ b/cells/and2/sky130_fd_sc_lp__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 539.5 L 644.5 539.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 1103.5 672.5 L 1137.5 672.5 L 1137.5 864.5 L 1103.5 864.5 Z M 801.5 768.5 L 836.5 768.5 L 836.5 864.5 L 801.5 864.5 Z M 884.5 768.5 L 918.5 768.5 L 918.5 864.5 L 884.5 864.5 Z M 1004.5 672.5 L 1039.5 672.5 L 1039.5 864.5 L 1004.5 864.5 Z M 1004.5 672.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 884.5 367.5 L 918.5 367.5 L 918.5 463.5 L 884.5 463.5 Z M 785.5 367.5 L 820.5 367.5 L 820.5 463.5 L 785.5 463.5 Z M 1103.5 209.5 L 1137.5 209.5 L 1137.5 498.5 L 1103.5 498.5 Z M 1004.5 209.5 L 1039.5 209.5 L 1039.5 498.5 L 1004.5 498.5 Z M 1004.5 209.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -152,6 +152,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 874.441406 632.496094 L 874.304688 634.652344 L 873.96875 636.605469 L 873.363281 638.421875 L 872.554688 640.039062 L 871.480469 641.585938 L 870.199219 642.933594 L 868.785156 644.078125 L 867.304688 644.953125 L 865.621094 645.625 L 863.871094 646.164062 L 861.988281 646.433594 L 859.96875 646.5 L 837.820312 646.5 L 837.820312 597.421875 L 857.746094 597.421875 L 860.640625 597.625 L 863.199219 598.097656 L 865.488281 598.902344 L 867.441406 600.046875 L 869.121094 601.53125 L 870.46875 603.347656 L 871.007812 604.355469 L 871.480469 605.433594 L 871.816406 606.445312 L 872.085938 607.589844 L 872.21875 608.734375 L 872.285156 609.878906 L 872.085938 612.300781 L 871.480469 614.386719 L 870.535156 616.339844 L 869.191406 617.957031 L 867.507812 619.4375 L 865.488281 620.582031 L 867.441406 621.457031 L 869.121094 622.398438 L 870.605469 623.476562 L 871.816406 624.6875 L 872.757812 625.96875 L 873.5 627.3125 L 873.769531 628.121094 L 873.96875 628.929688 L 874.171875 629.738281 L 874.304688 630.679688 L 874.375 631.554688 Z M 866.027344 610.753906 L 865.824219 608.734375 L 865.21875 607.050781 L 864.277344 605.570312 L 862.929688 604.492188 L 861.246094 603.683594 L 859.160156 603.144531 L 858.6875 603.144531 L 858.214844 603.078125 L 857.746094 603.011719 L 856.667969 603.011719 L 856.195312 602.941406 L 844.078125 602.941406 L 844.078125 618.5625 L 856.195312 618.5625 L 858.6875 618.425781 L 860.84375 618.023438 L 862.660156 617.28125 L 864.007812 616.273438 L 865.082031 614.925781 L 865.757812 613.3125 L 865.824219 612.972656 L 865.957031 612.167969 L 865.957031 611.222656 Z M 859.359375 640.980469 L 861.246094 640.914062 L 862.929688 640.507812 L 864.410156 639.835938 L 865.621094 638.960938 L 866.632812 637.816406 L 867.441406 636.402344 L 867.640625 635.863281 L 867.777344 635.257812 L 867.976562 634.585938 L 868.046875 633.976562 L 868.113281 633.304688 L 868.179688 632.566406 L 868.046875 631.082031 L 867.777344 629.667969 L 867.304688 628.457031 L 866.632812 627.3125 L 865.757812 626.371094 L 864.746094 625.496094 L 864.007812 625.09375 L 863.199219 624.753906 L 862.324219 624.484375 L 861.378906 624.285156 L 860.371094 624.148438 L 859.359375 624.082031 L 844.078125 624.082031 L 844.078125 640.980469 Z M 859.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 834 477 L 873 477 M 834 438 L 873 438 M 834 438 L 834 477 M 873 438 L 873 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 834 477 L 873 477 M 834 438 L 873 438 M 873 477 L 873 438 M 834 477 L 834 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/and2/sky130_fd_sc_lp__and2_4.svg b/cells/and2/sky130_fd_sc_lp__and2_4.svg
index 2457253..bdecf35 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_4.svg
+++ b/cells/and2/sky130_fd_sc_lp__and2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 1178.5 672.5 L 1213.5 672.5 L 1213.5 864.5 L 1178.5 864.5 Z M 669.5 672.5 L 703.5 672.5 L 703.5 864.5 L 669.5 864.5 Z M 751.5 672.5 L 785.5 672.5 L 785.5 864.5 L 751.5 864.5 Z M 883.5 672.5 L 917.5 672.5 L 917.5 864.5 L 883.5 864.5 Z M 981.5 672.5 L 1016.5 672.5 L 1016.5 864.5 L 981.5 864.5 Z M 1080.5 672.5 L 1114.5 672.5 L 1114.5 864.5 L 1080.5 864.5 Z M 1080.5 672.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 1178.5 209.5 L 1213.5 209.5 L 1213.5 498.5 L 1178.5 498.5 Z M 669.5 209.5 L 703.5 209.5 L 703.5 498.5 L 669.5 498.5 Z M 767.5 209.5 L 801.5 209.5 L 801.5 498.5 L 767.5 498.5 Z M 883.5 209.5 L 917.5 209.5 L 917.5 498.5 L 883.5 498.5 Z M 981.5 209.5 L 1016.5 209.5 L 1016.5 498.5 L 981.5 498.5 Z M 1080.5 209.5 L 1114.5 209.5 L 1114.5 498.5 L 1080.5 498.5 Z M 1080.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -146,6 +146,5 @@
 <path style=" 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 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/and2/sky130_fd_sc_lp__and2_lp.svg b/cells/and2/sky130_fd_sc_lp__and2_lp.svg
index 074d554..aa0ac6a 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp.svg
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 745.5 623.5 L 780.5 623.5 L 780.5 719.5 L 745.5 719.5 Z M 835.5 623.5 L 869.5 623.5 L 869.5 719.5 L 835.5 719.5 Z M 1109.5 716.5 L 1143.5 716.5 L 1143.5 813.5 L 1109.5 813.5 Z M 1198.5 716.5 L 1232.5 716.5 L 1232.5 813.5 L 1198.5 813.5 Z M 1198.5 716.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 1149.5 286.5 L 1183.5 286.5 L 1183.5 382.5 L 1149.5 382.5 Z M 704.5 286.5 L 738.5 286.5 L 738.5 382.5 L 704.5 382.5 Z M 787.5 286.5 L 821.5 286.5 L 821.5 382.5 L 787.5 382.5 Z M 885.5 286.5 L 920.5 286.5 L 920.5 382.5 L 885.5 382.5 Z M 968.5 286.5 L 1002.5 286.5 L 1002.5 382.5 L 968.5 382.5 Z M 1066.5 286.5 L 1101.5 286.5 L 1101.5 382.5 L 1066.5 382.5 Z M 1066.5 286.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/and2/sky130_fd_sc_lp__and2_lp2.svg b/cells/and2/sky130_fd_sc_lp__and2_lp2.svg
index 11ffff0..a8709fa 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_lp2.svg
+++ b/cells/and2/sky130_fd_sc_lp__and2_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.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 1072.5 768.5 L 1106.5 768.5 L 1106.5 864.5 L 1072.5 864.5 Z M 801.5 768.5 L 836.5 768.5 L 836.5 864.5 L 801.5 864.5 Z M 884.5 768.5 L 918.5 768.5 L 918.5 864.5 L 884.5 864.5 Z M 983.5 768.5 L 1017.5 768.5 L 1017.5 864.5 L 983.5 864.5 Z M 983.5 768.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 1072.5 220.5 L 1129.5 220.5 L 1129.5 449.5 L 1072.5 449.5 Z M 822.5 220.5 L 879.5 220.5 L 879.5 449.5 L 822.5 449.5 Z M 944.5 220.5 L 1001.5 220.5 L 1001.5 449.5 L 944.5 449.5 Z M 944.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 747.824219 282.320312 L 765.191406 307.5 L 757.449219 307.5 L 744.050781 287.035156 L 730.589844 307.5 L 722.980469 307.5 L 740.351562 282.320312 L 724.058594 258.421875 L 731.664062 258.421875 L 744.253906 277.675781 L 756.910156 258.421875 L 764.382812 258.421875 Z M 747.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 724 816 L 763 816 M 724 777 L 763 777 M 724 777 L 724 816 M 763 777 L 763 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 724 816 L 763 816 M 724 777 L 763 777 M 763 816 L 763 777 M 724 816 L 724 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_lp__and2_m.svg b/cells/and2/sky130_fd_sc_lp__and2_m.svg
index 93d4435..d19c930 100644
--- a/cells/and2/sky130_fd_sc_lp__and2_m.svg
+++ b/cells/and2/sky130_fd_sc_lp__and2_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1058.5 660.5 L 1093.5 660.5 L 1093.5 757.5 L 1058.5 757.5 Z M 844.5 660.5 L 878.5 660.5 L 878.5 757.5 L 844.5 757.5 Z M 926.5 660.5 L 961.5 660.5 L 961.5 757.5 L 926.5 757.5 Z M 926.5 660.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1058.5 367.5 L 1093.5 367.5 L 1093.5 463.5 L 1058.5 463.5 Z M 861.5 367.5 L 895.5 367.5 L 895.5 463.5 L 861.5 463.5 Z M 960.5 367.5 L 994.5 367.5 L 994.5 463.5 L 960.5 463.5 Z M 960.5 367.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/and2b/sky130_fd_sc_lp__and2b_1.svg b/cells/and2b/sky130_fd_sc_lp__and2b_1.svg
index d766f26..58a6211 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_1.svg
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 942.5 672.5 L 977.5 672.5 L 977.5 768.5 L 942.5 768.5 Z M 1025.5 672.5 L 1059.5 672.5 L 1059.5 768.5 L 1025.5 768.5 Z M 1159.5 672.5 L 1193.5 672.5 L 1193.5 864.5 L 1159.5 864.5 Z M 725.5 768.5 L 759.5 768.5 L 759.5 864.5 L 725.5 864.5 Z M 725.5 768.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 1153.5 209.5 L 1188.5 209.5 L 1188.5 498.5 L 1153.5 498.5 Z M 761.5 401.5 L 796.5 401.5 L 796.5 498.5 L 761.5 498.5 Z M 1025.5 401.5 L 1059.5 401.5 L 1059.5 498.5 L 1025.5 498.5 Z M 898.5 401.5 L 932.5 401.5 L 932.5 498.5 L 898.5 498.5 Z M 898.5 401.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 862.1875 681.574219 L 862.1875 730.652344 L 855.121094 730.652344 L 829.738281 690.863281 L 829.738281 730.652344 L 823.816406 730.652344 L 823.816406 681.574219 L 830.613281 681.574219 L 856.265625 721.699219 L 856.265625 681.574219 Z M 862.1875 681.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 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/and2b/sky130_fd_sc_lp__and2b_2.svg b/cells/and2b/sky130_fd_sc_lp__and2b_2.svg
index 8f28de7..c7e611e 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_2.svg
+++ b/cells/and2b/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1146.5 670.5 L 1181.5 670.5 L 1181.5 766.5 L 1146.5 766.5 Z M 695.5 670.5 L 729.5 670.5 L 729.5 766.5 L 695.5 766.5 Z M 1064.5 670.5 L 1098.5 670.5 L 1098.5 766.5 L 1064.5 766.5 Z M 929.5 670.5 L 963.5 670.5 L 963.5 862.5 L 929.5 862.5 Z M 830.5 670.5 L 865.5 670.5 L 865.5 862.5 L 830.5 862.5 Z M 830.5 670.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 889.5 209.5 L 923.5 209.5 L 923.5 498.5 L 889.5 498.5 Z M 1146.5 401.5 L 1181.5 401.5 L 1181.5 498.5 L 1146.5 498.5 Z M 1048.5 401.5 L 1082.5 401.5 L 1082.5 498.5 L 1048.5 498.5 Z M 670.5 401.5 L 704.5 401.5 L 704.5 498.5 L 670.5 498.5 Z M 790.5 209.5 L 824.5 209.5 L 824.5 498.5 L 790.5 498.5 Z M 790.5 209.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 856.824219 282.320312 L 874.191406 307.5 L 866.449219 307.5 L 853.050781 287.035156 L 839.589844 307.5 L 831.980469 307.5 L 849.351562 282.320312 L 833.058594 258.421875 L 840.664062 258.421875 L 853.253906 277.675781 L 865.910156 258.421875 L 873.382812 258.421875 Z M 856.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 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/and2b/sky130_fd_sc_lp__and2b_4.svg b/cells/and2b/sky130_fd_sc_lp__and2b_4.svg
index a6b2618..c4eee98 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_4.svg
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#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 646.5 670.5 L 680.5 670.5 L 680.5 766.5 L 646.5 766.5 Z M 1062.5 670.5 L 1096.5 670.5 L 1096.5 862.5 L 1062.5 862.5 Z M 766.5 670.5 L 800.5 670.5 L 800.5 862.5 L 766.5 862.5 Z M 865.5 670.5 L 899.5 670.5 L 899.5 862.5 L 865.5 862.5 Z M 963.5 670.5 L 997.5 670.5 L 997.5 862.5 L 963.5 862.5 Z M 1276.5 670.5 L 1310.5 670.5 L 1310.5 862.5 L 1276.5 862.5 Z M 1193.5 670.5 L 1228.5 670.5 L 1228.5 862.5 L 1193.5 862.5 Z M 1193.5 670.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1177.5 209.5 L 1212.5 209.5 L 1212.5 498.5 L 1177.5 498.5 Z M 632.5 401.5 L 666.5 401.5 L 666.5 498.5 L 632.5 498.5 Z M 1276.5 209.5 L 1310.5 209.5 L 1310.5 498.5 L 1276.5 498.5 Z M 1062.5 209.5 L 1096.5 209.5 L 1096.5 498.5 L 1062.5 498.5 Z M 963.5 209.5 L 997.5 209.5 L 997.5 498.5 L 963.5 498.5 Z M 865.5 209.5 L 899.5 209.5 L 899.5 498.5 L 865.5 498.5 Z M 766.5 209.5 L 800.5 209.5 L 800.5 498.5 L 766.5 498.5 Z M 766.5 209.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface333">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1021.824219 451.320312 L 1039.191406 476.5 L 1031.449219 476.5 L 1018.050781 456.035156 L 1004.589844 476.5 L 996.980469 476.5 L 1014.351562 451.320312 L 998.058594 427.421875 L 1005.664062 427.421875 L 1018.253906 446.675781 L 1030.910156 427.421875 L 1038.382812 427.421875 Z M 1021.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 997 647 L 1036 647 M 997 608 L 1036 608 M 997 608 L 997 647 M 1036 608 L 1036 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 997 647 L 1036 647 M 997 608 L 1036 608 M 1036 647 L 1036 608 M 997 647 L 997 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/and2b/sky130_fd_sc_lp__and2b_lp.svg b/cells/and2b/sky130_fd_sc_lp__and2b_lp.svg
index 31adeba..bb5d541 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_lp.svg
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 532.5 L 533.5 532.5 Z M 1143.5 532.5 L 1390.5 532.5 L 1390.5 539.5 L 1143.5 539.5 Z M 533.5 532.5 L 852.5 532.5 L 852.5 539.5 L 533.5 539.5 Z M 533.5 532.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 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="#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 1010.5 610.5 L 1044.5 610.5 L 1044.5 706.5 L 1010.5 706.5 Z M 701.5 647.5 L 735.5 647.5 L 735.5 743.5 L 701.5 743.5 Z M 901.5 647.5 L 936.5 647.5 L 936.5 743.5 L 901.5 743.5 Z M 790.5 647.5 L 824.5 647.5 L 824.5 743.5 L 790.5 743.5 Z M 1127.5 768.5 L 1161.5 768.5 L 1161.5 864.5 L 1127.5 864.5 Z M 1216.5 768.5 L 1251.5 768.5 L 1251.5 864.5 L 1216.5 864.5 Z M 1216.5 768.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 1160.5 209.5 L 1217.5 209.5 L 1217.5 438.5 L 1160.5 438.5 Z M 720.5 209.5 L 777.5 209.5 L 777.5 438.5 L 720.5 438.5 Z M 889.5 209.5 L 946.5 209.5 L 946.5 438.5 L 889.5 438.5 Z M 1010.5 209.5 L 1067.5 209.5 L 1067.5 438.5 L 1010.5 438.5 Z M 1010.5 209.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/and2b/sky130_fd_sc_lp__and2b_m.svg b/cells/and2b/sky130_fd_sc_lp__and2b_m.svg
index 4e5d7f0c..ca46d03 100644
--- a/cells/and2b/sky130_fd_sc_lp__and2b_m.svg
+++ b/cells/and2b/sky130_fd_sc_lp__and2b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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="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="#image333"/>
+  <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 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="#image333"/>
+  <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 734.5 742.5 L 768.5 742.5 L 768.5 838.5 L 734.5 838.5 Z M 1167.5 768.5 L 1201.5 768.5 L 1201.5 864.5 L 1167.5 864.5 Z M 1068.5 768.5 L 1103.5 768.5 L 1103.5 864.5 L 1068.5 864.5 Z M 986.5 768.5 L 1020.5 768.5 L 1020.5 864.5 L 986.5 864.5 Z M 986.5 768.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <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 1167.5 367.5 L 1201.5 367.5 L 1201.5 463.5 L 1167.5 463.5 Z M 782.5 367.5 L 816.5 367.5 L 816.5 463.5 L 782.5 463.5 Z M 906.5 367.5 L 940.5 367.5 L 940.5 463.5 L 906.5 463.5 Z M 1004.5 367.5 L 1039.5 367.5 L 1039.5 463.5 L 1004.5 463.5 Z M 1004.5 367.5 "/>
 </clipPath>
-<image id="image335" 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="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image336" 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="#image336"/>
+  <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="surface330">
+<g id="surface359">
 <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 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_lp__and3_0.svg b/cells/and3/sky130_fd_sc_lp__and3_0.svg
index 53c27bb..3e090ff 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_0.svg
+++ b/cells/and3/sky130_fd_sc_lp__and3_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.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 1167.5 747.5 L 1201.5 747.5 L 1201.5 844.5 L 1167.5 844.5 Z M 779.5 747.5 L 813.5 747.5 L 813.5 844.5 L 779.5 844.5 Z M 861.5 747.5 L 895.5 747.5 L 895.5 844.5 L 861.5 844.5 Z M 944.5 747.5 L 978.5 747.5 L 978.5 844.5 L 944.5 844.5 Z M 944.5 747.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 1153.5 218.5 L 1188.5 218.5 L 1188.5 365.5 L 1153.5 365.5 Z M 780.5 268.5 L 814.5 268.5 L 814.5 365.5 L 780.5 365.5 Z M 977.5 268.5 L 1011.5 268.5 L 1011.5 365.5 L 977.5 365.5 Z M 878.5 268.5 L 913.5 268.5 L 913.5 365.5 L 878.5 365.5 Z M 878.5 268.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 999.730469 452.984375 L 999.796875 450.292969 L 1000.066406 447.667969 L 1000.539062 445.175781 L 1001.144531 442.753906 L 1001.953125 440.464844 L 1003.03125 438.242188 L 1004.714844 435.347656 L 1006.800781 432.855469 L 1009.15625 430.835938 L 1011.847656 429.222656 L 1014.8125 428.078125 L 1018.175781 427.335938 L 1018.785156 427.269531 L 1019.457031 427.203125 L 1020.0625 427.132812 L 1021.410156 427.132812 L 1022.148438 427.066406 L 1026.457031 427.402344 L 1030.226562 428.414062 L 1033.460938 430.027344 L 1036.152344 432.316406 L 1038.304688 435.210938 L 1039.988281 438.78125 L 1040.394531 440.125 L 1040.59375 440.867188 L 1040.730469 441.609375 L 1040.863281 442.347656 L 1041.066406 443.089844 L 1034.671875 443.089844 L 1033.996094 440.734375 L 1033.121094 438.714844 L 1032.046875 436.960938 L 1030.632812 435.480469 L 1029.082031 434.335938 L 1027.265625 433.460938 L 1026.390625 433.191406 L 1025.449219 432.992188 L 1024.503906 432.855469 L 1023.496094 432.722656 L 1022.484375 432.652344 L 1021.410156 432.585938 L 1019.050781 432.789062 L 1016.898438 433.261719 L 1014.878906 434 L 1013.0625 435.144531 L 1011.378906 436.558594 L 1009.964844 438.242188 L 1008.753906 440.195312 L 1007.742188 442.347656 L 1006.933594 444.703125 L 1006.394531 447.261719 L 1006.058594 450.023438 L 1005.992188 452.917969 L 1006.058594 456.082031 L 1006.464844 458.910156 L 1007.136719 461.601562 L 1008.078125 463.957031 L 1009.292969 466.179688 L 1010.773438 468.066406 L 1012.253906 469.613281 L 1013.867188 470.824219 L 1015.621094 471.769531 L 1017.570312 472.441406 L 1019.660156 472.84375 L 1021.949219 472.980469 L 1024.371094 472.84375 L 1026.59375 472.375 L 1028.613281 471.566406 L 1030.296875 470.421875 L 1031.777344 468.941406 L 1033.054688 467.121094 L 1033.59375 466.046875 L 1034.066406 464.832031 L 1034.535156 463.554688 L 1034.941406 462.140625 L 1035.277344 460.660156 L 1035.613281 459.042969 L 1042.078125 459.042969 L 1040.863281 465.035156 L 1038.84375 469.882812 L 1035.882812 473.652344 L 1032.113281 476.347656 L 1027.402344 477.894531 L 1021.878906 478.5 L 1017.976562 478.230469 L 1014.476562 477.421875 L 1011.3125 476.210938 L 1008.484375 474.394531 L 1005.992188 472.039062 L 1003.90625 469.140625 L 1002.695312 467.054688 L 1001.683594 464.765625 L 1000.875 462.34375 L 1000.269531 459.785156 L 999.867188 457.09375 L 999.730469 454.265625 Z M 999.730469 452.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 999 647 L 1038 647 M 999 608 L 1038 608 M 999 608 L 999 647 M 1038 608 L 1038 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 999 647 L 1038 647 M 999 608 L 1038 608 M 1038 647 L 1038 608 M 999 647 L 999 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 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_lp__and3_1.svg b/cells/and3/sky130_fd_sc_lp__and3_1.svg
index f393418..2a45a26 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_1.svg
+++ b/cells/and3/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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="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 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="#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 1119.5 665.5 L 1153.5 665.5 L 1153.5 857.5 L 1119.5 857.5 Z M 769.5 761.5 L 804.5 761.5 L 804.5 857.5 L 769.5 857.5 Z M 983.5 761.5 L 1017.5 761.5 L 1017.5 857.5 L 983.5 857.5 Z M 859.5 761.5 L 893.5 761.5 L 893.5 857.5 L 859.5 857.5 Z M 859.5 761.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 1162.5 209.5 L 1197.5 209.5 L 1197.5 498.5 L 1162.5 498.5 Z M 764.5 401.5 L 798.5 401.5 L 798.5 498.5 L 764.5 498.5 Z M 983.5 401.5 L 1017.5 401.5 L 1017.5 498.5 L 983.5 498.5 Z M 867.5 401.5 L 901.5 401.5 L 901.5 498.5 L 867.5 498.5 Z M 867.5 401.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 999.730469 282.984375 L 999.796875 280.292969 L 1000.066406 277.667969 L 1000.539062 275.175781 L 1001.144531 272.753906 L 1001.953125 270.464844 L 1003.03125 268.242188 L 1004.714844 265.347656 L 1006.800781 262.855469 L 1009.15625 260.835938 L 1011.847656 259.222656 L 1014.8125 258.078125 L 1018.175781 257.335938 L 1018.785156 257.269531 L 1019.457031 257.203125 L 1020.0625 257.132812 L 1021.410156 257.132812 L 1022.148438 257.066406 L 1026.457031 257.402344 L 1030.226562 258.414062 L 1033.460938 260.027344 L 1036.152344 262.316406 L 1038.304688 265.210938 L 1039.988281 268.78125 L 1040.394531 270.125 L 1040.59375 270.867188 L 1040.730469 271.609375 L 1040.863281 272.347656 L 1041.066406 273.089844 L 1034.671875 273.089844 L 1033.996094 270.734375 L 1033.121094 268.714844 L 1032.046875 266.960938 L 1030.632812 265.480469 L 1029.082031 264.335938 L 1027.265625 263.460938 L 1026.390625 263.191406 L 1025.449219 262.992188 L 1024.503906 262.855469 L 1023.496094 262.722656 L 1022.484375 262.652344 L 1021.410156 262.585938 L 1019.050781 262.789062 L 1016.898438 263.261719 L 1014.878906 264 L 1013.0625 265.144531 L 1011.378906 266.558594 L 1009.964844 268.242188 L 1008.753906 270.195312 L 1007.742188 272.347656 L 1006.933594 274.703125 L 1006.394531 277.261719 L 1006.058594 280.023438 L 1005.992188 282.917969 L 1006.058594 286.082031 L 1006.464844 288.910156 L 1007.136719 291.601562 L 1008.078125 293.957031 L 1009.292969 296.179688 L 1010.773438 298.066406 L 1012.253906 299.613281 L 1013.867188 300.824219 L 1015.621094 301.769531 L 1017.570312 302.441406 L 1019.660156 302.84375 L 1021.949219 302.980469 L 1024.371094 302.84375 L 1026.59375 302.375 L 1028.613281 301.566406 L 1030.296875 300.421875 L 1031.777344 298.941406 L 1033.054688 297.121094 L 1033.59375 296.046875 L 1034.066406 294.832031 L 1034.535156 293.554688 L 1034.941406 292.140625 L 1035.277344 290.660156 L 1035.613281 289.042969 L 1042.078125 289.042969 L 1040.863281 295.035156 L 1038.84375 299.882812 L 1035.882812 303.652344 L 1032.113281 306.347656 L 1027.402344 307.894531 L 1021.878906 308.5 L 1017.976562 308.230469 L 1014.476562 307.421875 L 1011.3125 306.210938 L 1008.484375 304.394531 L 1005.992188 302.039062 L 1003.90625 299.140625 L 1002.695312 297.054688 L 1001.683594 294.765625 L 1000.875 292.34375 L 1000.269531 289.785156 L 999.867188 287.09375 L 999.730469 284.265625 Z M 999.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 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/and3/sky130_fd_sc_lp__and3_2.svg b/cells/and3/sky130_fd_sc_lp__and3_2.svg
index 42da15d..875f8a5 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_2.svg
+++ b/cells/and3/sky130_fd_sc_lp__and3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 1059.5 672.5 L 1094.5 672.5 L 1094.5 864.5 L 1059.5 864.5 Z M 823.5 768.5 L 858.5 768.5 L 858.5 864.5 L 823.5 864.5 Z M 741.5 768.5 L 775.5 768.5 L 775.5 864.5 L 741.5 864.5 Z M 906.5 768.5 L 940.5 768.5 L 940.5 864.5 L 906.5 864.5 Z M 1158.5 672.5 L 1192.5 672.5 L 1192.5 864.5 L 1158.5 864.5 Z M 1158.5 672.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 939.5 381.5 L 973.5 381.5 L 973.5 477.5 L 939.5 477.5 Z M 823.5 381.5 L 858.5 381.5 L 858.5 477.5 L 823.5 477.5 Z M 725.5 381.5 L 759.5 381.5 L 759.5 477.5 L 725.5 477.5 Z M 1059.5 209.5 L 1094.5 209.5 L 1094.5 498.5 L 1059.5 498.5 Z M 1158.5 209.5 L 1192.5 209.5 L 1192.5 498.5 L 1158.5 498.5 Z M 1158.5 209.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface308">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <path style=" 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/and3/sky130_fd_sc_lp__and3_4.svg b/cells/and3/sky130_fd_sc_lp__and3_4.svg
index ad2b990..53613b2 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_4.svg
+++ b/cells/and3/sky130_fd_sc_lp__and3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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="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 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="#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 1250.5 672.5 L 1284.5 672.5 L 1284.5 864.5 L 1250.5 864.5 Z M 616.5 672.5 L 650.5 672.5 L 650.5 864.5 L 616.5 864.5 Z M 698.5 672.5 L 733.5 672.5 L 733.5 864.5 L 698.5 864.5 Z M 822.5 672.5 L 856.5 672.5 L 856.5 864.5 L 822.5 864.5 Z M 954.5 672.5 L 988.5 672.5 L 988.5 864.5 L 954.5 864.5 Z M 1052.5 672.5 L 1087.5 672.5 L 1087.5 864.5 L 1052.5 864.5 Z M 1151.5 672.5 L 1185.5 672.5 L 1185.5 864.5 L 1151.5 864.5 Z M 1151.5 672.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 1250.5 209.5 L 1284.5 209.5 L 1284.5 498.5 L 1250.5 498.5 Z M 616.5 209.5 L 650.5 209.5 L 650.5 498.5 L 616.5 498.5 Z M 733.5 209.5 L 767.5 209.5 L 767.5 498.5 L 733.5 498.5 Z M 831.5 209.5 L 866.5 209.5 L 866.5 498.5 L 831.5 498.5 Z M 954.5 209.5 L 988.5 209.5 L 988.5 498.5 L 954.5 498.5 Z M 1052.5 209.5 L 1087.5 209.5 L 1087.5 498.5 L 1052.5 498.5 Z M 1151.5 209.5 L 1185.5 209.5 L 1185.5 498.5 L 1151.5 498.5 Z M 1151.5 209.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" 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 536.320312 L 1424.191406 561.5 L 1416.449219 561.5 L 1403.050781 541.035156 L 1389.589844 561.5 L 1381.980469 561.5 L 1399.351562 536.320312 L 1383.058594 512.421875 L 1390.664062 512.421875 L 1403.253906 531.675781 L 1415.910156 512.421875 L 1423.382812 512.421875 Z M 1406.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 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/and3/sky130_fd_sc_lp__and3_lp.svg b/cells/and3/sky130_fd_sc_lp__and3_lp.svg
index 15eeac6..462db85 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_lp.svg
+++ b/cells/and3/sky130_fd_sc_lp__and3_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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="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 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="#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 1157.5 768.5 L 1191.5 768.5 L 1191.5 864.5 L 1157.5 864.5 Z M 777.5 768.5 L 812.5 768.5 L 812.5 864.5 L 777.5 864.5 Z M 867.5 768.5 L 901.5 768.5 L 901.5 864.5 L 867.5 864.5 Z M 956.5 768.5 L 991.5 768.5 L 991.5 864.5 L 956.5 864.5 Z M 1074.5 768.5 L 1109.5 768.5 L 1109.5 864.5 L 1074.5 864.5 Z M 1074.5 768.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 1115.5 212.5 L 1173.5 212.5 L 1173.5 441.5 L 1115.5 441.5 Z M 742.5 212.5 L 799.5 212.5 L 799.5 441.5 L 742.5 441.5 Z M 863.5 212.5 L 921.5 212.5 L 921.5 441.5 L 863.5 441.5 Z M 985.5 212.5 L 1042.5 212.5 L 1042.5 441.5 L 985.5 441.5 Z M 985.5 212.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -152,6 +152,5 @@
 <path style=" 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 790.320312 L 1260.191406 815.5 L 1252.449219 815.5 L 1239.050781 795.035156 L 1225.589844 815.5 L 1217.980469 815.5 L 1235.351562 790.320312 L 1219.058594 766.421875 L 1226.664062 766.421875 L 1239.253906 785.675781 L 1251.910156 766.421875 L 1259.382812 766.421875 Z M 1242.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 1219 307 L 1258 307 M 1219 269 L 1258 269 M 1219 269 L 1219 307 M 1258 269 L 1258 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 1219 307 L 1258 307 M 1219 269 L 1258 269 M 1258 307 L 1258 269 M 1219 307 L 1219 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 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_lp__and3_m.svg b/cells/and3/sky130_fd_sc_lp__and3_m.svg
index 2dc8f2c..c98ec26 100644
--- a/cells/and3/sky130_fd_sc_lp__and3_m.svg
+++ b/cells/and3/sky130_fd_sc_lp__and3_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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="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="#image310"/>
+  <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 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="#image310"/>
+  <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 768.5 L 1146.5 768.5 L 1146.5 864.5 L 1112.5 864.5 Z M 807.5 768.5 L 842.5 768.5 L 842.5 864.5 L 807.5 864.5 Z M 890.5 768.5 L 924.5 768.5 L 924.5 864.5 L 890.5 864.5 Z M 1013.5 768.5 L 1048.5 768.5 L 1048.5 864.5 L 1013.5 864.5 Z M 1013.5 768.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <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 1103.5 374.5 L 1137.5 374.5 L 1137.5 470.5 L 1103.5 470.5 Z M 807.5 374.5 L 842.5 374.5 L 842.5 470.5 L 807.5 470.5 Z M 906.5 374.5 L 940.5 374.5 L 940.5 470.5 L 906.5 470.5 Z M 1004.5 374.5 L 1039.5 374.5 L 1039.5 470.5 L 1004.5 470.5 Z M 1004.5 374.5 "/>
 </clipPath>
-<image id="image312" 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="#image312"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image313" 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="#image313"/>
+  <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="surface307">
+<g id="surface334">
 <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 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/and3b/sky130_fd_sc_lp__and3b_1.svg b/cells/and3b/sky130_fd_sc_lp__and3b_1.svg
index 1f39f06..2e9da52 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_1.svg
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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 1217.5 672.5 L 1252.5 672.5 L 1252.5 864.5 L 1217.5 864.5 Z M 891.5 768.5 L 925.5 768.5 L 925.5 864.5 L 891.5 864.5 Z M 1056.5 768.5 L 1090.5 768.5 L 1090.5 864.5 L 1056.5 864.5 Z M 973.5 768.5 L 1008.5 768.5 L 1008.5 864.5 L 973.5 864.5 Z M 669.5 768.5 L 703.5 768.5 L 703.5 864.5 L 669.5 864.5 Z M 669.5 768.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 669.5 235.5 L 703.5 235.5 L 703.5 331.5 L 669.5 331.5 Z M 1195.5 209.5 L 1229.5 209.5 L 1229.5 498.5 L 1195.5 498.5 Z M 850.5 401.5 L 884.5 401.5 L 884.5 498.5 L 850.5 498.5 Z M 1074.5 401.5 L 1109.5 401.5 L 1109.5 498.5 L 1074.5 498.5 Z M 968.5 401.5 L 1002.5 401.5 L 1002.5 498.5 L 968.5 498.5 Z M 968.5 401.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 1053.730469 791.984375 L 1053.796875 789.292969 L 1054.066406 786.667969 L 1054.539062 784.175781 L 1055.144531 781.753906 L 1055.953125 779.464844 L 1057.03125 777.242188 L 1058.714844 774.347656 L 1060.800781 771.855469 L 1063.15625 769.835938 L 1065.847656 768.222656 L 1068.8125 767.078125 L 1072.175781 766.335938 L 1072.785156 766.269531 L 1073.457031 766.203125 L 1074.0625 766.132812 L 1075.410156 766.132812 L 1076.148438 766.066406 L 1080.457031 766.402344 L 1084.226562 767.414062 L 1087.460938 769.027344 L 1090.152344 771.316406 L 1092.304688 774.210938 L 1093.988281 777.78125 L 1094.394531 779.125 L 1094.59375 779.867188 L 1094.730469 780.609375 L 1094.863281 781.347656 L 1095.066406 782.089844 L 1088.671875 782.089844 L 1087.996094 779.734375 L 1087.121094 777.714844 L 1086.046875 775.960938 L 1084.632812 774.480469 L 1083.082031 773.335938 L 1081.265625 772.460938 L 1080.390625 772.191406 L 1079.449219 771.992188 L 1078.503906 771.855469 L 1077.496094 771.722656 L 1076.484375 771.652344 L 1075.410156 771.585938 L 1073.050781 771.789062 L 1070.898438 772.261719 L 1068.878906 773 L 1067.0625 774.144531 L 1065.378906 775.558594 L 1063.964844 777.242188 L 1062.753906 779.195312 L 1061.742188 781.347656 L 1060.933594 783.703125 L 1060.394531 786.261719 L 1060.058594 789.023438 L 1059.992188 791.917969 L 1060.058594 795.082031 L 1060.464844 797.910156 L 1061.136719 800.601562 L 1062.078125 802.957031 L 1063.292969 805.179688 L 1064.773438 807.066406 L 1066.253906 808.613281 L 1067.867188 809.824219 L 1069.621094 810.769531 L 1071.570312 811.441406 L 1073.660156 811.84375 L 1075.949219 811.980469 L 1078.371094 811.84375 L 1080.59375 811.375 L 1082.613281 810.566406 L 1084.296875 809.421875 L 1085.777344 807.941406 L 1087.054688 806.121094 L 1087.59375 805.046875 L 1088.066406 803.832031 L 1088.535156 802.554688 L 1088.941406 801.140625 L 1089.277344 799.660156 L 1089.613281 798.042969 L 1096.078125 798.042969 L 1094.863281 804.035156 L 1092.84375 808.882812 L 1089.882812 812.652344 L 1086.113281 815.347656 L 1081.402344 816.894531 L 1075.878906 817.5 L 1071.976562 817.230469 L 1068.476562 816.421875 L 1065.3125 815.210938 L 1062.484375 813.394531 L 1059.992188 811.039062 L 1057.90625 808.140625 L 1056.695312 806.054688 L 1055.683594 803.765625 L 1054.875 801.34375 L 1054.269531 798.785156 L 1053.867188 796.09375 L 1053.730469 793.265625 Z M 1053.730469 791.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 307 L 1091 307 M 1052 269 L 1091 269 M 1052 269 L 1052 307 M 1091 269 L 1091 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 1052 307 L 1091 307 M 1052 269 L 1091 269 M 1091 307 L 1091 269 M 1052 307 L 1052 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/and3b/sky130_fd_sc_lp__and3b_2.svg b/cells/and3b/sky130_fd_sc_lp__and3b_2.svg
index 36cefb3..83b681a 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_2.svg
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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="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 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="#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 1254.5 665.5 L 1289.5 665.5 L 1289.5 761.5 L 1254.5 761.5 Z M 614.5 665.5 L 648.5 665.5 L 648.5 761.5 L 614.5 761.5 Z M 1130.5 665.5 L 1165.5 665.5 L 1165.5 761.5 L 1130.5 761.5 Z M 1048.5 665.5 L 1082.5 665.5 L 1082.5 761.5 L 1048.5 761.5 Z M 854.5 665.5 L 889.5 665.5 L 889.5 857.5 L 854.5 857.5 Z M 756.5 665.5 L 790.5 665.5 L 790.5 857.5 L 756.5 857.5 Z M 756.5 665.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 854.5 209.5 L 889.5 209.5 L 889.5 498.5 L 854.5 498.5 Z M 1261.5 401.5 L 1295.5 401.5 L 1295.5 498.5 L 1261.5 498.5 Z M 1143.5 401.5 L 1177.5 401.5 L 1177.5 498.5 L 1143.5 498.5 Z M 1044.5 401.5 L 1079.5 401.5 L 1079.5 498.5 L 1044.5 498.5 Z M 627.5 401.5 L 662.5 401.5 L 662.5 498.5 L 627.5 498.5 Z M 756.5 209.5 L 790.5 209.5 L 790.5 498.5 L 756.5 498.5 Z M 756.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 801.824219 282.320312 L 819.191406 307.5 L 811.449219 307.5 L 798.050781 287.035156 L 784.589844 307.5 L 776.980469 307.5 L 794.351562 282.320312 L 778.058594 258.421875 L 785.664062 258.421875 L 798.253906 277.675781 L 810.910156 258.421875 L 818.382812 258.421875 Z M 801.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 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/and3b/sky130_fd_sc_lp__and3b_4.svg b/cells/and3b/sky130_fd_sc_lp__and3b_4.svg
index dcfe3c1..211d7a2 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_4.svg
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image326"/>
+  <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 532.5 670.5 L 567.5 670.5 L 567.5 766.5 L 532.5 766.5 Z M 984.5 670.5 L 1018.5 670.5 L 1018.5 862.5 L 984.5 862.5 Z M 688.5 670.5 L 722.5 670.5 L 722.5 862.5 L 688.5 862.5 Z M 787.5 670.5 L 821.5 670.5 L 821.5 862.5 L 787.5 862.5 Z M 885.5 670.5 L 920.5 670.5 L 920.5 862.5 L 885.5 862.5 Z M 1198.5 670.5 L 1232.5 670.5 L 1232.5 862.5 L 1198.5 862.5 Z M 1115.5 670.5 L 1150.5 670.5 L 1150.5 862.5 L 1115.5 862.5 Z M 1322.5 670.5 L 1356.5 670.5 L 1356.5 862.5 L 1322.5 862.5 Z M 1322.5 670.5 "/>
 </clipPath>
-<image id="image327" 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="#image327"/>
+  <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 1198.5 209.5 L 1232.5 209.5 L 1232.5 498.5 L 1198.5 498.5 Z M 532.5 401.5 L 567.5 401.5 L 567.5 498.5 L 532.5 498.5 Z M 1330.5 209.5 L 1364.5 209.5 L 1364.5 498.5 L 1330.5 498.5 Z M 1099.5 209.5 L 1134.5 209.5 L 1134.5 498.5 L 1099.5 498.5 Z M 984.5 209.5 L 1018.5 209.5 L 1018.5 498.5 L 984.5 498.5 Z M 885.5 209.5 L 920.5 209.5 L 920.5 498.5 L 885.5 498.5 Z M 787.5 209.5 L 821.5 209.5 L 821.5 498.5 L 787.5 498.5 Z M 688.5 209.5 L 722.5 209.5 L 722.5 498.5 L 688.5 498.5 Z M 688.5 209.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image329" 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="#image329"/>
+  <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="surface323">
+<g id="surface352">
 <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 910.824219 451.320312 L 928.191406 476.5 L 920.449219 476.5 L 907.050781 456.035156 L 893.589844 476.5 L 885.980469 476.5 L 903.351562 451.320312 L 887.058594 427.421875 L 894.664062 427.421875 L 907.253906 446.675781 L 919.910156 427.421875 L 927.382812 427.421875 Z M 910.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 886 647 L 925 647 M 886 608 L 925 608 M 886 608 L 886 647 M 925 608 L 925 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 886 647 L 925 647 M 886 608 L 925 608 M 925 647 L 925 608 M 886 647 L 886 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/and3b/sky130_fd_sc_lp__and3b_lp.svg b/cells/and3b/sky130_fd_sc_lp__and3b_lp.svg
index 197d698..400e38f 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_lp.svg
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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="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 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="#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 1278.5 757.5 L 1313.5 757.5 L 1313.5 853.5 L 1278.5 853.5 Z M 563.5 757.5 L 598.5 757.5 L 598.5 853.5 L 563.5 853.5 Z M 653.5 757.5 L 687.5 757.5 L 687.5 853.5 L 653.5 853.5 Z M 881.5 757.5 L 915.5 757.5 L 915.5 853.5 L 881.5 853.5 Z M 970.5 757.5 L 1004.5 757.5 L 1004.5 853.5 L 970.5 853.5 Z M 1059.5 757.5 L 1094.5 757.5 L 1094.5 853.5 L 1059.5 853.5 Z M 1196.5 757.5 L 1230.5 757.5 L 1230.5 853.5 L 1196.5 853.5 Z M 1196.5 757.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 1205.5 220.5 L 1262.5 220.5 L 1262.5 449.5 L 1205.5 449.5 Z M 1059.5 220.5 L 1117.5 220.5 L 1117.5 449.5 L 1059.5 449.5 Z M 816.5 220.5 L 874.5 220.5 L 874.5 449.5 L 816.5 449.5 Z M 938.5 220.5 L 995.5 220.5 L 995.5 449.5 L 938.5 449.5 Z M 567.5 221.5 L 624.5 221.5 L 624.5 451.5 L 567.5 451.5 Z M 567.5 221.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 586.1875 512.574219 L 586.1875 561.652344 L 579.121094 561.652344 L 553.738281 521.863281 L 553.738281 561.652344 L 547.816406 561.652344 L 547.816406 512.574219 L 554.613281 512.574219 L 580.265625 552.699219 L 580.265625 512.574219 Z M 586.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 502 562 L 541 562 M 502 523 L 541 523 M 502 523 L 502 562 M 541 523 L 541 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 502 562 L 541 562 M 502 523 L 541 523 M 541 562 L 541 523 M 502 562 L 502 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_lp__and3b_m.svg b/cells/and3b/sky130_fd_sc_lp__and3b_m.svg
index 4731ce5..af6bfda 100644
--- a/cells/and3b/sky130_fd_sc_lp__and3b_m.svg
+++ b/cells/and3b/sky130_fd_sc_lp__and3b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image347" 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="#image347"/>
+  <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 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="#image347"/>
+  <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 1196.5 761.5 L 1230.5 761.5 L 1230.5 857.5 L 1196.5 857.5 Z M 669.5 761.5 L 703.5 761.5 L 703.5 857.5 L 669.5 857.5 Z M 891.5 761.5 L 925.5 761.5 L 925.5 857.5 L 891.5 857.5 Z M 973.5 761.5 L 1008.5 761.5 L 1008.5 857.5 L 973.5 857.5 Z M 1097.5 761.5 L 1132.5 761.5 L 1132.5 857.5 L 1097.5 857.5 Z M 1097.5 761.5 "/>
 </clipPath>
-<image id="image348" 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="#image348"/>
+  <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 669.5 235.5 L 703.5 235.5 L 703.5 331.5 L 669.5 331.5 Z M 890.5 360.5 L 924.5 360.5 L 924.5 456.5 L 890.5 456.5 Z M 1221.5 360.5 L 1255.5 360.5 L 1255.5 456.5 L 1221.5 456.5 Z M 1087.5 360.5 L 1121.5 360.5 L 1121.5 456.5 L 1087.5 456.5 Z M 988.5 360.5 L 1023.5 360.5 L 1023.5 456.5 L 988.5 456.5 Z M 988.5 360.5 "/>
 </clipPath>
-<image id="image349" 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="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image350" 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="#image350"/>
+  <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="surface344">
+<g id="surface372">
 <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 1296.824219 366.320312 L 1314.191406 391.5 L 1306.449219 391.5 L 1293.050781 371.035156 L 1279.589844 391.5 L 1271.980469 391.5 L 1289.351562 366.320312 L 1273.058594 342.421875 L 1280.664062 342.421875 L 1293.253906 361.675781 L 1305.910156 342.421875 L 1313.382812 342.421875 Z M 1296.824219 366.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 731 L 1311 731 M 1272 693 L 1311 693 M 1272 693 L 1272 731 M 1311 693 L 1311 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 1272 731 L 1311 731 M 1272 693 L 1311 693 M 1311 731 L 1311 693 M 1272 731 L 1272 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 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_lp__and4_0.svg b/cells/and4/sky130_fd_sc_lp__and4_0.svg
index c13495a..38ebe45 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_0.svg
+++ b/cells/and4/sky130_fd_sc_lp__and4_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 1158.5 755.5 L 1192.5 755.5 L 1192.5 852.5 L 1158.5 852.5 Z M 734.5 755.5 L 768.5 755.5 L 768.5 852.5 L 734.5 852.5 Z M 816.5 755.5 L 851.5 755.5 L 851.5 852.5 L 816.5 852.5 Z M 899.5 755.5 L 933.5 755.5 L 933.5 852.5 L 899.5 852.5 Z M 981.5 755.5 L 1016.5 755.5 L 1016.5 852.5 L 981.5 852.5 Z M 981.5 755.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 1189.5 224.5 L 1223.5 224.5 L 1223.5 370.5 L 1189.5 370.5 Z M 789.5 274.5 L 823.5 274.5 L 823.5 370.5 L 789.5 370.5 Z M 997.5 274.5 L 1032.5 274.5 L 1032.5 370.5 L 997.5 370.5 Z M 899.5 274.5 L 933.5 274.5 L 933.5 370.5 L 899.5 370.5 Z M 690.5 274.5 L 725.5 274.5 L 725.5 370.5 L 690.5 370.5 Z M 690.5 274.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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_lp__and4_1.svg b/cells/and4/sky130_fd_sc_lp__and4_1.svg
index 87fc309..fc9ae85 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_1.svg
+++ b/cells/and4/sky130_fd_sc_lp__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 539.5 L 533.5 539.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 1165.5 672.5 L 1199.5 672.5 L 1199.5 864.5 L 1165.5 864.5 Z M 793.5 768.5 L 828.5 768.5 L 828.5 864.5 L 793.5 864.5 Z M 1041.5 768.5 L 1075.5 768.5 L 1075.5 864.5 L 1041.5 864.5 Z M 917.5 768.5 L 952.5 768.5 L 952.5 864.5 L 917.5 864.5 Z M 683.5 768.5 L 718.5 768.5 L 718.5 864.5 L 683.5 864.5 Z M 683.5 768.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 1221.5 209.5 L 1255.5 209.5 L 1255.5 498.5 L 1221.5 498.5 Z M 807.5 401.5 L 842.5 401.5 L 842.5 498.5 L 807.5 498.5 Z M 1041.5 401.5 L 1075.5 401.5 L 1075.5 498.5 L 1041.5 498.5 Z M 942.5 401.5 L 977.5 401.5 L 977.5 498.5 L 942.5 498.5 Z M 683.5 401.5 L 718.5 401.5 L 718.5 498.5 L 683.5 498.5 Z M 683.5 401.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1056.492188 561.5 L 1056.492188 512.421875 L 1075.410156 512.421875 L 1078.371094 512.625 L 1081.132812 513.164062 L 1083.6875 514.105469 L 1086.046875 515.316406 L 1088.132812 517 L 1090.085938 518.953125 L 1091.699219 521.308594 L 1093.046875 523.867188 L 1094.058594 526.761719 L 1094.796875 529.859375 L 1095.203125 533.292969 L 1095.402344 536.929688 L 1095.203125 540.765625 L 1094.730469 544.332031 L 1093.921875 547.566406 L 1092.84375 550.527344 L 1091.429688 553.152344 L 1089.679688 555.441406 L 1087.796875 557.324219 L 1085.707031 558.808594 L 1083.421875 560.019531 L 1080.929688 560.828125 L 1078.234375 561.367188 L 1075.410156 561.5 Z M 1062.753906 555.980469 L 1074.332031 555.980469 L 1077.429688 555.777344 L 1080.1875 555.039062 L 1082.613281 553.757812 L 1084.632812 552.074219 L 1086.246094 549.785156 L 1087.59375 547.027344 L 1087.996094 545.613281 L 1088.402344 544.132812 L 1088.738281 542.515625 L 1088.941406 540.765625 L 1089.074219 538.949219 L 1089.140625 536.996094 L 1088.875 532.621094 L 1088.199219 528.78125 L 1086.988281 525.484375 L 1085.371094 522.859375 L 1083.285156 520.703125 L 1080.726562 519.15625 L 1079.785156 518.820312 L 1078.773438 518.480469 L 1077.699219 518.28125 L 1076.621094 518.078125 L 1075.476562 518.011719 L 1074.332031 517.941406 L 1062.753906 517.941406 Z M 1062.753906 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 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_lp__and4_2.svg b/cells/and4/sky130_fd_sc_lp__and4_2.svg
index ae3f19a..7f99c9d 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_2.svg
+++ b/cells/and4/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1170.5 670.5 L 1205.5 670.5 L 1205.5 862.5 L 1170.5 862.5 Z M 748.5 766.5 L 782.5 766.5 L 782.5 862.5 L 748.5 862.5 Z M 665.5 766.5 L 699.5 766.5 L 699.5 862.5 L 665.5 862.5 Z M 995.5 766.5 L 1030.5 766.5 L 1030.5 862.5 L 995.5 862.5 Z M 871.5 766.5 L 906.5 766.5 L 906.5 862.5 L 871.5 862.5 Z M 1269.5 670.5 L 1303.5 670.5 L 1303.5 862.5 L 1269.5 862.5 Z M 1269.5 670.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1170.5 209.5 L 1205.5 209.5 L 1205.5 498.5 L 1170.5 498.5 Z M 764.5 401.5 L 798.5 401.5 L 798.5 498.5 L 764.5 498.5 Z M 665.5 401.5 L 699.5 401.5 L 699.5 498.5 L 665.5 498.5 Z M 1011.5 401.5 L 1046.5 401.5 L 1046.5 498.5 L 1011.5 498.5 Z M 913.5 401.5 L 947.5 401.5 L 947.5 498.5 L 913.5 498.5 Z M 1269.5 209.5 L 1303.5 209.5 L 1303.5 498.5 L 1269.5 498.5 Z M 1269.5 209.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface328">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1001.492188 646.5 L 1001.492188 597.421875 L 1020.410156 597.421875 L 1023.371094 597.625 L 1026.132812 598.164062 L 1028.6875 599.105469 L 1031.046875 600.316406 L 1033.132812 602 L 1035.085938 603.953125 L 1036.699219 606.308594 L 1038.046875 608.867188 L 1039.058594 611.761719 L 1039.796875 614.859375 L 1040.203125 618.292969 L 1040.402344 621.929688 L 1040.203125 625.765625 L 1039.730469 629.332031 L 1038.921875 632.566406 L 1037.84375 635.527344 L 1036.429688 638.152344 L 1034.679688 640.441406 L 1032.796875 642.324219 L 1030.707031 643.808594 L 1028.421875 645.019531 L 1025.929688 645.828125 L 1023.234375 646.367188 L 1020.410156 646.5 Z M 1007.753906 640.980469 L 1019.332031 640.980469 L 1022.429688 640.777344 L 1025.1875 640.039062 L 1027.613281 638.757812 L 1029.632812 637.074219 L 1031.246094 634.785156 L 1032.59375 632.027344 L 1032.996094 630.613281 L 1033.402344 629.132812 L 1033.738281 627.515625 L 1033.941406 625.765625 L 1034.074219 623.949219 L 1034.140625 621.996094 L 1033.875 617.621094 L 1033.199219 613.78125 L 1031.988281 610.484375 L 1030.371094 607.859375 L 1028.285156 605.703125 L 1025.726562 604.15625 L 1024.785156 603.820312 L 1023.773438 603.480469 L 1022.699219 603.28125 L 1021.621094 603.078125 L 1020.476562 603.011719 L 1019.332031 602.941406 L 1007.753906 602.941406 Z M 1007.753906 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 997 477 L 1036 477 M 997 438 L 1036 438 M 997 438 L 997 477 M 1036 438 L 1036 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 997 477 L 1036 477 M 997 438 L 1036 438 M 1036 477 L 1036 438 M 997 477 L 997 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/and4/sky130_fd_sc_lp__and4_4.svg b/cells/and4/sky130_fd_sc_lp__and4_4.svg
index aea6e6c..cdbb987 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_4.svg
+++ b/cells/and4/sky130_fd_sc_lp__and4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.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="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 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="#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 1295.5 672.5 L 1330.5 672.5 L 1330.5 864.5 L 1295.5 864.5 Z M 538.5 672.5 L 572.5 672.5 L 572.5 864.5 L 538.5 864.5 Z M 620.5 672.5 L 655.5 672.5 L 655.5 864.5 L 620.5 864.5 Z M 744.5 672.5 L 779.5 672.5 L 779.5 864.5 L 744.5 864.5 Z M 868.5 672.5 L 902.5 672.5 L 902.5 864.5 L 868.5 864.5 Z M 1000.5 672.5 L 1034.5 672.5 L 1034.5 864.5 L 1000.5 864.5 Z M 1098.5 672.5 L 1133.5 672.5 L 1133.5 864.5 L 1098.5 864.5 Z M 1197.5 672.5 L 1231.5 672.5 L 1231.5 864.5 L 1197.5 864.5 Z M 1197.5 672.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 1295.5 209.5 L 1330.5 209.5 L 1330.5 498.5 L 1295.5 498.5 Z M 538.5 209.5 L 572.5 209.5 L 572.5 498.5 L 538.5 498.5 Z M 636.5 209.5 L 671.5 209.5 L 671.5 498.5 L 636.5 498.5 Z M 769.5 209.5 L 804.5 209.5 L 804.5 498.5 L 769.5 498.5 Z M 868.5 209.5 L 902.5 209.5 L 902.5 498.5 L 868.5 498.5 Z M 1000.5 209.5 L 1034.5 209.5 L 1034.5 498.5 L 1000.5 498.5 Z M 1098.5 209.5 L 1133.5 209.5 L 1133.5 498.5 L 1098.5 498.5 Z M 1197.5 209.5 L 1231.5 209.5 L 1231.5 498.5 L 1197.5 498.5 Z M 1197.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/and4/sky130_fd_sc_lp__and4_lp.svg b/cells/and4/sky130_fd_sc_lp__and4_lp.svg
index 2e11f85..d81fad6 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp.svg
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.5 111.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 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="#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 1291.5 759.5 L 1325.5 759.5 L 1325.5 855.5 L 1291.5 855.5 Z M 640.5 759.5 L 674.5 759.5 L 674.5 855.5 L 640.5 855.5 Z M 729.5 759.5 L 764.5 759.5 L 764.5 855.5 L 729.5 855.5 Z M 860.5 759.5 L 894.5 759.5 L 894.5 855.5 L 860.5 855.5 Z M 949.5 759.5 L 984.5 759.5 L 984.5 855.5 L 949.5 855.5 Z M 1201.5 759.5 L 1236.5 759.5 L 1236.5 855.5 L 1201.5 855.5 Z M 1201.5 759.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 1321.5 266.5 L 1355.5 266.5 L 1355.5 362.5 L 1321.5 362.5 Z M 507.5 266.5 L 541.5 266.5 L 541.5 362.5 L 507.5 362.5 Z M 589.5 266.5 L 624.5 266.5 L 624.5 362.5 L 589.5 362.5 Z M 688.5 266.5 L 722.5 266.5 L 722.5 362.5 L 688.5 362.5 Z M 771.5 266.5 L 805.5 266.5 L 805.5 362.5 L 771.5 362.5 Z M 869.5 266.5 L 903.5 266.5 L 903.5 362.5 L 869.5 362.5 Z M 952.5 266.5 L 986.5 266.5 L 986.5 362.5 L 952.5 362.5 Z M 1050.5 266.5 L 1085.5 266.5 L 1085.5 362.5 L 1050.5 362.5 Z M 1133.5 266.5 L 1167.5 266.5 L 1167.5 362.5 L 1133.5 362.5 Z M 1231.5 266.5 L 1266.5 266.5 L 1266.5 362.5 L 1231.5 362.5 Z M 1231.5 266.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -236,6 +236,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1460.824219 282.320312 L 1478.191406 307.5 L 1470.449219 307.5 L 1457.050781 287.035156 L 1443.589844 307.5 L 1435.980469 307.5 L 1453.351562 282.320312 L 1437.058594 258.421875 L 1444.664062 258.421875 L 1457.253906 277.675781 L 1469.910156 258.421875 L 1477.382812 258.421875 Z M 1460.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 1436 816 L 1475 816 M 1436 777 L 1475 777 M 1436 777 L 1436 816 M 1475 777 L 1475 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 1436 816 L 1475 816 M 1436 777 L 1475 777 M 1475 816 L 1475 777 M 1436 816 L 1436 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/and4/sky130_fd_sc_lp__and4_lp2.svg b/cells/and4/sky130_fd_sc_lp__and4_lp2.svg
index ea51792..60d0293 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_lp2.svg
+++ b/cells/and4/sky130_fd_sc_lp__and4_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 1148.5 768.5 L 1182.5 768.5 L 1182.5 864.5 L 1148.5 864.5 Z M 673.5 768.5 L 708.5 768.5 L 708.5 864.5 L 673.5 864.5 Z M 756.5 768.5 L 790.5 768.5 L 790.5 864.5 L 756.5 864.5 Z M 879.5 768.5 L 914.5 768.5 L 914.5 864.5 L 879.5 864.5 Z M 969.5 768.5 L 1003.5 768.5 L 1003.5 864.5 L 969.5 864.5 Z M 1058.5 768.5 L 1093.5 768.5 L 1093.5 864.5 L 1058.5 864.5 Z M 1058.5 768.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 1189.5 220.5 L 1246.5 220.5 L 1246.5 449.5 L 1189.5 449.5 Z M 677.5 220.5 L 734.5 220.5 L 734.5 449.5 L 677.5 449.5 Z M 806.5 220.5 L 863.5 220.5 L 863.5 449.5 L 806.5 449.5 Z M 928.5 220.5 L 985.5 220.5 L 985.5 449.5 L 928.5 449.5 Z M 1067.5 220.5 L 1125.5 220.5 L 1125.5 449.5 L 1067.5 449.5 Z M 1067.5 220.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/and4/sky130_fd_sc_lp__and4_m.svg b/cells/and4/sky130_fd_sc_lp__and4_m.svg
index cb98776..9000c74 100644
--- a/cells/and4/sky130_fd_sc_lp__and4_m.svg
+++ b/cells/and4/sky130_fd_sc_lp__and4_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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="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 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="#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 1167.5 768.5 L 1201.5 768.5 L 1201.5 864.5 L 1167.5 864.5 Z M 755.5 768.5 L 789.5 768.5 L 789.5 864.5 L 755.5 864.5 Z M 837.5 768.5 L 871.5 768.5 L 871.5 864.5 L 837.5 864.5 Z M 961.5 768.5 L 995.5 768.5 L 995.5 864.5 L 961.5 864.5 Z M 1043.5 768.5 L 1078.5 768.5 L 1078.5 864.5 L 1043.5 864.5 Z M 1043.5 768.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 1167.5 374.5 L 1201.5 374.5 L 1201.5 470.5 L 1167.5 470.5 Z M 773.5 374.5 L 807.5 374.5 L 807.5 470.5 L 773.5 470.5 Z M 871.5 374.5 L 906.5 374.5 L 906.5 470.5 L 871.5 470.5 Z M 970.5 374.5 L 1004.5 374.5 L 1004.5 470.5 L 970.5 470.5 Z M 1068.5 374.5 L 1103.5 374.5 L 1103.5 470.5 L 1068.5 470.5 Z M 1068.5 374.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/and4b/sky130_fd_sc_lp__and4b_1.svg b/cells/and4b/sky130_fd_sc_lp__and4b_1.svg
index 659dc0c..11fa625 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_1.svg
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 614.5 766.5 L 648.5 766.5 L 648.5 862.5 L 614.5 862.5 Z M 831.5 768.5 L 866.5 768.5 L 866.5 864.5 L 831.5 864.5 Z M 1079.5 768.5 L 1113.5 768.5 L 1113.5 864.5 L 1079.5 864.5 Z M 996.5 768.5 L 1031.5 768.5 L 1031.5 864.5 L 996.5 864.5 Z M 914.5 768.5 L 948.5 768.5 L 948.5 864.5 L 914.5 864.5 Z M 1263.5 672.5 L 1298.5 672.5 L 1298.5 864.5 L 1263.5 864.5 Z M 1263.5 672.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 1267.5 209.5 L 1301.5 209.5 L 1301.5 498.5 L 1267.5 498.5 Z M 734.5 401.5 L 768.5 401.5 L 768.5 498.5 L 734.5 498.5 Z M 1146.5 401.5 L 1181.5 401.5 L 1181.5 498.5 L 1146.5 498.5 Z M 1048.5 401.5 L 1082.5 401.5 L 1082.5 498.5 L 1048.5 498.5 Z M 832.5 401.5 L 867.5 401.5 L 867.5 498.5 L 832.5 498.5 Z M 626.5 401.5 L 661.5 401.5 L 661.5 498.5 L 626.5 498.5 Z M 626.5 401.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/and4b/sky130_fd_sc_lp__and4b_2.svg b/cells/and4b/sky130_fd_sc_lp__and4b_2.svg
index 65230ac..a42edf1 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_2.svg
+++ b/cells/and4b/sky130_fd_sc_lp__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 539.5 L 423.5 539.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="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 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="#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 866.5 679.5 L 900.5 679.5 L 900.5 775.5 L 866.5 775.5 Z M 948.5 679.5 L 983.5 679.5 L 983.5 775.5 L 948.5 775.5 Z M 1072.5 679.5 L 1106.5 679.5 L 1106.5 775.5 L 1072.5 775.5 Z M 783.5 679.5 L 818.5 679.5 L 818.5 775.5 L 783.5 775.5 Z M 559.5 757.5 L 593.5 757.5 L 593.5 853.5 L 559.5 853.5 Z M 1204.5 672.5 L 1238.5 672.5 L 1238.5 864.5 L 1204.5 864.5 Z M 1302.5 672.5 L 1337.5 672.5 L 1337.5 864.5 L 1302.5 864.5 Z M 1302.5 672.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 785.5 392.5 L 820.5 392.5 L 820.5 488.5 L 785.5 488.5 Z M 687.5 392.5 L 721.5 392.5 L 721.5 488.5 L 687.5 488.5 Z M 989.5 392.5 L 1024.5 392.5 L 1024.5 488.5 L 989.5 488.5 Z M 1098.5 392.5 L 1133.5 392.5 L 1133.5 488.5 L 1098.5 488.5 Z M 588.5 392.5 L 623.5 392.5 L 623.5 488.5 L 588.5 488.5 Z M 1317.5 209.5 L 1352.5 209.5 L 1352.5 498.5 L 1317.5 498.5 Z M 1219.5 209.5 L 1253.5 209.5 L 1253.5 498.5 L 1219.5 498.5 Z M 1219.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1056.492188 646.5 L 1056.492188 597.421875 L 1075.410156 597.421875 L 1078.371094 597.625 L 1081.132812 598.164062 L 1083.6875 599.105469 L 1086.046875 600.316406 L 1088.132812 602 L 1090.085938 603.953125 L 1091.699219 606.308594 L 1093.046875 608.867188 L 1094.058594 611.761719 L 1094.796875 614.859375 L 1095.203125 618.292969 L 1095.402344 621.929688 L 1095.203125 625.765625 L 1094.730469 629.332031 L 1093.921875 632.566406 L 1092.84375 635.527344 L 1091.429688 638.152344 L 1089.679688 640.441406 L 1087.796875 642.324219 L 1085.707031 643.808594 L 1083.421875 645.019531 L 1080.929688 645.828125 L 1078.234375 646.367188 L 1075.410156 646.5 Z M 1062.753906 640.980469 L 1074.332031 640.980469 L 1077.429688 640.777344 L 1080.1875 640.039062 L 1082.613281 638.757812 L 1084.632812 637.074219 L 1086.246094 634.785156 L 1087.59375 632.027344 L 1087.996094 630.613281 L 1088.402344 629.132812 L 1088.738281 627.515625 L 1088.941406 625.765625 L 1089.074219 623.949219 L 1089.140625 621.996094 L 1088.875 617.621094 L 1088.199219 613.78125 L 1086.988281 610.484375 L 1085.371094 607.859375 L 1083.285156 605.703125 L 1080.726562 604.15625 L 1079.785156 603.820312 L 1078.773438 603.480469 L 1077.699219 603.28125 L 1076.621094 603.078125 L 1075.476562 603.011719 L 1074.332031 602.941406 L 1062.753906 602.941406 Z M 1062.753906 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 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_lp__and4b_4.svg b/cells/and4b/sky130_fd_sc_lp__and4b_4.svg
index 346e236..363e0d5 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_4.svg
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <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 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="#image332"/>
+  <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 477.5 670.5 L 512.5 670.5 L 512.5 766.5 L 477.5 766.5 Z M 1060.5 670.5 L 1095.5 670.5 L 1095.5 862.5 L 1060.5 862.5 Z M 633.5 670.5 L 667.5 670.5 L 667.5 862.5 L 633.5 862.5 Z M 732.5 670.5 L 766.5 670.5 L 766.5 862.5 L 732.5 862.5 Z M 830.5 670.5 L 865.5 670.5 L 865.5 862.5 L 830.5 862.5 Z M 929.5 670.5 L 963.5 670.5 L 963.5 862.5 L 929.5 862.5 Z M 1267.5 670.5 L 1301.5 670.5 L 1301.5 862.5 L 1267.5 862.5 Z M 1143.5 670.5 L 1177.5 670.5 L 1177.5 862.5 L 1143.5 862.5 Z M 1390.5 670.5 L 1425.5 670.5 L 1425.5 862.5 L 1390.5 862.5 Z M 1390.5 670.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <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 1143.5 209.5 L 1177.5 209.5 L 1177.5 498.5 L 1143.5 498.5 Z M 477.5 401.5 L 512.5 401.5 L 512.5 498.5 L 477.5 498.5 Z M 1292.5 209.5 L 1326.5 209.5 L 1326.5 498.5 L 1292.5 498.5 Z M 1390.5 209.5 L 1425.5 209.5 L 1425.5 498.5 L 1390.5 498.5 Z M 1044.5 209.5 L 1079.5 209.5 L 1079.5 498.5 L 1044.5 498.5 Z M 929.5 209.5 L 963.5 209.5 L 963.5 498.5 L 929.5 498.5 Z M 830.5 209.5 L 865.5 209.5 L 865.5 498.5 L 830.5 498.5 Z M 732.5 209.5 L 766.5 209.5 L 766.5 498.5 L 732.5 498.5 Z M 633.5 209.5 L 667.5 209.5 L 667.5 498.5 L 633.5 498.5 Z M 633.5 209.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image335" 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="#image335"/>
+  <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="surface329">
+<g id="surface358">
 <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 855.824219 451.320312 L 873.191406 476.5 L 865.449219 476.5 L 852.050781 456.035156 L 838.589844 476.5 L 830.980469 476.5 L 848.351562 451.320312 L 832.058594 427.421875 L 839.664062 427.421875 L 852.253906 446.675781 L 864.910156 427.421875 L 872.382812 427.421875 Z M 855.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 831 647 L 870 647 M 831 608 L 870 608 M 831 608 L 831 647 M 870 608 L 870 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 831 647 L 870 647 M 831 608 L 870 608 M 870 647 L 870 608 M 831 647 L 831 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/and4b/sky130_fd_sc_lp__and4b_lp.svg b/cells/and4b/sky130_fd_sc_lp__and4b_lp.svg
index 7363e52..78e233e 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_lp.svg
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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 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="#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 1326.5 768.5 L 1361.5 768.5 L 1361.5 864.5 L 1326.5 864.5 Z M 563.5 768.5 L 598.5 768.5 L 598.5 864.5 L 563.5 864.5 Z M 646.5 768.5 L 680.5 768.5 L 680.5 864.5 L 646.5 864.5 Z M 749.5 768.5 L 783.5 768.5 L 783.5 864.5 L 749.5 864.5 Z M 838.5 768.5 L 873.5 768.5 L 873.5 864.5 L 838.5 864.5 Z M 928.5 768.5 L 962.5 768.5 L 962.5 864.5 L 928.5 864.5 Z M 1017.5 768.5 L 1051.5 768.5 L 1051.5 864.5 L 1017.5 864.5 Z M 1244.5 768.5 L 1278.5 768.5 L 1278.5 864.5 L 1244.5 864.5 Z M 1244.5 768.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 1251.5 220.5 L 1308.5 220.5 L 1308.5 449.5 L 1251.5 449.5 Z M 575.5 220.5 L 632.5 220.5 L 632.5 449.5 L 575.5 449.5 Z M 696.5 220.5 L 753.5 220.5 L 753.5 449.5 L 696.5 449.5 Z M 818.5 220.5 L 875.5 220.5 L 875.5 449.5 L 818.5 449.5 Z M 944.5 220.5 L 1001.5 220.5 L 1001.5 449.5 L 944.5 449.5 Z M 1065.5 220.5 L 1122.5 220.5 L 1122.5 449.5 L 1065.5 449.5 Z M 1065.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 833.730469 536.984375 L 833.796875 534.292969 L 834.066406 531.667969 L 834.539062 529.175781 L 835.144531 526.753906 L 835.953125 524.464844 L 837.03125 522.242188 L 838.714844 519.347656 L 840.800781 516.855469 L 843.15625 514.835938 L 845.847656 513.222656 L 848.8125 512.078125 L 852.175781 511.335938 L 852.785156 511.269531 L 853.457031 511.203125 L 854.0625 511.132812 L 855.410156 511.132812 L 856.148438 511.066406 L 860.457031 511.402344 L 864.226562 512.414062 L 867.460938 514.027344 L 870.152344 516.316406 L 872.304688 519.210938 L 873.988281 522.78125 L 874.394531 524.125 L 874.59375 524.867188 L 874.730469 525.609375 L 874.863281 526.347656 L 875.066406 527.089844 L 868.671875 527.089844 L 867.996094 524.734375 L 867.121094 522.714844 L 866.046875 520.960938 L 864.632812 519.480469 L 863.082031 518.335938 L 861.265625 517.460938 L 860.390625 517.191406 L 859.449219 516.992188 L 858.503906 516.855469 L 857.496094 516.722656 L 856.484375 516.652344 L 855.410156 516.585938 L 853.050781 516.789062 L 850.898438 517.261719 L 848.878906 518 L 847.0625 519.144531 L 845.378906 520.558594 L 843.964844 522.242188 L 842.753906 524.195312 L 841.742188 526.347656 L 840.933594 528.703125 L 840.394531 531.261719 L 840.058594 534.023438 L 839.992188 536.917969 L 840.058594 540.082031 L 840.464844 542.910156 L 841.136719 545.601562 L 842.078125 547.957031 L 843.292969 550.179688 L 844.773438 552.066406 L 846.253906 553.613281 L 847.867188 554.824219 L 849.621094 555.769531 L 851.570312 556.441406 L 853.660156 556.84375 L 855.949219 556.980469 L 858.371094 556.84375 L 860.59375 556.375 L 862.613281 555.566406 L 864.296875 554.421875 L 865.777344 552.941406 L 867.054688 551.121094 L 867.59375 550.046875 L 868.066406 548.832031 L 868.535156 547.554688 L 868.941406 546.140625 L 869.277344 544.660156 L 869.613281 543.042969 L 876.078125 543.042969 L 874.863281 549.035156 L 872.84375 553.882812 L 869.882812 557.652344 L 866.113281 560.347656 L 861.402344 561.894531 L 855.878906 562.5 L 851.976562 562.230469 L 848.476562 561.421875 L 845.3125 560.210938 L 842.484375 558.394531 L 839.992188 556.039062 L 837.90625 553.140625 L 836.695312 551.054688 L 835.683594 548.765625 L 834.875 546.34375 L 834.269531 543.785156 L 833.867188 541.09375 L 833.730469 538.265625 Z M 833.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 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/and4b/sky130_fd_sc_lp__and4b_m.svg b/cells/and4b/sky130_fd_sc_lp__and4b_m.svg
index 1ae3a596..39d4ccf 100644
--- a/cells/and4b/sky130_fd_sc_lp__and4b_m.svg
+++ b/cells/and4b/sky130_fd_sc_lp__and4b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#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 1146.5 738.5 L 1181.5 738.5 L 1181.5 835.5 L 1146.5 835.5 Z M 858.5 738.5 L 892.5 738.5 L 892.5 835.5 L 858.5 835.5 Z M 1270.5 738.5 L 1305.5 738.5 L 1305.5 835.5 L 1270.5 835.5 Z M 1023.5 738.5 L 1057.5 738.5 L 1057.5 835.5 L 1023.5 835.5 Z M 940.5 738.5 L 975.5 738.5 L 975.5 835.5 L 940.5 835.5 Z M 614.5 759.5 L 648.5 759.5 L 648.5 855.5 L 614.5 855.5 Z M 614.5 759.5 "/>
 </clipPath>
-<image id="image322" 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="#image322"/>
+  <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 1270.5 367.5 L 1305.5 367.5 L 1305.5 463.5 L 1270.5 463.5 Z M 734.5 367.5 L 768.5 367.5 L 768.5 463.5 L 734.5 463.5 Z M 839.5 367.5 L 874.5 367.5 L 874.5 463.5 L 839.5 463.5 Z M 940.5 367.5 L 975.5 367.5 L 975.5 463.5 L 940.5 463.5 Z M 1042.5 367.5 L 1077.5 367.5 L 1077.5 463.5 L 1042.5 463.5 Z M 1146.5 367.5 L 1181.5 367.5 L 1181.5 463.5 L 1146.5 463.5 Z M 1146.5 367.5 "/>
 </clipPath>
-<image id="image323" 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="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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="#image324"/>
+  <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="surface318">
+<g id="surface347">
 <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 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/and4bb/sky130_fd_sc_lp__and4bb_1.svg b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.svg
index 702d32c..106db88 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_1.svg
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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 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="#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 1211.5 672.5 L 1245.5 672.5 L 1245.5 768.5 L 1211.5 768.5 Z M 1004.5 672.5 L 1039.5 672.5 L 1039.5 768.5 L 1004.5 768.5 Z M 1128.5 672.5 L 1162.5 672.5 L 1162.5 768.5 L 1128.5 768.5 Z M 922.5 672.5 L 956.5 672.5 L 956.5 768.5 L 922.5 768.5 Z M 559.5 763.5 L 593.5 763.5 L 593.5 860.5 L 559.5 860.5 Z M 657.5 763.5 L 691.5 763.5 L 691.5 860.5 L 657.5 860.5 Z M 1331.5 672.5 L 1365.5 672.5 L 1365.5 864.5 L 1331.5 864.5 Z M 1331.5 672.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 581.5 213.5 L 616.5 213.5 L 616.5 310.5 L 581.5 310.5 Z M 680.5 213.5 L 714.5 213.5 L 714.5 310.5 L 680.5 310.5 Z M 906.5 372.5 L 940.5 372.5 L 940.5 468.5 L 906.5 468.5 Z M 1004.5 372.5 L 1039.5 372.5 L 1039.5 468.5 L 1004.5 468.5 Z M 1211.5 372.5 L 1245.5 372.5 L 1245.5 468.5 L 1211.5 468.5 Z M 1112.5 372.5 L 1146.5 372.5 L 1146.5 468.5 L 1112.5 468.5 Z M 1331.5 209.5 L 1365.5 209.5 L 1365.5 498.5 L 1331.5 498.5 Z M 1331.5 209.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 696.1875 681.574219 L 696.1875 730.652344 L 689.121094 730.652344 L 663.738281 690.863281 L 663.738281 730.652344 L 657.816406 730.652344 L 657.816406 681.574219 L 664.613281 681.574219 L 690.265625 721.699219 L 690.265625 681.574219 Z M 696.1875 681.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 392 L 651 392 M 612 353 L 651 353 M 612 353 L 612 392 M 651 353 L 651 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 612 392 L 651 392 M 612 353 L 651 353 M 651 392 L 651 353 M 612 392 L 612 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/and4bb/sky130_fd_sc_lp__and4bb_2.svg b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.svg
index c4d0ee4..e442e6a 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_2.svg
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.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="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 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="#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 502.5 670.5 L 537.5 670.5 L 537.5 766.5 L 502.5 766.5 Z M 968.5 679.5 L 1002.5 679.5 L 1002.5 775.5 L 968.5 775.5 Z M 1256.5 679.5 L 1291.5 679.5 L 1291.5 775.5 L 1256.5 775.5 Z M 1380.5 679.5 L 1415.5 679.5 L 1415.5 775.5 L 1380.5 775.5 Z M 1050.5 679.5 L 1085.5 679.5 L 1085.5 775.5 L 1050.5 775.5 Z M 1174.5 679.5 L 1208.5 679.5 L 1208.5 775.5 L 1174.5 775.5 Z M 623.5 670.5 L 657.5 670.5 L 657.5 862.5 L 623.5 862.5 Z M 721.5 670.5 L 756.5 670.5 L 756.5 862.5 L 721.5 862.5 Z M 721.5 670.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 1280.5 346.5 L 1315.5 346.5 L 1315.5 443.5 L 1280.5 443.5 Z M 968.5 346.5 L 1002.5 346.5 L 1002.5 443.5 L 968.5 443.5 Z M 1380.5 346.5 L 1415.5 346.5 L 1415.5 443.5 L 1380.5 443.5 Z M 1066.5 346.5 L 1101.5 346.5 L 1101.5 443.5 L 1066.5 443.5 Z M 1174.5 346.5 L 1208.5 346.5 L 1208.5 443.5 L 1174.5 443.5 Z M 638.5 209.5 L 672.5 209.5 L 672.5 498.5 L 638.5 498.5 Z M 517.5 401.5 L 552.5 401.5 L 552.5 498.5 L 517.5 498.5 Z M 736.5 209.5 L 771.5 209.5 L 771.5 498.5 L 736.5 498.5 Z M 736.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1520.1875 766.574219 L 1520.1875 815.652344 L 1513.121094 815.652344 L 1487.738281 775.863281 L 1487.738281 815.652344 L 1481.816406 815.652344 L 1481.816406 766.574219 L 1488.613281 766.574219 L 1514.265625 806.699219 L 1514.265625 766.574219 Z M 1520.1875 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 1436 307 L 1475 307 M 1436 269 L 1475 269 M 1436 269 L 1436 307 M 1475 269 L 1475 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 1436 307 L 1475 307 M 1436 269 L 1475 269 M 1475 307 L 1475 269 M 1436 307 L 1436 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/and4bb/sky130_fd_sc_lp__and4bb_4.svg b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.svg
index f1f8f76..5492c5b 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_4.svg
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 539.5 L 201.5 539.5 Z M 201.5 111.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 366.5 672.5 L 400.5 672.5 L 400.5 768.5 L 366.5 768.5 Z M 1549.5 674.5 L 1583.5 674.5 L 1583.5 770.5 L 1549.5 770.5 Z M 979.5 672.5 L 1013.5 672.5 L 1013.5 864.5 L 979.5 864.5 Z M 536.5 672.5 L 570.5 672.5 L 570.5 864.5 L 536.5 864.5 Z M 634.5 672.5 L 669.5 672.5 L 669.5 864.5 L 634.5 864.5 Z M 733.5 672.5 L 767.5 672.5 L 767.5 864.5 L 733.5 864.5 Z M 1309.5 672.5 L 1344.5 672.5 L 1344.5 864.5 L 1309.5 864.5 Z M 1185.5 672.5 L 1220.5 672.5 L 1220.5 864.5 L 1185.5 864.5 Z M 1062.5 672.5 L 1096.5 672.5 L 1096.5 864.5 L 1062.5 864.5 Z M 831.5 672.5 L 866.5 672.5 L 866.5 864.5 L 831.5 864.5 Z M 831.5 672.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1185.5 209.5 L 1220.5 209.5 L 1220.5 498.5 L 1185.5 498.5 Z M 1433.5 401.5 L 1467.5 401.5 L 1467.5 498.5 L 1433.5 498.5 Z M 366.5 401.5 L 400.5 401.5 L 400.5 498.5 L 366.5 498.5 Z M 1309.5 209.5 L 1344.5 209.5 L 1344.5 498.5 L 1309.5 498.5 Z M 1062.5 209.5 L 1096.5 209.5 L 1096.5 498.5 L 1062.5 498.5 Z M 963.5 209.5 L 997.5 209.5 L 997.5 498.5 L 963.5 498.5 Z M 831.5 209.5 L 866.5 209.5 L 866.5 498.5 L 831.5 498.5 Z M 733.5 209.5 L 767.5 209.5 L 767.5 498.5 L 733.5 498.5 Z M 634.5 209.5 L 669.5 209.5 L 669.5 498.5 L 634.5 498.5 Z M 536.5 209.5 L 570.5 209.5 L 570.5 498.5 L 536.5 498.5 Z M 536.5 209.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface361">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 524.824219 536.320312 L 542.191406 561.5 L 534.449219 561.5 L 521.050781 541.035156 L 507.589844 561.5 L 499.980469 561.5 L 517.351562 536.320312 L 501.058594 512.421875 L 508.664062 512.421875 L 521.253906 531.675781 L 533.910156 512.421875 L 541.382812 512.421875 Z M 524.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 500 562 L 539 562 M 500 523 L 539 523 M 500 523 L 500 562 M 539 523 L 539 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 500 562 L 539 562 M 500 523 L 539 523 M 539 562 L 539 523 M 500 562 L 500 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/and4bb/sky130_fd_sc_lp__and4bb_lp.svg b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.svg
index cfacc27..fb1be00 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.svg
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.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 722.5 763.5 L 757.5 763.5 L 757.5 860.5 L 722.5 860.5 Z M 633.5 763.5 L 667.5 763.5 L 667.5 860.5 L 633.5 860.5 Z M 452.5 763.5 L 486.5 763.5 L 486.5 860.5 L 452.5 860.5 Z M 534.5 763.5 L 569.5 763.5 L 569.5 860.5 L 534.5 860.5 Z M 1217.5 768.5 L 1252.5 768.5 L 1252.5 864.5 L 1217.5 864.5 Z M 1348.5 768.5 L 1382.5 768.5 L 1382.5 864.5 L 1348.5 864.5 Z M 1431.5 768.5 L 1465.5 768.5 L 1465.5 864.5 L 1431.5 864.5 Z M 949.5 768.5 L 984.5 768.5 L 984.5 864.5 L 949.5 864.5 Z M 1128.5 768.5 L 1162.5 768.5 L 1162.5 864.5 L 1128.5 864.5 Z M 1039.5 768.5 L 1073.5 768.5 L 1073.5 864.5 L 1039.5 864.5 Z M 1039.5 768.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 1259.5 220.5 L 1316.5 220.5 L 1316.5 449.5 L 1259.5 449.5 Z M 755.5 220.5 L 812.5 220.5 L 812.5 449.5 L 755.5 449.5 Z M 1404.5 220.5 L 1462.5 220.5 L 1462.5 449.5 L 1404.5 449.5 Z M 1137.5 220.5 L 1195.5 220.5 L 1195.5 449.5 L 1137.5 449.5 Z M 997.5 220.5 L 1055.5 220.5 L 1055.5 449.5 L 997.5 449.5 Z M 876.5 220.5 L 933.5 220.5 L 933.5 449.5 L 876.5 449.5 Z M 452.5 229.5 L 509.5 229.5 L 509.5 459.5 L 452.5 459.5 Z M 452.5 229.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 694.1875 596.574219 L 694.1875 645.652344 L 687.121094 645.652344 L 661.738281 605.863281 L 661.738281 645.652344 L 655.816406 645.652344 L 655.816406 596.574219 L 662.613281 596.574219 L 688.265625 636.699219 L 688.265625 596.574219 Z M 694.1875 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 611 477 L 650 477 M 611 438 L 650 438 M 611 438 L 611 477 M 650 438 L 650 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 611 477 L 650 477 M 611 438 L 650 438 M 650 477 L 650 438 M 611 477 L 611 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/and4bb/sky130_fd_sc_lp__and4bb_m.svg b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.svg
index 3fc4f8f..989eecc 100644
--- a/cells/and4bb/sky130_fd_sc_lp__and4bb_m.svg
+++ b/cells/and4bb/sky130_fd_sc_lp__and4bb_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image369"/>
+  <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 1197.5 679.5 L 1231.5 679.5 L 1231.5 775.5 L 1197.5 775.5 Z M 1331.5 679.5 L 1365.5 679.5 L 1365.5 775.5 L 1331.5 775.5 Z M 991.5 679.5 L 1025.5 679.5 L 1025.5 775.5 L 991.5 775.5 Z M 1114.5 679.5 L 1149.5 679.5 L 1149.5 775.5 L 1114.5 775.5 Z M 908.5 679.5 L 942.5 679.5 L 942.5 775.5 L 908.5 775.5 Z M 688.5 759.5 L 722.5 759.5 L 722.5 855.5 L 688.5 855.5 Z M 589.5 759.5 L 624.5 759.5 L 624.5 855.5 L 589.5 855.5 Z M 589.5 759.5 "/>
 </clipPath>
-<image id="image370" 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="#image370"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 876.5 209.5 L 910.5 209.5 L 910.5 305.5 L 876.5 305.5 Z M 1279.5 209.5 L 1314.5 209.5 L 1314.5 305.5 L 1279.5 305.5 Z M 1172.5 209.5 L 1206.5 209.5 L 1206.5 305.5 L 1172.5 305.5 Z M 1073.5 209.5 L 1107.5 209.5 L 1107.5 305.5 L 1073.5 305.5 Z M 975.5 209.5 L 1009.5 209.5 L 1009.5 305.5 L 975.5 305.5 Z M 589.5 367.5 L 624.5 367.5 L 624.5 463.5 L 589.5 463.5 Z M 688.5 367.5 L 722.5 367.5 L 722.5 463.5 L 688.5 463.5 Z M 688.5 367.5 "/>
 </clipPath>
-<image id="image371" 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="#image371"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image372" 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="#image372"/>
+  <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="surface366">
+<g id="surface395">
 <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 1406.824219 536.320312 L 1424.191406 561.5 L 1416.449219 561.5 L 1403.050781 541.035156 L 1389.589844 561.5 L 1381.980469 561.5 L 1399.351562 536.320312 L 1383.058594 512.421875 L 1390.664062 512.421875 L 1403.253906 531.675781 L 1415.910156 512.421875 L 1423.382812 512.421875 Z M 1406.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 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/buf/sky130_fd_sc_lp__buf_0.svg b/cells/buf/sky130_fd_sc_lp__buf_0.svg
index a3c5a5c..8e6059a 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_0.svg
+++ b/cells/buf/sky130_fd_sc_lp__buf_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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 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="#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 1003.5 763.5 L 1038.5 763.5 L 1038.5 860.5 L 1003.5 860.5 Z M 891.5 763.5 L 925.5 763.5 L 925.5 860.5 L 891.5 860.5 Z M 891.5 763.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 1003.5 218.5 L 1038.5 218.5 L 1038.5 314.5 L 1003.5 314.5 Z M 891.5 218.5 L 925.5 218.5 L 925.5 365.5 L 891.5 365.5 Z M 891.5 218.5 "/>
 </clipPath>
-<image id="image281" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image281"/>
+  <use xlink:href="#image309"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image282" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image282"/>
+  <use xlink:href="#image310"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface276">
+<g id="surface304">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <path style=" 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/buf/sky130_fd_sc_lp__buf_1.svg b/cells/buf/sky130_fd_sc_lp__buf_1.svg
index ef00181..a65b1be 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_1.svg
+++ b/cells/buf/sky130_fd_sc_lp__buf_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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 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="#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 1003.5 672.5 L 1038.5 672.5 L 1038.5 768.5 L 1003.5 768.5 Z M 891.5 672.5 L 925.5 672.5 L 925.5 864.5 L 891.5 864.5 Z M 891.5 672.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 891.5 209.5 L 925.5 209.5 L 925.5 498.5 L 891.5 498.5 Z M 1003.5 351.5 L 1038.5 351.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1003.5 351.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -152,6 +152,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 859.824219 282.320312 L 877.191406 307.5 L 869.449219 307.5 L 856.050781 287.035156 L 842.589844 307.5 L 834.980469 307.5 L 852.351562 282.320312 L 836.058594 258.421875 L 843.664062 258.421875 L 856.253906 277.675781 L 868.910156 258.421875 L 876.382812 258.421875 Z M 859.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 835 816 L 874 816 M 835 777 L 874 777 M 835 777 L 835 816 M 874 777 L 874 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 835 816 L 874 816 M 835 777 L 874 777 M 874 816 L 874 777 M 835 816 L 835 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/buf/sky130_fd_sc_lp__buf_16.svg b/cells/buf/sky130_fd_sc_lp__buf_16.svg
index 040dbdf..e60852e 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_16.svg
+++ b/cells/buf/sky130_fd_sc_lp__buf_16.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="image271" 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="#image271"/>
+  <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 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="#image271"/>
+  <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 1633.5 623.5 L 1655.5 623.5 L 1655.5 749.5 L 1633.5 749.5 Z M 278.5 623.5 L 301.5 623.5 L 301.5 749.5 L 278.5 749.5 Z M 343.5 623.5 L 365.5 623.5 L 365.5 749.5 L 343.5 749.5 Z M 407.5 623.5 L 430.5 623.5 L 430.5 749.5 L 407.5 749.5 Z M 472.5 623.5 L 494.5 623.5 L 494.5 749.5 L 472.5 749.5 Z M 536.5 623.5 L 559.5 623.5 L 559.5 749.5 L 536.5 749.5 Z M 601.5 623.5 L 623.5 623.5 L 623.5 749.5 L 601.5 749.5 Z M 665.5 623.5 L 688.5 623.5 L 688.5 749.5 L 665.5 749.5 Z M 730.5 623.5 L 752.5 623.5 L 752.5 749.5 L 730.5 749.5 Z M 794.5 623.5 L 817.5 623.5 L 817.5 749.5 L 794.5 749.5 Z M 859.5 623.5 L 881.5 623.5 L 881.5 749.5 L 859.5 749.5 Z M 923.5 623.5 L 946.5 623.5 L 946.5 749.5 L 923.5 749.5 Z M 988.5 623.5 L 1010.5 623.5 L 1010.5 749.5 L 988.5 749.5 Z M 1052.5 623.5 L 1075.5 623.5 L 1075.5 749.5 L 1052.5 749.5 Z M 1117.5 623.5 L 1139.5 623.5 L 1139.5 749.5 L 1117.5 749.5 Z M 1181.5 623.5 L 1204.5 623.5 L 1204.5 749.5 L 1181.5 749.5 Z M 1246.5 623.5 L 1268.5 623.5 L 1268.5 749.5 L 1246.5 749.5 Z M 1310.5 623.5 L 1333.5 623.5 L 1333.5 749.5 L 1310.5 749.5 Z M 1375.5 623.5 L 1397.5 623.5 L 1397.5 749.5 L 1375.5 749.5 Z M 1439.5 623.5 L 1462.5 623.5 L 1462.5 749.5 L 1439.5 749.5 Z M 1504.5 623.5 L 1526.5 623.5 L 1526.5 749.5 L 1504.5 749.5 Z M 1568.5 623.5 L 1591.5 623.5 L 1591.5 749.5 L 1568.5 749.5 Z M 1568.5 623.5 "/>
 </clipPath>
-<image id="image272" 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="#image272"/>
+  <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 1633.5 320.5 L 1655.5 320.5 L 1655.5 509.5 L 1633.5 509.5 Z M 278.5 320.5 L 301.5 320.5 L 301.5 509.5 L 278.5 509.5 Z M 343.5 320.5 L 365.5 320.5 L 365.5 509.5 L 343.5 509.5 Z M 407.5 320.5 L 430.5 320.5 L 430.5 509.5 L 407.5 509.5 Z M 472.5 320.5 L 494.5 320.5 L 494.5 509.5 L 472.5 509.5 Z M 536.5 320.5 L 559.5 320.5 L 559.5 509.5 L 536.5 509.5 Z M 601.5 320.5 L 623.5 320.5 L 623.5 509.5 L 601.5 509.5 Z M 665.5 320.5 L 688.5 320.5 L 688.5 509.5 L 665.5 509.5 Z M 730.5 320.5 L 752.5 320.5 L 752.5 509.5 L 730.5 509.5 Z M 794.5 320.5 L 817.5 320.5 L 817.5 509.5 L 794.5 509.5 Z M 859.5 320.5 L 881.5 320.5 L 881.5 509.5 L 859.5 509.5 Z M 923.5 320.5 L 946.5 320.5 L 946.5 509.5 L 923.5 509.5 Z M 988.5 320.5 L 1010.5 320.5 L 1010.5 509.5 L 988.5 509.5 Z M 1052.5 320.5 L 1075.5 320.5 L 1075.5 509.5 L 1052.5 509.5 Z M 1117.5 320.5 L 1139.5 320.5 L 1139.5 509.5 L 1117.5 509.5 Z M 1181.5 320.5 L 1204.5 320.5 L 1204.5 509.5 L 1181.5 509.5 Z M 1246.5 320.5 L 1268.5 320.5 L 1268.5 509.5 L 1246.5 509.5 Z M 1310.5 320.5 L 1333.5 320.5 L 1333.5 509.5 L 1310.5 509.5 Z M 1375.5 320.5 L 1397.5 320.5 L 1397.5 509.5 L 1375.5 509.5 Z M 1439.5 320.5 L 1462.5 320.5 L 1462.5 509.5 L 1439.5 509.5 Z M 1504.5 320.5 L 1526.5 320.5 L 1526.5 509.5 L 1504.5 509.5 Z M 1568.5 320.5 L 1591.5 320.5 L 1591.5 509.5 L 1568.5 509.5 Z M 1568.5 320.5 "/>
 </clipPath>
-<image id="image273" 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="#image273"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 696.5 467.5 L 721.5 467.5 L 721.5 468.5 L 696.5 468.5 Z M 1212.5 467.5 L 1237.5 467.5 L 1237.5 468.5 L 1212.5 468.5 Z M 825.5 467.5 L 850.5 467.5 L 850.5 468.5 L 825.5 468.5 Z M 1083.5 467.5 L 1108.5 467.5 L 1108.5 468.5 L 1083.5 468.5 Z M 1341.5 467.5 L 1366.5 467.5 L 1366.5 468.5 L 1341.5 468.5 Z M 1470.5 467.5 L 1495.5 467.5 L 1495.5 468.5 L 1470.5 468.5 Z M 1599.5 467.5 L 1624.5 467.5 L 1624.5 468.5 L 1599.5 468.5 Z M 954.5 467.5 L 979.5 467.5 L 979.5 468.5 L 954.5 468.5 Z M 1470.5 468.5 L 1495.5 468.5 L 1495.5 492.5 L 1470.5 492.5 Z M 825.5 468.5 L 850.5 468.5 L 850.5 492.5 L 825.5 492.5 Z M 1083.5 468.5 L 1108.5 468.5 L 1108.5 492.5 L 1083.5 492.5 Z M 1599.5 468.5 L 1624.5 468.5 L 1624.5 492.5 L 1599.5 492.5 Z M 1212.5 468.5 L 1237.5 468.5 L 1237.5 492.5 L 1212.5 492.5 Z M 1341.5 468.5 L 1366.5 468.5 L 1366.5 492.5 L 1341.5 492.5 Z M 954.5 468.5 L 979.5 468.5 L 979.5 492.5 L 954.5 492.5 Z M 696.5 468.5 L 721.5 468.5 L 721.5 492.5 L 696.5 492.5 Z M 1147.5 522.5 L 1173.5 522.5 L 1173.5 548.5 L 1147.5 548.5 Z M 1534.5 522.5 L 1560.5 522.5 L 1560.5 548.5 L 1534.5 548.5 Z M 1018.5 522.5 L 1044.5 522.5 L 1044.5 548.5 L 1018.5 548.5 Z M 760.5 522.5 L 786.5 522.5 L 786.5 548.5 L 760.5 548.5 Z M 1405.5 522.5 L 1431.5 522.5 L 1431.5 548.5 L 1405.5 548.5 Z M 889.5 522.5 L 915.5 522.5 L 915.5 548.5 L 889.5 548.5 Z M 640.5 522.5 L 666.5 522.5 L 666.5 548.5 L 640.5 548.5 Z M 1276.5 522.5 L 1302.5 522.5 L 1302.5 548.5 L 1276.5 548.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="image274" 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="#image274"/>
+  <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="surface268">
+<g id="surface297">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -140,6 +140,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 534.109375 596.976562 L 521.890625 596.976562 L 518.542969 606.5 L 514.238281 606.5 L 525.542969 574.804688 L 530.761719 574.804688 L 541.890625 606.5 L 537.371094 606.5 Z M 532.976562 593.585938 L 528.109375 579.152344 L 522.890625 593.585938 Z M 532.976562 593.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 514 501 L 540 501 M 514 476 L 540 476 M 514 476 L 514 501 M 540 476 L 540 501 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 514 501 L 540 501 M 514 476 L 540 476 M 540 501 L 540 476 M 514 501 L 514 476 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/buf/sky130_fd_sc_lp__buf_2.svg b/cells/buf/sky130_fd_sc_lp__buf_2.svg
index 9ef4f34..859186a 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_2.svg
+++ b/cells/buf/sky130_fd_sc_lp__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 539.5 L 644.5 539.5 Z M 644.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 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="#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 1091.5 672.5 L 1126.5 672.5 L 1126.5 768.5 L 1091.5 768.5 Z M 791.5 672.5 L 826.5 672.5 L 826.5 864.5 L 791.5 864.5 Z M 890.5 672.5 L 924.5 672.5 L 924.5 864.5 L 890.5 864.5 Z M 890.5 672.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 800.5 209.5 L 835.5 209.5 L 835.5 498.5 L 800.5 498.5 Z M 1091.5 351.5 L 1126.5 351.5 L 1126.5 498.5 L 1091.5 498.5 Z M 899.5 209.5 L 933.5 209.5 L 933.5 498.5 L 899.5 498.5 Z M 899.5 209.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" 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/buf/sky130_fd_sc_lp__buf_4.svg b/cells/buf/sky130_fd_sc_lp__buf_4.svg
index 985272b..7bc0665 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_4.svg
+++ b/cells/buf/sky130_fd_sc_lp__buf_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.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 1167.5 670.5 L 1201.5 670.5 L 1201.5 862.5 L 1167.5 862.5 Z M 773.5 670.5 L 807.5 670.5 L 807.5 862.5 L 773.5 862.5 Z M 871.5 670.5 L 906.5 670.5 L 906.5 862.5 L 871.5 862.5 Z M 970.5 670.5 L 1004.5 670.5 L 1004.5 862.5 L 970.5 862.5 Z M 1068.5 670.5 L 1103.5 670.5 L 1103.5 862.5 L 1068.5 862.5 Z M 1068.5 670.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 1167.5 209.5 L 1201.5 209.5 L 1201.5 498.5 L 1167.5 498.5 Z M 773.5 209.5 L 807.5 209.5 L 807.5 498.5 L 773.5 498.5 Z M 871.5 209.5 L 906.5 209.5 L 906.5 498.5 L 871.5 498.5 Z M 970.5 209.5 L 1004.5 209.5 L 1004.5 498.5 L 970.5 498.5 Z M 1068.5 209.5 L 1103.5 209.5 L 1103.5 498.5 L 1068.5 498.5 Z M 1068.5 209.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -143,6 +143,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 692.824219 536.320312 L 710.191406 561.5 L 702.449219 561.5 L 689.050781 541.035156 L 675.589844 561.5 L 667.980469 561.5 L 685.351562 536.320312 L 669.058594 512.421875 L 676.664062 512.421875 L 689.253906 531.675781 L 701.910156 512.421875 L 709.382812 512.421875 Z M 692.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 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/buf/sky130_fd_sc_lp__buf_8.svg b/cells/buf/sky130_fd_sc_lp__buf_8.svg
index 313495b..60fd145 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_8.svg
+++ b/cells/buf/sky130_fd_sc_lp__buf_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.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 1433.5 672.5 L 1467.5 672.5 L 1467.5 864.5 L 1433.5 864.5 Z M 447.5 672.5 L 482.5 672.5 L 482.5 864.5 L 447.5 864.5 Z M 546.5 672.5 L 580.5 672.5 L 580.5 864.5 L 546.5 864.5 Z M 644.5 672.5 L 679.5 672.5 L 679.5 864.5 L 644.5 864.5 Z M 743.5 672.5 L 777.5 672.5 L 777.5 864.5 L 743.5 864.5 Z M 842.5 672.5 L 876.5 672.5 L 876.5 864.5 L 842.5 864.5 Z M 940.5 672.5 L 975.5 672.5 L 975.5 864.5 L 940.5 864.5 Z M 1039.5 672.5 L 1073.5 672.5 L 1073.5 864.5 L 1039.5 864.5 Z M 1137.5 672.5 L 1172.5 672.5 L 1172.5 864.5 L 1137.5 864.5 Z M 1236.5 672.5 L 1270.5 672.5 L 1270.5 864.5 L 1236.5 864.5 Z M 1334.5 672.5 L 1369.5 672.5 L 1369.5 864.5 L 1334.5 864.5 Z M 1334.5 672.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 1433.5 209.5 L 1467.5 209.5 L 1467.5 498.5 L 1433.5 498.5 Z M 447.5 209.5 L 482.5 209.5 L 482.5 498.5 L 447.5 498.5 Z M 546.5 209.5 L 580.5 209.5 L 580.5 498.5 L 546.5 498.5 Z M 644.5 209.5 L 679.5 209.5 L 679.5 498.5 L 644.5 498.5 Z M 743.5 209.5 L 777.5 209.5 L 777.5 498.5 L 743.5 498.5 Z M 842.5 209.5 L 876.5 209.5 L 876.5 498.5 L 842.5 498.5 Z M 940.5 209.5 L 975.5 209.5 L 975.5 498.5 L 940.5 498.5 Z M 1039.5 209.5 L 1073.5 209.5 L 1073.5 498.5 L 1039.5 498.5 Z M 1137.5 209.5 L 1172.5 209.5 L 1172.5 498.5 L 1137.5 498.5 Z M 1236.5 209.5 L 1270.5 209.5 L 1270.5 498.5 L 1236.5 498.5 Z M 1334.5 209.5 L 1369.5 209.5 L 1369.5 498.5 L 1334.5 498.5 Z M 1334.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -146,6 +146,5 @@
 <path style=" 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/buf/sky130_fd_sc_lp__buf_lp.svg b/cells/buf/sky130_fd_sc_lp__buf_lp.svg
index 05e150e..9f708b7 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_lp.svg
+++ b/cells/buf/sky130_fd_sc_lp__buf_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1094.5 757.5 L 1128.5 757.5 L 1128.5 853.5 L 1094.5 853.5 Z M 796.5 757.5 L 830.5 757.5 L 830.5 853.5 L 796.5 853.5 Z M 878.5 757.5 L 913.5 757.5 L 913.5 853.5 L 878.5 853.5 Z M 1011.5 757.5 L 1046.5 757.5 L 1046.5 853.5 L 1011.5 853.5 Z M 1011.5 757.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 988.5 223.5 L 1046.5 223.5 L 1046.5 452.5 L 988.5 452.5 Z M 811.5 223.5 L 868.5 223.5 L 868.5 452.5 L 811.5 452.5 Z M 811.5 223.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 747.824219 282.320312 L 765.191406 307.5 L 757.449219 307.5 L 744.050781 287.035156 L 730.589844 307.5 L 722.980469 307.5 L 740.351562 282.320312 L 724.058594 258.421875 L 731.664062 258.421875 L 744.253906 277.675781 L 756.910156 258.421875 L 764.382812 258.421875 Z M 747.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 724 816 L 763 816 M 724 777 L 763 777 M 724 777 L 724 816 M 763 777 L 763 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 724 816 L 763 816 M 724 777 L 763 777 M 763 816 L 763 777 M 724 816 L 724 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/buf/sky130_fd_sc_lp__buf_m.svg b/cells/buf/sky130_fd_sc_lp__buf_m.svg
index 925f0ac..a758a4c 100644
--- a/cells/buf/sky130_fd_sc_lp__buf_m.svg
+++ b/cells/buf/sky130_fd_sc_lp__buf_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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 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="#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 989.5 742.5 L 1024.5 742.5 L 1024.5 838.5 L 989.5 838.5 Z M 891.5 742.5 L 925.5 742.5 L 925.5 838.5 L 891.5 838.5 Z M 891.5 742.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 989.5 215.5 L 1024.5 215.5 L 1024.5 311.5 L 989.5 311.5 Z M 891.5 215.5 L 925.5 215.5 L 925.5 311.5 L 891.5 311.5 Z M 891.5 215.5 "/>
 </clipPath>
-<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 859.824219 282.320312 L 877.191406 307.5 L 869.449219 307.5 L 856.050781 287.035156 L 842.589844 307.5 L 834.980469 307.5 L 852.351562 282.320312 L 836.058594 258.421875 L 843.664062 258.421875 L 856.253906 277.675781 L 868.910156 258.421875 L 876.382812 258.421875 Z M 859.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 835 816 L 874 816 M 835 777 L 874 777 M 835 777 L 835 816 M 874 777 L 874 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 835 816 L 874 816 M 835 777 L 874 777 M 874 816 L 874 777 M 835 816 L 835 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/bufbuf/sky130_fd_sc_lp__bufbuf_16.svg b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.svg
index 1fc2a20..27aabe3 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.svg
+++ b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 308.5 L 1743.5 308.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 308.5 "/>
 </clipPath>
-<image id="image271" 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="#image271"/>
+  <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 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="#image271"/>
+  <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 403.5 605.5 L 422.5 605.5 L 422.5 708.5 L 403.5 708.5 Z M 351.5 605.5 L 369.5 605.5 L 369.5 708.5 L 351.5 708.5 Z M 246.5 605.5 L 264.5 605.5 L 264.5 708.5 L 246.5 708.5 Z M 299.5 605.5 L 317.5 605.5 L 317.5 708.5 L 299.5 708.5 Z M 708.5 606.5 L 727.5 606.5 L 727.5 709.5 L 708.5 709.5 Z M 761.5 606.5 L 779.5 606.5 L 779.5 709.5 L 761.5 709.5 Z M 813.5 606.5 L 832.5 606.5 L 832.5 709.5 L 813.5 709.5 Z M 866.5 606.5 L 884.5 606.5 L 884.5 709.5 L 866.5 709.5 Z M 918.5 606.5 L 937.5 606.5 L 937.5 709.5 L 918.5 709.5 Z M 971.5 606.5 L 989.5 606.5 L 989.5 709.5 L 971.5 709.5 Z M 1023.5 606.5 L 1042.5 606.5 L 1042.5 709.5 L 1023.5 709.5 Z M 1076.5 606.5 L 1094.5 606.5 L 1094.5 709.5 L 1076.5 709.5 Z M 1128.5 606.5 L 1146.5 606.5 L 1146.5 709.5 L 1128.5 709.5 Z M 1181.5 606.5 L 1199.5 606.5 L 1199.5 709.5 L 1181.5 709.5 Z M 1233.5 606.5 L 1251.5 606.5 L 1251.5 709.5 L 1233.5 709.5 Z M 1286.5 606.5 L 1304.5 606.5 L 1304.5 709.5 L 1286.5 709.5 Z M 1338.5 606.5 L 1356.5 606.5 L 1356.5 709.5 L 1338.5 709.5 Z M 1390.5 606.5 L 1409.5 606.5 L 1409.5 709.5 L 1390.5 709.5 Z M 1443.5 606.5 L 1461.5 606.5 L 1461.5 709.5 L 1443.5 709.5 Z M 1495.5 606.5 L 1514.5 606.5 L 1514.5 709.5 L 1495.5 709.5 Z M 1548.5 606.5 L 1566.5 606.5 L 1566.5 709.5 L 1548.5 709.5 Z M 1600.5 606.5 L 1619.5 606.5 L 1619.5 709.5 L 1600.5 709.5 Z M 1653.5 606.5 L 1671.5 606.5 L 1671.5 709.5 L 1653.5 709.5 Z M 551.5 606.5 L 569.5 606.5 L 569.5 709.5 L 551.5 709.5 Z M 656.5 606.5 L 674.5 606.5 L 674.5 709.5 L 656.5 709.5 Z M 604.5 606.5 L 622.5 606.5 L 622.5 709.5 L 604.5 709.5 Z M 604.5 606.5 "/>
 </clipPath>
-<image id="image272" 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="#image272"/>
+  <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 1653.5 360.5 L 1671.5 360.5 L 1671.5 514.5 L 1653.5 514.5 Z M 246.5 360.5 L 264.5 360.5 L 264.5 514.5 L 246.5 514.5 Z M 299.5 360.5 L 317.5 360.5 L 317.5 514.5 L 299.5 514.5 Z M 351.5 360.5 L 369.5 360.5 L 369.5 514.5 L 351.5 514.5 Z M 403.5 360.5 L 422.5 360.5 L 422.5 514.5 L 403.5 514.5 Z M 551.5 360.5 L 569.5 360.5 L 569.5 514.5 L 551.5 514.5 Z M 604.5 360.5 L 622.5 360.5 L 622.5 514.5 L 604.5 514.5 Z M 656.5 360.5 L 674.5 360.5 L 674.5 514.5 L 656.5 514.5 Z M 708.5 360.5 L 727.5 360.5 L 727.5 514.5 L 708.5 514.5 Z M 761.5 360.5 L 779.5 360.5 L 779.5 514.5 L 761.5 514.5 Z M 813.5 360.5 L 832.5 360.5 L 832.5 514.5 L 813.5 514.5 Z M 866.5 360.5 L 884.5 360.5 L 884.5 514.5 L 866.5 514.5 Z M 918.5 360.5 L 937.5 360.5 L 937.5 514.5 L 918.5 514.5 Z M 971.5 360.5 L 989.5 360.5 L 989.5 514.5 L 971.5 514.5 Z M 1023.5 360.5 L 1042.5 360.5 L 1042.5 514.5 L 1023.5 514.5 Z M 1076.5 360.5 L 1094.5 360.5 L 1094.5 514.5 L 1076.5 514.5 Z M 1128.5 360.5 L 1146.5 360.5 L 1146.5 514.5 L 1128.5 514.5 Z M 1181.5 360.5 L 1199.5 360.5 L 1199.5 514.5 L 1181.5 514.5 Z M 1233.5 360.5 L 1251.5 360.5 L 1251.5 514.5 L 1233.5 514.5 Z M 1286.5 360.5 L 1304.5 360.5 L 1304.5 514.5 L 1286.5 514.5 Z M 1338.5 360.5 L 1356.5 360.5 L 1356.5 514.5 L 1338.5 514.5 Z M 1390.5 360.5 L 1409.5 360.5 L 1409.5 514.5 L 1390.5 514.5 Z M 1443.5 360.5 L 1461.5 360.5 L 1461.5 514.5 L 1443.5 514.5 Z M 1495.5 360.5 L 1514.5 360.5 L 1514.5 514.5 L 1495.5 514.5 Z M 1548.5 360.5 L 1566.5 360.5 L 1566.5 514.5 L 1548.5 514.5 Z M 1600.5 360.5 L 1619.5 360.5 L 1619.5 514.5 L 1600.5 514.5 Z M 1600.5 360.5 "/>
 </clipPath>
-<image id="image273" 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="#image273"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 891.5 479.5 L 912.5 479.5 L 912.5 498.5 L 891.5 498.5 Z M 1415.5 479.5 L 1436.5 479.5 L 1436.5 498.5 L 1415.5 498.5 Z M 996.5 479.5 L 1017.5 479.5 L 1017.5 498.5 L 996.5 498.5 Z M 1311.5 479.5 L 1331.5 479.5 L 1331.5 498.5 L 1311.5 498.5 Z M 1520.5 479.5 L 1541.5 479.5 L 1541.5 498.5 L 1520.5 498.5 Z M 1625.5 479.5 L 1646.5 479.5 L 1646.5 498.5 L 1625.5 498.5 Z M 1206.5 479.5 L 1226.5 479.5 L 1226.5 498.5 L 1206.5 498.5 Z M 1101.5 479.5 L 1121.5 479.5 L 1121.5 498.5 L 1101.5 498.5 Z M 1101.5 498.5 L 1121.5 498.5 L 1121.5 500.5 L 1101.5 500.5 Z M 1415.5 498.5 L 1436.5 498.5 L 1436.5 500.5 L 1415.5 500.5 Z M 1206.5 498.5 L 1226.5 498.5 L 1226.5 500.5 L 1206.5 500.5 Z M 891.5 498.5 L 912.5 498.5 L 912.5 500.5 L 891.5 500.5 Z M 1311.5 498.5 L 1331.5 498.5 L 1331.5 500.5 L 1311.5 500.5 Z M 996.5 498.5 L 1017.5 498.5 L 1017.5 500.5 L 996.5 500.5 Z M 1520.5 498.5 L 1541.5 498.5 L 1541.5 500.5 L 1520.5 500.5 Z M 1625.5 498.5 L 1646.5 498.5 L 1646.5 500.5 L 1625.5 500.5 Z M 1153.5 524.5 L 1174.5 524.5 L 1174.5 545.5 L 1153.5 545.5 Z M 1573.5 524.5 L 1594.5 524.5 L 1594.5 545.5 L 1573.5 545.5 Z M 1048.5 524.5 L 1069.5 524.5 L 1069.5 545.5 L 1048.5 545.5 Z M 846.5 524.5 L 866.5 524.5 L 866.5 545.5 L 846.5 545.5 Z M 1468.5 524.5 L 1489.5 524.5 L 1489.5 545.5 L 1468.5 545.5 Z M 943.5 524.5 L 964.5 524.5 L 964.5 545.5 L 943.5 545.5 Z M 1258.5 524.5 L 1279.5 524.5 L 1279.5 545.5 L 1258.5 545.5 Z M 1363.5 524.5 L 1384.5 524.5 L 1384.5 545.5 L 1363.5 545.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="image274" 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="#image274"/>
+  <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="surface268">
+<g id="surface297">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -140,6 +140,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 232.121094 539.820312 L 222.265625 539.820312 L 219.566406 547.5 L 216.097656 547.5 L 225.210938 521.9375 L 229.421875 521.9375 L 238.394531 547.5 L 234.75 547.5 Z M 231.207031 537.085938 L 227.28125 525.445312 L 223.074219 537.085938 Z M 231.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 216 555 L 237 555 M 216 534 L 237 534 M 216 534 L 216 555 M 237 534 L 237 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 216 555 L 237 555 M 216 534 L 237 534 M 237 555 L 237 534 M 216 555 L 216 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 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/bufbuf/sky130_fd_sc_lp__bufbuf_8.svg b/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.svg
index 9434cd9..4c1cbf4 100644
--- a/cells/bufbuf/sky130_fd_sc_lp__bufbuf_8.svg
+++ b/cells/bufbuf/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 174.5 152.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 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="#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 1591.5 656.5 L 1622.5 656.5 L 1622.5 743.5 L 1591.5 743.5 Z M 359.5 656.5 L 390.5 656.5 L 390.5 830.5 L 359.5 830.5 Z M 448.5 656.5 L 479.5 656.5 L 479.5 830.5 L 448.5 830.5 Z M 537.5 656.5 L 568.5 656.5 L 568.5 830.5 L 537.5 830.5 Z M 626.5 656.5 L 657.5 656.5 L 657.5 830.5 L 626.5 830.5 Z M 715.5 656.5 L 746.5 656.5 L 746.5 830.5 L 715.5 830.5 Z M 804.5 656.5 L 835.5 656.5 L 835.5 830.5 L 804.5 830.5 Z M 893.5 656.5 L 924.5 656.5 L 924.5 830.5 L 893.5 830.5 Z M 982.5 656.5 L 1013.5 656.5 L 1013.5 830.5 L 982.5 830.5 Z M 1080.5 656.5 L 1111.5 656.5 L 1111.5 830.5 L 1080.5 830.5 Z M 1169.5 656.5 L 1201.5 656.5 L 1201.5 830.5 L 1169.5 830.5 Z M 1258.5 656.5 L 1290.5 656.5 L 1290.5 830.5 L 1258.5 830.5 Z M 1474.5 656.5 L 1505.5 656.5 L 1505.5 830.5 L 1474.5 830.5 Z M 1474.5 656.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 359.5 240.5 L 390.5 240.5 L 390.5 501.5 L 359.5 501.5 Z M 1591.5 368.5 L 1622.5 368.5 L 1622.5 501.5 L 1591.5 501.5 Z M 1482.5 240.5 L 1513.5 240.5 L 1513.5 501.5 L 1482.5 501.5 Z M 1258.5 240.5 L 1290.5 240.5 L 1290.5 501.5 L 1258.5 501.5 Z M 1169.5 240.5 L 1201.5 240.5 L 1201.5 501.5 L 1169.5 501.5 Z M 1080.5 240.5 L 1111.5 240.5 L 1111.5 501.5 L 1080.5 501.5 Z M 982.5 240.5 L 1013.5 240.5 L 1013.5 501.5 L 982.5 501.5 Z M 893.5 240.5 L 924.5 240.5 L 924.5 501.5 L 893.5 501.5 Z M 804.5 240.5 L 835.5 240.5 L 835.5 501.5 L 804.5 501.5 Z M 715.5 240.5 L 746.5 240.5 L 746.5 501.5 L 715.5 501.5 Z M 626.5 240.5 L 657.5 240.5 L 657.5 501.5 L 626.5 501.5 Z M 537.5 240.5 L 568.5 240.5 L 568.5 501.5 L 537.5 501.5 Z M 448.5 240.5 L 479.5 240.5 L 479.5 501.5 L 448.5 501.5 Z M 448.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface271">
+<g id="surface300">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 268.628906 535.421875 L 284.550781 558.5 L 277.453125 558.5 L 265.171875 539.738281 L 252.832031 558.5 L 245.859375 558.5 L 261.777344 535.421875 L 246.84375 513.511719 L 253.820312 513.511719 L 265.359375 531.160156 L 276.960938 513.511719 L 283.808594 513.511719 Z M 268.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 246 560 L 281 560 M 246 525 L 281 525 M 246 525 L 246 560 M 281 525 L 281 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 246 560 L 281 560 M 246 525 L 281 525 M 281 560 L 281 525 M 246 560 L 246 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_lp__bufinv_16.svg b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.svg
index e032ac2..1c5357f 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_16.svg
+++ b/cells/bufinv/sky130_fd_sc_lp__bufinv_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 290.5 L 1744.5 290.5 L 1744.5 536.5 L 175.5 536.5 Z M 175.5 290.5 "/>
 </clipPath>
-<image id="image280" 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="#image280"/>
+  <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 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="#image280"/>
+  <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 1643.5 611.5 L 1663.5 611.5 L 1663.5 722.5 L 1643.5 722.5 Z M 276.5 611.5 L 296.5 611.5 L 296.5 722.5 L 276.5 722.5 Z M 333.5 611.5 L 353.5 611.5 L 353.5 722.5 L 333.5 722.5 Z M 390.5 611.5 L 409.5 611.5 L 409.5 722.5 L 390.5 722.5 Z M 452.5 611.5 L 472.5 611.5 L 472.5 722.5 L 452.5 722.5 Z M 509.5 611.5 L 529.5 611.5 L 529.5 722.5 L 509.5 722.5 Z M 566.5 611.5 L 585.5 611.5 L 585.5 722.5 L 566.5 722.5 Z M 622.5 611.5 L 642.5 611.5 L 642.5 722.5 L 622.5 722.5 Z M 679.5 611.5 L 699.5 611.5 L 699.5 722.5 L 679.5 722.5 Z M 736.5 611.5 L 756.5 611.5 L 756.5 722.5 L 736.5 722.5 Z M 792.5 611.5 L 812.5 611.5 L 812.5 722.5 L 792.5 722.5 Z M 849.5 611.5 L 869.5 611.5 L 869.5 722.5 L 849.5 722.5 Z M 906.5 611.5 L 926.5 611.5 L 926.5 722.5 L 906.5 722.5 Z M 963.5 611.5 L 982.5 611.5 L 982.5 722.5 L 963.5 722.5 Z M 1019.5 611.5 L 1039.5 611.5 L 1039.5 722.5 L 1019.5 722.5 Z M 1076.5 611.5 L 1096.5 611.5 L 1096.5 722.5 L 1076.5 722.5 Z M 1133.5 611.5 L 1152.5 611.5 L 1152.5 722.5 L 1133.5 722.5 Z M 1189.5 611.5 L 1209.5 611.5 L 1209.5 722.5 L 1189.5 722.5 Z M 1246.5 611.5 L 1266.5 611.5 L 1266.5 722.5 L 1246.5 722.5 Z M 1303.5 611.5 L 1323.5 611.5 L 1323.5 722.5 L 1303.5 722.5 Z M 1359.5 611.5 L 1379.5 611.5 L 1379.5 722.5 L 1359.5 722.5 Z M 1416.5 611.5 L 1436.5 611.5 L 1436.5 722.5 L 1416.5 722.5 Z M 1473.5 611.5 L 1493.5 611.5 L 1493.5 722.5 L 1473.5 722.5 Z M 1530.5 611.5 L 1549.5 611.5 L 1549.5 722.5 L 1530.5 722.5 Z M 1586.5 611.5 L 1606.5 611.5 L 1606.5 722.5 L 1586.5 722.5 Z M 1586.5 611.5 "/>
 </clipPath>
-<image id="image281" 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="#image281"/>
+  <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 1643.5 346.5 L 1663.5 346.5 L 1663.5 512.5 L 1643.5 512.5 Z M 276.5 346.5 L 296.5 346.5 L 296.5 512.5 L 276.5 512.5 Z M 333.5 346.5 L 353.5 346.5 L 353.5 512.5 L 333.5 512.5 Z M 390.5 346.5 L 409.5 346.5 L 409.5 512.5 L 390.5 512.5 Z M 452.5 346.5 L 472.5 346.5 L 472.5 512.5 L 452.5 512.5 Z M 509.5 346.5 L 529.5 346.5 L 529.5 512.5 L 509.5 512.5 Z M 566.5 346.5 L 585.5 346.5 L 585.5 512.5 L 566.5 512.5 Z M 622.5 346.5 L 642.5 346.5 L 642.5 512.5 L 622.5 512.5 Z M 679.5 346.5 L 699.5 346.5 L 699.5 512.5 L 679.5 512.5 Z M 736.5 346.5 L 756.5 346.5 L 756.5 512.5 L 736.5 512.5 Z M 792.5 346.5 L 812.5 346.5 L 812.5 512.5 L 792.5 512.5 Z M 849.5 346.5 L 869.5 346.5 L 869.5 512.5 L 849.5 512.5 Z M 906.5 346.5 L 926.5 346.5 L 926.5 512.5 L 906.5 512.5 Z M 963.5 346.5 L 982.5 346.5 L 982.5 512.5 L 963.5 512.5 Z M 1019.5 346.5 L 1039.5 346.5 L 1039.5 512.5 L 1019.5 512.5 Z M 1076.5 346.5 L 1096.5 346.5 L 1096.5 512.5 L 1076.5 512.5 Z M 1133.5 346.5 L 1152.5 346.5 L 1152.5 512.5 L 1133.5 512.5 Z M 1189.5 346.5 L 1209.5 346.5 L 1209.5 512.5 L 1189.5 512.5 Z M 1246.5 346.5 L 1266.5 346.5 L 1266.5 512.5 L 1246.5 512.5 Z M 1303.5 346.5 L 1323.5 346.5 L 1323.5 512.5 L 1303.5 512.5 Z M 1359.5 346.5 L 1379.5 346.5 L 1379.5 512.5 L 1359.5 512.5 Z M 1416.5 346.5 L 1436.5 346.5 L 1436.5 512.5 L 1416.5 512.5 Z M 1473.5 346.5 L 1493.5 346.5 L 1493.5 512.5 L 1473.5 512.5 Z M 1530.5 346.5 L 1549.5 346.5 L 1549.5 512.5 L 1530.5 512.5 Z M 1586.5 346.5 L 1606.5 346.5 L 1606.5 512.5 L 1586.5 512.5 Z M 1586.5 346.5 "/>
 </clipPath>
-<image id="image282" 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="#image282"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 819.5 475.5 L 842.5 475.5 L 842.5 492.5 L 819.5 492.5 Z M 1613.5 475.5 L 1636.5 475.5 L 1636.5 492.5 L 1613.5 492.5 Z M 933.5 475.5 L 955.5 475.5 L 955.5 492.5 L 933.5 492.5 Z M 1046.5 475.5 L 1069.5 475.5 L 1069.5 492.5 L 1046.5 492.5 Z M 1387.5 475.5 L 1409.5 475.5 L 1409.5 492.5 L 1387.5 492.5 Z M 1500.5 475.5 L 1522.5 475.5 L 1522.5 492.5 L 1500.5 492.5 Z M 1160.5 475.5 L 1182.5 475.5 L 1182.5 492.5 L 1160.5 492.5 Z M 1273.5 475.5 L 1296.5 475.5 L 1296.5 492.5 L 1273.5 492.5 Z M 1613.5 492.5 L 1636.5 492.5 L 1636.5 497.5 L 1613.5 497.5 Z M 819.5 492.5 L 842.5 492.5 L 842.5 497.5 L 819.5 497.5 Z M 1273.5 492.5 L 1296.5 492.5 L 1296.5 497.5 L 1273.5 497.5 Z M 1387.5 492.5 L 1409.5 492.5 L 1409.5 497.5 L 1387.5 497.5 Z M 933.5 492.5 L 955.5 492.5 L 955.5 497.5 L 933.5 497.5 Z M 1046.5 492.5 L 1069.5 492.5 L 1069.5 497.5 L 1046.5 497.5 Z M 1160.5 492.5 L 1182.5 492.5 L 1182.5 497.5 L 1160.5 497.5 Z M 1500.5 492.5 L 1522.5 492.5 L 1522.5 497.5 L 1500.5 497.5 Z M 1330.5 523.5 L 1352.5 523.5 L 1352.5 544.5 L 1330.5 544.5 Z M 1557.5 523.5 L 1579.5 523.5 L 1579.5 544.5 L 1557.5 544.5 Z M 1103.5 523.5 L 1125.5 523.5 L 1125.5 544.5 L 1103.5 544.5 Z M 1216.5 523.5 L 1239.5 523.5 L 1239.5 544.5 L 1216.5 544.5 Z M 876.5 523.5 L 899.5 523.5 L 899.5 544.5 L 876.5 544.5 Z M 1443.5 523.5 L 1466.5 523.5 L 1466.5 544.5 L 1443.5 544.5 Z M 990.5 523.5 L 1012.5 523.5 L 1012.5 544.5 L 990.5 544.5 Z M 1216.5 544.5 L 1239.5 544.5 L 1239.5 546.5 L 1216.5 546.5 Z M 1557.5 544.5 L 1579.5 544.5 L 1579.5 546.5 L 1557.5 546.5 Z M 773.5 523.5 L 796.5 523.5 L 796.5 546.5 L 773.5 546.5 Z M 1443.5 544.5 L 1466.5 544.5 L 1466.5 546.5 L 1443.5 546.5 Z M 1330.5 544.5 L 1352.5 544.5 L 1352.5 546.5 L 1330.5 546.5 Z M 1103.5 544.5 L 1125.5 544.5 L 1125.5 546.5 L 1103.5 546.5 Z M 990.5 544.5 L 1012.5 544.5 L 1012.5 546.5 L 990.5 546.5 Z M 876.5 544.5 L 899.5 544.5 L 899.5 546.5 L 876.5 546.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="image283" 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="#image283"/>
+  <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="surface277">
+<g id="surface307">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -146,6 +146,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 364.113281 540.898438 L 353.078125 540.898438 L 350.054688 549.5 L 346.167969 549.5 L 356.378906 520.871094 L 361.089844 520.871094 L 371.144531 549.5 L 367.058594 549.5 Z M 363.09375 537.835938 L 358.695312 524.796875 L 353.984375 537.835938 Z M 363.09375 537.835938 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 347 556 L 369 556 M 347 533 L 369 533 M 347 533 L 347 556 M 369 533 L 369 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 347 556 L 369 556 M 347 533 L 369 533 M 369 556 L 369 533 M 347 556 L 347 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 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/bufinv/sky130_fd_sc_lp__bufinv_8.svg b/cells/bufinv/sky130_fd_sc_lp__bufinv_8.svg
index 2989044..63fd19b 100644
--- a/cells/bufinv/sky130_fd_sc_lp__bufinv_8.svg
+++ b/cells/bufinv/sky130_fd_sc_lp__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 539.5 L 201.5 539.5 Z M 201.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="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="#image286"/>
+  <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 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="#image286"/>
+  <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 1544.5 670.5 L 1578.5 670.5 L 1578.5 862.5 L 1544.5 862.5 Z M 339.5 670.5 L 373.5 670.5 L 373.5 862.5 L 339.5 862.5 Z M 437.5 670.5 L 471.5 670.5 L 471.5 862.5 L 437.5 862.5 Z M 536.5 670.5 L 570.5 670.5 L 570.5 862.5 L 536.5 862.5 Z M 634.5 670.5 L 669.5 670.5 L 669.5 862.5 L 634.5 862.5 Z M 733.5 670.5 L 767.5 670.5 L 767.5 862.5 L 733.5 862.5 Z M 831.5 670.5 L 866.5 670.5 L 866.5 862.5 L 831.5 862.5 Z M 930.5 670.5 L 964.5 670.5 L 964.5 862.5 L 930.5 862.5 Z M 1028.5 670.5 L 1063.5 670.5 L 1063.5 862.5 L 1028.5 862.5 Z M 1248.5 670.5 L 1283.5 670.5 L 1283.5 862.5 L 1248.5 862.5 Z M 1347.5 670.5 L 1381.5 670.5 L 1381.5 862.5 L 1347.5 862.5 Z M 1446.5 670.5 L 1480.5 670.5 L 1480.5 862.5 L 1446.5 862.5 Z M 1446.5 670.5 "/>
 </clipPath>
-<image id="image287" 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="#image287"/>
+  <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 1544.5 209.5 L 1578.5 209.5 L 1578.5 498.5 L 1544.5 498.5 Z M 339.5 209.5 L 373.5 209.5 L 373.5 498.5 L 339.5 498.5 Z M 437.5 209.5 L 471.5 209.5 L 471.5 498.5 L 437.5 498.5 Z M 536.5 209.5 L 570.5 209.5 L 570.5 498.5 L 536.5 498.5 Z M 634.5 209.5 L 669.5 209.5 L 669.5 498.5 L 634.5 498.5 Z M 733.5 209.5 L 767.5 209.5 L 767.5 498.5 L 733.5 498.5 Z M 831.5 209.5 L 866.5 209.5 L 866.5 498.5 L 831.5 498.5 Z M 930.5 209.5 L 964.5 209.5 L 964.5 498.5 L 930.5 498.5 Z M 1028.5 209.5 L 1063.5 209.5 L 1063.5 498.5 L 1028.5 498.5 Z M 1248.5 209.5 L 1283.5 209.5 L 1283.5 498.5 L 1248.5 498.5 Z M 1347.5 209.5 L 1381.5 209.5 L 1381.5 498.5 L 1347.5 498.5 Z M 1446.5 209.5 L 1480.5 209.5 L 1480.5 498.5 L 1446.5 498.5 Z M 1446.5 209.5 "/>
 </clipPath>
-<image id="image288" 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="#image288"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image289" 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="#image289"/>
+  <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="surface283">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 414.554688 542.246094 L 414.554688 561.5 L 408.292969 561.5 L 408.292969 542.246094 L 389.375 512.421875 L 397.117188 512.421875 L 411.523438 536.320312 L 425.527344 512.421875 L 433 512.421875 Z M 414.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 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/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.svg b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.svg
index dd85bba..fc12c1f 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.svg
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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="#image294"/>
+  <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 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="#image294"/>
+  <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 1002.5 763.5 L 1036.5 763.5 L 1036.5 860.5 L 1002.5 860.5 Z M 892.5 763.5 L 926.5 763.5 L 926.5 860.5 L 892.5 860.5 Z M 892.5 763.5 "/>
 </clipPath>
-<image id="image295" 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="#image295"/>
+  <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 991.5 209.5 L 1025.5 209.5 L 1025.5 498.5 L 991.5 498.5 Z M 892.5 209.5 L 926.5 209.5 L 926.5 498.5 L 892.5 498.5 Z M 892.5 209.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 940.5 255.5 L 979.5 255.5 L 979.5 272.5 L 940.5 272.5 Z M 940.5 272.5 L 979.5 272.5 L 979.5 294.5 L 940.5 294.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="image297" 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="#image297"/>
+  <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="surface291">
+<g id="surface338">
 <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 859.824219 366.320312 L 877.191406 391.5 L 869.449219 391.5 L 856.050781 371.035156 L 842.589844 391.5 L 834.980469 391.5 L 852.351562 366.320312 L 836.058594 342.421875 L 843.664062 342.421875 L 856.253906 361.675781 L 868.910156 342.421875 L 876.382812 342.421875 Z M 859.824219 366.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 835 731 L 874 731 M 835 693 L 874 693 M 835 693 L 835 731 M 874 693 L 874 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 835 731 L 874 731 M 835 693 L 874 693 M 874 731 L 874 693 M 835 731 L 835 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 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/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.svg b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.svg
index e7ecf58..69f5f2c 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.svg
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image301"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1046.5 768.5 L 1080.5 768.5 L 1080.5 864.5 L 1046.5 864.5 Z M 836.5 768.5 L 870.5 768.5 L 870.5 864.5 L 836.5 864.5 Z M 947.5 768.5 L 981.5 768.5 L 981.5 864.5 L 947.5 864.5 Z M 947.5 768.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1044.5 209.5 L 1079.5 209.5 L 1079.5 498.5 L 1044.5 498.5 Z M 836.5 209.5 L 870.5 209.5 L 870.5 498.5 L 836.5 498.5 Z M 946.5 209.5 L 980.5 209.5 L 980.5 498.5 L 946.5 498.5 Z M 946.5 209.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1090.5 255.5 L 1129.5 255.5 L 1129.5 271.5 L 1090.5 271.5 Z M 887.5 255.5 L 926.5 255.5 L 926.5 278.5 L 887.5 278.5 Z M 887.5 278.5 L 926.5 278.5 L 926.5 294.5 L 887.5 294.5 Z M 1090.5 271.5 L 1129.5 271.5 L 1129.5 294.5 L 1090.5 294.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="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface298">
+<g id="surface329">
 <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 1134.824219 706.320312 L 1152.191406 731.5 L 1144.449219 731.5 L 1131.050781 711.035156 L 1117.589844 731.5 L 1109.980469 731.5 L 1127.351562 706.320312 L 1111.058594 682.421875 L 1118.664062 682.421875 L 1131.253906 701.675781 L 1143.910156 682.421875 L 1151.382812 682.421875 Z M 1134.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 1110 392 L 1149 392 M 1110 353 L 1149 353 M 1110 353 L 1110 392 M 1149 353 L 1149 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 1110 392 L 1149 392 M 1110 353 L 1149 353 M 1149 392 L 1149 353 M 1110 392 L 1110 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 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/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.svg b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.svg
index c04d4d1..5e662c3 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.svg
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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="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="#image295"/>
+  <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="#image295"/>
+  <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 1132.5 768.5 L 1166.5 768.5 L 1166.5 864.5 L 1132.5 864.5 Z M 725.5 768.5 L 759.5 768.5 L 759.5 864.5 L 725.5 864.5 Z M 836.5 768.5 L 870.5 768.5 L 870.5 864.5 L 836.5 864.5 Z M 934.5 768.5 L 969.5 768.5 L 969.5 864.5 L 934.5 864.5 Z M 1033.5 768.5 L 1067.5 768.5 L 1067.5 864.5 L 1033.5 864.5 Z M 1033.5 768.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <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 1130.5 209.5 L 1165.5 209.5 L 1165.5 498.5 L 1130.5 498.5 Z M 725.5 209.5 L 759.5 209.5 L 759.5 498.5 L 725.5 498.5 Z M 835.5 209.5 L 869.5 209.5 L 869.5 498.5 L 835.5 498.5 Z M 933.5 209.5 L 968.5 209.5 L 968.5 498.5 L 933.5 498.5 Z M 1032.5 209.5 L 1066.5 209.5 L 1066.5 498.5 L 1032.5 498.5 Z M 1032.5 209.5 "/>
 </clipPath>
-<image id="image297" 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="#image297"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1181.5 255.5 L 1220.5 255.5 L 1220.5 271.5 L 1181.5 271.5 Z M 981.5 255.5 L 1020.5 255.5 L 1020.5 271.5 L 981.5 271.5 Z M 777.5 255.5 L 816.5 255.5 L 816.5 274.5 L 777.5 274.5 Z M 1181.5 271.5 L 1220.5 271.5 L 1220.5 294.5 L 1181.5 294.5 Z M 777.5 274.5 L 816.5 274.5 L 816.5 294.5 L 777.5 294.5 Z M 981.5 271.5 L 1020.5 271.5 L 1020.5 294.5 L 981.5 294.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="image298" 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="#image298"/>
+  <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="surface292">
+<g id="surface323">
 <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 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/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.svg b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.svg
index a5cb6bc..74a0bfa 100644
--- a/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.svg
+++ b/cells/bufkapwr/sky130_fd_sc_lp__bufkapwr_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.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="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="#image307"/>
+  <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 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="#image307"/>
+  <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 1334.5 768.5 L 1369.5 768.5 L 1369.5 864.5 L 1334.5 864.5 Z M 447.5 768.5 L 482.5 768.5 L 482.5 864.5 L 447.5 864.5 Z M 546.5 768.5 L 580.5 768.5 L 580.5 864.5 L 546.5 864.5 Z M 644.5 768.5 L 679.5 768.5 L 679.5 864.5 L 644.5 864.5 Z M 743.5 768.5 L 777.5 768.5 L 777.5 864.5 L 743.5 864.5 Z M 842.5 768.5 L 876.5 768.5 L 876.5 864.5 L 842.5 864.5 Z M 940.5 768.5 L 975.5 768.5 L 975.5 864.5 L 940.5 864.5 Z M 1039.5 768.5 L 1073.5 768.5 L 1073.5 864.5 L 1039.5 864.5 Z M 1137.5 768.5 L 1172.5 768.5 L 1172.5 864.5 L 1137.5 864.5 Z M 1236.5 768.5 L 1270.5 768.5 L 1270.5 864.5 L 1236.5 864.5 Z M 1236.5 768.5 "/>
 </clipPath>
-<image id="image308" 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="#image308"/>
+  <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 1334.5 209.5 L 1369.5 209.5 L 1369.5 498.5 L 1334.5 498.5 Z M 447.5 209.5 L 482.5 209.5 L 482.5 498.5 L 447.5 498.5 Z M 546.5 209.5 L 580.5 209.5 L 580.5 498.5 L 546.5 498.5 Z M 644.5 209.5 L 679.5 209.5 L 679.5 498.5 L 644.5 498.5 Z M 743.5 209.5 L 777.5 209.5 L 777.5 498.5 L 743.5 498.5 Z M 842.5 209.5 L 876.5 209.5 L 876.5 498.5 L 842.5 498.5 Z M 940.5 209.5 L 975.5 209.5 L 975.5 498.5 L 940.5 498.5 Z M 1039.5 209.5 L 1073.5 209.5 L 1073.5 498.5 L 1039.5 498.5 Z M 1137.5 209.5 L 1172.5 209.5 L 1172.5 498.5 L 1137.5 498.5 Z M 1236.5 209.5 L 1270.5 209.5 L 1270.5 498.5 L 1236.5 498.5 Z M 1236.5 209.5 "/>
 </clipPath>
-<image id="image309" 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="#image309"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1385.5 255.5 L 1424.5 255.5 L 1424.5 271.5 L 1385.5 271.5 Z M 1182.5 255.5 L 1221.5 255.5 L 1221.5 271.5 L 1182.5 271.5 Z M 986.5 255.5 L 1025.5 255.5 L 1025.5 271.5 L 986.5 271.5 Z M 789.5 255.5 L 828.5 255.5 L 828.5 271.5 L 789.5 271.5 Z M 594.5 255.5 L 633.5 255.5 L 633.5 275.5 L 594.5 275.5 Z M 394.5 255.5 L 432.5 255.5 L 432.5 275.5 L 394.5 275.5 Z M 1182.5 271.5 L 1221.5 271.5 L 1221.5 294.5 L 1182.5 294.5 Z M 986.5 271.5 L 1025.5 271.5 L 1025.5 294.5 L 986.5 294.5 Z M 394.5 275.5 L 432.5 275.5 L 432.5 294.5 L 394.5 294.5 Z M 789.5 271.5 L 828.5 271.5 L 828.5 294.5 L 789.5 294.5 Z M 1385.5 271.5 L 1424.5 271.5 L 1424.5 294.5 L 1385.5 294.5 Z M 594.5 275.5 L 633.5 275.5 L 633.5 294.5 L 594.5 294.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="image310" 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="#image310"/>
+  <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="surface304">
+<g id="surface335">
 <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 1405.824219 706.320312 L 1423.191406 731.5 L 1415.449219 731.5 L 1402.050781 711.035156 L 1388.589844 731.5 L 1380.980469 731.5 L 1398.351562 706.320312 L 1382.058594 682.421875 L 1389.664062 682.421875 L 1402.253906 701.675781 L 1414.910156 682.421875 L 1422.382812 682.421875 Z M 1405.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 1381 392 L 1420 392 M 1381 353 L 1420 353 M 1381 353 L 1381 392 M 1420 353 L 1420 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 1381 392 L 1420 392 M 1381 353 L 1420 353 M 1420 392 L 1420 353 M 1381 392 L 1381 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 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/buflp/sky130_fd_sc_lp__buflp_0.svg b/cells/buflp/sky130_fd_sc_lp__buflp_0.svg
index b6e9dcc..404e210 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_0.svg
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1072.5 684.5 L 1106.5 684.5 L 1106.5 781.5 L 1072.5 781.5 Z M 795.5 684.5 L 829.5 684.5 L 829.5 781.5 L 795.5 781.5 Z M 884.5 684.5 L 918.5 684.5 L 918.5 781.5 L 884.5 781.5 Z M 983.5 684.5 L 1017.5 684.5 L 1017.5 781.5 L 983.5 781.5 Z M 983.5 684.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 890.5 260.5 L 924.5 260.5 L 924.5 357.5 L 890.5 357.5 Z M 800.5 260.5 L 835.5 260.5 L 835.5 357.5 L 800.5 357.5 Z M 1104.5 260.5 L 1138.5 260.5 L 1138.5 407.5 L 1104.5 407.5 Z M 1015.5 260.5 L 1049.5 260.5 L 1049.5 407.5 L 1015.5 407.5 Z M 1015.5 260.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,5 @@
 <path style=" 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/buflp/sky130_fd_sc_lp__buflp_1.svg b/cells/buflp/sky130_fd_sc_lp__buflp_1.svg
index b9481ee..bef3d4f 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_1.svg
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1096.5 672.5 L 1130.5 672.5 L 1130.5 768.5 L 1096.5 768.5 Z M 1007.5 672.5 L 1041.5 672.5 L 1041.5 768.5 L 1007.5 768.5 Z M 876.5 672.5 L 910.5 672.5 L 910.5 864.5 L 876.5 864.5 Z M 787.5 672.5 L 821.5 672.5 L 821.5 864.5 L 787.5 864.5 Z M 787.5 672.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 1007.5 310.5 L 1041.5 310.5 L 1041.5 456.5 L 1007.5 456.5 Z M 1096.5 310.5 L 1130.5 310.5 L 1130.5 456.5 L 1096.5 456.5 Z M 787.5 209.5 L 821.5 209.5 L 821.5 498.5 L 787.5 498.5 Z M 876.5 209.5 L 910.5 209.5 L 910.5 498.5 L 876.5 498.5 Z M 876.5 209.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +167,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 747.824219 282.320312 L 765.191406 307.5 L 757.449219 307.5 L 744.050781 287.035156 L 730.589844 307.5 L 722.980469 307.5 L 740.351562 282.320312 L 724.058594 258.421875 L 731.664062 258.421875 L 744.253906 277.675781 L 756.910156 258.421875 L 764.382812 258.421875 Z M 747.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 724 816 L 763 816 M 724 777 L 763 777 M 724 777 L 724 816 M 763 777 L 763 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 724 816 L 763 816 M 724 777 L 763 777 M 763 816 L 763 777 M 724 816 L 724 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/buflp/sky130_fd_sc_lp__buflp_2.svg b/cells/buflp/sky130_fd_sc_lp__buflp_2.svg
index 2b28cda..0abc6aa 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_2.svg
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 689.5 672.5 L 724.5 672.5 L 724.5 864.5 L 689.5 864.5 Z M 1216.5 768.5 L 1251.5 768.5 L 1251.5 864.5 L 1216.5 864.5 Z M 1134.5 768.5 L 1168.5 768.5 L 1168.5 864.5 L 1134.5 864.5 Z M 1017.5 672.5 L 1051.5 672.5 L 1051.5 864.5 L 1017.5 864.5 Z M 902.5 672.5 L 937.5 672.5 L 937.5 864.5 L 902.5 864.5 Z M 788.5 672.5 L 822.5 672.5 L 822.5 864.5 L 788.5 864.5 Z M 788.5 672.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 1126.5 339.5 L 1160.5 339.5 L 1160.5 486.5 L 1126.5 486.5 Z M 1215.5 339.5 L 1250.5 339.5 L 1250.5 486.5 L 1215.5 486.5 Z M 788.5 209.5 L 822.5 209.5 L 822.5 498.5 L 788.5 498.5 Z M 985.5 209.5 L 1019.5 209.5 L 1019.5 498.5 L 985.5 498.5 Z M 886.5 209.5 L 921.5 209.5 L 921.5 498.5 L 886.5 498.5 Z M 689.5 209.5 L 724.5 209.5 L 724.5 498.5 L 689.5 498.5 Z M 689.5 209.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" 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 292.757812 L 1173.492188 292.757812 L 1168.308594 307.5 L 1161.644531 307.5 L 1179.148438 258.421875 L 1187.226562 258.421875 L 1204.460938 307.5 L 1197.460938 307.5 Z M 1190.660156 287.503906 L 1183.121094 265.15625 L 1175.042969 287.503906 Z M 1190.660156 287.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 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/buflp/sky130_fd_sc_lp__buflp_4.svg b/cells/buflp/sky130_fd_sc_lp__buflp_4.svg
index 18ebf8f..28eafea 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_4.svg
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.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 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="#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 1426.5 672.5 L 1460.5 672.5 L 1460.5 864.5 L 1426.5 864.5 Z M 452.5 672.5 L 486.5 672.5 L 486.5 864.5 L 452.5 864.5 Z M 551.5 672.5 L 585.5 672.5 L 585.5 864.5 L 551.5 864.5 Z M 649.5 672.5 L 683.5 672.5 L 683.5 864.5 L 649.5 864.5 Z M 748.5 672.5 L 782.5 672.5 L 782.5 864.5 L 748.5 864.5 Z M 846.5 672.5 L 881.5 672.5 L 881.5 864.5 L 846.5 864.5 Z M 945.5 672.5 L 979.5 672.5 L 979.5 864.5 L 945.5 864.5 Z M 1043.5 672.5 L 1078.5 672.5 L 1078.5 864.5 L 1043.5 864.5 Z M 1142.5 672.5 L 1176.5 672.5 L 1176.5 864.5 L 1142.5 864.5 Z M 1337.5 672.5 L 1371.5 672.5 L 1371.5 864.5 L 1337.5 864.5 Z M 1337.5 672.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 1426.5 209.5 L 1460.5 209.5 L 1460.5 498.5 L 1426.5 498.5 Z M 452.5 209.5 L 486.5 209.5 L 486.5 498.5 L 452.5 498.5 Z M 551.5 209.5 L 585.5 209.5 L 585.5 498.5 L 551.5 498.5 Z M 649.5 209.5 L 683.5 209.5 L 683.5 498.5 L 649.5 498.5 Z M 748.5 209.5 L 782.5 209.5 L 782.5 498.5 L 748.5 498.5 Z M 862.5 209.5 L 897.5 209.5 L 897.5 498.5 L 862.5 498.5 Z M 977.5 209.5 L 1011.5 209.5 L 1011.5 498.5 L 977.5 498.5 Z M 1091.5 209.5 L 1126.5 209.5 L 1126.5 498.5 L 1091.5 498.5 Z M 1206.5 209.5 L 1240.5 209.5 L 1240.5 498.5 L 1206.5 498.5 Z M 1337.5 209.5 L 1371.5 209.5 L 1371.5 498.5 L 1337.5 498.5 Z M 1337.5 209.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image277" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image277"/>
+  <use xlink:href="#image306"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface271">
+<g id="surface300">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <path style=" 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.824219 536.320312 L 433.191406 561.5 L 425.449219 561.5 L 412.050781 541.035156 L 398.589844 561.5 L 390.980469 561.5 L 408.351562 536.320312 L 392.058594 512.421875 L 399.664062 512.421875 L 412.253906 531.675781 L 424.910156 512.421875 L 432.382812 512.421875 Z M 415.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 391 562 L 430 562 M 391 523 L 430 523 M 391 523 L 391 562 M 430 523 L 430 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 391 562 L 430 562 M 391 523 L 430 523 M 430 562 L 430 523 M 391 562 L 391 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/buflp/sky130_fd_sc_lp__buflp_8.svg b/cells/buflp/sky130_fd_sc_lp__buflp_8.svg
index cc6f186..c20a073 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_8.svg
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_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="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 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="#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 1632.5 620.5 L 1653.5 620.5 L 1653.5 740.5 L 1632.5 740.5 Z M 261.5 620.5 L 283.5 620.5 L 283.5 740.5 L 261.5 740.5 Z M 323.5 620.5 L 345.5 620.5 L 345.5 740.5 L 323.5 740.5 Z M 395.5 620.5 L 416.5 620.5 L 416.5 740.5 L 395.5 740.5 Z M 456.5 620.5 L 478.5 620.5 L 478.5 740.5 L 456.5 740.5 Z M 518.5 620.5 L 540.5 620.5 L 540.5 740.5 L 518.5 740.5 Z M 580.5 620.5 L 601.5 620.5 L 601.5 740.5 L 580.5 740.5 Z M 642.5 620.5 L 663.5 620.5 L 663.5 740.5 L 642.5 740.5 Z M 703.5 620.5 L 725.5 620.5 L 725.5 740.5 L 703.5 740.5 Z M 765.5 620.5 L 786.5 620.5 L 786.5 740.5 L 765.5 740.5 Z M 827.5 620.5 L 848.5 620.5 L 848.5 740.5 L 827.5 740.5 Z M 906.5 620.5 L 927.5 620.5 L 927.5 740.5 L 906.5 740.5 Z M 967.5 620.5 L 989.5 620.5 L 989.5 740.5 L 967.5 740.5 Z M 1029.5 620.5 L 1050.5 620.5 L 1050.5 740.5 L 1029.5 740.5 Z M 1091.5 620.5 L 1112.5 620.5 L 1112.5 740.5 L 1091.5 740.5 Z M 1152.5 620.5 L 1174.5 620.5 L 1174.5 740.5 L 1152.5 740.5 Z M 1214.5 620.5 L 1236.5 620.5 L 1236.5 740.5 L 1214.5 740.5 Z M 1276.5 620.5 L 1297.5 620.5 L 1297.5 740.5 L 1276.5 740.5 Z M 1347.5 620.5 L 1369.5 620.5 L 1369.5 740.5 L 1347.5 740.5 Z M 1419.5 620.5 L 1441.5 620.5 L 1441.5 740.5 L 1419.5 740.5 Z M 1491.5 620.5 L 1512.5 620.5 L 1512.5 740.5 L 1491.5 740.5 Z M 1563.5 620.5 L 1584.5 620.5 L 1584.5 740.5 L 1563.5 740.5 Z M 1563.5 620.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 1632.5 330.5 L 1653.5 330.5 L 1653.5 510.5 L 1632.5 510.5 Z M 261.5 330.5 L 283.5 330.5 L 283.5 510.5 L 261.5 510.5 Z M 323.5 330.5 L 345.5 330.5 L 345.5 510.5 L 323.5 510.5 Z M 385.5 330.5 L 406.5 330.5 L 406.5 510.5 L 385.5 510.5 Z M 446.5 330.5 L 468.5 330.5 L 468.5 510.5 L 446.5 510.5 Z M 508.5 330.5 L 530.5 330.5 L 530.5 510.5 L 508.5 510.5 Z M 570.5 330.5 L 591.5 330.5 L 591.5 510.5 L 570.5 510.5 Z M 636.5 330.5 L 657.5 330.5 L 657.5 510.5 L 636.5 510.5 Z M 697.5 330.5 L 719.5 330.5 L 719.5 510.5 L 697.5 510.5 Z M 759.5 330.5 L 781.5 330.5 L 781.5 510.5 L 759.5 510.5 Z M 821.5 330.5 L 842.5 330.5 L 842.5 510.5 L 821.5 510.5 Z M 883.5 330.5 L 904.5 330.5 L 904.5 510.5 L 883.5 510.5 Z M 944.5 330.5 L 966.5 330.5 L 966.5 510.5 L 944.5 510.5 Z M 1006.5 330.5 L 1027.5 330.5 L 1027.5 510.5 L 1006.5 510.5 Z M 1068.5 330.5 L 1089.5 330.5 L 1089.5 510.5 L 1068.5 510.5 Z M 1139.5 330.5 L 1161.5 330.5 L 1161.5 510.5 L 1139.5 510.5 Z M 1211.5 330.5 L 1233.5 330.5 L 1233.5 510.5 L 1211.5 510.5 Z M 1283.5 330.5 L 1304.5 330.5 L 1304.5 510.5 L 1283.5 510.5 Z M 1355.5 330.5 L 1376.5 330.5 L 1376.5 510.5 L 1355.5 510.5 Z M 1426.5 330.5 L 1448.5 330.5 L 1448.5 510.5 L 1426.5 510.5 Z M 1498.5 330.5 L 1520.5 330.5 L 1520.5 510.5 L 1498.5 510.5 Z M 1570.5 330.5 L 1591.5 330.5 L 1591.5 510.5 L 1570.5 510.5 Z M 1570.5 330.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <path style=" 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>
diff --git a/cells/buflp/sky130_fd_sc_lp__buflp_m.svg b/cells/buflp/sky130_fd_sc_lp__buflp_m.svg
index c051efd..beb4b28 100644
--- a/cells/buflp/sky130_fd_sc_lp__buflp_m.svg
+++ b/cells/buflp/sky130_fd_sc_lp__buflp_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1062.5 684.5 L 1096.5 684.5 L 1096.5 781.5 L 1062.5 781.5 Z M 791.5 684.5 L 826.5 684.5 L 826.5 781.5 L 791.5 781.5 Z M 874.5 684.5 L 908.5 684.5 L 908.5 781.5 L 874.5 781.5 Z M 972.5 684.5 L 1007.5 684.5 L 1007.5 781.5 L 972.5 781.5 Z M 972.5 684.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 1091.5 260.5 L 1126.5 260.5 L 1126.5 357.5 L 1091.5 357.5 Z M 791.5 260.5 L 826.5 260.5 L 826.5 357.5 L 791.5 357.5 Z M 881.5 260.5 L 915.5 260.5 L 915.5 357.5 L 881.5 357.5 Z M 1002.5 260.5 L 1036.5 260.5 L 1036.5 357.5 L 1002.5 357.5 Z M 1002.5 260.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 747.824219 282.320312 L 765.191406 307.5 L 757.449219 307.5 L 744.050781 287.035156 L 730.589844 307.5 L 722.980469 307.5 L 740.351562 282.320312 L 724.058594 258.421875 L 731.664062 258.421875 L 744.253906 277.675781 L 756.910156 258.421875 L 764.382812 258.421875 Z M 747.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 724 816 L 763 816 M 724 777 L 763 777 M 724 777 L 724 816 M 763 777 L 763 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 724 816 L 763 816 M 724 777 L 763 777 M 763 816 L 763 777 M 724 816 L 724 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/busdriver/sky130_fd_sc_lp__busdriver_20.svg b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.svg
index 1d8e10a..3909958 100644
--- a/cells/busdriver/sky130_fd_sc_lp__busdriver_20.svg
+++ b/cells/busdriver/sky130_fd_sc_lp__busdriver_20.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 418.5 L 1743.5 418.5 L 1743.5 534.5 L 174.5 534.5 Z M 912.5 534.5 L 1485.5 534.5 L 1485.5 553.5 L 912.5 553.5 Z M 912.5 534.5 "/>
 </clipPath>
-<image id="image308" 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="#image308"/>
+  <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 186.5 621.5 L 1732.5 621.5 L 1732.5 636.5 L 186.5 636.5 Z M 186.5 621.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="#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 1632.5 570.5 L 1642.5 570.5 L 1642.5 622.5 L 1632.5 622.5 Z M 384.5 582.5 L 394.5 582.5 L 394.5 622.5 L 384.5 622.5 Z M 416.5 582.5 L 425.5 582.5 L 425.5 622.5 L 416.5 622.5 Z M 443.5 582.5 L 452.5 582.5 L 452.5 622.5 L 443.5 622.5 Z M 469.5 582.5 L 478.5 582.5 L 478.5 622.5 L 469.5 622.5 Z M 496.5 582.5 L 505.5 582.5 L 505.5 622.5 L 496.5 622.5 Z M 527.5 582.5 L 537.5 582.5 L 537.5 622.5 L 527.5 622.5 Z M 554.5 582.5 L 563.5 582.5 L 563.5 622.5 L 554.5 622.5 Z M 591.5 582.5 L 600.5 582.5 L 600.5 622.5 L 591.5 622.5 Z M 617.5 582.5 L 626.5 582.5 L 626.5 622.5 L 617.5 622.5 Z M 644.5 582.5 L 653.5 582.5 L 653.5 622.5 L 644.5 622.5 Z M 670.5 582.5 L 680.5 582.5 L 680.5 622.5 L 670.5 622.5 Z M 697.5 582.5 L 706.5 582.5 L 706.5 622.5 L 697.5 622.5 Z M 724.5 582.5 L 733.5 582.5 L 733.5 622.5 L 724.5 622.5 Z M 750.5 582.5 L 760.5 582.5 L 760.5 622.5 L 750.5 622.5 Z M 777.5 582.5 L 786.5 582.5 L 786.5 622.5 L 777.5 622.5 Z M 809.5 582.5 L 818.5 582.5 L 818.5 622.5 L 809.5 622.5 Z M 840.5 582.5 L 849.5 582.5 L 849.5 622.5 L 840.5 622.5 Z M 872.5 582.5 L 881.5 582.5 L 881.5 622.5 L 872.5 622.5 Z M 898.5 582.5 L 908.5 582.5 L 908.5 622.5 L 898.5 622.5 Z M 925.5 582.5 L 934.5 582.5 L 934.5 622.5 L 925.5 622.5 Z M 952.5 582.5 L 961.5 582.5 L 961.5 622.5 L 952.5 622.5 Z M 978.5 582.5 L 988.5 582.5 L 988.5 622.5 L 978.5 622.5 Z M 1005.5 582.5 L 1014.5 582.5 L 1014.5 622.5 L 1005.5 622.5 Z M 1032.5 582.5 L 1041.5 582.5 L 1041.5 622.5 L 1032.5 622.5 Z M 1058.5 582.5 L 1067.5 582.5 L 1067.5 622.5 L 1058.5 622.5 Z M 1085.5 582.5 L 1094.5 582.5 L 1094.5 622.5 L 1085.5 622.5 Z M 1111.5 582.5 L 1121.5 582.5 L 1121.5 622.5 L 1111.5 622.5 Z M 1138.5 582.5 L 1147.5 582.5 L 1147.5 622.5 L 1138.5 622.5 Z M 212.5 570.5 L 221.5 570.5 L 221.5 622.5 L 212.5 622.5 Z M 238.5 570.5 L 248.5 570.5 L 248.5 622.5 L 238.5 622.5 Z M 275.5 570.5 L 284.5 570.5 L 284.5 622.5 L 275.5 622.5 Z M 316.5 570.5 L 325.5 570.5 L 325.5 622.5 L 316.5 622.5 Z M 1538.5 570.5 L 1547.5 570.5 L 1547.5 622.5 L 1538.5 622.5 Z M 1569.5 570.5 L 1578.5 570.5 L 1578.5 622.5 L 1569.5 622.5 Z M 1606.5 570.5 L 1615.5 570.5 L 1615.5 622.5 L 1606.5 622.5 Z M 1606.5 570.5 "/>
 </clipPath>
-<image id="image309" 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="#image309"/>
+  <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 1696.5 445.5 L 1706.5 445.5 L 1706.5 523.5 L 1696.5 523.5 Z M 1670.5 445.5 L 1679.5 445.5 L 1679.5 523.5 L 1670.5 523.5 Z M 1615.5 445.5 L 1624.5 445.5 L 1624.5 523.5 L 1615.5 523.5 Z M 1508.5 445.5 L 1518.5 445.5 L 1518.5 523.5 L 1508.5 523.5 Z M 692.5 445.5 L 702.5 445.5 L 702.5 523.5 L 692.5 523.5 Z M 265.5 445.5 L 274.5 445.5 L 274.5 523.5 L 265.5 523.5 Z M 238.5 445.5 L 248.5 445.5 L 248.5 523.5 L 238.5 523.5 Z M 665.5 445.5 L 674.5 445.5 L 674.5 523.5 L 665.5 523.5 Z M 212.5 445.5 L 221.5 445.5 L 221.5 523.5 L 212.5 523.5 Z M 879.5 445.5 L 888.5 445.5 L 888.5 523.5 L 879.5 523.5 Z M 638.5 445.5 L 647.5 445.5 L 647.5 523.5 L 638.5 523.5 Z M 611.5 445.5 L 621.5 445.5 L 621.5 523.5 L 611.5 523.5 Z M 1588.5 445.5 L 1598.5 445.5 L 1598.5 523.5 L 1588.5 523.5 Z M 852.5 445.5 L 862.5 445.5 L 862.5 523.5 L 852.5 523.5 Z M 585.5 445.5 L 594.5 445.5 L 594.5 523.5 L 585.5 523.5 Z M 558.5 445.5 L 567.5 445.5 L 567.5 523.5 L 558.5 523.5 Z M 826.5 445.5 L 835.5 445.5 L 835.5 523.5 L 826.5 523.5 Z M 531.5 445.5 L 541.5 445.5 L 541.5 523.5 L 531.5 523.5 Z M 505.5 445.5 L 514.5 445.5 L 514.5 523.5 L 505.5 523.5 Z M 1642.5 445.5 L 1651.5 445.5 L 1651.5 523.5 L 1642.5 523.5 Z M 1562.5 445.5 L 1571.5 445.5 L 1571.5 523.5 L 1562.5 523.5 Z M 799.5 445.5 L 808.5 445.5 L 808.5 523.5 L 799.5 523.5 Z M 478.5 445.5 L 487.5 445.5 L 487.5 523.5 L 478.5 523.5 Z M 452.5 445.5 L 461.5 445.5 L 461.5 523.5 L 452.5 523.5 Z M 292.5 445.5 L 301.5 445.5 L 301.5 523.5 L 292.5 523.5 Z M 318.5 445.5 L 328.5 445.5 L 328.5 523.5 L 318.5 523.5 Z M 345.5 445.5 L 354.5 445.5 L 354.5 523.5 L 345.5 523.5 Z M 372.5 445.5 L 381.5 445.5 L 381.5 523.5 L 372.5 523.5 Z M 772.5 445.5 L 782.5 445.5 L 782.5 523.5 L 772.5 523.5 Z M 425.5 445.5 L 434.5 445.5 L 434.5 523.5 L 425.5 523.5 Z M 398.5 445.5 L 408.5 445.5 L 408.5 523.5 L 398.5 523.5 Z M 1535.5 445.5 L 1544.5 445.5 L 1544.5 523.5 L 1535.5 523.5 Z M 746.5 445.5 L 755.5 445.5 L 755.5 523.5 L 746.5 523.5 Z M 719.5 445.5 L 728.5 445.5 L 728.5 523.5 L 719.5 523.5 Z M 1234.5 464.5 L 1243.5 464.5 L 1243.5 542.5 L 1234.5 542.5 Z M 1207.5 464.5 L 1217.5 464.5 L 1217.5 542.5 L 1207.5 542.5 Z M 1128.5 464.5 L 1137.5 464.5 L 1137.5 542.5 L 1128.5 542.5 Z M 1101.5 464.5 L 1110.5 464.5 L 1110.5 542.5 L 1101.5 542.5 Z M 1048.5 464.5 L 1057.5 464.5 L 1057.5 542.5 L 1048.5 542.5 Z M 994.5 464.5 L 1004.5 464.5 L 1004.5 542.5 L 994.5 542.5 Z M 1420.5 464.5 L 1430.5 464.5 L 1430.5 542.5 L 1420.5 542.5 Z M 1447.5 464.5 L 1456.5 464.5 L 1456.5 542.5 L 1447.5 542.5 Z M 941.5 464.5 L 950.5 464.5 L 950.5 542.5 L 941.5 542.5 Z M 1021.5 464.5 L 1030.5 464.5 L 1030.5 542.5 L 1021.5 542.5 Z M 1341.5 464.5 L 1350.5 464.5 L 1350.5 542.5 L 1341.5 542.5 Z M 1261.5 464.5 L 1270.5 464.5 L 1270.5 542.5 L 1261.5 542.5 Z M 1154.5 464.5 L 1163.5 464.5 L 1163.5 542.5 L 1154.5 542.5 Z M 1074.5 464.5 L 1084.5 464.5 L 1084.5 542.5 L 1074.5 542.5 Z M 1314.5 464.5 L 1323.5 464.5 L 1323.5 542.5 L 1314.5 542.5 Z M 968.5 464.5 L 977.5 464.5 L 977.5 542.5 L 968.5 542.5 Z M 1367.5 464.5 L 1377.5 464.5 L 1377.5 542.5 L 1367.5 542.5 Z M 1181.5 464.5 L 1190.5 464.5 L 1190.5 542.5 L 1181.5 542.5 Z M 1287.5 464.5 L 1297.5 464.5 L 1297.5 542.5 L 1287.5 542.5 Z M 1394.5 464.5 L 1403.5 464.5 L 1403.5 542.5 L 1394.5 542.5 Z M 1394.5 464.5 "/>
 </clipPath>
-<image id="image310" 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="#image310"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,25 @@
 <clipPath id="clip11">
   <path d="M 195.5 425.5 L 206.5 425.5 L 206.5 435.5 L 195.5 435.5 Z M 1712.5 425.5 L 1722.5 425.5 L 1722.5 435.5 L 1712.5 435.5 Z M 1682.5 425.5 L 1692.5 425.5 L 1692.5 435.5 L 1682.5 435.5 Z M 1652.5 425.5 L 1663.5 425.5 L 1663.5 435.5 L 1652.5 435.5 Z M 1622.5 425.5 L 1633.5 425.5 L 1633.5 435.5 L 1622.5 435.5 Z M 1593.5 425.5 L 1603.5 425.5 L 1603.5 435.5 L 1593.5 435.5 Z M 1563.5 425.5 L 1573.5 425.5 L 1573.5 435.5 L 1563.5 435.5 Z M 1533.5 425.5 L 1544.5 425.5 L 1544.5 435.5 L 1533.5 435.5 Z M 1503.5 425.5 L 1514.5 425.5 L 1514.5 435.5 L 1503.5 435.5 Z M 1474.5 425.5 L 1484.5 425.5 L 1484.5 435.5 L 1474.5 435.5 Z M 1444.5 425.5 L 1455.5 425.5 L 1455.5 435.5 L 1444.5 435.5 Z M 1414.5 425.5 L 1425.5 425.5 L 1425.5 435.5 L 1414.5 435.5 Z M 1385.5 425.5 L 1395.5 425.5 L 1395.5 435.5 L 1385.5 435.5 Z M 1355.5 425.5 L 1365.5 425.5 L 1365.5 435.5 L 1355.5 435.5 Z M 1325.5 425.5 L 1336.5 425.5 L 1336.5 435.5 L 1325.5 435.5 Z M 1295.5 425.5 L 1306.5 425.5 L 1306.5 435.5 L 1295.5 435.5 Z M 1266.5 425.5 L 1276.5 425.5 L 1276.5 435.5 L 1266.5 435.5 Z M 1236.5 425.5 L 1246.5 425.5 L 1246.5 435.5 L 1236.5 435.5 Z M 1206.5 425.5 L 1217.5 425.5 L 1217.5 435.5 L 1206.5 435.5 Z M 1176.5 425.5 L 1187.5 425.5 L 1187.5 435.5 L 1176.5 435.5 Z M 1147.5 425.5 L 1157.5 425.5 L 1157.5 435.5 L 1147.5 435.5 Z M 1117.5 425.5 L 1128.5 425.5 L 1128.5 435.5 L 1117.5 435.5 Z M 1087.5 425.5 L 1098.5 425.5 L 1098.5 435.5 L 1087.5 435.5 Z M 1058.5 425.5 L 1068.5 425.5 L 1068.5 435.5 L 1058.5 435.5 Z M 1028.5 425.5 L 1038.5 425.5 L 1038.5 435.5 L 1028.5 435.5 Z M 998.5 425.5 L 1009.5 425.5 L 1009.5 435.5 L 998.5 435.5 Z M 968.5 425.5 L 979.5 425.5 L 979.5 435.5 L 968.5 435.5 Z M 939.5 425.5 L 949.5 425.5 L 949.5 435.5 L 939.5 435.5 Z M 909.5 425.5 L 919.5 425.5 L 919.5 435.5 L 909.5 435.5 Z M 879.5 425.5 L 890.5 425.5 L 890.5 435.5 L 879.5 435.5 Z M 849.5 425.5 L 860.5 425.5 L 860.5 435.5 L 849.5 435.5 Z M 820.5 425.5 L 830.5 425.5 L 830.5 435.5 L 820.5 435.5 Z M 790.5 425.5 L 801.5 425.5 L 801.5 435.5 L 790.5 435.5 Z M 760.5 425.5 L 771.5 425.5 L 771.5 435.5 L 760.5 435.5 Z M 731.5 425.5 L 741.5 425.5 L 741.5 435.5 L 731.5 435.5 Z M 701.5 425.5 L 711.5 425.5 L 711.5 435.5 L 701.5 435.5 Z M 671.5 425.5 L 682.5 425.5 L 682.5 435.5 L 671.5 435.5 Z M 641.5 425.5 L 652.5 425.5 L 652.5 435.5 L 641.5 435.5 Z M 612.5 425.5 L 622.5 425.5 L 622.5 435.5 L 612.5 435.5 Z M 582.5 425.5 L 592.5 425.5 L 592.5 435.5 L 582.5 435.5 Z M 552.5 425.5 L 563.5 425.5 L 563.5 435.5 L 552.5 435.5 Z M 522.5 425.5 L 533.5 425.5 L 533.5 435.5 L 522.5 435.5 Z M 493.5 425.5 L 503.5 425.5 L 503.5 435.5 L 493.5 435.5 Z M 463.5 425.5 L 473.5 425.5 L 473.5 435.5 L 463.5 435.5 Z M 433.5 425.5 L 444.5 425.5 L 444.5 435.5 L 433.5 435.5 Z M 404.5 425.5 L 414.5 425.5 L 414.5 435.5 L 404.5 435.5 Z M 374.5 425.5 L 384.5 425.5 L 384.5 435.5 L 374.5 435.5 Z M 344.5 425.5 L 355.5 425.5 L 355.5 435.5 L 344.5 435.5 Z M 314.5 425.5 L 325.5 425.5 L 325.5 435.5 L 314.5 435.5 Z M 285.5 425.5 L 295.5 425.5 L 295.5 435.5 L 285.5 435.5 Z M 255.5 425.5 L 265.5 425.5 L 265.5 435.5 L 255.5 435.5 Z M 225.5 425.5 L 236.5 425.5 L 236.5 435.5 L 225.5 435.5 Z M 195.5 631.5 L 206.5 631.5 L 206.5 642.5 L 195.5 642.5 Z M 1712.5 631.5 L 1722.5 631.5 L 1722.5 642.5 L 1712.5 642.5 Z M 1682.5 631.5 L 1692.5 631.5 L 1692.5 642.5 L 1682.5 642.5 Z M 1652.5 631.5 L 1663.5 631.5 L 1663.5 642.5 L 1652.5 642.5 Z M 1622.5 631.5 L 1633.5 631.5 L 1633.5 642.5 L 1622.5 642.5 Z M 1593.5 631.5 L 1603.5 631.5 L 1603.5 642.5 L 1593.5 642.5 Z M 1563.5 631.5 L 1573.5 631.5 L 1573.5 642.5 L 1563.5 642.5 Z M 1533.5 631.5 L 1544.5 631.5 L 1544.5 642.5 L 1533.5 642.5 Z M 1503.5 631.5 L 1514.5 631.5 L 1514.5 642.5 L 1503.5 642.5 Z M 1474.5 631.5 L 1484.5 631.5 L 1484.5 642.5 L 1474.5 642.5 Z M 1444.5 631.5 L 1455.5 631.5 L 1455.5 642.5 L 1444.5 642.5 Z M 1414.5 631.5 L 1425.5 631.5 L 1425.5 642.5 L 1414.5 642.5 Z M 1385.5 631.5 L 1395.5 631.5 L 1395.5 642.5 L 1385.5 642.5 Z M 1355.5 631.5 L 1365.5 631.5 L 1365.5 642.5 L 1355.5 642.5 Z M 1325.5 631.5 L 1336.5 631.5 L 1336.5 642.5 L 1325.5 642.5 Z M 1295.5 631.5 L 1306.5 631.5 L 1306.5 642.5 L 1295.5 642.5 Z M 1266.5 631.5 L 1276.5 631.5 L 1276.5 642.5 L 1266.5 642.5 Z M 1236.5 631.5 L 1246.5 631.5 L 1246.5 642.5 L 1236.5 642.5 Z M 1206.5 631.5 L 1217.5 631.5 L 1217.5 642.5 L 1206.5 642.5 Z M 1176.5 631.5 L 1187.5 631.5 L 1187.5 642.5 L 1176.5 642.5 Z M 1147.5 631.5 L 1157.5 631.5 L 1157.5 642.5 L 1147.5 642.5 Z M 1117.5 631.5 L 1128.5 631.5 L 1128.5 642.5 L 1117.5 642.5 Z M 1087.5 631.5 L 1098.5 631.5 L 1098.5 642.5 L 1087.5 642.5 Z M 1058.5 631.5 L 1068.5 631.5 L 1068.5 642.5 L 1058.5 642.5 Z M 1028.5 631.5 L 1038.5 631.5 L 1038.5 642.5 L 1028.5 642.5 Z M 998.5 631.5 L 1009.5 631.5 L 1009.5 642.5 L 998.5 642.5 Z M 968.5 631.5 L 979.5 631.5 L 979.5 642.5 L 968.5 642.5 Z M 939.5 631.5 L 949.5 631.5 L 949.5 642.5 L 939.5 642.5 Z M 909.5 631.5 L 919.5 631.5 L 919.5 642.5 L 909.5 642.5 Z M 879.5 631.5 L 890.5 631.5 L 890.5 642.5 L 879.5 642.5 Z M 849.5 631.5 L 860.5 631.5 L 860.5 642.5 L 849.5 642.5 Z M 820.5 631.5 L 830.5 631.5 L 830.5 642.5 L 820.5 642.5 Z M 790.5 631.5 L 801.5 631.5 L 801.5 642.5 L 790.5 642.5 Z M 760.5 631.5 L 771.5 631.5 L 771.5 642.5 L 760.5 642.5 Z M 731.5 631.5 L 741.5 631.5 L 741.5 642.5 L 731.5 642.5 Z M 701.5 631.5 L 711.5 631.5 L 711.5 642.5 L 701.5 642.5 Z M 671.5 631.5 L 682.5 631.5 L 682.5 642.5 L 671.5 642.5 Z M 641.5 631.5 L 652.5 631.5 L 652.5 642.5 L 641.5 642.5 Z M 612.5 631.5 L 622.5 631.5 L 622.5 642.5 L 612.5 642.5 Z M 582.5 631.5 L 592.5 631.5 L 592.5 642.5 L 582.5 642.5 Z M 552.5 631.5 L 563.5 631.5 L 563.5 642.5 L 552.5 642.5 Z M 522.5 631.5 L 533.5 631.5 L 533.5 642.5 L 522.5 642.5 Z M 493.5 631.5 L 503.5 631.5 L 503.5 642.5 L 493.5 642.5 Z M 463.5 631.5 L 473.5 631.5 L 473.5 642.5 L 463.5 642.5 Z M 433.5 631.5 L 444.5 631.5 L 444.5 642.5 L 433.5 642.5 Z M 404.5 631.5 L 414.5 631.5 L 414.5 642.5 L 404.5 642.5 Z M 374.5 631.5 L 384.5 631.5 L 384.5 642.5 L 374.5 642.5 Z M 344.5 631.5 L 355.5 631.5 L 355.5 642.5 L 344.5 642.5 Z M 314.5 631.5 L 325.5 631.5 L 325.5 642.5 L 314.5 642.5 Z M 285.5 631.5 L 295.5 631.5 L 295.5 642.5 L 285.5 642.5 Z M 255.5 631.5 L 265.5 631.5 L 265.5 642.5 L 255.5 642.5 Z M 225.5 631.5 L 236.5 631.5 L 236.5 642.5 L 225.5 642.5 Z M 225.5 631.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
+<clipPath id="clip12">
+  <path d="M 18.5 1019.5 L 1137.5 1019.5 L 1137.5 1021.5 L 18.5 1021.5 Z M 1135.5 1021.5 L 1137.5 1021.5 L 1137.5 1059 L 1135.5 1059 Z M 1135.5 1021.5 "/>
+</clipPath>
+<image id="image1948" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAbSURBVDiNY/jPgB8yEJAnDEdNGDVh1IQhagIAIcT+EDL4XQEAAAAASUVORK5CYII="/>
+<pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
+  <use xlink:href="#image1948"/>
+</pattern>
+<mask id="mask5">
+<rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
+</mask>
 </defs>
-<g id="surface305">
+<g id="surface340">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -167,6 +177,8 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 920.09375 573.207031 L 920.09375 574.738281 L 912.144531 585.003906 L 920.128906 585.003906 L 920.128906 586.5 L 910.011719 586.5 L 910.011719 585.003906 L 917.996094 574.703125 L 910.519531 574.703125 L 910.519531 573.207031 Z M 920.09375 573.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 909 505 L 919 505 M 909 495 L 919 495 M 909 495 L 909 505 M 919 495 L 919 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 909 505 L 919 505 M 909 495 L 919 495 M 919 505 L 919 495 M 909 505 L 909 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 186 438 L 186 447 M 181 443 L 190 443 M 185 444 L 187 444 M 185 442 L 187 442 M 185 442 L 185 444 M 187 442 L 187 444 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<g clip-path="url(#clip12)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(100%,100%,100%);fill-opacity:0.724409;stroke:none;" mask="url(#mask5)"/>
+</g>
 </g>
 </svg>
diff --git a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.svg b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.svg
index 91c7da2..5fe4a10 100644
--- a/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.svg
+++ b/cells/busdriver2/sky130_fd_sc_lp__busdriver2_20.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 418.5 L 1743.5 418.5 L 1743.5 534.5 L 174.5 534.5 Z M 912.5 534.5 L 1485.5 534.5 L 1485.5 553.5 L 912.5 553.5 Z M 912.5 534.5 "/>
 </clipPath>
-<image id="image305" 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="#image305"/>
+  <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 186.5 621.5 L 1732.5 621.5 L 1732.5 636.5 L 186.5 636.5 Z M 186.5 621.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="#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 1632.5 570.5 L 1642.5 570.5 L 1642.5 622.5 L 1632.5 622.5 Z M 384.5 582.5 L 394.5 582.5 L 394.5 622.5 L 384.5 622.5 Z M 416.5 582.5 L 425.5 582.5 L 425.5 622.5 L 416.5 622.5 Z M 443.5 582.5 L 452.5 582.5 L 452.5 622.5 L 443.5 622.5 Z M 469.5 582.5 L 478.5 582.5 L 478.5 622.5 L 469.5 622.5 Z M 496.5 582.5 L 505.5 582.5 L 505.5 622.5 L 496.5 622.5 Z M 527.5 582.5 L 537.5 582.5 L 537.5 622.5 L 527.5 622.5 Z M 554.5 582.5 L 563.5 582.5 L 563.5 622.5 L 554.5 622.5 Z M 591.5 582.5 L 600.5 582.5 L 600.5 622.5 L 591.5 622.5 Z M 617.5 582.5 L 626.5 582.5 L 626.5 622.5 L 617.5 622.5 Z M 644.5 582.5 L 653.5 582.5 L 653.5 622.5 L 644.5 622.5 Z M 670.5 582.5 L 680.5 582.5 L 680.5 622.5 L 670.5 622.5 Z M 697.5 582.5 L 706.5 582.5 L 706.5 622.5 L 697.5 622.5 Z M 724.5 582.5 L 733.5 582.5 L 733.5 622.5 L 724.5 622.5 Z M 750.5 582.5 L 760.5 582.5 L 760.5 622.5 L 750.5 622.5 Z M 777.5 582.5 L 786.5 582.5 L 786.5 622.5 L 777.5 622.5 Z M 809.5 582.5 L 818.5 582.5 L 818.5 622.5 L 809.5 622.5 Z M 840.5 582.5 L 849.5 582.5 L 849.5 622.5 L 840.5 622.5 Z M 872.5 582.5 L 881.5 582.5 L 881.5 622.5 L 872.5 622.5 Z M 898.5 582.5 L 908.5 582.5 L 908.5 622.5 L 898.5 622.5 Z M 925.5 582.5 L 934.5 582.5 L 934.5 622.5 L 925.5 622.5 Z M 952.5 582.5 L 961.5 582.5 L 961.5 622.5 L 952.5 622.5 Z M 978.5 582.5 L 988.5 582.5 L 988.5 622.5 L 978.5 622.5 Z M 1005.5 582.5 L 1014.5 582.5 L 1014.5 622.5 L 1005.5 622.5 Z M 1032.5 582.5 L 1041.5 582.5 L 1041.5 622.5 L 1032.5 622.5 Z M 1058.5 582.5 L 1067.5 582.5 L 1067.5 622.5 L 1058.5 622.5 Z M 1085.5 582.5 L 1094.5 582.5 L 1094.5 622.5 L 1085.5 622.5 Z M 1111.5 582.5 L 1121.5 582.5 L 1121.5 622.5 L 1111.5 622.5 Z M 1138.5 582.5 L 1147.5 582.5 L 1147.5 622.5 L 1138.5 622.5 Z M 212.5 570.5 L 221.5 570.5 L 221.5 622.5 L 212.5 622.5 Z M 238.5 570.5 L 248.5 570.5 L 248.5 622.5 L 238.5 622.5 Z M 275.5 570.5 L 284.5 570.5 L 284.5 622.5 L 275.5 622.5 Z M 316.5 570.5 L 325.5 570.5 L 325.5 622.5 L 316.5 622.5 Z M 1538.5 570.5 L 1547.5 570.5 L 1547.5 622.5 L 1538.5 622.5 Z M 1569.5 570.5 L 1578.5 570.5 L 1578.5 622.5 L 1569.5 622.5 Z M 1606.5 570.5 L 1615.5 570.5 L 1615.5 622.5 L 1606.5 622.5 Z M 1606.5 570.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <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 1696.5 445.5 L 1706.5 445.5 L 1706.5 523.5 L 1696.5 523.5 Z M 1670.5 445.5 L 1679.5 445.5 L 1679.5 523.5 L 1670.5 523.5 Z M 1615.5 445.5 L 1624.5 445.5 L 1624.5 523.5 L 1615.5 523.5 Z M 1508.5 445.5 L 1518.5 445.5 L 1518.5 523.5 L 1508.5 523.5 Z M 692.5 445.5 L 702.5 445.5 L 702.5 523.5 L 692.5 523.5 Z M 265.5 445.5 L 274.5 445.5 L 274.5 523.5 L 265.5 523.5 Z M 238.5 445.5 L 248.5 445.5 L 248.5 523.5 L 238.5 523.5 Z M 665.5 445.5 L 674.5 445.5 L 674.5 523.5 L 665.5 523.5 Z M 212.5 445.5 L 221.5 445.5 L 221.5 523.5 L 212.5 523.5 Z M 879.5 445.5 L 888.5 445.5 L 888.5 523.5 L 879.5 523.5 Z M 638.5 445.5 L 647.5 445.5 L 647.5 523.5 L 638.5 523.5 Z M 611.5 445.5 L 621.5 445.5 L 621.5 523.5 L 611.5 523.5 Z M 1588.5 445.5 L 1598.5 445.5 L 1598.5 523.5 L 1588.5 523.5 Z M 852.5 445.5 L 862.5 445.5 L 862.5 523.5 L 852.5 523.5 Z M 585.5 445.5 L 594.5 445.5 L 594.5 523.5 L 585.5 523.5 Z M 558.5 445.5 L 567.5 445.5 L 567.5 523.5 L 558.5 523.5 Z M 826.5 445.5 L 835.5 445.5 L 835.5 523.5 L 826.5 523.5 Z M 531.5 445.5 L 541.5 445.5 L 541.5 523.5 L 531.5 523.5 Z M 505.5 445.5 L 514.5 445.5 L 514.5 523.5 L 505.5 523.5 Z M 1642.5 445.5 L 1651.5 445.5 L 1651.5 523.5 L 1642.5 523.5 Z M 1562.5 445.5 L 1571.5 445.5 L 1571.5 523.5 L 1562.5 523.5 Z M 799.5 445.5 L 808.5 445.5 L 808.5 523.5 L 799.5 523.5 Z M 478.5 445.5 L 487.5 445.5 L 487.5 523.5 L 478.5 523.5 Z M 452.5 445.5 L 461.5 445.5 L 461.5 523.5 L 452.5 523.5 Z M 292.5 445.5 L 301.5 445.5 L 301.5 523.5 L 292.5 523.5 Z M 318.5 445.5 L 328.5 445.5 L 328.5 523.5 L 318.5 523.5 Z M 345.5 445.5 L 354.5 445.5 L 354.5 523.5 L 345.5 523.5 Z M 372.5 445.5 L 381.5 445.5 L 381.5 523.5 L 372.5 523.5 Z M 772.5 445.5 L 782.5 445.5 L 782.5 523.5 L 772.5 523.5 Z M 425.5 445.5 L 434.5 445.5 L 434.5 523.5 L 425.5 523.5 Z M 398.5 445.5 L 408.5 445.5 L 408.5 523.5 L 398.5 523.5 Z M 1535.5 445.5 L 1544.5 445.5 L 1544.5 523.5 L 1535.5 523.5 Z M 746.5 445.5 L 755.5 445.5 L 755.5 523.5 L 746.5 523.5 Z M 719.5 445.5 L 728.5 445.5 L 728.5 523.5 L 719.5 523.5 Z M 1234.5 464.5 L 1243.5 464.5 L 1243.5 542.5 L 1234.5 542.5 Z M 1207.5 464.5 L 1217.5 464.5 L 1217.5 542.5 L 1207.5 542.5 Z M 1128.5 464.5 L 1137.5 464.5 L 1137.5 542.5 L 1128.5 542.5 Z M 1101.5 464.5 L 1110.5 464.5 L 1110.5 542.5 L 1101.5 542.5 Z M 1048.5 464.5 L 1057.5 464.5 L 1057.5 542.5 L 1048.5 542.5 Z M 994.5 464.5 L 1004.5 464.5 L 1004.5 542.5 L 994.5 542.5 Z M 1420.5 464.5 L 1430.5 464.5 L 1430.5 542.5 L 1420.5 542.5 Z M 1447.5 464.5 L 1456.5 464.5 L 1456.5 542.5 L 1447.5 542.5 Z M 941.5 464.5 L 950.5 464.5 L 950.5 542.5 L 941.5 542.5 Z M 1021.5 464.5 L 1030.5 464.5 L 1030.5 542.5 L 1021.5 542.5 Z M 1341.5 464.5 L 1350.5 464.5 L 1350.5 542.5 L 1341.5 542.5 Z M 1261.5 464.5 L 1270.5 464.5 L 1270.5 542.5 L 1261.5 542.5 Z M 1154.5 464.5 L 1163.5 464.5 L 1163.5 542.5 L 1154.5 542.5 Z M 1074.5 464.5 L 1084.5 464.5 L 1084.5 542.5 L 1074.5 542.5 Z M 1314.5 464.5 L 1323.5 464.5 L 1323.5 542.5 L 1314.5 542.5 Z M 968.5 464.5 L 977.5 464.5 L 977.5 542.5 L 968.5 542.5 Z M 1367.5 464.5 L 1377.5 464.5 L 1377.5 542.5 L 1367.5 542.5 Z M 1181.5 464.5 L 1190.5 464.5 L 1190.5 542.5 L 1181.5 542.5 Z M 1287.5 464.5 L 1297.5 464.5 L 1297.5 542.5 L 1287.5 542.5 Z M 1394.5 464.5 L 1403.5 464.5 L 1403.5 542.5 L 1394.5 542.5 Z M 1394.5 464.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,25 @@
 <clipPath id="clip11">
   <path d="M 195.5 425.5 L 206.5 425.5 L 206.5 435.5 L 195.5 435.5 Z M 1712.5 425.5 L 1722.5 425.5 L 1722.5 435.5 L 1712.5 435.5 Z M 1682.5 425.5 L 1692.5 425.5 L 1692.5 435.5 L 1682.5 435.5 Z M 1652.5 425.5 L 1663.5 425.5 L 1663.5 435.5 L 1652.5 435.5 Z M 1622.5 425.5 L 1633.5 425.5 L 1633.5 435.5 L 1622.5 435.5 Z M 1593.5 425.5 L 1603.5 425.5 L 1603.5 435.5 L 1593.5 435.5 Z M 1563.5 425.5 L 1573.5 425.5 L 1573.5 435.5 L 1563.5 435.5 Z M 1533.5 425.5 L 1544.5 425.5 L 1544.5 435.5 L 1533.5 435.5 Z M 1503.5 425.5 L 1514.5 425.5 L 1514.5 435.5 L 1503.5 435.5 Z M 1474.5 425.5 L 1484.5 425.5 L 1484.5 435.5 L 1474.5 435.5 Z M 1444.5 425.5 L 1455.5 425.5 L 1455.5 435.5 L 1444.5 435.5 Z M 1414.5 425.5 L 1425.5 425.5 L 1425.5 435.5 L 1414.5 435.5 Z M 1385.5 425.5 L 1395.5 425.5 L 1395.5 435.5 L 1385.5 435.5 Z M 1355.5 425.5 L 1365.5 425.5 L 1365.5 435.5 L 1355.5 435.5 Z M 1325.5 425.5 L 1336.5 425.5 L 1336.5 435.5 L 1325.5 435.5 Z M 1295.5 425.5 L 1306.5 425.5 L 1306.5 435.5 L 1295.5 435.5 Z M 1266.5 425.5 L 1276.5 425.5 L 1276.5 435.5 L 1266.5 435.5 Z M 1236.5 425.5 L 1246.5 425.5 L 1246.5 435.5 L 1236.5 435.5 Z M 1206.5 425.5 L 1217.5 425.5 L 1217.5 435.5 L 1206.5 435.5 Z M 1176.5 425.5 L 1187.5 425.5 L 1187.5 435.5 L 1176.5 435.5 Z M 1147.5 425.5 L 1157.5 425.5 L 1157.5 435.5 L 1147.5 435.5 Z M 1117.5 425.5 L 1128.5 425.5 L 1128.5 435.5 L 1117.5 435.5 Z M 1087.5 425.5 L 1098.5 425.5 L 1098.5 435.5 L 1087.5 435.5 Z M 1058.5 425.5 L 1068.5 425.5 L 1068.5 435.5 L 1058.5 435.5 Z M 1028.5 425.5 L 1038.5 425.5 L 1038.5 435.5 L 1028.5 435.5 Z M 998.5 425.5 L 1009.5 425.5 L 1009.5 435.5 L 998.5 435.5 Z M 968.5 425.5 L 979.5 425.5 L 979.5 435.5 L 968.5 435.5 Z M 939.5 425.5 L 949.5 425.5 L 949.5 435.5 L 939.5 435.5 Z M 909.5 425.5 L 919.5 425.5 L 919.5 435.5 L 909.5 435.5 Z M 879.5 425.5 L 890.5 425.5 L 890.5 435.5 L 879.5 435.5 Z M 849.5 425.5 L 860.5 425.5 L 860.5 435.5 L 849.5 435.5 Z M 820.5 425.5 L 830.5 425.5 L 830.5 435.5 L 820.5 435.5 Z M 790.5 425.5 L 801.5 425.5 L 801.5 435.5 L 790.5 435.5 Z M 760.5 425.5 L 771.5 425.5 L 771.5 435.5 L 760.5 435.5 Z M 731.5 425.5 L 741.5 425.5 L 741.5 435.5 L 731.5 435.5 Z M 701.5 425.5 L 711.5 425.5 L 711.5 435.5 L 701.5 435.5 Z M 671.5 425.5 L 682.5 425.5 L 682.5 435.5 L 671.5 435.5 Z M 641.5 425.5 L 652.5 425.5 L 652.5 435.5 L 641.5 435.5 Z M 612.5 425.5 L 622.5 425.5 L 622.5 435.5 L 612.5 435.5 Z M 582.5 425.5 L 592.5 425.5 L 592.5 435.5 L 582.5 435.5 Z M 552.5 425.5 L 563.5 425.5 L 563.5 435.5 L 552.5 435.5 Z M 522.5 425.5 L 533.5 425.5 L 533.5 435.5 L 522.5 435.5 Z M 493.5 425.5 L 503.5 425.5 L 503.5 435.5 L 493.5 435.5 Z M 463.5 425.5 L 473.5 425.5 L 473.5 435.5 L 463.5 435.5 Z M 433.5 425.5 L 444.5 425.5 L 444.5 435.5 L 433.5 435.5 Z M 404.5 425.5 L 414.5 425.5 L 414.5 435.5 L 404.5 435.5 Z M 374.5 425.5 L 384.5 425.5 L 384.5 435.5 L 374.5 435.5 Z M 344.5 425.5 L 355.5 425.5 L 355.5 435.5 L 344.5 435.5 Z M 314.5 425.5 L 325.5 425.5 L 325.5 435.5 L 314.5 435.5 Z M 285.5 425.5 L 295.5 425.5 L 295.5 435.5 L 285.5 435.5 Z M 255.5 425.5 L 265.5 425.5 L 265.5 435.5 L 255.5 435.5 Z M 225.5 425.5 L 236.5 425.5 L 236.5 435.5 L 225.5 435.5 Z M 195.5 631.5 L 206.5 631.5 L 206.5 642.5 L 195.5 642.5 Z M 1712.5 631.5 L 1722.5 631.5 L 1722.5 642.5 L 1712.5 642.5 Z M 1682.5 631.5 L 1692.5 631.5 L 1692.5 642.5 L 1682.5 642.5 Z M 1652.5 631.5 L 1663.5 631.5 L 1663.5 642.5 L 1652.5 642.5 Z M 1622.5 631.5 L 1633.5 631.5 L 1633.5 642.5 L 1622.5 642.5 Z M 1593.5 631.5 L 1603.5 631.5 L 1603.5 642.5 L 1593.5 642.5 Z M 1563.5 631.5 L 1573.5 631.5 L 1573.5 642.5 L 1563.5 642.5 Z M 1533.5 631.5 L 1544.5 631.5 L 1544.5 642.5 L 1533.5 642.5 Z M 1503.5 631.5 L 1514.5 631.5 L 1514.5 642.5 L 1503.5 642.5 Z M 1474.5 631.5 L 1484.5 631.5 L 1484.5 642.5 L 1474.5 642.5 Z M 1444.5 631.5 L 1455.5 631.5 L 1455.5 642.5 L 1444.5 642.5 Z M 1414.5 631.5 L 1425.5 631.5 L 1425.5 642.5 L 1414.5 642.5 Z M 1385.5 631.5 L 1395.5 631.5 L 1395.5 642.5 L 1385.5 642.5 Z M 1355.5 631.5 L 1365.5 631.5 L 1365.5 642.5 L 1355.5 642.5 Z M 1325.5 631.5 L 1336.5 631.5 L 1336.5 642.5 L 1325.5 642.5 Z M 1295.5 631.5 L 1306.5 631.5 L 1306.5 642.5 L 1295.5 642.5 Z M 1266.5 631.5 L 1276.5 631.5 L 1276.5 642.5 L 1266.5 642.5 Z M 1236.5 631.5 L 1246.5 631.5 L 1246.5 642.5 L 1236.5 642.5 Z M 1206.5 631.5 L 1217.5 631.5 L 1217.5 642.5 L 1206.5 642.5 Z M 1176.5 631.5 L 1187.5 631.5 L 1187.5 642.5 L 1176.5 642.5 Z M 1147.5 631.5 L 1157.5 631.5 L 1157.5 642.5 L 1147.5 642.5 Z M 1117.5 631.5 L 1128.5 631.5 L 1128.5 642.5 L 1117.5 642.5 Z M 1087.5 631.5 L 1098.5 631.5 L 1098.5 642.5 L 1087.5 642.5 Z M 1058.5 631.5 L 1068.5 631.5 L 1068.5 642.5 L 1058.5 642.5 Z M 1028.5 631.5 L 1038.5 631.5 L 1038.5 642.5 L 1028.5 642.5 Z M 998.5 631.5 L 1009.5 631.5 L 1009.5 642.5 L 998.5 642.5 Z M 968.5 631.5 L 979.5 631.5 L 979.5 642.5 L 968.5 642.5 Z M 939.5 631.5 L 949.5 631.5 L 949.5 642.5 L 939.5 642.5 Z M 909.5 631.5 L 919.5 631.5 L 919.5 642.5 L 909.5 642.5 Z M 879.5 631.5 L 890.5 631.5 L 890.5 642.5 L 879.5 642.5 Z M 849.5 631.5 L 860.5 631.5 L 860.5 642.5 L 849.5 642.5 Z M 820.5 631.5 L 830.5 631.5 L 830.5 642.5 L 820.5 642.5 Z M 790.5 631.5 L 801.5 631.5 L 801.5 642.5 L 790.5 642.5 Z M 760.5 631.5 L 771.5 631.5 L 771.5 642.5 L 760.5 642.5 Z M 731.5 631.5 L 741.5 631.5 L 741.5 642.5 L 731.5 642.5 Z M 701.5 631.5 L 711.5 631.5 L 711.5 642.5 L 701.5 642.5 Z M 671.5 631.5 L 682.5 631.5 L 682.5 642.5 L 671.5 642.5 Z M 641.5 631.5 L 652.5 631.5 L 652.5 642.5 L 641.5 642.5 Z M 612.5 631.5 L 622.5 631.5 L 622.5 642.5 L 612.5 642.5 Z M 582.5 631.5 L 592.5 631.5 L 592.5 642.5 L 582.5 642.5 Z M 552.5 631.5 L 563.5 631.5 L 563.5 642.5 L 552.5 642.5 Z M 522.5 631.5 L 533.5 631.5 L 533.5 642.5 L 522.5 642.5 Z M 493.5 631.5 L 503.5 631.5 L 503.5 642.5 L 493.5 642.5 Z M 463.5 631.5 L 473.5 631.5 L 473.5 642.5 L 463.5 642.5 Z M 433.5 631.5 L 444.5 631.5 L 444.5 642.5 L 433.5 642.5 Z M 404.5 631.5 L 414.5 631.5 L 414.5 642.5 L 404.5 642.5 Z M 374.5 631.5 L 384.5 631.5 L 384.5 642.5 L 374.5 642.5 Z M 344.5 631.5 L 355.5 631.5 L 355.5 642.5 L 344.5 642.5 Z M 314.5 631.5 L 325.5 631.5 L 325.5 642.5 L 314.5 642.5 Z M 285.5 631.5 L 295.5 631.5 L 295.5 642.5 L 285.5 642.5 Z M 255.5 631.5 L 265.5 631.5 L 265.5 642.5 L 255.5 642.5 Z M 225.5 631.5 L 236.5 631.5 L 236.5 642.5 L 225.5 642.5 Z M 225.5 631.5 "/>
 </clipPath>
-<image id="image308" 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="#image308"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
+<clipPath id="clip12">
+  <path d="M 18.5 1019.5 L 1137.5 1019.5 L 1137.5 1021.5 L 18.5 1021.5 Z M 1135.5 1021.5 L 1137.5 1021.5 L 1137.5 1059 L 1135.5 1059 Z M 1135.5 1021.5 "/>
+</clipPath>
+<image id="image1945" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAbSURBVDiNY/jPgB8yEJAnDEdNGDVh1IQhagIAIcT+EDL4XQEAAAAASUVORK5CYII="/>
+<pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
+  <use xlink:href="#image1945"/>
+</pattern>
+<mask id="mask5">
+<rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
+</mask>
 </defs>
-<g id="surface302">
+<g id="surface337">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -166,6 +176,8 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 920.09375 573.207031 L 920.09375 574.738281 L 912.144531 585.003906 L 920.128906 585.003906 L 920.128906 586.5 L 910.011719 586.5 L 910.011719 585.003906 L 917.996094 574.703125 L 910.519531 574.703125 L 910.519531 573.207031 Z M 920.09375 573.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 909 505 L 919 505 M 909 495 L 919 495 M 909 495 L 909 505 M 919 495 L 919 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 909 505 L 919 505 M 909 495 L 919 495 M 919 505 L 919 495 M 909 505 L 909 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 186 438 L 186 447 M 181 443 L 190 443 M 185 444 L 187 444 M 185 442 L 187 442 M 185 442 L 185 444 M 187 442 L 187 444 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<g clip-path="url(#clip12)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(100%,100%,100%);fill-opacity:0.724409;stroke:none;" mask="url(#mask5)"/>
+</g>
 </g>
 </svg>
diff --git a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.svg b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.svg
index 8faed10..2f99d1d 100644
--- a/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.svg
+++ b/cells/busdrivernovlp/sky130_fd_sc_lp__busdrivernovlp_20.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 373.5 L 1743.5 373.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 373.5 "/>
 </clipPath>
-<image id="image292" 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="#image292"/>
+  <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 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="#image292"/>
+  <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 342.5 605.5 L 355.5 605.5 L 355.5 641.5 L 342.5 641.5 Z M 309.5 605.5 L 322.5 605.5 L 322.5 641.5 L 309.5 641.5 Z M 264.5 605.5 L 277.5 605.5 L 277.5 641.5 L 264.5 641.5 Z M 596.5 585.5 L 609.5 585.5 L 609.5 657.5 L 596.5 657.5 Z M 1342.5 602.5 L 1355.5 602.5 L 1355.5 657.5 L 1342.5 657.5 Z M 1417.5 602.5 L 1430.5 602.5 L 1430.5 657.5 L 1417.5 657.5 Z M 1528.5 602.5 L 1541.5 602.5 L 1541.5 657.5 L 1528.5 657.5 Z M 1491.5 602.5 L 1504.5 602.5 L 1504.5 657.5 L 1491.5 657.5 Z M 1305.5 602.5 L 1318.5 602.5 L 1318.5 657.5 L 1305.5 657.5 Z M 1566.5 602.5 L 1579.5 602.5 L 1579.5 657.5 L 1566.5 657.5 Z M 1231.5 602.5 L 1244.5 602.5 L 1244.5 657.5 L 1231.5 657.5 Z M 1194.5 602.5 L 1207.5 602.5 L 1207.5 657.5 L 1194.5 657.5 Z M 1156.5 602.5 L 1169.5 602.5 L 1169.5 657.5 L 1156.5 657.5 Z M 1119.5 602.5 L 1132.5 602.5 L 1132.5 657.5 L 1119.5 657.5 Z M 1082.5 602.5 L 1095.5 602.5 L 1095.5 657.5 L 1082.5 657.5 Z M 1380.5 602.5 L 1393.5 602.5 L 1393.5 657.5 L 1380.5 657.5 Z M 880.5 585.5 L 893.5 585.5 L 893.5 657.5 L 880.5 657.5 Z M 529.5 585.5 L 542.5 585.5 L 542.5 657.5 L 529.5 657.5 Z M 1268.5 602.5 L 1281.5 602.5 L 1281.5 657.5 L 1268.5 657.5 Z M 1454.5 602.5 L 1467.5 602.5 L 1467.5 657.5 L 1454.5 657.5 Z M 843.5 585.5 L 856.5 585.5 L 856.5 657.5 L 843.5 657.5 Z M 651.5 585.5 L 664.5 585.5 L 664.5 657.5 L 651.5 657.5 Z M 713.5 621.5 L 726.5 621.5 L 726.5 657.5 L 713.5 657.5 Z M 968.5 585.5 L 981.5 585.5 L 981.5 657.5 L 968.5 657.5 Z M 492.5 585.5 L 505.5 585.5 L 505.5 657.5 L 492.5 657.5 Z M 756.5 621.5 L 769.5 621.5 L 769.5 657.5 L 756.5 657.5 Z M 924.5 585.5 L 937.5 585.5 L 937.5 657.5 L 924.5 657.5 Z M 924.5 585.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <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 353.5 410.5 L 366.5 410.5 L 366.5 483.5 L 353.5 483.5 Z M 390.5 410.5 L 403.5 410.5 L 403.5 483.5 L 390.5 483.5 Z M 723.5 444.5 L 736.5 444.5 L 736.5 516.5 L 723.5 516.5 Z M 756.5 444.5 L 769.5 444.5 L 769.5 516.5 L 756.5 516.5 Z M 1603.5 410.5 L 1616.5 410.5 L 1616.5 519.5 L 1603.5 519.5 Z M 1677.5 410.5 L 1690.5 410.5 L 1690.5 519.5 L 1677.5 519.5 Z M 1491.5 410.5 L 1504.5 410.5 L 1504.5 519.5 L 1491.5 519.5 Z M 1454.5 410.5 L 1467.5 410.5 L 1467.5 519.5 L 1454.5 519.5 Z M 1640.5 410.5 L 1653.5 410.5 L 1653.5 519.5 L 1640.5 519.5 Z M 1380.5 410.5 L 1393.5 410.5 L 1393.5 519.5 L 1380.5 519.5 Z M 1342.5 410.5 L 1355.5 410.5 L 1355.5 519.5 L 1342.5 519.5 Z M 1305.5 410.5 L 1318.5 410.5 L 1318.5 519.5 L 1305.5 519.5 Z M 1268.5 410.5 L 1281.5 410.5 L 1281.5 519.5 L 1268.5 519.5 Z M 1231.5 410.5 L 1244.5 410.5 L 1244.5 519.5 L 1231.5 519.5 Z M 1194.5 410.5 L 1207.5 410.5 L 1207.5 519.5 L 1194.5 519.5 Z M 1156.5 410.5 L 1169.5 410.5 L 1169.5 519.5 L 1156.5 519.5 Z M 1119.5 410.5 L 1132.5 410.5 L 1132.5 519.5 L 1119.5 519.5 Z M 1082.5 410.5 L 1095.5 410.5 L 1095.5 519.5 L 1082.5 519.5 Z M 583.5 410.5 L 596.5 410.5 L 596.5 519.5 L 583.5 519.5 Z M 539.5 410.5 L 552.5 410.5 L 552.5 519.5 L 539.5 519.5 Z M 970.5 410.5 L 983.5 410.5 L 983.5 519.5 L 970.5 519.5 Z M 883.5 410.5 L 896.5 410.5 L 896.5 519.5 L 883.5 519.5 Z M 845.5 410.5 L 858.5 410.5 L 858.5 519.5 L 845.5 519.5 Z M 1566.5 410.5 L 1579.5 410.5 L 1579.5 519.5 L 1566.5 519.5 Z M 1528.5 410.5 L 1541.5 410.5 L 1541.5 519.5 L 1528.5 519.5 Z M 620.5 410.5 L 633.5 410.5 L 633.5 519.5 L 620.5 519.5 Z M 271.5 410.5 L 284.5 410.5 L 284.5 519.5 L 271.5 519.5 Z M 309.5 410.5 L 322.5 410.5 L 322.5 519.5 L 309.5 519.5 Z M 502.5 410.5 L 515.5 410.5 L 515.5 519.5 L 502.5 519.5 Z M 1417.5 410.5 L 1430.5 410.5 L 1430.5 519.5 L 1417.5 519.5 Z M 226.5 446.5 L 238.5 446.5 L 238.5 519.5 L 226.5 519.5 Z M 1008.5 410.5 L 1021.5 410.5 L 1021.5 519.5 L 1008.5 519.5 Z M 1045.5 410.5 L 1058.5 410.5 L 1058.5 519.5 L 1045.5 519.5 Z M 1045.5 410.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 988.5 494.5 L 1003.5 494.5 L 1003.5 501.5 L 988.5 501.5 Z M 1360.5 494.5 L 1375.5 494.5 L 1375.5 503.5 L 1360.5 503.5 Z M 1509.5 494.5 L 1524.5 494.5 L 1524.5 503.5 L 1509.5 503.5 Z M 1137.5 494.5 L 1152.5 494.5 L 1152.5 503.5 L 1137.5 503.5 Z M 1583.5 494.5 L 1598.5 494.5 L 1598.5 503.5 L 1583.5 503.5 Z M 1435.5 494.5 L 1449.5 494.5 L 1449.5 503.5 L 1435.5 503.5 Z M 1658.5 494.5 L 1672.5 494.5 L 1672.5 503.5 L 1658.5 503.5 Z M 1286.5 494.5 L 1300.5 494.5 L 1300.5 503.5 L 1286.5 503.5 Z M 1063.5 494.5 L 1077.5 494.5 L 1077.5 503.5 L 1063.5 503.5 Z M 1211.5 494.5 L 1226.5 494.5 L 1226.5 503.5 L 1211.5 503.5 Z M 1137.5 503.5 L 1152.5 503.5 L 1152.5 509.5 L 1137.5 509.5 Z M 1435.5 503.5 L 1449.5 503.5 L 1449.5 509.5 L 1435.5 509.5 Z M 1658.5 503.5 L 1672.5 503.5 L 1672.5 509.5 L 1658.5 509.5 Z M 988.5 501.5 L 1003.5 501.5 L 1003.5 509.5 L 988.5 509.5 Z M 1583.5 503.5 L 1598.5 503.5 L 1598.5 509.5 L 1583.5 509.5 Z M 1063.5 503.5 L 1077.5 503.5 L 1077.5 509.5 L 1063.5 509.5 Z M 1509.5 503.5 L 1524.5 503.5 L 1524.5 509.5 L 1509.5 509.5 Z M 1286.5 503.5 L 1300.5 503.5 L 1300.5 509.5 L 1286.5 509.5 Z M 1360.5 503.5 L 1375.5 503.5 L 1375.5 509.5 L 1360.5 509.5 Z M 1211.5 503.5 L 1226.5 503.5 L 1226.5 509.5 L 1211.5 509.5 Z M 1396.5 526.5 L 1411.5 526.5 L 1411.5 540.5 L 1396.5 540.5 Z M 1651.5 526.5 L 1666.5 526.5 L 1666.5 540.5 L 1651.5 540.5 Z M 1620.5 526.5 L 1634.5 526.5 L 1634.5 540.5 L 1620.5 540.5 Z M 1471.5 526.5 L 1486.5 526.5 L 1486.5 540.5 L 1471.5 540.5 Z M 1545.5 526.5 L 1560.5 526.5 L 1560.5 540.5 L 1545.5 540.5 Z M 1620.5 540.5 L 1634.5 540.5 L 1634.5 541.5 L 1620.5 541.5 Z M 1396.5 540.5 L 1411.5 540.5 L 1411.5 541.5 L 1396.5 541.5 Z M 370.5 526.5 L 385.5 526.5 L 385.5 541.5 L 370.5 541.5 Z M 993.5 526.5 L 1008.5 526.5 L 1008.5 541.5 L 993.5 541.5 Z M 1651.5 540.5 L 1666.5 540.5 L 1666.5 541.5 L 1651.5 541.5 Z M 1545.5 540.5 L 1560.5 540.5 L 1560.5 541.5 L 1545.5 541.5 Z M 1471.5 540.5 L 1486.5 540.5 L 1486.5 541.5 L 1471.5 541.5 Z M 1175.5 558.5 L 1190.5 558.5 L 1190.5 567.5 L 1175.5 567.5 Z M 1324.5 558.5 L 1339.5 558.5 L 1339.5 567.5 L 1324.5 567.5 Z M 1249.5 558.5 L 1264.5 558.5 L 1264.5 567.5 L 1249.5 567.5 Z M 1101.5 558.5 L 1115.5 558.5 L 1115.5 567.5 L 1101.5 567.5 Z M 1026.5 558.5 L 1041.5 558.5 L 1041.5 567.5 L 1026.5 567.5 Z M 1324.5 567.5 L 1339.5 567.5 L 1339.5 573.5 L 1324.5 573.5 Z M 744.5 558.5 L 758.5 558.5 L 758.5 573.5 L 744.5 573.5 Z M 1101.5 567.5 L 1115.5 567.5 L 1115.5 573.5 L 1101.5 573.5 Z M 1249.5 567.5 L 1264.5 567.5 L 1264.5 573.5 L 1249.5 573.5 Z M 661.5 558.5 L 675.5 558.5 L 675.5 573.5 L 661.5 573.5 Z M 1026.5 567.5 L 1041.5 567.5 L 1041.5 573.5 L 1026.5 573.5 Z M 1175.5 567.5 L 1190.5 567.5 L 1190.5 573.5 L 1175.5 573.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="image295" 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="#image295"/>
+  <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="surface289">
+<g id="surface320">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 630.464844 537.972656 L 623.371094 537.972656 L 621.429688 543.5 L 618.929688 543.5 L 625.492188 525.097656 L 628.523438 525.097656 L 634.984375 543.5 L 632.359375 543.5 Z M 629.808594 536.003906 L 626.984375 527.621094 L 623.953125 536.003906 Z M 629.808594 536.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 619 553 L 634 553 M 619 538 L 634 538 M 619 538 L 619 553 M 634 538 L 634 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 619 553 L 634 553 M 619 538 L 634 538 M 634 553 L 634 538 M 619 553 L 619 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 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/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.svg b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.svg
index 265f287..d30cc6e 100644
--- a/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.svg
+++ b/cells/busdrivernovlp2/sky130_fd_sc_lp__busdrivernovlp2_20.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 373.5 L 1743.5 373.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 373.5 "/>
 </clipPath>
-<image id="image289" 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="#image289"/>
+  <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 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="#image289"/>
+  <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 342.5 605.5 L 355.5 605.5 L 355.5 641.5 L 342.5 641.5 Z M 309.5 605.5 L 322.5 605.5 L 322.5 641.5 L 309.5 641.5 Z M 264.5 605.5 L 277.5 605.5 L 277.5 641.5 L 264.5 641.5 Z M 596.5 585.5 L 609.5 585.5 L 609.5 657.5 L 596.5 657.5 Z M 1342.5 602.5 L 1355.5 602.5 L 1355.5 657.5 L 1342.5 657.5 Z M 1417.5 602.5 L 1430.5 602.5 L 1430.5 657.5 L 1417.5 657.5 Z M 1528.5 602.5 L 1541.5 602.5 L 1541.5 657.5 L 1528.5 657.5 Z M 1491.5 602.5 L 1504.5 602.5 L 1504.5 657.5 L 1491.5 657.5 Z M 1305.5 602.5 L 1318.5 602.5 L 1318.5 657.5 L 1305.5 657.5 Z M 1566.5 602.5 L 1579.5 602.5 L 1579.5 657.5 L 1566.5 657.5 Z M 1231.5 602.5 L 1244.5 602.5 L 1244.5 657.5 L 1231.5 657.5 Z M 1194.5 602.5 L 1207.5 602.5 L 1207.5 657.5 L 1194.5 657.5 Z M 1156.5 602.5 L 1169.5 602.5 L 1169.5 657.5 L 1156.5 657.5 Z M 1119.5 602.5 L 1132.5 602.5 L 1132.5 657.5 L 1119.5 657.5 Z M 1082.5 602.5 L 1095.5 602.5 L 1095.5 657.5 L 1082.5 657.5 Z M 1380.5 602.5 L 1393.5 602.5 L 1393.5 657.5 L 1380.5 657.5 Z M 880.5 585.5 L 893.5 585.5 L 893.5 657.5 L 880.5 657.5 Z M 529.5 585.5 L 542.5 585.5 L 542.5 657.5 L 529.5 657.5 Z M 1268.5 602.5 L 1281.5 602.5 L 1281.5 657.5 L 1268.5 657.5 Z M 1454.5 602.5 L 1467.5 602.5 L 1467.5 657.5 L 1454.5 657.5 Z M 843.5 585.5 L 856.5 585.5 L 856.5 657.5 L 843.5 657.5 Z M 651.5 585.5 L 664.5 585.5 L 664.5 657.5 L 651.5 657.5 Z M 713.5 621.5 L 726.5 621.5 L 726.5 657.5 L 713.5 657.5 Z M 968.5 585.5 L 981.5 585.5 L 981.5 657.5 L 968.5 657.5 Z M 492.5 585.5 L 505.5 585.5 L 505.5 657.5 L 492.5 657.5 Z M 756.5 621.5 L 769.5 621.5 L 769.5 657.5 L 756.5 657.5 Z M 924.5 585.5 L 937.5 585.5 L 937.5 657.5 L 924.5 657.5 Z M 924.5 585.5 "/>
 </clipPath>
-<image id="image290" 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="#image290"/>
+  <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 353.5 410.5 L 366.5 410.5 L 366.5 483.5 L 353.5 483.5 Z M 390.5 410.5 L 403.5 410.5 L 403.5 483.5 L 390.5 483.5 Z M 723.5 444.5 L 736.5 444.5 L 736.5 516.5 L 723.5 516.5 Z M 756.5 444.5 L 769.5 444.5 L 769.5 516.5 L 756.5 516.5 Z M 1603.5 410.5 L 1616.5 410.5 L 1616.5 519.5 L 1603.5 519.5 Z M 1677.5 410.5 L 1690.5 410.5 L 1690.5 519.5 L 1677.5 519.5 Z M 1491.5 410.5 L 1504.5 410.5 L 1504.5 519.5 L 1491.5 519.5 Z M 1454.5 410.5 L 1467.5 410.5 L 1467.5 519.5 L 1454.5 519.5 Z M 1640.5 410.5 L 1653.5 410.5 L 1653.5 519.5 L 1640.5 519.5 Z M 1380.5 410.5 L 1393.5 410.5 L 1393.5 519.5 L 1380.5 519.5 Z M 1342.5 410.5 L 1355.5 410.5 L 1355.5 519.5 L 1342.5 519.5 Z M 1305.5 410.5 L 1318.5 410.5 L 1318.5 519.5 L 1305.5 519.5 Z M 1268.5 410.5 L 1281.5 410.5 L 1281.5 519.5 L 1268.5 519.5 Z M 1231.5 410.5 L 1244.5 410.5 L 1244.5 519.5 L 1231.5 519.5 Z M 1194.5 410.5 L 1207.5 410.5 L 1207.5 519.5 L 1194.5 519.5 Z M 1156.5 410.5 L 1169.5 410.5 L 1169.5 519.5 L 1156.5 519.5 Z M 1119.5 410.5 L 1132.5 410.5 L 1132.5 519.5 L 1119.5 519.5 Z M 1082.5 410.5 L 1095.5 410.5 L 1095.5 519.5 L 1082.5 519.5 Z M 583.5 410.5 L 596.5 410.5 L 596.5 519.5 L 583.5 519.5 Z M 539.5 410.5 L 552.5 410.5 L 552.5 519.5 L 539.5 519.5 Z M 970.5 410.5 L 983.5 410.5 L 983.5 519.5 L 970.5 519.5 Z M 883.5 410.5 L 896.5 410.5 L 896.5 519.5 L 883.5 519.5 Z M 845.5 410.5 L 858.5 410.5 L 858.5 519.5 L 845.5 519.5 Z M 1566.5 410.5 L 1579.5 410.5 L 1579.5 519.5 L 1566.5 519.5 Z M 1528.5 410.5 L 1541.5 410.5 L 1541.5 519.5 L 1528.5 519.5 Z M 620.5 410.5 L 633.5 410.5 L 633.5 519.5 L 620.5 519.5 Z M 271.5 410.5 L 284.5 410.5 L 284.5 519.5 L 271.5 519.5 Z M 309.5 410.5 L 322.5 410.5 L 322.5 519.5 L 309.5 519.5 Z M 502.5 410.5 L 515.5 410.5 L 515.5 519.5 L 502.5 519.5 Z M 1417.5 410.5 L 1430.5 410.5 L 1430.5 519.5 L 1417.5 519.5 Z M 226.5 446.5 L 238.5 446.5 L 238.5 519.5 L 226.5 519.5 Z M 1008.5 410.5 L 1021.5 410.5 L 1021.5 519.5 L 1008.5 519.5 Z M 1045.5 410.5 L 1058.5 410.5 L 1058.5 519.5 L 1045.5 519.5 Z M 1045.5 410.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 988.5 494.5 L 1003.5 494.5 L 1003.5 501.5 L 988.5 501.5 Z M 1360.5 494.5 L 1375.5 494.5 L 1375.5 503.5 L 1360.5 503.5 Z M 1509.5 494.5 L 1524.5 494.5 L 1524.5 503.5 L 1509.5 503.5 Z M 1137.5 494.5 L 1152.5 494.5 L 1152.5 503.5 L 1137.5 503.5 Z M 1583.5 494.5 L 1598.5 494.5 L 1598.5 503.5 L 1583.5 503.5 Z M 1435.5 494.5 L 1449.5 494.5 L 1449.5 503.5 L 1435.5 503.5 Z M 1658.5 494.5 L 1672.5 494.5 L 1672.5 503.5 L 1658.5 503.5 Z M 1286.5 494.5 L 1300.5 494.5 L 1300.5 503.5 L 1286.5 503.5 Z M 1063.5 494.5 L 1077.5 494.5 L 1077.5 503.5 L 1063.5 503.5 Z M 1211.5 494.5 L 1226.5 494.5 L 1226.5 503.5 L 1211.5 503.5 Z M 1137.5 503.5 L 1152.5 503.5 L 1152.5 509.5 L 1137.5 509.5 Z M 1435.5 503.5 L 1449.5 503.5 L 1449.5 509.5 L 1435.5 509.5 Z M 1658.5 503.5 L 1672.5 503.5 L 1672.5 509.5 L 1658.5 509.5 Z M 988.5 501.5 L 1003.5 501.5 L 1003.5 509.5 L 988.5 509.5 Z M 1583.5 503.5 L 1598.5 503.5 L 1598.5 509.5 L 1583.5 509.5 Z M 1063.5 503.5 L 1077.5 503.5 L 1077.5 509.5 L 1063.5 509.5 Z M 1509.5 503.5 L 1524.5 503.5 L 1524.5 509.5 L 1509.5 509.5 Z M 1286.5 503.5 L 1300.5 503.5 L 1300.5 509.5 L 1286.5 509.5 Z M 1360.5 503.5 L 1375.5 503.5 L 1375.5 509.5 L 1360.5 509.5 Z M 1211.5 503.5 L 1226.5 503.5 L 1226.5 509.5 L 1211.5 509.5 Z M 1396.5 526.5 L 1411.5 526.5 L 1411.5 540.5 L 1396.5 540.5 Z M 1651.5 526.5 L 1666.5 526.5 L 1666.5 540.5 L 1651.5 540.5 Z M 1620.5 526.5 L 1634.5 526.5 L 1634.5 540.5 L 1620.5 540.5 Z M 1471.5 526.5 L 1486.5 526.5 L 1486.5 540.5 L 1471.5 540.5 Z M 1545.5 526.5 L 1560.5 526.5 L 1560.5 540.5 L 1545.5 540.5 Z M 1620.5 540.5 L 1634.5 540.5 L 1634.5 541.5 L 1620.5 541.5 Z M 1396.5 540.5 L 1411.5 540.5 L 1411.5 541.5 L 1396.5 541.5 Z M 370.5 526.5 L 385.5 526.5 L 385.5 541.5 L 370.5 541.5 Z M 993.5 526.5 L 1008.5 526.5 L 1008.5 541.5 L 993.5 541.5 Z M 1651.5 540.5 L 1666.5 540.5 L 1666.5 541.5 L 1651.5 541.5 Z M 1545.5 540.5 L 1560.5 540.5 L 1560.5 541.5 L 1545.5 541.5 Z M 1471.5 540.5 L 1486.5 540.5 L 1486.5 541.5 L 1471.5 541.5 Z M 1175.5 558.5 L 1190.5 558.5 L 1190.5 567.5 L 1175.5 567.5 Z M 1324.5 558.5 L 1339.5 558.5 L 1339.5 567.5 L 1324.5 567.5 Z M 1249.5 558.5 L 1264.5 558.5 L 1264.5 567.5 L 1249.5 567.5 Z M 1101.5 558.5 L 1115.5 558.5 L 1115.5 567.5 L 1101.5 567.5 Z M 1026.5 558.5 L 1041.5 558.5 L 1041.5 567.5 L 1026.5 567.5 Z M 1324.5 567.5 L 1339.5 567.5 L 1339.5 573.5 L 1324.5 573.5 Z M 744.5 558.5 L 758.5 558.5 L 758.5 573.5 L 744.5 573.5 Z M 1101.5 567.5 L 1115.5 567.5 L 1115.5 573.5 L 1101.5 573.5 Z M 1249.5 567.5 L 1264.5 567.5 L 1264.5 573.5 L 1249.5 573.5 Z M 661.5 558.5 L 675.5 558.5 L 675.5 573.5 L 661.5 573.5 Z M 1026.5 567.5 L 1041.5 567.5 L 1041.5 573.5 L 1026.5 573.5 Z M 1175.5 567.5 L 1190.5 567.5 L 1190.5 573.5 L 1175.5 573.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="image292" 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="#image292"/>
+  <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="surface286">
+<g id="surface317">
 <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 630.464844 537.972656 L 623.371094 537.972656 L 621.429688 543.5 L 618.929688 543.5 L 625.492188 525.097656 L 628.523438 525.097656 L 634.984375 543.5 L 632.359375 543.5 Z M 629.808594 536.003906 L 626.984375 527.621094 L 623.953125 536.003906 Z M 629.808594 536.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 619 553 L 634 553 M 619 538 L 634 538 M 619 538 L 619 553 M 634 538 L 634 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 619 553 L 634 553 M 619 538 L 634 538 M 634 553 L 634 538 M 619 553 L 619 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 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/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.svg b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.svg
index 3c6def4..ec57fd5 100644
--- a/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.svg
+++ b/cells/busdrivernovlpsleep/sky130_fd_sc_lp__busdrivernovlpsleep_20.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 412.5 L 1744.5 412.5 L 1744.5 534.5 L 174.5 534.5 Z M 174.5 412.5 "/>
 </clipPath>
-<image id="image322" 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="#image322"/>
+  <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 187.5 627.5 L 1731.5 627.5 L 1731.5 643.5 L 187.5 643.5 Z M 187.5 627.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="#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 1126.5 572.5 L 1136.5 572.5 L 1136.5 627.5 L 1126.5 627.5 Z M 213.5 600.5 L 223.5 600.5 L 223.5 627.5 L 213.5 627.5 Z M 237.5 600.5 L 247.5 600.5 L 247.5 627.5 L 237.5 627.5 Z M 416.5 600.5 L 426.5 600.5 L 426.5 627.5 L 416.5 627.5 Z M 523.5 600.5 L 532.5 600.5 L 532.5 627.5 L 523.5 627.5 Z M 546.5 600.5 L 556.5 600.5 L 556.5 627.5 L 546.5 627.5 Z M 854.5 600.5 L 864.5 600.5 L 864.5 627.5 L 854.5 627.5 Z M 882.5 600.5 L 892.5 600.5 L 892.5 627.5 L 882.5 627.5 Z M 1213.5 585.5 L 1223.5 585.5 L 1223.5 627.5 L 1213.5 627.5 Z M 1241.5 585.5 L 1251.5 585.5 L 1251.5 627.5 L 1241.5 627.5 Z M 1269.5 585.5 L 1279.5 585.5 L 1279.5 627.5 L 1269.5 627.5 Z M 1297.5 585.5 L 1307.5 585.5 L 1307.5 627.5 L 1297.5 627.5 Z M 1326.5 585.5 L 1336.5 585.5 L 1336.5 627.5 L 1326.5 627.5 Z M 1354.5 585.5 L 1364.5 585.5 L 1364.5 627.5 L 1354.5 627.5 Z M 1382.5 585.5 L 1392.5 585.5 L 1392.5 627.5 L 1382.5 627.5 Z M 1410.5 585.5 L 1420.5 585.5 L 1420.5 627.5 L 1410.5 627.5 Z M 1439.5 585.5 L 1448.5 585.5 L 1448.5 627.5 L 1439.5 627.5 Z M 1467.5 585.5 L 1477.5 585.5 L 1477.5 627.5 L 1467.5 627.5 Z M 1495.5 585.5 L 1505.5 585.5 L 1505.5 627.5 L 1495.5 627.5 Z M 1523.5 585.5 L 1533.5 585.5 L 1533.5 627.5 L 1523.5 627.5 Z M 1552.5 585.5 L 1561.5 585.5 L 1561.5 627.5 L 1552.5 627.5 Z M 1580.5 585.5 L 1590.5 585.5 L 1590.5 627.5 L 1580.5 627.5 Z M 269.5 572.5 L 279.5 572.5 L 279.5 627.5 L 269.5 627.5 Z M 297.5 572.5 L 307.5 572.5 L 307.5 627.5 L 297.5 627.5 Z M 325.5 572.5 L 335.5 572.5 L 335.5 627.5 L 325.5 627.5 Z M 354.5 572.5 L 363.5 572.5 L 363.5 627.5 L 354.5 627.5 Z M 665.5 572.5 L 675.5 572.5 L 675.5 627.5 L 665.5 627.5 Z M 709.5 572.5 L 719.5 572.5 L 719.5 627.5 L 709.5 627.5 Z M 759.5 572.5 L 769.5 572.5 L 769.5 627.5 L 759.5 627.5 Z M 799.5 572.5 L 809.5 572.5 L 809.5 627.5 L 799.5 627.5 Z M 1031.5 572.5 L 1041.5 572.5 L 1041.5 627.5 L 1031.5 627.5 Z M 1066.5 572.5 L 1075.5 572.5 L 1075.5 627.5 L 1066.5 627.5 Z M 1098.5 572.5 L 1108.5 572.5 L 1108.5 627.5 L 1098.5 627.5 Z M 1098.5 572.5 "/>
 </clipPath>
-<image id="image323" 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="#image323"/>
+  <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 338.5 439.5 L 348.5 439.5 L 348.5 481.5 L 338.5 481.5 Z M 275.5 439.5 L 285.5 439.5 L 285.5 481.5 L 275.5 481.5 Z M 252.5 439.5 L 262.5 439.5 L 262.5 481.5 L 252.5 481.5 Z M 614.5 439.5 L 623.5 439.5 L 623.5 495.5 L 614.5 495.5 Z M 585.5 439.5 L 595.5 439.5 L 595.5 495.5 L 585.5 495.5 Z M 562.5 439.5 L 572.5 439.5 L 572.5 495.5 L 562.5 495.5 Z M 213.5 439.5 L 229.5 439.5 L 229.5 505.5 L 213.5 505.5 Z M 868.5 465.5 L 878.5 465.5 L 878.5 520.5 L 868.5 520.5 Z M 844.5 465.5 L 854.5 465.5 L 854.5 520.5 L 844.5 520.5 Z M 471.5 439.5 L 481.5 439.5 L 481.5 522.5 L 471.5 522.5 Z M 499.5 439.5 L 509.5 439.5 L 509.5 522.5 L 499.5 522.5 Z M 1608.5 439.5 L 1618.5 439.5 L 1618.5 522.5 L 1608.5 522.5 Z M 1269.5 439.5 L 1279.5 439.5 L 1279.5 522.5 L 1269.5 522.5 Z M 1297.5 439.5 L 1307.5 439.5 L 1307.5 522.5 L 1297.5 522.5 Z M 694.5 439.5 L 704.5 439.5 L 704.5 522.5 L 694.5 522.5 Z M 722.5 439.5 L 732.5 439.5 L 732.5 522.5 L 722.5 522.5 Z M 750.5 439.5 L 760.5 439.5 L 760.5 522.5 L 750.5 522.5 Z M 779.5 439.5 L 789.5 439.5 L 789.5 522.5 L 779.5 522.5 Z M 947.5 439.5 L 957.5 439.5 L 957.5 522.5 L 947.5 522.5 Z M 975.5 439.5 L 985.5 439.5 L 985.5 522.5 L 975.5 522.5 Z M 1037.5 439.5 L 1047.5 439.5 L 1047.5 522.5 L 1037.5 522.5 Z M 1066.5 439.5 L 1075.5 439.5 L 1075.5 522.5 L 1066.5 522.5 Z M 1552.5 439.5 L 1561.5 439.5 L 1561.5 522.5 L 1552.5 522.5 Z M 1410.5 439.5 L 1420.5 439.5 L 1420.5 522.5 L 1410.5 522.5 Z M 1580.5 439.5 L 1590.5 439.5 L 1590.5 522.5 L 1580.5 522.5 Z M 1213.5 439.5 L 1223.5 439.5 L 1223.5 522.5 L 1213.5 522.5 Z M 1241.5 439.5 L 1251.5 439.5 L 1251.5 522.5 L 1241.5 522.5 Z M 1664.5 439.5 L 1674.5 439.5 L 1674.5 522.5 L 1664.5 522.5 Z M 1495.5 439.5 L 1505.5 439.5 L 1505.5 522.5 L 1495.5 522.5 Z M 1326.5 439.5 L 1336.5 439.5 L 1336.5 522.5 L 1326.5 522.5 Z M 1354.5 439.5 L 1364.5 439.5 L 1364.5 522.5 L 1354.5 522.5 Z M 1382.5 439.5 L 1392.5 439.5 L 1392.5 522.5 L 1382.5 522.5 Z M 1184.5 439.5 L 1194.5 439.5 L 1194.5 522.5 L 1184.5 522.5 Z M 1128.5 439.5 L 1138.5 439.5 L 1138.5 522.5 L 1128.5 522.5 Z M 1467.5 439.5 L 1477.5 439.5 L 1477.5 522.5 L 1467.5 522.5 Z M 1156.5 439.5 L 1166.5 439.5 L 1166.5 522.5 L 1156.5 522.5 Z M 1523.5 439.5 L 1533.5 439.5 L 1533.5 522.5 L 1523.5 522.5 Z M 408.5 439.5 L 418.5 439.5 L 418.5 522.5 L 408.5 522.5 Z M 1636.5 439.5 L 1646.5 439.5 L 1646.5 522.5 L 1636.5 522.5 Z M 1439.5 439.5 L 1448.5 439.5 L 1448.5 522.5 L 1439.5 522.5 Z M 443.5 439.5 L 453.5 439.5 L 453.5 522.5 L 443.5 522.5 Z M 443.5 439.5 "/>
 </clipPath>
-<image id="image324" 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="#image324"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,25 @@
 <clipPath id="clip11">
   <path d="M 197.5 418.5 L 208.5 418.5 L 208.5 430.5 L 197.5 430.5 Z M 1710.5 418.5 L 1721.5 418.5 L 1721.5 430.5 L 1710.5 430.5 Z M 1678.5 418.5 L 1689.5 418.5 L 1689.5 430.5 L 1678.5 430.5 Z M 1647.5 418.5 L 1658.5 418.5 L 1658.5 430.5 L 1647.5 430.5 Z M 1615.5 418.5 L 1626.5 418.5 L 1626.5 430.5 L 1615.5 430.5 Z M 1584.5 418.5 L 1595.5 418.5 L 1595.5 430.5 L 1584.5 430.5 Z M 1552.5 418.5 L 1563.5 418.5 L 1563.5 430.5 L 1552.5 430.5 Z M 1521.5 418.5 L 1532.5 418.5 L 1532.5 430.5 L 1521.5 430.5 Z M 1489.5 418.5 L 1500.5 418.5 L 1500.5 430.5 L 1489.5 430.5 Z M 1458.5 418.5 L 1469.5 418.5 L 1469.5 430.5 L 1458.5 430.5 Z M 1426.5 418.5 L 1437.5 418.5 L 1437.5 430.5 L 1426.5 430.5 Z M 1395.5 418.5 L 1406.5 418.5 L 1406.5 430.5 L 1395.5 430.5 Z M 1363.5 418.5 L 1374.5 418.5 L 1374.5 430.5 L 1363.5 430.5 Z M 1332.5 418.5 L 1343.5 418.5 L 1343.5 430.5 L 1332.5 430.5 Z M 1300.5 418.5 L 1311.5 418.5 L 1311.5 430.5 L 1300.5 430.5 Z M 1269.5 418.5 L 1280.5 418.5 L 1280.5 430.5 L 1269.5 430.5 Z M 1237.5 418.5 L 1248.5 418.5 L 1248.5 430.5 L 1237.5 430.5 Z M 1206.5 418.5 L 1217.5 418.5 L 1217.5 430.5 L 1206.5 430.5 Z M 1174.5 418.5 L 1185.5 418.5 L 1185.5 430.5 L 1174.5 430.5 Z M 1142.5 418.5 L 1154.5 418.5 L 1154.5 430.5 L 1142.5 430.5 Z M 1111.5 418.5 L 1122.5 418.5 L 1122.5 430.5 L 1111.5 430.5 Z M 1079.5 418.5 L 1091.5 418.5 L 1091.5 430.5 L 1079.5 430.5 Z M 1048.5 418.5 L 1059.5 418.5 L 1059.5 430.5 L 1048.5 430.5 Z M 1016.5 418.5 L 1028.5 418.5 L 1028.5 430.5 L 1016.5 430.5 Z M 985.5 418.5 L 996.5 418.5 L 996.5 430.5 L 985.5 430.5 Z M 953.5 418.5 L 965.5 418.5 L 965.5 430.5 L 953.5 430.5 Z M 922.5 418.5 L 933.5 418.5 L 933.5 430.5 L 922.5 430.5 Z M 890.5 418.5 L 901.5 418.5 L 901.5 430.5 L 890.5 430.5 Z M 859.5 418.5 L 870.5 418.5 L 870.5 430.5 L 859.5 430.5 Z M 827.5 418.5 L 838.5 418.5 L 838.5 430.5 L 827.5 430.5 Z M 796.5 418.5 L 807.5 418.5 L 807.5 430.5 L 796.5 430.5 Z M 764.5 418.5 L 775.5 418.5 L 775.5 430.5 L 764.5 430.5 Z M 733.5 418.5 L 744.5 418.5 L 744.5 430.5 L 733.5 430.5 Z M 701.5 418.5 L 712.5 418.5 L 712.5 430.5 L 701.5 430.5 Z M 670.5 418.5 L 681.5 418.5 L 681.5 430.5 L 670.5 430.5 Z M 638.5 418.5 L 649.5 418.5 L 649.5 430.5 L 638.5 430.5 Z M 607.5 418.5 L 618.5 418.5 L 618.5 430.5 L 607.5 430.5 Z M 575.5 418.5 L 586.5 418.5 L 586.5 430.5 L 575.5 430.5 Z M 544.5 418.5 L 555.5 418.5 L 555.5 430.5 L 544.5 430.5 Z M 512.5 418.5 L 523.5 418.5 L 523.5 430.5 L 512.5 430.5 Z M 481.5 418.5 L 492.5 418.5 L 492.5 430.5 L 481.5 430.5 Z M 449.5 418.5 L 460.5 418.5 L 460.5 430.5 L 449.5 430.5 Z M 418.5 418.5 L 429.5 418.5 L 429.5 430.5 L 418.5 430.5 Z M 386.5 418.5 L 397.5 418.5 L 397.5 430.5 L 386.5 430.5 Z M 355.5 418.5 L 366.5 418.5 L 366.5 430.5 L 355.5 430.5 Z M 323.5 418.5 L 334.5 418.5 L 334.5 430.5 L 323.5 430.5 Z M 291.5 418.5 L 303.5 418.5 L 303.5 430.5 L 291.5 430.5 Z M 260.5 418.5 L 271.5 418.5 L 271.5 430.5 L 260.5 430.5 Z M 228.5 418.5 L 240.5 418.5 L 240.5 430.5 L 228.5 430.5 Z M 512.5 453.5 L 523.5 453.5 L 523.5 454.5 L 512.5 454.5 Z M 351.5 453.5 L 362.5 453.5 L 362.5 456.5 L 351.5 456.5 Z M 398.5 453.5 L 409.5 453.5 L 409.5 456.5 L 398.5 456.5 Z M 456.5 453.5 L 467.5 453.5 L 467.5 459.5 L 456.5 459.5 Z M 456.5 459.5 L 467.5 459.5 L 467.5 464.5 L 456.5 464.5 Z M 375.5 453.5 L 386.5 453.5 L 386.5 464.5 L 375.5 464.5 Z M 398.5 456.5 L 409.5 456.5 L 409.5 464.5 L 398.5 464.5 Z M 512.5 454.5 L 523.5 454.5 L 523.5 464.5 L 512.5 464.5 Z M 351.5 456.5 L 362.5 456.5 L 362.5 464.5 L 351.5 464.5 Z M 1141.5 503.5 L 1153.5 503.5 L 1153.5 509.5 L 1141.5 509.5 Z M 1254.5 503.5 L 1266.5 503.5 L 1266.5 510.5 L 1254.5 510.5 Z M 1650.5 503.5 L 1661.5 503.5 L 1661.5 510.5 L 1650.5 510.5 Z M 1198.5 503.5 L 1209.5 503.5 L 1209.5 510.5 L 1198.5 510.5 Z M 1593.5 503.5 L 1604.5 503.5 L 1604.5 510.5 L 1593.5 510.5 Z M 1537.5 503.5 L 1548.5 503.5 L 1548.5 510.5 L 1537.5 510.5 Z M 1424.5 503.5 L 1435.5 503.5 L 1435.5 510.5 L 1424.5 510.5 Z M 542.5 503.5 L 553.5 503.5 L 553.5 510.5 L 542.5 510.5 Z M 1480.5 503.5 L 1491.5 503.5 L 1491.5 510.5 L 1480.5 510.5 Z M 1367.5 503.5 L 1379.5 503.5 L 1379.5 510.5 L 1367.5 510.5 Z M 1311.5 503.5 L 1322.5 503.5 L 1322.5 510.5 L 1311.5 510.5 Z M 1537.5 510.5 L 1548.5 510.5 L 1548.5 515.5 L 1537.5 515.5 Z M 960.5 503.5 L 971.5 503.5 L 971.5 515.5 L 960.5 515.5 Z M 542.5 510.5 L 553.5 510.5 L 553.5 515.5 L 542.5 515.5 Z M 1254.5 510.5 L 1266.5 510.5 L 1266.5 515.5 L 1254.5 515.5 Z M 1480.5 510.5 L 1491.5 510.5 L 1491.5 515.5 L 1480.5 515.5 Z M 1141.5 509.5 L 1153.5 509.5 L 1153.5 515.5 L 1141.5 515.5 Z M 232.5 503.5 L 243.5 503.5 L 243.5 515.5 L 232.5 515.5 Z M 1198.5 510.5 L 1209.5 510.5 L 1209.5 515.5 L 1198.5 515.5 Z M 1424.5 510.5 L 1435.5 510.5 L 1435.5 515.5 L 1424.5 515.5 Z M 1367.5 510.5 L 1379.5 510.5 L 1379.5 515.5 L 1367.5 515.5 Z M 1593.5 510.5 L 1604.5 510.5 L 1604.5 515.5 L 1593.5 515.5 Z M 1650.5 510.5 L 1661.5 510.5 L 1661.5 515.5 L 1650.5 515.5 Z M 1311.5 510.5 L 1322.5 510.5 L 1322.5 515.5 L 1311.5 515.5 Z M 607.5 528.5 L 618.5 528.5 L 618.5 534.5 L 607.5 534.5 Z M 1621.5 528.5 L 1632.5 528.5 L 1632.5 538.5 L 1621.5 538.5 Z M 1644.5 528.5 L 1656.5 528.5 L 1656.5 538.5 L 1644.5 538.5 Z M 1451.5 528.5 L 1463.5 528.5 L 1463.5 538.5 L 1451.5 538.5 Z M 1564.5 528.5 L 1576.5 528.5 L 1576.5 538.5 L 1564.5 538.5 Z M 1508.5 528.5 L 1519.5 528.5 L 1519.5 538.5 L 1508.5 538.5 Z M 1564.5 538.5 L 1576.5 538.5 L 1576.5 539.5 L 1564.5 539.5 Z M 1451.5 538.5 L 1463.5 538.5 L 1463.5 539.5 L 1451.5 539.5 Z M 607.5 534.5 L 618.5 534.5 L 618.5 539.5 L 607.5 539.5 Z M 1145.5 528.5 L 1156.5 528.5 L 1156.5 539.5 L 1145.5 539.5 Z M 1508.5 538.5 L 1519.5 538.5 L 1519.5 539.5 L 1508.5 539.5 Z M 487.5 528.5 L 498.5 528.5 L 498.5 539.5 L 487.5 539.5 Z M 1644.5 538.5 L 1656.5 538.5 L 1656.5 539.5 L 1644.5 539.5 Z M 197.5 528.5 L 208.5 528.5 L 208.5 539.5 L 197.5 539.5 Z M 1621.5 538.5 L 1632.5 538.5 L 1632.5 539.5 L 1621.5 539.5 Z M 1227.5 552.5 L 1238.5 552.5 L 1238.5 558.5 L 1227.5 558.5 Z M 1283.5 552.5 L 1294.5 552.5 L 1294.5 558.5 L 1283.5 558.5 Z M 1170.5 552.5 L 1182.5 552.5 L 1182.5 558.5 L 1170.5 558.5 Z M 1340.5 552.5 L 1351.5 552.5 L 1351.5 558.5 L 1340.5 558.5 Z M 1396.5 552.5 L 1407.5 552.5 L 1407.5 558.5 L 1396.5 558.5 Z M 875.5 552.5 L 886.5 552.5 L 886.5 561.5 L 875.5 561.5 Z M 875.5 561.5 L 886.5 561.5 L 886.5 563.5 L 875.5 563.5 Z M 1227.5 558.5 L 1238.5 558.5 L 1238.5 563.5 L 1227.5 563.5 Z M 1340.5 558.5 L 1351.5 558.5 L 1351.5 563.5 L 1340.5 563.5 Z M 1170.5 558.5 L 1182.5 558.5 L 1182.5 563.5 L 1170.5 563.5 Z M 1396.5 558.5 L 1407.5 558.5 L 1407.5 563.5 L 1396.5 563.5 Z M 812.5 552.5 L 823.5 552.5 L 823.5 563.5 L 812.5 563.5 Z M 1283.5 558.5 L 1294.5 558.5 L 1294.5 563.5 L 1283.5 563.5 Z M 197.5 637.5 L 208.5 637.5 L 208.5 648.5 L 197.5 648.5 Z M 1710.5 637.5 L 1721.5 637.5 L 1721.5 648.5 L 1710.5 648.5 Z M 1678.5 637.5 L 1689.5 637.5 L 1689.5 648.5 L 1678.5 648.5 Z M 1647.5 637.5 L 1658.5 637.5 L 1658.5 648.5 L 1647.5 648.5 Z M 1615.5 637.5 L 1626.5 637.5 L 1626.5 648.5 L 1615.5 648.5 Z M 1584.5 637.5 L 1595.5 637.5 L 1595.5 648.5 L 1584.5 648.5 Z M 1552.5 637.5 L 1563.5 637.5 L 1563.5 648.5 L 1552.5 648.5 Z M 1521.5 637.5 L 1532.5 637.5 L 1532.5 648.5 L 1521.5 648.5 Z M 1489.5 637.5 L 1500.5 637.5 L 1500.5 648.5 L 1489.5 648.5 Z M 1458.5 637.5 L 1469.5 637.5 L 1469.5 648.5 L 1458.5 648.5 Z M 1426.5 637.5 L 1437.5 637.5 L 1437.5 648.5 L 1426.5 648.5 Z M 1395.5 637.5 L 1406.5 637.5 L 1406.5 648.5 L 1395.5 648.5 Z M 1363.5 637.5 L 1374.5 637.5 L 1374.5 648.5 L 1363.5 648.5 Z M 1332.5 637.5 L 1343.5 637.5 L 1343.5 648.5 L 1332.5 648.5 Z M 1300.5 637.5 L 1311.5 637.5 L 1311.5 648.5 L 1300.5 648.5 Z M 1269.5 637.5 L 1280.5 637.5 L 1280.5 648.5 L 1269.5 648.5 Z M 1237.5 637.5 L 1248.5 637.5 L 1248.5 648.5 L 1237.5 648.5 Z M 1206.5 637.5 L 1217.5 637.5 L 1217.5 648.5 L 1206.5 648.5 Z M 1174.5 637.5 L 1185.5 637.5 L 1185.5 648.5 L 1174.5 648.5 Z M 1142.5 637.5 L 1154.5 637.5 L 1154.5 648.5 L 1142.5 648.5 Z M 1111.5 637.5 L 1122.5 637.5 L 1122.5 648.5 L 1111.5 648.5 Z M 1079.5 637.5 L 1091.5 637.5 L 1091.5 648.5 L 1079.5 648.5 Z M 1048.5 637.5 L 1059.5 637.5 L 1059.5 648.5 L 1048.5 648.5 Z M 1016.5 637.5 L 1028.5 637.5 L 1028.5 648.5 L 1016.5 648.5 Z M 985.5 637.5 L 996.5 637.5 L 996.5 648.5 L 985.5 648.5 Z M 953.5 637.5 L 965.5 637.5 L 965.5 648.5 L 953.5 648.5 Z M 922.5 637.5 L 933.5 637.5 L 933.5 648.5 L 922.5 648.5 Z M 890.5 637.5 L 901.5 637.5 L 901.5 648.5 L 890.5 648.5 Z M 859.5 637.5 L 870.5 637.5 L 870.5 648.5 L 859.5 648.5 Z M 827.5 637.5 L 838.5 637.5 L 838.5 648.5 L 827.5 648.5 Z M 796.5 637.5 L 807.5 637.5 L 807.5 648.5 L 796.5 648.5 Z M 764.5 637.5 L 775.5 637.5 L 775.5 648.5 L 764.5 648.5 Z M 733.5 637.5 L 744.5 637.5 L 744.5 648.5 L 733.5 648.5 Z M 701.5 637.5 L 712.5 637.5 L 712.5 648.5 L 701.5 648.5 Z M 670.5 637.5 L 681.5 637.5 L 681.5 648.5 L 670.5 648.5 Z M 638.5 637.5 L 649.5 637.5 L 649.5 648.5 L 638.5 648.5 Z M 607.5 637.5 L 618.5 637.5 L 618.5 648.5 L 607.5 648.5 Z M 575.5 637.5 L 586.5 637.5 L 586.5 648.5 L 575.5 648.5 Z M 544.5 637.5 L 555.5 637.5 L 555.5 648.5 L 544.5 648.5 Z M 512.5 637.5 L 523.5 637.5 L 523.5 648.5 L 512.5 648.5 Z M 481.5 637.5 L 492.5 637.5 L 492.5 648.5 L 481.5 648.5 Z M 449.5 637.5 L 460.5 637.5 L 460.5 648.5 L 449.5 648.5 Z M 418.5 637.5 L 429.5 637.5 L 429.5 648.5 L 418.5 648.5 Z M 386.5 637.5 L 397.5 637.5 L 397.5 648.5 L 386.5 648.5 Z M 355.5 637.5 L 366.5 637.5 L 366.5 648.5 L 355.5 648.5 Z M 323.5 637.5 L 334.5 637.5 L 334.5 648.5 L 323.5 648.5 Z M 291.5 637.5 L 303.5 637.5 L 303.5 648.5 L 291.5 648.5 Z M 260.5 637.5 L 271.5 637.5 L 271.5 648.5 L 260.5 648.5 Z M 228.5 637.5 L 240.5 637.5 L 240.5 648.5 L 228.5 648.5 Z M 228.5 637.5 "/>
 </clipPath>
-<image id="image325" 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="#image325"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
+<clipPath id="clip12">
+  <path d="M 18.5 1048.5 L 1100.5 1048.5 L 1100.5 1050.5 L 18.5 1050.5 Z M 1098.5 1050.5 L 1100.5 1050.5 L 1100.5 1059 L 1098.5 1059 Z M 1098.5 1050.5 "/>
+</clipPath>
+<image id="image2254" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAbSURBVDiNY/jPgB8yEJAnDEdNGDVh1IQhagIAIcT+EDL4XQEAAAAASUVORK5CYII="/>
+<pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
+  <use xlink:href="#image2254"/>
+</pattern>
+<mask id="mask5">
+<rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
+</mask>
 </defs>
-<g id="surface319">
+<g id="surface354">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -163,6 +173,8 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 960.820312 608.042969 L 957.664062 608.042969 L 956.800781 610.5 L 955.691406 610.5 L 958.609375 602.320312 L 959.953125 602.320312 L 962.828125 610.5 L 961.660156 610.5 Z M 960.527344 607.167969 L 959.269531 603.441406 L 957.921875 607.167969 Z M 960.527344 607.167969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 953 478 L 965 478 M 953 467 L 965 467 M 953 467 L 953 478 M 965 467 L 965 478 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 953 478 L 965 478 M 953 467 L 965 467 M 965 478 L 965 467 M 953 478 L 953 467 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 187 431 L 187 440 M 182 436 L 191 436 M 186 437 L 188 437 M 186 435 L 188 435 M 186 435 L 186 437 M 188 435 L 188 437 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
+<g clip-path="url(#clip12)" clip-rule="nonzero">
+<rect x="0" y="0" width="1898" height="1059" style="fill:rgb(100%,100%,100%);fill-opacity:0.724409;stroke:none;" mask="url(#mask5)"/>
+</g>
 </g>
 </svg>
diff --git a/cells/bushold/sky130_fd_sc_lp__bushold_1.svg b/cells/bushold/sky130_fd_sc_lp__bushold_1.svg
index e1bcaa2..c8ee71e 100644
--- a/cells/bushold/sky130_fd_sc_lp__bushold_1.svg
+++ b/cells/bushold/sky130_fd_sc_lp__bushold_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <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 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="#image332"/>
+  <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 1032.5 768.5 L 1146.5 768.5 L 1146.5 864.5 L 1032.5 864.5 Z M 835.5 768.5 L 869.5 768.5 L 869.5 864.5 L 835.5 864.5 Z M 933.5 768.5 L 968.5 768.5 L 968.5 864.5 L 933.5 864.5 Z M 933.5 768.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <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 1032.5 209.5 L 1146.5 209.5 L 1146.5 305.5 L 1032.5 305.5 Z M 851.5 209.5 L 885.5 209.5 L 885.5 305.5 L 851.5 305.5 Z M 933.5 209.5 L 968.5 209.5 L 968.5 305.5 L 933.5 305.5 Z M 933.5 209.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image335" 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="#image335"/>
+  <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="surface329">
+<g id="surface357">
 <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 1020.179688 441.1875 L 1020.179688 466.597656 L 1016.527344 466.597656 L 1016.527344 441.1875 L 1007.101562 441.1875 L 1007.101562 437.96875 L 1029.566406 437.96875 L 1029.566406 441.1875 Z M 1020.179688 441.1875 "/>
 <path style="fill:none;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/bushold0/sky130_fd_sc_lp__bushold0_1.svg b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.svg
index 4d994b2..51e89e0 100644
--- a/cells/bushold0/sky130_fd_sc_lp__bushold0_1.svg
+++ b/cells/bushold0/sky130_fd_sc_lp__bushold0_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image314"/>
+  <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 1032.5 768.5 L 1146.5 768.5 L 1146.5 864.5 L 1032.5 864.5 Z M 835.5 768.5 L 869.5 768.5 L 869.5 864.5 L 835.5 864.5 Z M 933.5 768.5 L 968.5 768.5 L 968.5 864.5 L 933.5 864.5 Z M 933.5 768.5 "/>
 </clipPath>
-<image id="image315" 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="#image315"/>
+  <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 1032.5 209.5 L 1146.5 209.5 L 1146.5 305.5 L 1032.5 305.5 Z M 840.5 209.5 L 875.5 209.5 L 875.5 305.5 L 840.5 305.5 Z M 949.5 209.5 L 984.5 209.5 L 984.5 305.5 L 949.5 305.5 Z M 949.5 209.5 "/>
 </clipPath>
-<image id="image316" 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="#image316"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image317" 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="#image317"/>
+  <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="surface311">
+<g id="surface339">
 <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 1020.179688 441.1875 L 1020.179688 466.597656 L 1016.527344 466.597656 L 1016.527344 441.1875 L 1007.101562 441.1875 L 1007.101562 437.96875 L 1029.566406 437.96875 L 1029.566406 441.1875 Z M 1020.179688 441.1875 "/>
 <path style="fill:none;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/busreceiver/sky130_fd_sc_lp__busreceiver_0.svg b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.svg
index eab7fc6..c8bb642 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.svg
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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="#image283"/>
+  <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 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="#image283"/>
+  <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 1003.5 763.5 L 1038.5 763.5 L 1038.5 860.5 L 1003.5 860.5 Z M 891.5 763.5 L 925.5 763.5 L 925.5 860.5 L 891.5 860.5 Z M 891.5 763.5 "/>
 </clipPath>
-<image id="image284" 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="#image284"/>
+  <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 1003.5 218.5 L 1038.5 218.5 L 1038.5 314.5 L 1003.5 314.5 Z M 891.5 218.5 L 925.5 218.5 L 925.5 365.5 L 891.5 365.5 Z M 891.5 218.5 "/>
 </clipPath>
-<image id="image285" 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="#image285"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image286" 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="#image286"/>
+  <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="surface280">
+<g id="surface328">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <path style=" 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/busreceiver/sky130_fd_sc_lp__busreceiver_1.svg b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.svg
index aa1e90d..fa39d80 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.svg
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.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="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="#image286"/>
+  <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 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="#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 1003.5 672.5 L 1038.5 672.5 L 1038.5 768.5 L 1003.5 768.5 Z M 891.5 672.5 L 925.5 672.5 L 925.5 864.5 L 891.5 864.5 Z M 891.5 672.5 "/>
 </clipPath>
-<image id="image287" 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="#image287"/>
+  <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 891.5 209.5 L 925.5 209.5 L 925.5 498.5 L 891.5 498.5 Z M 1003.5 351.5 L 1038.5 351.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1003.5 351.5 "/>
 </clipPath>
-<image id="image288" 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="#image288"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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="#image289"/>
+  <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="surface283">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 859.824219 282.320312 L 877.191406 307.5 L 869.449219 307.5 L 856.050781 287.035156 L 842.589844 307.5 L 834.980469 307.5 L 852.351562 282.320312 L 836.058594 258.421875 L 843.664062 258.421875 L 856.253906 277.675781 L 868.910156 258.421875 L 876.382812 258.421875 Z M 859.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 835 816 L 874 816 M 835 777 L 874 777 M 835 777 L 835 816 M 874 777 L 874 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 835 816 L 874 816 M 835 777 L 874 777 M 874 816 L 874 777 M 835 816 L 835 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/busreceiver/sky130_fd_sc_lp__busreceiver_m.svg b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.svg
index 68c30f9..bc82f09 100644
--- a/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.svg
+++ b/cells/busreceiver/sky130_fd_sc_lp__busreceiver_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image296"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 989.5 742.5 L 1024.5 742.5 L 1024.5 838.5 L 989.5 838.5 Z M 891.5 742.5 L 925.5 742.5 L 925.5 838.5 L 891.5 838.5 Z M 891.5 742.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 989.5 215.5 L 1024.5 215.5 L 1024.5 311.5 L 989.5 311.5 Z M 891.5 215.5 L 925.5 215.5 L 925.5 311.5 L 891.5 311.5 Z M 891.5 215.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface293">
+<g id="surface342">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 859.824219 282.320312 L 877.191406 307.5 L 869.449219 307.5 L 856.050781 287.035156 L 842.589844 307.5 L 834.980469 307.5 L 852.351562 282.320312 L 836.058594 258.421875 L 843.664062 258.421875 L 856.253906 277.675781 L 868.910156 258.421875 L 876.382812 258.421875 Z M 859.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 835 816 L 874 816 M 835 777 L 874 777 M 835 777 L 835 816 M 874 777 L 874 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 835 816 L 874 816 M 835 777 L 874 777 M 874 816 L 874 777 M 835 816 L 835 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/clkbuf/sky130_fd_sc_lp__clkbuf_0.svg b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.svg
index 2272977..241ab08 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.svg
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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="#image279"/>
+  <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 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="#image279"/>
+  <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 1003.5 763.5 L 1038.5 763.5 L 1038.5 860.5 L 1003.5 860.5 Z M 891.5 763.5 L 925.5 763.5 L 925.5 860.5 L 891.5 860.5 Z M 891.5 763.5 "/>
 </clipPath>
-<image id="image280" 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="#image280"/>
+  <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 989.5 218.5 L 1024.5 218.5 L 1024.5 365.5 L 989.5 365.5 Z M 891.5 218.5 L 925.5 218.5 L 925.5 365.5 L 891.5 365.5 Z M 891.5 218.5 "/>
 </clipPath>
-<image id="image281" 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="#image281"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image282" 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="#image282"/>
+  <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="surface276">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <path style=" 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/clkbuf/sky130_fd_sc_lp__clkbuf_1.svg b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.svg
index 400506b..8c4bd67 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.svg
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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="#image279"/>
+  <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 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="#image279"/>
+  <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 1002.5 763.5 L 1036.5 763.5 L 1036.5 860.5 L 1002.5 860.5 Z M 892.5 763.5 L 926.5 763.5 L 926.5 860.5 L 892.5 860.5 Z M 892.5 763.5 "/>
 </clipPath>
-<image id="image280" 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="#image280"/>
+  <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 991.5 209.5 L 1025.5 209.5 L 1025.5 498.5 L 991.5 498.5 Z M 892.5 209.5 L 926.5 209.5 L 926.5 498.5 L 892.5 498.5 Z M 892.5 209.5 "/>
 </clipPath>
-<image id="image281" 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="#image281"/>
+  <use xlink:href="#image323"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image282" 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="#image282"/>
+  <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="surface276">
+<g id="surface318">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 859.824219 282.320312 L 877.191406 307.5 L 869.449219 307.5 L 856.050781 287.035156 L 842.589844 307.5 L 834.980469 307.5 L 852.351562 282.320312 L 836.058594 258.421875 L 843.664062 258.421875 L 856.253906 277.675781 L 868.910156 258.421875 L 876.382812 258.421875 Z M 859.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 835 816 L 874 816 M 835 777 L 874 777 M 835 777 L 835 816 M 874 777 L 874 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 835 816 L 874 816 M 835 777 L 874 777 M 874 816 L 874 777 M 835 816 L 835 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/clkbuf/sky130_fd_sc_lp__clkbuf_16.svg b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.svg
index bc38187..788d4f4 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_16.svg
+++ b/cells/clkbuf/sky130_fd_sc_lp__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 537.5 L 174.5 537.5 Z M 174.5 243.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 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="#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 1618.5 694.5 L 1641.5 694.5 L 1641.5 760.5 L 1618.5 760.5 Z M 271.5 694.5 L 295.5 694.5 L 295.5 760.5 L 271.5 760.5 Z M 339.5 694.5 L 363.5 694.5 L 363.5 760.5 L 339.5 760.5 Z M 407.5 694.5 L 430.5 694.5 L 430.5 760.5 L 407.5 760.5 Z M 474.5 694.5 L 498.5 694.5 L 498.5 760.5 L 474.5 760.5 Z M 603.5 694.5 L 627.5 694.5 L 627.5 760.5 L 603.5 760.5 Z M 671.5 694.5 L 694.5 694.5 L 694.5 760.5 L 671.5 760.5 Z M 738.5 694.5 L 762.5 694.5 L 762.5 760.5 L 738.5 760.5 Z M 806.5 694.5 L 830.5 694.5 L 830.5 760.5 L 806.5 760.5 Z M 874.5 694.5 L 897.5 694.5 L 897.5 760.5 L 874.5 760.5 Z M 941.5 694.5 L 965.5 694.5 L 965.5 760.5 L 941.5 760.5 Z M 1009.5 694.5 L 1033.5 694.5 L 1033.5 760.5 L 1009.5 760.5 Z M 1077.5 694.5 L 1100.5 694.5 L 1100.5 760.5 L 1077.5 760.5 Z M 1144.5 694.5 L 1168.5 694.5 L 1168.5 760.5 L 1144.5 760.5 Z M 1212.5 694.5 L 1235.5 694.5 L 1235.5 760.5 L 1212.5 760.5 Z M 1279.5 694.5 L 1303.5 694.5 L 1303.5 760.5 L 1279.5 760.5 Z M 1347.5 694.5 L 1371.5 694.5 L 1371.5 760.5 L 1347.5 760.5 Z M 1415.5 694.5 L 1438.5 694.5 L 1438.5 760.5 L 1415.5 760.5 Z M 1482.5 694.5 L 1506.5 694.5 L 1506.5 760.5 L 1482.5 760.5 Z M 1550.5 694.5 L 1574.5 694.5 L 1574.5 760.5 L 1550.5 760.5 Z M 1550.5 694.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 1618.5 310.5 L 1641.5 310.5 L 1641.5 508.5 L 1618.5 508.5 Z M 271.5 310.5 L 295.5 310.5 L 295.5 508.5 L 271.5 508.5 Z M 339.5 310.5 L 363.5 310.5 L 363.5 508.5 L 339.5 508.5 Z M 407.5 310.5 L 430.5 310.5 L 430.5 508.5 L 407.5 508.5 Z M 474.5 310.5 L 498.5 310.5 L 498.5 508.5 L 474.5 508.5 Z M 603.5 310.5 L 627.5 310.5 L 627.5 508.5 L 603.5 508.5 Z M 671.5 310.5 L 694.5 310.5 L 694.5 508.5 L 671.5 508.5 Z M 738.5 310.5 L 762.5 310.5 L 762.5 508.5 L 738.5 508.5 Z M 806.5 310.5 L 830.5 310.5 L 830.5 508.5 L 806.5 508.5 Z M 874.5 310.5 L 897.5 310.5 L 897.5 508.5 L 874.5 508.5 Z M 941.5 310.5 L 965.5 310.5 L 965.5 508.5 L 941.5 508.5 Z M 1009.5 310.5 L 1033.5 310.5 L 1033.5 508.5 L 1009.5 508.5 Z M 1077.5 310.5 L 1100.5 310.5 L 1100.5 508.5 L 1077.5 508.5 Z M 1144.5 310.5 L 1168.5 310.5 L 1168.5 508.5 L 1144.5 508.5 Z M 1212.5 310.5 L 1235.5 310.5 L 1235.5 508.5 L 1212.5 508.5 Z M 1279.5 310.5 L 1303.5 310.5 L 1303.5 508.5 L 1279.5 508.5 Z M 1347.5 310.5 L 1371.5 310.5 L 1371.5 508.5 L 1347.5 508.5 Z M 1415.5 310.5 L 1438.5 310.5 L 1438.5 508.5 L 1415.5 508.5 Z M 1482.5 310.5 L 1506.5 310.5 L 1506.5 508.5 L 1482.5 508.5 Z M 1550.5 310.5 L 1574.5 310.5 L 1574.5 508.5 L 1550.5 508.5 Z M 1550.5 310.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 635.5 464.5 L 662.5 464.5 L 662.5 490.5 L 635.5 490.5 Z M 1041.5 464.5 L 1068.5 464.5 L 1068.5 490.5 L 1041.5 490.5 Z M 906.5 464.5 L 933.5 464.5 L 933.5 490.5 L 906.5 490.5 Z M 1582.5 464.5 L 1609.5 464.5 L 1609.5 490.5 L 1582.5 490.5 Z M 1312.5 464.5 L 1338.5 464.5 L 1338.5 490.5 L 1312.5 490.5 Z M 771.5 464.5 L 797.5 464.5 L 797.5 490.5 L 771.5 490.5 Z M 1447.5 464.5 L 1474.5 464.5 L 1474.5 490.5 L 1447.5 490.5 Z M 1176.5 464.5 L 1203.5 464.5 L 1203.5 490.5 L 1176.5 490.5 Z M 1380.5 580.5 L 1407.5 580.5 L 1407.5 595.5 L 1380.5 595.5 Z M 839.5 580.5 L 866.5 580.5 L 866.5 595.5 L 839.5 595.5 Z M 1515.5 580.5 L 1542.5 580.5 L 1542.5 595.5 L 1515.5 595.5 Z M 704.5 580.5 L 731.5 580.5 L 731.5 595.5 L 704.5 595.5 Z M 1244.5 580.5 L 1271.5 580.5 L 1271.5 595.5 L 1244.5 595.5 Z M 974.5 580.5 L 1001.5 580.5 L 1001.5 595.5 L 974.5 595.5 Z M 1110.5 580.5 L 1136.5 580.5 L 1136.5 595.5 L 1110.5 595.5 Z M 1244.5 595.5 L 1271.5 595.5 L 1271.5 607.5 L 1244.5 607.5 Z M 974.5 595.5 L 1001.5 595.5 L 1001.5 607.5 L 974.5 607.5 Z M 1515.5 595.5 L 1542.5 595.5 L 1542.5 607.5 L 1515.5 607.5 Z M 578.5 580.5 L 605.5 580.5 L 605.5 607.5 L 578.5 607.5 Z M 839.5 595.5 L 866.5 595.5 L 866.5 607.5 L 839.5 607.5 Z M 521.5 580.5 L 548.5 580.5 L 548.5 607.5 L 521.5 607.5 Z M 704.5 595.5 L 731.5 595.5 L 731.5 607.5 L 704.5 607.5 Z M 1110.5 595.5 L 1136.5 595.5 L 1136.5 607.5 L 1110.5 607.5 Z M 1380.5 595.5 L 1407.5 595.5 L 1407.5 607.5 L 1380.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="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface312">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 324.4375 600.363281 L 311.433594 600.363281 L 307.867188 610.5 L 303.285156 610.5 L 315.320312 576.757812 L 320.875 576.757812 L 332.722656 610.5 L 327.910156 610.5 Z M 323.234375 596.753906 L 318.050781 581.386719 L 312.496094 596.753906 Z M 323.234375 596.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 304 499 L 330 499 M 304 472 L 330 472 M 304 472 L 304 499 M 330 472 L 330 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 304 499 L 330 499 M 304 472 L 330 472 M 330 499 L 330 472 M 304 499 L 304 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/clkbuf/sky130_fd_sc_lp__clkbuf_2.svg b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.svg
index b8344ae..82c1b4b 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_2.svg
+++ b/cells/clkbuf/sky130_fd_sc_lp__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 539.5 L 701.5 539.5 Z M 701.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 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="#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 1046.5 768.5 L 1080.5 768.5 L 1080.5 864.5 L 1046.5 864.5 Z M 836.5 768.5 L 870.5 768.5 L 870.5 864.5 L 836.5 864.5 Z M 947.5 768.5 L 981.5 768.5 L 981.5 864.5 L 947.5 864.5 Z M 947.5 768.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 1044.5 209.5 L 1079.5 209.5 L 1079.5 498.5 L 1044.5 498.5 Z M 836.5 209.5 L 870.5 209.5 L 870.5 498.5 L 836.5 498.5 Z M 946.5 209.5 L 980.5 209.5 L 980.5 498.5 L 946.5 498.5 Z M 946.5 209.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface280">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <path style=" 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 706.320312 L 1152.191406 731.5 L 1144.449219 731.5 L 1131.050781 711.035156 L 1117.589844 731.5 L 1109.980469 731.5 L 1127.351562 706.320312 L 1111.058594 682.421875 L 1118.664062 682.421875 L 1131.253906 701.675781 L 1143.910156 682.421875 L 1151.382812 682.421875 Z M 1134.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 1110 392 L 1149 392 M 1110 353 L 1149 353 M 1110 353 L 1110 392 M 1149 353 L 1149 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 1110 392 L 1149 392 M 1110 353 L 1149 353 M 1149 392 L 1149 353 M 1110 392 L 1110 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 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_lp__clkbuf_4.svg b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.svg
index fa9d1db..929899f 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_4.svg
+++ b/cells/clkbuf/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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 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="#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 1132.5 768.5 L 1166.5 768.5 L 1166.5 864.5 L 1132.5 864.5 Z M 725.5 768.5 L 759.5 768.5 L 759.5 864.5 L 725.5 864.5 Z M 836.5 768.5 L 870.5 768.5 L 870.5 864.5 L 836.5 864.5 Z M 934.5 768.5 L 969.5 768.5 L 969.5 864.5 L 934.5 864.5 Z M 1033.5 768.5 L 1067.5 768.5 L 1067.5 864.5 L 1033.5 864.5 Z M 1033.5 768.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 1130.5 209.5 L 1165.5 209.5 L 1165.5 498.5 L 1130.5 498.5 Z M 725.5 209.5 L 759.5 209.5 L 759.5 498.5 L 725.5 498.5 Z M 835.5 209.5 L 869.5 209.5 L 869.5 498.5 L 835.5 498.5 Z M 933.5 209.5 L 968.5 209.5 L 968.5 498.5 L 933.5 498.5 Z M 1032.5 209.5 L 1066.5 209.5 L 1066.5 498.5 L 1032.5 498.5 Z M 1032.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -146,6 +146,5 @@
 <path style=" 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/clkbuf/sky130_fd_sc_lp__clkbuf_8.svg b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.svg
index 077098d..45fac30 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_8.svg
+++ b/cells/clkbuf/sky130_fd_sc_lp__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 539.5 L 312.5 539.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 1334.5 768.5 L 1369.5 768.5 L 1369.5 864.5 L 1334.5 864.5 Z M 447.5 768.5 L 482.5 768.5 L 482.5 864.5 L 447.5 864.5 Z M 546.5 768.5 L 580.5 768.5 L 580.5 864.5 L 546.5 864.5 Z M 644.5 768.5 L 679.5 768.5 L 679.5 864.5 L 644.5 864.5 Z M 743.5 768.5 L 777.5 768.5 L 777.5 864.5 L 743.5 864.5 Z M 842.5 768.5 L 876.5 768.5 L 876.5 864.5 L 842.5 864.5 Z M 940.5 768.5 L 975.5 768.5 L 975.5 864.5 L 940.5 864.5 Z M 1039.5 768.5 L 1073.5 768.5 L 1073.5 864.5 L 1039.5 864.5 Z M 1137.5 768.5 L 1172.5 768.5 L 1172.5 864.5 L 1137.5 864.5 Z M 1236.5 768.5 L 1270.5 768.5 L 1270.5 864.5 L 1236.5 864.5 Z M 1236.5 768.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 1334.5 209.5 L 1369.5 209.5 L 1369.5 498.5 L 1334.5 498.5 Z M 447.5 209.5 L 482.5 209.5 L 482.5 498.5 L 447.5 498.5 Z M 546.5 209.5 L 580.5 209.5 L 580.5 498.5 L 546.5 498.5 Z M 644.5 209.5 L 679.5 209.5 L 679.5 498.5 L 644.5 498.5 Z M 743.5 209.5 L 777.5 209.5 L 777.5 498.5 L 743.5 498.5 Z M 842.5 209.5 L 876.5 209.5 L 876.5 498.5 L 842.5 498.5 Z M 940.5 209.5 L 975.5 209.5 L 975.5 498.5 L 940.5 498.5 Z M 1039.5 209.5 L 1073.5 209.5 L 1073.5 498.5 L 1039.5 498.5 Z M 1137.5 209.5 L 1172.5 209.5 L 1172.5 498.5 L 1137.5 498.5 Z M 1236.5 209.5 L 1270.5 209.5 L 1270.5 498.5 L 1236.5 498.5 Z M 1236.5 209.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1405.824219 706.320312 L 1423.191406 731.5 L 1415.449219 731.5 L 1402.050781 711.035156 L 1388.589844 731.5 L 1380.980469 731.5 L 1398.351562 706.320312 L 1382.058594 682.421875 L 1389.664062 682.421875 L 1402.253906 701.675781 L 1414.910156 682.421875 L 1422.382812 682.421875 Z M 1405.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 1381 392 L 1420 392 M 1381 353 L 1420 353 M 1381 353 L 1381 392 M 1420 353 L 1420 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 1381 392 L 1420 392 M 1381 353 L 1420 353 M 1420 392 L 1420 353 M 1381 392 L 1381 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 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/clkbuf/sky130_fd_sc_lp__clkbuf_lp.svg b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.svg
index 05e150e..9f708b7 100644
--- a/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.svg
+++ b/cells/clkbuf/sky130_fd_sc_lp__clkbuf_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1094.5 757.5 L 1128.5 757.5 L 1128.5 853.5 L 1094.5 853.5 Z M 796.5 757.5 L 830.5 757.5 L 830.5 853.5 L 796.5 853.5 Z M 878.5 757.5 L 913.5 757.5 L 913.5 853.5 L 878.5 853.5 Z M 1011.5 757.5 L 1046.5 757.5 L 1046.5 853.5 L 1011.5 853.5 Z M 1011.5 757.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 988.5 223.5 L 1046.5 223.5 L 1046.5 452.5 L 988.5 452.5 Z M 811.5 223.5 L 868.5 223.5 L 868.5 452.5 L 811.5 452.5 Z M 811.5 223.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface319">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 747.824219 282.320312 L 765.191406 307.5 L 757.449219 307.5 L 744.050781 287.035156 L 730.589844 307.5 L 722.980469 307.5 L 740.351562 282.320312 L 724.058594 258.421875 L 731.664062 258.421875 L 744.253906 277.675781 L 756.910156 258.421875 L 764.382812 258.421875 Z M 747.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 724 816 L 763 816 M 724 777 L 763 777 M 724 777 L 724 816 M 763 777 L 763 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 724 816 L 763 816 M 724 777 L 763 777 M 763 816 L 763 777 M 724 816 L 724 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/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.svg b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.svg
index 90eb78e..3d5c8ac 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.svg
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 308.5 L 1743.5 308.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 308.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 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="#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 1545.5 642.5 L 1564.5 642.5 L 1564.5 709.5 L 1545.5 709.5 Z M 246.5 642.5 L 264.5 642.5 L 264.5 709.5 L 246.5 709.5 Z M 290.5 642.5 L 308.5 642.5 L 308.5 709.5 L 290.5 709.5 Z M 342.5 642.5 L 361.5 642.5 L 361.5 709.5 L 342.5 709.5 Z M 386.5 642.5 L 405.5 642.5 L 405.5 709.5 L 386.5 709.5 Z M 439.5 642.5 L 457.5 642.5 L 457.5 709.5 L 439.5 709.5 Z M 483.5 642.5 L 501.5 642.5 L 501.5 709.5 L 483.5 709.5 Z M 535.5 642.5 L 554.5 642.5 L 554.5 709.5 L 535.5 709.5 Z M 579.5 642.5 L 597.5 642.5 L 597.5 709.5 L 579.5 709.5 Z M 634.5 642.5 L 652.5 642.5 L 652.5 709.5 L 634.5 709.5 Z M 678.5 642.5 L 696.5 642.5 L 696.5 709.5 L 678.5 709.5 Z M 730.5 642.5 L 749.5 642.5 L 749.5 709.5 L 730.5 709.5 Z M 774.5 642.5 L 793.5 642.5 L 793.5 709.5 L 774.5 709.5 Z M 827.5 642.5 L 845.5 642.5 L 845.5 709.5 L 827.5 709.5 Z M 871.5 642.5 L 889.5 642.5 L 889.5 709.5 L 871.5 709.5 Z M 923.5 642.5 L 941.5 642.5 L 941.5 709.5 L 923.5 709.5 Z M 967.5 642.5 L 985.5 642.5 L 985.5 709.5 L 967.5 709.5 Z M 1020.5 642.5 L 1038.5 642.5 L 1038.5 709.5 L 1020.5 709.5 Z M 1063.5 642.5 L 1082.5 642.5 L 1082.5 709.5 L 1063.5 709.5 Z M 1116.5 642.5 L 1134.5 642.5 L 1134.5 709.5 L 1116.5 709.5 Z M 1160.5 642.5 L 1178.5 642.5 L 1178.5 709.5 L 1160.5 709.5 Z M 1212.5 642.5 L 1231.5 642.5 L 1231.5 709.5 L 1212.5 709.5 Z M 1256.5 642.5 L 1275.5 642.5 L 1275.5 709.5 L 1256.5 709.5 Z M 1309.5 642.5 L 1327.5 642.5 L 1327.5 709.5 L 1309.5 709.5 Z M 1353.5 642.5 L 1371.5 642.5 L 1371.5 709.5 L 1353.5 709.5 Z M 1405.5 642.5 L 1423.5 642.5 L 1423.5 709.5 L 1405.5 709.5 Z M 1449.5 642.5 L 1467.5 642.5 L 1467.5 709.5 L 1449.5 709.5 Z M 1501.5 642.5 L 1520.5 642.5 L 1520.5 709.5 L 1501.5 709.5 Z M 1501.5 642.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 1604.5 361.5 L 1634.5 361.5 L 1634.5 483.5 L 1604.5 483.5 Z M 246.5 361.5 L 277.5 361.5 L 277.5 483.5 L 246.5 483.5 Z M 311.5 361.5 L 341.5 361.5 L 341.5 483.5 L 311.5 483.5 Z M 375.5 361.5 L 406.5 361.5 L 406.5 483.5 L 375.5 483.5 Z M 440.5 361.5 L 471.5 361.5 L 471.5 483.5 L 440.5 483.5 Z M 505.5 361.5 L 535.5 361.5 L 535.5 483.5 L 505.5 483.5 Z M 569.5 361.5 L 600.5 361.5 L 600.5 483.5 L 569.5 483.5 Z M 634.5 361.5 L 665.5 361.5 L 665.5 483.5 L 634.5 483.5 Z M 699.5 361.5 L 729.5 361.5 L 729.5 483.5 L 699.5 483.5 Z M 763.5 361.5 L 794.5 361.5 L 794.5 483.5 L 763.5 483.5 Z M 828.5 361.5 L 859.5 361.5 L 859.5 483.5 L 828.5 483.5 Z M 893.5 361.5 L 923.5 361.5 L 923.5 483.5 L 893.5 483.5 Z M 957.5 361.5 L 988.5 361.5 L 988.5 483.5 L 957.5 483.5 Z M 1022.5 361.5 L 1053.5 361.5 L 1053.5 483.5 L 1022.5 483.5 Z M 1087.5 361.5 L 1117.5 361.5 L 1117.5 483.5 L 1087.5 483.5 Z M 1151.5 361.5 L 1182.5 361.5 L 1182.5 483.5 L 1151.5 483.5 Z M 1216.5 361.5 L 1246.5 361.5 L 1246.5 483.5 L 1216.5 483.5 Z M 1281.5 361.5 L 1311.5 361.5 L 1311.5 483.5 L 1281.5 483.5 Z M 1345.5 361.5 L 1376.5 361.5 L 1376.5 483.5 L 1345.5 483.5 Z M 1410.5 361.5 L 1440.5 361.5 L 1440.5 483.5 L 1410.5 483.5 Z M 1475.5 361.5 L 1505.5 361.5 L 1505.5 483.5 L 1475.5 483.5 Z M 1539.5 361.5 L 1570.5 361.5 L 1570.5 483.5 L 1539.5 483.5 Z M 1539.5 361.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 671.5 479.5 L 692.5 479.5 L 692.5 500.5 L 671.5 500.5 Z M 1060.5 479.5 L 1081.5 479.5 L 1081.5 500.5 L 1060.5 500.5 Z M 1318.5 479.5 L 1339.5 479.5 L 1339.5 500.5 L 1318.5 500.5 Z M 1577.5 479.5 L 1597.5 479.5 L 1597.5 500.5 L 1577.5 500.5 Z M 1446.5 479.5 L 1467.5 479.5 L 1467.5 500.5 L 1446.5 500.5 Z M 1189.5 479.5 L 1210.5 479.5 L 1210.5 500.5 L 1189.5 500.5 Z M 930.5 479.5 L 951.5 479.5 L 951.5 500.5 L 930.5 500.5 Z M 802.5 479.5 L 823.5 479.5 L 823.5 500.5 L 802.5 500.5 Z M 1622.5 569.5 L 1642.5 569.5 L 1642.5 581.5 L 1622.5 581.5 Z M 996.5 569.5 L 1017.5 569.5 L 1017.5 581.5 L 996.5 581.5 Z M 1212.5 569.5 L 1232.5 569.5 L 1232.5 581.5 L 1212.5 581.5 Z M 1563.5 569.5 L 1584.5 569.5 L 1584.5 581.5 L 1563.5 581.5 Z M 1153.5 569.5 L 1174.5 569.5 L 1174.5 581.5 L 1153.5 581.5 Z M 1387.5 569.5 L 1408.5 569.5 L 1408.5 581.5 L 1387.5 581.5 Z M 626.5 569.5 L 647.5 569.5 L 647.5 581.5 L 626.5 581.5 Z M 626.5 581.5 L 647.5 581.5 L 647.5 590.5 L 626.5 590.5 Z M 1622.5 581.5 L 1642.5 581.5 L 1642.5 590.5 L 1622.5 590.5 Z M 568.5 569.5 L 588.5 569.5 L 588.5 590.5 L 568.5 590.5 Z M 802.5 569.5 L 823.5 569.5 L 823.5 590.5 L 802.5 590.5 Z M 996.5 581.5 L 1017.5 581.5 L 1017.5 590.5 L 996.5 590.5 Z M 1212.5 581.5 L 1232.5 581.5 L 1232.5 590.5 L 1212.5 590.5 Z M 1563.5 581.5 L 1584.5 581.5 L 1584.5 590.5 L 1563.5 590.5 Z M 1153.5 581.5 L 1174.5 581.5 L 1174.5 590.5 L 1153.5 590.5 Z M 1387.5 581.5 L 1408.5 581.5 L 1408.5 590.5 L 1387.5 590.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="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>
@@ -146,6 +146,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 232.121094 585.820312 L 222.265625 585.820312 L 219.566406 593.5 L 216.097656 593.5 L 225.210938 567.9375 L 229.421875 567.9375 L 238.394531 593.5 L 234.75 593.5 Z M 231.207031 583.085938 L 227.28125 571.445312 L 223.074219 583.085938 Z M 231.207031 583.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 216 510 L 237 510 M 216 489 L 237 489 M 216 489 L 216 510 M 237 489 L 237 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 216 510 L 237 510 M 216 489 L 237 489 M 237 510 L 237 489 M 216 510 L 216 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/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.svg b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.svg
index 034c5df..8eb0b2a 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.svg
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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 1113.5 768.5 L 1148.5 768.5 L 1148.5 864.5 L 1113.5 864.5 Z M 669.5 768.5 L 703.5 768.5 L 703.5 864.5 L 669.5 864.5 Z M 751.5 768.5 L 785.5 768.5 L 785.5 864.5 L 751.5 864.5 Z M 850.5 768.5 L 884.5 768.5 L 884.5 864.5 L 850.5 864.5 Z M 932.5 768.5 L 967.5 768.5 L 967.5 864.5 L 932.5 864.5 Z M 1031.5 768.5 L 1065.5 768.5 L 1065.5 864.5 L 1031.5 864.5 Z M 1031.5 768.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 956.5 211.5 L 1013.5 211.5 L 1013.5 440.5 L 956.5 440.5 Z M 713.5 211.5 L 771.5 211.5 L 771.5 440.5 L 713.5 440.5 Z M 835.5 211.5 L 892.5 211.5 L 892.5 440.5 L 835.5 440.5 Z M 835.5 211.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 966.824219 706.320312 L 984.191406 731.5 L 976.449219 731.5 L 963.050781 711.035156 L 949.589844 731.5 L 941.980469 731.5 L 959.351562 706.320312 L 943.058594 682.421875 L 950.664062 682.421875 L 963.253906 701.675781 L 975.910156 682.421875 L 983.382812 682.421875 Z M 966.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 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/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.svg b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.svg
index 88f0aa9..943dadf 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.svg
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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 614.5 718.5 L 648.5 718.5 L 648.5 864.5 L 614.5 864.5 Z M 1177.5 738.5 L 1212.5 738.5 L 1212.5 864.5 L 1177.5 864.5 Z M 1095.5 738.5 L 1129.5 738.5 L 1129.5 864.5 L 1095.5 864.5 Z M 996.5 738.5 L 1031.5 738.5 L 1031.5 864.5 L 996.5 864.5 Z M 914.5 738.5 L 948.5 738.5 L 948.5 864.5 L 914.5 864.5 Z M 696.5 718.5 L 730.5 718.5 L 730.5 864.5 L 696.5 864.5 Z M 696.5 718.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 1221.5 211.5 L 1278.5 211.5 L 1278.5 440.5 L 1221.5 440.5 Z M 614.5 211.5 L 671.5 211.5 L 671.5 440.5 L 614.5 440.5 Z M 735.5 211.5 L 792.5 211.5 L 792.5 440.5 L 735.5 440.5 Z M 856.5 211.5 L 914.5 211.5 L 914.5 440.5 L 856.5 440.5 Z M 978.5 211.5 L 1035.5 211.5 L 1035.5 440.5 L 978.5 440.5 Z M 1099.5 211.5 L 1157.5 211.5 L 1157.5 440.5 L 1099.5 440.5 Z M 1099.5 211.5 "/>
 </clipPath>
-<image id="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.svg b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.svg
index b1295a3..86edeaa 100644
--- a/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.svg
+++ b/cells/clkbuflp/sky130_fd_sc_lp__clkbuflp_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 538.5 L 174.5 538.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 297.5 700.5 L 328.5 700.5 L 328.5 832.5 L 297.5 832.5 Z M 1301.5 718.5 L 1332.5 718.5 L 1332.5 832.5 L 1301.5 832.5 Z M 1226.5 718.5 L 1257.5 718.5 L 1257.5 832.5 L 1226.5 832.5 Z M 1137.5 718.5 L 1168.5 718.5 L 1168.5 832.5 L 1137.5 832.5 Z M 1063.5 718.5 L 1094.5 718.5 L 1094.5 832.5 L 1063.5 832.5 Z M 974.5 718.5 L 1005.5 718.5 L 1005.5 832.5 L 974.5 832.5 Z M 899.5 718.5 L 930.5 718.5 L 930.5 832.5 L 899.5 832.5 Z M 810.5 718.5 L 841.5 718.5 L 841.5 832.5 L 810.5 832.5 Z M 736.5 718.5 L 767.5 718.5 L 767.5 832.5 L 736.5 832.5 Z M 535.5 700.5 L 566.5 700.5 L 566.5 832.5 L 535.5 832.5 Z M 460.5 700.5 L 491.5 700.5 L 491.5 832.5 L 460.5 832.5 Z M 371.5 700.5 L 402.5 700.5 L 402.5 832.5 L 371.5 832.5 Z M 371.5 700.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 1504.5 242.5 L 1556.5 242.5 L 1556.5 449.5 L 1504.5 449.5 Z M 297.5 242.5 L 348.5 242.5 L 348.5 449.5 L 297.5 449.5 Z M 406.5 242.5 L 458.5 242.5 L 458.5 449.5 L 406.5 449.5 Z M 516.5 242.5 L 568.5 242.5 L 568.5 449.5 L 516.5 449.5 Z M 626.5 242.5 L 678.5 242.5 L 678.5 449.5 L 626.5 449.5 Z M 736.5 242.5 L 787.5 242.5 L 787.5 449.5 L 736.5 449.5 Z M 845.5 242.5 L 897.5 242.5 L 897.5 449.5 L 845.5 449.5 Z M 955.5 242.5 L 1007.5 242.5 L 1007.5 449.5 L 955.5 449.5 Z M 1065.5 242.5 L 1117.5 242.5 L 1117.5 449.5 L 1065.5 449.5 Z M 1175.5 242.5 L 1226.5 242.5 L 1226.5 449.5 L 1175.5 449.5 Z M 1284.5 242.5 L 1336.5 242.5 L 1336.5 449.5 L 1284.5 449.5 Z M 1394.5 242.5 L 1446.5 242.5 L 1446.5 449.5 L 1394.5 449.5 Z M 1394.5 242.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1361.628906 535.421875 L 1377.550781 558.5 L 1370.453125 558.5 L 1358.171875 539.738281 L 1345.832031 558.5 L 1338.859375 558.5 L 1354.777344 535.421875 L 1339.84375 513.511719 L 1346.820312 513.511719 L 1358.359375 531.160156 L 1369.960938 513.511719 L 1376.808594 513.511719 Z M 1361.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 1339 560 L 1374 560 M 1339 525 L 1374 525 M 1339 525 L 1339 560 M 1374 525 L 1374 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 1339 560 L 1374 560 M 1339 525 L 1374 525 M 1374 560 L 1374 525 M 1339 560 L 1339 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/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.svg b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.svg
index f5f6360..d51085f 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.svg
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1034.5 629.5 L 1068.5 629.5 L 1068.5 859.5 L 1034.5 859.5 Z M 1231.5 762.5 L 1266.5 762.5 L 1266.5 859.5 L 1231.5 859.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 811.5 629.5 L 845.5 629.5 L 845.5 859.5 L 811.5 859.5 Z M 811.5 629.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 1034.5 209.5 L 1068.5 209.5 L 1068.5 438.5 L 1034.5 438.5 Z M 811.5 209.5 L 845.5 209.5 L 845.5 438.5 L 811.5 438.5 Z M 614.5 209.5 L 648.5 209.5 L 648.5 498.5 L 614.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 1231.5 209.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.svg b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.svg
index aea88a0..a339189 100644
--- a/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.svg
+++ b/cells/clkdlybuf4s15/sky130_fd_sc_lp__clkdlybuf4s15_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 979.5 629.5 L 1013.5 629.5 L 1013.5 859.5 L 979.5 859.5 Z M 1275.5 762.5 L 1309.5 762.5 L 1309.5 859.5 L 1275.5 859.5 Z M 1176.5 762.5 L 1211.5 762.5 L 1211.5 859.5 L 1176.5 859.5 Z M 559.5 762.5 L 593.5 762.5 L 593.5 859.5 L 559.5 859.5 Z M 756.5 629.5 L 790.5 629.5 L 790.5 859.5 L 756.5 859.5 Z M 756.5 629.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 979.5 209.5 L 1013.5 209.5 L 1013.5 438.5 L 979.5 438.5 Z M 756.5 209.5 L 790.5 209.5 L 790.5 438.5 L 756.5 438.5 Z M 1176.5 209.5 L 1211.5 209.5 L 1211.5 498.5 L 1176.5 498.5 Z M 1275.5 209.5 L 1309.5 209.5 L 1309.5 498.5 L 1275.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 559.5 209.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -161,6 +161,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1294.855469 282.8125 L 1304.988281 297.5 L 1300.46875 297.5 L 1292.65625 285.5625 L 1284.800781 297.5 L 1280.363281 297.5 L 1290.496094 282.8125 L 1280.992188 268.871094 L 1285.429688 268.871094 L 1292.773438 280.101562 L 1300.15625 268.871094 L 1304.515625 268.871094 Z M 1294.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 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 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/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.svg b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.svg
index a6d3798..6116892 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.svg
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1034.5 629.5 L 1075.5 629.5 L 1075.5 859.5 L 1034.5 859.5 Z M 1231.5 762.5 L 1266.5 762.5 L 1266.5 859.5 L 1231.5 859.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 804.5 629.5 L 845.5 629.5 L 845.5 859.5 L 804.5 859.5 Z M 804.5 629.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 1034.5 209.5 L 1075.5 209.5 L 1075.5 438.5 L 1034.5 438.5 Z M 804.5 209.5 L 845.5 209.5 L 845.5 438.5 L 804.5 438.5 Z M 614.5 209.5 L 648.5 209.5 L 648.5 498.5 L 614.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 1231.5 209.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.svg b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.svg
index 3be652d..ee89f8d 100644
--- a/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.svg
+++ b/cells/clkdlybuf4s18/sky130_fd_sc_lp__clkdlybuf4s18_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 979.5 629.5 L 1020.5 629.5 L 1020.5 859.5 L 979.5 859.5 Z M 1275.5 762.5 L 1309.5 762.5 L 1309.5 859.5 L 1275.5 859.5 Z M 1176.5 762.5 L 1211.5 762.5 L 1211.5 859.5 L 1176.5 859.5 Z M 559.5 762.5 L 593.5 762.5 L 593.5 859.5 L 559.5 859.5 Z M 749.5 629.5 L 790.5 629.5 L 790.5 859.5 L 749.5 859.5 Z M 749.5 629.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 979.5 209.5 L 1020.5 209.5 L 1020.5 438.5 L 979.5 438.5 Z M 749.5 209.5 L 790.5 209.5 L 790.5 438.5 L 749.5 438.5 Z M 1176.5 209.5 L 1211.5 209.5 L 1211.5 498.5 L 1176.5 498.5 Z M 1275.5 209.5 L 1309.5 209.5 L 1309.5 498.5 L 1275.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 559.5 209.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -161,6 +161,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1294.855469 282.8125 L 1304.988281 297.5 L 1300.46875 297.5 L 1292.65625 285.5625 L 1284.800781 297.5 L 1280.363281 297.5 L 1290.496094 282.8125 L 1280.992188 268.871094 L 1285.429688 268.871094 L 1292.773438 280.101562 L 1300.15625 268.871094 L 1304.515625 268.871094 Z M 1294.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 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 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/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.svg b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.svg
index 902c1b0..d0ec629 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.svg
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#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 1034.5 629.5 L 1091.5 629.5 L 1091.5 859.5 L 1034.5 859.5 Z M 1231.5 762.5 L 1266.5 762.5 L 1266.5 859.5 L 1231.5 859.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 788.5 629.5 L 845.5 629.5 L 845.5 859.5 L 788.5 859.5 Z M 788.5 629.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1034.5 209.5 L 1091.5 209.5 L 1091.5 438.5 L 1034.5 438.5 Z M 788.5 209.5 L 845.5 209.5 L 845.5 438.5 L 788.5 438.5 Z M 614.5 209.5 L 648.5 209.5 L 648.5 498.5 L 614.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 1231.5 209.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -161,6 +161,5 @@
 <path style=" 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/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.svg b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.svg
index 6834d6b..ff0724e 100644
--- a/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.svg
+++ b/cells/clkdlybuf4s25/sky130_fd_sc_lp__clkdlybuf4s25_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 979.5 629.5 L 1036.5 629.5 L 1036.5 859.5 L 979.5 859.5 Z M 1275.5 762.5 L 1309.5 762.5 L 1309.5 859.5 L 1275.5 859.5 Z M 1176.5 762.5 L 1211.5 762.5 L 1211.5 859.5 L 1176.5 859.5 Z M 559.5 762.5 L 593.5 762.5 L 593.5 859.5 L 559.5 859.5 Z M 733.5 629.5 L 790.5 629.5 L 790.5 859.5 L 733.5 859.5 Z M 733.5 629.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 979.5 209.5 L 1036.5 209.5 L 1036.5 438.5 L 979.5 438.5 Z M 733.5 209.5 L 790.5 209.5 L 790.5 438.5 L 733.5 438.5 Z M 1176.5 209.5 L 1211.5 209.5 L 1211.5 498.5 L 1176.5 498.5 Z M 1275.5 209.5 L 1309.5 209.5 L 1309.5 498.5 L 1275.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 559.5 209.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -161,6 +161,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1294.855469 282.8125 L 1304.988281 297.5 L 1300.46875 297.5 L 1292.65625 285.5625 L 1284.800781 297.5 L 1280.363281 297.5 L 1290.496094 282.8125 L 1280.992188 268.871094 L 1285.429688 268.871094 L 1292.773438 280.101562 L 1300.15625 268.871094 L 1304.515625 268.871094 Z M 1294.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 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 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/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.svg b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.svg
index e8270b4..7878f7a 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.svg
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1034.5 629.5 L 1149.5 629.5 L 1149.5 859.5 L 1034.5 859.5 Z M 1231.5 762.5 L 1266.5 762.5 L 1266.5 859.5 L 1231.5 859.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 730.5 629.5 L 845.5 629.5 L 845.5 859.5 L 730.5 859.5 Z M 730.5 629.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 1034.5 209.5 L 1149.5 209.5 L 1149.5 438.5 L 1034.5 438.5 Z M 730.5 209.5 L 845.5 209.5 L 845.5 438.5 L 730.5 438.5 Z M 614.5 209.5 L 648.5 209.5 L 648.5 498.5 L 614.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 1231.5 209.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.svg b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.svg
index f74ced7..0b76368 100644
--- a/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.svg
+++ b/cells/clkdlybuf4s50/sky130_fd_sc_lp__clkdlybuf4s50_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image294"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 979.5 629.5 L 1094.5 629.5 L 1094.5 859.5 L 979.5 859.5 Z M 1275.5 762.5 L 1309.5 762.5 L 1309.5 859.5 L 1275.5 859.5 Z M 1176.5 762.5 L 1211.5 762.5 L 1211.5 859.5 L 1176.5 859.5 Z M 559.5 762.5 L 593.5 762.5 L 593.5 859.5 L 559.5 859.5 Z M 675.5 629.5 L 790.5 629.5 L 790.5 859.5 L 675.5 859.5 Z M 675.5 629.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 979.5 209.5 L 1094.5 209.5 L 1094.5 438.5 L 979.5 438.5 Z M 675.5 209.5 L 790.5 209.5 L 790.5 438.5 L 675.5 438.5 Z M 1176.5 209.5 L 1211.5 209.5 L 1211.5 498.5 L 1176.5 498.5 Z M 1275.5 209.5 L 1309.5 209.5 L 1309.5 498.5 L 1275.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 559.5 209.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image297" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -161,6 +161,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1294.855469 282.8125 L 1304.988281 297.5 L 1300.46875 297.5 L 1292.65625 285.5625 L 1284.800781 297.5 L 1280.363281 297.5 L 1290.496094 282.8125 L 1280.992188 268.871094 L 1285.429688 268.871094 L 1292.773438 280.101562 L 1300.15625 268.871094 L 1304.515625 268.871094 Z M 1294.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 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 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/clkinv/sky130_fd_sc_lp__clkinv_0.svg b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.svg
index a4dca1c..4850d1c 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_0.svg
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 539.5 L 812.5 539.5 Z M 812.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="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="#image295"/>
+  <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 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="#image295"/>
+  <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 949.5 742.5 L 984.5 742.5 L 984.5 838.5 L 949.5 838.5 Z M 949.5 742.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <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 949.5 242.5 L 984.5 242.5 L 984.5 389.5 L 949.5 389.5 Z M 949.5 242.5 "/>
 </clipPath>
-<image id="image297" 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="#image297"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image298" 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="#image298"/>
+  <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="surface292">
+<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 1024.554688 288.246094 L 1024.554688 307.5 L 1018.292969 307.5 L 1018.292969 288.246094 L 999.375 258.421875 L 1007.117188 258.421875 L 1021.523438 282.320312 L 1035.527344 258.421875 L 1043 258.421875 Z M 1024.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 1001 816 L 1040 816 M 1001 777 L 1040 777 M 1001 777 L 1001 816 M 1040 777 L 1040 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 1001 816 L 1040 816 M 1001 777 L 1040 777 M 1040 816 L 1040 777 M 1001 816 L 1001 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 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/clkinv/sky130_fd_sc_lp__clkinv_1.svg b/cells/clkinv/sky130_fd_sc_lp__clkinv_1.svg
index 03c7f2b..3264200 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_1.svg
+++ b/cells/clkinv/sky130_fd_sc_lp__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 539.5 L 756.5 539.5 Z M 756.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="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="#image283"/>
+  <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 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="#image283"/>
+  <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 1003.5 742.5 L 1038.5 742.5 L 1038.5 838.5 L 1003.5 838.5 Z M 1003.5 742.5 "/>
 </clipPath>
-<image id="image284" 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="#image284"/>
+  <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 1003.5 242.5 L 1038.5 242.5 L 1038.5 435.5 L 1003.5 435.5 Z M 905.5 242.5 L 939.5 242.5 L 939.5 435.5 L 905.5 435.5 Z M 905.5 242.5 "/>
 </clipPath>
-<image id="image285" 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="#image285"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image286" 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="#image286"/>
+  <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="surface280">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1078.554688 542.246094 L 1078.554688 561.5 L 1072.292969 561.5 L 1072.292969 542.246094 L 1053.375 512.421875 L 1061.117188 512.421875 L 1075.523438 536.320312 L 1089.527344 512.421875 L 1097 512.421875 Z M 1078.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 1055 562 L 1094 562 M 1055 523 L 1094 523 M 1055 523 L 1055 562 M 1094 523 L 1094 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 1055 562 L 1094 562 M 1055 523 L 1094 523 M 1094 562 L 1094 523 M 1055 562 L 1055 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/clkinv/sky130_fd_sc_lp__clkinv_16.svg b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.svg
index c253aca..58821e7 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_16.svg
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 536.5 L 174.5 536.5 Z M 174.5 280.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 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="#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 1404.5 658.5 L 1425.5 658.5 L 1425.5 715.5 L 1404.5 715.5 Z M 518.5 658.5 L 538.5 658.5 L 538.5 715.5 L 518.5 715.5 Z M 577.5 658.5 L 598.5 658.5 L 598.5 715.5 L 577.5 715.5 Z M 636.5 658.5 L 657.5 658.5 L 657.5 715.5 L 636.5 715.5 Z M 695.5 658.5 L 716.5 658.5 L 716.5 715.5 L 695.5 715.5 Z M 754.5 658.5 L 775.5 658.5 L 775.5 715.5 L 754.5 715.5 Z M 813.5 658.5 L 834.5 658.5 L 834.5 715.5 L 813.5 715.5 Z M 872.5 658.5 L 893.5 658.5 L 893.5 715.5 L 872.5 715.5 Z M 931.5 658.5 L 952.5 658.5 L 952.5 715.5 L 931.5 715.5 Z M 991.5 658.5 L 1011.5 658.5 L 1011.5 715.5 L 991.5 715.5 Z M 1050.5 658.5 L 1070.5 658.5 L 1070.5 715.5 L 1050.5 715.5 Z M 1109.5 658.5 L 1129.5 658.5 L 1129.5 715.5 L 1109.5 715.5 Z M 1168.5 658.5 L 1188.5 658.5 L 1188.5 715.5 L 1168.5 715.5 Z M 1227.5 658.5 L 1248.5 658.5 L 1248.5 715.5 L 1227.5 715.5 Z M 1286.5 658.5 L 1307.5 658.5 L 1307.5 715.5 L 1286.5 715.5 Z M 1345.5 658.5 L 1366.5 658.5 L 1366.5 715.5 L 1345.5 715.5 Z M 1345.5 658.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 1640.5 338.5 L 1661.5 338.5 L 1661.5 511.5 L 1640.5 511.5 Z M 282.5 338.5 L 302.5 338.5 L 302.5 511.5 L 282.5 511.5 Z M 341.5 338.5 L 361.5 338.5 L 361.5 511.5 L 341.5 511.5 Z M 400.5 338.5 L 420.5 338.5 L 420.5 511.5 L 400.5 511.5 Z M 459.5 338.5 L 479.5 338.5 L 479.5 511.5 L 459.5 511.5 Z M 518.5 338.5 L 538.5 338.5 L 538.5 511.5 L 518.5 511.5 Z M 577.5 338.5 L 598.5 338.5 L 598.5 511.5 L 577.5 511.5 Z M 636.5 338.5 L 657.5 338.5 L 657.5 511.5 L 636.5 511.5 Z M 695.5 338.5 L 716.5 338.5 L 716.5 511.5 L 695.5 511.5 Z M 754.5 338.5 L 775.5 338.5 L 775.5 511.5 L 754.5 511.5 Z M 813.5 338.5 L 834.5 338.5 L 834.5 511.5 L 813.5 511.5 Z M 872.5 338.5 L 893.5 338.5 L 893.5 511.5 L 872.5 511.5 Z M 931.5 338.5 L 952.5 338.5 L 952.5 511.5 L 931.5 511.5 Z M 991.5 338.5 L 1011.5 338.5 L 1011.5 511.5 L 991.5 511.5 Z M 1050.5 338.5 L 1070.5 338.5 L 1070.5 511.5 L 1050.5 511.5 Z M 1109.5 338.5 L 1129.5 338.5 L 1129.5 511.5 L 1109.5 511.5 Z M 1168.5 338.5 L 1188.5 338.5 L 1188.5 511.5 L 1168.5 511.5 Z M 1227.5 338.5 L 1248.5 338.5 L 1248.5 511.5 L 1227.5 511.5 Z M 1286.5 338.5 L 1307.5 338.5 L 1307.5 511.5 L 1286.5 511.5 Z M 1345.5 338.5 L 1366.5 338.5 L 1366.5 511.5 L 1345.5 511.5 Z M 1404.5 338.5 L 1425.5 338.5 L 1425.5 511.5 L 1404.5 511.5 Z M 1463.5 338.5 L 1484.5 338.5 L 1484.5 511.5 L 1463.5 511.5 Z M 1522.5 338.5 L 1543.5 338.5 L 1543.5 511.5 L 1522.5 511.5 Z M 1581.5 338.5 L 1602.5 338.5 L 1602.5 511.5 L 1581.5 511.5 Z M 1581.5 338.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 310.5 472.5 L 333.5 472.5 L 333.5 495.5 L 310.5 495.5 Z M 1255.5 472.5 L 1278.5 472.5 L 1278.5 495.5 L 1255.5 495.5 Z M 1019.5 472.5 L 1042.5 472.5 L 1042.5 495.5 L 1019.5 495.5 Z M 782.5 472.5 L 806.5 472.5 L 806.5 495.5 L 782.5 495.5 Z M 1610.5 472.5 L 1633.5 472.5 L 1633.5 495.5 L 1610.5 495.5 Z M 546.5 472.5 L 569.5 472.5 L 569.5 495.5 L 546.5 495.5 Z M 1491.5 472.5 L 1515.5 472.5 L 1515.5 495.5 L 1491.5 495.5 Z M 901.5 472.5 L 924.5 472.5 L 924.5 495.5 L 901.5 495.5 Z M 428.5 472.5 L 451.5 472.5 L 451.5 495.5 L 428.5 495.5 Z M 1373.5 472.5 L 1397.5 472.5 L 1397.5 495.5 L 1373.5 495.5 Z M 664.5 472.5 L 688.5 472.5 L 688.5 495.5 L 664.5 495.5 Z M 1137.5 472.5 L 1160.5 472.5 L 1160.5 495.5 L 1137.5 495.5 Z M 1610.5 495.5 L 1633.5 495.5 L 1633.5 496.5 L 1610.5 496.5 Z M 782.5 495.5 L 806.5 495.5 L 806.5 496.5 L 782.5 496.5 Z M 1491.5 495.5 L 1515.5 495.5 L 1515.5 496.5 L 1491.5 496.5 Z M 901.5 495.5 L 924.5 495.5 L 924.5 496.5 L 901.5 496.5 Z M 546.5 495.5 L 569.5 495.5 L 569.5 496.5 L 546.5 496.5 Z M 310.5 495.5 L 333.5 495.5 L 333.5 496.5 L 310.5 496.5 Z M 664.5 495.5 L 688.5 495.5 L 688.5 496.5 L 664.5 496.5 Z M 1019.5 495.5 L 1042.5 495.5 L 1042.5 496.5 L 1019.5 496.5 Z M 1373.5 495.5 L 1397.5 495.5 L 1397.5 496.5 L 1373.5 496.5 Z M 1255.5 495.5 L 1278.5 495.5 L 1278.5 496.5 L 1255.5 496.5 Z M 428.5 495.5 L 451.5 495.5 L 451.5 496.5 L 428.5 496.5 Z M 1137.5 495.5 L 1160.5 495.5 L 1160.5 496.5 L 1137.5 496.5 Z M 1197.5 574.5 L 1220.5 574.5 L 1220.5 575.5 L 1197.5 575.5 Z M 842.5 574.5 L 866.5 574.5 L 866.5 575.5 L 842.5 575.5 Z M 1315.5 574.5 L 1338.5 574.5 L 1338.5 575.5 L 1315.5 575.5 Z M 1615.5 574.5 L 1638.5 574.5 L 1638.5 575.5 L 1615.5 575.5 Z M 1467.5 574.5 L 1490.5 574.5 L 1490.5 575.5 L 1467.5 575.5 Z M 1566.5 574.5 L 1589.5 574.5 L 1589.5 575.5 L 1566.5 575.5 Z M 406.5 574.5 L 429.5 574.5 L 429.5 575.5 L 406.5 575.5 Z M 356.5 574.5 L 380.5 574.5 L 380.5 575.5 L 356.5 575.5 Z M 455.5 574.5 L 479.5 574.5 L 479.5 575.5 L 455.5 575.5 Z M 606.5 574.5 L 629.5 574.5 L 629.5 575.5 L 606.5 575.5 Z M 1078.5 574.5 L 1102.5 574.5 L 1102.5 575.5 L 1078.5 575.5 Z M 307.5 574.5 L 330.5 574.5 L 330.5 575.5 L 307.5 575.5 Z M 1516.5 574.5 L 1539.5 574.5 L 1539.5 575.5 L 1516.5 575.5 Z M 960.5 574.5 L 983.5 574.5 L 983.5 575.5 L 960.5 575.5 Z M 723.5 574.5 L 747.5 574.5 L 747.5 575.5 L 723.5 575.5 Z M 1615.5 575.5 L 1638.5 575.5 L 1638.5 597.5 L 1615.5 597.5 Z M 842.5 575.5 L 866.5 575.5 L 866.5 597.5 L 842.5 597.5 Z M 455.5 575.5 L 479.5 575.5 L 479.5 597.5 L 455.5 597.5 Z M 1315.5 575.5 L 1338.5 575.5 L 1338.5 597.5 L 1315.5 597.5 Z M 1078.5 575.5 L 1102.5 575.5 L 1102.5 597.5 L 1078.5 597.5 Z M 307.5 575.5 L 330.5 575.5 L 330.5 597.5 L 307.5 597.5 Z M 356.5 575.5 L 380.5 575.5 L 380.5 597.5 L 356.5 597.5 Z M 723.5 575.5 L 747.5 575.5 L 747.5 597.5 L 723.5 597.5 Z M 1516.5 575.5 L 1539.5 575.5 L 1539.5 597.5 L 1516.5 597.5 Z M 1467.5 575.5 L 1490.5 575.5 L 1490.5 597.5 L 1467.5 597.5 Z M 406.5 575.5 L 429.5 575.5 L 429.5 597.5 L 406.5 597.5 Z M 1197.5 575.5 L 1220.5 575.5 L 1220.5 597.5 L 1197.5 597.5 Z M 606.5 575.5 L 629.5 575.5 L 629.5 597.5 L 606.5 597.5 Z M 1566.5 575.5 L 1589.5 575.5 L 1589.5 597.5 L 1566.5 597.5 Z M 960.5 575.5 L 983.5 575.5 L 983.5 597.5 L 960.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="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface269">
+<g id="surface297">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -140,6 +140,5 @@
 <path style=" 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.726562 485.679688 L 973.726562 492.5 L 971.511719 492.5 L 971.511719 485.679688 L 964.808594 475.117188 L 967.550781 475.117188 L 972.652344 483.582031 L 977.613281 475.117188 L 980.261719 475.117188 Z M 973.726562 485.679688 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 301 611 L 1641 611 M 301 579 L 1641 579 M 301 579 L 301 611 M 1641 579 L 1641 611 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 301 611 L 1641 611 M 301 579 L 1641 579 M 1641 611 L 1641 579 M 301 611 L 301 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 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/clkinv/sky130_fd_sc_lp__clkinv_2.svg b/cells/clkinv/sky130_fd_sc_lp__clkinv_2.svg
index 3471e77..f3b72e2 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_2.svg
+++ b/cells/clkinv/sky130_fd_sc_lp__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 539.5 L 701.5 539.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 1058.5 742.5 L 1093.5 742.5 L 1093.5 838.5 L 1058.5 838.5 Z M 960.5 742.5 L 994.5 742.5 L 994.5 838.5 L 960.5 838.5 Z M 960.5 742.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 1038.5 209.5 L 1072.5 209.5 L 1072.5 498.5 L 1038.5 498.5 Z M 840.5 209.5 L 875.5 209.5 L 875.5 498.5 L 840.5 498.5 Z M 939.5 209.5 L 973.5 209.5 L 973.5 498.5 L 939.5 498.5 Z M 939.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -146,6 +146,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1133.554688 627.246094 L 1133.554688 646.5 L 1127.292969 646.5 L 1127.292969 627.246094 L 1108.375 597.421875 L 1116.117188 597.421875 L 1130.523438 621.320312 L 1144.527344 597.421875 L 1152 597.421875 Z M 1133.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 1110 477 L 1149 477 M 1110 438 L 1149 438 M 1110 438 L 1110 477 M 1149 438 L 1149 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 1110 477 L 1149 477 M 1110 438 L 1149 438 M 1149 477 L 1149 438 M 1110 477 L 1110 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 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_lp__clkinv_4.svg b/cells/clkinv/sky130_fd_sc_lp__clkinv_4.svg
index d9bb115..8bcae17 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_4.svg
+++ b/cells/clkinv/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.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 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="#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 1102.5 742.5 L 1136.5 742.5 L 1136.5 838.5 L 1102.5 838.5 Z M 806.5 742.5 L 840.5 742.5 L 840.5 838.5 L 806.5 838.5 Z M 905.5 742.5 L 939.5 742.5 L 939.5 838.5 L 905.5 838.5 Z M 1003.5 742.5 L 1038.5 742.5 L 1038.5 838.5 L 1003.5 838.5 Z M 1003.5 742.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 1200.5 209.5 L 1235.5 209.5 L 1235.5 498.5 L 1200.5 498.5 Z M 708.5 209.5 L 742.5 209.5 L 742.5 498.5 L 708.5 498.5 Z M 806.5 209.5 L 840.5 209.5 L 840.5 498.5 L 806.5 498.5 Z M 905.5 209.5 L 939.5 209.5 L 939.5 498.5 L 905.5 498.5 Z M 1003.5 209.5 L 1038.5 209.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1102.5 209.5 L 1136.5 209.5 L 1136.5 498.5 L 1102.5 498.5 Z M 1102.5 209.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" 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 542.246094 L 1296.554688 561.5 L 1290.292969 561.5 L 1290.292969 542.246094 L 1271.375 512.421875 L 1279.117188 512.421875 L 1293.523438 536.320312 L 1307.527344 512.421875 L 1315 512.421875 Z M 1296.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 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/clkinv/sky130_fd_sc_lp__clkinv_8.svg b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.svg
index 52ae080..bfa4820 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_8.svg
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1294.5 742.5 L 1329.5 742.5 L 1329.5 838.5 L 1294.5 838.5 Z M 604.5 742.5 L 639.5 742.5 L 639.5 838.5 L 604.5 838.5 Z M 703.5 742.5 L 737.5 742.5 L 737.5 838.5 L 703.5 838.5 Z M 801.5 742.5 L 836.5 742.5 L 836.5 838.5 L 801.5 838.5 Z M 900.5 742.5 L 934.5 742.5 L 934.5 838.5 L 900.5 838.5 Z M 999.5 742.5 L 1033.5 742.5 L 1033.5 838.5 L 999.5 838.5 Z M 1097.5 742.5 L 1132.5 742.5 L 1132.5 838.5 L 1097.5 838.5 Z M 1196.5 742.5 L 1230.5 742.5 L 1230.5 838.5 L 1196.5 838.5 Z M 1196.5 742.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1491.5 209.5 L 1526.5 209.5 L 1526.5 498.5 L 1491.5 498.5 Z M 407.5 209.5 L 442.5 209.5 L 442.5 498.5 L 407.5 498.5 Z M 506.5 209.5 L 540.5 209.5 L 540.5 498.5 L 506.5 498.5 Z M 604.5 209.5 L 639.5 209.5 L 639.5 498.5 L 604.5 498.5 Z M 703.5 209.5 L 737.5 209.5 L 737.5 498.5 L 703.5 498.5 Z M 801.5 209.5 L 836.5 209.5 L 836.5 498.5 L 801.5 498.5 Z M 900.5 209.5 L 934.5 209.5 L 934.5 498.5 L 900.5 498.5 Z M 999.5 209.5 L 1033.5 209.5 L 1033.5 498.5 L 999.5 498.5 Z M 1097.5 209.5 L 1132.5 209.5 L 1132.5 498.5 L 1097.5 498.5 Z M 1196.5 209.5 L 1230.5 209.5 L 1230.5 498.5 L 1196.5 498.5 Z M 1294.5 209.5 L 1329.5 209.5 L 1329.5 498.5 L 1294.5 498.5 Z M 1393.5 209.5 L 1427.5 209.5 L 1427.5 498.5 L 1393.5 498.5 Z M 1393.5 209.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 915.410156 631.757812 L 896.492188 631.757812 L 891.308594 646.5 L 884.644531 646.5 L 902.148438 597.421875 L 910.226562 597.421875 L 927.460938 646.5 L 920.460938 646.5 Z M 913.660156 626.503906 L 906.121094 604.15625 L 898.042969 626.503906 Z M 913.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 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/clkinv/sky130_fd_sc_lp__clkinv_lp.svg b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.svg
index 033f78f..7fc1858 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.svg
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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="#image304"/>
+  <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 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="#image304"/>
+  <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 996.5 716.5 L 1031.5 716.5 L 1031.5 813.5 L 996.5 813.5 Z M 907.5 716.5 L 941.5 716.5 L 941.5 813.5 L 907.5 813.5 Z M 907.5 716.5 "/>
 </clipPath>
-<image id="image305" 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="#image305"/>
+  <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 996.5 235.5 L 1031.5 235.5 L 1031.5 382.5 L 996.5 382.5 Z M 907.5 235.5 L 941.5 235.5 L 941.5 382.5 L 907.5 382.5 Z M 907.5 235.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image307" 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="#image307"/>
+  <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="surface301">
+<g id="surface343">
 <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 1078.554688 288.246094 L 1078.554688 307.5 L 1072.292969 307.5 L 1072.292969 288.246094 L 1053.375 258.421875 L 1061.117188 258.421875 L 1075.523438 282.320312 L 1089.527344 258.421875 L 1097 258.421875 Z M 1078.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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1055 777 L 1055 816 M 1094 777 L 1094 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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1094 816 L 1094 777 M 1055 816 L 1055 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/clkinv/sky130_fd_sc_lp__clkinv_lp2.svg b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.svg
index 3d0e372..04b0c37 100644
--- a/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.svg
+++ b/cells/clkinv/sky130_fd_sc_lp__clkinv_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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="#image299"/>
+  <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 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="#image299"/>
+  <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 996.5 745.5 L 1031.5 745.5 L 1031.5 841.5 L 996.5 841.5 Z M 907.5 745.5 L 941.5 745.5 L 941.5 841.5 L 907.5 841.5 Z M 907.5 745.5 "/>
 </clipPath>
-<image id="image300" 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="#image300"/>
+  <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 973.5 235.5 L 1031.5 235.5 L 1031.5 464.5 L 973.5 464.5 Z M 973.5 235.5 "/>
 </clipPath>
-<image id="image301" 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="#image301"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image302" 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="#image302"/>
+  <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="surface296">
+<g id="surface340">
 <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 1078.554688 288.246094 L 1078.554688 307.5 L 1072.292969 307.5 L 1072.292969 288.246094 L 1053.375 258.421875 L 1061.117188 258.421875 L 1075.523438 282.320312 L 1089.527344 258.421875 L 1097 258.421875 Z M 1078.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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1055 777 L 1055 816 M 1094 777 L 1094 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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1094 816 L 1094 777 M 1055 816 L 1055 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/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.svg b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.svg
index 10de28d..1fd71f5 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.svg
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 537.5 L 175.5 537.5 Z M 175.5 229.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 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="#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 1506.5 664.5 L 1530.5 664.5 L 1530.5 755.5 L 1506.5 755.5 Z M 272.5 664.5 L 297.5 664.5 L 297.5 755.5 L 272.5 755.5 Z M 332.5 664.5 L 356.5 664.5 L 356.5 755.5 L 332.5 755.5 Z M 403.5 664.5 L 427.5 664.5 L 427.5 755.5 L 403.5 755.5 Z M 462.5 664.5 L 487.5 664.5 L 487.5 755.5 L 462.5 755.5 Z M 533.5 664.5 L 558.5 664.5 L 558.5 755.5 L 533.5 755.5 Z M 592.5 664.5 L 617.5 664.5 L 617.5 755.5 L 592.5 755.5 Z M 663.5 664.5 L 688.5 664.5 L 688.5 755.5 L 663.5 755.5 Z M 723.5 664.5 L 748.5 664.5 L 748.5 755.5 L 723.5 755.5 Z M 794.5 664.5 L 819.5 664.5 L 819.5 755.5 L 794.5 755.5 Z M 853.5 664.5 L 878.5 664.5 L 878.5 755.5 L 853.5 755.5 Z M 924.5 664.5 L 949.5 664.5 L 949.5 755.5 L 924.5 755.5 Z M 984.5 664.5 L 1009.5 664.5 L 1009.5 755.5 L 984.5 755.5 Z M 1055.5 664.5 L 1080.5 664.5 L 1080.5 755.5 L 1055.5 755.5 Z M 1114.5 664.5 L 1139.5 664.5 L 1139.5 755.5 L 1114.5 755.5 Z M 1185.5 664.5 L 1210.5 664.5 L 1210.5 755.5 L 1185.5 755.5 Z M 1245.5 664.5 L 1270.5 664.5 L 1270.5 755.5 L 1245.5 755.5 Z M 1316.5 664.5 L 1341.5 664.5 L 1341.5 755.5 L 1316.5 755.5 Z M 1375.5 664.5 L 1400.5 664.5 L 1400.5 755.5 L 1375.5 755.5 Z M 1446.5 664.5 L 1471.5 664.5 L 1471.5 755.5 L 1446.5 755.5 Z M 1446.5 664.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 1585.5 318.5 L 1626.5 318.5 L 1626.5 483.5 L 1585.5 483.5 Z M 272.5 318.5 L 313.5 318.5 L 313.5 483.5 L 272.5 483.5 Z M 360.5 318.5 L 401.5 318.5 L 401.5 483.5 L 360.5 483.5 Z M 447.5 318.5 L 488.5 318.5 L 488.5 483.5 L 447.5 483.5 Z M 535.5 318.5 L 576.5 318.5 L 576.5 483.5 L 535.5 483.5 Z M 622.5 318.5 L 663.5 318.5 L 663.5 483.5 L 622.5 483.5 Z M 710.5 318.5 L 751.5 318.5 L 751.5 483.5 L 710.5 483.5 Z M 797.5 318.5 L 839.5 318.5 L 839.5 483.5 L 797.5 483.5 Z M 885.5 318.5 L 926.5 318.5 L 926.5 483.5 L 885.5 483.5 Z M 972.5 318.5 L 1014.5 318.5 L 1014.5 483.5 L 972.5 483.5 Z M 1060.5 318.5 L 1101.5 318.5 L 1101.5 483.5 L 1060.5 483.5 Z M 1147.5 318.5 L 1189.5 318.5 L 1189.5 483.5 L 1147.5 483.5 Z M 1235.5 318.5 L 1276.5 318.5 L 1276.5 483.5 L 1235.5 483.5 Z M 1322.5 318.5 L 1364.5 318.5 L 1364.5 483.5 L 1322.5 483.5 Z M 1410.5 318.5 L 1451.5 318.5 L 1451.5 483.5 L 1410.5 483.5 Z M 1497.5 318.5 L 1539.5 318.5 L 1539.5 483.5 L 1497.5 483.5 Z M 1497.5 318.5 "/>
 </clipPath>
-<image id="image274" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image274"/>
+  <use xlink:href="#image302"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 311.5 460.5 L 339.5 460.5 L 339.5 473.5 L 311.5 473.5 Z M 1373.5 460.5 L 1401.5 460.5 L 1401.5 473.5 L 1373.5 473.5 Z M 848.5 460.5 L 876.5 460.5 L 876.5 473.5 L 848.5 473.5 Z M 673.5 460.5 L 701.5 460.5 L 701.5 473.5 L 673.5 473.5 Z M 1183.5 460.5 L 1211.5 460.5 L 1211.5 473.5 L 1183.5 473.5 Z M 1024.5 460.5 L 1052.5 460.5 L 1052.5 473.5 L 1024.5 473.5 Z M 1548.5 460.5 L 1576.5 460.5 L 1576.5 473.5 L 1548.5 473.5 Z M 498.5 460.5 L 526.5 460.5 L 526.5 473.5 L 498.5 473.5 Z M 1183.5 473.5 L 1211.5 473.5 L 1211.5 488.5 L 1183.5 488.5 Z M 1548.5 473.5 L 1576.5 473.5 L 1576.5 488.5 L 1548.5 488.5 Z M 1024.5 473.5 L 1052.5 473.5 L 1052.5 488.5 L 1024.5 488.5 Z M 498.5 473.5 L 526.5 473.5 L 526.5 488.5 L 498.5 488.5 Z M 848.5 473.5 L 876.5 473.5 L 876.5 488.5 L 848.5 488.5 Z M 311.5 473.5 L 339.5 473.5 L 339.5 488.5 L 311.5 488.5 Z M 1373.5 473.5 L 1401.5 473.5 L 1401.5 488.5 L 1373.5 488.5 Z M 673.5 473.5 L 701.5 473.5 L 701.5 488.5 L 673.5 488.5 Z M 232.5 582.5 L 260.5 582.5 L 260.5 591.5 L 232.5 591.5 Z M 1262.5 582.5 L 1290.5 582.5 L 1290.5 593.5 L 1262.5 593.5 Z M 390.5 582.5 L 418.5 582.5 L 418.5 593.5 L 390.5 593.5 Z M 549.5 582.5 L 577.5 582.5 L 577.5 593.5 L 549.5 593.5 Z M 1579.5 582.5 L 1607.5 582.5 L 1607.5 593.5 L 1579.5 593.5 Z M 469.5 582.5 L 498.5 582.5 L 498.5 593.5 L 469.5 593.5 Z M 1500.5 582.5 L 1528.5 582.5 L 1528.5 593.5 L 1500.5 593.5 Z M 787.5 582.5 L 815.5 582.5 L 815.5 593.5 L 787.5 593.5 Z M 469.5 593.5 L 498.5 593.5 L 498.5 610.5 L 469.5 610.5 Z M 1500.5 593.5 L 1528.5 593.5 L 1528.5 610.5 L 1500.5 610.5 Z M 1579.5 593.5 L 1607.5 593.5 L 1607.5 610.5 L 1579.5 610.5 Z M 232.5 591.5 L 260.5 591.5 L 260.5 610.5 L 232.5 610.5 Z M 1024.5 582.5 L 1052.5 582.5 L 1052.5 610.5 L 1024.5 610.5 Z M 787.5 593.5 L 815.5 593.5 L 815.5 610.5 L 787.5 610.5 Z M 549.5 593.5 L 577.5 593.5 L 577.5 610.5 L 549.5 610.5 Z M 390.5 593.5 L 418.5 593.5 L 418.5 610.5 L 390.5 610.5 Z M 1262.5 593.5 L 1290.5 593.5 L 1290.5 610.5 L 1262.5 610.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="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface269">
+<g id="surface297">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -140,6 +140,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1003.097656 808.371094 L 1003.097656 772.585938 L 1016.890625 772.585938 L 1019.050781 772.734375 L 1021.0625 773.125 L 1022.929688 773.8125 L 1024.644531 774.695312 L 1026.167969 775.921875 L 1027.589844 777.347656 L 1028.769531 779.066406 L 1029.75 780.929688 L 1030.488281 783.042969 L 1031.027344 785.300781 L 1031.320312 787.804688 L 1031.46875 790.453125 L 1031.320312 793.25 L 1030.976562 795.851562 L 1030.390625 798.210938 L 1029.605469 800.371094 L 1028.574219 802.285156 L 1027.296875 803.953125 L 1025.921875 805.328125 L 1024.402344 806.40625 L 1022.730469 807.292969 L 1020.914062 807.878906 L 1018.953125 808.273438 L 1016.890625 808.371094 Z M 1007.660156 804.347656 L 1016.105469 804.347656 L 1018.363281 804.199219 L 1020.375 803.660156 L 1022.140625 802.726562 L 1023.613281 801.5 L 1024.792969 799.828125 L 1025.773438 797.816406 L 1026.070312 796.785156 L 1026.363281 795.707031 L 1026.609375 794.527344 L 1026.757812 793.25 L 1026.855469 791.925781 L 1026.902344 790.503906 L 1026.707031 787.3125 L 1026.214844 784.515625 L 1025.332031 782.109375 L 1024.15625 780.195312 L 1022.632812 778.625 L 1020.769531 777.496094 L 1020.082031 777.25 L 1019.34375 777.003906 L 1017.773438 776.707031 L 1016.9375 776.660156 L 1016.105469 776.609375 L 1007.660156 776.609375 Z M 1007.660156 804.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 206 309 L 1712 309 M 206 269 L 1712 269 M 206 269 L 206 309 M 1712 269 L 1712 309 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 309 L 1712 309 M 206 269 L 1712 269 M 1712 309 L 1712 269 M 206 309 L 206 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 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/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.svg b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.svg
index 6fce475..0a2ce5a 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.svg
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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="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 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="#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 1011.5 715.5 L 1046.5 715.5 L 1046.5 841.5 L 1011.5 841.5 Z M 922.5 715.5 L 956.5 715.5 L 956.5 841.5 L 922.5 841.5 Z M 922.5 715.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 1027.5 235.5 L 1085.5 235.5 L 1085.5 464.5 L 1027.5 464.5 Z M 906.5 235.5 L 963.5 235.5 L 963.5 464.5 L 906.5 464.5 Z M 906.5 235.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1023.554688 288.246094 L 1023.554688 307.5 L 1017.292969 307.5 L 1017.292969 288.246094 L 998.375 258.421875 L 1006.117188 258.421875 L 1020.523438 282.320312 L 1034.527344 258.421875 L 1042 258.421875 Z M 1023.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 1000 816 L 1039 816 M 1000 777 L 1039 777 M 1000 777 L 1000 816 M 1039 777 L 1039 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 1000 816 L 1039 816 M 1000 777 L 1039 777 M 1039 816 L 1039 777 M 1000 816 L 1000 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/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.svg b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.svg
index 8b918ab..de57c51 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.svg
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 988.5 715.5 L 1023.5 715.5 L 1023.5 841.5 L 988.5 841.5 Z M 725.5 715.5 L 759.5 715.5 L 759.5 841.5 L 725.5 841.5 Z M 807.5 715.5 L 842.5 715.5 L 842.5 841.5 L 807.5 841.5 Z M 906.5 715.5 L 940.5 715.5 L 940.5 841.5 L 906.5 841.5 Z M 906.5 715.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 1089.5 235.5 L 1146.5 235.5 L 1146.5 464.5 L 1089.5 464.5 Z M 725.5 235.5 L 782.5 235.5 L 782.5 464.5 L 725.5 464.5 Z M 846.5 235.5 L 903.5 235.5 L 903.5 464.5 L 846.5 464.5 Z M 968.5 235.5 L 1025.5 235.5 L 1025.5 464.5 L 968.5 464.5 Z M 968.5 235.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" 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.554688 288.246094 L 802.554688 307.5 L 796.292969 307.5 L 796.292969 288.246094 L 777.375 258.421875 L 785.117188 258.421875 L 799.523438 282.320312 L 813.527344 258.421875 L 821 258.421875 Z M 802.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 779 816 L 818 816 M 779 777 L 818 777 M 779 777 L 779 816 M 818 777 L 818 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 779 816 L 818 816 M 779 777 L 818 777 M 818 816 L 818 777 M 779 816 L 779 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/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.svg b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.svg
index 98c470f..f7fa53f 100644
--- a/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.svg
+++ b/cells/clkinvlp/sky130_fd_sc_lp__clkinvlp_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.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 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="#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 1128.5 715.5 L 1162.5 715.5 L 1162.5 841.5 L 1128.5 841.5 Z M 502.5 715.5 L 537.5 715.5 L 537.5 841.5 L 502.5 841.5 Z M 585.5 715.5 L 619.5 715.5 L 619.5 841.5 L 585.5 841.5 Z M 683.5 715.5 L 718.5 715.5 L 718.5 841.5 L 683.5 841.5 Z M 766.5 715.5 L 800.5 715.5 L 800.5 841.5 L 766.5 841.5 Z M 865.5 715.5 L 899.5 715.5 L 899.5 841.5 L 865.5 841.5 Z M 947.5 715.5 L 981.5 715.5 L 981.5 841.5 L 947.5 841.5 Z M 1046.5 715.5 L 1080.5 715.5 L 1080.5 841.5 L 1046.5 841.5 Z M 1046.5 715.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 1353.5 235.5 L 1410.5 235.5 L 1410.5 464.5 L 1353.5 464.5 Z M 502.5 235.5 L 560.5 235.5 L 560.5 464.5 L 502.5 464.5 Z M 624.5 235.5 L 681.5 235.5 L 681.5 464.5 L 624.5 464.5 Z M 745.5 235.5 L 803.5 235.5 L 803.5 464.5 L 745.5 464.5 Z M 867.5 235.5 L 924.5 235.5 L 924.5 464.5 L 867.5 464.5 Z M 988.5 235.5 L 1046.5 235.5 L 1046.5 464.5 L 988.5 464.5 Z M 1110.5 235.5 L 1167.5 235.5 L 1167.5 464.5 L 1110.5 464.5 Z M 1231.5 235.5 L 1289.5 235.5 L 1289.5 464.5 L 1231.5 464.5 Z M 1231.5 235.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image293"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface287">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" 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/conb/sky130_fd_sc_lp__conb_0.svg b/cells/conb/sky130_fd_sc_lp__conb_0.svg
index a523d71..3206f56 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_0.svg
+++ b/cells/conb/sky130_fd_sc_lp__conb_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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 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="#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 1003.5 742.5 L 1038.5 742.5 L 1038.5 838.5 L 1003.5 838.5 Z M 905.5 742.5 L 939.5 742.5 L 939.5 838.5 L 905.5 838.5 Z M 905.5 742.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 1003.5 242.5 L 1038.5 242.5 L 1038.5 389.5 L 1003.5 389.5 Z M 905.5 242.5 L 939.5 242.5 L 939.5 389.5 L 905.5 389.5 Z M 905.5 242.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 996.097656 427.421875 L 996.097656 476.5 L 989.769531 476.5 L 989.769531 427.421875 Z M 996.097656 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 945 647 L 984 647 M 945 608 L 984 608 M 945 608 L 945 647 M 984 608 L 984 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 945 647 L 984 647 M 945 608 L 984 608 M 984 647 L 984 608 M 945 647 L 945 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/conb/sky130_fd_sc_lp__conb_1.svg b/cells/conb/sky130_fd_sc_lp__conb_1.svg
index 9b1ed6a..97dbdc9 100644
--- a/cells/conb/sky130_fd_sc_lp__conb_1.svg
+++ b/cells/conb/sky130_fd_sc_lp__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 539.5 L 756.5 539.5 Z M 756.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="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 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="#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 1003.5 742.5 L 1038.5 742.5 L 1038.5 838.5 L 1003.5 838.5 Z M 905.5 742.5 L 939.5 742.5 L 939.5 838.5 L 905.5 838.5 Z M 905.5 742.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 1003.5 242.5 L 1038.5 242.5 L 1038.5 389.5 L 1003.5 389.5 Z M 905.5 242.5 L 939.5 242.5 L 939.5 389.5 L 905.5 389.5 Z M 905.5 242.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 996.097656 427.421875 L 996.097656 476.5 L 989.769531 476.5 L 989.769531 427.421875 Z M 996.097656 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 945 647 L 984 647 M 945 608 L 984 608 M 945 608 L 945 647 M 984 608 L 984 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 945 647 L 984 647 M 945 608 L 984 608 M 984 647 L 984 608 M 945 647 L 945 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/decap/sky130_fd_sc_lp__decap_12.svg b/cells/decap/sky130_fd_sc_lp__decap_12.svg
index 678c8a9..3699285 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_12.svg
+++ b/cells/decap/sky130_fd_sc_lp__decap_12.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 256.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 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="#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 518.5 635.5 L 1435.5 635.5 L 1435.5 864.5 L 518.5 864.5 Z M 518.5 635.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 504.5 209.5 L 1420.5 209.5 L 1420.5 438.5 L 504.5 438.5 Z M 504.5 209.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image268" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image268"/>
+  <use xlink:href="#image296"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface262">
+<g id="surface290">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -134,6 +134,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1050.738281 183.265625 L 1052.289062 184.140625 L 1053.703125 185.082031 L 1054.914062 186.160156 L 1055.855469 187.4375 L 1056.53125 188.785156 L 1057.066406 190.265625 L 1057.203125 191.074219 L 1057.335938 191.949219 L 1057.40625 192.957031 L 1057.472656 194.101562 L 1057.472656 196.796875 L 1057.40625 198.210938 L 1057.472656 199.421875 L 1057.539062 200.5 L 1057.675781 201.441406 L 1057.808594 202.25 L 1058.078125 202.921875 L 1058.28125 203.59375 L 1058.953125 204.671875 L 1059.355469 205.144531 L 1059.828125 205.613281 L 1060.367188 205.953125 L 1060.367188 207.5 L 1052.757812 207.5 L 1052.355469 206.421875 L 1052.019531 205.277344 L 1051.75 203.933594 L 1051.546875 202.585938 L 1051.414062 201.105469 L 1051.414062 195.113281 L 1051.277344 193.160156 L 1050.941406 191.410156 L 1050.402344 189.929688 L 1049.59375 188.71875 L 1048.585938 187.773438 L 1047.375 187.035156 L 1046.769531 186.832031 L 1046.160156 186.699219 L 1045.488281 186.5625 L 1044.816406 186.496094 L 1044.074219 186.429688 L 1043.335938 186.359375 L 1027.175781 186.359375 L 1027.175781 207.5 L 1020.917969 207.5 L 1020.917969 158.421875 L 1043.535156 158.421875 L 1046.566406 158.625 L 1049.324219 159.097656 L 1051.683594 159.972656 L 1053.703125 161.117188 L 1055.386719 162.597656 L 1056.730469 164.414062 L 1057.675781 166.570312 L 1058.011719 167.714844 L 1058.28125 168.925781 L 1058.414062 170.203125 L 1058.480469 171.550781 L 1058.347656 173.367188 L 1058.078125 175.050781 L 1057.605469 176.597656 L 1056.933594 178.011719 L 1056.125 179.292969 L 1055.117188 180.371094 L 1054.511719 180.90625 L 1053.835938 181.445312 L 1053.164062 181.917969 L 1052.421875 182.390625 L 1051.613281 182.859375 Z M 1051.953125 172.425781 L 1051.75 170.40625 L 1051.347656 168.65625 L 1050.539062 167.175781 L 1049.527344 165.960938 L 1048.113281 165.085938 L 1046.5 164.414062 L 1045.894531 164.28125 L 1045.21875 164.144531 L 1044.546875 164.078125 L 1043.804688 164.011719 L 1043.066406 164.011719 L 1042.324219 163.941406 L 1027.175781 163.941406 L 1027.175781 180.839844 L 1042.324219 180.839844 L 1044.546875 180.773438 L 1046.5 180.371094 L 1048.113281 179.765625 L 1049.460938 178.886719 L 1050.539062 177.8125 L 1051.277344 176.464844 L 1051.480469 175.925781 L 1051.613281 175.253906 L 1051.75 174.648438 L 1051.816406 173.90625 L 1051.882812 173.234375 Z M 1051.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 300 924 L 1620 924 M 300 868 L 1620 868 M 300 868 L 300 924 M 1620 868 L 1620 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 300 924 L 1620 924 M 300 868 L 1620 868 M 1620 924 L 1620 868 M 300 924 L 300 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 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/decap/sky130_fd_sc_lp__decap_3.svg b/cells/decap/sky130_fd_sc_lp__decap_3.svg
index 375c333..d696803 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_3.svg
+++ b/cells/decap/sky130_fd_sc_lp__decap_3.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.5 111.5 "/>
 </clipPath>
-<image id="image264" 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="#image264"/>
+  <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="#image264"/>
+  <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 908.5 738.5 L 1023.5 738.5 L 1023.5 864.5 L 908.5 864.5 Z M 908.5 738.5 "/>
 </clipPath>
-<image id="image265" 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="#image265"/>
+  <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 893.5 209.5 L 1008.5 209.5 L 1008.5 438.5 L 893.5 438.5 Z M 893.5 209.5 "/>
 </clipPath>
-<image id="image266" 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="#image266"/>
+  <use xlink:href="#image307"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image267" 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="#image267"/>
+  <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="surface261">
+<g id="surface302">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -134,6 +134,5 @@
 <path style=" 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 799 924 L 1129 924 M 799 868 L 1129 868 M 799 868 L 799 924 M 1129 868 L 1129 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 799 924 L 1129 924 M 799 868 L 1129 868 M 1129 924 L 1129 868 M 799 924 L 799 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 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_lp__decap_4.svg b/cells/decap/sky130_fd_sc_lp__decap_4.svg
index 2db5d80..6cb3141 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_4.svg
+++ b/cells/decap/sky130_fd_sc_lp__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 539.5 L 701.5 539.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 635.5 L 1082.5 635.5 L 1082.5 864.5 L 853.5 864.5 Z M 853.5 635.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 209.5 L 1067.5 209.5 L 1067.5 438.5 L 838.5 438.5 Z M 838.5 209.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -134,6 +134,5 @@
 <path style=" 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_lp__decap_6.svg b/cells/decap/sky130_fd_sc_lp__decap_6.svg
index 5ebeca5..6242b4a 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_6.svg
+++ b/cells/decap/sky130_fd_sc_lp__decap_6.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 742.5 635.5 L 1200.5 635.5 L 1200.5 864.5 L 742.5 864.5 Z M 742.5 635.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 727.5 209.5 L 1185.5 209.5 L 1185.5 438.5 L 727.5 438.5 Z M 727.5 209.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image268" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image268"/>
+  <use xlink:href="#image296"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface262">
+<g id="surface290">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -134,6 +134,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1054.738281 183.265625 L 1056.289062 184.140625 L 1057.703125 185.082031 L 1058.914062 186.160156 L 1059.855469 187.4375 L 1060.53125 188.785156 L 1061.066406 190.265625 L 1061.203125 191.074219 L 1061.335938 191.949219 L 1061.40625 192.957031 L 1061.472656 194.101562 L 1061.472656 196.796875 L 1061.40625 198.210938 L 1061.472656 199.421875 L 1061.539062 200.5 L 1061.675781 201.441406 L 1061.808594 202.25 L 1062.078125 202.921875 L 1062.28125 203.59375 L 1062.953125 204.671875 L 1063.355469 205.144531 L 1063.828125 205.613281 L 1064.367188 205.953125 L 1064.367188 207.5 L 1056.757812 207.5 L 1056.355469 206.421875 L 1056.019531 205.277344 L 1055.75 203.933594 L 1055.546875 202.585938 L 1055.414062 201.105469 L 1055.414062 195.113281 L 1055.277344 193.160156 L 1054.941406 191.410156 L 1054.402344 189.929688 L 1053.59375 188.71875 L 1052.585938 187.773438 L 1051.375 187.035156 L 1050.769531 186.832031 L 1050.160156 186.699219 L 1049.488281 186.5625 L 1048.816406 186.496094 L 1048.074219 186.429688 L 1047.335938 186.359375 L 1031.175781 186.359375 L 1031.175781 207.5 L 1024.917969 207.5 L 1024.917969 158.421875 L 1047.535156 158.421875 L 1050.566406 158.625 L 1053.324219 159.097656 L 1055.683594 159.972656 L 1057.703125 161.117188 L 1059.386719 162.597656 L 1060.730469 164.414062 L 1061.675781 166.570312 L 1062.011719 167.714844 L 1062.28125 168.925781 L 1062.414062 170.203125 L 1062.480469 171.550781 L 1062.347656 173.367188 L 1062.078125 175.050781 L 1061.605469 176.597656 L 1060.933594 178.011719 L 1060.125 179.292969 L 1059.117188 180.371094 L 1058.511719 180.90625 L 1057.835938 181.445312 L 1057.164062 181.917969 L 1056.421875 182.390625 L 1055.613281 182.859375 Z M 1055.953125 172.425781 L 1055.75 170.40625 L 1055.347656 168.65625 L 1054.539062 167.175781 L 1053.527344 165.960938 L 1052.113281 165.085938 L 1050.5 164.414062 L 1049.894531 164.28125 L 1049.21875 164.144531 L 1048.546875 164.078125 L 1047.804688 164.011719 L 1047.066406 164.011719 L 1046.324219 163.941406 L 1031.175781 163.941406 L 1031.175781 180.839844 L 1046.324219 180.839844 L 1048.546875 180.773438 L 1050.5 180.371094 L 1052.113281 179.765625 L 1053.460938 178.886719 L 1054.539062 177.8125 L 1055.277344 176.464844 L 1055.480469 175.925781 L 1055.613281 175.253906 L 1055.75 174.648438 L 1055.816406 173.90625 L 1055.882812 173.234375 Z M 1055.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 633 924 L 1293 924 M 633 868 L 1293 868 M 633 868 L 633 924 M 1293 868 L 1293 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 633 924 L 1293 924 M 633 868 L 1293 868 M 1293 924 L 1293 868 M 633 924 L 633 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 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/decap/sky130_fd_sc_lp__decap_8.svg b/cells/decap/sky130_fd_sc_lp__decap_8.svg
index ed42c03..b68060f 100644
--- a/cells/decap/sky130_fd_sc_lp__decap_8.svg
+++ b/cells/decap/sky130_fd_sc_lp__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 539.5 L 478.5 539.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 741.5 635.5 L 1199.5 635.5 L 1199.5 864.5 L 741.5 864.5 Z M 741.5 635.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 726.5 209.5 L 1184.5 209.5 L 1184.5 438.5 L 726.5 438.5 Z M 726.5 209.5 "/>
 </clipPath>
-<image id="image267" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image267"/>
+  <use xlink:href="#image295"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -134,6 +134,5 @@
 <path style=" 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/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.svg b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.svg
index 0eaca3f..2100d3e 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.svg
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_12.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.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 518.5 635.5 L 1435.5 635.5 L 1435.5 864.5 L 518.5 864.5 Z M 518.5 635.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 504.5 209.5 L 1420.5 209.5 L 1420.5 438.5 L 504.5 438.5 Z M 504.5 209.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1429.5 255.5 L 1468.5 255.5 L 1468.5 257.5 L 1429.5 257.5 Z M 431.5 255.5 L 470.5 255.5 L 470.5 262.5 L 431.5 262.5 Z M 1347.5 255.5 L 1386.5 255.5 L 1386.5 294.5 L 1347.5 294.5 Z M 1264.5 255.5 L 1303.5 255.5 L 1303.5 294.5 L 1264.5 294.5 Z M 1182.5 255.5 L 1221.5 255.5 L 1221.5 294.5 L 1182.5 294.5 Z M 1091.5 255.5 L 1130.5 255.5 L 1130.5 294.5 L 1091.5 294.5 Z M 1009.5 255.5 L 1048.5 255.5 L 1048.5 294.5 L 1009.5 294.5 Z M 926.5 255.5 L 965.5 255.5 L 965.5 294.5 L 926.5 294.5 Z M 844.5 255.5 L 883.5 255.5 L 883.5 294.5 L 844.5 294.5 Z M 1429.5 257.5 L 1468.5 257.5 L 1468.5 294.5 L 1429.5 294.5 Z M 679.5 255.5 L 718.5 255.5 L 718.5 294.5 L 679.5 294.5 Z M 596.5 255.5 L 635.5 255.5 L 635.5 294.5 L 596.5 294.5 Z M 514.5 255.5 L 553.5 255.5 L 553.5 294.5 L 514.5 294.5 Z M 431.5 262.5 L 470.5 262.5 L 470.5 294.5 L 431.5 294.5 Z M 761.5 255.5 L 800.5 255.5 L 800.5 294.5 L 761.5 294.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>
@@ -141,6 +141,5 @@
 <path style=" 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.042969 274.363281 L 1026.949219 274.875 L 1027.773438 275.421875 L 1028.480469 276.050781 L 1029.027344 276.796875 L 1029.421875 277.582031 L 1029.734375 278.445312 L 1029.8125 278.917969 L 1029.894531 279.429688 L 1029.933594 280.015625 L 1029.972656 280.683594 L 1029.972656 282.257812 L 1029.933594 283.082031 L 1029.972656 283.789062 L 1030.011719 284.414062 L 1030.089844 284.964844 L 1030.167969 285.4375 L 1030.324219 285.828125 L 1030.441406 286.222656 L 1030.640625 286.535156 L 1030.835938 286.851562 L 1031.070312 287.125 L 1031.347656 287.402344 L 1031.660156 287.597656 L 1031.660156 288.5 L 1027.222656 288.5 L 1026.988281 287.871094 L 1026.789062 287.203125 L 1026.632812 286.417969 L 1026.515625 285.632812 L 1026.4375 284.769531 L 1026.4375 281.273438 L 1026.359375 280.136719 L 1026.160156 279.113281 L 1025.847656 278.25 L 1025.375 277.542969 L 1024.789062 276.992188 L 1024.082031 276.5625 L 1023.726562 276.445312 L 1023.375 276.367188 L 1022.980469 276.285156 L 1022.589844 276.246094 L 1021.722656 276.167969 L 1012.300781 276.167969 L 1012.300781 288.5 L 1008.648438 288.5 L 1008.648438 259.871094 L 1021.84375 259.871094 L 1023.609375 259.988281 L 1025.21875 260.265625 L 1026.59375 260.773438 L 1027.773438 261.441406 L 1028.753906 262.304688 L 1029.539062 263.367188 L 1029.8125 263.996094 L 1030.089844 264.625 L 1030.285156 265.292969 L 1030.441406 265.996094 L 1030.519531 266.742188 L 1030.558594 267.53125 L 1030.480469 268.589844 L 1030.324219 269.570312 L 1030.050781 270.476562 L 1029.65625 271.300781 L 1029.1875 272.046875 L 1028.597656 272.675781 L 1028.242188 272.988281 L 1027.851562 273.300781 L 1027.457031 273.578125 L 1027.027344 273.851562 L 1026.554688 274.125 Z M 1026.75 268.039062 L 1026.632812 266.863281 L 1026.398438 265.839844 L 1025.925781 264.976562 L 1025.335938 264.269531 L 1024.511719 263.757812 L 1023.570312 263.367188 L 1023.214844 263.289062 L 1022.824219 263.210938 L 1022.429688 263.171875 L 1022 263.132812 L 1021.566406 263.132812 L 1021.136719 263.09375 L 1012.300781 263.09375 L 1012.300781 272.949219 L 1021.136719 272.949219 L 1022.429688 272.910156 L 1023.570312 272.675781 L 1024.511719 272.320312 L 1025.296875 271.808594 L 1025.925781 271.179688 L 1026.359375 270.394531 L 1026.476562 270.082031 L 1026.554688 269.6875 L 1026.632812 269.335938 L 1026.671875 268.902344 L 1026.710938 268.511719 Z M 1026.75 268.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 316 836 L 1604 836 M 316 774 L 1604 774 M 316 774 L 316 836 M 1604 774 L 1604 836 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 316 836 L 1604 836 M 316 774 L 1604 774 M 1604 836 L 1604 774 M 316 836 L 316 774 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.svg b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.svg
index e0403fb..e745f80 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.svg
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_3.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.5 111.5 "/>
 </clipPath>
-<image id="image281" 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="#image281"/>
+  <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 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="#image281"/>
+  <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 908.5 738.5 L 1023.5 738.5 L 1023.5 864.5 L 908.5 864.5 Z M 908.5 738.5 "/>
 </clipPath>
-<image id="image282" 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="#image282"/>
+  <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 893.5 209.5 L 1008.5 209.5 L 1008.5 438.5 L 893.5 438.5 Z M 893.5 209.5 "/>
 </clipPath>
-<image id="image283" 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="#image283"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1039.5 255.5 L 1078.5 255.5 L 1078.5 257.5 L 1039.5 257.5 Z M 829.5 255.5 L 868.5 255.5 L 868.5 262.5 L 829.5 262.5 Z M 932.5 255.5 L 971.5 255.5 L 971.5 294.5 L 932.5 294.5 Z M 829.5 262.5 L 868.5 262.5 L 868.5 294.5 L 829.5 294.5 Z M 1039.5 257.5 L 1078.5 257.5 L 1078.5 294.5 L 1039.5 294.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="image284" 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="#image284"/>
+  <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="surface278">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -141,6 +141,5 @@
 <path style=" 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 799 924 L 1129 924 M 799 868 L 1129 868 M 799 868 L 799 924 M 1129 868 L 1129 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 799 924 L 1129 924 M 799 868 L 1129 868 M 1129 924 L 1129 868 M 799 924 L 799 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 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/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.svg b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.svg
index cf7993b..5071e44 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.svg
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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 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="#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 853.5 635.5 L 1082.5 635.5 L 1082.5 864.5 L 853.5 864.5 Z M 853.5 635.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 838.5 209.5 L 1067.5 209.5 L 1067.5 438.5 L 838.5 438.5 Z M 838.5 209.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1115.5 255.5 L 1154.5 255.5 L 1154.5 257.5 L 1115.5 257.5 Z M 774.5 255.5 L 813.5 255.5 L 813.5 262.5 L 774.5 262.5 Z M 1022.5 255.5 L 1060.5 255.5 L 1060.5 294.5 L 1022.5 294.5 Z M 939.5 255.5 L 978.5 255.5 L 978.5 294.5 L 939.5 294.5 Z M 856.5 255.5 L 895.5 255.5 L 895.5 294.5 L 856.5 294.5 Z M 774.5 262.5 L 813.5 262.5 L 813.5 294.5 L 774.5 294.5 Z M 1115.5 257.5 L 1154.5 257.5 L 1154.5 294.5 L 1115.5 294.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="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>
@@ -141,6 +141,5 @@
 <path style=" 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/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.svg b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.svg
index 1063463..ef207c6 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.svg
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_6.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 742.5 635.5 L 1200.5 635.5 L 1200.5 864.5 L 742.5 864.5 Z M 742.5 635.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 727.5 209.5 L 1185.5 209.5 L 1185.5 438.5 L 727.5 438.5 Z M 727.5 209.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1224.5 255.5 L 1263.5 255.5 L 1263.5 257.5 L 1224.5 257.5 Z M 663.5 255.5 L 702.5 255.5 L 702.5 262.5 L 663.5 262.5 Z M 1119.5 255.5 L 1158.5 255.5 L 1158.5 294.5 L 1119.5 294.5 Z M 1028.5 255.5 L 1067.5 255.5 L 1067.5 294.5 L 1028.5 294.5 Z M 936.5 255.5 L 975.5 255.5 L 975.5 294.5 L 936.5 294.5 Z M 839.5 255.5 L 878.5 255.5 L 878.5 294.5 L 839.5 294.5 Z M 1224.5 257.5 L 1263.5 257.5 L 1263.5 294.5 L 1224.5 294.5 Z M 663.5 262.5 L 702.5 262.5 L 702.5 294.5 L 663.5 294.5 Z M 746.5 255.5 L 785.5 255.5 L 785.5 294.5 L 746.5 294.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="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>
@@ -141,6 +141,5 @@
 <path style=" 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.042969 274.363281 L 1029.949219 274.875 L 1030.773438 275.421875 L 1031.480469 276.050781 L 1032.027344 276.796875 L 1032.421875 277.582031 L 1032.734375 278.445312 L 1032.8125 278.917969 L 1032.894531 279.429688 L 1032.933594 280.015625 L 1032.972656 280.683594 L 1032.972656 282.257812 L 1032.933594 283.082031 L 1032.972656 283.789062 L 1033.011719 284.414062 L 1033.089844 284.964844 L 1033.167969 285.4375 L 1033.324219 285.828125 L 1033.441406 286.222656 L 1033.640625 286.535156 L 1033.835938 286.851562 L 1034.070312 287.125 L 1034.347656 287.402344 L 1034.660156 287.597656 L 1034.660156 288.5 L 1030.222656 288.5 L 1029.988281 287.871094 L 1029.789062 287.203125 L 1029.632812 286.417969 L 1029.515625 285.632812 L 1029.4375 284.769531 L 1029.4375 281.273438 L 1029.359375 280.136719 L 1029.160156 279.113281 L 1028.847656 278.25 L 1028.375 277.542969 L 1027.789062 276.992188 L 1027.082031 276.5625 L 1026.726562 276.445312 L 1026.375 276.367188 L 1025.980469 276.285156 L 1025.589844 276.246094 L 1024.722656 276.167969 L 1015.300781 276.167969 L 1015.300781 288.5 L 1011.648438 288.5 L 1011.648438 259.871094 L 1024.84375 259.871094 L 1026.609375 259.988281 L 1028.21875 260.265625 L 1029.59375 260.773438 L 1030.773438 261.441406 L 1031.753906 262.304688 L 1032.539062 263.367188 L 1032.8125 263.996094 L 1033.089844 264.625 L 1033.285156 265.292969 L 1033.441406 265.996094 L 1033.519531 266.742188 L 1033.558594 267.53125 L 1033.480469 268.589844 L 1033.324219 269.570312 L 1033.050781 270.476562 L 1032.65625 271.300781 L 1032.1875 272.046875 L 1031.597656 272.675781 L 1031.242188 272.988281 L 1030.851562 273.300781 L 1030.457031 273.578125 L 1030.027344 273.851562 L 1029.554688 274.125 Z M 1029.75 268.039062 L 1029.632812 266.863281 L 1029.398438 265.839844 L 1028.925781 264.976562 L 1028.335938 264.269531 L 1027.511719 263.757812 L 1026.570312 263.367188 L 1026.214844 263.289062 L 1025.824219 263.210938 L 1025.429688 263.171875 L 1025 263.132812 L 1024.566406 263.132812 L 1024.136719 263.09375 L 1015.300781 263.09375 L 1015.300781 272.949219 L 1024.136719 272.949219 L 1025.429688 272.910156 L 1026.570312 272.675781 L 1027.511719 272.320312 L 1028.296875 271.808594 L 1028.925781 271.179688 L 1029.359375 270.394531 L 1029.476562 270.082031 L 1029.554688 269.6875 L 1029.632812 269.335938 L 1029.671875 268.902344 L 1029.710938 268.511719 Z M 1029.75 268.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 649 836 L 1277 836 M 649 774 L 1277 774 M 649 774 L 649 836 M 1277 774 L 1277 836 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 649 836 L 1277 836 M 649 774 L 1277 774 M 1277 836 L 1277 774 M 649 836 L 649 774 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.svg b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.svg
index cdc4529..090ed50 100644
--- a/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.svg
+++ b/cells/decapkapwr/sky130_fd_sc_lp__decapkapwr_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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="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 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="#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 741.5 635.5 L 1199.5 635.5 L 1199.5 864.5 L 741.5 864.5 Z M 741.5 635.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 726.5 209.5 L 1184.5 209.5 L 1184.5 438.5 L 726.5 438.5 Z M 726.5 209.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1215.5 255.5 L 1254.5 255.5 L 1254.5 257.5 L 1215.5 257.5 Z M 654.5 255.5 L 693.5 255.5 L 693.5 262.5 L 654.5 262.5 Z M 1110.5 255.5 L 1149.5 255.5 L 1149.5 294.5 L 1110.5 294.5 Z M 1019.5 255.5 L 1058.5 255.5 L 1058.5 294.5 L 1019.5 294.5 Z M 926.5 255.5 L 965.5 255.5 L 965.5 294.5 L 926.5 294.5 Z M 830.5 255.5 L 869.5 255.5 L 869.5 294.5 L 830.5 294.5 Z M 1215.5 257.5 L 1254.5 257.5 L 1254.5 294.5 L 1215.5 294.5 Z M 654.5 262.5 L 693.5 262.5 L 693.5 294.5 L 654.5 294.5 Z M 737.5 255.5 L 776.5 255.5 L 776.5 294.5 L 737.5 294.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="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>
@@ -141,6 +141,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1028.042969 274.363281 L 1028.949219 274.875 L 1029.773438 275.421875 L 1030.480469 276.050781 L 1031.027344 276.796875 L 1031.421875 277.582031 L 1031.734375 278.445312 L 1031.8125 278.917969 L 1031.894531 279.429688 L 1031.933594 280.015625 L 1031.972656 280.683594 L 1031.972656 282.257812 L 1031.933594 283.082031 L 1031.972656 283.789062 L 1032.011719 284.414062 L 1032.089844 284.964844 L 1032.167969 285.4375 L 1032.324219 285.828125 L 1032.441406 286.222656 L 1032.640625 286.535156 L 1032.835938 286.851562 L 1033.070312 287.125 L 1033.347656 287.402344 L 1033.660156 287.597656 L 1033.660156 288.5 L 1029.222656 288.5 L 1028.988281 287.871094 L 1028.789062 287.203125 L 1028.632812 286.417969 L 1028.515625 285.632812 L 1028.4375 284.769531 L 1028.4375 281.273438 L 1028.359375 280.136719 L 1028.160156 279.113281 L 1027.847656 278.25 L 1027.375 277.542969 L 1026.789062 276.992188 L 1026.082031 276.5625 L 1025.726562 276.445312 L 1025.375 276.367188 L 1024.980469 276.285156 L 1024.589844 276.246094 L 1023.722656 276.167969 L 1014.300781 276.167969 L 1014.300781 288.5 L 1010.648438 288.5 L 1010.648438 259.871094 L 1023.84375 259.871094 L 1025.609375 259.988281 L 1027.21875 260.265625 L 1028.59375 260.773438 L 1029.773438 261.441406 L 1030.753906 262.304688 L 1031.539062 263.367188 L 1031.8125 263.996094 L 1032.089844 264.625 L 1032.285156 265.292969 L 1032.441406 265.996094 L 1032.519531 266.742188 L 1032.558594 267.53125 L 1032.480469 268.589844 L 1032.324219 269.570312 L 1032.050781 270.476562 L 1031.65625 271.300781 L 1031.1875 272.046875 L 1030.597656 272.675781 L 1030.242188 272.988281 L 1029.851562 273.300781 L 1029.457031 273.578125 L 1029.027344 273.851562 L 1028.554688 274.125 Z M 1028.75 268.039062 L 1028.632812 266.863281 L 1028.398438 265.839844 L 1027.925781 264.976562 L 1027.335938 264.269531 L 1026.511719 263.757812 L 1025.570312 263.367188 L 1025.214844 263.289062 L 1024.824219 263.210938 L 1024.429688 263.171875 L 1024 263.132812 L 1023.566406 263.132812 L 1023.136719 263.09375 L 1014.300781 263.09375 L 1014.300781 272.949219 L 1023.136719 272.949219 L 1024.429688 272.910156 L 1025.570312 272.675781 L 1026.511719 272.320312 L 1027.296875 271.808594 L 1027.925781 271.179688 L 1028.359375 270.394531 L 1028.476562 270.082031 L 1028.554688 269.6875 L 1028.632812 269.335938 L 1028.671875 268.902344 L 1028.710938 268.511719 Z M 1028.75 268.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 538 836 L 1386 836 M 538 774 L 1386 774 M 538 774 L 538 836 M 1386 774 L 1386 836 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 538 836 L 1386 836 M 538 774 L 1386 774 M 1386 836 L 1386 774 M 538 836 L 538 774 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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_lp__dfbbn_1.svg b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.svg
index 001b77e..db4120a 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_1.svg
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_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 1392.5 535.5 L 1564.5 535.5 L 1564.5 548.5 L 1392.5 548.5 Z M 1392.5 535.5 "/>
 </clipPath>
-<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image426"/>
+  <use xlink:href="#image453"/>
 </pattern>
 <mask 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="#image426"/>
+  <use xlink:href="#image453"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1108.5 581.5 L 1124.5 581.5 L 1124.5 627.5 L 1108.5 627.5 Z M 1150.5 581.5 L 1167.5 581.5 L 1167.5 627.5 L 1150.5 627.5 Z M 1604.5 596.5 L 1621.5 596.5 L 1621.5 642.5 L 1604.5 642.5 Z M 1439.5 599.5 L 1456.5 599.5 L 1456.5 645.5 L 1439.5 645.5 Z M 1273.5 581.5 L 1289.5 581.5 L 1289.5 652.5 L 1273.5 652.5 Z M 1026.5 581.5 L 1042.5 581.5 L 1042.5 652.5 L 1026.5 652.5 Z M 970.5 581.5 L 986.5 581.5 L 986.5 652.5 L 970.5 652.5 Z M 348.5 606.5 L 364.5 606.5 L 364.5 652.5 L 348.5 652.5 Z M 493.5 606.5 L 509.5 606.5 L 509.5 652.5 L 493.5 652.5 Z M 446.5 606.5 L 462.5 606.5 L 462.5 652.5 L 446.5 652.5 Z M 1219.5 581.5 L 1235.5 581.5 L 1235.5 652.5 L 1219.5 652.5 Z M 564.5 610.5 L 580.5 610.5 L 580.5 657.5 L 564.5 657.5 Z M 626.5 610.5 L 643.5 610.5 L 643.5 657.5 L 626.5 657.5 Z M 1325.5 604.5 L 1341.5 604.5 L 1341.5 675.5 L 1325.5 675.5 Z M 241.5 634.5 L 257.5 634.5 L 257.5 680.5 L 241.5 680.5 Z M 846.5 610.5 L 862.5 610.5 L 862.5 681.5 L 846.5 681.5 Z M 734.5 610.5 L 751.5 610.5 L 751.5 681.5 L 734.5 681.5 Z M 782.5 610.5 L 799.5 610.5 L 799.5 681.5 L 782.5 681.5 Z M 1660.5 596.5 L 1676.5 596.5 L 1676.5 688.5 L 1660.5 688.5 Z M 1495.5 599.5 L 1512.5 599.5 L 1512.5 691.5 L 1495.5 691.5 Z M 1495.5 599.5 "/>
 </clipPath>
-<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image454" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image427"/>
+  <use xlink:href="#image454"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1171.5 390.5 L 1187.5 390.5 L 1187.5 436.5 L 1171.5 436.5 Z M 1083.5 390.5 L 1100.5 390.5 L 1100.5 436.5 L 1083.5 436.5 Z M 241.5 383.5 L 258.5 383.5 L 258.5 453.5 L 241.5 453.5 Z M 1335.5 377.5 L 1352.5 377.5 L 1352.5 469.5 L 1335.5 469.5 Z M 1296.5 377.5 L 1312.5 377.5 L 1312.5 469.5 L 1296.5 469.5 Z M 1249.5 377.5 L 1265.5 377.5 L 1265.5 469.5 L 1249.5 469.5 Z M 567.5 424.5 L 583.5 424.5 L 583.5 471.5 L 567.5 471.5 Z M 609.5 424.5 L 626.5 424.5 L 626.5 471.5 L 609.5 471.5 Z M 431.5 424.5 L 447.5 424.5 L 447.5 471.5 L 431.5 471.5 Z M 361.5 400.5 L 377.5 400.5 L 377.5 471.5 L 361.5 471.5 Z M 478.5 424.5 L 495.5 424.5 L 495.5 471.5 L 478.5 471.5 Z M 1019.5 390.5 L 1035.5 390.5 L 1035.5 482.5 L 1019.5 482.5 Z M 852.5 417.5 L 869.5 417.5 L 869.5 509.5 L 852.5 509.5 Z M 743.5 417.5 L 759.5 417.5 L 759.5 509.5 L 743.5 509.5 Z M 967.5 417.5 L 983.5 417.5 L 983.5 509.5 L 967.5 509.5 Z M 895.5 417.5 L 912.5 417.5 L 912.5 509.5 L 895.5 509.5 Z M 1660.5 377.5 L 1676.5 377.5 L 1676.5 516.5 L 1660.5 516.5 Z M 1604.5 445.5 L 1621.5 445.5 L 1621.5 516.5 L 1604.5 516.5 Z M 1498.5 390.5 L 1514.5 390.5 L 1514.5 529.5 L 1498.5 529.5 Z M 1442.5 458.5 L 1459.5 458.5 L 1459.5 529.5 L 1442.5 529.5 Z M 1442.5 458.5 "/>
 </clipPath>
-<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image455" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image428"/>
+  <use xlink:href="#image455"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 739.5 525.5 L 757.5 525.5 L 757.5 535.5 L 739.5 535.5 Z M 739.5 535.5 L 757.5 535.5 L 757.5 544.5 L 739.5 544.5 Z M 1160.5 525.5 L 1179.5 525.5 L 1179.5 544.5 L 1160.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="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image456" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image429"/>
+  <use xlink:href="#image456"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface423">
+<g id="surface450">
 <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 1274.144531 539.113281 L 1274.082031 540.144531 L 1273.917969 541.082031 L 1273.628906 541.953125 L 1273.242188 542.726562 L 1272.726562 543.46875 L 1272.113281 544.113281 L 1271.433594 544.660156 L 1270.726562 545.082031 L 1269.917969 545.402344 L 1269.082031 545.660156 L 1268.175781 545.789062 L 1267.210938 545.824219 L 1256.597656 545.824219 L 1256.597656 522.304688 L 1266.144531 522.304688 L 1267.53125 522.402344 L 1268.757812 522.628906 L 1269.855469 523.015625 L 1270.789062 523.566406 L 1271.597656 524.273438 L 1272.242188 525.144531 L 1272.5 525.628906 L 1272.726562 526.144531 L 1272.886719 526.628906 L 1273.015625 527.175781 L 1273.082031 527.726562 L 1273.113281 528.273438 L 1273.015625 529.433594 L 1272.726562 530.433594 L 1272.273438 531.371094 L 1271.628906 532.144531 L 1270.824219 532.855469 L 1269.855469 533.402344 L 1270.789062 533.824219 L 1271.597656 534.273438 L 1272.304688 534.789062 L 1272.886719 535.371094 L 1273.339844 535.984375 L 1273.695312 536.628906 L 1273.824219 537.015625 L 1273.917969 537.402344 L 1274.015625 537.789062 L 1274.082031 538.242188 L 1274.113281 538.660156 Z M 1270.113281 528.695312 L 1270.015625 527.726562 L 1269.726562 526.917969 L 1269.273438 526.210938 L 1268.628906 525.695312 L 1267.824219 525.304688 L 1266.824219 525.046875 L 1266.597656 525.046875 L 1266.144531 524.984375 L 1265.628906 524.984375 L 1265.402344 524.953125 L 1259.597656 524.953125 L 1259.597656 532.433594 L 1265.402344 532.433594 L 1266.597656 532.371094 L 1267.628906 532.175781 L 1268.5 531.824219 L 1269.144531 531.339844 L 1269.660156 530.695312 L 1269.984375 529.917969 L 1270.015625 529.757812 L 1270.046875 529.566406 L 1270.082031 529.371094 L 1270.082031 528.917969 Z M 1266.917969 543.175781 L 1267.824219 543.144531 L 1268.628906 542.953125 L 1269.339844 542.628906 L 1269.917969 542.210938 L 1270.402344 541.660156 L 1270.789062 540.984375 L 1270.886719 540.726562 L 1270.953125 540.433594 L 1271.046875 540.113281 L 1271.082031 539.824219 L 1271.113281 539.5 L 1271.144531 539.144531 L 1271.082031 538.433594 L 1270.953125 537.757812 L 1270.726562 537.175781 L 1270.402344 536.628906 L 1269.984375 536.175781 L 1269.5 535.757812 L 1269.144531 535.566406 L 1268.757812 535.402344 L 1268.339844 535.273438 L 1267.886719 535.175781 L 1267.402344 535.113281 L 1266.917969 535.082031 L 1259.597656 535.082031 L 1259.597656 543.175781 Z M 1266.917969 543.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 1213 554 L 1232 554 M 1213 535 L 1232 535 M 1213 535 L 1213 554 M 1232 535 L 1232 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 1213 554 L 1232 554 M 1213 535 L 1232 535 M 1232 554 L 1232 535 M 1213 554 L 1213 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/dfbbn/sky130_fd_sc_lp__dfbbn_2.svg b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.svg
index eea9354..e66e0e3 100644
--- a/cells/dfbbn/sky130_fd_sc_lp__dfbbn_2.svg
+++ b/cells/dfbbn/sky130_fd_sc_lp__dfbbn_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 1322.5 535.5 L 1531.5 535.5 L 1531.5 548.5 L 1322.5 548.5 Z M 1322.5 535.5 "/>
 </clipPath>
-<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image409"/>
+  <use xlink:href="#image437"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image409"/>
+  <use xlink:href="#image437"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1051.5 578.5 L 1067.5 578.5 L 1067.5 621.5 L 1051.5 621.5 Z M 1091.5 578.5 L 1107.5 578.5 L 1107.5 621.5 L 1091.5 621.5 Z M 1569.5 595.5 L 1585.5 595.5 L 1585.5 638.5 L 1569.5 638.5 Z M 806.5 574.5 L 821.5 574.5 L 821.5 640.5 L 806.5 640.5 Z M 1161.5 578.5 L 1176.5 578.5 L 1176.5 644.5 L 1161.5 644.5 Z M 975.5 578.5 L 990.5 578.5 L 990.5 644.5 L 975.5 644.5 Z M 922.5 578.5 L 938.5 578.5 L 938.5 644.5 L 922.5 644.5 Z M 432.5 601.5 L 448.5 601.5 L 448.5 644.5 L 432.5 644.5 Z M 337.5 601.5 L 353.5 601.5 L 353.5 644.5 L 337.5 644.5 Z M 1207.5 578.5 L 1222.5 578.5 L 1222.5 644.5 L 1207.5 644.5 Z M 476.5 601.5 L 492.5 601.5 L 492.5 644.5 L 476.5 644.5 Z M 541.5 609.5 L 556.5 609.5 L 556.5 652.5 L 541.5 652.5 Z M 599.5 609.5 L 615.5 609.5 L 615.5 652.5 L 599.5 652.5 Z M 1267.5 605.5 L 1283.5 605.5 L 1283.5 670.5 L 1267.5 670.5 Z M 746.5 609.5 L 762.5 609.5 L 762.5 674.5 L 746.5 674.5 Z M 702.5 609.5 L 717.5 609.5 L 717.5 674.5 L 702.5 674.5 Z M 236.5 633.5 L 252.5 633.5 L 252.5 676.5 L 236.5 676.5 Z M 1467.5 595.5 L 1483.5 595.5 L 1483.5 681.5 L 1467.5 681.5 Z M 1666.5 595.5 L 1681.5 595.5 L 1681.5 681.5 L 1666.5 681.5 Z M 1371.5 638.5 L 1386.5 638.5 L 1386.5 681.5 L 1371.5 681.5 Z M 1622.5 595.5 L 1637.5 595.5 L 1637.5 681.5 L 1622.5 681.5 Z M 1423.5 595.5 L 1439.5 595.5 L 1439.5 681.5 L 1423.5 681.5 Z M 1423.5 595.5 "/>
 </clipPath>
-<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image410"/>
+  <use xlink:href="#image438"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1024.5 402.5 L 1039.5 402.5 L 1039.5 445.5 L 1024.5 445.5 Z M 1110.5 402.5 L 1126.5 402.5 L 1126.5 445.5 L 1110.5 445.5 Z M 248.5 392.5 L 263.5 392.5 L 263.5 458.5 L 248.5 458.5 Z M 416.5 431.5 L 432.5 431.5 L 432.5 474.5 L 416.5 474.5 Z M 543.5 431.5 L 558.5 431.5 L 558.5 474.5 L 543.5 474.5 Z M 461.5 431.5 L 476.5 431.5 L 476.5 474.5 L 461.5 474.5 Z M 599.5 431.5 L 615.5 431.5 L 615.5 474.5 L 599.5 474.5 Z M 349.5 409.5 L 365.5 409.5 L 365.5 474.5 L 349.5 474.5 Z M 1231.5 399.5 L 1247.5 399.5 L 1247.5 485.5 L 1231.5 485.5 Z M 1268.5 399.5 L 1284.5 399.5 L 1284.5 485.5 L 1268.5 485.5 Z M 1187.5 399.5 L 1203.5 399.5 L 1203.5 485.5 L 1187.5 485.5 Z M 971.5 399.5 L 987.5 399.5 L 987.5 485.5 L 971.5 485.5 Z M 754.5 424.5 L 769.5 424.5 L 769.5 510.5 L 754.5 510.5 Z M 709.5 424.5 L 725.5 424.5 L 725.5 510.5 L 709.5 510.5 Z M 806.5 424.5 L 821.5 424.5 L 821.5 510.5 L 806.5 510.5 Z M 922.5 424.5 L 938.5 424.5 L 938.5 510.5 L 922.5 510.5 Z M 1569.5 451.5 L 1585.5 451.5 L 1585.5 517.5 L 1569.5 517.5 Z M 1666.5 387.5 L 1681.5 387.5 L 1681.5 517.5 L 1666.5 517.5 Z M 1622.5 387.5 L 1637.5 387.5 L 1637.5 517.5 L 1622.5 517.5 Z M 1422.5 400.5 L 1438.5 400.5 L 1438.5 529.5 L 1422.5 529.5 Z M 1466.5 400.5 L 1482.5 400.5 L 1482.5 529.5 L 1466.5 529.5 Z M 1370.5 464.5 L 1385.5 464.5 L 1385.5 529.5 L 1370.5 529.5 Z M 1370.5 464.5 "/>
 </clipPath>
-<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image411"/>
+  <use xlink:href="#image439"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 703.5 525.5 L 721.5 525.5 L 721.5 535.5 L 703.5 535.5 Z M 703.5 535.5 L 721.5 535.5 L 721.5 543.5 L 703.5 543.5 Z M 1098.5 525.5 L 1116.5 525.5 L 1116.5 543.5 L 1098.5 543.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="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image440" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image412"/>
+  <use xlink:href="#image440"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface406">
+<g id="surface434">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1481.757812 637.84375 L 1481.757812 659.316406 L 1478.664062 659.316406 L 1467.5625 641.910156 L 1467.5625 659.316406 L 1464.96875 659.316406 L 1464.96875 637.84375 L 1467.945312 637.84375 L 1479.167969 655.398438 L 1479.167969 637.84375 Z M 1481.757812 637.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 440 L 1461 440 M 1444 422 L 1461 422 M 1444 422 L 1444 440 M 1461 422 L 1461 440 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 440 L 1461 440 M 1444 422 L 1461 422 M 1461 440 L 1461 422 M 1444 440 L 1444 422 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/dfbbp/sky130_fd_sc_lp__dfbbp_1.svg b/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.svg
index 41825eb..29f62c0 100644
--- a/cells/dfbbp/sky130_fd_sc_lp__dfbbp_1.svg
+++ b/cells/dfbbp/sky130_fd_sc_lp__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 498.5 L 174.5 498.5 Z M 1332.5 498.5 L 1744.5 498.5 L 1744.5 536.5 L 1332.5 536.5 Z M 174.5 498.5 L 1183.5 498.5 L 1183.5 536.5 L 174.5 536.5 Z M 1332.5 536.5 L 1549.5 536.5 L 1549.5 550.5 L 1332.5 550.5 Z M 1332.5 536.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 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="#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 1417.5 604.5 L 1435.5 604.5 L 1435.5 653.5 L 1417.5 653.5 Z M 1593.5 604.5 L 1611.5 604.5 L 1611.5 653.5 L 1593.5 653.5 Z M 1061.5 623.5 L 1078.5 623.5 L 1078.5 673.5 L 1061.5 673.5 Z M 1107.5 623.5 L 1124.5 623.5 L 1124.5 673.5 L 1107.5 673.5 Z M 246.5 647.5 L 263.5 647.5 L 263.5 697.5 L 246.5 697.5 Z M 1301.5 623.5 L 1319.5 623.5 L 1319.5 698.5 L 1301.5 698.5 Z M 955.5 623.5 L 972.5 623.5 L 972.5 698.5 L 955.5 698.5 Z M 1001.5 623.5 L 1018.5 623.5 L 1018.5 698.5 L 1001.5 698.5 Z M 1182.5 623.5 L 1199.5 623.5 L 1199.5 698.5 L 1182.5 698.5 Z M 1232.5 623.5 L 1250.5 623.5 L 1250.5 698.5 L 1232.5 698.5 Z M 648.5 653.5 L 665.5 653.5 L 665.5 703.5 L 648.5 703.5 Z M 491.5 653.5 L 509.5 653.5 L 509.5 703.5 L 491.5 703.5 Z M 602.5 653.5 L 619.5 653.5 L 619.5 703.5 L 602.5 703.5 Z M 1653.5 604.5 L 1671.5 604.5 L 1671.5 703.5 L 1653.5 703.5 Z M 838.5 627.5 L 856.5 627.5 L 856.5 703.5 L 838.5 703.5 Z M 1477.5 604.5 L 1495.5 604.5 L 1495.5 703.5 L 1477.5 703.5 Z M 362.5 653.5 L 380.5 653.5 L 380.5 703.5 L 362.5 703.5 Z M 542.5 653.5 L 559.5 653.5 L 559.5 703.5 L 542.5 703.5 Z M 769.5 627.5 L 786.5 627.5 L 786.5 703.5 L 769.5 703.5 Z M 718.5 627.5 L 736.5 627.5 L 736.5 703.5 L 718.5 703.5 Z M 718.5 627.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 1107.5 380.5 L 1124.5 380.5 L 1124.5 429.5 L 1107.5 429.5 Z M 1014.5 380.5 L 1031.5 380.5 L 1031.5 429.5 L 1014.5 429.5 Z M 263.5 372.5 L 281.5 372.5 L 281.5 447.5 L 263.5 447.5 Z M 623.5 408.5 L 641.5 408.5 L 641.5 458.5 L 623.5 458.5 Z M 512.5 408.5 L 530.5 408.5 L 530.5 458.5 L 512.5 458.5 Z M 380.5 383.5 L 398.5 383.5 L 398.5 458.5 L 380.5 458.5 Z M 669.5 408.5 L 686.5 408.5 L 686.5 458.5 L 669.5 458.5 Z M 563.5 408.5 L 581.5 408.5 L 581.5 458.5 L 563.5 458.5 Z M 1251.5 378.5 L 1269.5 378.5 L 1269.5 477.5 L 1251.5 477.5 Z M 1299.5 378.5 L 1317.5 378.5 L 1317.5 477.5 L 1299.5 477.5 Z M 1190.5 378.5 L 1208.5 378.5 L 1208.5 477.5 L 1190.5 477.5 Z M 948.5 380.5 L 965.5 380.5 L 965.5 478.5 L 948.5 478.5 Z M 794.5 408.5 L 812.5 408.5 L 812.5 507.5 L 794.5 507.5 Z M 744.5 408.5 L 761.5 408.5 L 761.5 507.5 L 744.5 507.5 Z M 892.5 408.5 L 909.5 408.5 L 909.5 507.5 L 892.5 507.5 Z M 840.5 408.5 L 858.5 408.5 L 858.5 507.5 L 840.5 507.5 Z M 1653.5 366.5 L 1671.5 366.5 L 1671.5 514.5 L 1653.5 514.5 Z M 1593.5 439.5 L 1611.5 439.5 L 1611.5 514.5 L 1593.5 514.5 Z M 1417.5 453.5 L 1434.5 453.5 L 1434.5 528.5 L 1417.5 528.5 Z M 1477.5 380.5 L 1494.5 380.5 L 1494.5 528.5 L 1477.5 528.5 Z M 1477.5 380.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 1175.5 481.5 L 1195.5 481.5 L 1195.5 501.5 L 1175.5 501.5 Z M 723.5 481.5 L 743.5 481.5 L 743.5 501.5 L 723.5 501.5 Z M 1005.5 568.5 L 1025.5 568.5 L 1025.5 570.5 L 1005.5 570.5 Z M 1005.5 570.5 L 1025.5 570.5 L 1025.5 588.5 L 1005.5 588.5 Z M 497.5 568.5 L 517.5 568.5 L 517.5 588.5 L 497.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="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>
@@ -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 789.898438 540.035156 L 789.828125 541.15625 L 789.652344 542.175781 L 789.335938 543.121094 L 788.914062 543.960938 L 788.355469 544.769531 L 787.6875 545.46875 L 786.953125 546.066406 L 786.179688 546.523438 L 785.304688 546.875 L 784.390625 547.152344 L 783.410156 547.292969 L 782.359375 547.328125 L 770.824219 547.328125 L 770.824219 521.769531 L 781.203125 521.769531 L 782.707031 521.875 L 784.042969 522.117188 L 785.234375 522.539062 L 786.25 523.136719 L 787.125 523.90625 L 787.828125 524.851562 L 788.109375 525.378906 L 788.355469 525.941406 L 788.53125 526.464844 L 788.667969 527.0625 L 788.738281 527.660156 L 788.773438 528.253906 L 788.667969 529.515625 L 788.355469 530.605469 L 787.863281 531.621094 L 787.160156 532.460938 L 786.285156 533.234375 L 785.234375 533.828125 L 786.25 534.285156 L 787.125 534.777344 L 787.898438 535.335938 L 788.53125 535.96875 L 789.019531 536.632812 L 789.40625 537.335938 L 789.546875 537.757812 L 789.652344 538.175781 L 789.757812 538.597656 L 789.828125 539.089844 L 789.863281 539.542969 Z M 785.515625 528.710938 L 785.410156 527.660156 L 785.09375 526.78125 L 784.601562 526.011719 L 783.902344 525.449219 L 783.023438 525.027344 L 781.9375 524.75 L 781.691406 524.75 L 781.445312 524.714844 L 781.203125 524.679688 L 780.640625 524.679688 L 780.394531 524.644531 L 774.082031 524.644531 L 774.082031 532.777344 L 780.394531 532.777344 L 781.691406 532.707031 L 782.8125 532.496094 L 783.761719 532.113281 L 784.460938 531.585938 L 785.023438 530.882812 L 785.375 530.042969 L 785.410156 529.867188 L 785.480469 529.445312 L 785.480469 528.957031 Z M 782.042969 544.453125 L 783.023438 544.417969 L 783.902344 544.207031 L 784.671875 543.859375 L 785.304688 543.402344 L 785.828125 542.804688 L 786.25 542.070312 L 786.355469 541.789062 L 786.425781 541.472656 L 786.53125 541.121094 L 786.566406 540.808594 L 786.601562 540.457031 L 786.636719 540.070312 L 786.566406 539.300781 L 786.425781 538.5625 L 786.179688 537.933594 L 785.828125 537.335938 L 785.375 536.84375 L 784.847656 536.390625 L 784.460938 536.179688 L 784.042969 536.003906 L 783.585938 535.863281 L 783.09375 535.757812 L 782.570312 535.6875 L 782.042969 535.652344 L 774.082031 535.652344 L 774.082031 544.453125 Z M 782.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 723 555 L 743 555 M 723 535 L 743 535 M 723 535 L 723 555 M 743 535 L 743 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 723 555 L 743 555 M 723 535 L 743 535 M 743 555 L 743 535 M 723 555 L 723 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_lp__dfrbp_1.svg b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.svg
index 041362e..e5ca3db 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_1.svg
+++ b/cells/dfrbp/sky130_fd_sc_lp__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 528.5 L 175.5 528.5 Z M 892.5 528.5 L 1744.5 528.5 L 1744.5 536.5 L 892.5 536.5 Z M 175.5 528.5 L 373.5 528.5 L 373.5 536.5 L 175.5 536.5 Z M 175.5 528.5 "/>
 </clipPath>
-<image id="image522" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image550" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image522"/>
+  <use xlink:href="#image550"/>
 </pattern>
 <mask 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="#image522"/>
+  <use xlink:href="#image550"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 739.5 573.5 L 759.5 573.5 L 759.5 628.5 L 739.5 628.5 Z M 801.5 573.5 L 821.5 573.5 L 821.5 628.5 L 801.5 628.5 Z M 506.5 573.5 L 526.5 573.5 L 526.5 628.5 L 506.5 628.5 Z M 577.5 573.5 L 597.5 573.5 L 597.5 628.5 L 577.5 628.5 Z M 459.5 573.5 L 479.5 573.5 L 479.5 628.5 L 459.5 628.5 Z M 682.5 573.5 L 702.5 573.5 L 702.5 628.5 L 682.5 628.5 Z M 1437.5 607.5 L 1456.5 607.5 L 1456.5 663.5 L 1437.5 663.5 Z M 1116.5 614.5 L 1136.5 614.5 L 1136.5 670.5 L 1116.5 670.5 Z M 1001.5 585.5 L 1021.5 585.5 L 1021.5 670.5 L 1001.5 670.5 Z M 1164.5 614.5 L 1183.5 614.5 L 1183.5 670.5 L 1164.5 670.5 Z M 1220.5 614.5 L 1240.5 614.5 L 1240.5 670.5 L 1220.5 670.5 Z M 944.5 585.5 L 964.5 585.5 L 964.5 670.5 L 944.5 670.5 Z M 1268.5 614.5 L 1288.5 614.5 L 1288.5 670.5 L 1268.5 670.5 Z M 310.5 628.5 L 330.5 628.5 L 330.5 683.5 L 310.5 683.5 Z M 253.5 628.5 L 273.5 628.5 L 273.5 683.5 L 253.5 683.5 Z M 1514.5 598.5 L 1534.5 598.5 L 1534.5 709.5 L 1514.5 709.5 Z M 1646.5 612.5 L 1666.5 612.5 L 1666.5 723.5 L 1646.5 723.5 Z M 1646.5 612.5 "/>
 </clipPath>
-<image id="image523" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image551" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image523"/>
+  <use xlink:href="#image551"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1437.5 349.5 L 1456.5 349.5 L 1456.5 433.5 L 1437.5 433.5 Z M 253.5 359.5 L 273.5 359.5 L 273.5 443.5 L 253.5 443.5 Z M 1149.5 388.5 L 1169.5 388.5 L 1169.5 443.5 L 1149.5 443.5 Z M 1102.5 388.5 L 1121.5 388.5 L 1121.5 443.5 L 1102.5 443.5 Z M 310.5 359.5 L 330.5 359.5 L 330.5 443.5 L 310.5 443.5 Z M 1309.5 388.5 L 1328.5 388.5 L 1328.5 443.5 L 1309.5 443.5 Z M 1252.5 388.5 L 1272.5 388.5 L 1272.5 443.5 L 1252.5 443.5 Z M 643.5 394.5 L 663.5 394.5 L 663.5 449.5 L 643.5 449.5 Z M 435.5 394.5 L 455.5 394.5 L 455.5 449.5 L 435.5 449.5 Z M 510.5 394.5 L 530.5 394.5 L 530.5 449.5 L 510.5 449.5 Z M 748.5 394.5 L 767.5 394.5 L 767.5 449.5 L 748.5 449.5 Z M 700.5 394.5 L 720.5 394.5 L 720.5 449.5 L 700.5 449.5 Z M 820.5 394.5 L 840.5 394.5 L 840.5 449.5 L 820.5 449.5 Z M 1032.5 372.5 L 1052.5 372.5 L 1052.5 483.5 L 1032.5 483.5 Z M 945.5 394.5 L 965.5 394.5 L 965.5 504.5 L 945.5 504.5 Z M 1636.5 346.5 L 1656.5 346.5 L 1656.5 512.5 L 1636.5 512.5 Z M 1572.5 346.5 L 1592.5 346.5 L 1592.5 512.5 L 1572.5 512.5 Z M 1572.5 346.5 "/>
 </clipPath>
-<image id="image524" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image552" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image524"/>
+  <use xlink:href="#image552"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 220.5 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 410.5 475.5 L 432.5 475.5 L 432.5 481.5 L 410.5 481.5 Z M 410.5 481.5 L 432.5 481.5 L 432.5 497.5 L 410.5 497.5 Z M 790.5 475.5 L 812.5 475.5 L 812.5 497.5 L 790.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="image525" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image553" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image525"/>
+  <use xlink:href="#image553"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface519">
+<g id="surface547">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -254,6 +254,5 @@
 <path style=" 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.175781 373.960938 L 1728.175781 402.589844 L 1724.054688 402.589844 L 1709.25 379.378906 L 1709.25 402.589844 L 1705.792969 402.589844 L 1705.792969 373.960938 L 1709.757812 373.960938 L 1724.722656 397.367188 L 1724.722656 373.960938 Z M 1728.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 1676 702 L 1698 702 M 1676 680 L 1698 680 M 1676 680 L 1676 702 M 1698 680 L 1698 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 1676 702 L 1698 702 M 1676 680 L 1698 680 M 1698 702 L 1698 680 M 1676 702 L 1676 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_lp__dfrbp_2.svg b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.svg
index bd95c82..862747a 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.svg
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 299.5 L 1744.5 299.5 L 1744.5 528.5 L 174.5 528.5 Z M 863.5 528.5 L 1744.5 528.5 L 1744.5 530.5 L 863.5 530.5 Z M 1111.5 530.5 L 1744.5 530.5 L 1744.5 536.5 L 1111.5 536.5 Z M 174.5 528.5 L 356.5 528.5 L 356.5 536.5 L 174.5 536.5 Z M 1111.5 536.5 L 1468.5 536.5 L 1468.5 561.5 L 1111.5 561.5 Z M 1111.5 536.5 "/>
 </clipPath>
-<image id="image529" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image558" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image529"/>
+  <use xlink:href="#image558"/>
 </pattern>
 <mask 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="#image529"/>
+  <use xlink:href="#image558"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 450.5 571.5 L 469.5 571.5 L 469.5 625.5 L 450.5 625.5 Z M 496.5 571.5 L 515.5 571.5 L 515.5 625.5 L 496.5 625.5 Z M 676.5 571.5 L 695.5 571.5 L 695.5 625.5 L 676.5 625.5 Z M 725.5 571.5 L 744.5 571.5 L 744.5 625.5 L 725.5 625.5 Z M 583.5 571.5 L 602.5 571.5 L 602.5 625.5 L 583.5 625.5 Z M 779.5 571.5 L 798.5 571.5 L 798.5 625.5 L 779.5 625.5 Z M 1228.5 611.5 L 1247.5 611.5 L 1247.5 664.5 L 1228.5 664.5 Z M 1127.5 611.5 L 1147.5 611.5 L 1147.5 664.5 L 1127.5 664.5 Z M 916.5 583.5 L 935.5 583.5 L 935.5 664.5 L 916.5 664.5 Z M 1082.5 611.5 L 1101.5 611.5 L 1101.5 664.5 L 1082.5 664.5 Z M 1182.5 611.5 L 1201.5 611.5 L 1201.5 664.5 L 1182.5 664.5 Z M 986.5 583.5 L 1005.5 583.5 L 1005.5 664.5 L 986.5 664.5 Z M 304.5 642.5 L 323.5 642.5 L 323.5 696.5 L 304.5 696.5 Z M 249.5 642.5 L 268.5 642.5 L 268.5 696.5 L 249.5 696.5 Z M 1525.5 649.5 L 1544.5 649.5 L 1544.5 702.5 L 1525.5 702.5 Z M 1591.5 595.5 L 1610.5 595.5 L 1610.5 702.5 L 1591.5 702.5 Z M 1646.5 595.5 L 1665.5 595.5 L 1665.5 702.5 L 1646.5 702.5 Z M 1348.5 607.5 L 1367.5 607.5 L 1367.5 714.5 L 1348.5 714.5 Z M 1403.5 607.5 L 1422.5 607.5 L 1422.5 714.5 L 1403.5 714.5 Z M 1403.5 607.5 "/>
 </clipPath>
-<image id="image530" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image559" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image530"/>
+  <use xlink:href="#image559"/>
 </pattern>
 <mask id="mask2">
 <rect 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 378.5 L 1290.5 378.5 L 1290.5 431.5 L 1271.5 431.5 Z M 1217.5 378.5 L 1236.5 378.5 L 1236.5 431.5 L 1217.5 431.5 Z M 1068.5 378.5 L 1087.5 378.5 L 1087.5 431.5 L 1068.5 431.5 Z M 1114.5 378.5 L 1133.5 378.5 L 1133.5 431.5 L 1114.5 431.5 Z M 252.5 365.5 L 271.5 365.5 L 271.5 446.5 L 252.5 446.5 Z M 307.5 365.5 L 326.5 365.5 L 326.5 446.5 L 307.5 446.5 Z M 627.5 399.5 L 646.5 399.5 L 646.5 452.5 L 627.5 452.5 Z M 797.5 399.5 L 816.5 399.5 L 816.5 452.5 L 797.5 452.5 Z M 499.5 399.5 L 518.5 399.5 L 518.5 452.5 L 499.5 452.5 Z M 728.5 399.5 L 747.5 399.5 L 747.5 452.5 L 728.5 452.5 Z M 682.5 399.5 L 701.5 399.5 L 701.5 452.5 L 682.5 452.5 Z M 427.5 399.5 L 446.5 399.5 L 446.5 452.5 L 427.5 452.5 Z M 1001.5 378.5 L 1020.5 378.5 L 1020.5 484.5 L 1001.5 484.5 Z M 918.5 399.5 L 937.5 399.5 L 937.5 505.5 L 918.5 505.5 Z M 1517.5 432.5 L 1536.5 432.5 L 1536.5 513.5 L 1517.5 513.5 Z M 1591.5 353.5 L 1610.5 353.5 L 1610.5 513.5 L 1591.5 513.5 Z M 1646.5 353.5 L 1665.5 353.5 L 1665.5 513.5 L 1646.5 513.5 Z M 1392.5 378.5 L 1411.5 378.5 L 1411.5 538.5 L 1392.5 538.5 Z M 1338.5 378.5 L 1357.5 378.5 L 1357.5 538.5 L 1338.5 538.5 Z M 1338.5 378.5 "/>
 </clipPath>
-<image id="image531" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image560" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image531"/>
+  <use xlink:href="#image560"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 218.5 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 400.5 477.5 L 422.5 477.5 L 422.5 483.5 L 400.5 483.5 Z M 1192.5 477.5 L 1213.5 477.5 L 1213.5 488.5 L 1192.5 488.5 Z M 1192.5 488.5 L 1213.5 488.5 L 1213.5 498.5 L 1192.5 498.5 Z M 766.5 477.5 L 787.5 477.5 L 787.5 498.5 L 766.5 498.5 Z M 400.5 483.5 L 422.5 483.5 L 422.5 498.5 L 400.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="image532" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image561" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image532"/>
+  <use xlink:href="#image561"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface526">
+<g id="surface555">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -260,6 +260,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 463.746094 548.5 L 463.746094 521.917969 L 473.992188 521.917969 L 475.597656 522.027344 L 477.09375 522.316406 L 478.476562 522.828125 L 479.753906 523.484375 L 480.882812 524.394531 L 481.941406 525.453125 L 482.816406 526.730469 L 483.546875 528.117188 L 484.09375 529.683594 L 484.496094 531.359375 L 484.714844 533.222656 L 484.824219 535.191406 L 484.714844 537.269531 L 484.457031 539.203125 L 484.019531 540.953125 L 483.4375 542.554688 L 482.671875 543.976562 L 481.722656 545.21875 L 480.703125 546.238281 L 479.570312 547.042969 L 478.332031 547.699219 L 476.984375 548.136719 L 475.523438 548.425781 L 473.992188 548.5 Z M 467.136719 545.511719 L 473.410156 545.511719 L 475.085938 545.402344 L 476.582031 545 L 477.894531 544.304688 L 478.988281 543.394531 L 479.863281 542.15625 L 480.59375 540.660156 L 480.8125 539.894531 L 481.03125 539.09375 L 481.210938 538.214844 L 481.320312 537.269531 L 481.394531 536.285156 L 481.429688 535.226562 L 481.285156 532.855469 L 480.921875 530.777344 L 480.265625 528.992188 L 479.390625 527.570312 L 478.257812 526.402344 L 476.875 525.5625 L 476.363281 525.378906 L 475.816406 525.199219 L 475.230469 525.089844 L 474.648438 524.980469 L 474.027344 524.941406 L 473.410156 524.90625 L 467.136719 524.90625 Z M 467.136719 545.511719 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 461 555 L 483 555 M 461 534 L 483 534 M 461 534 L 461 555 M 483 534 L 483 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 461 555 L 483 555 M 461 534 L 483 534 M 483 555 L 483 534 M 461 555 L 461 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/dfrbp/sky130_fd_sc_lp__dfrbp_lp.svg b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.svg
index b6eac46..742fdc6 100644
--- a/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.svg
+++ b/cells/dfrbp/sky130_fd_sc_lp__dfrbp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 377.5 L 1744.5 377.5 L 1744.5 535.5 L 174.5 535.5 Z M 822.5 535.5 L 905.5 535.5 L 905.5 558.5 L 822.5 558.5 Z M 822.5 535.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="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="#image405"/>
+  <use xlink:href="#image433"/>
 </pattern>
 <mask id="mask1">
 <rect 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 581.5 L 1585.5 581.5 L 1585.5 616.5 L 1572.5 616.5 Z M 1602.5 581.5 L 1615.5 581.5 L 1615.5 616.5 L 1602.5 616.5 Z M 469.5 590.5 L 482.5 590.5 L 482.5 625.5 L 469.5 625.5 Z M 535.5 590.5 L 547.5 590.5 L 547.5 625.5 L 535.5 625.5 Z M 567.5 590.5 L 580.5 590.5 L 580.5 625.5 L 567.5 625.5 Z M 358.5 590.5 L 370.5 590.5 L 370.5 625.5 L 358.5 625.5 Z M 426.5 590.5 L 439.5 590.5 L 439.5 625.5 L 426.5 625.5 Z M 325.5 590.5 L 337.5 590.5 L 337.5 625.5 L 325.5 625.5 Z M 838.5 592.5 L 851.5 592.5 L 851.5 627.5 L 838.5 627.5 Z M 808.5 592.5 L 821.5 592.5 L 821.5 627.5 L 808.5 627.5 Z M 756.5 592.5 L 769.5 592.5 L 769.5 646.5 L 756.5 646.5 Z M 726.5 592.5 L 739.5 592.5 L 739.5 646.5 L 726.5 646.5 Z M 1679.5 581.5 L 1691.5 581.5 L 1691.5 652.5 L 1679.5 652.5 Z M 1648.5 581.5 L 1661.5 581.5 L 1661.5 652.5 L 1648.5 652.5 Z M 1020.5 617.5 L 1033.5 617.5 L 1033.5 653.5 L 1020.5 653.5 Z M 1076.5 617.5 L 1089.5 617.5 L 1089.5 653.5 L 1076.5 653.5 Z M 1228.5 617.5 L 1241.5 617.5 L 1241.5 653.5 L 1228.5 653.5 Z M 1261.5 617.5 L 1274.5 617.5 L 1274.5 653.5 L 1261.5 653.5 Z M 1401.5 618.5 L 1414.5 618.5 L 1414.5 654.5 L 1401.5 654.5 Z M 1368.5 618.5 L 1381.5 618.5 L 1381.5 654.5 L 1368.5 654.5 Z M 1457.5 583.5 L 1470.5 583.5 L 1470.5 654.5 L 1457.5 654.5 Z M 975.5 600.5 L 987.5 600.5 L 987.5 654.5 L 975.5 654.5 Z M 1487.5 583.5 L 1500.5 583.5 L 1500.5 654.5 L 1487.5 654.5 Z M 1487.5 583.5 "/>
 </clipPath>
-<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image406"/>
+  <use xlink:href="#image434"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1076.5 413.5 L 1089.5 413.5 L 1089.5 449.5 L 1076.5 449.5 Z M 1289.5 424.5 L 1302.5 424.5 L 1302.5 459.5 L 1289.5 459.5 Z M 336.5 430.5 L 349.5 430.5 L 349.5 466.5 L 336.5 466.5 Z M 615.5 446.5 L 627.5 446.5 L 627.5 481.5 L 615.5 481.5 Z M 224.5 446.5 L 237.5 446.5 L 237.5 481.5 L 224.5 481.5 Z M 567.5 446.5 L 579.5 446.5 L 579.5 481.5 L 567.5 481.5 Z M 261.5 446.5 L 273.5 446.5 L 273.5 481.5 L 261.5 481.5 Z M 291.5 446.5 L 304.5 446.5 L 304.5 481.5 L 291.5 481.5 Z M 645.5 446.5 L 658.5 446.5 L 658.5 481.5 L 645.5 481.5 Z M 801.5 446.5 L 814.5 446.5 L 814.5 500.5 L 801.5 500.5 Z M 832.5 446.5 L 844.5 446.5 L 844.5 500.5 L 832.5 500.5 Z M 440.5 465.5 L 452.5 465.5 L 452.5 501.5 L 440.5 501.5 Z M 476.5 465.5 L 489.5 465.5 L 489.5 501.5 L 476.5 501.5 Z M 1241.5 471.5 L 1253.5 471.5 L 1253.5 507.5 L 1241.5 507.5 Z M 1155.5 471.5 L 1168.5 471.5 L 1168.5 507.5 L 1155.5 507.5 Z M 1211.5 471.5 L 1223.5 471.5 L 1223.5 507.5 L 1211.5 507.5 Z M 936.5 479.5 L 948.5 479.5 L 948.5 514.5 L 936.5 514.5 Z M 981.5 443.5 L 993.5 443.5 L 993.5 514.5 L 981.5 514.5 Z M 756.5 446.5 L 769.5 446.5 L 769.5 517.5 L 756.5 517.5 Z M 726.5 446.5 L 739.5 446.5 L 739.5 517.5 L 726.5 517.5 Z M 1602.5 465.5 L 1615.5 465.5 L 1615.5 519.5 L 1602.5 519.5 Z M 1572.5 465.5 L 1585.5 465.5 L 1585.5 519.5 L 1572.5 519.5 Z M 1679.5 413.5 L 1691.5 413.5 L 1691.5 519.5 L 1679.5 519.5 Z M 1371.5 465.5 L 1383.5 465.5 L 1383.5 519.5 L 1371.5 519.5 Z M 1487.5 413.5 L 1500.5 413.5 L 1500.5 519.5 L 1487.5 519.5 Z M 1648.5 413.5 L 1661.5 413.5 L 1661.5 519.5 L 1648.5 519.5 Z M 1401.5 465.5 L 1414.5 465.5 L 1414.5 519.5 L 1401.5 519.5 Z M 1457.5 413.5 L 1470.5 413.5 L 1470.5 519.5 L 1457.5 519.5 Z M 1457.5 413.5 "/>
 </clipPath>
-<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image407"/>
+  <use xlink:href="#image435"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 284.5 527.5 L 299.5 527.5 L 299.5 531.5 L 284.5 531.5 Z M 608.5 527.5 L 622.5 527.5 L 622.5 531.5 L 608.5 531.5 Z M 1215.5 527.5 L 1229.5 527.5 L 1229.5 531.5 L 1215.5 531.5 Z M 608.5 531.5 L 622.5 531.5 L 622.5 541.5 L 608.5 541.5 Z M 284.5 531.5 L 299.5 531.5 L 299.5 541.5 L 284.5 541.5 Z M 1215.5 531.5 L 1229.5 531.5 L 1229.5 541.5 L 1215.5 541.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="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image436" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image408"/>
+  <use xlink:href="#image436"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface402">
+<g id="surface430">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -227,6 +227,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 366.621094 574.5 L 366.621094 557.117188 L 373.320312 557.117188 L 374.371094 557.191406 L 375.347656 557.378906 L 376.253906 557.714844 L 377.089844 558.144531 L 377.828125 558.738281 L 378.519531 559.429688 L 379.09375 560.265625 L 379.570312 561.171875 L 379.925781 562.195312 L 380.1875 563.292969 L 380.332031 564.511719 L 380.402344 565.796875 L 380.332031 567.15625 L 380.164062 568.421875 L 379.878906 569.566406 L 379.496094 570.613281 L 378.996094 571.542969 L 378.375 572.355469 L 377.707031 573.023438 L 376.96875 573.546875 L 376.160156 573.976562 L 375.277344 574.261719 L 374.324219 574.453125 L 373.320312 574.5 Z M 368.839844 572.542969 L 372.941406 572.542969 L 374.039062 572.472656 L 375.015625 572.210938 L 375.875 571.757812 L 376.589844 571.160156 L 377.160156 570.351562 L 377.636719 569.375 L 377.78125 568.875 L 377.921875 568.347656 L 378.042969 567.777344 L 378.113281 567.15625 L 378.160156 566.511719 L 378.1875 565.820312 L 378.089844 564.269531 L 377.851562 562.914062 L 377.421875 561.742188 L 376.851562 560.8125 L 376.113281 560.050781 L 375.207031 559.503906 L 374.871094 559.382812 L 374.515625 559.265625 L 374.132812 559.191406 L 373.75 559.121094 L 373.347656 559.097656 L 372.941406 559.074219 L 368.839844 559.074219 Z M 368.839844 572.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 365 521 L 379 521 M 365 507 L 379 507 M 365 507 L 365 521 M 379 507 L 379 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 365 521 L 379 521 M 365 507 L 379 507 M 379 521 L 379 507 M 365 521 L 365 507 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/dfrtn/sky130_fd_sc_lp__dfrtn_1.svg b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.svg
index ab998f1..ff820f0 100644
--- a/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.svg
+++ b/cells/dfrtn/sky130_fd_sc_lp__dfrtn_1.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="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image376"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1423.5 585.5 L 1445.5 585.5 L 1445.5 645.5 L 1423.5 645.5 Z M 1282.5 624.5 L 1304.5 624.5 L 1304.5 684.5 L 1282.5 684.5 Z M 1094.5 624.5 L 1116.5 624.5 L 1116.5 684.5 L 1094.5 684.5 Z M 1146.5 624.5 L 1167.5 624.5 L 1167.5 684.5 L 1146.5 684.5 Z M 1231.5 624.5 L 1252.5 624.5 L 1252.5 684.5 L 1231.5 684.5 Z M 494.5 625.5 L 515.5 625.5 L 515.5 686.5 L 494.5 686.5 Z M 638.5 625.5 L 659.5 625.5 L 659.5 686.5 L 638.5 686.5 Z M 431.5 625.5 L 452.5 625.5 L 452.5 686.5 L 431.5 686.5 Z M 567.5 625.5 L 588.5 625.5 L 588.5 686.5 L 567.5 686.5 Z M 281.5 627.5 L 303.5 627.5 L 303.5 687.5 L 281.5 687.5 Z M 333.5 627.5 L 355.5 627.5 L 355.5 687.5 L 333.5 687.5 Z M 809.5 635.5 L 830.5 635.5 L 830.5 696.5 L 809.5 696.5 Z M 911.5 635.5 L 932.5 635.5 L 932.5 727.5 L 911.5 727.5 Z M 995.5 635.5 L 1017.5 635.5 L 1017.5 727.5 L 995.5 727.5 Z M 1562.5 680.5 L 1583.5 680.5 L 1583.5 740.5 L 1562.5 740.5 Z M 1637.5 620.5 L 1659.5 620.5 L 1659.5 740.5 L 1637.5 740.5 Z M 1637.5 620.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1061.5 333.5 L 1083.5 333.5 L 1083.5 393.5 L 1061.5 393.5 Z M 1225.5 333.5 L 1246.5 333.5 L 1246.5 393.5 L 1225.5 393.5 Z M 1139.5 333.5 L 1160.5 333.5 L 1160.5 393.5 L 1139.5 393.5 Z M 1319.5 366.5 L 1341.5 366.5 L 1341.5 426.5 L 1319.5 426.5 Z M 1403.5 334.5 L 1425.5 334.5 L 1425.5 426.5 L 1403.5 426.5 Z M 353.5 381.5 L 375.5 381.5 L 375.5 442.5 L 353.5 442.5 Z M 421.5 381.5 L 442.5 381.5 L 442.5 442.5 L 421.5 442.5 Z M 578.5 381.5 L 599.5 381.5 L 599.5 442.5 L 578.5 442.5 Z M 258.5 381.5 L 280.5 381.5 L 280.5 442.5 L 258.5 442.5 Z M 662.5 381.5 L 684.5 381.5 L 684.5 442.5 L 662.5 442.5 Z M 500.5 381.5 L 522.5 381.5 L 522.5 442.5 L 500.5 442.5 Z M 906.5 333.5 L 928.5 333.5 L 928.5 453.5 L 906.5 453.5 Z M 968.5 333.5 L 989.5 333.5 L 989.5 453.5 L 968.5 453.5 Z M 809.5 401.5 L 830.5 401.5 L 830.5 493.5 L 809.5 493.5 Z M 1553.5 419.5 L 1575.5 419.5 L 1575.5 510.5 L 1553.5 510.5 Z M 1637.5 330.5 L 1659.5 330.5 L 1659.5 510.5 L 1637.5 510.5 Z M 1637.5 330.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 523.5 L 248.5 523.5 L 248.5 547.5 L 223.5 547.5 Z M 1187.5 523.5 L 1212.5 523.5 L 1212.5 547.5 L 1187.5 547.5 Z M 568.5 523.5 L 592.5 523.5 L 592.5 547.5 L 568.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="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface373">
+<g id="surface400">
 <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 1474.742188 519.421875 L 1474.742188 550.09375 L 1470.324219 550.09375 L 1454.464844 525.226562 L 1454.464844 550.09375 L 1450.761719 550.09375 L 1450.761719 519.421875 L 1455.011719 519.421875 L 1471.042969 544.5 L 1471.042969 519.421875 Z M 1474.742188 519.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 1394 556 L 1418 556 M 1394 532 L 1418 532 M 1394 532 L 1394 556 M 1418 532 L 1418 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 1394 556 L 1418 556 M 1394 532 L 1418 532 M 1418 556 L 1418 532 M 1394 556 L 1394 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/dfrtp/sky130_fd_sc_lp__dfrtp_1.svg b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.svg
index a5937f5..ab70a6d 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.svg
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_1.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="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 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="#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 584.5 607.5 L 606.5 607.5 L 606.5 667.5 L 584.5 667.5 Z M 807.5 607.5 L 829.5 607.5 L 829.5 667.5 L 807.5 667.5 Z M 646.5 607.5 L 667.5 607.5 L 667.5 667.5 L 646.5 667.5 Z M 532.5 607.5 L 554.5 607.5 L 554.5 667.5 L 532.5 667.5 Z M 756.5 607.5 L 777.5 607.5 L 777.5 667.5 L 756.5 667.5 Z M 1374.5 618.5 L 1396.5 618.5 L 1396.5 678.5 L 1374.5 678.5 Z M 1261.5 618.5 L 1282.5 618.5 L 1282.5 678.5 L 1261.5 678.5 Z M 1196.5 618.5 L 1218.5 618.5 L 1218.5 678.5 L 1196.5 678.5 Z M 1322.5 618.5 L 1344.5 618.5 L 1344.5 678.5 L 1322.5 678.5 Z M 258.5 632.5 L 280.5 632.5 L 280.5 692.5 L 258.5 692.5 Z M 359.5 632.5 L 380.5 632.5 L 380.5 692.5 L 359.5 692.5 Z M 885.5 637.5 L 906.5 637.5 L 906.5 697.5 L 885.5 697.5 Z M 1074.5 618.5 L 1096.5 618.5 L 1096.5 710.5 L 1074.5 710.5 Z M 1564.5 658.5 L 1586.5 658.5 L 1586.5 719.5 L 1564.5 719.5 Z M 1637.5 598.5 L 1659.5 598.5 L 1659.5 719.5 L 1637.5 719.5 Z M 979.5 637.5 L 1001.5 637.5 L 1001.5 729.5 L 979.5 729.5 Z M 979.5 637.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 457.5 331.5 L 479.5 331.5 L 479.5 391.5 L 457.5 391.5 Z M 581.5 331.5 L 602.5 331.5 L 602.5 391.5 L 581.5 391.5 Z M 776.5 331.5 L 798.5 331.5 L 798.5 391.5 L 776.5 391.5 Z M 519.5 331.5 L 540.5 331.5 L 540.5 391.5 L 519.5 391.5 Z M 648.5 331.5 L 669.5 331.5 L 669.5 391.5 L 648.5 391.5 Z M 700.5 331.5 L 721.5 331.5 L 721.5 391.5 L 700.5 391.5 Z M 1416.5 343.5 L 1437.5 343.5 L 1437.5 403.5 L 1416.5 403.5 Z M 1354.5 343.5 L 1375.5 343.5 L 1375.5 403.5 L 1354.5 403.5 Z M 1169.5 343.5 L 1190.5 343.5 L 1190.5 403.5 L 1169.5 403.5 Z M 1253.5 343.5 L 1275.5 343.5 L 1275.5 403.5 L 1253.5 403.5 Z M 258.5 350.5 L 280.5 350.5 L 280.5 442.5 L 258.5 442.5 Z M 320.5 350.5 L 342.5 350.5 L 342.5 442.5 L 320.5 442.5 Z M 1015.5 330.5 L 1037.5 330.5 L 1037.5 450.5 L 1015.5 450.5 Z M 1093.5 331.5 L 1115.5 331.5 L 1115.5 452.5 L 1093.5 452.5 Z M 1553.5 419.5 L 1575.5 419.5 L 1575.5 510.5 L 1553.5 510.5 Z M 1627.5 330.5 L 1648.5 330.5 L 1648.5 510.5 L 1627.5 510.5 Z M 1627.5 330.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1187.5 470.5 L 1212.5 470.5 L 1212.5 492.5 L 1187.5 492.5 Z M 1187.5 492.5 L 1212.5 492.5 L 1212.5 494.5 L 1187.5 494.5 Z M 361.5 470.5 L 385.5 470.5 L 385.5 494.5 L 361.5 494.5 Z M 705.5 470.5 L 730.5 470.5 L 730.5 494.5 L 705.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="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>
@@ -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 1366.136719 541.34375 L 1366.050781 542.6875 L 1365.839844 543.910156 L 1365.460938 545.046875 L 1364.957031 546.054688 L 1364.285156 547.023438 L 1363.484375 547.863281 L 1362.601562 548.578125 L 1361.675781 549.125 L 1360.625 549.546875 L 1359.53125 549.882812 L 1358.351562 550.050781 L 1357.089844 550.09375 L 1343.246094 550.09375 L 1343.246094 519.421875 L 1355.699219 519.421875 L 1357.511719 519.546875 L 1359.109375 519.84375 L 1360.539062 520.347656 L 1361.757812 521.0625 L 1362.8125 521.988281 L 1363.652344 523.125 L 1363.988281 523.753906 L 1364.285156 524.429688 L 1364.496094 525.058594 L 1364.664062 525.773438 L 1364.746094 526.488281 L 1364.789062 527.207031 L 1364.664062 528.71875 L 1364.285156 530.023438 L 1363.695312 531.246094 L 1362.851562 532.253906 L 1361.800781 533.179688 L 1360.539062 533.894531 L 1361.757812 534.441406 L 1362.8125 535.03125 L 1363.738281 535.703125 L 1364.496094 536.460938 L 1365.082031 537.261719 L 1365.546875 538.101562 L 1365.714844 538.609375 L 1365.839844 539.113281 L 1365.96875 539.617188 L 1366.050781 540.207031 L 1366.09375 540.753906 Z M 1360.875 527.753906 L 1360.75 526.488281 L 1360.371094 525.4375 L 1359.78125 524.511719 L 1358.941406 523.839844 L 1357.886719 523.335938 L 1356.585938 522.996094 L 1356.289062 522.996094 L 1355.996094 522.957031 L 1355.699219 522.914062 L 1355.027344 522.914062 L 1354.734375 522.871094 L 1347.160156 522.871094 L 1347.160156 532.632812 L 1354.734375 532.632812 L 1356.289062 532.550781 L 1357.636719 532.296875 L 1358.773438 531.832031 L 1359.613281 531.203125 L 1360.285156 530.359375 L 1360.707031 529.351562 L 1360.75 529.140625 L 1360.792969 528.886719 L 1360.832031 528.636719 L 1360.832031 528.046875 Z M 1356.710938 546.644531 L 1357.886719 546.601562 L 1358.941406 546.351562 L 1359.867188 545.929688 L 1360.625 545.382812 L 1361.253906 544.667969 L 1361.757812 543.785156 L 1361.886719 543.445312 L 1361.96875 543.066406 L 1362.097656 542.648438 L 1362.136719 542.269531 L 1362.179688 541.847656 L 1362.222656 541.386719 L 1362.136719 540.460938 L 1361.96875 539.574219 L 1361.675781 538.820312 L 1361.253906 538.101562 L 1360.707031 537.515625 L 1360.078125 536.96875 L 1359.613281 536.714844 L 1359.109375 536.503906 L 1358.5625 536.335938 L 1357.972656 536.210938 L 1357.339844 536.125 L 1356.710938 536.082031 L 1347.160156 536.082031 L 1347.160156 546.644531 Z M 1356.710938 546.644531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1256 556 L 1281 556 M 1256 532 L 1281 532 M 1256 532 L 1256 556 M 1281 532 L 1281 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 1256 556 L 1281 556 M 1256 532 L 1281 532 M 1281 556 L 1281 532 M 1256 556 L 1256 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/dfrtp/sky130_fd_sc_lp__dfrtp_2.svg b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.svg
index deec0f7..376d08f 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.svg
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 536.5 L 174.5 536.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask 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="#image373"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1274.5 620.5 L 1295.5 620.5 L 1295.5 678.5 L 1274.5 678.5 Z M 1324.5 620.5 L 1344.5 620.5 L 1344.5 678.5 L 1324.5 678.5 Z M 1141.5 620.5 L 1162.5 620.5 L 1162.5 678.5 L 1141.5 678.5 Z M 1215.5 620.5 L 1236.5 620.5 L 1236.5 678.5 L 1215.5 678.5 Z M 737.5 624.5 L 758.5 624.5 L 758.5 682.5 L 737.5 682.5 Z M 582.5 624.5 L 602.5 624.5 L 602.5 682.5 L 582.5 682.5 Z M 641.5 624.5 L 661.5 624.5 L 661.5 682.5 L 641.5 682.5 Z M 786.5 624.5 L 807.5 624.5 L 807.5 682.5 L 786.5 682.5 Z M 861.5 632.5 L 881.5 632.5 L 881.5 690.5 L 861.5 690.5 Z M 255.5 636.5 L 276.5 636.5 L 276.5 694.5 L 255.5 694.5 Z M 339.5 636.5 L 359.5 636.5 L 359.5 694.5 L 339.5 694.5 Z M 512.5 652.5 L 532.5 652.5 L 532.5 710.5 L 512.5 710.5 Z M 973.5 632.5 L 993.5 632.5 L 993.5 720.5 L 973.5 720.5 Z M 1056.5 632.5 L 1076.5 632.5 L 1076.5 720.5 L 1056.5 720.5 Z M 1579.5 616.5 L 1600.5 616.5 L 1600.5 731.5 L 1579.5 731.5 Z M 1498.5 674.5 L 1519.5 674.5 L 1519.5 731.5 L 1498.5 731.5 Z M 1638.5 616.5 L 1659.5 616.5 L 1659.5 731.5 L 1638.5 731.5 Z M 1638.5 616.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image402"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1379.5 338.5 L 1399.5 338.5 L 1399.5 396.5 L 1379.5 396.5 Z M 514.5 338.5 L 535.5 338.5 L 535.5 396.5 L 514.5 396.5 Z M 750.5 338.5 L 771.5 338.5 L 771.5 396.5 L 750.5 396.5 Z M 574.5 338.5 L 594.5 338.5 L 594.5 396.5 L 574.5 396.5 Z M 1112.5 338.5 L 1133.5 338.5 L 1133.5 396.5 L 1112.5 396.5 Z M 1320.5 338.5 L 1340.5 338.5 L 1340.5 396.5 L 1320.5 396.5 Z M 1162.5 338.5 L 1182.5 338.5 L 1182.5 396.5 L 1162.5 396.5 Z M 455.5 338.5 L 476.5 338.5 L 476.5 396.5 L 455.5 396.5 Z M 638.5 338.5 L 659.5 338.5 L 659.5 396.5 L 638.5 396.5 Z M 688.5 338.5 L 708.5 338.5 L 708.5 396.5 L 688.5 396.5 Z M 1509.5 338.5 L 1530.5 338.5 L 1530.5 426.5 L 1509.5 426.5 Z M 255.5 357.5 L 276.5 357.5 L 276.5 445.5 L 255.5 445.5 Z M 314.5 357.5 L 335.5 357.5 L 335.5 445.5 L 314.5 445.5 Z M 1040.5 338.5 L 1061.5 338.5 L 1061.5 454.5 L 1040.5 454.5 Z M 981.5 338.5 L 1002.5 338.5 L 1002.5 454.5 L 981.5 454.5 Z M 1638.5 338.5 L 1659.5 338.5 L 1659.5 511.5 L 1638.5 511.5 Z M 1579.5 338.5 L 1600.5 338.5 L 1600.5 511.5 L 1579.5 511.5 Z M 1579.5 338.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image403"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 222.5 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 1145.5 523.5 L 1168.5 523.5 L 1168.5 529.5 L 1145.5 529.5 Z M 1145.5 529.5 L 1168.5 529.5 L 1168.5 546.5 L 1145.5 546.5 Z M 420.5 523.5 L 443.5 523.5 L 443.5 546.5 L 420.5 546.5 Z M 683.5 523.5 L 707.5 523.5 L 707.5 546.5 L 683.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="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image404"/>
 </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="surface398">
 <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 1634.3125 397.140625 L 1632.402344 399.5 L 1628.132812 395.960938 L 1626.910156 396.613281 L 1625.691406 397.101562 L 1624.429688 397.507812 L 1623.085938 397.792969 L 1621.746094 397.953125 L 1620.363281 398.035156 L 1618.492188 397.914062 L 1616.742188 397.628906 L 1615.117188 397.140625 L 1613.570312 396.488281 L 1612.105469 395.636719 L 1610.804688 394.539062 L 1609.625 393.359375 L 1608.609375 392.015625 L 1607.792969 390.550781 L 1607.101562 388.964844 L 1606.574219 387.257812 L 1606.25 385.386719 L 1606.167969 384.9375 L 1606.125 384.449219 L 1606.085938 384.003906 L 1606.046875 383.515625 L 1606.046875 382.5 L 1606.125 380.464844 L 1606.410156 378.511719 L 1606.859375 376.722656 L 1607.511719 375.015625 L 1608.324219 373.429688 L 1609.378906 371.964844 L 1610.4375 370.785156 L 1611.660156 369.726562 L 1613 368.832031 L 1614.425781 368.140625 L 1615.96875 367.570312 L 1617.679688 367.164062 L 1618.085938 367.125 L 1618.53125 367.082031 L 1618.980469 367.042969 L 1619.425781 367.003906 L 1619.875 367.003906 L 1620.363281 366.960938 L 1622.191406 367.082031 L 1623.941406 367.367188 L 1625.570312 367.855469 L 1627.113281 368.507812 L 1628.578125 369.359375 L 1629.921875 370.417969 L 1631.058594 371.640625 L 1632.078125 372.941406 L 1632.890625 374.363281 L 1633.582031 375.949219 L 1634.109375 377.660156 L 1634.476562 379.449219 L 1634.515625 379.976562 L 1634.558594 380.464844 L 1634.597656 380.953125 L 1634.640625 381.441406 L 1634.640625 381.929688 L 1634.679688 382.417969 L 1634.558594 384.695312 L 1634.191406 386.851562 L 1633.621094 388.84375 L 1632.808594 390.714844 L 1631.75 392.421875 L 1630.488281 394.007812 Z M 1624.0625 388.761719 L 1627.683594 391.730469 L 1628.660156 390.511719 L 1629.472656 389.128906 L 1630.082031 387.625 L 1630.53125 386.039062 L 1630.773438 384.328125 L 1630.898438 382.457031 L 1630.816406 380.75 L 1630.570312 379.121094 L 1630.164062 377.617188 L 1629.636719 376.234375 L 1628.945312 374.933594 L 1628.089844 373.753906 L 1627.113281 372.777344 L 1626.097656 371.964844 L 1624.957031 371.3125 L 1623.738281 370.824219 L 1622.394531 370.5 L 1621.011719 370.296875 L 1620.363281 370.296875 L 1618.898438 370.417969 L 1617.515625 370.664062 L 1616.214844 371.070312 L 1615.035156 371.679688 L 1613.9375 372.453125 L 1612.960938 373.386719 L 1612.023438 374.484375 L 1611.292969 375.707031 L 1610.683594 377.046875 L 1610.234375 378.511719 L 1609.949219 380.097656 L 1609.828125 381.808594 L 1609.828125 382.5 L 1609.867188 384.289062 L 1610.113281 385.914062 L 1610.519531 387.421875 L 1611.046875 388.84375 L 1611.78125 390.144531 L 1612.675781 391.285156 L 1613.609375 392.300781 L 1614.667969 393.113281 L 1615.808594 393.765625 L 1617.027344 394.210938 L 1618.371094 394.539062 L 1619.792969 394.660156 L 1619.875 394.699219 L 1621.054688 394.699219 L 1621.828125 394.621094 L 1622.597656 394.457031 L 1623.332031 394.292969 L 1624.0625 394.050781 L 1624.835938 393.722656 L 1624.878906 393.722656 L 1624.957031 393.683594 L 1625 393.644531 L 1625.082031 393.644531 L 1625.121094 393.601562 L 1625.203125 393.5625 L 1622.191406 391.039062 Z M 1624.0625 388.761719 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 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/dfrtp/sky130_fd_sc_lp__dfrtp_4.svg b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.svg
index 55f256b..20e0a01 100644
--- a/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.svg
+++ b/cells/dfrtp/sky130_fd_sc_lp__dfrtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 299.5 L 1744.5 299.5 L 1744.5 536.5 L 174.5 536.5 Z M 174.5 299.5 "/>
 </clipPath>
-<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image416" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image388"/>
+  <use xlink:href="#image416"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image388"/>
+  <use xlink:href="#image416"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1166.5 608.5 L 1185.5 608.5 L 1185.5 661.5 L 1166.5 661.5 Z M 1255.5 608.5 L 1274.5 608.5 L 1274.5 661.5 L 1255.5 661.5 Z M 1098.5 608.5 L 1117.5 608.5 L 1117.5 661.5 L 1098.5 661.5 Z M 1301.5 608.5 L 1320.5 608.5 L 1320.5 661.5 L 1301.5 661.5 Z M 561.5 617.5 L 580.5 617.5 L 580.5 670.5 L 561.5 670.5 Z M 516.5 617.5 L 535.5 617.5 L 535.5 670.5 L 516.5 670.5 Z M 616.5 617.5 L 635.5 617.5 L 635.5 670.5 L 616.5 670.5 Z M 753.5 617.5 L 772.5 617.5 L 772.5 670.5 L 753.5 670.5 Z M 705.5 617.5 L 724.5 617.5 L 724.5 670.5 L 705.5 670.5 Z M 821.5 626.5 L 840.5 626.5 L 840.5 679.5 L 821.5 679.5 Z M 249.5 635.5 L 268.5 635.5 L 268.5 689.5 L 249.5 689.5 Z M 355.5 635.5 L 374.5 635.5 L 374.5 689.5 L 355.5 689.5 Z M 989.5 626.5 L 1008.5 626.5 L 1008.5 707.5 L 989.5 707.5 Z M 905.5 626.5 L 924.5 626.5 L 924.5 707.5 L 905.5 707.5 Z M 1539.5 609.5 L 1559.5 609.5 L 1559.5 716.5 L 1539.5 716.5 Z M 1430.5 609.5 L 1449.5 609.5 L 1449.5 716.5 L 1430.5 716.5 Z M 1649.5 609.5 L 1668.5 609.5 L 1668.5 716.5 L 1649.5 716.5 Z M 1485.5 609.5 L 1504.5 609.5 L 1504.5 716.5 L 1485.5 716.5 Z M 1594.5 609.5 L 1613.5 609.5 L 1613.5 716.5 L 1594.5 716.5 Z M 1594.5 609.5 "/>
 </clipPath>
-<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image389"/>
+  <use xlink:href="#image417"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 447.5 353.5 L 466.5 353.5 L 466.5 407.5 L 447.5 407.5 Z M 502.5 353.5 L 521.5 353.5 L 521.5 407.5 L 502.5 407.5 Z M 726.5 353.5 L 745.5 353.5 L 745.5 407.5 L 726.5 407.5 Z M 556.5 353.5 L 575.5 353.5 L 575.5 407.5 L 556.5 407.5 Z M 616.5 353.5 L 635.5 353.5 L 635.5 407.5 L 616.5 407.5 Z M 662.5 353.5 L 681.5 353.5 L 681.5 407.5 L 662.5 407.5 Z M 1243.5 383.5 L 1262.5 383.5 L 1262.5 436.5 L 1243.5 436.5 Z M 1054.5 383.5 L 1073.5 383.5 L 1073.5 436.5 L 1054.5 436.5 Z M 1301.5 383.5 L 1320.5 383.5 L 1320.5 436.5 L 1301.5 436.5 Z M 1133.5 383.5 L 1152.5 383.5 L 1152.5 436.5 L 1133.5 436.5 Z M 262.5 372.5 L 281.5 372.5 L 281.5 453.5 L 262.5 453.5 Z M 316.5 372.5 L 335.5 372.5 L 335.5 453.5 L 316.5 453.5 Z M 920.5 355.5 L 939.5 355.5 L 939.5 461.5 L 920.5 461.5 Z M 975.5 355.5 L 994.5 355.5 L 994.5 461.5 L 975.5 461.5 Z M 1430.5 353.5 L 1449.5 353.5 L 1449.5 513.5 L 1430.5 513.5 Z M 1539.5 353.5 L 1559.5 353.5 L 1559.5 513.5 L 1539.5 513.5 Z M 1649.5 353.5 L 1668.5 353.5 L 1668.5 513.5 L 1649.5 513.5 Z M 1594.5 353.5 L 1613.5 353.5 L 1613.5 513.5 L 1594.5 513.5 Z M 1485.5 353.5 L 1504.5 353.5 L 1504.5 513.5 L 1485.5 513.5 Z M 1485.5 353.5 "/>
 </clipPath>
-<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image418" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image390"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 340.5 477.5 L 361.5 477.5 L 361.5 498.5 L 340.5 498.5 Z M 1070.5 477.5 L 1091.5 477.5 L 1091.5 498.5 L 1070.5 498.5 Z M 705.5 477.5 L 726.5 477.5 L 726.5 498.5 L 705.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="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface385">
+<g id="surface413">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1642.230469 642.386719 L 1640.515625 644.5 L 1636.6875 641.328125 L 1635.59375 641.910156 L 1634.5 642.347656 L 1633.367188 642.714844 L 1632.164062 642.96875 L 1630.960938 643.113281 L 1629.722656 643.1875 L 1628.042969 643.078125 L 1626.476562 642.824219 L 1625.015625 642.386719 L 1623.632812 641.800781 L 1622.320312 641.035156 L 1621.152344 640.050781 L 1620.09375 638.992188 L 1619.183594 637.789062 L 1618.453125 636.476562 L 1617.832031 635.054688 L 1617.359375 633.523438 L 1617.066406 631.847656 L 1616.996094 631.445312 L 1616.957031 631.007812 L 1616.921875 630.605469 L 1616.886719 630.167969 L 1616.886719 629.257812 L 1616.957031 627.433594 L 1617.214844 625.683594 L 1617.613281 624.078125 L 1618.199219 622.546875 L 1618.929688 621.125 L 1619.875 619.8125 L 1620.824219 618.753906 L 1621.917969 617.808594 L 1623.121094 617.003906 L 1624.398438 616.386719 L 1625.785156 615.875 L 1627.316406 615.511719 L 1627.679688 615.472656 L 1628.082031 615.4375 L 1628.480469 615.402344 L 1628.882812 615.363281 L 1629.285156 615.363281 L 1629.722656 615.328125 L 1631.363281 615.4375 L 1632.929688 615.691406 L 1634.390625 616.128906 L 1635.773438 616.714844 L 1637.085938 617.480469 L 1638.292969 618.425781 L 1639.3125 619.519531 L 1640.222656 620.6875 L 1640.953125 621.964844 L 1641.574219 623.386719 L 1642.046875 624.917969 L 1642.375 626.523438 L 1642.410156 626.996094 L 1642.449219 627.433594 L 1642.519531 628.308594 L 1642.519531 628.746094 L 1642.558594 629.183594 L 1642.449219 631.226562 L 1642.121094 633.160156 L 1641.609375 634.945312 L 1640.878906 636.625 L 1639.933594 638.15625 L 1638.800781 639.578125 Z M 1633.039062 634.875 L 1636.285156 637.535156 L 1637.160156 636.441406 L 1637.890625 635.203125 L 1638.4375 633.851562 L 1638.839844 632.429688 L 1639.058594 630.898438 L 1639.167969 629.222656 L 1639.09375 627.6875 L 1638.875 626.230469 L 1638.511719 624.882812 L 1638.035156 623.640625 L 1637.414062 622.476562 L 1636.648438 621.417969 L 1635.773438 620.542969 L 1634.863281 619.8125 L 1633.84375 619.230469 L 1632.75 618.792969 L 1631.542969 618.5 L 1630.304688 618.316406 L 1629.722656 618.316406 L 1628.410156 618.425781 L 1627.167969 618.644531 L 1626.003906 619.011719 L 1624.945312 619.558594 L 1623.960938 620.25 L 1623.085938 621.089844 L 1622.246094 622.074219 L 1621.589844 623.167969 L 1621.042969 624.371094 L 1620.640625 625.683594 L 1620.386719 627.105469 L 1620.277344 628.636719 L 1620.277344 629.257812 L 1620.3125 630.863281 L 1620.53125 632.320312 L 1620.898438 633.667969 L 1621.371094 634.945312 L 1622.027344 636.113281 L 1622.828125 637.132812 L 1623.667969 638.046875 L 1624.617188 638.773438 L 1625.636719 639.359375 L 1626.730469 639.757812 L 1627.933594 640.050781 L 1629.210938 640.160156 L 1629.285156 640.195312 L 1630.339844 640.195312 L 1631.035156 640.125 L 1631.726562 639.976562 L 1632.382812 639.832031 L 1633.039062 639.613281 L 1633.734375 639.320312 L 1633.769531 639.320312 L 1633.84375 639.285156 L 1633.878906 639.25 L 1633.953125 639.25 L 1633.988281 639.210938 L 1634.0625 639.175781 L 1631.363281 636.914062 Z M 1633.039062 634.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 461 L 1639 461 M 1617 440 L 1639 440 M 1617 440 L 1617 461 M 1639 440 L 1639 461 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 461 L 1639 461 M 1617 440 L 1639 440 M 1639 461 L 1639 440 M 1617 461 L 1617 440 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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_lp__dfsbp_1.svg b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.svg
index f7c26f1..98b5c48 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.svg
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 308.5 L 1743.5 308.5 L 1743.5 536.5 L 174.5 536.5 Z M 174.5 308.5 "/>
 </clipPath>
-<image id="image581" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image608" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image581"/>
+  <use xlink:href="#image608"/>
 </pattern>
 <mask 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="#image581"/>
+  <use xlink:href="#image608"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 811.5 583.5 L 829.5 583.5 L 829.5 634.5 L 811.5 634.5 Z M 767.5 583.5 L 785.5 583.5 L 785.5 634.5 L 767.5 634.5 Z M 247.5 591.5 L 265.5 591.5 L 265.5 642.5 L 247.5 642.5 Z M 991.5 594.5 L 1009.5 594.5 L 1009.5 645.5 L 991.5 645.5 Z M 875.5 583.5 L 893.5 583.5 L 893.5 661.5 L 875.5 661.5 Z M 629.5 614.5 L 647.5 614.5 L 647.5 665.5 L 629.5 665.5 Z M 480.5 614.5 L 499.5 614.5 L 499.5 665.5 L 480.5 665.5 Z M 381.5 614.5 L 400.5 614.5 L 400.5 665.5 L 381.5 665.5 Z M 585.5 614.5 L 604.5 614.5 L 604.5 665.5 L 585.5 665.5 Z M 533.5 614.5 L 551.5 614.5 L 551.5 665.5 L 533.5 665.5 Z M 1402.5 614.5 L 1420.5 614.5 L 1420.5 665.5 L 1402.5 665.5 Z M 1350.5 614.5 L 1368.5 614.5 L 1368.5 665.5 L 1350.5 665.5 Z M 1057.5 594.5 L 1076.5 594.5 L 1076.5 672.5 L 1057.5 672.5 Z M 1190.5 643.5 L 1208.5 643.5 L 1208.5 694.5 L 1190.5 694.5 Z M 1234.5 643.5 L 1252.5 643.5 L 1252.5 694.5 L 1234.5 694.5 Z M 1653.5 601.5 L 1671.5 601.5 L 1671.5 703.5 L 1653.5 703.5 Z M 1581.5 601.5 L 1600.5 601.5 L 1600.5 703.5 L 1581.5 703.5 Z M 1581.5 601.5 "/>
 </clipPath>
-<image id="image582" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image609" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image582"/>
+  <use xlink:href="#image609"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 598.5 361.5 L 616.5 361.5 L 616.5 412.5 L 598.5 412.5 Z M 880.5 361.5 L 899.5 361.5 L 899.5 412.5 L 880.5 412.5 Z M 546.5 361.5 L 564.5 361.5 L 564.5 412.5 L 546.5 412.5 Z M 493.5 361.5 L 511.5 361.5 L 511.5 412.5 L 493.5 412.5 Z M 642.5 361.5 L 660.5 361.5 L 660.5 412.5 L 642.5 412.5 Z M 828.5 361.5 L 846.5 361.5 L 846.5 412.5 L 828.5 412.5 Z M 410.5 376.5 L 428.5 376.5 L 428.5 454.5 L 410.5 454.5 Z M 247.5 381.5 L 265.5 381.5 L 265.5 459.5 L 247.5 459.5 Z M 947.5 361.5 L 965.5 361.5 L 965.5 464.5 L 947.5 464.5 Z M 1013.5 361.5 L 1031.5 361.5 L 1031.5 464.5 L 1013.5 464.5 Z M 1186.5 412.5 L 1204.5 412.5 L 1204.5 464.5 L 1186.5 464.5 Z M 1134.5 412.5 L 1152.5 412.5 L 1152.5 464.5 L 1134.5 464.5 Z M 1077.5 412.5 L 1095.5 412.5 L 1095.5 464.5 L 1077.5 464.5 Z M 1408.5 397.5 L 1426.5 397.5 L 1426.5 475.5 L 1408.5 475.5 Z M 1341.5 423.5 L 1359.5 423.5 L 1359.5 475.5 L 1341.5 475.5 Z M 1578.5 360.5 L 1596.5 360.5 L 1596.5 514.5 L 1578.5 514.5 Z M 1630.5 360.5 L 1648.5 360.5 L 1648.5 514.5 L 1630.5 514.5 Z M 1630.5 360.5 "/>
 </clipPath>
-<image id="image583" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image610" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image583"/>
+  <use xlink:href="#image610"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 216.5 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="image584" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image611" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image584"/>
+  <use xlink:href="#image611"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface578">
+<g id="surface605">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -280,6 +280,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1725.855469 386.769531 L 1725.855469 412.328125 L 1722.171875 412.328125 L 1708.953125 391.605469 L 1708.953125 412.328125 L 1705.867188 412.328125 L 1705.867188 386.769531 L 1709.410156 386.769531 L 1722.769531 407.664062 L 1722.769531 386.769531 Z M 1725.855469 386.769531 "/>
 <path style="fill:none;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 690 L 1701 690 M 1680 670 L 1701 670 M 1680 670 L 1680 690 M 1701 670 L 1701 690 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 690 L 1701 690 M 1680 670 L 1701 670 M 1701 690 L 1701 670 M 1680 690 L 1680 670 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/dfsbp/sky130_fd_sc_lp__dfsbp_2.svg b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.svg
index e05cde5..03a514c 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_2.svg
+++ b/cells/dfsbp/sky130_fd_sc_lp__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 536.5 L 174.5 536.5 Z M 174.5 316.5 "/>
 </clipPath>
-<image id="image462" 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="#image462"/>
+  <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 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="#image462"/>
+  <use xlink:href="#image490"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 255.5 576.5 L 272.5 576.5 L 272.5 625.5 L 255.5 625.5 Z M 807.5 581.5 L 825.5 581.5 L 825.5 631.5 L 807.5 631.5 Z M 765.5 581.5 L 782.5 581.5 L 782.5 631.5 L 765.5 631.5 Z M 981.5 587.5 L 998.5 587.5 L 998.5 637.5 L 981.5 637.5 Z M 1319.5 604.5 L 1337.5 604.5 L 1337.5 653.5 L 1319.5 653.5 Z M 1494.5 604.5 L 1511.5 604.5 L 1511.5 653.5 L 1494.5 653.5 Z M 528.5 607.5 L 545.5 607.5 L 545.5 657.5 L 528.5 657.5 Z M 477.5 607.5 L 495.5 607.5 L 495.5 657.5 L 477.5 657.5 Z M 376.5 607.5 L 394.5 607.5 L 394.5 657.5 L 376.5 657.5 Z M 869.5 581.5 L 886.5 581.5 L 886.5 657.5 L 869.5 657.5 Z M 578.5 607.5 L 596.5 607.5 L 596.5 657.5 L 578.5 657.5 Z M 621.5 607.5 L 638.5 607.5 L 638.5 657.5 L 621.5 657.5 Z M 1042.5 587.5 L 1060.5 587.5 L 1060.5 663.5 L 1042.5 663.5 Z M 1208.5 627.5 L 1225.5 627.5 L 1225.5 677.5 L 1208.5 677.5 Z M 1165.5 627.5 L 1183.5 627.5 L 1183.5 677.5 L 1165.5 677.5 Z M 1605.5 585.5 L 1623.5 585.5 L 1623.5 684.5 L 1605.5 684.5 Z M 1656.5 585.5 L 1674.5 585.5 L 1674.5 684.5 L 1656.5 684.5 Z M 1381.5 604.5 L 1399.5 604.5 L 1399.5 703.5 L 1381.5 703.5 Z M 1432.5 604.5 L 1449.5 604.5 L 1449.5 703.5 L 1432.5 703.5 Z M 1432.5 604.5 "/>
 </clipPath>
-<image id="image463" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image491" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image463"/>
+  <use xlink:href="#image491"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 485.5 366.5 L 503.5 366.5 L 503.5 416.5 L 485.5 416.5 Z M 536.5 366.5 L 554.5 366.5 L 554.5 416.5 L 536.5 416.5 Z M 875.5 366.5 L 892.5 366.5 L 892.5 416.5 L 875.5 416.5 Z M 591.5 366.5 L 609.5 366.5 L 609.5 416.5 L 591.5 416.5 Z M 634.5 366.5 L 651.5 366.5 L 651.5 416.5 L 634.5 416.5 Z M 744.5 366.5 L 761.5 366.5 L 761.5 416.5 L 744.5 416.5 Z M 406.5 381.5 L 424.5 381.5 L 424.5 457.5 L 406.5 457.5 Z M 1098.5 416.5 L 1116.5 416.5 L 1116.5 465.5 L 1098.5 465.5 Z M 1149.5 416.5 L 1167.5 416.5 L 1167.5 465.5 L 1149.5 465.5 Z M 936.5 366.5 L 954.5 366.5 L 954.5 465.5 L 936.5 465.5 Z M 1042.5 416.5 L 1060.5 416.5 L 1060.5 465.5 L 1042.5 465.5 Z M 979.5 366.5 L 997.5 366.5 L 997.5 465.5 L 979.5 465.5 Z M 255.5 423.5 L 272.5 423.5 L 272.5 498.5 L 255.5 498.5 Z M 1377.5 366.5 L 1394.5 366.5 L 1394.5 514.5 L 1377.5 514.5 Z M 1605.5 366.5 L 1623.5 366.5 L 1623.5 514.5 L 1605.5 514.5 Z M 1489.5 439.5 L 1507.5 439.5 L 1507.5 514.5 L 1489.5 514.5 Z M 1315.5 465.5 L 1332.5 465.5 L 1332.5 514.5 L 1315.5 514.5 Z M 1656.5 366.5 L 1674.5 366.5 L 1674.5 514.5 L 1656.5 514.5 Z M 1427.5 366.5 L 1445.5 366.5 L 1445.5 514.5 L 1427.5 514.5 Z M 1427.5 366.5 "/>
 </clipPath>
-<image id="image464" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image492" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image464"/>
+  <use xlink:href="#image492"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 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="image465" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image493" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image465"/>
+  <use xlink:href="#image493"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface459">
+<g id="surface487">
 <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 1446.855469 390.769531 L 1446.855469 416.328125 L 1443.171875 416.328125 L 1429.953125 395.605469 L 1429.953125 416.328125 L 1426.867188 416.328125 L 1426.867188 390.769531 L 1430.410156 390.769531 L 1443.769531 411.664062 L 1443.769531 390.769531 Z M 1446.855469 390.769531 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1401 685 L 1421 685 M 1401 665 L 1421 665 M 1401 665 L 1401 685 M 1421 665 L 1421 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 1401 685 L 1421 685 M 1401 665 L 1421 665 M 1421 685 L 1421 665 M 1401 685 L 1401 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/dfsbp/sky130_fd_sc_lp__dfsbp_lp.svg b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.svg
index 3669ea3..b882b85 100644
--- a/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.svg
+++ b/cells/dfsbp/sky130_fd_sc_lp__dfsbp_lp.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 174.5 331.5 "/>
 </clipPath>
-<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image320"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image320"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1068.5 602.5 L 1084.5 602.5 L 1084.5 648.5 L 1068.5 648.5 Z M 1012.5 602.5 L 1029.5 602.5 L 1029.5 648.5 L 1012.5 648.5 Z M 969.5 602.5 L 986.5 602.5 L 986.5 648.5 L 969.5 648.5 Z M 714.5 602.5 L 731.5 602.5 L 731.5 648.5 L 714.5 648.5 Z M 907.5 602.5 L 923.5 602.5 L 923.5 648.5 L 907.5 648.5 Z M 864.5 602.5 L 880.5 602.5 L 880.5 648.5 L 864.5 648.5 Z M 675.5 602.5 L 691.5 602.5 L 691.5 648.5 L 675.5 648.5 Z M 383.5 609.5 L 400.5 609.5 L 400.5 655.5 L 383.5 655.5 Z M 470.5 609.5 L 486.5 609.5 L 486.5 655.5 L 470.5 655.5 Z M 509.5 609.5 L 526.5 609.5 L 526.5 655.5 L 509.5 655.5 Z M 423.5 609.5 L 439.5 609.5 L 439.5 655.5 L 423.5 655.5 Z M 614.5 622.5 L 630.5 622.5 L 630.5 668.5 L 614.5 668.5 Z M 1120.5 635.5 L 1137.5 635.5 L 1137.5 681.5 L 1120.5 681.5 Z M 1163.5 635.5 L 1179.5 635.5 L 1179.5 681.5 L 1163.5 681.5 Z M 1299.5 640.5 L 1315.5 640.5 L 1315.5 686.5 L 1299.5 686.5 Z M 1621.5 640.5 L 1637.5 640.5 L 1637.5 686.5 L 1621.5 686.5 Z M 1573.5 640.5 L 1590.5 640.5 L 1590.5 686.5 L 1573.5 686.5 Z M 1660.5 640.5 L 1676.5 640.5 L 1676.5 686.5 L 1660.5 686.5 Z M 1386.5 640.5 L 1402.5 640.5 L 1402.5 686.5 L 1386.5 686.5 Z M 1425.5 640.5 L 1442.5 640.5 L 1442.5 686.5 L 1425.5 686.5 Z M 239.5 640.5 L 255.5 640.5 L 255.5 686.5 L 239.5 686.5 Z M 1339.5 640.5 L 1355.5 640.5 L 1355.5 686.5 L 1339.5 686.5 Z M 1534.5 640.5 L 1550.5 640.5 L 1550.5 686.5 L 1534.5 686.5 Z M 278.5 640.5 L 295.5 640.5 L 295.5 686.5 L 278.5 686.5 Z M 278.5 640.5 "/>
 </clipPath>
-<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1170.5 377.5 L 1197.5 377.5 L 1197.5 487.5 L 1170.5 487.5 Z M 1247.5 377.5 L 1274.5 377.5 L 1274.5 487.5 L 1247.5 487.5 Z M 558.5 377.5 L 586.5 377.5 L 586.5 487.5 L 558.5 487.5 Z M 874.5 377.5 L 902.5 377.5 L 902.5 487.5 L 874.5 487.5 Z M 958.5 377.5 L 986.5 377.5 L 986.5 487.5 L 958.5 487.5 Z M 653.5 377.5 L 680.5 377.5 L 680.5 487.5 L 653.5 487.5 Z M 1012.5 377.5 L 1039.5 377.5 L 1039.5 487.5 L 1012.5 487.5 Z M 1111.5 377.5 L 1138.5 377.5 L 1138.5 487.5 L 1111.5 487.5 Z M 717.5 377.5 L 745.5 377.5 L 745.5 487.5 L 717.5 487.5 Z M 816.5 377.5 L 844.5 377.5 L 844.5 487.5 L 816.5 487.5 Z M 247.5 383.5 L 275.5 383.5 L 275.5 492.5 L 247.5 492.5 Z M 371.5 383.5 L 398.5 383.5 L 398.5 492.5 L 371.5 492.5 Z M 429.5 383.5 L 456.5 383.5 L 456.5 492.5 L 429.5 492.5 Z M 1366.5 388.5 L 1393.5 388.5 L 1393.5 497.5 L 1366.5 497.5 Z M 1443.5 388.5 L 1470.5 388.5 L 1470.5 497.5 L 1443.5 497.5 Z M 1562.5 402.5 L 1590.5 402.5 L 1590.5 512.5 L 1562.5 512.5 Z M 1621.5 402.5 L 1648.5 402.5 L 1648.5 512.5 L 1621.5 512.5 Z M 1621.5 402.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 897.5 484.5 L 915.5 484.5 L 915.5 503.5 L 897.5 503.5 Z M 1266.5 484.5 L 1284.5 484.5 L 1284.5 503.5 L 1266.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="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface317">
+<g id="surface344">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1709.144531 424.628906 L 1707.628906 426.5 L 1704.242188 423.695312 L 1703.273438 424.210938 L 1702.304688 424.597656 L 1701.304688 424.917969 L 1700.242188 425.144531 L 1699.175781 425.273438 L 1698.082031 425.339844 L 1696.597656 425.242188 L 1695.210938 425.015625 L 1693.917969 424.628906 L 1692.695312 424.113281 L 1691.53125 423.433594 L 1690.5 422.566406 L 1689.566406 421.628906 L 1688.757812 420.566406 L 1688.113281 419.402344 L 1687.566406 418.144531 L 1687.144531 416.789062 L 1686.886719 415.304688 L 1686.824219 414.953125 L 1686.789062 414.566406 L 1686.757812 414.210938 L 1686.726562 413.824219 L 1686.726562 413.015625 L 1686.789062 411.402344 L 1687.015625 409.855469 L 1687.371094 408.433594 L 1687.886719 407.082031 L 1688.53125 405.824219 L 1689.371094 404.660156 L 1690.210938 403.726562 L 1691.175781 402.886719 L 1692.242188 402.175781 L 1693.371094 401.628906 L 1694.597656 401.175781 L 1695.953125 400.855469 L 1696.273438 400.824219 L 1696.628906 400.789062 L 1697.339844 400.726562 L 1697.695312 400.726562 L 1698.082031 400.695312 L 1699.53125 400.789062 L 1700.917969 401.015625 L 1702.210938 401.402344 L 1703.433594 401.917969 L 1704.597656 402.597656 L 1705.660156 403.433594 L 1706.566406 404.402344 L 1707.371094 405.433594 L 1708.015625 406.566406 L 1708.566406 407.824219 L 1708.984375 409.175781 L 1709.273438 410.597656 L 1709.304688 411.015625 L 1709.339844 411.402344 L 1709.402344 412.175781 L 1709.402344 412.566406 L 1709.433594 412.953125 L 1709.339844 414.757812 L 1709.046875 416.46875 L 1708.597656 418.046875 L 1707.953125 419.53125 L 1707.113281 420.886719 L 1706.113281 422.144531 Z M 1701.015625 417.984375 L 1703.886719 420.339844 L 1704.660156 419.371094 L 1705.304688 418.273438 L 1705.789062 417.082031 L 1706.144531 415.824219 L 1706.339844 414.46875 L 1706.433594 412.984375 L 1706.371094 411.628906 L 1706.175781 410.339844 L 1705.855469 409.144531 L 1705.433594 408.046875 L 1704.886719 407.015625 L 1704.210938 406.082031 L 1703.433594 405.304688 L 1702.628906 404.660156 L 1701.726562 404.144531 L 1700.757812 403.757812 L 1699.695312 403.5 L 1698.597656 403.339844 L 1698.082031 403.339844 L 1696.917969 403.433594 L 1695.824219 403.628906 L 1694.789062 403.953125 L 1693.855469 404.433594 L 1692.984375 405.046875 L 1692.210938 405.789062 L 1691.46875 406.660156 L 1690.886719 407.628906 L 1690.402344 408.695312 L 1690.046875 409.855469 L 1689.824219 411.113281 L 1689.726562 412.46875 L 1689.726562 413.015625 L 1689.757812 414.433594 L 1689.953125 415.726562 L 1690.273438 416.917969 L 1690.695312 418.046875 L 1691.273438 419.082031 L 1691.984375 419.984375 L 1692.726562 420.789062 L 1693.566406 421.433594 L 1694.46875 421.953125 L 1695.433594 422.304688 L 1696.5 422.566406 L 1697.628906 422.660156 L 1697.695312 422.695312 L 1698.628906 422.695312 L 1699.242188 422.628906 L 1699.855469 422.5 L 1700.433594 422.371094 L 1701.015625 422.175781 L 1701.628906 421.917969 L 1701.660156 421.917969 L 1701.726562 421.886719 L 1701.757812 421.855469 L 1701.824219 421.855469 L 1701.855469 421.824219 L 1701.917969 421.789062 L 1699.53125 419.789062 Z M 1701.015625 417.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 1687 676 L 1706 676 M 1687 657 L 1706 657 M 1687 657 L 1687 676 M 1706 657 L 1706 676 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1687 676 L 1706 676 M 1687 657 L 1706 657 M 1706 676 L 1706 657 M 1687 676 L 1687 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 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/dfstp/sky130_fd_sc_lp__dfstp_1.svg b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.svg
index e846f69..9689572 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_1.svg
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_1.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 1353.5 536.5 L 1502.5 536.5 L 1502.5 569.5 L 1353.5 569.5 Z M 1353.5 536.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 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="#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 1553.5 620.5 L 1575.5 620.5 L 1575.5 680.5 L 1553.5 680.5 Z M 466.5 628.5 L 488.5 628.5 L 488.5 688.5 L 466.5 688.5 Z M 590.5 628.5 L 611.5 628.5 L 611.5 688.5 L 590.5 688.5 Z M 528.5 628.5 L 550.5 628.5 L 550.5 688.5 L 528.5 688.5 Z M 642.5 628.5 L 663.5 628.5 L 663.5 688.5 L 642.5 688.5 Z M 1279.5 648.5 L 1301.5 648.5 L 1301.5 708.5 L 1279.5 708.5 Z M 1103.5 648.5 L 1124.5 648.5 L 1124.5 708.5 L 1103.5 708.5 Z M 1154.5 648.5 L 1176.5 648.5 L 1176.5 708.5 L 1154.5 708.5 Z M 1206.5 648.5 L 1228.5 648.5 L 1228.5 708.5 L 1206.5 708.5 Z M 330.5 660.5 L 352.5 660.5 L 352.5 721.5 L 330.5 721.5 Z M 268.5 660.5 L 290.5 660.5 L 290.5 721.5 L 268.5 721.5 Z M 976.5 648.5 L 997.5 648.5 L 997.5 740.5 L 976.5 740.5 Z M 843.5 680.5 L 865.5 680.5 L 865.5 740.5 L 843.5 740.5 Z M 791.5 680.5 L 813.5 680.5 L 813.5 740.5 L 791.5 740.5 Z M 1027.5 648.5 L 1049.5 648.5 L 1049.5 740.5 L 1027.5 740.5 Z M 1627.5 620.5 L 1648.5 620.5 L 1648.5 740.5 L 1627.5 740.5 Z M 1627.5 620.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 324.5 350.5 L 346.5 350.5 L 346.5 442.5 L 324.5 442.5 Z M 597.5 381.5 L 619.5 381.5 L 619.5 442.5 L 597.5 442.5 Z M 788.5 381.5 L 809.5 381.5 L 809.5 442.5 L 788.5 442.5 Z M 1314.5 381.5 L 1335.5 381.5 L 1335.5 442.5 L 1314.5 442.5 Z M 1252.5 381.5 L 1274.5 381.5 L 1274.5 442.5 L 1252.5 442.5 Z M 535.5 381.5 L 557.5 381.5 L 557.5 442.5 L 535.5 442.5 Z M 474.5 381.5 L 495.5 381.5 L 495.5 442.5 L 474.5 442.5 Z M 263.5 350.5 L 284.5 350.5 L 284.5 442.5 L 263.5 442.5 Z M 649.5 381.5 L 670.5 381.5 L 670.5 442.5 L 649.5 442.5 Z M 726.5 381.5 L 748.5 381.5 L 748.5 442.5 L 726.5 442.5 Z M 1098.5 354.5 L 1119.5 354.5 L 1119.5 475.5 L 1098.5 475.5 Z M 1022.5 414.5 L 1044.5 414.5 L 1044.5 475.5 L 1022.5 475.5 Z M 886.5 381.5 L 908.5 381.5 L 908.5 502.5 L 886.5 502.5 Z M 1553.5 419.5 L 1575.5 419.5 L 1575.5 510.5 L 1553.5 510.5 Z M 1637.5 330.5 L 1659.5 330.5 L 1659.5 510.5 L 1637.5 510.5 Z M 1417.5 483.5 L 1439.5 483.5 L 1439.5 543.5 L 1417.5 543.5 Z M 1417.5 483.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 361.5 576.5 L 385.5 576.5 L 385.5 600.5 L 361.5 600.5 Z M 981.5 576.5 L 1005.5 576.5 L 1005.5 600.5 L 981.5 600.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="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>
@@ -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 1698.339844 391.058594 L 1696.363281 393.5 L 1691.945312 389.839844 L 1690.683594 390.511719 L 1689.421875 391.015625 L 1688.117188 391.4375 L 1686.730469 391.734375 L 1685.339844 391.902344 L 1683.910156 391.984375 L 1681.972656 391.859375 L 1680.164062 391.566406 L 1678.480469 391.058594 L 1676.882812 390.386719 L 1675.367188 389.503906 L 1674.023438 388.367188 L 1672.800781 387.148438 L 1671.75 385.757812 L 1670.90625 384.242188 L 1670.191406 382.601562 L 1669.644531 380.835938 L 1669.308594 378.898438 L 1669.226562 378.4375 L 1669.183594 377.933594 L 1669.140625 377.46875 L 1669.097656 376.964844 L 1669.097656 375.914062 L 1669.183594 373.808594 L 1669.476562 371.789062 L 1669.941406 369.9375 L 1670.613281 368.171875 L 1671.457031 366.53125 L 1672.550781 365.015625 L 1673.644531 363.792969 L 1674.90625 362.699219 L 1676.292969 361.773438 L 1677.765625 361.058594 L 1679.367188 360.46875 L 1681.132812 360.050781 L 1681.554688 360.007812 L 1682.015625 359.964844 L 1682.480469 359.921875 L 1682.941406 359.882812 L 1683.40625 359.882812 L 1683.910156 359.839844 L 1685.804688 359.964844 L 1687.613281 360.261719 L 1689.296875 360.765625 L 1690.894531 361.4375 L 1692.410156 362.320312 L 1693.796875 363.414062 L 1694.976562 364.679688 L 1696.027344 366.023438 L 1696.867188 367.496094 L 1697.585938 369.136719 L 1698.132812 370.90625 L 1698.511719 372.757812 L 1698.550781 373.304688 L 1698.636719 374.3125 L 1698.679688 374.820312 L 1698.679688 375.324219 L 1698.71875 375.828125 L 1698.59375 378.183594 L 1698.214844 380.414062 L 1697.625 382.476562 L 1696.785156 384.410156 L 1695.691406 386.179688 L 1694.386719 387.820312 Z M 1687.738281 382.390625 L 1691.484375 385.464844 L 1692.492188 384.203125 L 1693.335938 382.769531 L 1693.964844 381.214844 L 1694.429688 379.574219 L 1694.679688 377.804688 L 1694.808594 375.871094 L 1694.722656 374.101562 L 1694.46875 372.421875 L 1694.050781 370.863281 L 1693.503906 369.433594 L 1692.789062 368.085938 L 1691.902344 366.867188 L 1690.894531 365.855469 L 1689.84375 365.015625 L 1688.664062 364.339844 L 1687.402344 363.835938 L 1686.011719 363.5 L 1684.582031 363.289062 L 1683.910156 363.289062 L 1682.394531 363.414062 L 1680.964844 363.667969 L 1679.617188 364.089844 L 1678.398438 364.71875 L 1677.261719 365.519531 L 1676.25 366.488281 L 1675.285156 367.625 L 1674.527344 368.886719 L 1673.894531 370.273438 L 1673.433594 371.789062 L 1673.136719 373.429688 L 1673.011719 375.195312 L 1673.011719 375.914062 L 1673.054688 377.765625 L 1673.304688 379.445312 L 1673.726562 381.003906 L 1674.273438 382.476562 L 1675.03125 383.824219 L 1675.957031 385 L 1676.925781 386.050781 L 1678.019531 386.894531 L 1679.195312 387.566406 L 1680.460938 388.03125 L 1681.847656 388.367188 L 1683.320312 388.492188 L 1683.40625 388.535156 L 1684.625 388.535156 L 1685.425781 388.449219 L 1686.222656 388.28125 L 1686.980469 388.113281 L 1687.738281 387.863281 L 1688.539062 387.523438 L 1688.578125 387.523438 L 1688.664062 387.484375 L 1688.707031 387.441406 L 1688.789062 387.441406 L 1688.832031 387.398438 L 1688.917969 387.355469 L 1685.804688 384.75 Z M 1687.738281 382.390625 "/>
 <path style="fill:none;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 716 L 1694 716 M 1670 691 L 1694 691 M 1670 691 L 1670 716 M 1694 691 L 1694 716 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 716 L 1694 716 M 1670 691 L 1694 691 M 1694 716 L 1694 691 M 1670 716 L 1670 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,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/dfstp/sky130_fd_sc_lp__dfstp_2.svg b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.svg
index c5fe20b..114c03f 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_2.svg
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 536.5 L 174.5 536.5 Z M 1320.5 536.5 L 1463.5 536.5 L 1463.5 565.5 L 1320.5 565.5 Z M 1320.5 536.5 "/>
 </clipPath>
-<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image411"/>
+  <use xlink:href="#image438"/>
 </pattern>
 <mask 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="#image411"/>
+  <use xlink:href="#image438"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 455.5 624.5 L 475.5 624.5 L 475.5 682.5 L 455.5 682.5 Z M 573.5 624.5 L 593.5 624.5 L 593.5 682.5 L 573.5 682.5 Z M 514.5 624.5 L 534.5 624.5 L 534.5 682.5 L 514.5 682.5 Z M 622.5 624.5 L 643.5 624.5 L 643.5 682.5 L 622.5 682.5 Z M 1149.5 643.5 L 1170.5 643.5 L 1170.5 701.5 L 1149.5 701.5 Z M 1228.5 643.5 L 1249.5 643.5 L 1249.5 701.5 L 1228.5 701.5 Z M 1100.5 643.5 L 1120.5 643.5 L 1120.5 701.5 L 1100.5 701.5 Z M 1050.5 643.5 L 1071.5 643.5 L 1071.5 701.5 L 1050.5 701.5 Z M 260.5 655.5 L 280.5 655.5 L 280.5 713.5 L 260.5 713.5 Z M 324.5 655.5 L 345.5 655.5 L 345.5 713.5 L 324.5 713.5 Z M 1581.5 616.5 L 1602.5 616.5 L 1602.5 731.5 L 1581.5 731.5 Z M 1640.5 616.5 L 1661.5 616.5 L 1661.5 731.5 L 1640.5 731.5 Z M 926.5 643.5 L 947.5 643.5 L 947.5 731.5 L 926.5 731.5 Z M 769.5 674.5 L 789.5 674.5 L 789.5 731.5 L 769.5 731.5 Z M 1511.5 674.5 L 1532.5 674.5 L 1532.5 731.5 L 1511.5 731.5 Z M 818.5 674.5 L 839.5 674.5 L 839.5 731.5 L 818.5 731.5 Z M 975.5 643.5 L 996.5 643.5 L 996.5 731.5 L 975.5 731.5 Z M 975.5 643.5 "/>
 </clipPath>
-<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image439" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image412"/>
+  <use xlink:href="#image439"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 314.5 356.5 L 335.5 356.5 L 335.5 444.5 L 314.5 444.5 Z M 255.5 356.5 L 276.5 356.5 L 276.5 444.5 L 255.5 444.5 Z M 756.5 388.5 L 776.5 388.5 L 776.5 445.5 L 756.5 445.5 Z M 514.5 388.5 L 534.5 388.5 L 534.5 445.5 L 514.5 445.5 Z M 1271.5 388.5 L 1291.5 388.5 L 1291.5 445.5 L 1271.5 445.5 Z M 455.5 388.5 L 475.5 388.5 L 475.5 445.5 L 455.5 445.5 Z M 573.5 388.5 L 593.5 388.5 L 593.5 445.5 L 573.5 445.5 Z M 622.5 388.5 L 643.5 388.5 L 643.5 445.5 L 622.5 445.5 Z M 1212.5 388.5 L 1232.5 388.5 L 1232.5 445.5 L 1212.5 445.5 Z M 696.5 388.5 L 717.5 388.5 L 717.5 445.5 L 696.5 445.5 Z M 989.5 414.5 L 1010.5 414.5 L 1010.5 472.5 L 989.5 472.5 Z M 1064.5 356.5 L 1085.5 356.5 L 1085.5 472.5 L 1064.5 472.5 Z M 1511.5 403.5 L 1532.5 403.5 L 1532.5 491.5 L 1511.5 491.5 Z M 859.5 388.5 L 879.5 388.5 L 879.5 503.5 L 859.5 503.5 Z M 1640.5 338.5 L 1661.5 338.5 L 1661.5 511.5 L 1640.5 511.5 Z M 1581.5 338.5 L 1602.5 338.5 L 1602.5 511.5 L 1581.5 511.5 Z M 1381.5 483.5 L 1401.5 483.5 L 1401.5 540.5 L 1381.5 540.5 Z M 1381.5 483.5 "/>
 </clipPath>
-<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image440" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image413"/>
+  <use xlink:href="#image440"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 222.5 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 574.5 L 377.5 574.5 L 377.5 597.5 L 354.5 597.5 Z M 947.5 574.5 L 971.5 574.5 L 971.5 597.5 L 947.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="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image441" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface408">
+<g id="surface435">
 <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 1634.3125 397.140625 L 1632.402344 399.5 L 1628.132812 395.960938 L 1626.910156 396.613281 L 1625.691406 397.101562 L 1624.429688 397.507812 L 1623.085938 397.792969 L 1621.746094 397.953125 L 1620.363281 398.035156 L 1618.492188 397.914062 L 1616.742188 397.628906 L 1615.117188 397.140625 L 1613.570312 396.488281 L 1612.105469 395.636719 L 1610.804688 394.539062 L 1609.625 393.359375 L 1608.609375 392.015625 L 1607.792969 390.550781 L 1607.101562 388.964844 L 1606.574219 387.257812 L 1606.25 385.386719 L 1606.167969 384.9375 L 1606.125 384.449219 L 1606.085938 384.003906 L 1606.046875 383.515625 L 1606.046875 382.5 L 1606.125 380.464844 L 1606.410156 378.511719 L 1606.859375 376.722656 L 1607.511719 375.015625 L 1608.324219 373.429688 L 1609.378906 371.964844 L 1610.4375 370.785156 L 1611.660156 369.726562 L 1613 368.832031 L 1614.425781 368.140625 L 1615.96875 367.570312 L 1617.679688 367.164062 L 1618.085938 367.125 L 1618.53125 367.082031 L 1618.980469 367.042969 L 1619.425781 367.003906 L 1619.875 367.003906 L 1620.363281 366.960938 L 1622.191406 367.082031 L 1623.941406 367.367188 L 1625.570312 367.855469 L 1627.113281 368.507812 L 1628.578125 369.359375 L 1629.921875 370.417969 L 1631.058594 371.640625 L 1632.078125 372.941406 L 1632.890625 374.363281 L 1633.582031 375.949219 L 1634.109375 377.660156 L 1634.476562 379.449219 L 1634.515625 379.976562 L 1634.558594 380.464844 L 1634.597656 380.953125 L 1634.640625 381.441406 L 1634.640625 381.929688 L 1634.679688 382.417969 L 1634.558594 384.695312 L 1634.191406 386.851562 L 1633.621094 388.84375 L 1632.808594 390.714844 L 1631.75 392.421875 L 1630.488281 394.007812 Z M 1624.0625 388.761719 L 1627.683594 391.730469 L 1628.660156 390.511719 L 1629.472656 389.128906 L 1630.082031 387.625 L 1630.53125 386.039062 L 1630.773438 384.328125 L 1630.898438 382.457031 L 1630.816406 380.75 L 1630.570312 379.121094 L 1630.164062 377.617188 L 1629.636719 376.234375 L 1628.945312 374.933594 L 1628.089844 373.753906 L 1627.113281 372.777344 L 1626.097656 371.964844 L 1624.957031 371.3125 L 1623.738281 370.824219 L 1622.394531 370.5 L 1621.011719 370.296875 L 1620.363281 370.296875 L 1618.898438 370.417969 L 1617.515625 370.664062 L 1616.214844 371.070312 L 1615.035156 371.679688 L 1613.9375 372.453125 L 1612.960938 373.386719 L 1612.023438 374.484375 L 1611.292969 375.707031 L 1610.683594 377.046875 L 1610.234375 378.511719 L 1609.949219 380.097656 L 1609.828125 381.808594 L 1609.828125 382.5 L 1609.867188 384.289062 L 1610.113281 385.914062 L 1610.519531 387.421875 L 1611.046875 388.84375 L 1611.78125 390.144531 L 1612.675781 391.285156 L 1613.609375 392.300781 L 1614.667969 393.113281 L 1615.808594 393.765625 L 1617.027344 394.210938 L 1618.371094 394.539062 L 1619.792969 394.660156 L 1619.875 394.699219 L 1621.054688 394.699219 L 1621.828125 394.621094 L 1622.597656 394.457031 L 1623.332031 394.292969 L 1624.0625 394.050781 L 1624.835938 393.722656 L 1624.878906 393.722656 L 1624.957031 393.683594 L 1625 393.644531 L 1625.082031 393.644531 L 1625.121094 393.601562 L 1625.203125 393.5625 L 1622.191406 391.039062 Z M 1624.0625 388.761719 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 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/dfstp/sky130_fd_sc_lp__dfstp_4.svg b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.svg
index 825b7cd..32c688b 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_4.svg
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 308.5 L 1743.5 308.5 L 1743.5 536.5 L 174.5 536.5 Z M 1273.5 536.5 L 1400.5 536.5 L 1400.5 555.5 L 1273.5 555.5 Z M 1273.5 536.5 "/>
 </clipPath>
-<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image462" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image435"/>
+  <use xlink:href="#image462"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image435"/>
+  <use xlink:href="#image462"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 618.5 614.5 L 636.5 614.5 L 636.5 665.5 L 618.5 665.5 Z M 574.5 614.5 L 593.5 614.5 L 593.5 665.5 L 574.5 665.5 Z M 469.5 614.5 L 488.5 614.5 L 488.5 665.5 L 469.5 665.5 Z M 522.5 614.5 L 540.5 614.5 L 540.5 665.5 L 522.5 665.5 Z M 345.5 626.5 L 363.5 626.5 L 363.5 677.5 L 345.5 677.5 Z M 248.5 626.5 L 266.5 626.5 L 266.5 677.5 L 248.5 677.5 Z M 1006.5 631.5 L 1024.5 631.5 L 1024.5 682.5 L 1006.5 682.5 Z M 1050.5 631.5 L 1068.5 631.5 L 1068.5 682.5 L 1050.5 682.5 Z M 1094.5 631.5 L 1112.5 631.5 L 1112.5 682.5 L 1094.5 682.5 Z M 1188.5 631.5 L 1206.5 631.5 L 1206.5 682.5 L 1188.5 682.5 Z M 1443.5 605.5 L 1461.5 605.5 L 1461.5 708.5 L 1443.5 708.5 Z M 1600.5 605.5 L 1619.5 605.5 L 1619.5 708.5 L 1600.5 708.5 Z M 1495.5 605.5 L 1514.5 605.5 L 1514.5 708.5 L 1495.5 708.5 Z M 1653.5 605.5 L 1671.5 605.5 L 1671.5 708.5 L 1653.5 708.5 Z M 1548.5 605.5 L 1566.5 605.5 L 1566.5 708.5 L 1548.5 708.5 Z M 780.5 658.5 L 799.5 658.5 L 799.5 709.5 L 780.5 709.5 Z M 940.5 631.5 L 958.5 631.5 L 958.5 709.5 L 940.5 709.5 Z M 737.5 658.5 L 755.5 658.5 L 755.5 709.5 L 737.5 709.5 Z M 896.5 631.5 L 914.5 631.5 L 914.5 709.5 L 896.5 709.5 Z M 896.5 631.5 "/>
 </clipPath>
-<image id="image436" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image463" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image436"/>
+  <use xlink:href="#image463"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 319.5 376.5 L 338.5 376.5 L 338.5 454.5 L 319.5 454.5 Z M 267.5 376.5 L 285.5 376.5 L 285.5 454.5 L 267.5 454.5 Z M 644.5 404.5 L 662.5 404.5 L 662.5 455.5 L 644.5 455.5 Z M 547.5 404.5 L 566.5 404.5 L 566.5 455.5 L 547.5 455.5 Z M 710.5 404.5 L 729.5 404.5 L 729.5 455.5 L 710.5 455.5 Z M 763.5 404.5 L 781.5 404.5 L 781.5 455.5 L 763.5 455.5 Z M 600.5 404.5 L 618.5 404.5 L 618.5 455.5 L 600.5 455.5 Z M 495.5 404.5 L 513.5 404.5 L 513.5 455.5 L 495.5 455.5 Z M 1157.5 408.5 L 1176.5 408.5 L 1176.5 459.5 L 1157.5 459.5 Z M 1210.5 408.5 L 1228.5 408.5 L 1228.5 459.5 L 1210.5 459.5 Z M 962.5 438.5 L 981.5 438.5 L 981.5 489.5 L 962.5 489.5 Z M 1026.5 387.5 L 1045.5 387.5 L 1045.5 489.5 L 1026.5 489.5 Z M 846.5 404.5 L 865.5 404.5 L 865.5 506.5 L 846.5 506.5 Z M 1495.5 360.5 L 1514.5 360.5 L 1514.5 514.5 L 1495.5 514.5 Z M 1443.5 360.5 L 1461.5 360.5 L 1461.5 514.5 L 1443.5 514.5 Z M 1653.5 360.5 L 1671.5 360.5 L 1671.5 514.5 L 1653.5 514.5 Z M 1600.5 360.5 L 1619.5 360.5 L 1619.5 514.5 L 1600.5 514.5 Z M 1548.5 360.5 L 1566.5 360.5 L 1566.5 514.5 L 1548.5 514.5 Z M 1327.5 482.5 L 1345.5 482.5 L 1345.5 533.5 L 1327.5 533.5 Z M 1327.5 482.5 "/>
 </clipPath>
-<image id="image437" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image464" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image437"/>
+  <use xlink:href="#image464"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 392.5 569.5 L 413.5 569.5 L 413.5 590.5 L 392.5 590.5 Z M 860.5 569.5 L 881.5 569.5 L 881.5 590.5 L 860.5 590.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="image438" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image465" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image438"/>
+  <use xlink:href="#image465"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface432">
+<g id="surface459">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -215,6 +215,5 @@
 <path style=" 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/dfstp/sky130_fd_sc_lp__dfstp_lp.svg b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.svg
index 5974a23..d82f61d 100644
--- a/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.svg
+++ b/cells/dfstp/sky130_fd_sc_lp__dfstp_lp.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 1368.5 535.5 L 1521.5 535.5 L 1521.5 551.5 L 1368.5 551.5 Z M 1368.5 535.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <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 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="#image314"/>
+  <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 1045.5 605.5 L 1062.5 605.5 L 1062.5 652.5 L 1045.5 652.5 Z M 1134.5 605.5 L 1151.5 605.5 L 1151.5 652.5 L 1134.5 652.5 Z M 1253.5 605.5 L 1270.5 605.5 L 1270.5 652.5 L 1253.5 652.5 Z M 692.5 605.5 L 709.5 605.5 L 709.5 652.5 L 692.5 652.5 Z M 733.5 605.5 L 750.5 605.5 L 750.5 652.5 L 733.5 652.5 Z M 936.5 605.5 L 953.5 605.5 L 953.5 652.5 L 936.5 652.5 Z M 892.5 605.5 L 909.5 605.5 L 909.5 652.5 L 892.5 652.5 Z M 1178.5 605.5 L 1195.5 605.5 L 1195.5 652.5 L 1178.5 652.5 Z M 1001.5 605.5 L 1018.5 605.5 L 1018.5 652.5 L 1001.5 652.5 Z M 629.5 605.5 L 646.5 605.5 L 646.5 652.5 L 629.5 652.5 Z M 480.5 614.5 L 497.5 614.5 L 497.5 661.5 L 480.5 661.5 Z M 521.5 614.5 L 538.5 614.5 L 538.5 661.5 L 521.5 661.5 Z M 431.5 614.5 L 448.5 614.5 L 448.5 661.5 L 431.5 661.5 Z M 390.5 614.5 L 407.5 614.5 L 407.5 661.5 L 390.5 661.5 Z M 1526.5 634.5 L 1543.5 634.5 L 1543.5 681.5 L 1526.5 681.5 Z M 1567.5 634.5 L 1584.5 634.5 L 1584.5 681.5 L 1567.5 681.5 Z M 1657.5 634.5 L 1674.5 634.5 L 1674.5 681.5 L 1657.5 681.5 Z M 1616.5 634.5 L 1633.5 634.5 L 1633.5 681.5 L 1616.5 681.5 Z M 241.5 643.5 L 258.5 643.5 L 258.5 691.5 L 241.5 691.5 Z M 282.5 643.5 L 299.5 643.5 L 299.5 691.5 L 282.5 691.5 Z M 1373.5 649.5 L 1390.5 649.5 L 1390.5 697.5 L 1373.5 697.5 Z M 1414.5 649.5 L 1431.5 649.5 L 1431.5 697.5 L 1414.5 697.5 Z M 1414.5 649.5 "/>
 </clipPath>
-<image id="image315" 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="#image315"/>
+  <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 1297.5 372.5 L 1325.5 372.5 L 1325.5 485.5 L 1297.5 485.5 Z M 1045.5 372.5 L 1073.5 372.5 L 1073.5 485.5 L 1045.5 485.5 Z M 570.5 372.5 L 598.5 372.5 L 598.5 485.5 L 570.5 485.5 Z M 893.5 372.5 L 922.5 372.5 L 922.5 485.5 L 893.5 485.5 Z M 989.5 372.5 L 1018.5 372.5 L 1018.5 485.5 L 989.5 485.5 Z M 667.5 372.5 L 696.5 372.5 L 696.5 485.5 L 667.5 485.5 Z M 1208.5 372.5 L 1237.5 372.5 L 1237.5 485.5 L 1208.5 485.5 Z M 1147.5 372.5 L 1175.5 372.5 L 1175.5 485.5 L 1147.5 485.5 Z M 731.5 372.5 L 759.5 372.5 L 759.5 485.5 L 731.5 485.5 Z M 831.5 372.5 L 860.5 372.5 L 860.5 485.5 L 831.5 485.5 Z M 439.5 378.5 L 467.5 378.5 L 467.5 491.5 L 439.5 491.5 Z M 379.5 378.5 L 407.5 378.5 L 407.5 491.5 L 379.5 491.5 Z M 244.5 378.5 L 272.5 378.5 L 272.5 491.5 L 244.5 491.5 Z M 1624.5 397.5 L 1652.5 397.5 L 1652.5 511.5 L 1624.5 511.5 Z M 1564.5 397.5 L 1592.5 397.5 L 1592.5 511.5 L 1564.5 511.5 Z M 1421.5 417.5 L 1449.5 417.5 L 1449.5 531.5 L 1421.5 531.5 Z M 1421.5 417.5 "/>
 </clipPath>
-<image id="image316" 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="#image316"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 922.5 525.5 L 941.5 525.5 L 941.5 538.5 L 922.5 538.5 Z M 1303.5 525.5 L 1322.5 525.5 L 1322.5 543.5 L 1303.5 543.5 Z M 1303.5 543.5 L 1322.5 543.5 L 1322.5 544.5 L 1303.5 544.5 Z M 922.5 538.5 L 941.5 538.5 L 941.5 544.5 L 922.5 544.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="image317" 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="#image317"/>
+  <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="surface311">
+<g id="surface337">
 <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 1707.171875 420.546875 L 1705.589844 422.5 L 1702.058594 419.570312 L 1701.046875 420.109375 L 1700.039062 420.515625 L 1698.992188 420.851562 L 1697.882812 421.085938 L 1696.773438 421.222656 L 1695.628906 421.289062 L 1694.078125 421.1875 L 1692.632812 420.953125 L 1691.285156 420.546875 L 1690.007812 420.007812 L 1688.792969 419.300781 L 1687.71875 418.394531 L 1686.742188 417.417969 L 1685.898438 416.304688 L 1685.226562 415.09375 L 1684.652344 413.78125 L 1684.214844 412.367188 L 1683.949219 410.820312 L 1683.878906 410.449219 L 1683.847656 410.046875 L 1683.8125 409.675781 L 1683.777344 409.269531 L 1683.777344 408.429688 L 1683.847656 406.746094 L 1684.082031 405.132812 L 1684.453125 403.648438 L 1684.992188 402.234375 L 1685.664062 400.921875 L 1686.539062 399.710938 L 1687.414062 398.734375 L 1688.425781 397.859375 L 1689.535156 397.121094 L 1690.714844 396.546875 L 1691.992188 396.078125 L 1693.40625 395.738281 L 1693.742188 395.707031 L 1694.113281 395.671875 L 1694.484375 395.640625 L 1694.851562 395.605469 L 1695.222656 395.605469 L 1695.628906 395.570312 L 1697.140625 395.671875 L 1698.589844 395.90625 L 1699.9375 396.3125 L 1701.214844 396.851562 L 1702.425781 397.558594 L 1703.539062 398.433594 L 1704.480469 399.441406 L 1705.320312 400.519531 L 1705.996094 401.699219 L 1706.566406 403.011719 L 1707.003906 404.425781 L 1707.308594 405.90625 L 1707.339844 406.34375 L 1707.375 406.746094 L 1707.410156 407.152344 L 1707.441406 407.554688 L 1707.441406 407.957031 L 1707.476562 408.363281 L 1707.375 410.246094 L 1707.070312 412.03125 L 1706.601562 413.679688 L 1705.929688 415.230469 L 1705.050781 416.644531 L 1704.007812 417.957031 Z M 1698.691406 413.613281 L 1701.6875 416.070312 L 1702.496094 415.0625 L 1703.167969 413.917969 L 1703.671875 412.671875 L 1704.042969 411.359375 L 1704.246094 409.945312 L 1704.347656 408.394531 L 1704.277344 406.984375 L 1704.078125 405.636719 L 1703.738281 404.390625 L 1703.300781 403.246094 L 1702.730469 402.167969 L 1702.023438 401.191406 L 1701.214844 400.386719 L 1700.375 399.710938 L 1699.429688 399.171875 L 1698.421875 398.769531 L 1697.3125 398.5 L 1696.167969 398.332031 L 1695.628906 398.332031 L 1694.414062 398.433594 L 1693.269531 398.632812 L 1692.195312 398.972656 L 1691.21875 399.476562 L 1690.308594 400.117188 L 1689.5 400.890625 L 1688.726562 401.796875 L 1688.121094 402.808594 L 1687.617188 403.917969 L 1687.246094 405.132812 L 1687.011719 406.445312 L 1686.910156 407.859375 L 1686.910156 408.429688 L 1686.941406 409.910156 L 1687.144531 411.257812 L 1687.480469 412.503906 L 1687.917969 413.679688 L 1688.523438 414.757812 L 1689.265625 415.699219 L 1690.039062 416.542969 L 1690.914062 417.214844 L 1691.859375 417.753906 L 1692.867188 418.125 L 1693.976562 418.394531 L 1695.15625 418.496094 L 1695.222656 418.527344 L 1696.199219 418.527344 L 1696.839844 418.460938 L 1697.480469 418.324219 L 1698.085938 418.191406 L 1698.691406 417.988281 L 1699.332031 417.71875 L 1699.363281 417.71875 L 1699.429688 417.6875 L 1699.464844 417.652344 L 1699.53125 417.652344 L 1699.566406 417.621094 L 1699.632812 417.585938 L 1697.140625 415.5 Z M 1698.691406 413.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 680 L 1704 680 M 1685 661 L 1704 661 M 1685 661 L 1685 680 M 1704 661 L 1704 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 1685 680 L 1704 680 M 1685 661 L 1704 661 M 1704 680 L 1704 661 M 1685 680 L 1685 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/dfxbp/sky130_fd_sc_lp__dfxbp_1.svg b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.svg
index aa3d258..0bbe1a2 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_1.svg
+++ b/cells/dfxbp/sky130_fd_sc_lp__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 537.5 L 174.5 537.5 Z M 174.5 243.5 "/>
 </clipPath>
-<image id="image411" 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="#image411"/>
+  <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 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="#image411"/>
+  <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 1390.5 607.5 L 1414.5 607.5 L 1414.5 673.5 L 1390.5 673.5 Z M 882.5 603.5 L 905.5 603.5 L 905.5 703.5 L 882.5 703.5 Z M 434.5 637.5 L 458.5 637.5 L 458.5 703.5 L 434.5 703.5 Z M 964.5 637.5 L 988.5 637.5 L 988.5 703.5 L 964.5 703.5 Z M 1049.5 637.5 L 1073.5 637.5 L 1073.5 703.5 L 1049.5 703.5 Z M 695.5 637.5 L 719.5 637.5 L 719.5 703.5 L 695.5 703.5 Z M 1107.5 637.5 L 1131.5 637.5 L 1131.5 703.5 L 1107.5 703.5 Z M 752.5 637.5 L 775.5 637.5 L 775.5 703.5 L 752.5 703.5 Z M 628.5 637.5 L 651.5 637.5 L 651.5 703.5 L 628.5 703.5 Z M 560.5 637.5 L 584.5 637.5 L 584.5 703.5 L 560.5 703.5 Z M 267.5 666.5 L 290.5 666.5 L 290.5 733.5 L 267.5 733.5 Z M 1627.5 603.5 L 1651.5 603.5 L 1651.5 735.5 L 1627.5 735.5 Z M 1216.5 637.5 L 1239.5 637.5 L 1239.5 738.5 L 1216.5 738.5 Z M 1476.5 607.5 L 1500.5 607.5 L 1500.5 739.5 L 1476.5 739.5 Z M 1476.5 607.5 "/>
 </clipPath>
-<image id="image412" 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="#image412"/>
+  <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 691.5 339.5 L 715.5 339.5 L 715.5 405.5 L 691.5 405.5 Z M 267.5 328.5 L 290.5 328.5 L 290.5 429.5 L 267.5 429.5 Z M 416.5 332.5 L 440.5 332.5 L 440.5 433.5 L 416.5 433.5 Z M 526.5 367.5 L 550.5 367.5 L 550.5 433.5 L 526.5 433.5 Z M 771.5 367.5 L 795.5 367.5 L 795.5 433.5 L 771.5 433.5 Z M 594.5 367.5 L 617.5 367.5 L 617.5 433.5 L 594.5 433.5 Z M 992.5 367.5 L 1015.5 367.5 L 1015.5 499.5 L 992.5 499.5 Z M 882.5 367.5 L 905.5 367.5 L 905.5 499.5 L 882.5 499.5 Z M 1074.5 433.5 L 1098.5 433.5 L 1098.5 499.5 L 1074.5 499.5 Z M 1216.5 367.5 L 1239.5 367.5 L 1239.5 499.5 L 1216.5 499.5 Z M 1131.5 433.5 L 1154.5 433.5 L 1154.5 499.5 L 1131.5 499.5 Z M 1627.5 310.5 L 1651.5 310.5 L 1651.5 508.5 L 1627.5 508.5 Z M 1476.5 310.5 L 1500.5 310.5 L 1500.5 508.5 L 1476.5 508.5 Z M 1393.5 408.5 L 1417.5 408.5 L 1417.5 508.5 L 1393.5 508.5 Z M 1393.5 408.5 "/>
 </clipPath>
-<image id="image413" 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="#image413"/>
+  <use xlink:href="#image441"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image414" 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="#image414"/>
+  <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="surface408">
+<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 1693.425781 377.816406 L 1691.25 380.5 L 1686.390625 376.472656 L 1685.003906 377.214844 L 1683.613281 377.769531 L 1682.179688 378.230469 L 1680.652344 378.554688 L 1679.125 378.742188 L 1677.550781 378.832031 L 1675.421875 378.695312 L 1673.429688 378.371094 L 1671.578125 377.816406 L 1669.820312 377.074219 L 1668.15625 376.101562 L 1666.675781 374.851562 L 1665.332031 373.511719 L 1664.175781 371.984375 L 1663.25 370.316406 L 1662.460938 368.511719 L 1661.859375 366.570312 L 1661.488281 364.441406 L 1661.398438 363.929688 L 1661.351562 363.375 L 1661.304688 362.867188 L 1661.257812 362.3125 L 1661.257812 361.152344 L 1661.351562 358.839844 L 1661.675781 356.617188 L 1662.183594 354.582031 L 1662.925781 352.636719 L 1663.851562 350.832031 L 1665.054688 349.167969 L 1666.257812 347.824219 L 1667.644531 346.621094 L 1669.171875 345.601562 L 1670.792969 344.816406 L 1672.550781 344.167969 L 1674.496094 343.703125 L 1674.957031 343.660156 L 1675.46875 343.613281 L 1676.484375 343.519531 L 1676.996094 343.519531 L 1677.550781 343.472656 L 1679.632812 343.613281 L 1681.625 343.9375 L 1683.476562 344.492188 L 1685.234375 345.230469 L 1686.898438 346.203125 L 1688.425781 347.40625 L 1689.722656 348.796875 L 1690.878906 350.277344 L 1691.804688 351.898438 L 1692.59375 353.703125 L 1693.195312 355.644531 L 1693.609375 357.683594 L 1693.65625 358.285156 L 1693.796875 359.949219 L 1693.796875 360.503906 L 1693.84375 361.0625 L 1693.703125 363.652344 L 1693.285156 366.105469 L 1692.640625 368.375 L 1691.714844 370.503906 L 1690.511719 372.445312 L 1689.074219 374.25 Z M 1681.761719 368.28125 L 1685.882812 371.660156 L 1686.992188 370.269531 L 1687.917969 368.699219 L 1688.613281 366.984375 L 1689.121094 365.179688 L 1689.398438 363.234375 L 1689.539062 361.105469 L 1689.445312 359.164062 L 1689.167969 357.3125 L 1688.703125 355.597656 L 1688.101562 354.027344 L 1687.316406 352.542969 L 1686.34375 351.203125 L 1685.234375 350.09375 L 1684.078125 349.167969 L 1682.78125 348.425781 L 1681.390625 347.871094 L 1679.863281 347.5 L 1678.292969 347.269531 L 1677.550781 347.269531 L 1675.882812 347.40625 L 1674.3125 347.683594 L 1672.828125 348.148438 L 1671.488281 348.84375 L 1670.238281 349.722656 L 1669.125 350.785156 L 1668.0625 352.035156 L 1667.230469 353.425781 L 1666.535156 354.953125 L 1666.027344 356.617188 L 1665.703125 358.421875 L 1665.5625 360.367188 L 1665.5625 361.152344 L 1665.609375 363.191406 L 1665.886719 365.042969 L 1666.351562 366.753906 L 1666.953125 368.375 L 1667.785156 369.855469 L 1668.804688 371.152344 L 1669.867188 372.308594 L 1671.070312 373.234375 L 1672.367188 373.972656 L 1673.753906 374.484375 L 1675.28125 374.851562 L 1676.902344 374.992188 L 1676.996094 375.039062 L 1678.335938 375.039062 L 1679.214844 374.945312 L 1680.097656 374.761719 L 1680.929688 374.574219 L 1681.761719 374.296875 L 1682.640625 373.929688 L 1682.6875 373.929688 L 1682.78125 373.882812 L 1682.828125 373.835938 L 1682.917969 373.835938 L 1682.964844 373.789062 L 1683.058594 373.742188 L 1679.632812 370.875 Z M 1681.761719 368.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 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_lp__dfxbp_2.svg b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.svg
index ec4f8b8..fccb8fd 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.svg
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_2.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="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image367"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1327.5 615.5 L 1349.5 615.5 L 1349.5 675.5 L 1327.5 675.5 Z M 898.5 628.5 L 919.5 628.5 L 919.5 688.5 L 898.5 688.5 Z M 487.5 628.5 L 509.5 628.5 L 509.5 688.5 L 487.5 688.5 Z M 419.5 628.5 L 441.5 628.5 L 441.5 688.5 L 419.5 688.5 Z M 565.5 628.5 L 586.5 628.5 L 586.5 688.5 L 565.5 688.5 Z M 987.5 628.5 L 1008.5 628.5 L 1008.5 688.5 L 987.5 688.5 Z M 1040.5 628.5 L 1061.5 628.5 L 1061.5 688.5 L 1040.5 688.5 Z M 822.5 597.5 L 844.5 597.5 L 844.5 688.5 L 822.5 688.5 Z M 682.5 628.5 L 703.5 628.5 L 703.5 688.5 L 682.5 688.5 Z M 630.5 628.5 L 652.5 628.5 L 652.5 688.5 L 630.5 688.5 Z M 1139.5 628.5 L 1160.5 628.5 L 1160.5 720.5 L 1139.5 720.5 Z M 258.5 663.5 L 280.5 663.5 L 280.5 724.5 L 258.5 724.5 Z M 1569.5 615.5 L 1591.5 615.5 L 1591.5 736.5 L 1569.5 736.5 Z M 1484.5 615.5 L 1506.5 615.5 L 1506.5 736.5 L 1484.5 736.5 Z M 1631.5 615.5 L 1652.5 615.5 L 1652.5 736.5 L 1631.5 736.5 Z M 1423.5 615.5 L 1444.5 615.5 L 1444.5 736.5 L 1423.5 736.5 Z M 1423.5 615.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 659.5 356.5 L 681.5 356.5 L 681.5 416.5 L 659.5 416.5 Z M 408.5 350.5 L 430.5 350.5 L 430.5 442.5 L 408.5 442.5 Z M 509.5 381.5 L 530.5 381.5 L 530.5 442.5 L 509.5 442.5 Z M 733.5 381.5 L 754.5 381.5 L 754.5 442.5 L 733.5 442.5 Z M 570.5 381.5 L 592.5 381.5 L 592.5 442.5 L 570.5 442.5 Z M 258.5 353.5 L 280.5 353.5 L 280.5 445.5 L 258.5 445.5 Z M 1010.5 389.5 L 1031.5 389.5 L 1031.5 449.5 L 1010.5 449.5 Z M 1083.5 390.5 L 1104.5 390.5 L 1104.5 450.5 L 1083.5 450.5 Z M 1165.5 330.5 L 1186.5 330.5 L 1186.5 450.5 L 1165.5 450.5 Z M 822.5 389.5 L 844.5 389.5 L 844.5 509.5 L 822.5 509.5 Z M 884.5 389.5 L 906.5 389.5 L 906.5 509.5 L 884.5 509.5 Z M 1568.5 330.5 L 1590.5 330.5 L 1590.5 510.5 L 1568.5 510.5 Z M 1630.5 330.5 L 1652.5 330.5 L 1652.5 510.5 L 1630.5 510.5 Z M 1484.5 330.5 L 1506.5 330.5 L 1506.5 510.5 L 1484.5 510.5 Z M 1423.5 330.5 L 1444.5 330.5 L 1444.5 510.5 L 1423.5 510.5 Z M 1327.5 419.5 L 1349.5 419.5 L 1349.5 510.5 L 1327.5 510.5 Z M 1327.5 419.5 "/>
 </clipPath>
-<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image369"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface364">
+<g id="surface393">
 <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 501.246094 497.5 L 501.246094 466.828125 L 513.066406 466.828125 L 514.917969 466.953125 L 516.644531 467.289062 L 518.242188 467.878906 L 519.714844 468.636719 L 521.019531 469.6875 L 522.242188 470.90625 L 523.25 472.378906 L 524.09375 473.980469 L 524.722656 475.789062 L 525.1875 477.722656 L 525.4375 479.871094 L 525.566406 482.140625 L 525.4375 484.539062 L 525.144531 486.769531 L 524.640625 488.789062 L 523.964844 490.640625 L 523.082031 492.28125 L 521.988281 493.714844 L 520.808594 494.890625 L 519.503906 495.816406 L 518.074219 496.574219 L 516.519531 497.078125 L 514.835938 497.414062 L 513.066406 497.5 Z M 505.15625 494.050781 L 512.394531 494.050781 L 514.332031 493.921875 L 516.054688 493.460938 L 517.570312 492.660156 L 518.832031 491.609375 L 519.84375 490.179688 L 520.683594 488.453125 L 520.9375 487.570312 L 521.1875 486.644531 L 521.398438 485.632812 L 521.523438 484.539062 L 521.609375 483.40625 L 521.652344 482.183594 L 521.484375 479.449219 L 521.0625 477.050781 L 520.304688 474.988281 L 519.296875 473.347656 L 517.992188 472.003906 L 516.390625 471.035156 L 515.804688 470.824219 L 515.171875 470.613281 L 514.5 470.488281 L 513.824219 470.359375 L 513.109375 470.320312 L 512.394531 470.277344 L 505.15625 470.277344 Z M 505.15625 494.050781 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 499 609 L 523 609 M 499 585 L 523 585 M 499 585 L 499 609 M 523 585 L 523 609 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 499 609 L 523 609 M 499 585 L 523 585 M 523 609 L 523 585 M 499 609 L 499 585 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/dfxbp/sky130_fd_sc_lp__dfxbp_lp.svg b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.svg
index ed913c8..ff99948 100644
--- a/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.svg
+++ b/cells/dfxbp/sky130_fd_sc_lp__dfxbp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 316.5 L 1744.5 316.5 L 1744.5 536.5 L 174.5 536.5 Z M 381.5 536.5 L 900.5 536.5 L 900.5 547.5 L 381.5 547.5 Z M 761.5 547.5 L 900.5 547.5 L 900.5 551.5 L 761.5 551.5 Z M 381.5 547.5 L 581.5 547.5 L 581.5 561.5 L 381.5 561.5 Z M 381.5 547.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image391"/>
 </pattern>
 <mask 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="#image363"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask1">
 <rect 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 580.5 L 1055.5 580.5 L 1055.5 630.5 L 1037.5 630.5 Z M 967.5 591.5 L 984.5 591.5 L 984.5 640.5 L 967.5 640.5 Z M 1404.5 606.5 L 1421.5 606.5 L 1421.5 656.5 L 1404.5 656.5 Z M 1361.5 606.5 L 1379.5 606.5 L 1379.5 656.5 L 1361.5 656.5 Z M 1454.5 606.5 L 1472.5 606.5 L 1472.5 656.5 L 1454.5 656.5 Z M 1497.5 606.5 L 1514.5 606.5 L 1514.5 656.5 L 1497.5 656.5 Z M 796.5 607.5 L 814.5 607.5 L 814.5 657.5 L 796.5 657.5 Z M 838.5 607.5 L 856.5 607.5 L 856.5 657.5 L 838.5 657.5 Z M 516.5 611.5 L 534.5 611.5 L 534.5 660.5 L 516.5 660.5 Z M 670.5 611.5 L 688.5 611.5 L 688.5 660.5 L 670.5 660.5 Z M 628.5 611.5 L 645.5 611.5 L 645.5 660.5 L 628.5 660.5 Z M 558.5 611.5 L 576.5 611.5 L 576.5 660.5 L 558.5 660.5 Z M 295.5 631.5 L 312.5 631.5 L 312.5 680.5 L 295.5 680.5 Z M 252.5 631.5 L 270.5 631.5 L 270.5 680.5 L 252.5 680.5 Z M 446.5 631.5 L 464.5 631.5 L 464.5 680.5 L 446.5 680.5 Z M 396.5 631.5 L 414.5 631.5 L 414.5 680.5 L 396.5 680.5 Z M 354.5 631.5 L 371.5 631.5 L 371.5 680.5 L 354.5 680.5 Z M 1204.5 647.5 L 1221.5 647.5 L 1221.5 697.5 L 1204.5 697.5 Z M 1153.5 647.5 L 1171.5 647.5 L 1171.5 697.5 L 1153.5 697.5 Z M 1612.5 647.5 L 1629.5 647.5 L 1629.5 697.5 L 1612.5 697.5 Z M 1654.5 647.5 L 1672.5 647.5 L 1672.5 697.5 L 1654.5 697.5 Z M 1246.5 647.5 L 1264.5 647.5 L 1264.5 697.5 L 1246.5 697.5 Z M 1246.5 647.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image392"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1017.5 366.5 L 1047.5 366.5 L 1047.5 484.5 L 1017.5 484.5 Z M 1083.5 366.5 L 1112.5 366.5 L 1112.5 484.5 L 1083.5 484.5 Z M 955.5 366.5 L 984.5 366.5 L 984.5 484.5 L 955.5 484.5 Z M 1181.5 366.5 L 1210.5 366.5 L 1210.5 484.5 L 1181.5 484.5 Z M 1642.5 372.5 L 1672.5 372.5 L 1672.5 490.5 L 1642.5 490.5 Z M 245.5 376.5 L 275.5 376.5 L 275.5 493.5 L 245.5 493.5 Z M 308.5 376.5 L 337.5 376.5 L 337.5 493.5 L 308.5 493.5 Z M 1380.5 397.5 L 1409.5 397.5 L 1409.5 514.5 L 1380.5 514.5 Z M 1318.5 397.5 L 1347.5 397.5 L 1347.5 514.5 L 1318.5 514.5 Z M 687.5 408.5 L 716.5 408.5 L 716.5 526.5 L 687.5 526.5 Z M 625.5 408.5 L 654.5 408.5 L 654.5 526.5 L 625.5 526.5 Z M 816.5 412.5 L 845.5 412.5 L 845.5 530.5 L 816.5 530.5 Z M 497.5 423.5 L 526.5 423.5 L 526.5 540.5 L 497.5 540.5 Z M 435.5 423.5 L 464.5 423.5 L 464.5 540.5 L 435.5 540.5 Z M 435.5 423.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image393"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 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="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image394"/>
 </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="surface388">
 <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 1729.855469 390.769531 L 1729.855469 416.328125 L 1726.171875 416.328125 L 1712.953125 395.605469 L 1712.953125 416.328125 L 1709.867188 416.328125 L 1709.867188 390.769531 L 1713.410156 390.769531 L 1726.769531 411.664062 L 1726.769531 390.769531 Z M 1729.855469 390.769531 "/>
 <path style="fill:none;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/dfxtp/sky130_fd_sc_lp__dfxtp_1.svg b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.svg
index af27d6e..8f338de 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_1.svg
+++ b/cells/dfxtp/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image327"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 478.5 615.5 L 506.5 615.5 L 506.5 692.5 L 478.5 692.5 Z M 599.5 615.5 L 626.5 615.5 L 626.5 692.5 L 599.5 692.5 Z M 757.5 615.5 L 785.5 615.5 L 785.5 692.5 L 757.5 692.5 Z M 823.5 615.5 L 851.5 615.5 L 851.5 692.5 L 823.5 692.5 Z M 678.5 615.5 L 705.5 615.5 L 705.5 692.5 L 678.5 692.5 Z M 1207.5 655.5 L 1235.5 655.5 L 1235.5 732.5 L 1207.5 732.5 Z M 1080.5 655.5 L 1108.5 655.5 L 1108.5 732.5 L 1080.5 732.5 Z M 1273.5 655.5 L 1301.5 655.5 L 1301.5 732.5 L 1273.5 732.5 Z M 990.5 615.5 L 1018.5 615.5 L 1018.5 732.5 L 990.5 732.5 Z M 1366.5 655.5 L 1394.5 655.5 L 1394.5 773.5 L 1366.5 773.5 Z M 283.5 700.5 L 310.5 700.5 L 310.5 777.5 L 283.5 777.5 Z M 1608.5 644.5 L 1636.5 644.5 L 1636.5 799.5 L 1608.5 799.5 Z M 1608.5 644.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 283.5 294.5 L 310.5 294.5 L 310.5 412.5 L 283.5 412.5 Z M 794.5 385.5 L 821.5 385.5 L 821.5 462.5 L 794.5 462.5 Z M 665.5 385.5 L 693.5 385.5 L 693.5 462.5 L 665.5 462.5 Z M 586.5 385.5 L 614.5 385.5 L 614.5 462.5 L 586.5 462.5 Z M 457.5 344.5 L 485.5 344.5 L 485.5 462.5 L 457.5 462.5 Z M 860.5 385.5 L 887.5 385.5 L 887.5 462.5 L 860.5 462.5 Z M 1061.5 339.5 L 1089.5 339.5 L 1089.5 493.5 L 1061.5 493.5 Z M 1273.5 416.5 L 1301.5 416.5 L 1301.5 493.5 L 1273.5 493.5 Z M 1207.5 416.5 L 1235.5 416.5 L 1235.5 493.5 L 1207.5 493.5 Z M 967.5 339.5 L 995.5 339.5 L 995.5 493.5 L 967.5 493.5 Z M 1374.5 339.5 L 1401.5 339.5 L 1401.5 493.5 L 1374.5 493.5 Z M 1608.5 273.5 L 1636.5 273.5 L 1636.5 504.5 L 1608.5 504.5 Z M 1608.5 273.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface324">
+<g id="surface351">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1686.59375 351.328125 L 1684.023438 354.5 L 1678.28125 349.742188 L 1676.640625 350.617188 L 1674.996094 351.273438 L 1673.300781 351.820312 L 1671.496094 352.203125 L 1669.691406 352.421875 L 1667.832031 352.53125 L 1665.316406 352.367188 L 1662.964844 351.984375 L 1660.777344 351.328125 L 1658.699219 350.453125 L 1656.730469 349.304688 L 1654.976562 347.828125 L 1653.390625 346.242188 L 1652.023438 344.433594 L 1650.929688 342.464844 L 1650 340.332031 L 1649.289062 338.035156 L 1648.851562 335.519531 L 1648.742188 334.917969 L 1648.6875 334.261719 L 1648.632812 333.660156 L 1648.578125 333.003906 L 1648.578125 331.636719 L 1648.6875 328.902344 L 1649.070312 326.277344 L 1649.671875 323.867188 L 1650.546875 321.570312 L 1651.640625 319.4375 L 1653.0625 317.46875 L 1654.484375 315.882812 L 1656.125 314.460938 L 1657.933594 313.257812 L 1659.847656 312.328125 L 1661.925781 311.5625 L 1664.222656 311.015625 L 1664.769531 310.960938 L 1666.574219 310.796875 L 1667.175781 310.796875 L 1667.832031 310.742188 L 1670.292969 310.90625 L 1672.644531 311.289062 L 1674.832031 311.945312 L 1676.914062 312.820312 L 1678.882812 313.96875 L 1680.6875 315.390625 L 1682.21875 317.03125 L 1683.585938 318.78125 L 1684.679688 320.695312 L 1685.609375 322.828125 L 1686.320312 325.125 L 1686.8125 327.535156 L 1686.867188 328.246094 L 1687.03125 330.214844 L 1687.03125 330.871094 L 1687.085938 331.527344 L 1686.921875 334.589844 L 1686.429688 337.488281 L 1685.664062 340.167969 L 1684.570312 342.683594 L 1683.148438 344.984375 L 1681.453125 347.117188 Z M 1672.808594 340.058594 L 1677.679688 344.050781 L 1678.992188 342.410156 L 1680.085938 340.550781 L 1680.90625 338.527344 L 1681.507812 336.394531 L 1681.835938 334.097656 L 1682 331.582031 L 1681.890625 329.285156 L 1681.5625 327.097656 L 1681.015625 325.070312 L 1680.304688 323.210938 L 1679.375 321.460938 L 1678.226562 319.875 L 1676.914062 318.5625 L 1675.542969 317.46875 L 1674.011719 316.59375 L 1672.371094 315.9375 L 1670.566406 315.5 L 1668.707031 315.226562 L 1667.832031 315.226562 L 1665.863281 315.390625 L 1664.003906 315.71875 L 1662.253906 316.265625 L 1660.667969 317.085938 L 1659.191406 318.125 L 1657.878906 319.382812 L 1656.621094 320.859375 L 1655.632812 322.5 L 1654.8125 324.304688 L 1654.210938 326.277344 L 1653.828125 328.410156 L 1653.664062 330.707031 L 1653.664062 331.636719 L 1653.71875 334.042969 L 1654.046875 336.230469 L 1654.59375 338.253906 L 1655.304688 340.167969 L 1656.292969 341.917969 L 1657.496094 343.449219 L 1658.753906 344.820312 L 1660.175781 345.914062 L 1661.707031 346.789062 L 1663.347656 347.390625 L 1665.152344 347.828125 L 1667.066406 347.992188 L 1667.175781 348.046875 L 1668.761719 348.046875 L 1669.800781 347.9375 L 1670.839844 347.71875 L 1671.824219 347.5 L 1672.808594 347.171875 L 1673.847656 346.734375 L 1673.902344 346.734375 L 1674.011719 346.679688 L 1674.066406 346.625 L 1674.175781 346.625 L 1674.230469 346.570312 L 1674.339844 346.515625 L 1670.292969 343.121094 Z M 1672.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 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/dfxtp/sky130_fd_sc_lp__dfxtp_2.svg b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.svg
index aca9cf3..4e7cb77 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_2.svg
+++ b/cells/dfxtp/sky130_fd_sc_lp__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 537.5 L 174.5 537.5 Z M 174.5 213.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 976.5 610.5 L 1002.5 610.5 L 1002.5 722.5 L 976.5 722.5 Z M 660.5 649.5 L 686.5 649.5 L 686.5 722.5 L 660.5 722.5 Z M 1067.5 649.5 L 1094.5 649.5 L 1094.5 722.5 L 1067.5 722.5 Z M 1167.5 649.5 L 1193.5 649.5 L 1193.5 722.5 L 1167.5 722.5 Z M 735.5 649.5 L 761.5 649.5 L 761.5 722.5 L 735.5 722.5 Z M 1229.5 649.5 L 1255.5 649.5 L 1255.5 722.5 L 1229.5 722.5 Z M 798.5 649.5 L 824.5 649.5 L 824.5 722.5 L 798.5 722.5 Z M 557.5 649.5 L 583.5 649.5 L 583.5 722.5 L 557.5 722.5 Z M 482.5 649.5 L 508.5 649.5 L 508.5 722.5 L 482.5 722.5 Z M 1535.5 610.5 L 1561.5 610.5 L 1561.5 756.5 L 1535.5 756.5 Z M 1609.5 610.5 L 1635.5 610.5 L 1635.5 756.5 L 1609.5 756.5 Z M 1349.5 649.5 L 1375.5 649.5 L 1375.5 760.5 L 1349.5 760.5 Z M 277.5 698.5 L 303.5 698.5 L 303.5 771.5 L 277.5 771.5 Z M 277.5 698.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 277.5 296.5 L 303.5 296.5 L 303.5 408.5 L 277.5 408.5 Z M 598.5 367.5 L 624.5 367.5 L 624.5 440.5 L 598.5 440.5 Z M 462.5 328.5 L 488.5 328.5 L 488.5 440.5 L 462.5 440.5 Z M 857.5 367.5 L 883.5 367.5 L 883.5 440.5 L 857.5 440.5 Z M 794.5 367.5 L 820.5 367.5 L 820.5 440.5 L 794.5 440.5 Z M 672.5 367.5 L 699.5 367.5 L 699.5 440.5 L 672.5 440.5 Z M 1255.5 422.5 L 1281.5 422.5 L 1281.5 495.5 L 1255.5 495.5 Z M 966.5 349.5 L 992.5 349.5 L 992.5 495.5 L 966.5 495.5 Z M 1193.5 422.5 L 1219.5 422.5 L 1219.5 495.5 L 1193.5 495.5 Z M 1349.5 349.5 L 1375.5 349.5 L 1375.5 495.5 L 1349.5 495.5 Z M 1054.5 349.5 L 1080.5 349.5 L 1080.5 495.5 L 1054.5 495.5 Z M 1535.5 287.5 L 1561.5 287.5 L 1561.5 506.5 L 1535.5 506.5 Z M 1609.5 287.5 L 1635.5 287.5 L 1635.5 506.5 L 1609.5 506.5 Z M 1609.5 287.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface334">
+<g id="surface362">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1604.511719 361.570312 L 1602.136719 364.5 L 1596.835938 360.105469 L 1595.320312 360.914062 L 1593.804688 361.519531 L 1592.242188 362.027344 L 1590.574219 362.378906 L 1588.90625 362.582031 L 1587.191406 362.683594 L 1584.867188 362.53125 L 1582.699219 362.175781 L 1580.679688 361.570312 L 1578.757812 360.765625 L 1576.941406 359.703125 L 1575.324219 358.339844 L 1573.863281 356.875 L 1572.597656 355.210938 L 1571.589844 353.390625 L 1570.730469 351.421875 L 1570.074219 349.300781 L 1569.671875 346.980469 L 1569.570312 346.425781 L 1569.519531 345.820312 L 1569.46875 345.261719 L 1569.417969 344.65625 L 1569.417969 343.394531 L 1569.519531 340.871094 L 1569.875 338.445312 L 1570.429688 336.226562 L 1571.234375 334.105469 L 1572.246094 332.136719 L 1573.558594 330.316406 L 1574.871094 328.851562 L 1576.386719 327.539062 L 1578.050781 326.429688 L 1579.820312 325.570312 L 1581.738281 324.863281 L 1583.859375 324.359375 L 1584.363281 324.308594 L 1584.917969 324.257812 L 1585.476562 324.207031 L 1586.03125 324.15625 L 1586.585938 324.15625 L 1587.191406 324.105469 L 1589.464844 324.257812 L 1591.632812 324.613281 L 1593.652344 325.21875 L 1595.574219 326.027344 L 1597.390625 327.085938 L 1599.058594 328.398438 L 1600.46875 329.914062 L 1601.734375 331.53125 L 1602.742188 333.296875 L 1603.601562 335.265625 L 1604.257812 337.386719 L 1604.710938 339.609375 L 1604.761719 340.265625 L 1604.914062 342.082031 L 1604.914062 342.6875 L 1604.964844 343.292969 L 1604.8125 346.121094 L 1604.359375 348.796875 L 1603.652344 351.269531 L 1602.640625 353.59375 L 1601.328125 355.714844 L 1599.765625 357.683594 Z M 1591.785156 351.171875 L 1596.28125 354.855469 L 1597.492188 353.339844 L 1598.5 351.625 L 1599.257812 349.757812 L 1599.8125 347.789062 L 1600.117188 345.667969 L 1600.269531 343.34375 L 1600.167969 341.222656 L 1599.863281 339.203125 L 1599.359375 337.335938 L 1598.703125 335.621094 L 1597.84375 334.003906 L 1596.785156 332.539062 L 1595.574219 331.328125 L 1594.3125 330.316406 L 1592.898438 329.511719 L 1591.382812 328.902344 L 1589.714844 328.5 L 1588 328.246094 L 1587.191406 328.246094 L 1585.375 328.398438 L 1583.65625 328.703125 L 1582.042969 329.207031 L 1580.578125 329.964844 L 1579.214844 330.921875 L 1578.003906 332.085938 L 1576.839844 333.449219 L 1575.933594 334.960938 L 1575.175781 336.628906 L 1574.621094 338.445312 L 1574.265625 340.414062 L 1574.113281 342.535156 L 1574.113281 343.394531 L 1574.164062 345.617188 L 1574.46875 347.636719 L 1574.972656 349.503906 L 1575.628906 351.269531 L 1576.539062 352.886719 L 1577.648438 354.300781 L 1578.808594 355.5625 L 1580.121094 356.574219 L 1581.535156 357.378906 L 1583.050781 357.9375 L 1584.71875 358.339844 L 1586.484375 358.492188 L 1586.585938 358.542969 L 1588.050781 358.542969 L 1589.007812 358.441406 L 1589.96875 358.238281 L 1590.878906 358.039062 L 1591.785156 357.734375 L 1592.746094 357.332031 L 1592.796875 357.332031 L 1592.898438 357.28125 L 1592.949219 357.230469 L 1593.046875 357.230469 L 1593.097656 357.179688 L 1593.199219 357.128906 L 1589.464844 353.996094 Z M 1591.785156 351.171875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1570 751 L 1600 751 M 1570 722 L 1600 722 M 1570 722 L 1570 751 M 1600 722 L 1600 751 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1570 751 L 1600 751 M 1570 722 L 1600 722 M 1600 751 L 1600 722 M 1570 751 L 1570 722 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(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_lp__dfxtp_4.svg b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.svg
index e652a8b..727d5ff 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.svg
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 537.5 L 175.5 537.5 Z M 1175.5 537.5 L 1347.5 537.5 L 1347.5 555.5 L 1175.5 555.5 Z M 1175.5 537.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 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="#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 891.5 606.5 L 916.5 606.5 L 916.5 712.5 L 891.5 712.5 Z M 981.5 643.5 L 1006.5 643.5 L 1006.5 712.5 L 981.5 712.5 Z M 1065.5 643.5 L 1090.5 643.5 L 1090.5 712.5 L 1065.5 712.5 Z M 448.5 643.5 L 473.5 643.5 L 473.5 712.5 L 448.5 712.5 Z M 1124.5 643.5 L 1149.5 643.5 L 1149.5 712.5 L 1124.5 712.5 Z M 711.5 643.5 L 736.5 643.5 L 736.5 712.5 L 711.5 712.5 Z M 771.5 643.5 L 796.5 643.5 L 796.5 712.5 L 771.5 712.5 Z M 625.5 643.5 L 649.5 643.5 L 649.5 712.5 L 625.5 712.5 Z M 537.5 643.5 L 562.5 643.5 L 562.5 712.5 L 537.5 712.5 Z M 272.5 683.5 L 297.5 683.5 L 297.5 752.5 L 272.5 752.5 Z M 1222.5 633.5 L 1246.5 633.5 L 1246.5 771.5 L 1222.5 771.5 Z M 1406.5 633.5 L 1431.5 633.5 L 1431.5 771.5 L 1406.5 771.5 Z M 1548.5 633.5 L 1573.5 633.5 L 1573.5 771.5 L 1548.5 771.5 Z M 1619.5 633.5 L 1644.5 633.5 L 1644.5 771.5 L 1619.5 771.5 Z M 1477.5 633.5 L 1502.5 633.5 L 1502.5 771.5 L 1477.5 771.5 Z M 1477.5 633.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 272.5 318.5 L 297.5 318.5 L 297.5 424.5 L 272.5 424.5 Z M 1162.5 377.5 L 1187.5 377.5 L 1187.5 446.5 L 1162.5 446.5 Z M 1103.5 377.5 L 1127.5 377.5 L 1127.5 446.5 L 1103.5 446.5 Z M 616.5 400.5 L 640.5 400.5 L 640.5 469.5 L 616.5 469.5 Z M 429.5 364.5 L 454.5 364.5 L 454.5 469.5 L 429.5 469.5 Z M 791.5 400.5 L 815.5 400.5 L 815.5 469.5 L 791.5 469.5 Z M 731.5 400.5 L 756.5 400.5 L 756.5 469.5 L 731.5 469.5 Z M 545.5 400.5 L 569.5 400.5 L 569.5 469.5 L 545.5 469.5 Z M 958.5 359.5 L 983.5 359.5 L 983.5 497.5 L 958.5 497.5 Z M 887.5 359.5 L 912.5 359.5 L 912.5 497.5 L 887.5 497.5 Z M 1406.5 299.5 L 1431.5 299.5 L 1431.5 507.5 L 1406.5 507.5 Z M 1619.5 299.5 L 1644.5 299.5 L 1644.5 507.5 L 1619.5 507.5 Z M 1548.5 299.5 L 1573.5 299.5 L 1573.5 507.5 L 1548.5 507.5 Z M 1477.5 299.5 L 1502.5 299.5 L 1502.5 507.5 L 1477.5 507.5 Z M 1249.5 317.5 L 1274.5 317.5 L 1274.5 525.5 L 1249.5 525.5 Z M 1249.5 317.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 472.867188 553.5 L 472.867188 517.714844 L 486.664062 517.714844 L 488.824219 517.863281 L 490.835938 518.253906 L 492.699219 518.941406 L 494.417969 519.824219 L 495.941406 521.050781 L 497.363281 522.476562 L 498.542969 524.195312 L 499.523438 526.058594 L 500.261719 528.171875 L 500.800781 530.429688 L 501.09375 532.933594 L 501.242188 535.582031 L 501.09375 538.378906 L 500.75 540.984375 L 500.160156 543.339844 L 499.375 545.5 L 498.347656 547.414062 L 497.070312 549.082031 L 495.695312 550.457031 L 494.171875 551.535156 L 492.503906 552.421875 L 490.6875 553.007812 L 488.722656 553.402344 L 486.664062 553.5 Z M 477.433594 549.476562 L 485.878906 549.476562 L 488.136719 549.328125 L 490.148438 548.789062 L 491.914062 547.855469 L 493.386719 546.628906 L 494.566406 544.957031 L 495.546875 542.945312 L 495.84375 541.914062 L 496.136719 540.835938 L 496.382812 539.65625 L 496.53125 538.378906 L 496.628906 537.054688 L 496.675781 535.632812 L 496.480469 532.441406 L 495.988281 529.644531 L 495.105469 527.238281 L 493.929688 525.324219 L 492.40625 523.753906 L 490.539062 522.625 L 489.851562 522.378906 L 489.117188 522.132812 L 488.332031 521.984375 L 487.546875 521.839844 L 486.710938 521.789062 L 485.878906 521.738281 L 477.433594 521.738281 Z M 477.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 469 558 L 498 558 M 469 530 L 498 530 M 469 530 L 469 558 M 498 530 L 498 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 469 558 L 498 558 M 469 530 L 498 530 M 498 558 L 498 530 M 469 558 L 469 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/dfxtp/sky130_fd_sc_lp__dfxtp_lp.svg b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.svg
index 7f8f6cf..bc2d10f 100644
--- a/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.svg
+++ b/cells/dfxtp/sky130_fd_sc_lp__dfxtp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 536.5 L 174.5 536.5 Z M 527.5 536.5 L 1162.5 536.5 L 1162.5 554.5 L 527.5 554.5 Z M 527.5 536.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image345"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1221.5 620.5 L 1241.5 620.5 L 1241.5 678.5 L 1221.5 678.5 Z M 1111.5 620.5 L 1131.5 620.5 L 1131.5 678.5 L 1111.5 678.5 Z M 800.5 620.5 L 820.5 620.5 L 820.5 678.5 L 800.5 678.5 Z M 553.5 620.5 L 574.5 620.5 L 574.5 678.5 L 553.5 678.5 Z M 1160.5 620.5 L 1181.5 620.5 L 1181.5 678.5 L 1160.5 678.5 Z M 612.5 620.5 L 633.5 620.5 L 633.5 678.5 L 612.5 678.5 Z M 891.5 620.5 L 912.5 620.5 L 912.5 678.5 L 891.5 678.5 Z M 1591.5 643.5 L 1612.5 643.5 L 1612.5 700.5 L 1591.5 700.5 Z M 1640.5 643.5 L 1661.5 643.5 L 1661.5 700.5 L 1640.5 700.5 Z M 693.5 652.5 L 714.5 652.5 L 714.5 709.5 L 693.5 709.5 Z M 1455.5 654.5 L 1476.5 654.5 L 1476.5 712.5 L 1455.5 712.5 Z M 1297.5 654.5 L 1318.5 654.5 L 1318.5 712.5 L 1297.5 712.5 Z M 1406.5 654.5 L 1426.5 654.5 L 1426.5 712.5 L 1406.5 712.5 Z M 1346.5 654.5 L 1367.5 654.5 L 1367.5 712.5 L 1346.5 712.5 Z M 415.5 667.5 L 435.5 667.5 L 435.5 724.5 L 415.5 724.5 Z M 306.5 667.5 L 327.5 667.5 L 327.5 724.5 L 306.5 724.5 Z M 257.5 667.5 L 277.5 667.5 L 277.5 724.5 L 257.5 724.5 Z M 365.5 667.5 L 386.5 667.5 L 386.5 724.5 L 365.5 724.5 Z M 365.5 667.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 274.5 345.5 L 308.5 345.5 L 308.5 483.5 L 274.5 483.5 Z M 347.5 345.5 L 381.5 345.5 L 381.5 483.5 L 347.5 483.5 Z M 1625.5 354.5 L 1660.5 354.5 L 1660.5 491.5 L 1625.5 491.5 Z M 1449.5 363.5 L 1483.5 363.5 L 1483.5 500.5 L 1449.5 500.5 Z M 1221.5 363.5 L 1255.5 363.5 L 1255.5 500.5 L 1221.5 500.5 Z M 1288.5 363.5 L 1322.5 363.5 L 1322.5 500.5 L 1288.5 500.5 Z M 1148.5 363.5 L 1182.5 363.5 L 1182.5 500.5 L 1148.5 500.5 Z M 827.5 371.5 L 861.5 371.5 L 861.5 509.5 L 827.5 509.5 Z M 906.5 392.5 L 940.5 392.5 L 940.5 529.5 L 906.5 529.5 Z M 1053.5 392.5 L 1087.5 392.5 L 1087.5 529.5 L 1053.5 529.5 Z M 732.5 392.5 L 767.5 392.5 L 767.5 529.5 L 732.5 529.5 Z M 602.5 392.5 L 637.5 392.5 L 637.5 529.5 L 602.5 529.5 Z M 602.5 392.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface342">
+<g id="surface369">
 <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 1700.3125 550.140625 L 1698.402344 552.5 L 1694.132812 548.960938 L 1692.910156 549.613281 L 1691.691406 550.101562 L 1690.429688 550.507812 L 1689.085938 550.792969 L 1687.746094 550.953125 L 1686.363281 551.035156 L 1684.492188 550.914062 L 1682.742188 550.628906 L 1681.117188 550.140625 L 1679.570312 549.488281 L 1678.105469 548.636719 L 1676.804688 547.539062 L 1675.625 546.359375 L 1674.609375 545.015625 L 1673.792969 543.550781 L 1673.101562 541.964844 L 1672.574219 540.257812 L 1672.25 538.386719 L 1672.167969 537.9375 L 1672.125 537.449219 L 1672.085938 537.003906 L 1672.046875 536.515625 L 1672.046875 535.5 L 1672.125 533.464844 L 1672.410156 531.511719 L 1672.859375 529.722656 L 1673.511719 528.015625 L 1674.324219 526.429688 L 1675.378906 524.964844 L 1676.4375 523.785156 L 1677.660156 522.726562 L 1679 521.832031 L 1680.425781 521.140625 L 1681.96875 520.570312 L 1683.679688 520.164062 L 1684.085938 520.125 L 1684.53125 520.082031 L 1684.980469 520.042969 L 1685.425781 520.003906 L 1685.875 520.003906 L 1686.363281 519.960938 L 1688.191406 520.082031 L 1689.941406 520.367188 L 1691.570312 520.855469 L 1693.113281 521.507812 L 1694.578125 522.359375 L 1695.921875 523.417969 L 1697.058594 524.640625 L 1698.078125 525.941406 L 1698.890625 527.363281 L 1699.582031 528.949219 L 1700.109375 530.660156 L 1700.476562 532.449219 L 1700.515625 532.976562 L 1700.558594 533.464844 L 1700.597656 533.953125 L 1700.640625 534.441406 L 1700.640625 534.929688 L 1700.679688 535.417969 L 1700.558594 537.695312 L 1700.191406 539.851562 L 1699.621094 541.84375 L 1698.808594 543.714844 L 1697.75 545.421875 L 1696.488281 547.007812 Z M 1690.0625 541.761719 L 1693.683594 544.730469 L 1694.660156 543.511719 L 1695.472656 542.128906 L 1696.082031 540.625 L 1696.53125 539.039062 L 1696.773438 537.328125 L 1696.898438 535.457031 L 1696.816406 533.75 L 1696.570312 532.121094 L 1696.164062 530.617188 L 1695.636719 529.234375 L 1694.945312 527.933594 L 1694.089844 526.753906 L 1693.113281 525.777344 L 1692.097656 524.964844 L 1690.957031 524.3125 L 1689.738281 523.824219 L 1688.394531 523.5 L 1687.011719 523.296875 L 1686.363281 523.296875 L 1684.898438 523.417969 L 1683.515625 523.664062 L 1682.214844 524.070312 L 1681.035156 524.679688 L 1679.9375 525.453125 L 1678.960938 526.386719 L 1678.023438 527.484375 L 1677.292969 528.707031 L 1676.683594 530.046875 L 1676.234375 531.511719 L 1675.949219 533.097656 L 1675.828125 534.808594 L 1675.828125 535.5 L 1675.867188 537.289062 L 1676.113281 538.914062 L 1676.519531 540.421875 L 1677.046875 541.84375 L 1677.78125 543.144531 L 1678.675781 544.285156 L 1679.609375 545.300781 L 1680.667969 546.113281 L 1681.808594 546.765625 L 1683.027344 547.210938 L 1684.371094 547.539062 L 1685.792969 547.660156 L 1685.875 547.699219 L 1687.054688 547.699219 L 1687.828125 547.621094 L 1688.597656 547.457031 L 1689.332031 547.292969 L 1690.0625 547.050781 L 1690.835938 546.722656 L 1690.878906 546.722656 L 1690.957031 546.683594 L 1691 546.644531 L 1691.082031 546.644531 L 1691.121094 546.601562 L 1691.203125 546.5625 L 1688.191406 544.039062 Z M 1690.0625 541.761719 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 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/diode/sky130_fd_sc_lp__diode_0.svg b/cells/diode/sky130_fd_sc_lp__diode_0.svg
index af9e6cc..6c67ac1 100644
--- a/cells/diode/sky130_fd_sc_lp__diode_0.svg
+++ b/cells/diode/sky130_fd_sc_lp__diode_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 539.5 L 812.5 539.5 Z M 812.5 111.5 "/>
 </clipPath>
-<image id="image447" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image481" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image447"/>
+  <use xlink:href="#image481"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image447"/>
+  <use xlink:href="#image481"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,15 +35,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="image448" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image482" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image448"/>
+  <use xlink:href="#image482"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface444">
+<g id="surface478">
 <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 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/diode/sky130_fd_sc_lp__diode_1.svg b/cells/diode/sky130_fd_sc_lp__diode_1.svg
index 21bde91..83d84dd 100644
--- a/cells/diode/sky130_fd_sc_lp__diode_1.svg
+++ b/cells/diode/sky130_fd_sc_lp__diode_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 539.5 L 812.5 539.5 Z M 812.5 111.5 "/>
 </clipPath>
-<image id="image447" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image481" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image447"/>
+  <use xlink:href="#image481"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image447"/>
+  <use xlink:href="#image481"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,15 +35,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="image448" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image482" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image448"/>
+  <use xlink:href="#image482"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface444">
+<g id="surface478">
 <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 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_lp__dlclkp_1.svg b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.svg
index 6f2ca9b..3bb6c1d 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_1.svg
+++ b/cells/dlclkp/sky130_fd_sc_lp__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 539.5 L 174.5 539.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image343" 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="#image343"/>
+  <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 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="#image343"/>
+  <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 1152.5 629.5 L 1185.5 629.5 L 1185.5 722.5 L 1152.5 722.5 Z M 571.5 722.5 L 604.5 722.5 L 604.5 815.5 L 571.5 815.5 Z M 491.5 722.5 L 525.5 722.5 L 525.5 815.5 L 491.5 815.5 Z M 666.5 722.5 L 699.5 722.5 L 699.5 815.5 L 666.5 815.5 Z M 889.5 722.5 L 922.5 722.5 L 922.5 815.5 L 889.5 815.5 Z M 770.5 722.5 L 803.5 722.5 L 803.5 815.5 L 770.5 815.5 Z M 1290.5 724.5 L 1323.5 724.5 L 1323.5 817.5 L 1290.5 817.5 Z M 1370.5 724.5 L 1403.5 724.5 L 1403.5 817.5 L 1370.5 817.5 Z M 1580.5 667.5 L 1613.5 667.5 L 1613.5 852.5 L 1580.5 852.5 Z M 339.5 667.5 L 372.5 667.5 L 372.5 852.5 L 339.5 852.5 Z M 339.5 667.5 "/>
 </clipPath>
-<image id="image344" 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="#image344"/>
+  <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 485.5 233.5 L 518.5 233.5 L 518.5 374.5 L 485.5 374.5 Z M 564.5 233.5 L 598.5 233.5 L 598.5 374.5 L 564.5 374.5 Z M 684.5 281.5 L 717.5 281.5 L 717.5 374.5 L 684.5 374.5 Z M 763.5 281.5 L 796.5 281.5 L 796.5 374.5 L 763.5 374.5 Z M 922.5 327.5 L 955.5 327.5 L 955.5 468.5 L 922.5 468.5 Z M 305.5 220.5 L 338.5 220.5 L 338.5 499.5 L 305.5 499.5 Z M 1208.5 357.5 L 1242.5 357.5 L 1242.5 499.5 L 1208.5 499.5 Z M 1580.5 220.5 L 1613.5 220.5 L 1613.5 499.5 L 1580.5 499.5 Z M 1339.5 357.5 L 1372.5 357.5 L 1372.5 499.5 L 1339.5 499.5 Z M 1434.5 357.5 L 1467.5 357.5 L 1467.5 499.5 L 1434.5 499.5 Z M 1434.5 357.5 "/>
 </clipPath>
-<image id="image345" 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="#image345"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image346" 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="#image346"/>
+  <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="surface340">
+<g id="surface366">
 <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 1706.046875 298.566406 L 1706.046875 315.015625 L 1700.046875 315.015625 L 1700.046875 267.984375 L 1706.046875 267.984375 L 1706.046875 291.789062 L 1729.46875 267.984375 L 1737.210938 267.984375 L 1718.046875 287.144531 L 1737.402344 315.015625 L 1730.304688 315.015625 L 1713.726562 290.886719 Z M 1706.046875 298.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 1629 807 L 1667 807 M 1629 769 L 1667 769 M 1629 769 L 1629 807 M 1667 769 L 1667 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 1629 807 L 1667 807 M 1629 769 L 1667 769 M 1667 807 L 1667 769 M 1629 807 L 1629 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/dlclkp/sky130_fd_sc_lp__dlclkp_2.svg b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.svg
index ee2170a..b88237e 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.svg
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 538.5 L 174.5 538.5 Z M 977.5 538.5 L 1151.5 538.5 L 1151.5 586.5 L 977.5 586.5 Z M 977.5 538.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 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="#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 1295.5 656.5 L 1326.5 656.5 L 1326.5 743.5 L 1295.5 743.5 Z M 1220.5 656.5 L 1251.5 656.5 L 1251.5 743.5 L 1220.5 743.5 Z M 1091.5 656.5 L 1122.5 656.5 L 1122.5 743.5 L 1091.5 743.5 Z M 711.5 710.5 L 742.5 710.5 L 742.5 797.5 L 711.5 797.5 Z M 524.5 710.5 L 555.5 710.5 L 555.5 797.5 L 524.5 797.5 Z M 613.5 710.5 L 644.5 710.5 L 644.5 797.5 L 613.5 797.5 Z M 450.5 710.5 L 481.5 710.5 L 481.5 797.5 L 450.5 797.5 Z M 824.5 710.5 L 855.5 710.5 L 855.5 797.5 L 824.5 797.5 Z M 1491.5 658.5 L 1523.5 658.5 L 1523.5 832.5 L 1491.5 832.5 Z M 307.5 658.5 L 338.5 658.5 L 338.5 832.5 L 307.5 832.5 Z M 1581.5 658.5 L 1612.5 658.5 L 1612.5 832.5 L 1581.5 832.5 Z M 1581.5 658.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 433.5 267.5 L 464.5 267.5 L 464.5 399.5 L 433.5 399.5 Z M 508.5 267.5 L 539.5 267.5 L 539.5 399.5 L 508.5 399.5 Z M 620.5 312.5 L 651.5 312.5 L 651.5 399.5 L 620.5 399.5 Z M 694.5 312.5 L 725.5 312.5 L 725.5 399.5 L 694.5 399.5 Z M 824.5 344.5 L 855.5 344.5 L 855.5 476.5 L 824.5 476.5 Z M 1258.5 368.5 L 1290.5 368.5 L 1290.5 501.5 L 1258.5 501.5 Z M 1581.5 240.5 L 1612.5 240.5 L 1612.5 501.5 L 1581.5 501.5 Z M 304.5 240.5 L 335.5 240.5 L 335.5 501.5 L 304.5 501.5 Z M 1136.5 368.5 L 1167.5 368.5 L 1167.5 501.5 L 1136.5 501.5 Z M 1367.5 368.5 L 1398.5 368.5 L 1398.5 501.5 L 1367.5 501.5 Z M 1491.5 240.5 L 1523.5 240.5 L 1523.5 501.5 L 1491.5 501.5 Z M 1491.5 240.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1612.808594 313.34375 L 1612.808594 329.082031 L 1607.066406 329.082031 L 1607.066406 284.09375 L 1612.808594 284.09375 L 1612.808594 306.863281 L 1635.207031 284.09375 L 1642.613281 284.09375 L 1624.285156 302.421875 L 1642.796875 329.082031 L 1636.011719 329.082031 L 1620.152344 306 Z M 1612.808594 313.34375 "/>
 <path style="fill:none;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/dlclkp/sky130_fd_sc_lp__dlclkp_4.svg b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.svg
index 9fba089..63cfe71 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.svg
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 917.5 538.5 L 1071.5 538.5 L 1071.5 549.5 L 917.5 549.5 Z M 917.5 538.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 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="#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 1024.5 644.5 L 1052.5 644.5 L 1052.5 721.5 L 1024.5 721.5 Z M 646.5 690.5 L 673.5 690.5 L 673.5 767.5 L 646.5 767.5 Z M 746.5 690.5 L 773.5 690.5 L 773.5 767.5 L 746.5 767.5 Z M 480.5 690.5 L 508.5 690.5 L 508.5 767.5 L 480.5 767.5 Z M 559.5 690.5 L 587.5 690.5 L 587.5 767.5 L 559.5 767.5 Z M 414.5 690.5 L 442.5 690.5 L 442.5 767.5 L 414.5 767.5 Z M 1125.5 644.5 L 1152.5 644.5 L 1152.5 799.5 L 1125.5 799.5 Z M 1444.5 644.5 L 1472.5 644.5 L 1472.5 799.5 L 1444.5 799.5 Z M 1191.5 644.5 L 1218.5 644.5 L 1218.5 799.5 L 1191.5 799.5 Z M 1365.5 644.5 L 1393.5 644.5 L 1393.5 799.5 L 1365.5 799.5 Z M 1603.5 644.5 L 1630.5 644.5 L 1630.5 799.5 L 1603.5 799.5 Z M 1524.5 644.5 L 1551.5 644.5 L 1551.5 799.5 L 1524.5 799.5 Z M 287.5 644.5 L 315.5 644.5 L 315.5 799.5 L 287.5 799.5 Z M 287.5 644.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 464.5 297.5 L 491.5 297.5 L 491.5 414.5 L 464.5 414.5 Z M 398.5 297.5 L 425.5 297.5 L 425.5 414.5 L 398.5 414.5 Z M 563.5 337.5 L 591.5 337.5 L 591.5 414.5 L 563.5 414.5 Z M 629.5 337.5 L 657.5 337.5 L 657.5 414.5 L 629.5 414.5 Z M 785.5 339.5 L 812.5 339.5 L 812.5 457.5 L 785.5 457.5 Z M 1575.5 273.5 L 1603.5 273.5 L 1603.5 504.5 L 1575.5 504.5 Z M 1496.5 273.5 L 1524.5 273.5 L 1524.5 504.5 L 1496.5 504.5 Z M 1172.5 273.5 L 1200.5 273.5 L 1200.5 504.5 L 1172.5 504.5 Z M 1417.5 273.5 L 1444.5 273.5 L 1444.5 504.5 L 1417.5 504.5 Z M 1338.5 273.5 L 1365.5 273.5 L 1365.5 504.5 L 1338.5 504.5 Z M 283.5 273.5 L 310.5 273.5 L 310.5 504.5 L 283.5 504.5 Z M 1251.5 273.5 L 1279.5 273.5 L 1279.5 504.5 L 1251.5 504.5 Z M 1058.5 387.5 L 1086.5 387.5 L 1086.5 504.5 L 1058.5 504.5 Z M 1058.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 482.804688 605.082031 L 482.804688 618.757812 L 506.324219 618.757812 L 506.324219 623.242188 L 477.71875 623.242188 L 477.71875 583.367188 L 505.339844 583.367188 L 505.339844 587.851562 L 482.804688 587.851562 L 482.804688 600.597656 L 504.519531 600.597656 L 504.519531 605.082031 Z M 482.804688 605.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 414 491 L 445 491 M 414 460 L 445 460 M 414 460 L 414 491 M 445 460 L 445 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 414 491 L 445 491 M 414 460 L 445 460 M 445 491 L 445 460 M 414 491 L 414 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/dlclkp/sky130_fd_sc_lp__dlclkp_lp.svg b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.svg
index 3f5db1e..72d38d8 100644
--- a/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.svg
+++ b/cells/dlclkp/sky130_fd_sc_lp__dlclkp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 484.5 L 174.5 484.5 Z M 1292.5 484.5 L 1744.5 484.5 L 1744.5 532.5 L 1292.5 532.5 Z M 1567.5 532.5 L 1744.5 532.5 L 1744.5 538.5 L 1567.5 538.5 Z M 174.5 484.5 L 1009.5 484.5 L 1009.5 538.5 L 174.5 538.5 Z M 174.5 484.5 "/>
 </clipPath>
-<image id="image364" 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="#image364"/>
+  <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 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="#image364"/>
+  <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 1138.5 602.5 L 1169.5 602.5 L 1169.5 689.5 L 1138.5 689.5 Z M 1407.5 602.5 L 1438.5 602.5 L 1438.5 689.5 L 1407.5 689.5 Z M 1326.5 602.5 L 1357.5 602.5 L 1357.5 689.5 L 1326.5 689.5 Z M 1237.5 602.5 L 1268.5 602.5 L 1268.5 689.5 L 1237.5 689.5 Z M 297.5 745.5 L 328.5 745.5 L 328.5 832.5 L 297.5 832.5 Z M 1587.5 745.5 L 1618.5 745.5 L 1618.5 832.5 L 1587.5 832.5 Z M 1512.5 745.5 L 1543.5 745.5 L 1543.5 832.5 L 1512.5 832.5 Z M 988.5 745.5 L 1019.5 745.5 L 1019.5 832.5 L 988.5 832.5 Z M 907.5 745.5 L 939.5 745.5 L 939.5 832.5 L 907.5 832.5 Z M 818.5 745.5 L 849.5 745.5 L 849.5 832.5 L 818.5 832.5 Z M 647.5 745.5 L 678.5 745.5 L 678.5 832.5 L 647.5 832.5 Z M 558.5 745.5 L 589.5 745.5 L 589.5 832.5 L 558.5 832.5 Z M 477.5 745.5 L 508.5 745.5 L 508.5 832.5 L 477.5 832.5 Z M 371.5 745.5 L 402.5 745.5 L 402.5 832.5 L 371.5 832.5 Z M 371.5 745.5 "/>
 </clipPath>
-<image id="image365" 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="#image365"/>
+  <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 1569.5 240.5 L 1621.5 240.5 L 1621.5 447.5 L 1569.5 447.5 Z M 307.5 240.5 L 359.5 240.5 L 359.5 447.5 L 307.5 447.5 Z M 425.5 240.5 L 477.5 240.5 L 477.5 447.5 L 425.5 447.5 Z M 526.5 240.5 L 578.5 240.5 L 578.5 447.5 L 526.5 447.5 Z M 707.5 240.5 L 758.5 240.5 L 758.5 447.5 L 707.5 447.5 Z M 825.5 240.5 L 876.5 240.5 L 876.5 447.5 L 825.5 447.5 Z M 950.5 240.5 L 1002.5 240.5 L 1002.5 447.5 L 950.5 447.5 Z M 1240.5 240.5 L 1292.5 240.5 L 1292.5 447.5 L 1240.5 447.5 Z M 1350.5 240.5 L 1401.5 240.5 L 1401.5 447.5 L 1350.5 447.5 Z M 1459.5 240.5 L 1511.5 240.5 L 1511.5 447.5 L 1459.5 447.5 Z M 1459.5 240.5 "/>
 </clipPath>
-<image id="image366" 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="#image366"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image367" 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="#image367"/>
+  <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="surface361">
+<g id="surface387">
 <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 422.484375 461.59375 L 422.484375 477.019531 L 449.023438 477.019531 L 449.023438 482.082031 L 416.746094 482.082031 L 416.746094 437.09375 L 447.910156 437.09375 L 447.910156 442.152344 L 422.484375 442.152344 L 422.484375 456.53125 L 446.984375 456.53125 L 446.984375 461.59375 Z M 422.484375 461.59375 "/>
 <path style="fill:none;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 637 L 380 637 M 345 602 L 380 602 M 345 602 L 345 637 M 380 602 L 380 637 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 637 L 380 637 M 345 602 L 380 602 M 380 637 L 380 602 M 345 637 L 345 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(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/dlrbn/sky130_fd_sc_lp__dlrbn_1.svg b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.svg
index 7348cb8..072f8d9 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.svg
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 537.5 L 174.5 537.5 Z M 391.5 537.5 L 646.5 537.5 L 646.5 543.5 L 391.5 543.5 Z M 391.5 537.5 "/>
 </clipPath>
-<image id="image502" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image530" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image502"/>
+  <use xlink:href="#image530"/>
 </pattern>
 <mask 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="#image502"/>
+  <use xlink:href="#image530"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 743.5 600.5 L 767.5 600.5 L 767.5 666.5 L 743.5 666.5 Z M 676.5 600.5 L 699.5 600.5 L 699.5 666.5 L 676.5 666.5 Z M 456.5 618.5 L 480.5 618.5 L 480.5 684.5 L 456.5 684.5 Z M 524.5 618.5 L 547.5 618.5 L 547.5 684.5 L 524.5 684.5 Z M 1309.5 628.5 L 1333.5 628.5 L 1333.5 694.5 L 1309.5 694.5 Z M 268.5 676.5 L 292.5 676.5 L 292.5 742.5 L 268.5 742.5 Z M 983.5 677.5 L 1007.5 677.5 L 1007.5 743.5 L 983.5 743.5 Z M 915.5 677.5 L 939.5 677.5 L 939.5 743.5 L 915.5 743.5 Z M 1485.5 616.5 L 1509.5 616.5 L 1509.5 748.5 L 1485.5 748.5 Z M 1592.5 616.5 L 1616.5 616.5 L 1616.5 748.5 L 1592.5 748.5 Z M 1132.5 628.5 L 1156.5 628.5 L 1156.5 760.5 L 1132.5 760.5 Z M 1189.5 628.5 L 1213.5 628.5 L 1213.5 760.5 L 1189.5 760.5 Z M 1189.5 628.5 "/>
 </clipPath>
-<image id="image503" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image531" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image503"/>
+  <use xlink:href="#image531"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 275.5 324.5 L 299.5 324.5 L 299.5 425.5 L 275.5 425.5 Z M 876.5 400.5 L 900.5 400.5 L 900.5 501.5 L 876.5 501.5 Z M 959.5 434.5 L 982.5 434.5 L 982.5 501.5 L 959.5 501.5 Z M 737.5 434.5 L 760.5 434.5 L 760.5 501.5 L 737.5 501.5 Z M 819.5 400.5 L 843.5 400.5 L 843.5 501.5 L 819.5 501.5 Z M 1276.5 408.5 L 1300.5 408.5 L 1300.5 508.5 L 1276.5 508.5 Z M 1126.5 310.5 L 1150.5 310.5 L 1150.5 508.5 L 1126.5 508.5 Z M 1194.5 310.5 L 1217.5 310.5 L 1217.5 508.5 L 1194.5 508.5 Z M 1553.5 310.5 L 1577.5 310.5 L 1577.5 508.5 L 1553.5 508.5 Z M 1485.5 310.5 L 1509.5 310.5 L 1509.5 508.5 L 1485.5 508.5 Z M 461.5 414.5 L 484.5 414.5 L 484.5 515.5 L 461.5 515.5 Z M 553.5 414.5 L 576.5 414.5 L 576.5 515.5 L 553.5 515.5 Z M 553.5 414.5 "/>
 </clipPath>
-<image id="image504" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image532" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image504"/>
+  <use xlink:href="#image532"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image505" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image533" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image505"/>
+  <use xlink:href="#image533"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface499">
+<g id="surface527">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -259,6 +259,5 @@
 <path style=" 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.046875 343.613281 L 1497.046875 377.355469 L 1492.1875 377.355469 L 1474.738281 350 L 1474.738281 377.355469 L 1470.667969 377.355469 L 1470.667969 343.613281 L 1475.339844 343.613281 L 1492.976562 371.199219 L 1492.976562 343.613281 Z M 1497.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 1436 732 L 1463 732 M 1436 705 L 1463 705 M 1436 705 L 1436 732 M 1463 705 L 1463 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 1436 732 L 1463 732 M 1436 705 L 1463 705 M 1463 732 L 1463 705 M 1436 732 L 1436 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/dlrbn/sky130_fd_sc_lp__dlrbn_2.svg b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.svg
index cdcbd5d..7132040 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.svg
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 537.5 L 174.5 537.5 Z M 357.5 537.5 L 1038.5 537.5 L 1038.5 543.5 L 357.5 543.5 Z M 357.5 537.5 "/>
 </clipPath>
-<image id="image518" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image547" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image518"/>
+  <use xlink:href="#image547"/>
 </pattern>
 <mask 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="#image518"/>
+  <use xlink:href="#image547"/>
 </pattern>
 <mask id="mask1">
 <rect 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 609.5 L 736.5 609.5 L 736.5 675.5 L 713.5 675.5 Z M 645.5 609.5 L 668.5 609.5 L 668.5 675.5 L 645.5 675.5 Z M 421.5 618.5 L 444.5 618.5 L 444.5 684.5 L 421.5 684.5 Z M 269.5 618.5 L 293.5 618.5 L 293.5 684.5 L 269.5 684.5 Z M 488.5 618.5 L 512.5 618.5 L 512.5 684.5 L 488.5 684.5 Z M 1405.5 618.5 L 1429.5 618.5 L 1429.5 684.5 L 1405.5 684.5 Z M 955.5 667.5 L 979.5 667.5 L 979.5 733.5 L 955.5 733.5 Z M 888.5 667.5 L 911.5 667.5 L 911.5 733.5 L 888.5 733.5 Z M 1168.5 618.5 L 1191.5 618.5 L 1191.5 750.5 L 1168.5 750.5 Z M 1320.5 618.5 L 1344.5 618.5 L 1344.5 750.5 L 1320.5 750.5 Z M 1253.5 618.5 L 1276.5 618.5 L 1276.5 750.5 L 1253.5 750.5 Z M 1111.5 618.5 L 1135.5 618.5 L 1135.5 750.5 L 1111.5 750.5 Z M 1625.5 622.5 L 1649.5 622.5 L 1649.5 755.5 L 1625.5 755.5 Z M 1558.5 622.5 L 1581.5 622.5 L 1581.5 755.5 L 1558.5 755.5 Z M 1558.5 622.5 "/>
 </clipPath>
-<image id="image519" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image548" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image519"/>
+  <use xlink:href="#image548"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 274.5 324.5 L 297.5 324.5 L 297.5 425.5 L 274.5 425.5 Z M 1558.5 310.5 L 1581.5 310.5 L 1581.5 508.5 L 1558.5 508.5 Z M 1253.5 310.5 L 1276.5 310.5 L 1276.5 508.5 L 1253.5 508.5 Z M 1403.5 408.5 L 1427.5 408.5 L 1427.5 508.5 L 1403.5 508.5 Z M 1320.5 310.5 L 1344.5 310.5 L 1344.5 508.5 L 1320.5 508.5 Z M 1179.5 310.5 L 1202.5 310.5 L 1202.5 508.5 L 1179.5 508.5 Z M 1111.5 310.5 L 1135.5 310.5 L 1135.5 508.5 L 1111.5 508.5 Z M 1625.5 310.5 L 1649.5 310.5 L 1649.5 508.5 L 1625.5 508.5 Z M 427.5 414.5 L 451.5 414.5 L 451.5 515.5 L 427.5 515.5 Z M 861.5 414.5 L 885.5 414.5 L 885.5 515.5 L 861.5 515.5 Z M 944.5 449.5 L 968.5 449.5 L 968.5 515.5 L 944.5 515.5 Z M 722.5 449.5 L 746.5 449.5 L 746.5 515.5 L 722.5 515.5 Z M 519.5 414.5 L 543.5 414.5 L 543.5 515.5 L 519.5 515.5 Z M 805.5 414.5 L 828.5 414.5 L 828.5 515.5 L 805.5 515.5 Z M 805.5 414.5 "/>
 </clipPath>
-<image id="image520" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image549" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image520"/>
+  <use xlink:href="#image549"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image521" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image550" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image521"/>
+  <use xlink:href="#image550"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface515">
+<g id="surface544">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -254,6 +254,5 @@
 <path style=" 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.929688 401.613281 L 334.929688 435.355469 L 330.070312 435.355469 L 312.621094 408 L 312.621094 435.355469 L 308.550781 435.355469 L 308.550781 401.613281 L 313.222656 401.613281 L 330.859375 429.199219 L 330.859375 401.613281 Z M 334.929688 401.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 228 674 L 255 674 M 228 647 L 255 647 M 228 647 L 228 674 M 255 647 L 255 674 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 228 674 L 255 674 M 228 647 L 255 647 M 255 674 L 255 647 M 228 674 L 228 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(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/dlrbn/sky130_fd_sc_lp__dlrbn_lp.svg b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.svg
index 9c3613c..7168fe4 100644
--- a/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.svg
+++ b/cells/dlrbn/sky130_fd_sc_lp__dlrbn_lp.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="image571" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image599" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image571"/>
+  <use xlink:href="#image599"/>
 </pattern>
 <mask 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="#image571"/>
+  <use xlink:href="#image599"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1257.5 607.5 L 1279.5 607.5 L 1279.5 670.5 L 1257.5 670.5 Z M 1311.5 607.5 L 1333.5 607.5 L 1333.5 670.5 L 1311.5 670.5 Z M 1138.5 607.5 L 1161.5 607.5 L 1161.5 670.5 L 1138.5 670.5 Z M 1192.5 607.5 L 1215.5 607.5 L 1215.5 670.5 L 1192.5 670.5 Z M 1576.5 665.5 L 1599.5 665.5 L 1599.5 728.5 L 1576.5 728.5 Z M 1630.5 665.5 L 1653.5 665.5 L 1653.5 728.5 L 1630.5 728.5 Z M 1458.5 665.5 L 1480.5 665.5 L 1480.5 728.5 L 1458.5 728.5 Z M 1512.5 665.5 L 1534.5 665.5 L 1534.5 728.5 L 1512.5 728.5 Z M 385.5 671.5 L 407.5 671.5 L 407.5 734.5 L 385.5 734.5 Z M 439.5 671.5 L 461.5 671.5 L 461.5 734.5 L 439.5 734.5 Z M 266.5 671.5 L 289.5 671.5 L 289.5 734.5 L 266.5 734.5 Z M 320.5 671.5 L 343.5 671.5 L 343.5 734.5 L 320.5 734.5 Z M 893.5 686.5 L 916.5 686.5 L 916.5 749.5 L 893.5 749.5 Z M 808.5 686.5 L 830.5 686.5 L 830.5 749.5 L 808.5 749.5 Z M 749.5 686.5 L 772.5 686.5 L 772.5 749.5 L 749.5 749.5 Z M 587.5 686.5 L 610.5 686.5 L 610.5 749.5 L 587.5 749.5 Z M 641.5 686.5 L 664.5 686.5 L 664.5 749.5 L 641.5 749.5 Z M 974.5 686.5 L 997.5 686.5 L 997.5 749.5 L 974.5 749.5 Z M 974.5 686.5 "/>
 </clipPath>
-<image id="image572" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image600" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image572"/>
+  <use xlink:href="#image600"/>
 </pattern>
 <mask id="mask2">
 <rect 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 320.5 L 1160.5 320.5 L 1160.5 470.5 L 1123.5 470.5 Z M 1328.5 320.5 L 1366.5 320.5 L 1366.5 470.5 L 1328.5 470.5 Z M 689.5 320.5 L 727.5 320.5 L 727.5 470.5 L 689.5 470.5 Z M 1043.5 320.5 L 1081.5 320.5 L 1081.5 470.5 L 1043.5 470.5 Z M 763.5 320.5 L 800.5 320.5 L 800.5 470.5 L 763.5 470.5 Z M 584.5 320.5 L 622.5 320.5 L 622.5 470.5 L 584.5 470.5 Z M 917.5 320.5 L 955.5 320.5 L 955.5 470.5 L 917.5 470.5 Z M 844.5 320.5 L 881.5 320.5 L 881.5 470.5 L 844.5 470.5 Z M 355.5 338.5 L 392.5 338.5 L 392.5 488.5 L 355.5 488.5 Z M 275.5 338.5 L 313.5 338.5 L 313.5 488.5 L 275.5 488.5 Z M 1576.5 354.5 L 1614.5 354.5 L 1614.5 504.5 L 1576.5 504.5 Z M 1497.5 354.5 L 1534.5 354.5 L 1534.5 504.5 L 1497.5 504.5 Z M 1497.5 354.5 "/>
 </clipPath>
-<image id="image573" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image601" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image573"/>
+  <use xlink:href="#image601"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 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="image574" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image602" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image574"/>
+  <use xlink:href="#image602"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface568">
+<g id="surface596">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -264,6 +264,5 @@
 <path style=" 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.5 353.152344 L 1723.5 384.847656 L 1718.933594 384.847656 L 1702.542969 359.152344 L 1702.542969 384.847656 L 1698.71875 384.847656 L 1698.71875 353.152344 L 1703.109375 353.152344 L 1719.675781 379.066406 L 1719.675781 353.152344 Z M 1723.5 353.152344 "/>
 <path style="fill:none;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 723 L 1692 723 M 1666 698 L 1692 698 M 1666 698 L 1666 723 M 1692 698 L 1692 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 1666 723 L 1692 723 M 1666 698 L 1692 698 M 1692 723 L 1692 698 M 1666 723 L 1666 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/dlrbp/sky130_fd_sc_lp__dlrbp_1.svg b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.svg
index 319b1c4..721697e 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_1.svg
+++ b/cells/dlrbp/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 1015.5 538.5 L 1382.5 538.5 L 1382.5 547.5 L 1015.5 547.5 Z M 1015.5 538.5 "/>
 </clipPath>
-<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image451" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image423"/>
+  <use xlink:href="#image451"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image423"/>
+  <use xlink:href="#image451"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1273.5 644.5 L 1300.5 644.5 L 1300.5 721.5 L 1273.5 721.5 Z M 691.5 655.5 L 718.5 655.5 L 718.5 732.5 L 691.5 732.5 Z M 757.5 655.5 L 785.5 655.5 L 785.5 732.5 L 757.5 732.5 Z M 612.5 655.5 L 639.5 655.5 L 639.5 732.5 L 612.5 732.5 Z M 856.5 655.5 L 884.5 655.5 L 884.5 732.5 L 856.5 732.5 Z M 922.5 655.5 L 950.5 655.5 L 950.5 732.5 L 922.5 732.5 Z M 410.5 679.5 L 438.5 679.5 L 438.5 756.5 L 410.5 756.5 Z M 303.5 679.5 L 330.5 679.5 L 330.5 756.5 L 303.5 756.5 Z M 1501.5 636.5 L 1528.5 636.5 L 1528.5 790.5 L 1501.5 790.5 Z M 1582.5 636.5 L 1610.5 636.5 L 1610.5 790.5 L 1582.5 790.5 Z M 1101.5 644.5 L 1128.5 644.5 L 1128.5 799.5 L 1101.5 799.5 Z M 1167.5 644.5 L 1194.5 644.5 L 1194.5 799.5 L 1167.5 799.5 Z M 1167.5 644.5 "/>
 </clipPath>
-<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image452" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image424"/>
+  <use xlink:href="#image452"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 892.5 282.5 L 920.5 282.5 L 920.5 359.5 L 892.5 359.5 Z M 1001.5 282.5 L 1028.5 282.5 L 1028.5 359.5 L 1001.5 359.5 Z M 303.5 280.5 L 330.5 280.5 L 330.5 398.5 L 303.5 398.5 Z M 382.5 280.5 L 409.5 280.5 L 409.5 398.5 L 382.5 398.5 Z M 729.5 282.5 L 757.5 282.5 L 757.5 400.5 L 729.5 400.5 Z M 796.5 282.5 L 823.5 282.5 L 823.5 400.5 L 796.5 400.5 Z M 601.5 282.5 L 628.5 282.5 L 628.5 400.5 L 601.5 400.5 Z M 1495.5 273.5 L 1523.5 273.5 L 1523.5 504.5 L 1495.5 504.5 Z M 1574.5 273.5 L 1602.5 273.5 L 1602.5 504.5 L 1574.5 504.5 Z M 1097.5 282.5 L 1125.5 282.5 L 1125.5 514.5 L 1097.5 514.5 Z M 1176.5 282.5 L 1204.5 282.5 L 1204.5 514.5 L 1176.5 514.5 Z M 1273.5 396.5 L 1300.5 396.5 L 1300.5 514.5 L 1273.5 514.5 Z M 1273.5 396.5 "/>
 </clipPath>
-<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image425"/>
+  <use xlink:href="#image453"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image454" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image426"/>
+  <use xlink:href="#image454"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface420">
+<g id="surface448">
 <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 1686.59375 351.328125 L 1684.023438 354.5 L 1678.28125 349.742188 L 1676.640625 350.617188 L 1674.996094 351.273438 L 1673.300781 351.820312 L 1671.496094 352.203125 L 1669.691406 352.421875 L 1667.832031 352.53125 L 1665.316406 352.367188 L 1662.964844 351.984375 L 1660.777344 351.328125 L 1658.699219 350.453125 L 1656.730469 349.304688 L 1654.976562 347.828125 L 1653.390625 346.242188 L 1652.023438 344.433594 L 1650.929688 342.464844 L 1650 340.332031 L 1649.289062 338.035156 L 1648.851562 335.519531 L 1648.742188 334.917969 L 1648.6875 334.261719 L 1648.632812 333.660156 L 1648.578125 333.003906 L 1648.578125 331.636719 L 1648.6875 328.902344 L 1649.070312 326.277344 L 1649.671875 323.867188 L 1650.546875 321.570312 L 1651.640625 319.4375 L 1653.0625 317.46875 L 1654.484375 315.882812 L 1656.125 314.460938 L 1657.933594 313.257812 L 1659.847656 312.328125 L 1661.925781 311.5625 L 1664.222656 311.015625 L 1664.769531 310.960938 L 1666.574219 310.796875 L 1667.175781 310.796875 L 1667.832031 310.742188 L 1670.292969 310.90625 L 1672.644531 311.289062 L 1674.832031 311.945312 L 1676.914062 312.820312 L 1678.882812 313.96875 L 1680.6875 315.390625 L 1682.21875 317.03125 L 1683.585938 318.78125 L 1684.679688 320.695312 L 1685.609375 322.828125 L 1686.320312 325.125 L 1686.8125 327.535156 L 1686.867188 328.246094 L 1687.03125 330.214844 L 1687.03125 330.871094 L 1687.085938 331.527344 L 1686.921875 334.589844 L 1686.429688 337.488281 L 1685.664062 340.167969 L 1684.570312 342.683594 L 1683.148438 344.984375 L 1681.453125 347.117188 Z M 1672.808594 340.058594 L 1677.679688 344.050781 L 1678.992188 342.410156 L 1680.085938 340.550781 L 1680.90625 338.527344 L 1681.507812 336.394531 L 1681.835938 334.097656 L 1682 331.582031 L 1681.890625 329.285156 L 1681.5625 327.097656 L 1681.015625 325.070312 L 1680.304688 323.210938 L 1679.375 321.460938 L 1678.226562 319.875 L 1676.914062 318.5625 L 1675.542969 317.46875 L 1674.011719 316.59375 L 1672.371094 315.9375 L 1670.566406 315.5 L 1668.707031 315.226562 L 1667.832031 315.226562 L 1665.863281 315.390625 L 1664.003906 315.71875 L 1662.253906 316.265625 L 1660.667969 317.085938 L 1659.191406 318.125 L 1657.878906 319.382812 L 1656.621094 320.859375 L 1655.632812 322.5 L 1654.8125 324.304688 L 1654.210938 326.277344 L 1653.828125 328.410156 L 1653.664062 330.707031 L 1653.664062 331.636719 L 1653.71875 334.042969 L 1654.046875 336.230469 L 1654.59375 338.253906 L 1655.304688 340.167969 L 1656.292969 341.917969 L 1657.496094 343.449219 L 1658.753906 344.820312 L 1660.175781 345.914062 L 1661.707031 346.789062 L 1663.347656 347.390625 L 1665.152344 347.828125 L 1667.066406 347.992188 L 1667.175781 348.046875 L 1668.761719 348.046875 L 1669.800781 347.9375 L 1670.839844 347.71875 L 1671.824219 347.5 L 1672.808594 347.171875 L 1673.847656 346.734375 L 1673.902344 346.734375 L 1674.011719 346.679688 L 1674.066406 346.625 L 1674.175781 346.625 L 1674.230469 346.570312 L 1674.339844 346.515625 L 1670.292969 343.121094 Z M 1672.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 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/dlrbp/sky130_fd_sc_lp__dlrbp_2.svg b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.svg
index b52d059..5c5b31a 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_2.svg
+++ b/cells/dlrbp/sky130_fd_sc_lp__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 537.5 L 175.5 537.5 Z M 175.5 229.5 "/>
 </clipPath>
-<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image408"/>
 </pattern>
 <mask 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="#image379"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask1">
 <rect 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 629.5 L 588.5 629.5 L 588.5 699.5 L 563.5 699.5 Z M 1062.5 643.5 L 1087.5 643.5 L 1087.5 712.5 L 1062.5 712.5 Z M 1122.5 643.5 L 1146.5 643.5 L 1146.5 712.5 L 1122.5 712.5 Z M 1193.5 643.5 L 1217.5 643.5 L 1217.5 712.5 L 1193.5 712.5 Z M 1270.5 643.5 L 1295.5 643.5 L 1295.5 712.5 L 1270.5 712.5 Z M 1341.5 643.5 L 1366.5 643.5 L 1366.5 712.5 L 1341.5 712.5 Z M 666.5 629.5 L 691.5 629.5 L 691.5 768.5 L 666.5 768.5 Z M 826.5 629.5 L 851.5 629.5 L 851.5 768.5 L 826.5 768.5 Z M 737.5 629.5 L 762.5 629.5 L 762.5 768.5 L 737.5 768.5 Z M 886.5 629.5 L 910.5 629.5 L 910.5 768.5 L 886.5 768.5 Z M 343.5 633.5 L 368.5 633.5 L 368.5 771.5 L 343.5 771.5 Z M 1597.5 702.5 L 1622.5 702.5 L 1622.5 771.5 L 1597.5 771.5 Z M 1526.5 702.5 L 1551.5 702.5 L 1551.5 771.5 L 1526.5 771.5 Z M 272.5 633.5 L 297.5 633.5 L 297.5 771.5 L 272.5 771.5 Z M 272.5 633.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image409"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 991.5 326.5 L 1016.5 326.5 L 1016.5 395.5 L 991.5 395.5 Z M 1089.5 326.5 L 1113.5 326.5 L 1113.5 395.5 L 1089.5 395.5 Z M 1609.5 306.5 L 1634.5 306.5 L 1634.5 411.5 L 1609.5 411.5 Z M 1538.5 306.5 L 1563.5 306.5 L 1563.5 411.5 L 1538.5 411.5 Z M 1175.5 326.5 L 1200.5 326.5 L 1200.5 431.5 L 1175.5 431.5 Z M 1235.5 326.5 L 1260.5 326.5 L 1260.5 431.5 L 1235.5 431.5 Z M 1360.5 326.5 L 1385.5 326.5 L 1385.5 431.5 L 1360.5 431.5 Z M 666.5 299.5 L 691.5 299.5 L 691.5 507.5 L 666.5 507.5 Z M 905.5 299.5 L 929.5 299.5 L 929.5 507.5 L 905.5 507.5 Z M 272.5 299.5 L 297.5 299.5 L 297.5 507.5 L 272.5 507.5 Z M 576.5 402.5 L 601.5 402.5 L 601.5 507.5 L 576.5 507.5 Z M 834.5 299.5 L 858.5 299.5 L 858.5 507.5 L 834.5 507.5 Z M 344.5 299.5 L 369.5 299.5 L 369.5 507.5 L 344.5 507.5 Z M 737.5 299.5 L 762.5 299.5 L 762.5 507.5 L 737.5 507.5 Z M 737.5 299.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image410"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 232.5 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="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image411"/>
 </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="surface405">
 <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 1640.261719 476.074219 L 1640.261719 488.347656 L 1661.371094 488.347656 L 1661.371094 492.371094 L 1635.695312 492.371094 L 1635.695312 456.585938 L 1660.484375 456.585938 L 1660.484375 460.609375 L 1640.261719 460.609375 L 1640.261719 472.046875 L 1659.75 472.046875 L 1659.75 476.074219 Z M 1640.261719 476.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 619 L 1607 619 M 1579 591 L 1607 591 M 1579 591 L 1579 619 M 1607 591 L 1607 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 1579 619 L 1607 619 M 1579 591 L 1607 591 M 1607 619 L 1607 591 M 1579 619 L 1579 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/dlrbp/sky130_fd_sc_lp__dlrbp_lp.svg b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.svg
index fd42e65..3433853 100644
--- a/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.svg
+++ b/cells/dlrbp/sky130_fd_sc_lp__dlrbp_lp.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 523.5 536.5 L 1351.5 536.5 L 1351.5 560.5 L 523.5 560.5 Z M 523.5 536.5 "/>
 </clipPath>
-<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image457" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image429"/>
+  <use xlink:href="#image457"/>
 </pattern>
 <mask id="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="#image429"/>
+  <use xlink:href="#image457"/>
 </pattern>
 <mask id="mask1">
 <rect 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 638.5 L 289.5 638.5 L 289.5 701.5 L 266.5 701.5 Z M 320.5 638.5 L 343.5 638.5 L 343.5 701.5 L 320.5 701.5 Z M 439.5 638.5 L 461.5 638.5 L 461.5 701.5 L 439.5 701.5 Z M 385.5 638.5 L 407.5 638.5 L 407.5 701.5 L 385.5 701.5 Z M 1510.5 666.5 L 1533.5 666.5 L 1533.5 729.5 L 1510.5 729.5 Z M 1629.5 666.5 L 1651.5 666.5 L 1651.5 729.5 L 1629.5 729.5 Z M 1575.5 666.5 L 1597.5 666.5 L 1597.5 729.5 L 1575.5 729.5 Z M 1456.5 666.5 L 1479.5 666.5 L 1479.5 729.5 L 1456.5 729.5 Z M 1135.5 685.5 L 1158.5 685.5 L 1158.5 748.5 L 1135.5 748.5 Z M 974.5 685.5 L 997.5 685.5 L 997.5 748.5 L 974.5 748.5 Z M 889.5 685.5 L 911.5 685.5 L 911.5 748.5 L 889.5 748.5 Z M 587.5 685.5 L 610.5 685.5 L 610.5 748.5 L 587.5 748.5 Z M 1254.5 685.5 L 1276.5 685.5 L 1276.5 748.5 L 1254.5 748.5 Z M 764.5 685.5 L 787.5 685.5 L 787.5 748.5 L 764.5 748.5 Z M 706.5 685.5 L 728.5 685.5 L 728.5 748.5 L 706.5 748.5 Z M 641.5 685.5 L 664.5 685.5 L 664.5 748.5 L 641.5 748.5 Z M 1189.5 685.5 L 1212.5 685.5 L 1212.5 748.5 L 1189.5 748.5 Z M 1308.5 685.5 L 1330.5 685.5 L 1330.5 748.5 L 1308.5 748.5 Z M 1308.5 685.5 "/>
 </clipPath>
-<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image430"/>
+  <use xlink:href="#image458"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 290.5 320.5 L 328.5 320.5 L 328.5 470.5 L 290.5 470.5 Z M 370.5 320.5 L 407.5 320.5 L 407.5 470.5 L 370.5 470.5 Z M 1575.5 354.5 L 1612.5 354.5 L 1612.5 504.5 L 1575.5 504.5 Z M 1495.5 354.5 L 1533.5 354.5 L 1533.5 504.5 L 1495.5 504.5 Z M 1060.5 359.5 L 1097.5 359.5 L 1097.5 509.5 L 1060.5 509.5 Z M 685.5 359.5 L 722.5 359.5 L 722.5 509.5 L 685.5 509.5 Z M 974.5 359.5 L 1012.5 359.5 L 1012.5 509.5 L 974.5 509.5 Z M 758.5 359.5 L 796.5 359.5 L 796.5 509.5 L 758.5 509.5 Z M 882.5 359.5 L 919.5 359.5 L 919.5 509.5 L 882.5 509.5 Z M 1163.5 374.5 L 1201.5 374.5 L 1201.5 524.5 L 1163.5 524.5 Z M 1243.5 374.5 L 1281.5 374.5 L 1281.5 524.5 L 1243.5 524.5 Z M 593.5 383.5 L 631.5 383.5 L 631.5 533.5 L 593.5 533.5 Z M 593.5 383.5 "/>
 </clipPath>
-<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image459" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image431"/>
+  <use xlink:href="#image459"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 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="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image460" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image432"/>
+  <use xlink:href="#image460"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface426">
+<g id="surface454">
 <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 1723.5 353.152344 L 1723.5 384.847656 L 1718.933594 384.847656 L 1702.542969 359.152344 L 1702.542969 384.847656 L 1698.71875 384.847656 L 1698.71875 353.152344 L 1703.109375 353.152344 L 1719.675781 379.066406 L 1719.675781 353.152344 Z M 1723.5 353.152344 "/>
 <path style="fill:none;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 723 L 1692 723 M 1666 698 L 1692 698 M 1666 698 L 1666 723 M 1692 698 L 1692 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 1666 723 L 1692 723 M 1666 698 L 1692 698 M 1692 723 L 1692 698 M 1666 723 L 1666 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/dlrtn/sky130_fd_sc_lp__dlrtn_1.svg b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.svg
index dc9fde0..8e8ac00 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.svg
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 539.5 L 174.5 539.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image460" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" 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="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="#image433"/>
+  <use xlink:href="#image460"/>
 </pattern>
 <mask id="mask1">
 <rect 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 673.5 L 877.5 673.5 L 877.5 766.5 L 844.5 766.5 Z M 923.5 673.5 L 957.5 673.5 L 957.5 766.5 L 923.5 766.5 Z M 725.5 673.5 L 758.5 673.5 L 758.5 766.5 L 725.5 766.5 Z M 1018.5 673.5 L 1052.5 673.5 L 1052.5 766.5 L 1018.5 766.5 Z M 1122.5 673.5 L 1155.5 673.5 L 1155.5 766.5 L 1122.5 766.5 Z M 1531.5 667.5 L 1564.5 667.5 L 1564.5 852.5 L 1531.5 852.5 Z M 1332.5 667.5 L 1365.5 667.5 L 1365.5 852.5 L 1332.5 852.5 Z M 327.5 760.5 L 360.5 760.5 L 360.5 852.5 L 327.5 852.5 Z M 1412.5 667.5 L 1445.5 667.5 L 1445.5 852.5 L 1412.5 852.5 Z M 484.5 760.5 L 517.5 760.5 L 517.5 852.5 L 484.5 852.5 Z M 484.5 760.5 "/>
 </clipPath>
-<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image461" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 482.5 249.5 L 515.5 249.5 L 515.5 391.5 L 482.5 391.5 Z M 327.5 249.5 L 360.5 249.5 L 360.5 391.5 L 327.5 391.5 Z M 923.5 269.5 L 957.5 269.5 L 957.5 410.5 L 923.5 410.5 Z M 1043.5 318.5 L 1076.5 318.5 L 1076.5 410.5 L 1043.5 410.5 Z M 732.5 269.5 L 765.5 269.5 L 765.5 410.5 L 732.5 410.5 Z M 1122.5 318.5 L 1155.5 318.5 L 1155.5 410.5 L 1122.5 410.5 Z M 844.5 269.5 L 877.5 269.5 L 877.5 410.5 L 844.5 410.5 Z M 1317.5 220.5 L 1350.5 220.5 L 1350.5 499.5 L 1317.5 499.5 Z M 1412.5 220.5 L 1445.5 220.5 L 1445.5 499.5 L 1412.5 499.5 Z M 1531.5 220.5 L 1564.5 220.5 L 1564.5 499.5 L 1531.5 499.5 Z M 1531.5 220.5 "/>
 </clipPath>
-<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image462" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image435"/>
+  <use xlink:href="#image462"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 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="image436" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image463" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image436"/>
+  <use xlink:href="#image463"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface430">
+<g id="surface457">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -224,6 +224,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1672.789062 396.757812 L 1669.757812 400.5 L 1662.984375 394.886719 L 1661.046875 395.917969 L 1659.113281 396.695312 L 1657.113281 397.339844 L 1654.984375 397.789062 L 1652.855469 398.046875 L 1650.660156 398.175781 L 1647.695312 397.984375 L 1644.917969 397.53125 L 1642.339844 396.757812 L 1639.886719 395.726562 L 1637.566406 394.371094 L 1635.5 392.628906 L 1633.628906 390.757812 L 1632.015625 388.628906 L 1630.726562 386.304688 L 1629.628906 383.789062 L 1628.789062 381.082031 L 1628.273438 378.113281 L 1628.144531 377.402344 L 1628.082031 376.628906 L 1628.015625 375.917969 L 1627.953125 375.144531 L 1627.953125 373.53125 L 1628.082031 370.304688 L 1628.53125 367.210938 L 1629.242188 364.371094 L 1630.273438 361.660156 L 1631.566406 359.144531 L 1633.242188 356.824219 L 1634.917969 354.953125 L 1636.855469 353.273438 L 1638.984375 351.855469 L 1641.242188 350.757812 L 1643.695312 349.855469 L 1646.402344 349.210938 L 1647.046875 349.144531 L 1647.757812 349.082031 L 1648.46875 349.015625 L 1649.175781 348.953125 L 1649.886719 348.953125 L 1650.660156 348.886719 L 1653.566406 349.082031 L 1656.339844 349.53125 L 1658.917969 350.304688 L 1661.371094 351.339844 L 1663.695312 352.695312 L 1665.824219 354.371094 L 1667.628906 356.304688 L 1669.242188 358.371094 L 1670.53125 360.628906 L 1671.628906 363.144531 L 1672.46875 365.855469 L 1673.046875 368.695312 L 1673.113281 369.53125 L 1673.175781 370.304688 L 1673.242188 371.082031 L 1673.304688 371.855469 L 1673.304688 372.628906 L 1673.371094 373.402344 L 1673.175781 377.015625 L 1672.597656 380.433594 L 1671.695312 383.597656 L 1670.402344 386.566406 L 1668.726562 389.273438 L 1666.726562 391.789062 Z M 1656.53125 383.46875 L 1662.273438 388.175781 L 1663.824219 386.242188 L 1665.113281 384.046875 L 1666.082031 381.660156 L 1666.789062 379.144531 L 1667.175781 376.433594 L 1667.371094 373.46875 L 1667.242188 370.757812 L 1666.855469 368.175781 L 1666.210938 365.789062 L 1665.371094 363.597656 L 1664.273438 361.53125 L 1662.917969 359.660156 L 1661.371094 358.113281 L 1659.757812 356.824219 L 1657.953125 355.789062 L 1656.015625 355.015625 L 1653.886719 354.5 L 1651.695312 354.175781 L 1650.660156 354.175781 L 1648.339844 354.371094 L 1646.144531 354.757812 L 1644.082031 355.402344 L 1642.210938 356.371094 L 1640.46875 357.597656 L 1638.917969 359.082031 L 1637.433594 360.824219 L 1636.273438 362.757812 L 1635.304688 364.886719 L 1634.597656 367.210938 L 1634.144531 369.726562 L 1633.953125 372.433594 L 1633.953125 373.53125 L 1634.015625 376.371094 L 1634.402344 378.953125 L 1635.046875 381.339844 L 1635.886719 383.597656 L 1637.046875 385.660156 L 1638.46875 387.46875 L 1639.953125 389.082031 L 1641.628906 390.371094 L 1643.433594 391.402344 L 1645.371094 392.113281 L 1647.5 392.628906 L 1649.757812 392.824219 L 1649.886719 392.886719 L 1651.757812 392.886719 L 1652.984375 392.757812 L 1654.210938 392.5 L 1655.371094 392.242188 L 1656.53125 391.855469 L 1657.757812 391.339844 L 1657.824219 391.339844 L 1657.953125 391.273438 L 1658.015625 391.210938 L 1658.144531 391.210938 L 1658.210938 391.144531 L 1658.339844 391.082031 L 1653.566406 387.082031 Z M 1656.53125 383.46875 "/>
 <path style="fill:none;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 725 L 1667 725 M 1629 687 L 1667 687 M 1629 687 L 1629 725 M 1667 687 L 1667 725 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 725 L 1667 725 M 1629 687 L 1667 687 M 1667 725 L 1667 687 M 1629 725 L 1629 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(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/dlrtn/sky130_fd_sc_lp__dlrtn_2.svg b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.svg
index ea94c22..6053bba 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.svg
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 539.5 L 174.5 539.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 875.5 673.5 L 908.5 673.5 L 908.5 766.5 L 875.5 766.5 Z M 795.5 673.5 L 828.5 673.5 L 828.5 766.5 L 795.5 766.5 Z M 700.5 673.5 L 733.5 673.5 L 733.5 766.5 L 700.5 766.5 Z M 985.5 673.5 L 1018.5 673.5 L 1018.5 766.5 L 985.5 766.5 Z M 1074.5 673.5 L 1107.5 673.5 L 1107.5 766.5 L 1074.5 766.5 Z M 332.5 734.5 L 366.5 734.5 L 366.5 827.5 L 332.5 827.5 Z M 427.5 734.5 L 461.5 734.5 L 461.5 827.5 L 427.5 827.5 Z M 1363.5 667.5 L 1396.5 667.5 L 1396.5 852.5 L 1363.5 852.5 Z M 1482.5 667.5 L 1516.5 667.5 L 1516.5 852.5 L 1482.5 852.5 Z M 1284.5 667.5 L 1317.5 667.5 L 1317.5 852.5 L 1284.5 852.5 Z M 1577.5 667.5 L 1611.5 667.5 L 1611.5 852.5 L 1577.5 852.5 Z M 1577.5 667.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 906.5 240.5 L 939.5 240.5 L 939.5 382.5 L 906.5 382.5 Z M 1026.5 289.5 L 1059.5 289.5 L 1059.5 382.5 L 1026.5 382.5 Z M 1106.5 289.5 L 1139.5 289.5 L 1139.5 382.5 L 1106.5 382.5 Z M 826.5 240.5 L 859.5 240.5 L 859.5 382.5 L 826.5 382.5 Z M 707.5 240.5 L 740.5 240.5 L 740.5 382.5 L 707.5 382.5 Z M 309.5 250.5 L 342.5 250.5 L 342.5 392.5 L 309.5 392.5 Z M 461.5 250.5 L 494.5 250.5 L 494.5 392.5 L 461.5 392.5 Z M 1379.5 220.5 L 1412.5 220.5 L 1412.5 499.5 L 1379.5 499.5 Z M 1482.5 220.5 L 1516.5 220.5 L 1516.5 499.5 L 1482.5 499.5 Z M 1284.5 220.5 L 1317.5 220.5 L 1317.5 499.5 L 1284.5 499.5 Z M 1577.5 220.5 L 1611.5 220.5 L 1611.5 499.5 L 1577.5 499.5 Z M 1577.5 220.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface362">
+<g id="surface390">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1566.789062 560.757812 L 1563.757812 564.5 L 1556.984375 558.886719 L 1555.046875 559.917969 L 1553.113281 560.695312 L 1551.113281 561.339844 L 1548.984375 561.789062 L 1546.855469 562.046875 L 1544.660156 562.175781 L 1541.695312 561.984375 L 1538.917969 561.53125 L 1536.339844 560.757812 L 1533.886719 559.726562 L 1531.566406 558.371094 L 1529.5 556.628906 L 1527.628906 554.757812 L 1526.015625 552.628906 L 1524.726562 550.304688 L 1523.628906 547.789062 L 1522.789062 545.082031 L 1522.273438 542.113281 L 1522.144531 541.402344 L 1522.082031 540.628906 L 1522.015625 539.917969 L 1521.953125 539.144531 L 1521.953125 537.53125 L 1522.082031 534.304688 L 1522.53125 531.210938 L 1523.242188 528.371094 L 1524.273438 525.660156 L 1525.566406 523.144531 L 1527.242188 520.824219 L 1528.917969 518.953125 L 1530.855469 517.273438 L 1532.984375 515.855469 L 1535.242188 514.757812 L 1537.695312 513.855469 L 1540.402344 513.210938 L 1541.046875 513.144531 L 1541.757812 513.082031 L 1542.46875 513.015625 L 1543.175781 512.953125 L 1543.886719 512.953125 L 1544.660156 512.886719 L 1547.566406 513.082031 L 1550.339844 513.53125 L 1552.917969 514.304688 L 1555.371094 515.339844 L 1557.695312 516.695312 L 1559.824219 518.371094 L 1561.628906 520.304688 L 1563.242188 522.371094 L 1564.53125 524.628906 L 1565.628906 527.144531 L 1566.46875 529.855469 L 1567.046875 532.695312 L 1567.113281 533.53125 L 1567.175781 534.304688 L 1567.242188 535.082031 L 1567.304688 535.855469 L 1567.304688 536.628906 L 1567.371094 537.402344 L 1567.175781 541.015625 L 1566.597656 544.433594 L 1565.695312 547.597656 L 1564.402344 550.566406 L 1562.726562 553.273438 L 1560.726562 555.789062 Z M 1550.53125 547.46875 L 1556.273438 552.175781 L 1557.824219 550.242188 L 1559.113281 548.046875 L 1560.082031 545.660156 L 1560.789062 543.144531 L 1561.175781 540.433594 L 1561.371094 537.46875 L 1561.242188 534.757812 L 1560.855469 532.175781 L 1560.210938 529.789062 L 1559.371094 527.597656 L 1558.273438 525.53125 L 1556.917969 523.660156 L 1555.371094 522.113281 L 1553.757812 520.824219 L 1551.953125 519.789062 L 1550.015625 519.015625 L 1547.886719 518.5 L 1545.695312 518.175781 L 1544.660156 518.175781 L 1542.339844 518.371094 L 1540.144531 518.757812 L 1538.082031 519.402344 L 1536.210938 520.371094 L 1534.46875 521.597656 L 1532.917969 523.082031 L 1531.433594 524.824219 L 1530.273438 526.757812 L 1529.304688 528.886719 L 1528.597656 531.210938 L 1528.144531 533.726562 L 1527.953125 536.433594 L 1527.953125 537.53125 L 1528.015625 540.371094 L 1528.402344 542.953125 L 1529.046875 545.339844 L 1529.886719 547.597656 L 1531.046875 549.660156 L 1532.46875 551.46875 L 1533.953125 553.082031 L 1535.628906 554.371094 L 1537.433594 555.402344 L 1539.371094 556.113281 L 1541.5 556.628906 L 1543.757812 556.824219 L 1543.886719 556.886719 L 1545.757812 556.886719 L 1546.984375 556.757812 L 1548.210938 556.5 L 1549.371094 556.242188 L 1550.53125 555.855469 L 1551.757812 555.339844 L 1551.824219 555.339844 L 1551.953125 555.273438 L 1552.015625 555.210938 L 1552.144531 555.210938 L 1552.210938 555.144531 L 1552.339844 555.082031 L 1547.566406 551.082031 Z M 1550.53125 547.46875 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1523 561 L 1561 561 M 1523 524 L 1561 524 M 1523 524 L 1523 561 M 1561 524 L 1561 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 1523 561 L 1561 561 M 1523 524 L 1561 524 M 1561 561 L 1561 524 M 1523 561 L 1523 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/dlrtn/sky130_fd_sc_lp__dlrtn_4.svg b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.svg
index 668edbd..b7eae26 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.svg
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 479.5 538.5 L 642.5 538.5 L 642.5 540.5 L 479.5 540.5 Z M 479.5 538.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 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="#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 979.5 657.5 L 1008.5 657.5 L 1008.5 738.5 L 979.5 738.5 Z M 888.5 657.5 L 917.5 657.5 L 917.5 738.5 L 888.5 738.5 Z M 804.5 657.5 L 833.5 657.5 L 833.5 738.5 L 804.5 738.5 Z M 734.5 657.5 L 763.5 657.5 L 763.5 738.5 L 734.5 738.5 Z M 629.5 657.5 L 658.5 657.5 L 658.5 738.5 L 629.5 738.5 Z M 342.5 710.5 L 371.5 710.5 L 371.5 792.5 L 342.5 792.5 Z M 425.5 710.5 L 455.5 710.5 L 455.5 792.5 L 425.5 792.5 Z M 1430.5 651.5 L 1459.5 651.5 L 1459.5 814.5 L 1430.5 814.5 Z M 1597.5 651.5 L 1626.5 651.5 L 1626.5 814.5 L 1597.5 814.5 Z M 1164.5 651.5 L 1193.5 651.5 L 1193.5 814.5 L 1164.5 814.5 Z M 1514.5 651.5 L 1543.5 651.5 L 1543.5 814.5 L 1514.5 814.5 Z M 1346.5 651.5 L 1375.5 651.5 L 1375.5 814.5 L 1346.5 814.5 Z M 1234.5 651.5 L 1263.5 651.5 L 1263.5 814.5 L 1234.5 814.5 Z M 1234.5 651.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 425.5 280.5 L 455.5 280.5 L 455.5 404.5 L 425.5 404.5 Z M 289.5 280.5 L 318.5 280.5 L 318.5 404.5 L 289.5 404.5 Z M 804.5 300.5 L 833.5 300.5 L 833.5 425.5 L 804.5 425.5 Z M 734.5 300.5 L 763.5 300.5 L 763.5 425.5 L 734.5 425.5 Z M 629.5 300.5 L 658.5 300.5 L 658.5 425.5 L 629.5 425.5 Z M 910.5 343.5 L 939.5 343.5 L 939.5 425.5 L 910.5 425.5 Z M 980.5 343.5 L 1009.5 343.5 L 1009.5 425.5 L 980.5 425.5 Z M 1430.5 258.5 L 1459.5 258.5 L 1459.5 503.5 L 1430.5 503.5 Z M 1597.5 258.5 L 1626.5 258.5 L 1626.5 503.5 L 1597.5 503.5 Z M 1164.5 258.5 L 1193.5 258.5 L 1193.5 503.5 L 1164.5 503.5 Z M 1514.5 258.5 L 1543.5 258.5 L 1543.5 503.5 L 1514.5 503.5 Z M 1344.5 258.5 L 1373.5 258.5 L 1373.5 503.5 L 1344.5 503.5 Z M 1248.5 258.5 L 1277.5 258.5 L 1277.5 503.5 L 1248.5 503.5 Z M 1248.5 258.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 467.914062 442.460938 L 467.914062 484.378906 L 461.875 484.378906 L 440.195312 450.394531 L 440.195312 484.378906 L 435.136719 484.378906 L 435.136719 442.460938 L 440.945312 442.460938 L 462.851562 476.730469 L 462.851562 442.460938 Z M 467.914062 442.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 335 632 L 368 632 M 335 599 L 368 599 M 335 599 L 335 632 M 368 599 L 368 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 335 632 L 368 632 M 335 599 L 368 599 M 368 632 L 368 599 M 335 632 L 335 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/dlrtn/sky130_fd_sc_lp__dlrtn_lp.svg b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.svg
index 55a4fa7..9017523 100644
--- a/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.svg
+++ b/cells/dlrtn/sky130_fd_sc_lp__dlrtn_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" 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="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="#image394"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1595.5 723.5 L 1624.5 723.5 L 1624.5 805.5 L 1595.5 805.5 Z M 1525.5 723.5 L 1554.5 723.5 L 1554.5 805.5 L 1525.5 805.5 Z M 1371.5 723.5 L 1401.5 723.5 L 1401.5 805.5 L 1371.5 805.5 Z M 1441.5 723.5 L 1471.5 723.5 L 1471.5 805.5 L 1441.5 805.5 Z M 523.5 733.5 L 552.5 733.5 L 552.5 814.5 L 523.5 814.5 Z M 721.5 733.5 L 750.5 733.5 L 750.5 814.5 L 721.5 814.5 Z M 791.5 733.5 L 820.5 733.5 L 820.5 814.5 L 791.5 814.5 Z M 875.5 733.5 L 904.5 733.5 L 904.5 814.5 L 875.5 814.5 Z M 951.5 733.5 L 980.5 733.5 L 980.5 814.5 L 951.5 814.5 Z M 1056.5 733.5 L 1085.5 733.5 L 1085.5 814.5 L 1056.5 814.5 Z M 1167.5 733.5 L 1196.5 733.5 L 1196.5 814.5 L 1167.5 814.5 Z M 293.5 733.5 L 322.5 733.5 L 322.5 814.5 L 293.5 814.5 Z M 447.5 733.5 L 476.5 733.5 L 476.5 814.5 L 447.5 814.5 Z M 363.5 733.5 L 392.5 733.5 L 392.5 814.5 L 363.5 814.5 Z M 363.5 733.5 "/>
 </clipPath>
-<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image422"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1536.5 261.5 L 1585.5 261.5 L 1585.5 456.5 L 1536.5 456.5 Z M 316.5 261.5 L 365.5 261.5 L 365.5 456.5 L 316.5 456.5 Z M 419.5 261.5 L 468.5 261.5 L 468.5 456.5 L 419.5 456.5 Z M 655.5 261.5 L 704.5 261.5 L 704.5 456.5 L 655.5 456.5 Z M 791.5 261.5 L 840.5 261.5 L 840.5 456.5 L 791.5 456.5 Z M 887.5 261.5 L 935.5 261.5 L 935.5 456.5 L 887.5 456.5 Z M 1040.5 261.5 L 1088.5 261.5 L 1088.5 456.5 L 1040.5 456.5 Z M 1135.5 261.5 L 1184.5 261.5 L 1184.5 456.5 L 1135.5 456.5 Z M 1309.5 261.5 L 1358.5 261.5 L 1358.5 456.5 L 1309.5 456.5 Z M 1412.5 261.5 L 1461.5 261.5 L 1461.5 456.5 L 1412.5 456.5 Z M 1412.5 261.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface391">
+<g id="surface418">
 <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 1681.648438 341.164062 L 1678.949219 344.5 L 1672.910156 339.496094 L 1671.183594 340.417969 L 1669.460938 341.105469 L 1667.675781 341.683594 L 1665.777344 342.085938 L 1663.882812 342.316406 L 1661.925781 342.429688 L 1659.28125 342.257812 L 1656.808594 341.855469 L 1654.507812 341.164062 L 1652.324219 340.246094 L 1650.253906 339.039062 L 1648.414062 337.484375 L 1646.746094 335.816406 L 1645.308594 333.917969 L 1644.15625 331.847656 L 1643.179688 329.605469 L 1642.433594 327.191406 L 1641.972656 324.546875 L 1641.859375 323.914062 L 1641.800781 323.222656 L 1641.742188 322.589844 L 1641.683594 321.902344 L 1641.683594 320.464844 L 1641.800781 317.589844 L 1642.203125 314.828125 L 1642.835938 312.296875 L 1643.753906 309.882812 L 1644.90625 307.640625 L 1646.402344 305.570312 L 1647.894531 303.902344 L 1649.621094 302.40625 L 1651.519531 301.140625 L 1653.53125 300.164062 L 1655.714844 299.359375 L 1658.132812 298.785156 L 1658.707031 298.726562 L 1659.339844 298.667969 L 1659.972656 298.613281 L 1660.605469 298.554688 L 1661.234375 298.554688 L 1661.925781 298.496094 L 1664.515625 298.667969 L 1666.988281 299.070312 L 1669.285156 299.761719 L 1671.472656 300.683594 L 1673.542969 301.890625 L 1675.441406 303.386719 L 1677.050781 305.109375 L 1678.488281 306.949219 L 1679.636719 308.960938 L 1680.613281 311.207031 L 1681.363281 313.621094 L 1681.878906 316.152344 L 1681.9375 316.898438 L 1681.996094 317.589844 L 1682.050781 318.277344 L 1682.109375 318.96875 L 1682.109375 319.660156 L 1682.167969 320.347656 L 1681.996094 323.570312 L 1681.476562 326.617188 L 1680.671875 329.433594 L 1679.523438 332.078125 L 1678.027344 334.496094 L 1676.246094 336.738281 Z M 1667.160156 329.320312 L 1672.277344 333.515625 L 1673.65625 331.792969 L 1674.808594 329.835938 L 1675.667969 327.707031 L 1676.300781 325.464844 L 1676.648438 323.050781 L 1676.820312 320.40625 L 1676.703125 317.992188 L 1676.359375 315.691406 L 1675.785156 313.5625 L 1675.039062 311.609375 L 1674.058594 309.769531 L 1672.851562 308.101562 L 1671.472656 306.71875 L 1670.035156 305.570312 L 1668.425781 304.648438 L 1666.699219 303.960938 L 1664.800781 303.5 L 1662.847656 303.210938 L 1661.925781 303.210938 L 1659.855469 303.386719 L 1657.902344 303.730469 L 1656.0625 304.304688 L 1654.394531 305.167969 L 1652.839844 306.261719 L 1651.460938 307.582031 L 1650.136719 309.136719 L 1649.101562 310.859375 L 1648.242188 312.757812 L 1647.609375 314.828125 L 1647.207031 317.070312 L 1647.03125 319.484375 L 1647.03125 320.464844 L 1647.089844 322.992188 L 1647.433594 325.292969 L 1648.011719 327.421875 L 1648.757812 329.433594 L 1649.792969 331.273438 L 1651.058594 332.882812 L 1652.378906 334.320312 L 1653.875 335.472656 L 1655.484375 336.390625 L 1657.210938 337.023438 L 1659.109375 337.484375 L 1661.121094 337.65625 L 1661.234375 337.714844 L 1662.902344 337.714844 L 1663.996094 337.597656 L 1665.089844 337.371094 L 1666.125 337.140625 L 1667.160156 336.792969 L 1668.25 336.335938 L 1668.308594 336.335938 L 1668.425781 336.277344 L 1668.480469 336.21875 L 1668.597656 336.21875 L 1668.652344 336.160156 L 1668.769531 336.105469 L 1664.515625 332.539062 Z M 1667.160156 329.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 1643 776 L 1676 776 M 1643 743 L 1676 743 M 1643 743 L 1643 776 M 1676 743 L 1676 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 1643 776 L 1676 776 M 1643 743 L 1676 743 M 1676 776 L 1676 743 M 1643 776 L 1643 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/dlrtp/sky130_fd_sc_lp__dlrtp_1.svg b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.svg
index eb341c7..afe5885 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_1.svg
+++ b/cells/dlrtp/sky130_fd_sc_lp__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 539.5 L 174.5 539.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image468" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image495" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image468"/>
+  <use xlink:href="#image495"/>
 </pattern>
 <mask 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="#image468"/>
+  <use xlink:href="#image495"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1350.5 638.5 L 1383.5 638.5 L 1383.5 824.5 L 1350.5 824.5 Z M 1429.5 638.5 L 1463.5 638.5 L 1463.5 824.5 L 1429.5 824.5 Z M 1549.5 638.5 L 1582.5 638.5 L 1582.5 824.5 L 1549.5 824.5 Z M 458.5 734.5 L 491.5 734.5 L 491.5 827.5 L 458.5 827.5 Z M 329.5 734.5 L 362.5 734.5 L 362.5 827.5 L 329.5 827.5 Z M 1031.5 760.5 L 1064.5 760.5 L 1064.5 852.5 L 1031.5 852.5 Z M 911.5 760.5 L 944.5 760.5 L 944.5 852.5 L 911.5 852.5 Z M 737.5 760.5 L 770.5 760.5 L 770.5 852.5 L 737.5 852.5 Z M 832.5 760.5 L 865.5 760.5 L 865.5 852.5 L 832.5 852.5 Z M 1110.5 760.5 L 1143.5 760.5 L 1143.5 852.5 L 1110.5 852.5 Z M 1110.5 760.5 "/>
 </clipPath>
-<image id="image469" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image496" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image469"/>
+  <use xlink:href="#image496"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 871.5 240.5 L 905.5 240.5 L 905.5 382.5 L 871.5 382.5 Z M 951.5 240.5 L 984.5 240.5 L 984.5 382.5 L 951.5 382.5 Z M 1067.5 289.5 L 1100.5 289.5 L 1100.5 382.5 L 1067.5 382.5 Z M 1153.5 289.5 L 1186.5 289.5 L 1186.5 382.5 L 1153.5 382.5 Z M 685.5 240.5 L 718.5 240.5 L 718.5 382.5 L 685.5 382.5 Z M 320.5 250.5 L 353.5 250.5 L 353.5 392.5 L 320.5 392.5 Z M 458.5 250.5 L 491.5 250.5 L 491.5 392.5 L 458.5 392.5 Z M 1445.5 220.5 L 1478.5 220.5 L 1478.5 499.5 L 1445.5 499.5 Z M 1350.5 220.5 L 1383.5 220.5 L 1383.5 499.5 L 1350.5 499.5 Z M 1556.5 220.5 L 1590.5 220.5 L 1590.5 499.5 L 1556.5 499.5 Z M 1556.5 220.5 "/>
 </clipPath>
-<image id="image470" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image497" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image470"/>
+  <use xlink:href="#image497"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 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="image471" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image498" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image471"/>
+  <use xlink:href="#image498"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface465">
+<g id="surface492">
 <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 1672.789062 314.757812 L 1669.757812 318.5 L 1662.984375 312.886719 L 1661.046875 313.917969 L 1659.113281 314.695312 L 1657.113281 315.339844 L 1654.984375 315.789062 L 1652.855469 316.046875 L 1650.660156 316.175781 L 1647.695312 315.984375 L 1644.917969 315.53125 L 1642.339844 314.757812 L 1639.886719 313.726562 L 1637.566406 312.371094 L 1635.5 310.628906 L 1633.628906 308.757812 L 1632.015625 306.628906 L 1630.726562 304.304688 L 1629.628906 301.789062 L 1628.789062 299.082031 L 1628.273438 296.113281 L 1628.144531 295.402344 L 1628.082031 294.628906 L 1628.015625 293.917969 L 1627.953125 293.144531 L 1627.953125 291.53125 L 1628.082031 288.304688 L 1628.53125 285.210938 L 1629.242188 282.371094 L 1630.273438 279.660156 L 1631.566406 277.144531 L 1633.242188 274.824219 L 1634.917969 272.953125 L 1636.855469 271.273438 L 1638.984375 269.855469 L 1641.242188 268.757812 L 1643.695312 267.855469 L 1646.402344 267.210938 L 1647.046875 267.144531 L 1647.757812 267.082031 L 1648.46875 267.015625 L 1649.175781 266.953125 L 1649.886719 266.953125 L 1650.660156 266.886719 L 1653.566406 267.082031 L 1656.339844 267.53125 L 1658.917969 268.304688 L 1661.371094 269.339844 L 1663.695312 270.695312 L 1665.824219 272.371094 L 1667.628906 274.304688 L 1669.242188 276.371094 L 1670.53125 278.628906 L 1671.628906 281.144531 L 1672.46875 283.855469 L 1673.046875 286.695312 L 1673.113281 287.53125 L 1673.175781 288.304688 L 1673.242188 289.082031 L 1673.304688 289.855469 L 1673.304688 290.628906 L 1673.371094 291.402344 L 1673.175781 295.015625 L 1672.597656 298.433594 L 1671.695312 301.597656 L 1670.402344 304.566406 L 1668.726562 307.273438 L 1666.726562 309.789062 Z M 1656.53125 301.46875 L 1662.273438 306.175781 L 1663.824219 304.242188 L 1665.113281 302.046875 L 1666.082031 299.660156 L 1666.789062 297.144531 L 1667.175781 294.433594 L 1667.371094 291.46875 L 1667.242188 288.757812 L 1666.855469 286.175781 L 1666.210938 283.789062 L 1665.371094 281.597656 L 1664.273438 279.53125 L 1662.917969 277.660156 L 1661.371094 276.113281 L 1659.757812 274.824219 L 1657.953125 273.789062 L 1656.015625 273.015625 L 1653.886719 272.5 L 1651.695312 272.175781 L 1650.660156 272.175781 L 1648.339844 272.371094 L 1646.144531 272.757812 L 1644.082031 273.402344 L 1642.210938 274.371094 L 1640.46875 275.597656 L 1638.917969 277.082031 L 1637.433594 278.824219 L 1636.273438 280.757812 L 1635.304688 282.886719 L 1634.597656 285.210938 L 1634.144531 287.726562 L 1633.953125 290.433594 L 1633.953125 291.53125 L 1634.015625 294.371094 L 1634.402344 296.953125 L 1635.046875 299.339844 L 1635.886719 301.597656 L 1637.046875 303.660156 L 1638.46875 305.46875 L 1639.953125 307.082031 L 1641.628906 308.371094 L 1643.433594 309.402344 L 1645.371094 310.113281 L 1647.5 310.628906 L 1649.757812 310.824219 L 1649.886719 310.886719 L 1651.757812 310.886719 L 1652.984375 310.757812 L 1654.210938 310.5 L 1655.371094 310.242188 L 1656.53125 309.855469 L 1657.757812 309.339844 L 1657.824219 309.339844 L 1657.953125 309.273438 L 1658.015625 309.210938 L 1658.144531 309.210938 L 1658.210938 309.144531 L 1658.339844 309.082031 L 1653.566406 305.082031 Z M 1656.53125 301.46875 "/>
 <path style="fill:none;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 807 L 1667 807 M 1629 769 L 1667 769 M 1629 769 L 1629 807 M 1667 769 L 1667 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 1629 807 L 1667 807 M 1629 769 L 1667 769 M 1667 807 L 1667 769 M 1629 807 L 1629 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/dlrtp/sky130_fd_sc_lp__dlrtp_2.svg b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.svg
index 8c7c2d2..3c52070 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_2.svg
+++ b/cells/dlrtp/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image436" 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="#image436"/>
+  <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 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="#image436"/>
+  <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 1337.5 631.5 L 1368.5 631.5 L 1368.5 805.5 L 1337.5 805.5 Z M 1449.5 631.5 L 1480.5 631.5 L 1480.5 805.5 L 1449.5 805.5 Z M 1263.5 631.5 L 1294.5 631.5 L 1294.5 805.5 L 1263.5 805.5 Z M 1562.5 631.5 L 1593.5 631.5 L 1593.5 805.5 L 1562.5 805.5 Z M 310.5 738.5 L 341.5 738.5 L 341.5 825.5 L 310.5 825.5 Z M 466.5 738.5 L 497.5 738.5 L 497.5 825.5 L 466.5 825.5 Z M 852.5 745.5 L 883.5 745.5 L 883.5 832.5 L 852.5 832.5 Z M 777.5 745.5 L 808.5 745.5 L 808.5 832.5 L 777.5 832.5 Z M 688.5 745.5 L 719.5 745.5 L 719.5 832.5 L 688.5 832.5 Z M 1038.5 745.5 L 1069.5 745.5 L 1069.5 832.5 L 1038.5 832.5 Z M 963.5 745.5 L 994.5 745.5 L 994.5 832.5 L 963.5 832.5 Z M 963.5 745.5 "/>
 </clipPath>
-<image id="image437" 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="#image437"/>
+  <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 890.5 252.5 L 921.5 252.5 L 921.5 385.5 L 890.5 385.5 Z M 995.5 298.5 L 1027.5 298.5 L 1027.5 385.5 L 995.5 385.5 Z M 1076.5 298.5 L 1107.5 298.5 L 1107.5 385.5 L 1076.5 385.5 Z M 815.5 252.5 L 846.5 252.5 L 846.5 385.5 L 815.5 385.5 Z M 665.5 252.5 L 696.5 252.5 L 696.5 385.5 L 665.5 385.5 Z M 310.5 257.5 L 341.5 257.5 L 341.5 389.5 L 310.5 389.5 Z M 443.5 257.5 L 474.5 257.5 L 474.5 389.5 L 443.5 389.5 Z M 1352.5 240.5 L 1383.5 240.5 L 1383.5 501.5 L 1352.5 501.5 Z M 1496.5 240.5 L 1527.5 240.5 L 1527.5 501.5 L 1496.5 501.5 Z M 1263.5 240.5 L 1294.5 240.5 L 1294.5 501.5 L 1263.5 501.5 Z M 1585.5 240.5 L 1616.5 240.5 L 1616.5 501.5 L 1585.5 501.5 Z M 1585.5 240.5 "/>
 </clipPath>
-<image id="image438" 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="#image438"/>
+  <use xlink:href="#image466"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image439" 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="#image439"/>
+  <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="surface433">
+<g id="surface461">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -227,6 +227,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1501.632812 544.804688 L 1501.507812 546.777344 L 1501.199219 548.566406 L 1500.644531 550.234375 L 1499.902344 551.714844 L 1498.917969 553.132812 L 1497.742188 554.367188 L 1496.449219 555.417969 L 1495.089844 556.21875 L 1493.546875 556.835938 L 1491.941406 557.332031 L 1490.214844 557.578125 L 1488.363281 557.640625 L 1468.0625 557.640625 L 1468.0625 512.652344 L 1486.328125 512.652344 L 1488.980469 512.835938 L 1491.324219 513.269531 L 1493.425781 514.007812 L 1495.214844 515.058594 L 1496.757812 516.414062 L 1497.992188 518.082031 L 1498.484375 519.007812 L 1498.917969 519.996094 L 1499.226562 520.921875 L 1499.472656 521.96875 L 1499.59375 523.019531 L 1499.65625 524.066406 L 1499.472656 526.289062 L 1498.917969 528.203125 L 1498.050781 529.992188 L 1496.820312 531.472656 L 1495.277344 532.832031 L 1493.425781 533.878906 L 1495.214844 534.683594 L 1496.757812 535.546875 L 1498.113281 536.535156 L 1499.226562 537.644531 L 1500.089844 538.816406 L 1500.769531 540.050781 L 1501.015625 540.792969 L 1501.199219 541.53125 L 1501.386719 542.273438 L 1501.507812 543.136719 L 1501.570312 543.9375 Z M 1493.917969 524.871094 L 1493.734375 523.019531 L 1493.175781 521.476562 L 1492.3125 520.117188 L 1491.078125 519.132812 L 1489.535156 518.390625 L 1487.625 517.898438 L 1487.191406 517.898438 L 1486.757812 517.835938 L 1486.328125 517.773438 L 1485.339844 517.773438 L 1484.90625 517.710938 L 1473.800781 517.710938 L 1473.800781 532.027344 L 1484.90625 532.027344 L 1487.191406 531.90625 L 1489.167969 531.535156 L 1490.832031 530.855469 L 1492.066406 529.929688 L 1493.054688 528.695312 L 1493.671875 527.214844 L 1493.734375 526.90625 L 1493.792969 526.535156 L 1493.855469 526.167969 L 1493.855469 525.300781 Z M 1487.808594 552.578125 L 1489.535156 552.515625 L 1491.078125 552.148438 L 1492.4375 551.53125 L 1493.546875 550.726562 L 1494.472656 549.679688 L 1495.214844 548.382812 L 1495.398438 547.886719 L 1495.523438 547.332031 L 1495.707031 546.714844 L 1495.769531 546.160156 L 1495.832031 545.542969 L 1495.894531 544.863281 L 1495.769531 543.507812 L 1495.523438 542.210938 L 1495.089844 541.101562 L 1494.472656 540.050781 L 1493.671875 539.1875 L 1492.746094 538.386719 L 1492.066406 538.015625 L 1491.324219 537.707031 L 1490.523438 537.460938 L 1489.660156 537.273438 L 1488.734375 537.152344 L 1487.808594 537.089844 L 1473.800781 537.089844 L 1473.800781 552.578125 Z M 1487.808594 552.578125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1339 560 L 1374 560 M 1339 525 L 1374 525 M 1339 525 L 1339 560 M 1374 525 L 1374 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 1339 560 L 1374 560 M 1339 525 L 1374 525 M 1374 560 L 1374 525 M 1339 560 L 1339 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/dlrtp/sky130_fd_sc_lp__dlrtp_4.svg b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.svg
index e9fde7c..05407cd 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.svg
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image442" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image470" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image442"/>
+  <use xlink:href="#image470"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image442"/>
+  <use xlink:href="#image470"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1508.5 620.5 L 1535.5 620.5 L 1535.5 775.5 L 1508.5 775.5 Z M 1587.5 620.5 L 1615.5 620.5 L 1615.5 775.5 L 1587.5 775.5 Z M 1350.5 620.5 L 1377.5 620.5 L 1377.5 775.5 L 1350.5 775.5 Z M 1271.5 620.5 L 1298.5 620.5 L 1298.5 775.5 L 1271.5 775.5 Z M 1429.5 620.5 L 1456.5 620.5 L 1456.5 775.5 L 1429.5 775.5 Z M 1177.5 620.5 L 1205.5 620.5 L 1205.5 775.5 L 1177.5 775.5 Z M 303.5 700.5 L 330.5 700.5 L 330.5 777.5 L 303.5 777.5 Z M 432.5 700.5 L 459.5 700.5 L 459.5 777.5 L 432.5 777.5 Z M 898.5 721.5 L 925.5 721.5 L 925.5 799.5 L 898.5 799.5 Z M 732.5 721.5 L 760.5 721.5 L 760.5 799.5 L 732.5 799.5 Z M 638.5 721.5 L 666.5 721.5 L 666.5 799.5 L 638.5 799.5 Z M 997.5 721.5 L 1024.5 721.5 L 1024.5 799.5 L 997.5 799.5 Z M 798.5 721.5 L 826.5 721.5 L 826.5 799.5 L 798.5 799.5 Z M 798.5 721.5 "/>
 </clipPath>
-<image id="image443" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image471" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image443"/>
+  <use xlink:href="#image471"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 638.5 293.5 L 666.5 293.5 L 666.5 411.5 L 638.5 411.5 Z M 780.5 293.5 L 807.5 293.5 L 807.5 411.5 L 780.5 411.5 Z M 846.5 293.5 L 874.5 293.5 L 874.5 411.5 L 846.5 411.5 Z M 943.5 333.5 L 970.5 333.5 L 970.5 411.5 L 943.5 411.5 Z M 1012.5 333.5 L 1039.5 333.5 L 1039.5 411.5 L 1012.5 411.5 Z M 303.5 298.5 L 330.5 298.5 L 330.5 415.5 L 303.5 415.5 Z M 427.5 298.5 L 455.5 298.5 L 455.5 415.5 L 427.5 415.5 Z M 1428.5 273.5 L 1455.5 273.5 L 1455.5 504.5 L 1428.5 504.5 Z M 1177.5 273.5 L 1205.5 273.5 L 1205.5 504.5 L 1177.5 504.5 Z M 1586.5 273.5 L 1614.5 273.5 L 1614.5 504.5 L 1586.5 504.5 Z M 1507.5 273.5 L 1535.5 273.5 L 1535.5 504.5 L 1507.5 504.5 Z M 1256.5 273.5 L 1284.5 273.5 L 1284.5 504.5 L 1256.5 504.5 Z M 1349.5 273.5 L 1376.5 273.5 L 1376.5 504.5 L 1349.5 504.5 Z M 1349.5 273.5 "/>
 </clipPath>
-<image id="image444" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image472" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image444"/>
+  <use xlink:href="#image472"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image445" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image473" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image445"/>
+  <use xlink:href="#image473"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface439">
+<g id="surface467">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1686.59375 623.328125 L 1684.023438 626.5 L 1678.28125 621.742188 L 1676.640625 622.617188 L 1674.996094 623.273438 L 1673.300781 623.820312 L 1671.496094 624.203125 L 1669.691406 624.421875 L 1667.832031 624.53125 L 1665.316406 624.367188 L 1662.964844 623.984375 L 1660.777344 623.328125 L 1658.699219 622.453125 L 1656.730469 621.304688 L 1654.976562 619.828125 L 1653.390625 618.242188 L 1652.023438 616.433594 L 1650.929688 614.464844 L 1650 612.332031 L 1649.289062 610.035156 L 1648.851562 607.519531 L 1648.742188 606.917969 L 1648.6875 606.261719 L 1648.632812 605.660156 L 1648.578125 605.003906 L 1648.578125 603.636719 L 1648.6875 600.902344 L 1649.070312 598.277344 L 1649.671875 595.867188 L 1650.546875 593.570312 L 1651.640625 591.4375 L 1653.0625 589.46875 L 1654.484375 587.882812 L 1656.125 586.460938 L 1657.933594 585.257812 L 1659.847656 584.328125 L 1661.925781 583.5625 L 1664.222656 583.015625 L 1664.769531 582.960938 L 1666.574219 582.796875 L 1667.175781 582.796875 L 1667.832031 582.742188 L 1670.292969 582.90625 L 1672.644531 583.289062 L 1674.832031 583.945312 L 1676.914062 584.820312 L 1678.882812 585.96875 L 1680.6875 587.390625 L 1682.21875 589.03125 L 1683.585938 590.78125 L 1684.679688 592.695312 L 1685.609375 594.828125 L 1686.320312 597.125 L 1686.8125 599.535156 L 1686.867188 600.246094 L 1687.03125 602.214844 L 1687.03125 602.871094 L 1687.085938 603.527344 L 1686.921875 606.589844 L 1686.429688 609.488281 L 1685.664062 612.167969 L 1684.570312 614.683594 L 1683.148438 616.984375 L 1681.453125 619.117188 Z M 1672.808594 612.058594 L 1677.679688 616.050781 L 1678.992188 614.410156 L 1680.085938 612.550781 L 1680.90625 610.527344 L 1681.507812 608.394531 L 1681.835938 606.097656 L 1682 603.582031 L 1681.890625 601.285156 L 1681.5625 599.097656 L 1681.015625 597.070312 L 1680.304688 595.210938 L 1679.375 593.460938 L 1678.226562 591.875 L 1676.914062 590.5625 L 1675.542969 589.46875 L 1674.011719 588.59375 L 1672.371094 587.9375 L 1670.566406 587.5 L 1668.707031 587.226562 L 1667.832031 587.226562 L 1665.863281 587.390625 L 1664.003906 587.71875 L 1662.253906 588.265625 L 1660.667969 589.085938 L 1659.191406 590.125 L 1657.878906 591.382812 L 1656.621094 592.859375 L 1655.632812 594.5 L 1654.8125 596.304688 L 1654.210938 598.277344 L 1653.828125 600.410156 L 1653.664062 602.707031 L 1653.664062 603.636719 L 1653.71875 606.042969 L 1654.046875 608.230469 L 1654.59375 610.253906 L 1655.304688 612.167969 L 1656.292969 613.917969 L 1657.496094 615.449219 L 1658.753906 616.820312 L 1660.175781 617.914062 L 1661.707031 618.789062 L 1663.347656 619.390625 L 1665.152344 619.828125 L 1667.066406 619.992188 L 1667.175781 620.046875 L 1668.761719 620.046875 L 1669.800781 619.9375 L 1670.839844 619.71875 L 1671.824219 619.5 L 1672.808594 619.171875 L 1673.847656 618.734375 L 1673.902344 618.734375 L 1674.011719 618.679688 L 1674.066406 618.625 L 1674.175781 618.625 L 1674.230469 618.570312 L 1674.339844 618.515625 L 1670.292969 615.121094 Z M 1672.808594 612.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 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/dlrtp/sky130_fd_sc_lp__dlrtp_lp.svg b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.svg
index 543bffa..87c0439 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.svg
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp.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 388.5 536.5 L 982.5 536.5 L 982.5 552.5 L 388.5 552.5 Z M 749.5 552.5 L 982.5 552.5 L 982.5 554.5 L 749.5 554.5 Z M 749.5 552.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image408"/>
 </pattern>
 <mask 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="#image381"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1068.5 641.5 L 1089.5 641.5 L 1089.5 701.5 L 1068.5 701.5 Z M 939.5 641.5 L 960.5 641.5 L 960.5 701.5 L 939.5 701.5 Z M 994.5 641.5 L 1016.5 641.5 L 1016.5 701.5 L 994.5 701.5 Z M 877.5 641.5 L 898.5 641.5 L 898.5 701.5 L 877.5 701.5 Z M 586.5 661.5 L 607.5 661.5 L 607.5 721.5 L 586.5 721.5 Z M 637.5 661.5 L 659.5 661.5 L 659.5 721.5 L 637.5 721.5 Z M 524.5 661.5 L 545.5 661.5 L 545.5 721.5 L 524.5 721.5 Z M 472.5 661.5 L 494.5 661.5 L 494.5 721.5 L 472.5 721.5 Z M 261.5 673.5 L 283.5 673.5 L 283.5 733.5 L 261.5 733.5 Z M 313.5 673.5 L 334.5 673.5 L 334.5 733.5 L 313.5 733.5 Z M 1512.5 620.5 L 1533.5 620.5 L 1533.5 740.5 L 1512.5 740.5 Z M 1319.5 620.5 L 1340.5 620.5 L 1340.5 740.5 L 1319.5 740.5 Z M 1563.5 620.5 L 1585.5 620.5 L 1585.5 740.5 L 1563.5 740.5 Z M 1263.5 620.5 L 1284.5 620.5 L 1284.5 740.5 L 1263.5 740.5 Z M 1263.5 620.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image409"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 261.5 345.5 L 283.5 345.5 L 283.5 437.5 L 261.5 437.5 Z M 313.5 345.5 L 334.5 345.5 L 334.5 437.5 L 313.5 437.5 Z M 1036.5 404.5 L 1058.5 404.5 L 1058.5 496.5 L 1036.5 496.5 Z M 1114.5 436.5 L 1136.5 436.5 L 1136.5 496.5 L 1114.5 496.5 Z M 1578.5 330.5 L 1599.5 330.5 L 1599.5 510.5 L 1578.5 510.5 Z M 1634.5 330.5 L 1655.5 330.5 L 1655.5 510.5 L 1634.5 510.5 Z M 1436.5 330.5 L 1457.5 330.5 L 1457.5 510.5 L 1436.5 510.5 Z M 1261.5 330.5 L 1282.5 330.5 L 1282.5 510.5 L 1261.5 510.5 Z M 1322.5 330.5 L 1344.5 330.5 L 1344.5 510.5 L 1322.5 510.5 Z M 1374.5 330.5 L 1396.5 330.5 L 1396.5 510.5 L 1374.5 510.5 Z M 674.5 434.5 L 695.5 434.5 L 695.5 526.5 L 674.5 526.5 Z M 622.5 434.5 L 644.5 434.5 L 644.5 526.5 L 622.5 526.5 Z M 455.5 434.5 L 477.5 434.5 L 477.5 526.5 L 455.5 526.5 Z M 528.5 434.5 L 550.5 434.5 L 550.5 526.5 L 528.5 526.5 Z M 894.5 467.5 L 916.5 467.5 L 916.5 528.5 L 894.5 528.5 Z M 816.5 436.5 L 837.5 436.5 L 837.5 528.5 L 816.5 528.5 Z M 816.5 436.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image410"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image411"/>
 </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="surface405">
 <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 1698.339844 391.058594 L 1696.363281 393.5 L 1691.945312 389.839844 L 1690.683594 390.511719 L 1689.421875 391.015625 L 1688.117188 391.4375 L 1686.730469 391.734375 L 1685.339844 391.902344 L 1683.910156 391.984375 L 1681.972656 391.859375 L 1680.164062 391.566406 L 1678.480469 391.058594 L 1676.882812 390.386719 L 1675.367188 389.503906 L 1674.023438 388.367188 L 1672.800781 387.148438 L 1671.75 385.757812 L 1670.90625 384.242188 L 1670.191406 382.601562 L 1669.644531 380.835938 L 1669.308594 378.898438 L 1669.226562 378.4375 L 1669.183594 377.933594 L 1669.140625 377.46875 L 1669.097656 376.964844 L 1669.097656 375.914062 L 1669.183594 373.808594 L 1669.476562 371.789062 L 1669.941406 369.9375 L 1670.613281 368.171875 L 1671.457031 366.53125 L 1672.550781 365.015625 L 1673.644531 363.792969 L 1674.90625 362.699219 L 1676.292969 361.773438 L 1677.765625 361.058594 L 1679.367188 360.46875 L 1681.132812 360.050781 L 1681.554688 360.007812 L 1682.015625 359.964844 L 1682.480469 359.921875 L 1682.941406 359.882812 L 1683.40625 359.882812 L 1683.910156 359.839844 L 1685.804688 359.964844 L 1687.613281 360.261719 L 1689.296875 360.765625 L 1690.894531 361.4375 L 1692.410156 362.320312 L 1693.796875 363.414062 L 1694.976562 364.679688 L 1696.027344 366.023438 L 1696.867188 367.496094 L 1697.585938 369.136719 L 1698.132812 370.90625 L 1698.511719 372.757812 L 1698.550781 373.304688 L 1698.636719 374.3125 L 1698.679688 374.820312 L 1698.679688 375.324219 L 1698.71875 375.828125 L 1698.59375 378.183594 L 1698.214844 380.414062 L 1697.625 382.476562 L 1696.785156 384.410156 L 1695.691406 386.179688 L 1694.386719 387.820312 Z M 1687.738281 382.390625 L 1691.484375 385.464844 L 1692.492188 384.203125 L 1693.335938 382.769531 L 1693.964844 381.214844 L 1694.429688 379.574219 L 1694.679688 377.804688 L 1694.808594 375.871094 L 1694.722656 374.101562 L 1694.46875 372.421875 L 1694.050781 370.863281 L 1693.503906 369.433594 L 1692.789062 368.085938 L 1691.902344 366.867188 L 1690.894531 365.855469 L 1689.84375 365.015625 L 1688.664062 364.339844 L 1687.402344 363.835938 L 1686.011719 363.5 L 1684.582031 363.289062 L 1683.910156 363.289062 L 1682.394531 363.414062 L 1680.964844 363.667969 L 1679.617188 364.089844 L 1678.398438 364.71875 L 1677.261719 365.519531 L 1676.25 366.488281 L 1675.285156 367.625 L 1674.527344 368.886719 L 1673.894531 370.273438 L 1673.433594 371.789062 L 1673.136719 373.429688 L 1673.011719 375.195312 L 1673.011719 375.914062 L 1673.054688 377.765625 L 1673.304688 379.445312 L 1673.726562 381.003906 L 1674.273438 382.476562 L 1675.03125 383.824219 L 1675.957031 385 L 1676.925781 386.050781 L 1678.019531 386.894531 L 1679.195312 387.566406 L 1680.460938 388.03125 L 1681.847656 388.367188 L 1683.320312 388.492188 L 1683.40625 388.535156 L 1684.625 388.535156 L 1685.425781 388.449219 L 1686.222656 388.28125 L 1686.980469 388.113281 L 1687.738281 387.863281 L 1688.539062 387.523438 L 1688.578125 387.523438 L 1688.664062 387.484375 L 1688.707031 387.441406 L 1688.789062 387.441406 L 1688.832031 387.398438 L 1688.917969 387.355469 L 1685.804688 384.75 Z M 1687.738281 382.390625 "/>
 <path style="fill:none;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 716 L 1694 716 M 1670 691 L 1694 691 M 1670 691 L 1670 716 M 1694 691 L 1694 716 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 716 L 1694 716 M 1670 691 L 1694 691 M 1694 716 L 1694 691 M 1670 716 L 1670 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,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/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.svg b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.svg
index d51fa10..9aede21 100644
--- a/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.svg
+++ b/cells/dlrtp/sky130_fd_sc_lp__dlrtp_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 501.5 L 174.5 501.5 Z M 689.5 501.5 L 1743.5 501.5 L 1743.5 538.5 L 689.5 538.5 Z M 174.5 501.5 L 353.5 501.5 L 353.5 538.5 L 174.5 538.5 Z M 174.5 501.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#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 538.5 598.5 L 567.5 598.5 L 567.5 680.5 L 538.5 680.5 Z M 468.5 598.5 L 497.5 598.5 L 497.5 680.5 L 468.5 680.5 Z M 369.5 660.5 L 398.5 660.5 L 398.5 741.5 L 369.5 741.5 Z M 293.5 660.5 L 322.5 660.5 L 322.5 741.5 L 293.5 741.5 Z M 1595.5 723.5 L 1624.5 723.5 L 1624.5 805.5 L 1595.5 805.5 Z M 1366.5 723.5 L 1395.5 723.5 L 1395.5 805.5 L 1366.5 805.5 Z M 1525.5 723.5 L 1554.5 723.5 L 1554.5 805.5 L 1525.5 805.5 Z M 1441.5 723.5 L 1471.5 723.5 L 1471.5 805.5 L 1441.5 805.5 Z M 1009.5 733.5 L 1039.5 733.5 L 1039.5 814.5 L 1009.5 814.5 Z M 822.5 733.5 L 852.5 733.5 L 852.5 814.5 L 822.5 814.5 Z M 669.5 733.5 L 698.5 733.5 L 698.5 814.5 L 669.5 814.5 Z M 739.5 733.5 L 768.5 733.5 L 768.5 814.5 L 739.5 814.5 Z M 1085.5 733.5 L 1114.5 733.5 L 1114.5 814.5 L 1085.5 814.5 Z M 898.5 733.5 L 928.5 733.5 L 928.5 814.5 L 898.5 814.5 Z M 898.5 733.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 293.5 258.5 L 342.5 258.5 L 342.5 452.5 L 293.5 452.5 Z M 1419.5 258.5 L 1468.5 258.5 L 1468.5 452.5 L 1419.5 452.5 Z M 1531.5 258.5 L 1580.5 258.5 L 1580.5 452.5 L 1531.5 452.5 Z M 883.5 258.5 L 931.5 258.5 L 931.5 452.5 L 883.5 452.5 Z M 1179.5 258.5 L 1227.5 258.5 L 1227.5 452.5 L 1179.5 452.5 Z M 1081.5 258.5 L 1130.5 258.5 L 1130.5 452.5 L 1081.5 452.5 Z M 978.5 258.5 L 1027.5 258.5 L 1027.5 452.5 L 978.5 452.5 Z M 1316.5 258.5 L 1365.5 258.5 L 1365.5 452.5 L 1316.5 452.5 Z M 676.5 258.5 L 725.5 258.5 L 725.5 452.5 L 676.5 452.5 Z M 412.5 271.5 L 460.5 271.5 L 460.5 466.5 L 412.5 466.5 Z M 412.5 271.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1681.648438 341.164062 L 1678.949219 344.5 L 1672.910156 339.496094 L 1671.183594 340.417969 L 1669.460938 341.105469 L 1667.675781 341.683594 L 1665.777344 342.085938 L 1663.882812 342.316406 L 1661.925781 342.429688 L 1659.28125 342.257812 L 1656.808594 341.855469 L 1654.507812 341.164062 L 1652.324219 340.246094 L 1650.253906 339.039062 L 1648.414062 337.484375 L 1646.746094 335.816406 L 1645.308594 333.917969 L 1644.15625 331.847656 L 1643.179688 329.605469 L 1642.433594 327.191406 L 1641.972656 324.546875 L 1641.859375 323.914062 L 1641.800781 323.222656 L 1641.742188 322.589844 L 1641.683594 321.902344 L 1641.683594 320.464844 L 1641.800781 317.589844 L 1642.203125 314.828125 L 1642.835938 312.296875 L 1643.753906 309.882812 L 1644.90625 307.640625 L 1646.402344 305.570312 L 1647.894531 303.902344 L 1649.621094 302.40625 L 1651.519531 301.140625 L 1653.53125 300.164062 L 1655.714844 299.359375 L 1658.132812 298.785156 L 1658.707031 298.726562 L 1659.339844 298.667969 L 1659.972656 298.613281 L 1660.605469 298.554688 L 1661.234375 298.554688 L 1661.925781 298.496094 L 1664.515625 298.667969 L 1666.988281 299.070312 L 1669.285156 299.761719 L 1671.472656 300.683594 L 1673.542969 301.890625 L 1675.441406 303.386719 L 1677.050781 305.109375 L 1678.488281 306.949219 L 1679.636719 308.960938 L 1680.613281 311.207031 L 1681.363281 313.621094 L 1681.878906 316.152344 L 1681.9375 316.898438 L 1681.996094 317.589844 L 1682.050781 318.277344 L 1682.109375 318.96875 L 1682.109375 319.660156 L 1682.167969 320.347656 L 1681.996094 323.570312 L 1681.476562 326.617188 L 1680.671875 329.433594 L 1679.523438 332.078125 L 1678.027344 334.496094 L 1676.246094 336.738281 Z M 1667.160156 329.320312 L 1672.277344 333.515625 L 1673.65625 331.792969 L 1674.808594 329.835938 L 1675.667969 327.707031 L 1676.300781 325.464844 L 1676.648438 323.050781 L 1676.820312 320.40625 L 1676.703125 317.992188 L 1676.359375 315.691406 L 1675.785156 313.5625 L 1675.039062 311.609375 L 1674.058594 309.769531 L 1672.851562 308.101562 L 1671.472656 306.71875 L 1670.035156 305.570312 L 1668.425781 304.648438 L 1666.699219 303.960938 L 1664.800781 303.5 L 1662.847656 303.210938 L 1661.925781 303.210938 L 1659.855469 303.386719 L 1657.902344 303.730469 L 1656.0625 304.304688 L 1654.394531 305.167969 L 1652.839844 306.261719 L 1651.460938 307.582031 L 1650.136719 309.136719 L 1649.101562 310.859375 L 1648.242188 312.757812 L 1647.609375 314.828125 L 1647.207031 317.070312 L 1647.03125 319.484375 L 1647.03125 320.464844 L 1647.089844 322.992188 L 1647.433594 325.292969 L 1648.011719 327.421875 L 1648.757812 329.433594 L 1649.792969 331.273438 L 1651.058594 332.882812 L 1652.378906 334.320312 L 1653.875 335.472656 L 1655.484375 336.390625 L 1657.210938 337.023438 L 1659.109375 337.484375 L 1661.121094 337.65625 L 1661.234375 337.714844 L 1662.902344 337.714844 L 1663.996094 337.597656 L 1665.089844 337.371094 L 1666.125 337.140625 L 1667.160156 336.792969 L 1668.25 336.335938 L 1668.308594 336.335938 L 1668.425781 336.277344 L 1668.480469 336.21875 L 1668.597656 336.21875 L 1668.652344 336.160156 L 1668.769531 336.105469 L 1664.515625 332.539062 Z M 1667.160156 329.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 1643 776 L 1676 776 M 1643 743 L 1676 743 M 1643 743 L 1643 776 M 1676 743 L 1676 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 1643 776 L 1676 776 M 1643 743 L 1676 743 M 1676 776 L 1676 743 M 1643 776 L 1643 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/dlxbn/sky130_fd_sc_lp__dlxbn_1.svg b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.svg
index 998e469..fb9de8d 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_1.svg
+++ b/cells/dlxbn/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 363.5 538.5 L 1492.5 538.5 L 1492.5 541.5 L 363.5 541.5 Z M 363.5 541.5 L 517.5 541.5 L 517.5 558.5 L 363.5 558.5 Z M 363.5 541.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 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="#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 1240.5 617.5 L 1268.5 617.5 L 1268.5 694.5 L 1240.5 694.5 Z M 383.5 640.5 L 410.5 640.5 L 410.5 718.5 L 383.5 718.5 Z M 304.5 640.5 L 331.5 640.5 L 331.5 718.5 L 304.5 718.5 Z M 1433.5 617.5 L 1461.5 617.5 L 1461.5 771.5 L 1433.5 771.5 Z M 612.5 721.5 L 639.5 721.5 L 639.5 799.5 L 612.5 799.5 Z M 691.5 721.5 L 718.5 721.5 L 718.5 799.5 L 691.5 799.5 Z M 757.5 721.5 L 785.5 721.5 L 785.5 799.5 L 757.5 799.5 Z M 856.5 721.5 L 884.5 721.5 L 884.5 799.5 L 856.5 799.5 Z M 955.5 721.5 L 983.5 721.5 L 983.5 799.5 L 955.5 799.5 Z M 1608.5 644.5 L 1636.5 644.5 L 1636.5 799.5 L 1608.5 799.5 Z M 1052.5 644.5 L 1080.5 644.5 L 1080.5 799.5 L 1052.5 799.5 Z M 1052.5 644.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 785.5 280.5 L 812.5 280.5 L 812.5 398.5 L 785.5 398.5 Z M 718.5 280.5 L 746.5 280.5 L 746.5 398.5 L 718.5 398.5 Z M 950.5 321.5 L 978.5 321.5 L 978.5 398.5 L 950.5 398.5 Z M 591.5 280.5 L 619.5 280.5 L 619.5 398.5 L 591.5 398.5 Z M 884.5 321.5 L 911.5 321.5 L 911.5 398.5 L 884.5 398.5 Z M 289.5 350.5 L 317.5 350.5 L 317.5 468.5 L 289.5 468.5 Z M 383.5 350.5 L 410.5 350.5 L 410.5 468.5 L 383.5 468.5 Z M 1608.5 273.5 L 1636.5 273.5 L 1636.5 504.5 L 1608.5 504.5 Z M 1293.5 389.5 L 1320.5 389.5 L 1320.5 506.5 L 1293.5 506.5 Z M 1383.5 275.5 L 1410.5 275.5 L 1410.5 506.5 L 1383.5 506.5 Z M 1092.5 276.5 L 1119.5 276.5 L 1119.5 508.5 L 1092.5 508.5 Z M 1092.5 276.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1545.695312 310.996094 L 1545.695312 350.875 L 1539.949219 350.875 L 1519.328125 318.546875 L 1519.328125 350.875 L 1514.515625 350.875 L 1514.515625 310.996094 L 1520.039062 310.996094 L 1540.878906 343.597656 L 1540.878906 310.996094 Z M 1545.695312 310.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 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/dlxbn/sky130_fd_sc_lp__dlxbn_2.svg b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.svg
index ac117db..3e9503b 100644
--- a/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.svg
+++ b/cells/dlxbn/sky130_fd_sc_lp__dlxbn_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 537.5 L 174.5 537.5 Z M 360.5 537.5 L 1147.5 537.5 L 1147.5 546.5 L 360.5 546.5 Z M 360.5 546.5 L 506.5 546.5 L 506.5 549.5 L 360.5 549.5 Z M 360.5 546.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image350"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image350"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1247.5 619.5 L 1273.5 619.5 L 1273.5 692.5 L 1247.5 692.5 Z M 292.5 634.5 L 318.5 634.5 L 318.5 707.5 L 292.5 707.5 Z M 367.5 634.5 L 393.5 634.5 L 393.5 707.5 L 367.5 707.5 Z M 1022.5 619.5 L 1048.5 619.5 L 1048.5 765.5 L 1022.5 765.5 Z M 1362.5 619.5 L 1388.5 619.5 L 1388.5 765.5 L 1362.5 765.5 Z M 1540.5 619.5 L 1566.5 619.5 L 1566.5 765.5 L 1540.5 765.5 Z M 1615.5 619.5 L 1641.5 619.5 L 1641.5 765.5 L 1615.5 765.5 Z M 1437.5 619.5 L 1463.5 619.5 L 1463.5 765.5 L 1437.5 765.5 Z M 907.5 711.5 L 933.5 711.5 L 933.5 784.5 L 907.5 784.5 Z M 657.5 711.5 L 683.5 711.5 L 683.5 784.5 L 657.5 784.5 Z M 719.5 711.5 L 746.5 711.5 L 746.5 784.5 L 719.5 784.5 Z M 822.5 711.5 L 848.5 711.5 L 848.5 784.5 L 822.5 784.5 Z M 561.5 711.5 L 587.5 711.5 L 587.5 784.5 L 561.5 784.5 Z M 561.5 711.5 "/>
 </clipPath>
-<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image351"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 568.5 287.5 L 594.5 287.5 L 594.5 398.5 L 568.5 398.5 Z M 693.5 287.5 L 719.5 287.5 L 719.5 398.5 L 693.5 398.5 Z M 913.5 325.5 L 939.5 325.5 L 939.5 398.5 L 913.5 398.5 Z M 756.5 287.5 L 782.5 287.5 L 782.5 398.5 L 756.5 398.5 Z M 850.5 325.5 L 876.5 325.5 L 876.5 398.5 L 850.5 398.5 Z M 379.5 353.5 L 405.5 353.5 L 405.5 464.5 L 379.5 464.5 Z M 305.5 353.5 L 331.5 353.5 L 331.5 464.5 L 305.5 464.5 Z M 1437.5 287.5 L 1463.5 287.5 L 1463.5 506.5 L 1437.5 506.5 Z M 1601.5 287.5 L 1627.5 287.5 L 1627.5 506.5 L 1601.5 506.5 Z M 1362.5 287.5 L 1388.5 287.5 L 1388.5 506.5 L 1362.5 506.5 Z M 1247.5 395.5 L 1273.5 395.5 L 1273.5 506.5 L 1247.5 506.5 Z M 1526.5 287.5 L 1552.5 287.5 L 1552.5 506.5 L 1526.5 506.5 Z M 1044.5 295.5 L 1070.5 295.5 L 1070.5 515.5 L 1044.5 515.5 Z M 1044.5 295.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface347">
+<g id="surface376">
 <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 516.425781 710.804688 L 516.425781 747.613281 L 511.121094 747.613281 L 492.085938 717.773438 L 492.085938 747.613281 L 487.644531 747.613281 L 487.644531 710.804688 L 492.742188 710.804688 L 511.980469 740.898438 L 511.980469 710.804688 Z M 516.425781 710.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 401 365 L 431 365 M 401 336 L 431 336 M 401 336 L 401 365 M 431 336 L 431 365 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 365 L 431 365 M 401 336 L 431 336 M 431 365 L 431 336 M 401 365 L 401 336 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(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/dlxbp/sky130_fd_sc_lp__dlxbp_1.svg b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.svg
index 14b2ba2..732769f 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.svg
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 970.5 538.5 L 1243.5 538.5 L 1243.5 550.5 L 970.5 550.5 Z M 970.5 538.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image391"/>
 </pattern>
 <mask 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="#image363"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1414.5 635.5 L 1443.5 635.5 L 1443.5 717.5 L 1414.5 717.5 Z M 1599.5 620.5 L 1628.5 620.5 L 1628.5 783.5 L 1599.5 783.5 Z M 1312.5 635.5 L 1341.5 635.5 L 1341.5 799.5 L 1312.5 799.5 Z M 308.5 718.5 L 337.5 718.5 L 337.5 800.5 L 308.5 800.5 Z M 391.5 718.5 L 420.5 718.5 L 420.5 800.5 L 391.5 800.5 Z M 910.5 733.5 L 939.5 733.5 L 939.5 814.5 L 910.5 814.5 Z M 980.5 733.5 L 1009.5 733.5 L 1009.5 814.5 L 980.5 814.5 Z M 735.5 733.5 L 764.5 733.5 L 764.5 814.5 L 735.5 814.5 Z M 1088.5 651.5 L 1117.5 651.5 L 1117.5 814.5 L 1088.5 814.5 Z M 634.5 733.5 L 663.5 733.5 L 663.5 814.5 L 634.5 814.5 Z M 805.5 733.5 L 834.5 733.5 L 834.5 814.5 L 805.5 814.5 Z M 805.5 733.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image392"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 774.5 258.5 L 803.5 258.5 L 803.5 382.5 L 774.5 382.5 Z M 704.5 258.5 L 733.5 258.5 L 733.5 382.5 L 704.5 382.5 Z M 949.5 300.5 L 978.5 300.5 L 978.5 382.5 L 949.5 382.5 Z M 620.5 258.5 L 649.5 258.5 L 649.5 382.5 L 620.5 382.5 Z M 876.5 300.5 L 905.5 300.5 L 905.5 382.5 L 876.5 382.5 Z M 321.5 328.5 L 350.5 328.5 L 350.5 452.5 L 321.5 452.5 Z M 405.5 328.5 L 434.5 328.5 L 434.5 452.5 L 405.5 452.5 Z M 1414.5 378.5 L 1443.5 378.5 L 1443.5 503.5 L 1414.5 503.5 Z M 1599.5 258.5 L 1628.5 258.5 L 1628.5 503.5 L 1599.5 503.5 Z M 1312.5 258.5 L 1341.5 258.5 L 1341.5 503.5 L 1312.5 503.5 Z M 1127.5 269.5 L 1156.5 269.5 L 1156.5 514.5 L 1127.5 514.5 Z M 1127.5 269.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image393"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image394"/>
 </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="surface388">
 <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 593.078125 682.085938 L 593.078125 696.460938 L 617.804688 696.460938 L 617.804688 701.175781 L 587.730469 701.175781 L 587.730469 659.257812 L 616.769531 659.257812 L 616.769531 663.972656 L 593.078125 663.972656 L 593.078125 677.371094 L 615.90625 677.371094 L 615.90625 682.085938 Z M 593.078125 682.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 522 416 L 555 416 M 522 383 L 555 383 M 522 383 L 522 416 M 555 383 L 555 416 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 416 L 555 416 M 522 383 L 555 383 M 555 416 L 555 383 M 522 416 L 522 383 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/dlxbp/sky130_fd_sc_lp__dlxbp_lp.svg b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.svg
index 9b16398..05d4cf9 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.svg
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp.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 425.5 536.5 L 1523.5 536.5 L 1523.5 541.5 L 425.5 541.5 Z M 425.5 541.5 L 574.5 541.5 L 574.5 580.5 L 425.5 580.5 Z M 425.5 541.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 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="#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 1427.5 623.5 L 1450.5 623.5 L 1450.5 686.5 L 1427.5 686.5 Z M 1369.5 623.5 L 1391.5 623.5 L 1391.5 686.5 L 1369.5 686.5 Z M 320.5 638.5 L 343.5 638.5 L 343.5 701.5 L 320.5 701.5 Z M 266.5 638.5 L 289.5 638.5 L 289.5 701.5 L 266.5 701.5 Z M 385.5 638.5 L 407.5 638.5 L 407.5 701.5 L 385.5 701.5 Z M 443.5 638.5 L 466.5 638.5 L 466.5 701.5 L 443.5 701.5 Z M 1576.5 619.5 L 1598.5 619.5 L 1598.5 745.5 L 1576.5 745.5 Z M 1630.5 619.5 L 1652.5 619.5 L 1652.5 745.5 L 1630.5 745.5 Z M 656.5 686.5 L 679.5 686.5 L 679.5 749.5 L 656.5 749.5 Z M 1287.5 623.5 L 1309.5 623.5 L 1309.5 749.5 L 1287.5 749.5 Z M 598.5 686.5 L 620.5 686.5 L 620.5 749.5 L 598.5 749.5 Z M 1030.5 623.5 L 1053.5 623.5 L 1053.5 749.5 L 1030.5 749.5 Z M 1233.5 623.5 L 1255.5 623.5 L 1255.5 749.5 L 1233.5 749.5 Z M 937.5 686.5 L 959.5 686.5 L 959.5 749.5 L 937.5 749.5 Z M 779.5 686.5 L 802.5 686.5 L 802.5 749.5 L 779.5 749.5 Z M 721.5 686.5 L 743.5 686.5 L 743.5 749.5 L 721.5 749.5 Z M 1084.5 623.5 L 1107.5 623.5 L 1107.5 749.5 L 1084.5 749.5 Z M 856.5 686.5 L 878.5 686.5 L 878.5 749.5 L 856.5 749.5 Z M 856.5 686.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 934.5 332.5 L 957.5 332.5 L 957.5 395.5 L 934.5 395.5 Z M 876.5 332.5 L 898.5 332.5 L 898.5 395.5 L 876.5 395.5 Z M 319.5 328.5 L 341.5 328.5 L 341.5 424.5 L 319.5 424.5 Z M 443.5 328.5 L 466.5 328.5 L 466.5 424.5 L 443.5 424.5 Z M 265.5 328.5 L 287.5 328.5 L 287.5 424.5 L 265.5 424.5 Z M 389.5 328.5 L 412.5 328.5 L 412.5 424.5 L 389.5 424.5 Z M 606.5 332.5 L 628.5 332.5 L 628.5 428.5 L 606.5 428.5 Z M 660.5 332.5 L 682.5 332.5 L 682.5 428.5 L 660.5 428.5 Z M 736.5 332.5 L 759.5 332.5 L 759.5 428.5 L 736.5 428.5 Z M 795.5 332.5 L 817.5 332.5 L 817.5 428.5 L 795.5 428.5 Z M 1578.5 320.5 L 1600.5 320.5 L 1600.5 509.5 L 1578.5 509.5 Z M 1632.5 320.5 L 1654.5 320.5 L 1654.5 509.5 L 1632.5 509.5 Z M 1378.5 418.5 L 1401.5 418.5 L 1401.5 514.5 L 1378.5 514.5 Z M 1298.5 325.5 L 1321.5 325.5 L 1321.5 514.5 L 1298.5 514.5 Z M 1432.5 418.5 L 1455.5 418.5 L 1455.5 514.5 L 1432.5 514.5 Z M 1099.5 325.5 L 1121.5 325.5 L 1121.5 514.5 L 1099.5 514.5 Z M 1045.5 325.5 L 1067.5 325.5 L 1067.5 514.5 L 1045.5 514.5 Z M 1244.5 325.5 L 1267.5 325.5 L 1267.5 514.5 L 1244.5 514.5 Z M 1244.5 325.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1407.371094 550.976562 L 1405.324219 553.5 L 1400.761719 549.71875 L 1399.457031 550.414062 L 1398.152344 550.933594 L 1396.804688 551.371094 L 1395.371094 551.675781 L 1393.933594 551.847656 L 1392.457031 551.933594 L 1390.457031 551.804688 L 1388.585938 551.5 L 1386.847656 550.976562 L 1385.195312 550.28125 L 1383.628906 549.371094 L 1382.238281 548.195312 L 1380.976562 546.933594 L 1379.890625 545.5 L 1379.023438 543.933594 L 1378.28125 542.238281 L 1377.71875 540.414062 L 1377.371094 538.414062 L 1377.28125 537.933594 L 1377.238281 537.414062 L 1377.195312 536.933594 L 1377.152344 536.414062 L 1377.152344 535.324219 L 1377.238281 533.152344 L 1377.542969 531.066406 L 1378.023438 529.152344 L 1378.71875 527.324219 L 1379.585938 525.628906 L 1380.71875 524.066406 L 1381.847656 522.804688 L 1383.152344 521.675781 L 1384.585938 520.71875 L 1386.109375 519.976562 L 1387.761719 519.371094 L 1389.585938 518.933594 L 1390.023438 518.890625 L 1390.976562 518.804688 L 1391.457031 518.761719 L 1391.933594 518.761719 L 1392.457031 518.71875 L 1394.414062 518.847656 L 1396.28125 519.152344 L 1398.023438 519.675781 L 1399.675781 520.371094 L 1401.238281 521.28125 L 1402.675781 522.414062 L 1403.890625 523.71875 L 1404.976562 525.109375 L 1405.847656 526.628906 L 1406.585938 528.324219 L 1407.152344 530.152344 L 1407.542969 532.066406 L 1407.585938 532.628906 L 1407.628906 533.152344 L 1407.675781 533.675781 L 1407.71875 534.195312 L 1407.71875 534.71875 L 1407.761719 535.238281 L 1407.628906 537.675781 L 1407.238281 539.976562 L 1406.628906 542.109375 L 1405.761719 544.109375 L 1404.628906 545.933594 L 1403.28125 547.628906 Z M 1396.414062 542.023438 L 1400.28125 545.195312 L 1401.324219 543.890625 L 1402.195312 542.414062 L 1402.847656 540.804688 L 1403.324219 539.109375 L 1403.585938 537.28125 L 1403.71875 535.28125 L 1403.628906 533.457031 L 1403.371094 531.71875 L 1402.933594 530.109375 L 1402.371094 528.628906 L 1401.628906 527.238281 L 1400.71875 525.976562 L 1399.675781 524.933594 L 1398.585938 524.066406 L 1397.371094 523.371094 L 1396.066406 522.847656 L 1394.628906 522.5 L 1393.152344 522.28125 L 1392.457031 522.28125 L 1390.890625 522.414062 L 1389.414062 522.675781 L 1388.023438 523.109375 L 1386.761719 523.761719 L 1385.585938 524.585938 L 1384.542969 525.585938 L 1383.542969 526.761719 L 1382.761719 528.066406 L 1382.109375 529.5 L 1381.628906 531.066406 L 1381.324219 532.761719 L 1381.195312 534.585938 L 1381.195312 535.324219 L 1381.238281 537.238281 L 1381.5 538.976562 L 1381.933594 540.585938 L 1382.5 542.109375 L 1383.28125 543.5 L 1384.238281 544.71875 L 1385.238281 545.804688 L 1386.371094 546.675781 L 1387.585938 547.371094 L 1388.890625 547.847656 L 1390.324219 548.195312 L 1391.847656 548.324219 L 1391.933594 548.371094 L 1393.195312 548.371094 L 1394.023438 548.28125 L 1394.847656 548.109375 L 1395.628906 547.933594 L 1396.414062 547.675781 L 1397.238281 547.324219 L 1397.28125 547.324219 L 1397.371094 547.28125 L 1397.414062 547.238281 L 1397.5 547.238281 L 1397.542969 547.195312 L 1397.628906 547.152344 L 1394.414062 544.457031 Z M 1396.414062 542.023438 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 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/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.svg b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.svg
index 2040f3d..03c79e4 100644
--- a/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.svg
+++ b/cells/dlxbp/sky130_fd_sc_lp__dlxbp_lp2.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 542.5 536.5 L 1218.5 536.5 L 1218.5 557.5 L 542.5 557.5 Z M 542.5 536.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 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="#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 1630.5 653.5 L 1652.5 653.5 L 1652.5 716.5 L 1630.5 716.5 Z M 1576.5 653.5 L 1598.5 653.5 L 1598.5 716.5 L 1576.5 716.5 Z M 320.5 679.5 L 343.5 679.5 L 343.5 742.5 L 320.5 742.5 Z M 1427.5 679.5 L 1450.5 679.5 L 1450.5 742.5 L 1427.5 742.5 Z M 1255.5 679.5 L 1277.5 679.5 L 1277.5 742.5 L 1255.5 742.5 Z M 266.5 679.5 L 289.5 679.5 L 289.5 742.5 L 266.5 742.5 Z M 1309.5 679.5 L 1331.5 679.5 L 1331.5 742.5 L 1309.5 742.5 Z M 389.5 679.5 L 412.5 679.5 L 412.5 742.5 L 389.5 742.5 Z M 443.5 679.5 L 466.5 679.5 L 466.5 742.5 L 443.5 742.5 Z M 1373.5 679.5 L 1396.5 679.5 L 1396.5 742.5 L 1373.5 742.5 Z M 646.5 680.5 L 668.5 680.5 L 668.5 743.5 L 646.5 743.5 Z M 592.5 680.5 L 614.5 680.5 L 614.5 743.5 L 592.5 743.5 Z M 1052.5 680.5 L 1075.5 680.5 L 1075.5 743.5 L 1052.5 743.5 Z M 1106.5 680.5 L 1129.5 680.5 L 1129.5 743.5 L 1106.5 743.5 Z M 904.5 680.5 L 926.5 680.5 L 926.5 743.5 L 904.5 743.5 Z M 769.5 680.5 L 791.5 680.5 L 791.5 743.5 L 769.5 743.5 Z M 710.5 680.5 L 733.5 680.5 L 733.5 743.5 L 710.5 743.5 Z M 845.5 680.5 L 868.5 680.5 L 868.5 743.5 L 845.5 743.5 Z M 845.5 680.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 271.5 328.5 L 308.5 328.5 L 308.5 478.5 L 271.5 478.5 Z M 374.5 328.5 L 412.5 328.5 L 412.5 478.5 L 374.5 478.5 Z M 1576.5 328.5 L 1613.5 328.5 L 1613.5 478.5 L 1576.5 478.5 Z M 703.5 340.5 L 741.5 340.5 L 741.5 490.5 L 703.5 490.5 Z M 1111.5 340.5 L 1148.5 340.5 L 1148.5 490.5 L 1111.5 490.5 Z M 985.5 340.5 L 1022.5 340.5 L 1022.5 490.5 L 985.5 490.5 Z M 777.5 340.5 L 814.5 340.5 L 814.5 490.5 L 777.5 490.5 Z M 899.5 340.5 L 937.5 340.5 L 937.5 490.5 L 899.5 490.5 Z M 1333.5 359.5 L 1370.5 359.5 L 1370.5 509.5 L 1333.5 509.5 Z M 1412.5 359.5 L 1450.5 359.5 L 1450.5 509.5 L 1412.5 509.5 Z M 612.5 380.5 L 649.5 380.5 L 649.5 530.5 L 612.5 530.5 Z M 612.5 380.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1723.5 353.152344 L 1723.5 384.847656 L 1718.933594 384.847656 L 1702.542969 359.152344 L 1702.542969 384.847656 L 1698.71875 384.847656 L 1698.71875 353.152344 L 1703.109375 353.152344 L 1719.675781 379.066406 L 1719.675781 353.152344 Z M 1723.5 353.152344 "/>
 <path style="fill:none;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 723 L 1692 723 M 1666 698 L 1692 698 M 1666 698 L 1666 723 M 1692 698 L 1692 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 1666 723 L 1692 723 M 1666 698 L 1692 698 M 1692 723 L 1692 698 M 1666 723 L 1666 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/dlxtn/sky130_fd_sc_lp__dlxtn_1.svg b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.svg
index d5de464..b0bac1b 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_1.svg
+++ b/cells/dlxtn/sky130_fd_sc_lp__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 539.5 L 174.5 539.5 Z M 1268.5 539.5 L 1498.5 539.5 L 1498.5 559.5 L 1268.5 559.5 Z M 1268.5 539.5 "/>
 </clipPath>
-<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" 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="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="#image394"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 340.5 669.5 L 373.5 669.5 L 373.5 762.5 L 340.5 762.5 Z M 435.5 669.5 L 468.5 669.5 L 468.5 762.5 L 435.5 762.5 Z M 1580.5 651.5 L 1613.5 651.5 L 1613.5 837.5 L 1580.5 837.5 Z M 1226.5 760.5 L 1259.5 760.5 L 1259.5 852.5 L 1226.5 852.5 Z M 1107.5 760.5 L 1140.5 760.5 L 1140.5 852.5 L 1107.5 852.5 Z M 987.5 760.5 L 1021.5 760.5 L 1021.5 852.5 L 987.5 852.5 Z M 1342.5 667.5 L 1375.5 667.5 L 1375.5 852.5 L 1342.5 852.5 Z M 908.5 760.5 L 941.5 760.5 L 941.5 852.5 L 908.5 852.5 Z M 813.5 760.5 L 846.5 760.5 L 846.5 852.5 L 813.5 852.5 Z M 813.5 760.5 "/>
 </clipPath>
-<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image422"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 435.5 232.5 L 468.5 232.5 L 468.5 373.5 L 435.5 373.5 Z M 1027.5 280.5 L 1060.5 280.5 L 1060.5 373.5 L 1027.5 373.5 Z M 828.5 232.5 L 862.5 232.5 L 862.5 373.5 L 828.5 373.5 Z M 1147.5 280.5 L 1180.5 280.5 L 1180.5 373.5 L 1147.5 373.5 Z M 653.5 232.5 L 686.5 232.5 L 686.5 373.5 L 653.5 373.5 Z M 908.5 232.5 L 941.5 232.5 L 941.5 373.5 L 908.5 373.5 Z M 340.5 232.5 L 373.5 232.5 L 373.5 373.5 L 340.5 373.5 Z M 1580.5 220.5 L 1613.5 220.5 L 1613.5 499.5 L 1580.5 499.5 Z M 1366.5 240.5 L 1400.5 240.5 L 1400.5 519.5 L 1366.5 519.5 Z M 1366.5 240.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 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="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface391">
+<g id="surface418">
 <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 1672.789062 314.757812 L 1669.757812 318.5 L 1662.984375 312.886719 L 1661.046875 313.917969 L 1659.113281 314.695312 L 1657.113281 315.339844 L 1654.984375 315.789062 L 1652.855469 316.046875 L 1650.660156 316.175781 L 1647.695312 315.984375 L 1644.917969 315.53125 L 1642.339844 314.757812 L 1639.886719 313.726562 L 1637.566406 312.371094 L 1635.5 310.628906 L 1633.628906 308.757812 L 1632.015625 306.628906 L 1630.726562 304.304688 L 1629.628906 301.789062 L 1628.789062 299.082031 L 1628.273438 296.113281 L 1628.144531 295.402344 L 1628.082031 294.628906 L 1628.015625 293.917969 L 1627.953125 293.144531 L 1627.953125 291.53125 L 1628.082031 288.304688 L 1628.53125 285.210938 L 1629.242188 282.371094 L 1630.273438 279.660156 L 1631.566406 277.144531 L 1633.242188 274.824219 L 1634.917969 272.953125 L 1636.855469 271.273438 L 1638.984375 269.855469 L 1641.242188 268.757812 L 1643.695312 267.855469 L 1646.402344 267.210938 L 1647.046875 267.144531 L 1647.757812 267.082031 L 1648.46875 267.015625 L 1649.175781 266.953125 L 1649.886719 266.953125 L 1650.660156 266.886719 L 1653.566406 267.082031 L 1656.339844 267.53125 L 1658.917969 268.304688 L 1661.371094 269.339844 L 1663.695312 270.695312 L 1665.824219 272.371094 L 1667.628906 274.304688 L 1669.242188 276.371094 L 1670.53125 278.628906 L 1671.628906 281.144531 L 1672.46875 283.855469 L 1673.046875 286.695312 L 1673.113281 287.53125 L 1673.175781 288.304688 L 1673.242188 289.082031 L 1673.304688 289.855469 L 1673.304688 290.628906 L 1673.371094 291.402344 L 1673.175781 295.015625 L 1672.597656 298.433594 L 1671.695312 301.597656 L 1670.402344 304.566406 L 1668.726562 307.273438 L 1666.726562 309.789062 Z M 1656.53125 301.46875 L 1662.273438 306.175781 L 1663.824219 304.242188 L 1665.113281 302.046875 L 1666.082031 299.660156 L 1666.789062 297.144531 L 1667.175781 294.433594 L 1667.371094 291.46875 L 1667.242188 288.757812 L 1666.855469 286.175781 L 1666.210938 283.789062 L 1665.371094 281.597656 L 1664.273438 279.53125 L 1662.917969 277.660156 L 1661.371094 276.113281 L 1659.757812 274.824219 L 1657.953125 273.789062 L 1656.015625 273.015625 L 1653.886719 272.5 L 1651.695312 272.175781 L 1650.660156 272.175781 L 1648.339844 272.371094 L 1646.144531 272.757812 L 1644.082031 273.402344 L 1642.210938 274.371094 L 1640.46875 275.597656 L 1638.917969 277.082031 L 1637.433594 278.824219 L 1636.273438 280.757812 L 1635.304688 282.886719 L 1634.597656 285.210938 L 1634.144531 287.726562 L 1633.953125 290.433594 L 1633.953125 291.53125 L 1634.015625 294.371094 L 1634.402344 296.953125 L 1635.046875 299.339844 L 1635.886719 301.597656 L 1637.046875 303.660156 L 1638.46875 305.46875 L 1639.953125 307.082031 L 1641.628906 308.371094 L 1643.433594 309.402344 L 1645.371094 310.113281 L 1647.5 310.628906 L 1649.757812 310.824219 L 1649.886719 310.886719 L 1651.757812 310.886719 L 1652.984375 310.757812 L 1654.210938 310.5 L 1655.371094 310.242188 L 1656.53125 309.855469 L 1657.757812 309.339844 L 1657.824219 309.339844 L 1657.953125 309.273438 L 1658.015625 309.210938 L 1658.144531 309.210938 L 1658.210938 309.144531 L 1658.339844 309.082031 L 1653.566406 305.082031 Z M 1656.53125 301.46875 "/>
 <path style="fill:none;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 807 L 1667 807 M 1629 769 L 1667 769 M 1629 769 L 1629 807 M 1667 769 L 1667 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 1629 807 L 1667 807 M 1629 769 L 1667 769 M 1667 807 L 1667 769 M 1629 807 L 1629 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/dlxtn/sky130_fd_sc_lp__dlxtn_2.svg b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.svg
index d55b7cf..9ef3d49 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_2.svg
+++ b/cells/dlxtn/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 1207.5 538.5 L 1426.5 538.5 L 1426.5 570.5 L 1207.5 570.5 Z M 1207.5 538.5 "/>
 </clipPath>
-<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image395"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 433.5 659.5 L 464.5 659.5 L 464.5 746.5 L 433.5 746.5 Z M 328.5 659.5 L 359.5 659.5 L 359.5 746.5 L 328.5 746.5 Z M 1500.5 641.5 L 1531.5 641.5 L 1531.5 815.5 L 1500.5 815.5 Z M 1589.5 641.5 L 1620.5 641.5 L 1620.5 815.5 L 1589.5 815.5 Z M 1174.5 745.5 L 1205.5 745.5 L 1205.5 832.5 L 1174.5 832.5 Z M 1062.5 745.5 L 1093.5 745.5 L 1093.5 832.5 L 1062.5 832.5 Z M 875.5 745.5 L 906.5 745.5 L 906.5 832.5 L 875.5 832.5 Z M 786.5 745.5 L 817.5 745.5 L 817.5 832.5 L 786.5 832.5 Z M 1286.5 658.5 L 1318.5 658.5 L 1318.5 832.5 L 1286.5 832.5 Z M 950.5 745.5 L 981.5 745.5 L 981.5 832.5 L 950.5 832.5 Z M 950.5 745.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image396"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 344.5 250.5 L 375.5 250.5 L 375.5 383.5 L 344.5 383.5 Z M 1093.5 296.5 L 1124.5 296.5 L 1124.5 383.5 L 1093.5 383.5 Z M 795.5 250.5 L 826.5 250.5 L 826.5 383.5 L 795.5 383.5 Z M 981.5 296.5 L 1012.5 296.5 L 1012.5 383.5 L 981.5 383.5 Z M 630.5 250.5 L 661.5 250.5 L 661.5 383.5 L 630.5 383.5 Z M 869.5 250.5 L 900.5 250.5 L 900.5 383.5 L 869.5 383.5 Z M 433.5 250.5 L 464.5 250.5 L 464.5 383.5 L 433.5 383.5 Z M 1500.5 240.5 L 1531.5 240.5 L 1531.5 501.5 L 1500.5 501.5 Z M 1589.5 240.5 L 1620.5 240.5 L 1620.5 501.5 L 1589.5 501.5 Z M 1303.5 272.5 L 1334.5 272.5 L 1334.5 533.5 L 1303.5 533.5 Z M 1303.5 272.5 "/>
 </clipPath>
-<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface392">
+<g id="surface420">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -203,6 +203,5 @@
 <path style=" 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_lp__dlxtn_4.svg b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.svg
index fe32658..f335c35 100644
--- a/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.svg
+++ b/cells/dlxtn/sky130_fd_sc_lp__dlxtn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 1076.5 538.5 L 1279.5 538.5 L 1279.5 553.5 L 1076.5 553.5 Z M 1076.5 538.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 305.5 650.5 L 334.5 650.5 L 334.5 732.5 L 305.5 732.5 Z M 392.5 650.5 L 421.5 650.5 L 421.5 732.5 L 392.5 732.5 Z M 1426.5 651.5 L 1455.5 651.5 L 1455.5 814.5 L 1426.5 814.5 Z M 741.5 733.5 L 770.5 733.5 L 770.5 814.5 L 741.5 814.5 Z M 657.5 733.5 L 686.5 733.5 L 686.5 814.5 L 657.5 814.5 Z M 916.5 733.5 L 945.5 733.5 L 945.5 814.5 L 916.5 814.5 Z M 811.5 733.5 L 840.5 733.5 L 840.5 814.5 L 811.5 814.5 Z M 1021.5 733.5 L 1050.5 733.5 L 1050.5 814.5 L 1021.5 814.5 Z M 1342.5 651.5 L 1371.5 651.5 L 1371.5 814.5 L 1342.5 814.5 Z M 1593.5 651.5 L 1623.5 651.5 L 1623.5 814.5 L 1593.5 814.5 Z M 1510.5 651.5 L 1539.5 651.5 L 1539.5 814.5 L 1510.5 814.5 Z M 1127.5 651.5 L 1156.5 651.5 L 1156.5 814.5 L 1127.5 814.5 Z M 1127.5 651.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 705.5 263.5 L 734.5 263.5 L 734.5 388.5 L 705.5 388.5 Z M 985.5 306.5 L 1014.5 306.5 L 1014.5 388.5 L 985.5 388.5 Z M 775.5 263.5 L 804.5 263.5 L 804.5 388.5 L 775.5 388.5 Z M 880.5 306.5 L 909.5 306.5 L 909.5 388.5 L 880.5 388.5 Z M 568.5 263.5 L 598.5 263.5 L 598.5 388.5 L 568.5 388.5 Z M 293.5 267.5 L 322.5 267.5 L 322.5 392.5 L 293.5 392.5 Z M 377.5 267.5 L 406.5 267.5 L 406.5 392.5 L 377.5 392.5 Z M 1432.5 258.5 L 1461.5 258.5 L 1461.5 503.5 L 1432.5 503.5 Z M 1348.5 258.5 L 1377.5 258.5 L 1377.5 503.5 L 1348.5 503.5 Z M 1515.5 258.5 L 1545.5 258.5 L 1545.5 503.5 L 1515.5 503.5 Z M 1599.5 258.5 L 1628.5 258.5 L 1628.5 503.5 L 1599.5 503.5 Z M 1163.5 273.5 L 1192.5 273.5 L 1192.5 518.5 L 1163.5 518.5 Z M 1163.5 273.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface362">
+<g id="surface390">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 654.914062 730.460938 L 654.914062 772.378906 L 648.875 772.378906 L 627.195312 738.394531 L 627.195312 772.378906 L 622.136719 772.378906 L 622.136719 730.460938 L 627.945312 730.460938 L 649.851562 764.730469 L 649.851562 730.460938 Z M 654.914062 730.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 344 L 555 344 M 522 310 L 555 310 M 522 310 L 522 344 M 555 310 L 555 344 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 344 L 555 344 M 522 310 L 555 310 M 555 344 L 555 310 M 522 344 L 522 310 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 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/dlxtp/sky130_fd_sc_lp__dlxtp_1.svg b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.svg
index 5d0a98b..da9218e 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.svg
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 1091.5 539.5 L 1412.5 539.5 L 1412.5 576.5 L 1091.5 576.5 Z M 1091.5 539.5 "/>
 </clipPath>
-<image id="image348" 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="#image348"/>
+  <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 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="#image348"/>
+  <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 1140.5 679.5 L 1174.5 679.5 L 1174.5 775.5 L 1140.5 775.5 Z M 873.5 679.5 L 907.5 679.5 L 907.5 775.5 L 873.5 775.5 Z M 955.5 679.5 L 989.5 679.5 L 989.5 775.5 L 955.5 775.5 Z M 774.5 679.5 L 808.5 679.5 L 808.5 775.5 L 774.5 775.5 Z M 1057.5 679.5 L 1091.5 679.5 L 1091.5 775.5 L 1057.5 775.5 Z M 1494.5 653.5 L 1528.5 653.5 L 1528.5 846.5 L 1494.5 846.5 Z M 522.5 766.5 L 556.5 766.5 L 556.5 862.5 L 522.5 862.5 Z M 423.5 766.5 L 458.5 766.5 L 458.5 862.5 L 423.5 862.5 Z M 1263.5 672.5 L 1298.5 672.5 L 1298.5 864.5 L 1263.5 864.5 Z M 1263.5 672.5 "/>
 </clipPath>
-<image id="image349" 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="#image349"/>
+  <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 724.5 243.5 L 758.5 243.5 L 758.5 390.5 L 724.5 390.5 Z M 490.5 284.5 L 524.5 284.5 L 524.5 431.5 L 490.5 431.5 Z M 391.5 284.5 L 426.5 284.5 L 426.5 431.5 L 391.5 431.5 Z M 866.5 291.5 L 900.5 291.5 L 900.5 438.5 L 866.5 438.5 Z M 1151.5 342.5 L 1185.5 342.5 L 1185.5 438.5 L 1151.5 438.5 Z M 1068.5 342.5 L 1103.5 342.5 L 1103.5 438.5 L 1068.5 438.5 Z M 948.5 291.5 L 983.5 291.5 L 983.5 438.5 L 948.5 438.5 Z M 1494.5 209.5 L 1528.5 209.5 L 1528.5 498.5 L 1494.5 498.5 Z M 1276.5 246.5 L 1310.5 246.5 L 1310.5 534.5 L 1276.5 534.5 Z M 1276.5 246.5 "/>
 </clipPath>
-<image id="image350" 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="#image350"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image351" 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="#image351"/>
+  <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="surface345">
+<g id="surface372">
 <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 1589.847656 306.59375 L 1586.683594 310.5 L 1579.613281 304.644531 L 1577.59375 305.71875 L 1575.574219 306.527344 L 1573.488281 307.203125 L 1571.265625 307.671875 L 1569.042969 307.941406 L 1566.753906 308.078125 L 1563.660156 307.875 L 1560.765625 307.402344 L 1558.070312 306.59375 L 1555.511719 305.519531 L 1553.089844 304.105469 L 1550.933594 302.285156 L 1548.984375 300.335938 L 1547.300781 298.113281 L 1545.953125 295.6875 L 1544.808594 293.0625 L 1543.933594 290.234375 L 1543.394531 287.140625 L 1543.261719 286.398438 L 1543.191406 285.589844 L 1543.125 284.851562 L 1543.058594 284.042969 L 1543.058594 282.359375 L 1543.191406 278.992188 L 1543.664062 275.761719 L 1544.40625 272.800781 L 1545.480469 269.972656 L 1546.828125 267.347656 L 1548.578125 264.921875 L 1550.328125 262.972656 L 1552.347656 261.222656 L 1554.570312 259.738281 L 1556.925781 258.59375 L 1559.484375 257.652344 L 1562.3125 256.980469 L 1562.984375 256.914062 L 1563.726562 256.84375 L 1564.464844 256.777344 L 1565.207031 256.710938 L 1565.949219 256.710938 L 1566.753906 256.644531 L 1569.785156 256.84375 L 1572.679688 257.316406 L 1575.371094 258.125 L 1577.929688 259.203125 L 1580.355469 260.613281 L 1582.574219 262.367188 L 1584.460938 264.386719 L 1586.144531 266.539062 L 1587.488281 268.894531 L 1588.632812 271.519531 L 1589.511719 274.347656 L 1590.117188 277.3125 L 1590.183594 278.1875 L 1590.25 278.992188 L 1590.316406 279.800781 L 1590.386719 280.609375 L 1590.386719 281.417969 L 1590.453125 282.226562 L 1590.25 285.996094 L 1589.644531 289.5625 L 1588.703125 292.863281 L 1587.355469 295.957031 L 1585.605469 298.785156 L 1583.519531 301.410156 Z M 1572.882812 292.726562 L 1578.875 297.640625 L 1580.488281 295.621094 L 1581.835938 293.332031 L 1582.84375 290.84375 L 1583.585938 288.214844 L 1583.988281 285.390625 L 1584.191406 282.292969 L 1584.058594 279.464844 L 1583.652344 276.773438 L 1582.980469 274.28125 L 1582.105469 271.992188 L 1580.960938 269.839844 L 1579.546875 267.886719 L 1577.929688 266.269531 L 1576.246094 264.921875 L 1574.363281 263.847656 L 1572.34375 263.039062 L 1570.121094 262.5 L 1567.832031 262.164062 L 1566.753906 262.164062 L 1564.332031 262.367188 L 1562.042969 262.769531 L 1559.886719 263.441406 L 1557.9375 264.453125 L 1556.117188 265.730469 L 1554.503906 267.28125 L 1552.953125 269.097656 L 1551.742188 271.117188 L 1550.734375 273.339844 L 1549.992188 275.761719 L 1549.519531 278.386719 L 1549.320312 281.214844 L 1549.320312 282.359375 L 1549.386719 285.320312 L 1549.789062 288.015625 L 1550.464844 290.503906 L 1551.339844 292.863281 L 1552.550781 295.015625 L 1554.03125 296.902344 L 1555.578125 298.585938 L 1557.332031 299.929688 L 1559.214844 301.007812 L 1561.234375 301.75 L 1563.457031 302.285156 L 1565.8125 302.488281 L 1565.949219 302.554688 L 1567.898438 302.554688 L 1569.179688 302.421875 L 1570.457031 302.152344 L 1571.667969 301.882812 L 1572.882812 301.480469 L 1574.160156 300.941406 L 1574.226562 300.941406 L 1574.363281 300.875 L 1574.429688 300.804688 L 1574.566406 300.804688 L 1574.632812 300.738281 L 1574.765625 300.671875 L 1569.785156 296.496094 Z M 1572.882812 292.726562 "/>
 <path style="fill:none;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 816 L 1584 816 M 1545 777 L 1584 777 M 1545 777 L 1545 816 M 1584 777 L 1584 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 1545 816 L 1584 816 M 1545 777 L 1584 777 M 1584 816 L 1584 777 M 1545 816 L 1545 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/dlxtp/sky130_fd_sc_lp__dlxtp_lp.svg b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.svg
index e3387cf..a5a054e 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.svg
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image357"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 503.5 671.5 L 531.5 671.5 L 531.5 748.5 L 503.5 748.5 Z M 286.5 671.5 L 314.5 671.5 L 314.5 748.5 L 286.5 748.5 Z M 437.5 671.5 L 465.5 671.5 L 465.5 748.5 L 437.5 748.5 Z M 353.5 671.5 L 380.5 671.5 L 380.5 748.5 L 353.5 748.5 Z M 1603.5 639.5 L 1630.5 639.5 L 1630.5 793.5 L 1603.5 793.5 Z M 1536.5 639.5 L 1564.5 639.5 L 1564.5 793.5 L 1536.5 793.5 Z M 1084.5 721.5 L 1112.5 721.5 L 1112.5 799.5 L 1084.5 799.5 Z M 1283.5 644.5 L 1310.5 644.5 L 1310.5 799.5 L 1283.5 799.5 Z M 718.5 721.5 L 746.5 721.5 L 746.5 799.5 L 718.5 799.5 Z M 1354.5 644.5 L 1382.5 644.5 L 1382.5 799.5 L 1354.5 799.5 Z M 908.5 721.5 L 935.5 721.5 L 935.5 799.5 L 908.5 799.5 Z M 790.5 721.5 L 818.5 721.5 L 818.5 799.5 L 790.5 799.5 Z M 979.5 721.5 L 1007.5 721.5 L 1007.5 799.5 L 979.5 799.5 Z M 1156.5 721.5 L 1183.5 721.5 L 1183.5 799.5 L 1156.5 799.5 Z M 1156.5 721.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image358"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1153.5 273.5 L 1181.5 273.5 L 1181.5 350.5 L 1153.5 350.5 Z M 1039.5 273.5 L 1067.5 273.5 L 1067.5 350.5 L 1039.5 350.5 Z M 687.5 273.5 L 715.5 273.5 L 715.5 390.5 L 687.5 390.5 Z M 939.5 273.5 L 967.5 273.5 L 967.5 390.5 L 939.5 390.5 Z M 759.5 273.5 L 786.5 273.5 L 786.5 390.5 L 759.5 390.5 Z M 867.5 273.5 L 895.5 273.5 L 895.5 390.5 L 867.5 390.5 Z M 358.5 292.5 L 386.5 292.5 L 386.5 410.5 L 358.5 410.5 Z M 437.5 292.5 L 465.5 292.5 L 465.5 410.5 L 437.5 410.5 Z M 503.5 292.5 L 531.5 292.5 L 531.5 410.5 L 503.5 410.5 Z M 286.5 292.5 L 314.5 292.5 L 314.5 410.5 L 286.5 410.5 Z M 1536.5 273.5 L 1564.5 273.5 L 1564.5 504.5 L 1536.5 504.5 Z M 1603.5 273.5 L 1630.5 273.5 L 1630.5 504.5 L 1603.5 504.5 Z M 1288.5 273.5 L 1316.5 273.5 L 1316.5 504.5 L 1288.5 504.5 Z M 1354.5 273.5 L 1382.5 273.5 L 1382.5 504.5 L 1354.5 504.5 Z M 1354.5 273.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface354">
+<g id="surface381">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 417.367188 487.5 L 417.367188 447.625 L 432.738281 447.625 L 435.144531 447.789062 L 437.386719 448.226562 L 439.464844 448.992188 L 441.378906 449.976562 L 443.078125 451.34375 L 444.664062 452.929688 L 445.976562 454.84375 L 447.070312 456.921875 L 447.890625 459.277344 L 448.492188 461.792969 L 448.820312 464.582031 L 448.984375 467.535156 L 448.820312 470.652344 L 448.4375 473.550781 L 447.78125 476.175781 L 446.90625 478.585938 L 445.757812 480.71875 L 444.335938 482.578125 L 442.804688 484.109375 L 441.105469 485.3125 L 439.246094 486.296875 L 437.222656 486.953125 L 435.035156 487.390625 L 432.738281 487.5 Z M 422.457031 483.015625 L 431.863281 483.015625 L 434.378906 482.851562 L 436.621094 482.25 L 438.589844 481.210938 L 440.230469 479.84375 L 441.542969 477.984375 L 442.640625 475.738281 L 442.96875 474.589844 L 443.296875 473.386719 L 443.570312 472.074219 L 443.734375 470.652344 L 443.84375 469.175781 L 443.898438 467.589844 L 443.679688 464.035156 L 443.132812 460.917969 L 442.148438 458.234375 L 440.832031 456.101562 L 439.136719 454.351562 L 437.058594 453.09375 L 436.292969 452.820312 L 435.472656 452.546875 L 433.722656 452.21875 L 431.863281 452.109375 L 422.457031 452.109375 Z M 422.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 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/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.svg b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.svg
index 2da633b..5f4f66f 100644
--- a/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.svg
+++ b/cells/dlxtp/sky130_fd_sc_lp__dlxtp_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 195.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 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="#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 1605.5 688.5 L 1633.5 688.5 L 1633.5 765.5 L 1605.5 765.5 Z M 1539.5 688.5 L 1567.5 688.5 L 1567.5 765.5 L 1539.5 765.5 Z M 498.5 712.5 L 525.5 712.5 L 525.5 789.5 L 498.5 789.5 Z M 353.5 712.5 L 380.5 712.5 L 380.5 789.5 L 353.5 789.5 Z M 286.5 712.5 L 314.5 712.5 L 314.5 789.5 L 286.5 789.5 Z M 432.5 712.5 L 459.5 712.5 L 459.5 789.5 L 432.5 789.5 Z M 990.5 721.5 L 1018.5 721.5 L 1018.5 799.5 L 990.5 799.5 Z M 897.5 721.5 L 924.5 721.5 L 924.5 799.5 L 897.5 799.5 Z M 825.5 721.5 L 853.5 721.5 L 853.5 799.5 L 825.5 799.5 Z M 1291.5 721.5 L 1319.5 721.5 L 1319.5 799.5 L 1291.5 799.5 Z M 680.5 721.5 L 707.5 721.5 L 707.5 799.5 L 680.5 799.5 Z M 746.5 721.5 L 773.5 721.5 L 773.5 799.5 L 746.5 799.5 Z M 1062.5 721.5 L 1090.5 721.5 L 1090.5 799.5 L 1062.5 799.5 Z M 1357.5 721.5 L 1385.5 721.5 L 1385.5 799.5 L 1357.5 799.5 Z M 1357.5 721.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 1161.5 273.5 L 1207.5 273.5 L 1207.5 457.5 L 1161.5 457.5 Z M 1296.5 273.5 L 1342.5 273.5 L 1342.5 457.5 L 1296.5 457.5 Z M 867.5 273.5 L 913.5 273.5 L 913.5 457.5 L 867.5 457.5 Z M 957.5 273.5 L 1003.5 273.5 L 1003.5 457.5 L 957.5 457.5 Z M 1057.5 273.5 L 1103.5 273.5 L 1103.5 457.5 L 1057.5 457.5 Z M 677.5 273.5 L 723.5 273.5 L 723.5 457.5 L 677.5 457.5 Z M 384.5 282.5 L 430.5 282.5 L 430.5 466.5 L 384.5 466.5 Z M 286.5 282.5 L 332.5 282.5 L 332.5 466.5 L 286.5 466.5 Z M 1539.5 308.5 L 1585.5 308.5 L 1585.5 492.5 L 1539.5 492.5 Z M 1539.5 308.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1686.59375 351.328125 L 1684.023438 354.5 L 1678.28125 349.742188 L 1676.640625 350.617188 L 1674.996094 351.273438 L 1673.300781 351.820312 L 1671.496094 352.203125 L 1669.691406 352.421875 L 1667.832031 352.53125 L 1665.316406 352.367188 L 1662.964844 351.984375 L 1660.777344 351.328125 L 1658.699219 350.453125 L 1656.730469 349.304688 L 1654.976562 347.828125 L 1653.390625 346.242188 L 1652.023438 344.433594 L 1650.929688 342.464844 L 1650 340.332031 L 1649.289062 338.035156 L 1648.851562 335.519531 L 1648.742188 334.917969 L 1648.6875 334.261719 L 1648.632812 333.660156 L 1648.578125 333.003906 L 1648.578125 331.636719 L 1648.6875 328.902344 L 1649.070312 326.277344 L 1649.671875 323.867188 L 1650.546875 321.570312 L 1651.640625 319.4375 L 1653.0625 317.46875 L 1654.484375 315.882812 L 1656.125 314.460938 L 1657.933594 313.257812 L 1659.847656 312.328125 L 1661.925781 311.5625 L 1664.222656 311.015625 L 1664.769531 310.960938 L 1666.574219 310.796875 L 1667.175781 310.796875 L 1667.832031 310.742188 L 1670.292969 310.90625 L 1672.644531 311.289062 L 1674.832031 311.945312 L 1676.914062 312.820312 L 1678.882812 313.96875 L 1680.6875 315.390625 L 1682.21875 317.03125 L 1683.585938 318.78125 L 1684.679688 320.695312 L 1685.609375 322.828125 L 1686.320312 325.125 L 1686.8125 327.535156 L 1686.867188 328.246094 L 1687.03125 330.214844 L 1687.03125 330.871094 L 1687.085938 331.527344 L 1686.921875 334.589844 L 1686.429688 337.488281 L 1685.664062 340.167969 L 1684.570312 342.683594 L 1683.148438 344.984375 L 1681.453125 347.117188 Z M 1672.808594 340.058594 L 1677.679688 344.050781 L 1678.992188 342.410156 L 1680.085938 340.550781 L 1680.90625 338.527344 L 1681.507812 336.394531 L 1681.835938 334.097656 L 1682 331.582031 L 1681.890625 329.285156 L 1681.5625 327.097656 L 1681.015625 325.070312 L 1680.304688 323.210938 L 1679.375 321.460938 L 1678.226562 319.875 L 1676.914062 318.5625 L 1675.542969 317.46875 L 1674.011719 316.59375 L 1672.371094 315.9375 L 1670.566406 315.5 L 1668.707031 315.226562 L 1667.832031 315.226562 L 1665.863281 315.390625 L 1664.003906 315.71875 L 1662.253906 316.265625 L 1660.667969 317.085938 L 1659.191406 318.125 L 1657.878906 319.382812 L 1656.621094 320.859375 L 1655.632812 322.5 L 1654.8125 324.304688 L 1654.210938 326.277344 L 1653.828125 328.410156 L 1653.664062 330.707031 L 1653.664062 331.636719 L 1653.71875 334.042969 L 1654.046875 336.230469 L 1654.59375 338.253906 L 1655.304688 340.167969 L 1656.292969 341.917969 L 1657.496094 343.449219 L 1658.753906 344.820312 L 1660.175781 345.914062 L 1661.707031 346.789062 L 1663.347656 347.390625 L 1665.152344 347.828125 L 1667.066406 347.992188 L 1667.175781 348.046875 L 1668.761719 348.046875 L 1669.800781 347.9375 L 1670.839844 347.71875 L 1671.824219 347.5 L 1672.808594 347.171875 L 1673.847656 346.734375 L 1673.902344 346.734375 L 1674.011719 346.679688 L 1674.066406 346.625 L 1674.175781 346.625 L 1674.230469 346.570312 L 1674.339844 346.515625 L 1670.292969 343.121094 Z M 1672.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 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/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.svg b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.svg
index 8062fb4..2330a39 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.svg
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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="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="#image311"/>
+  <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 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="#image311"/>
+  <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 1034.5 629.5 L 1068.5 629.5 L 1068.5 859.5 L 1034.5 859.5 Z M 1231.5 762.5 L 1266.5 762.5 L 1266.5 859.5 L 1231.5 859.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 811.5 629.5 L 845.5 629.5 L 845.5 859.5 L 811.5 859.5 Z M 811.5 629.5 "/>
 </clipPath>
-<image id="image312" 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="#image312"/>
+  <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 1034.5 209.5 L 1068.5 209.5 L 1068.5 438.5 L 1034.5 438.5 Z M 811.5 209.5 L 845.5 209.5 L 845.5 438.5 L 811.5 438.5 Z M 614.5 209.5 L 648.5 209.5 L 648.5 498.5 L 614.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 1231.5 209.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1161.5 255.5 L 1200.5 255.5 L 1200.5 262.5 L 1161.5 262.5 Z M 677.5 255.5 L 716.5 255.5 L 716.5 276.5 L 677.5 276.5 Z M 677.5 276.5 L 716.5 276.5 L 716.5 294.5 L 677.5 294.5 Z M 1161.5 262.5 L 1200.5 262.5 L 1200.5 294.5 L 1161.5 294.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="image314" 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="#image314"/>
+  <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="surface308">
+<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 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/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.svg b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.svg
index 99128e1..75de5f6 100644
--- a/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.svg
+++ b/cells/dlybuf4s15kapwr/sky130_fd_sc_lp__dlybuf4s15kapwr_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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="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="#image312"/>
+  <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="#image312"/>
+  <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 979.5 629.5 L 1013.5 629.5 L 1013.5 859.5 L 979.5 859.5 Z M 1275.5 762.5 L 1309.5 762.5 L 1309.5 859.5 L 1275.5 859.5 Z M 1176.5 762.5 L 1211.5 762.5 L 1211.5 859.5 L 1176.5 859.5 Z M 559.5 762.5 L 593.5 762.5 L 593.5 859.5 L 559.5 859.5 Z M 756.5 629.5 L 790.5 629.5 L 790.5 859.5 L 756.5 859.5 Z M 756.5 629.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <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 979.5 209.5 L 1013.5 209.5 L 1013.5 438.5 L 979.5 438.5 Z M 756.5 209.5 L 790.5 209.5 L 790.5 438.5 L 756.5 438.5 Z M 1176.5 209.5 L 1211.5 209.5 L 1211.5 498.5 L 1176.5 498.5 Z M 1275.5 209.5 L 1309.5 209.5 L 1309.5 498.5 L 1275.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 559.5 209.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1106.5 256.5 L 1145.5 256.5 L 1145.5 262.5 L 1106.5 262.5 Z M 1355.5 256.5 L 1394.5 256.5 L 1394.5 271.5 L 1355.5 271.5 Z M 622.5 256.5 L 661.5 256.5 L 661.5 276.5 L 622.5 276.5 Z M 622.5 276.5 L 661.5 276.5 L 661.5 295.5 L 622.5 295.5 Z M 1106.5 262.5 L 1145.5 262.5 L 1145.5 295.5 L 1106.5 295.5 Z M 1355.5 271.5 L 1394.5 271.5 L 1394.5 295.5 L 1355.5 295.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="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="#image315"/>
+  <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="surface309">
+<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 1294.855469 282.8125 L 1304.988281 297.5 L 1300.46875 297.5 L 1292.65625 285.5625 L 1284.800781 297.5 L 1280.363281 297.5 L 1290.496094 282.8125 L 1280.992188 268.871094 L 1285.429688 268.871094 L 1292.773438 280.101562 L 1300.15625 268.871094 L 1304.515625 268.871094 Z M 1294.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 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 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/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.svg b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.svg
index 777d6e8..1151c8c 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.svg
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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="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="#image311"/>
+  <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 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="#image311"/>
+  <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 1034.5 629.5 L 1075.5 629.5 L 1075.5 859.5 L 1034.5 859.5 Z M 1231.5 762.5 L 1266.5 762.5 L 1266.5 859.5 L 1231.5 859.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 804.5 629.5 L 845.5 629.5 L 845.5 859.5 L 804.5 859.5 Z M 804.5 629.5 "/>
 </clipPath>
-<image id="image312" 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="#image312"/>
+  <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 1034.5 209.5 L 1075.5 209.5 L 1075.5 438.5 L 1034.5 438.5 Z M 804.5 209.5 L 845.5 209.5 L 845.5 438.5 L 804.5 438.5 Z M 614.5 209.5 L 648.5 209.5 L 648.5 498.5 L 614.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 1231.5 209.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1161.5 255.5 L 1200.5 255.5 L 1200.5 262.5 L 1161.5 262.5 Z M 677.5 255.5 L 716.5 255.5 L 716.5 276.5 L 677.5 276.5 Z M 677.5 276.5 L 716.5 276.5 L 716.5 294.5 L 677.5 294.5 Z M 1161.5 262.5 L 1200.5 262.5 L 1200.5 294.5 L 1161.5 294.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="image314" 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="#image314"/>
+  <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="surface308">
+<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 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/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.svg b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.svg
index 92a7dd3..7d3e9c2 100644
--- a/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.svg
+++ b/cells/dlybuf4s18kapwr/sky130_fd_sc_lp__dlybuf4s18kapwr_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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="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="#image312"/>
+  <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="#image312"/>
+  <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 979.5 629.5 L 1020.5 629.5 L 1020.5 859.5 L 979.5 859.5 Z M 1275.5 762.5 L 1309.5 762.5 L 1309.5 859.5 L 1275.5 859.5 Z M 1176.5 762.5 L 1211.5 762.5 L 1211.5 859.5 L 1176.5 859.5 Z M 559.5 762.5 L 593.5 762.5 L 593.5 859.5 L 559.5 859.5 Z M 749.5 629.5 L 790.5 629.5 L 790.5 859.5 L 749.5 859.5 Z M 749.5 629.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <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 979.5 209.5 L 1020.5 209.5 L 1020.5 438.5 L 979.5 438.5 Z M 749.5 209.5 L 790.5 209.5 L 790.5 438.5 L 749.5 438.5 Z M 1176.5 209.5 L 1211.5 209.5 L 1211.5 498.5 L 1176.5 498.5 Z M 1275.5 209.5 L 1309.5 209.5 L 1309.5 498.5 L 1275.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 559.5 209.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1106.5 255.5 L 1145.5 255.5 L 1145.5 262.5 L 1106.5 262.5 Z M 1355.5 255.5 L 1394.5 255.5 L 1394.5 271.5 L 1355.5 271.5 Z M 622.5 255.5 L 661.5 255.5 L 661.5 276.5 L 622.5 276.5 Z M 622.5 276.5 L 661.5 276.5 L 661.5 294.5 L 622.5 294.5 Z M 1106.5 262.5 L 1145.5 262.5 L 1145.5 294.5 L 1106.5 294.5 Z M 1355.5 271.5 L 1394.5 271.5 L 1394.5 294.5 L 1355.5 294.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="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="#image315"/>
+  <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="surface309">
+<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 1294.855469 282.8125 L 1304.988281 297.5 L 1300.46875 297.5 L 1292.65625 285.5625 L 1284.800781 297.5 L 1280.363281 297.5 L 1290.496094 282.8125 L 1280.992188 268.871094 L 1285.429688 268.871094 L 1292.773438 280.101562 L 1300.15625 268.871094 L 1304.515625 268.871094 Z M 1294.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 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 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/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.svg b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.svg
index d83ef0f..8178936 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.svg
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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="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="#image312"/>
+  <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 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="#image312"/>
+  <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 1034.5 629.5 L 1091.5 629.5 L 1091.5 859.5 L 1034.5 859.5 Z M 1231.5 762.5 L 1266.5 762.5 L 1266.5 859.5 L 1231.5 859.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 788.5 629.5 L 845.5 629.5 L 845.5 859.5 L 788.5 859.5 Z M 788.5 629.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <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 1034.5 209.5 L 1091.5 209.5 L 1091.5 438.5 L 1034.5 438.5 Z M 788.5 209.5 L 845.5 209.5 L 845.5 438.5 L 788.5 438.5 Z M 614.5 209.5 L 648.5 209.5 L 648.5 498.5 L 614.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 1231.5 209.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1161.5 255.5 L 1200.5 255.5 L 1200.5 262.5 L 1161.5 262.5 Z M 677.5 255.5 L 716.5 255.5 L 716.5 276.5 L 677.5 276.5 Z M 677.5 276.5 L 716.5 276.5 L 716.5 294.5 L 677.5 294.5 Z M 1161.5 262.5 L 1200.5 262.5 L 1200.5 294.5 L 1161.5 294.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="image315" 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="#image315"/>
+  <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="surface309">
+<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 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/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.svg b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.svg
index 428fd82..1518254 100644
--- a/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.svg
+++ b/cells/dlybuf4s25kapwr/sky130_fd_sc_lp__dlybuf4s25kapwr_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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="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="#image312"/>
+  <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="#image312"/>
+  <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 979.5 629.5 L 1036.5 629.5 L 1036.5 859.5 L 979.5 859.5 Z M 1275.5 762.5 L 1309.5 762.5 L 1309.5 859.5 L 1275.5 859.5 Z M 1176.5 762.5 L 1211.5 762.5 L 1211.5 859.5 L 1176.5 859.5 Z M 559.5 762.5 L 593.5 762.5 L 593.5 859.5 L 559.5 859.5 Z M 733.5 629.5 L 790.5 629.5 L 790.5 859.5 L 733.5 859.5 Z M 733.5 629.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <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 979.5 209.5 L 1036.5 209.5 L 1036.5 438.5 L 979.5 438.5 Z M 733.5 209.5 L 790.5 209.5 L 790.5 438.5 L 733.5 438.5 Z M 1176.5 209.5 L 1211.5 209.5 L 1211.5 498.5 L 1176.5 498.5 Z M 1275.5 209.5 L 1309.5 209.5 L 1309.5 498.5 L 1275.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 559.5 209.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1106.5 255.5 L 1145.5 255.5 L 1145.5 262.5 L 1106.5 262.5 Z M 1355.5 255.5 L 1394.5 255.5 L 1394.5 271.5 L 1355.5 271.5 Z M 622.5 255.5 L 661.5 255.5 L 661.5 276.5 L 622.5 276.5 Z M 622.5 276.5 L 661.5 276.5 L 661.5 294.5 L 622.5 294.5 Z M 1106.5 262.5 L 1145.5 262.5 L 1145.5 294.5 L 1106.5 294.5 Z M 1355.5 271.5 L 1394.5 271.5 L 1394.5 294.5 L 1355.5 294.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="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="#image315"/>
+  <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="surface309">
+<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 1294.855469 282.8125 L 1304.988281 297.5 L 1300.46875 297.5 L 1292.65625 285.5625 L 1284.800781 297.5 L 1280.363281 297.5 L 1290.496094 282.8125 L 1280.992188 268.871094 L 1285.429688 268.871094 L 1292.773438 280.101562 L 1300.15625 268.871094 L 1304.515625 268.871094 Z M 1294.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 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 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/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.svg b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.svg
index f37fc43..3d59f32 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.svg
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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="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="#image311"/>
+  <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 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="#image311"/>
+  <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 1034.5 629.5 L 1149.5 629.5 L 1149.5 859.5 L 1034.5 859.5 Z M 1231.5 762.5 L 1266.5 762.5 L 1266.5 859.5 L 1231.5 859.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 730.5 629.5 L 845.5 629.5 L 845.5 859.5 L 730.5 859.5 Z M 730.5 629.5 "/>
 </clipPath>
-<image id="image312" 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="#image312"/>
+  <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 1034.5 209.5 L 1149.5 209.5 L 1149.5 438.5 L 1034.5 438.5 Z M 730.5 209.5 L 845.5 209.5 L 845.5 438.5 L 730.5 438.5 Z M 614.5 209.5 L 648.5 209.5 L 648.5 498.5 L 614.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 1231.5 209.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1161.5 255.5 L 1200.5 255.5 L 1200.5 262.5 L 1161.5 262.5 Z M 677.5 255.5 L 716.5 255.5 L 716.5 276.5 L 677.5 276.5 Z M 677.5 276.5 L 716.5 276.5 L 716.5 294.5 L 677.5 294.5 Z M 1161.5 262.5 L 1200.5 262.5 L 1200.5 294.5 L 1161.5 294.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="image314" 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="#image314"/>
+  <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="surface308">
+<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 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/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.svg b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.svg
index 301a9b8..f200c69 100644
--- a/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.svg
+++ b/cells/dlybuf4s50kapwr/sky130_fd_sc_lp__dlybuf4s50kapwr_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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="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="#image312"/>
+  <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="#image312"/>
+  <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 979.5 629.5 L 1094.5 629.5 L 1094.5 859.5 L 979.5 859.5 Z M 1275.5 762.5 L 1309.5 762.5 L 1309.5 859.5 L 1275.5 859.5 Z M 1176.5 762.5 L 1211.5 762.5 L 1211.5 859.5 L 1176.5 859.5 Z M 559.5 762.5 L 593.5 762.5 L 593.5 859.5 L 559.5 859.5 Z M 675.5 629.5 L 790.5 629.5 L 790.5 859.5 L 675.5 859.5 Z M 675.5 629.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <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 979.5 209.5 L 1094.5 209.5 L 1094.5 438.5 L 979.5 438.5 Z M 675.5 209.5 L 790.5 209.5 L 790.5 438.5 L 675.5 438.5 Z M 1176.5 209.5 L 1211.5 209.5 L 1211.5 498.5 L 1176.5 498.5 Z M 1275.5 209.5 L 1309.5 209.5 L 1309.5 498.5 L 1275.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 559.5 209.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1106.5 255.5 L 1145.5 255.5 L 1145.5 262.5 L 1106.5 262.5 Z M 1355.5 255.5 L 1394.5 255.5 L 1394.5 271.5 L 1355.5 271.5 Z M 622.5 255.5 L 661.5 255.5 L 661.5 276.5 L 622.5 276.5 Z M 622.5 276.5 L 661.5 276.5 L 661.5 294.5 L 622.5 294.5 Z M 1106.5 262.5 L 1145.5 262.5 L 1145.5 294.5 L 1106.5 294.5 Z M 1355.5 271.5 L 1394.5 271.5 L 1394.5 294.5 L 1355.5 294.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="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="#image315"/>
+  <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="surface309">
+<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 1294.855469 282.8125 L 1304.988281 297.5 L 1300.46875 297.5 L 1292.65625 285.5625 L 1284.800781 297.5 L 1280.363281 297.5 L 1290.496094 282.8125 L 1280.992188 268.871094 L 1285.429688 268.871094 L 1292.773438 280.101562 L 1300.15625 268.871094 L 1304.515625 268.871094 Z M 1294.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 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 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/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.svg b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.svg
index 3a2fdb7..c1dedd1 100644
--- a/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.svg
+++ b/cells/dlygate4s15/sky130_fd_sc_lp__dlygate4s15_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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 1047.5 666.5 L 1081.5 666.5 L 1081.5 762.5 L 1047.5 762.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 818.5 762.5 L 852.5 762.5 L 852.5 859.5 L 818.5 859.5 Z M 1239.5 666.5 L 1274.5 666.5 L 1274.5 859.5 L 1239.5 859.5 Z M 1239.5 666.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 818.5 287.5 L 852.5 287.5 L 852.5 383.5 L 818.5 383.5 Z M 614.5 287.5 L 648.5 287.5 L 648.5 383.5 L 614.5 383.5 Z M 1239.5 209.5 L 1274.5 209.5 L 1274.5 498.5 L 1239.5 498.5 Z M 1047.5 401.5 L 1081.5 401.5 L 1081.5 498.5 L 1047.5 498.5 Z M 1047.5 401.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 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/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.svg b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.svg
index b931068..f49d233 100644
--- a/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.svg
+++ b/cells/dlygate4s18/sky130_fd_sc_lp__dlygate4s18_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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 1047.5 666.5 L 1088.5 666.5 L 1088.5 762.5 L 1047.5 762.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 811.5 762.5 L 852.5 762.5 L 852.5 859.5 L 811.5 859.5 Z M 1239.5 666.5 L 1274.5 666.5 L 1274.5 859.5 L 1239.5 859.5 Z M 1239.5 666.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 811.5 287.5 L 852.5 287.5 L 852.5 383.5 L 811.5 383.5 Z M 614.5 287.5 L 648.5 287.5 L 648.5 383.5 L 614.5 383.5 Z M 1239.5 209.5 L 1274.5 209.5 L 1274.5 498.5 L 1239.5 498.5 Z M 1047.5 401.5 L 1088.5 401.5 L 1088.5 498.5 L 1047.5 498.5 Z M 1047.5 401.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 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/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.svg b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.svg
index ddf8250..25cf887 100644
--- a/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.svg
+++ b/cells/dlygate4s50/sky130_fd_sc_lp__dlygate4s50_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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 1047.5 666.5 L 1161.5 666.5 L 1161.5 762.5 L 1047.5 762.5 Z M 614.5 762.5 L 648.5 762.5 L 648.5 859.5 L 614.5 859.5 Z M 737.5 762.5 L 852.5 762.5 L 852.5 859.5 L 737.5 859.5 Z M 1239.5 666.5 L 1274.5 666.5 L 1274.5 859.5 L 1239.5 859.5 Z M 1239.5 666.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 737.5 287.5 L 852.5 287.5 L 852.5 383.5 L 737.5 383.5 Z M 614.5 287.5 L 648.5 287.5 L 648.5 383.5 L 614.5 383.5 Z M 1239.5 209.5 L 1274.5 209.5 L 1274.5 498.5 L 1239.5 498.5 Z M 1047.5 401.5 L 1161.5 401.5 L 1161.5 498.5 L 1047.5 498.5 Z M 1047.5 401.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 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_lp__dlymetal6s2s_1.svg b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.svg
index 885f933..81eeede 100644
--- a/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.svg
+++ b/cells/dlymetal6s2s/sky130_fd_sc_lp__dlymetal6s2s_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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 1219.5 672.5 L 1253.5 672.5 L 1253.5 768.5 L 1219.5 768.5 Z M 889.5 672.5 L 923.5 672.5 L 923.5 768.5 L 889.5 768.5 Z M 559.5 672.5 L 593.5 672.5 L 593.5 768.5 L 559.5 768.5 Z M 1331.5 672.5 L 1365.5 672.5 L 1365.5 864.5 L 1331.5 864.5 Z M 671.5 672.5 L 705.5 672.5 L 705.5 864.5 L 671.5 864.5 Z M 1001.5 672.5 L 1035.5 672.5 L 1035.5 864.5 L 1001.5 864.5 Z M 1001.5 672.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 1001.5 209.5 L 1035.5 209.5 L 1035.5 498.5 L 1001.5 498.5 Z M 889.5 401.5 L 923.5 401.5 L 923.5 498.5 L 889.5 498.5 Z M 1219.5 401.5 L 1253.5 401.5 L 1253.5 498.5 L 1219.5 498.5 Z M 559.5 401.5 L 593.5 401.5 L 593.5 498.5 L 559.5 498.5 Z M 1331.5 209.5 L 1365.5 209.5 L 1365.5 498.5 L 1331.5 498.5 Z M 671.5 209.5 L 705.5 209.5 L 705.5 498.5 L 671.5 498.5 Z M 671.5 209.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 718.5 432.5 L 757.5 432.5 L 757.5 440.5 L 718.5 440.5 Z M 1378.5 432.5 L 1417.5 432.5 L 1417.5 440.5 L 1378.5 440.5 Z M 1048.5 432.5 L 1087.5 432.5 L 1087.5 440.5 L 1048.5 440.5 Z M 1048.5 440.5 L 1087.5 440.5 L 1087.5 471.5 L 1048.5 471.5 Z M 718.5 440.5 L 757.5 440.5 L 757.5 471.5 L 718.5 471.5 Z M 1378.5 440.5 L 1417.5 440.5 L 1417.5 471.5 L 1378.5 471.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>
@@ -140,6 +140,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 532.410156 546.757812 L 513.492188 546.757812 L 508.308594 561.5 L 501.644531 561.5 L 519.148438 512.421875 L 527.226562 512.421875 L 544.460938 561.5 L 537.460938 561.5 Z M 530.660156 541.503906 L 523.121094 519.15625 L 515.042969 541.503906 Z M 530.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 502 562 L 541 562 M 502 523 L 541 523 M 502 523 L 502 562 M 541 523 L 541 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 502 562 L 541 562 M 502 523 L 541 523 M 541 562 L 541 523 M 502 562 L 502 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/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.svg b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.svg
index 84e0393..5eec7c0 100644
--- a/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.svg
+++ b/cells/dlymetal6s4s/sky130_fd_sc_lp__dlymetal6s4s_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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 1219.5 672.5 L 1253.5 672.5 L 1253.5 768.5 L 1219.5 768.5 Z M 889.5 672.5 L 923.5 672.5 L 923.5 768.5 L 889.5 768.5 Z M 559.5 672.5 L 593.5 672.5 L 593.5 768.5 L 559.5 768.5 Z M 1331.5 672.5 L 1365.5 672.5 L 1365.5 864.5 L 1331.5 864.5 Z M 671.5 672.5 L 705.5 672.5 L 705.5 864.5 L 671.5 864.5 Z M 1001.5 672.5 L 1035.5 672.5 L 1035.5 864.5 L 1001.5 864.5 Z M 1001.5 672.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 1001.5 209.5 L 1035.5 209.5 L 1035.5 498.5 L 1001.5 498.5 Z M 889.5 401.5 L 923.5 401.5 L 923.5 498.5 L 889.5 498.5 Z M 1219.5 401.5 L 1253.5 401.5 L 1253.5 498.5 L 1219.5 498.5 Z M 559.5 401.5 L 593.5 401.5 L 593.5 498.5 L 559.5 498.5 Z M 1331.5 209.5 L 1365.5 209.5 L 1365.5 498.5 L 1331.5 498.5 Z M 671.5 209.5 L 705.5 209.5 L 705.5 498.5 L 671.5 498.5 Z M 671.5 209.5 "/>
 </clipPath>
-<image id="image276" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image276"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 718.5 432.5 L 757.5 432.5 L 757.5 440.5 L 718.5 440.5 Z M 1378.5 432.5 L 1417.5 432.5 L 1417.5 440.5 L 1378.5 440.5 Z M 1048.5 432.5 L 1087.5 432.5 L 1087.5 440.5 L 1048.5 440.5 Z M 1048.5 440.5 L 1087.5 440.5 L 1087.5 471.5 L 1048.5 471.5 Z M 718.5 440.5 L 757.5 440.5 L 757.5 471.5 L 718.5 471.5 Z M 1378.5 440.5 L 1417.5 440.5 L 1417.5 471.5 L 1378.5 471.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>
@@ -140,6 +140,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 532.410156 546.757812 L 513.492188 546.757812 L 508.308594 561.5 L 501.644531 561.5 L 519.148438 512.421875 L 527.226562 512.421875 L 544.460938 561.5 L 537.460938 561.5 Z M 530.660156 541.503906 L 523.121094 519.15625 L 515.042969 541.503906 Z M 530.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 502 562 L 541 562 M 502 523 L 541 523 M 502 523 L 502 562 M 541 523 L 541 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 502 562 L 541 562 M 502 523 L 541 523 M 541 562 L 541 523 M 502 562 L 502 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/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.svg b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.svg
index cc00e2a..0b223df 100644
--- a/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.svg
+++ b/cells/dlymetal6s6s/sky130_fd_sc_lp__dlymetal6s6s_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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 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="#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 1219.5 672.5 L 1253.5 672.5 L 1253.5 768.5 L 1219.5 768.5 Z M 889.5 672.5 L 923.5 672.5 L 923.5 768.5 L 889.5 768.5 Z M 559.5 672.5 L 593.5 672.5 L 593.5 768.5 L 559.5 768.5 Z M 1331.5 672.5 L 1365.5 672.5 L 1365.5 864.5 L 1331.5 864.5 Z M 671.5 672.5 L 705.5 672.5 L 705.5 864.5 L 671.5 864.5 Z M 1001.5 672.5 L 1035.5 672.5 L 1035.5 864.5 L 1001.5 864.5 Z M 1001.5 672.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 1001.5 209.5 L 1035.5 209.5 L 1035.5 498.5 L 1001.5 498.5 Z M 889.5 401.5 L 923.5 401.5 L 923.5 498.5 L 889.5 498.5 Z M 1219.5 401.5 L 1253.5 401.5 L 1253.5 498.5 L 1219.5 498.5 Z M 559.5 401.5 L 593.5 401.5 L 593.5 498.5 L 559.5 498.5 Z M 1331.5 209.5 L 1365.5 209.5 L 1365.5 498.5 L 1331.5 498.5 Z M 671.5 209.5 L 705.5 209.5 L 705.5 498.5 L 671.5 498.5 Z M 671.5 209.5 "/>
 </clipPath>
-<image id="image275" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image275"/>
+  <use xlink:href="#image303"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 718.5 432.5 L 757.5 432.5 L 757.5 440.5 L 718.5 440.5 Z M 1378.5 432.5 L 1417.5 432.5 L 1417.5 440.5 L 1378.5 440.5 Z M 1048.5 432.5 L 1087.5 432.5 L 1087.5 440.5 L 1048.5 440.5 Z M 1048.5 440.5 L 1087.5 440.5 L 1087.5 471.5 L 1048.5 471.5 Z M 718.5 440.5 L 757.5 440.5 L 757.5 471.5 L 718.5 471.5 Z M 1378.5 440.5 L 1417.5 440.5 L 1417.5 471.5 L 1378.5 471.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="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>
@@ -140,6 +140,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 532.410156 546.757812 L 513.492188 546.757812 L 508.308594 561.5 L 501.644531 561.5 L 519.148438 512.421875 L 527.226562 512.421875 L 544.460938 561.5 L 537.460938 561.5 Z M 530.660156 541.503906 L 523.121094 519.15625 L 515.042969 541.503906 Z M 530.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 502 562 L 541 562 M 502 523 L 541 523 M 502 523 L 502 562 M 541 523 L 541 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 502 562 L 541 562 M 502 523 L 541 523 M 541 562 L 541 523 M 502 562 L 502 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_lp__ebufn_1.svg b/cells/ebufn/sky130_fd_sc_lp__ebufn_1.svg
index 19a7226..ced6fd4 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_1.svg
+++ b/cells/ebufn/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1105.5 671.5 L 1140.5 671.5 L 1140.5 767.5 L 1105.5 767.5 Z M 1236.5 671.5 L 1270.5 671.5 L 1270.5 767.5 L 1236.5 767.5 Z M 683.5 642.5 L 718.5 642.5 L 718.5 835.5 L 683.5 835.5 Z M 773.5 642.5 L 807.5 642.5 L 807.5 835.5 L 773.5 835.5 Z M 773.5 642.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1039.5 283.5 L 1073.5 283.5 L 1073.5 430.5 L 1039.5 430.5 Z M 1236.5 283.5 L 1270.5 283.5 L 1270.5 430.5 L 1236.5 430.5 Z M 677.5 209.5 L 711.5 209.5 L 711.5 498.5 L 677.5 498.5 Z M 766.5 209.5 L 800.5 209.5 L 800.5 498.5 L 766.5 498.5 Z M 766.5 209.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 597.613281 258.421875 L 597.613281 264.078125 L 568.261719 301.980469 L 597.75 301.980469 L 597.75 307.5 L 560.386719 307.5 L 560.386719 301.980469 L 589.871094 263.941406 L 562.269531 263.941406 L 562.269531 258.421875 Z M 597.613281 258.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 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/ebufn/sky130_fd_sc_lp__ebufn_2.svg b/cells/ebufn/sky130_fd_sc_lp__ebufn_2.svg
index 7ce2e57..7b78103 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_2.svg
+++ b/cells/ebufn/sky130_fd_sc_lp__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 539.5 L 423.5 539.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="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1195.5 663.5 L 1229.5 663.5 L 1229.5 759.5 L 1195.5 759.5 Z M 1325.5 663.5 L 1360.5 663.5 L 1360.5 759.5 L 1325.5 759.5 Z M 577.5 672.5 L 611.5 672.5 L 611.5 864.5 L 577.5 864.5 Z M 907.5 672.5 L 941.5 672.5 L 941.5 864.5 L 907.5 864.5 Z M 792.5 672.5 L 827.5 672.5 L 827.5 864.5 L 792.5 864.5 Z M 678.5 672.5 L 712.5 672.5 L 712.5 864.5 L 678.5 864.5 Z M 678.5 672.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1317.5 209.5 L 1352.5 209.5 L 1352.5 356.5 L 1317.5 356.5 Z M 1153.5 282.5 L 1188.5 282.5 L 1188.5 429.5 L 1153.5 429.5 Z M 675.5 209.5 L 710.5 209.5 L 710.5 498.5 L 675.5 498.5 Z M 873.5 209.5 L 907.5 209.5 L 907.5 498.5 L 873.5 498.5 Z M 774.5 209.5 L 808.5 209.5 L 808.5 498.5 L 774.5 498.5 Z M 577.5 209.5 L 611.5 209.5 L 611.5 498.5 L 577.5 498.5 Z M 577.5 209.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface300">
+<g id="surface329">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1265.707031 462.648438 L 1265.570312 464.804688 L 1265.234375 466.753906 L 1264.628906 468.574219 L 1263.820312 470.1875 L 1262.742188 471.738281 L 1261.464844 473.082031 L 1260.050781 474.226562 L 1258.570312 475.101562 L 1256.886719 475.777344 L 1255.136719 476.316406 L 1253.25 476.585938 L 1251.230469 476.652344 L 1229.082031 476.652344 L 1229.082031 427.574219 L 1249.011719 427.574219 L 1251.90625 427.777344 L 1254.464844 428.246094 L 1256.753906 429.054688 L 1258.703125 430.199219 L 1260.386719 431.679688 L 1261.734375 433.5 L 1262.273438 434.507812 L 1262.742188 435.585938 L 1263.082031 436.59375 L 1263.351562 437.738281 L 1263.484375 438.882812 L 1263.550781 440.027344 L 1263.351562 442.453125 L 1262.742188 444.539062 L 1261.800781 446.492188 L 1260.457031 448.105469 L 1258.773438 449.589844 L 1256.753906 450.734375 L 1258.703125 451.609375 L 1260.386719 452.550781 L 1261.867188 453.628906 L 1263.082031 454.839844 L 1264.023438 456.117188 L 1264.765625 457.464844 L 1265.03125 458.273438 L 1265.234375 459.082031 L 1265.4375 459.886719 L 1265.570312 460.832031 L 1265.640625 461.707031 Z M 1257.292969 440.902344 L 1257.089844 438.882812 L 1256.484375 437.203125 L 1255.539062 435.71875 L 1254.195312 434.644531 L 1252.511719 433.835938 L 1250.425781 433.296875 L 1249.953125 433.296875 L 1249.480469 433.230469 L 1249.011719 433.160156 L 1247.933594 433.160156 L 1247.460938 433.09375 L 1235.34375 433.09375 L 1235.34375 448.714844 L 1247.460938 448.714844 L 1249.953125 448.578125 L 1252.105469 448.175781 L 1253.925781 447.433594 L 1255.269531 446.425781 L 1256.347656 445.078125 L 1257.023438 443.460938 L 1257.089844 443.125 L 1257.15625 442.722656 L 1257.222656 442.316406 L 1257.222656 441.375 Z M 1250.625 471.132812 L 1252.511719 471.0625 L 1254.195312 470.660156 L 1255.675781 469.988281 L 1256.886719 469.113281 L 1257.898438 467.96875 L 1258.703125 466.554688 L 1258.90625 466.015625 L 1259.042969 465.410156 L 1259.242188 464.734375 L 1259.3125 464.128906 L 1259.378906 463.457031 L 1259.445312 462.714844 L 1259.3125 461.234375 L 1259.042969 459.820312 L 1258.570312 458.609375 L 1257.898438 457.464844 L 1257.023438 456.523438 L 1256.011719 455.648438 L 1255.269531 455.242188 L 1254.464844 454.90625 L 1253.589844 454.636719 L 1252.644531 454.433594 L 1251.636719 454.300781 L 1250.625 454.234375 L 1235.34375 454.234375 L 1235.34375 471.132812 Z M 1250.625 471.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 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 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_lp__ebufn_4.svg b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.svg
index a629bca..c3630e4 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_4.svg
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 539.5 L 201.5 539.5 Z M 1234.5 539.5 L 1426.5 539.5 L 1426.5 550.5 L 1234.5 550.5 Z M 1234.5 539.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1541.5 663.5 L 1575.5 663.5 L 1575.5 855.5 L 1541.5 855.5 Z M 1410.5 663.5 L 1444.5 663.5 L 1444.5 855.5 L 1410.5 855.5 Z M 439.5 672.5 L 474.5 672.5 L 474.5 864.5 L 439.5 864.5 Z M 1063.5 672.5 L 1097.5 672.5 L 1097.5 864.5 L 1063.5 864.5 Z M 964.5 672.5 L 999.5 672.5 L 999.5 864.5 L 964.5 864.5 Z M 866.5 672.5 L 900.5 672.5 L 900.5 864.5 L 866.5 864.5 Z M 767.5 672.5 L 801.5 672.5 L 801.5 864.5 L 767.5 864.5 Z M 669.5 672.5 L 703.5 672.5 L 703.5 864.5 L 669.5 864.5 Z M 341.5 672.5 L 375.5 672.5 L 375.5 864.5 L 341.5 864.5 Z M 554.5 672.5 L 588.5 672.5 L 588.5 864.5 L 554.5 864.5 Z M 554.5 672.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1525.5 209.5 L 1559.5 209.5 L 1559.5 498.5 L 1525.5 498.5 Z M 341.5 209.5 L 375.5 209.5 L 375.5 498.5 L 341.5 498.5 Z M 439.5 209.5 L 474.5 209.5 L 474.5 498.5 L 439.5 498.5 Z M 554.5 209.5 L 588.5 209.5 L 588.5 498.5 L 554.5 498.5 Z M 669.5 209.5 L 703.5 209.5 L 703.5 498.5 L 669.5 498.5 Z M 783.5 209.5 L 818.5 209.5 L 818.5 498.5 L 783.5 498.5 Z M 914.5 209.5 L 948.5 209.5 L 948.5 498.5 L 914.5 498.5 Z M 1012.5 209.5 L 1047.5 209.5 L 1047.5 498.5 L 1012.5 498.5 Z M 1152.5 209.5 L 1187.5 209.5 L 1187.5 498.5 L 1152.5 498.5 Z M 1410.5 209.5 L 1444.5 209.5 L 1444.5 498.5 L 1410.5 498.5 Z M 1410.5 209.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface335">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 319.613281 597.421875 L 319.613281 603.078125 L 290.261719 640.980469 L 319.75 640.980469 L 319.75 646.5 L 282.386719 646.5 L 282.386719 640.980469 L 311.871094 602.941406 L 284.269531 602.941406 L 284.269531 597.421875 Z M 319.613281 597.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 280 477 L 319 477 M 280 438 L 319 438 M 280 438 L 280 477 M 319 438 L 319 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 280 477 L 319 477 M 280 438 L 319 438 M 319 477 L 319 438 M 280 477 L 280 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/ebufn/sky130_fd_sc_lp__ebufn_8.svg b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.svg
index 861a2e3..c21a951 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_8.svg
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 537.5 L 174.5 537.5 Z M 174.5 243.5 "/>
 </clipPath>
-<image id="image288" 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="#image288"/>
+  <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="#image288"/>
+  <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 1619.5 628.5 L 1643.5 628.5 L 1643.5 760.5 L 1619.5 760.5 Z M 270.5 628.5 L 293.5 628.5 L 293.5 760.5 L 270.5 760.5 Z M 337.5 628.5 L 361.5 628.5 L 361.5 760.5 L 337.5 760.5 Z M 405.5 628.5 L 429.5 628.5 L 429.5 760.5 L 405.5 760.5 Z M 473.5 628.5 L 496.5 628.5 L 496.5 760.5 L 473.5 760.5 Z M 540.5 628.5 L 564.5 628.5 L 564.5 760.5 L 540.5 760.5 Z M 608.5 628.5 L 632.5 628.5 L 632.5 760.5 L 608.5 760.5 Z M 676.5 628.5 L 699.5 628.5 L 699.5 760.5 L 676.5 760.5 Z M 743.5 628.5 L 767.5 628.5 L 767.5 760.5 L 743.5 760.5 Z M 811.5 628.5 L 834.5 628.5 L 834.5 760.5 L 811.5 760.5 Z M 878.5 628.5 L 902.5 628.5 L 902.5 760.5 L 878.5 760.5 Z M 946.5 628.5 L 970.5 628.5 L 970.5 760.5 L 946.5 760.5 Z M 1014.5 628.5 L 1037.5 628.5 L 1037.5 760.5 L 1014.5 760.5 Z M 1081.5 628.5 L 1105.5 628.5 L 1105.5 760.5 L 1081.5 760.5 Z M 1149.5 628.5 L 1173.5 628.5 L 1173.5 760.5 L 1149.5 760.5 Z M 1217.5 628.5 L 1240.5 628.5 L 1240.5 760.5 L 1217.5 760.5 Z M 1284.5 628.5 L 1308.5 628.5 L 1308.5 760.5 L 1284.5 760.5 Z M 1484.5 628.5 L 1507.5 628.5 L 1507.5 760.5 L 1484.5 760.5 Z M 1552.5 628.5 L 1575.5 628.5 L 1575.5 760.5 L 1552.5 760.5 Z M 1552.5 628.5 "/>
 </clipPath>
-<image id="image289" 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="#image289"/>
+  <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 1619.5 310.5 L 1643.5 310.5 L 1643.5 508.5 L 1619.5 508.5 Z M 270.5 310.5 L 293.5 310.5 L 293.5 508.5 L 270.5 508.5 Z M 337.5 310.5 L 361.5 310.5 L 361.5 508.5 L 337.5 508.5 Z M 405.5 310.5 L 429.5 310.5 L 429.5 508.5 L 405.5 508.5 Z M 473.5 310.5 L 496.5 310.5 L 496.5 508.5 L 473.5 508.5 Z M 540.5 310.5 L 564.5 310.5 L 564.5 508.5 L 540.5 508.5 Z M 608.5 310.5 L 632.5 310.5 L 632.5 508.5 L 608.5 508.5 Z M 676.5 310.5 L 699.5 310.5 L 699.5 508.5 L 676.5 508.5 Z M 743.5 310.5 L 767.5 310.5 L 767.5 508.5 L 743.5 508.5 Z M 811.5 310.5 L 834.5 310.5 L 834.5 508.5 L 811.5 508.5 Z M 878.5 310.5 L 902.5 310.5 L 902.5 508.5 L 878.5 508.5 Z M 946.5 310.5 L 970.5 310.5 L 970.5 508.5 L 946.5 508.5 Z M 1014.5 310.5 L 1037.5 310.5 L 1037.5 508.5 L 1014.5 508.5 Z M 1081.5 310.5 L 1105.5 310.5 L 1105.5 508.5 L 1081.5 508.5 Z M 1149.5 310.5 L 1173.5 310.5 L 1173.5 508.5 L 1149.5 508.5 Z M 1217.5 310.5 L 1240.5 310.5 L 1240.5 508.5 L 1217.5 508.5 Z M 1284.5 310.5 L 1308.5 310.5 L 1308.5 508.5 L 1284.5 508.5 Z M 1484.5 310.5 L 1507.5 310.5 L 1507.5 508.5 L 1484.5 508.5 Z M 1552.5 310.5 L 1575.5 310.5 L 1575.5 508.5 L 1552.5 508.5 Z M 1552.5 310.5 "/>
 </clipPath>
-<image id="image290" 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="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image291" 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="#image291"/>
+  <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="surface285">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 331.390625 576.757812 L 331.390625 580.648438 L 311.210938 606.703125 L 331.484375 606.703125 L 331.484375 610.5 L 305.796875 610.5 L 305.796875 606.703125 L 326.066406 580.554688 L 307.09375 580.554688 L 307.09375 576.757812 Z M 331.390625 576.757812 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 304 499 L 330 499 M 304 472 L 330 472 M 304 472 L 304 499 M 330 472 L 330 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 304 499 L 330 499 M 304 472 L 330 472 M 330 499 L 330 472 M 304 499 L 304 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/ebufn/sky130_fd_sc_lp__ebufn_lp.svg b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.svg
index 3ba9599..5e99524 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.svg
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#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 572.5 672.5 L 607.5 672.5 L 607.5 768.5 L 572.5 768.5 Z M 655.5 672.5 L 689.5 672.5 L 689.5 768.5 L 655.5 768.5 Z M 1244.5 768.5 L 1278.5 768.5 L 1278.5 864.5 L 1244.5 864.5 Z M 875.5 672.5 L 909.5 672.5 L 909.5 864.5 L 875.5 864.5 Z M 785.5 672.5 L 820.5 672.5 L 820.5 864.5 L 785.5 864.5 Z M 1326.5 768.5 L 1361.5 768.5 L 1361.5 864.5 L 1326.5 864.5 Z M 1326.5 768.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 655.5 218.5 L 689.5 218.5 L 689.5 365.5 L 655.5 365.5 Z M 565.5 218.5 L 600.5 218.5 L 600.5 365.5 L 565.5 365.5 Z M 1237.5 312.5 L 1271.5 312.5 L 1271.5 459.5 L 1237.5 459.5 Z M 1326.5 312.5 L 1361.5 312.5 L 1361.5 459.5 L 1326.5 459.5 Z M 1023.5 209.5 L 1057.5 209.5 L 1057.5 498.5 L 1023.5 498.5 Z M 1112.5 209.5 L 1146.5 209.5 L 1146.5 498.5 L 1112.5 498.5 Z M 1112.5 209.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface308">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1092.613281 258.421875 L 1092.613281 264.078125 L 1063.261719 301.980469 L 1092.75 301.980469 L 1092.75 307.5 L 1055.386719 307.5 L 1055.386719 301.980469 L 1084.871094 263.941406 L 1057.269531 263.941406 L 1057.269531 258.421875 Z M 1092.613281 258.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 1052 816 L 1091 816 M 1052 777 L 1091 777 M 1052 777 L 1052 816 M 1091 777 L 1091 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 1052 816 L 1091 816 M 1052 777 L 1091 777 M 1091 816 L 1091 777 M 1052 816 L 1052 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/ebufn/sky130_fd_sc_lp__ebufn_lp2.svg b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.svg
index b2b32ae..588ddef 100644
--- a/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.svg
+++ b/cells/ebufn/sky130_fd_sc_lp__ebufn_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 479.5 L 478.5 479.5 Z M 1144.5 479.5 L 1446.5 479.5 L 1446.5 539.5 L 1144.5 539.5 Z M 478.5 479.5 L 831.5 479.5 L 831.5 539.5 L 478.5 539.5 Z M 478.5 479.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 975.5 601.5 L 1009.5 601.5 L 1009.5 697.5 L 975.5 697.5 Z M 1083.5 647.5 L 1118.5 647.5 L 1118.5 743.5 L 1083.5 743.5 Z M 1182.5 647.5 L 1216.5 647.5 L 1216.5 743.5 L 1182.5 743.5 Z M 1271.5 647.5 L 1306.5 647.5 L 1306.5 743.5 L 1271.5 743.5 Z M 618.5 768.5 L 653.5 768.5 L 653.5 864.5 L 618.5 864.5 Z M 708.5 768.5 L 742.5 768.5 L 742.5 864.5 L 708.5 864.5 Z M 708.5 768.5 "/>
 </clipPath>
-<image id="image310" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image310"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1243.5 209.5 L 1300.5 209.5 L 1300.5 438.5 L 1243.5 438.5 Z M 1009.5 209.5 L 1066.5 209.5 L 1066.5 438.5 L 1009.5 438.5 Z M 1121.5 209.5 L 1178.5 209.5 L 1178.5 438.5 L 1121.5 438.5 Z M 618.5 220.5 L 675.5 220.5 L 675.5 449.5 L 618.5 449.5 Z M 618.5 220.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface306">
+<g id="surface335">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 697.410156 631.757812 L 678.492188 631.757812 L 673.308594 646.5 L 666.644531 646.5 L 684.148438 597.421875 L 692.226562 597.421875 L 709.460938 646.5 L 702.460938 646.5 Z M 695.660156 626.503906 L 688.121094 604.15625 L 680.042969 626.503906 Z M 695.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 667 477 L 706 477 M 667 438 L 706 438 M 667 438 L 667 477 M 706 438 L 706 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 667 477 L 706 477 M 667 438 L 706 438 M 706 477 L 706 438 M 667 477 L 667 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/edfxbp/sky130_fd_sc_lp__edfxbp_1.svg b/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.svg
index c348598..c7a21ca 100644
--- a/cells/edfxbp/sky130_fd_sc_lp__edfxbp_1.svg
+++ b/cells/edfxbp/sky130_fd_sc_lp__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 1455.5 535.5 L 1625.5 535.5 L 1625.5 537.5 L 1455.5 537.5 Z M 1455.5 535.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 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="#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 242.5 571.5 L 258.5 571.5 L 258.5 616.5 L 242.5 616.5 Z M 1368.5 591.5 L 1384.5 591.5 L 1384.5 636.5 L 1368.5 636.5 Z M 1486.5 591.5 L 1502.5 591.5 L 1502.5 636.5 L 1486.5 636.5 Z M 1174.5 591.5 L 1190.5 591.5 L 1190.5 636.5 L 1174.5 636.5 Z M 543.5 607.5 L 559.5 607.5 L 559.5 651.5 L 543.5 651.5 Z M 498.5 607.5 L 514.5 607.5 L 514.5 651.5 L 498.5 651.5 Z M 1053.5 615.5 L 1068.5 615.5 L 1068.5 660.5 L 1053.5 660.5 Z M 978.5 615.5 L 994.5 615.5 L 994.5 660.5 L 978.5 660.5 Z M 761.5 618.5 L 776.5 618.5 L 776.5 663.5 L 761.5 663.5 Z M 711.5 618.5 L 727.5 618.5 L 727.5 663.5 L 711.5 663.5 Z M 661.5 618.5 L 677.5 618.5 L 677.5 663.5 L 661.5 663.5 Z M 1276.5 591.5 L 1292.5 591.5 L 1292.5 681.5 L 1276.5 681.5 Z M 1548.5 591.5 L 1564.5 591.5 L 1564.5 681.5 L 1548.5 681.5 Z M 1232.5 591.5 L 1248.5 591.5 L 1248.5 681.5 L 1232.5 681.5 Z M 393.5 638.5 L 409.5 638.5 L 409.5 683.5 L 393.5 683.5 Z M 347.5 638.5 L 363.5 638.5 L 363.5 683.5 L 347.5 683.5 Z M 1664.5 597.5 L 1679.5 597.5 L 1679.5 686.5 L 1664.5 686.5 Z M 827.5 618.5 L 843.5 618.5 L 843.5 686.5 L 827.5 686.5 Z M 827.5 618.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 242.5 388.5 L 258.5 388.5 L 258.5 456.5 L 242.5 456.5 Z M 805.5 424.5 L 821.5 424.5 L 821.5 468.5 L 805.5 468.5 Z M 376.5 442.5 L 392.5 442.5 L 392.5 486.5 L 376.5 486.5 Z M 506.5 442.5 L 522.5 442.5 L 522.5 486.5 L 506.5 486.5 Z M 460.5 442.5 L 476.5 442.5 L 476.5 486.5 L 460.5 486.5 Z M 422.5 442.5 L 438.5 442.5 L 438.5 486.5 L 422.5 486.5 Z M 1384.5 445.5 L 1400.5 445.5 L 1400.5 490.5 L 1384.5 490.5 Z M 1066.5 433.5 L 1082.5 433.5 L 1082.5 501.5 L 1066.5 501.5 Z M 657.5 456.5 L 673.5 456.5 L 673.5 501.5 L 657.5 501.5 Z M 963.5 433.5 L 979.5 433.5 L 979.5 501.5 L 963.5 501.5 Z M 703.5 456.5 L 719.5 456.5 L 719.5 501.5 L 703.5 501.5 Z M 1225.5 460.5 L 1240.5 460.5 L 1240.5 505.5 L 1225.5 505.5 Z M 861.5 424.5 L 877.5 424.5 L 877.5 513.5 L 861.5 513.5 Z M 1326.5 382.5 L 1342.5 382.5 L 1342.5 516.5 L 1326.5 516.5 Z M 1664.5 382.5 L 1680.5 382.5 L 1680.5 516.5 L 1664.5 516.5 Z M 1168.5 382.5 L 1184.5 382.5 L 1184.5 516.5 L 1168.5 516.5 Z M 1560.5 384.5 L 1576.5 384.5 L 1576.5 518.5 L 1560.5 518.5 Z M 1503.5 450.5 L 1519.5 450.5 L 1519.5 518.5 L 1503.5 518.5 Z M 1503.5 450.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 1485.5 486.5 L 1503.5 486.5 L 1503.5 492.5 L 1485.5 492.5 Z M 1485.5 492.5 L 1503.5 492.5 L 1503.5 504.5 L 1485.5 504.5 Z M 567.5 486.5 L 585.5 486.5 L 585.5 504.5 L 567.5 504.5 Z M 720.5 525.5 L 738.5 525.5 L 738.5 530.5 L 720.5 530.5 Z M 720.5 530.5 L 738.5 530.5 L 738.5 543.5 L 720.5 543.5 Z M 1077.5 525.5 L 1095.5 525.5 L 1095.5 543.5 L 1077.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="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>
@@ -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 949.179688 576.921875 L 949.179688 584.789062 L 946.308594 584.789062 L 946.308594 562.296875 L 949.179688 562.296875 L 949.179688 573.683594 L 960.378906 562.296875 L 964.082031 562.296875 L 954.917969 571.460938 L 964.175781 584.789062 L 960.78125 584.789062 L 952.851562 573.25 Z M 949.179688 576.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 924 515 L 942 515 M 924 497 L 942 497 M 924 497 L 924 515 M 942 497 L 942 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 924 515 L 942 515 M 924 497 L 942 497 M 942 515 L 942 497 M 924 515 L 924 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/einvn/sky130_fd_sc_lp__einvn_0.svg b/cells/einvn/sky130_fd_sc_lp__einvn_0.svg
index 6a24fc3..f186e3e 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_0.svg
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image335"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1056.5 660.5 L 1090.5 660.5 L 1090.5 757.5 L 1056.5 757.5 Z M 837.5 660.5 L 871.5 660.5 L 871.5 757.5 L 837.5 757.5 Z M 967.5 660.5 L 1001.5 660.5 L 1001.5 757.5 L 967.5 757.5 Z M 967.5 660.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1056.5 220.5 L 1090.5 220.5 L 1090.5 367.5 L 1056.5 367.5 Z M 846.5 271.5 L 881.5 271.5 L 881.5 367.5 L 846.5 367.5 Z M 967.5 220.5 L 1001.5 220.5 L 1001.5 367.5 L 967.5 367.5 Z M 967.5 220.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface359">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1149.613281 258.421875 L 1149.613281 264.078125 L 1120.261719 301.980469 L 1149.75 301.980469 L 1149.75 307.5 L 1112.386719 307.5 L 1112.386719 301.980469 L 1141.871094 263.941406 L 1114.269531 263.941406 L 1114.269531 258.421875 Z M 1149.613281 258.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 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/einvn/sky130_fd_sc_lp__einvn_1.svg b/cells/einvn/sky130_fd_sc_lp__einvn_1.svg
index e2adcde..9bd53e1 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_1.svg
+++ b/cells/einvn/sky130_fd_sc_lp__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 539.5 L 644.5 539.5 Z M 644.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="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image314"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1090.5 619.5 L 1125.5 619.5 L 1125.5 715.5 L 1090.5 715.5 Z M 844.5 642.5 L 878.5 642.5 L 878.5 835.5 L 844.5 835.5 Z M 933.5 642.5 L 968.5 642.5 L 968.5 835.5 L 933.5 835.5 Z M 933.5 642.5 "/>
 </clipPath>
-<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1072.5 335.5 L 1106.5 335.5 L 1106.5 482.5 L 1072.5 482.5 Z M 844.5 209.5 L 878.5 209.5 L 878.5 498.5 L 844.5 498.5 Z M 933.5 209.5 L 968.5 209.5 L 968.5 498.5 L 933.5 498.5 Z M 933.5 209.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface338">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 873.613281 258.421875 L 873.613281 264.078125 L 844.261719 301.980469 L 873.75 301.980469 L 873.75 307.5 L 836.386719 307.5 L 836.386719 301.980469 L 865.871094 263.941406 L 838.269531 263.941406 L 838.269531 258.421875 Z M 873.613281 258.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 834 816 L 873 816 M 834 777 L 873 777 M 834 777 L 834 816 M 873 777 L 873 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 834 816 L 873 816 M 834 777 L 873 777 M 873 816 L 873 777 M 834 816 L 834 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/einvn/sky130_fd_sc_lp__einvn_2.svg b/cells/einvn/sky130_fd_sc_lp__einvn_2.svg
index 4033866..d1b0424 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_2.svg
+++ b/cells/einvn/sky130_fd_sc_lp__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 539.5 L 533.5 539.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 674.5 751.5 L 709.5 751.5 L 709.5 847.5 L 674.5 847.5 Z M 925.5 672.5 L 960.5 672.5 L 960.5 864.5 L 925.5 864.5 Z M 1221.5 672.5 L 1255.5 672.5 L 1255.5 864.5 L 1221.5 864.5 Z M 1024.5 672.5 L 1058.5 672.5 L 1058.5 864.5 L 1024.5 864.5 Z M 1122.5 672.5 L 1157.5 672.5 L 1157.5 864.5 L 1122.5 864.5 Z M 1122.5 672.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 1122.5 209.5 L 1157.5 209.5 L 1157.5 498.5 L 1122.5 498.5 Z M 674.5 351.5 L 709.5 351.5 L 709.5 498.5 L 674.5 498.5 Z M 1221.5 209.5 L 1255.5 209.5 L 1255.5 498.5 L 1221.5 498.5 Z M 893.5 209.5 L 928.5 209.5 L 928.5 498.5 L 893.5 498.5 Z M 795.5 209.5 L 829.5 209.5 L 829.5 498.5 L 795.5 498.5 Z M 795.5 209.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1302.410156 631.757812 L 1283.492188 631.757812 L 1278.308594 646.5 L 1271.644531 646.5 L 1289.148438 597.421875 L 1297.226562 597.421875 L 1314.460938 646.5 L 1307.460938 646.5 Z M 1300.660156 626.503906 L 1293.121094 604.15625 L 1285.042969 626.503906 Z M 1300.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 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/einvn/sky130_fd_sc_lp__einvn_4.svg b/cells/einvn/sky130_fd_sc_lp__einvn_4.svg
index 4ea14ea..1aacea5 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_4.svg
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 256.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 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="#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 460.5 647.5 L 494.5 647.5 L 494.5 839.5 L 460.5 839.5 Z M 577.5 647.5 L 611.5 647.5 L 611.5 839.5 L 577.5 839.5 Z M 792.5 647.5 L 827.5 647.5 L 827.5 839.5 L 792.5 839.5 Z M 675.5 647.5 L 710.5 647.5 L 710.5 839.5 L 675.5 839.5 Z M 1196.5 672.5 L 1230.5 672.5 L 1230.5 864.5 L 1196.5 864.5 Z M 1097.5 672.5 L 1132.5 672.5 L 1132.5 864.5 L 1097.5 864.5 Z M 1491.5 672.5 L 1526.5 672.5 L 1526.5 864.5 L 1491.5 864.5 Z M 1294.5 672.5 L 1329.5 672.5 L 1329.5 864.5 L 1294.5 864.5 Z M 1393.5 672.5 L 1427.5 672.5 L 1427.5 864.5 L 1393.5 864.5 Z M 1393.5 672.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 1491.5 209.5 L 1526.5 209.5 L 1526.5 498.5 L 1491.5 498.5 Z M 460.5 209.5 L 494.5 209.5 L 494.5 498.5 L 460.5 498.5 Z M 577.5 209.5 L 611.5 209.5 L 611.5 498.5 L 577.5 498.5 Z M 675.5 209.5 L 710.5 209.5 L 710.5 498.5 L 675.5 498.5 Z M 792.5 209.5 L 827.5 209.5 L 827.5 498.5 L 792.5 498.5 Z M 891.5 209.5 L 925.5 209.5 L 925.5 498.5 L 891.5 498.5 Z M 989.5 209.5 L 1024.5 209.5 L 1024.5 498.5 L 989.5 498.5 Z M 1088.5 209.5 L 1122.5 209.5 L 1122.5 498.5 L 1088.5 498.5 Z M 1187.5 209.5 L 1221.5 209.5 L 1221.5 498.5 L 1187.5 498.5 Z M 1187.5 209.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 695.410156 546.757812 L 676.492188 546.757812 L 671.308594 561.5 L 664.644531 561.5 L 682.148438 512.421875 L 690.226562 512.421875 L 707.460938 561.5 L 700.460938 561.5 Z M 693.660156 541.503906 L 686.121094 519.15625 L 678.042969 541.503906 Z M 693.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 665 562 L 704 562 M 665 523 L 704 523 M 665 523 L 665 562 M 704 523 L 704 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 665 562 L 704 562 M 665 523 L 704 523 M 704 562 L 704 523 M 665 562 L 665 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/einvn/sky130_fd_sc_lp__einvn_8.svg b/cells/einvn/sky130_fd_sc_lp__einvn_8.svg
index d6801c2..8f79174 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_8.svg
+++ b/cells/einvn/sky130_fd_sc_lp__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 537.5 L 175.5 537.5 Z M 175.5 229.5 "/>
 </clipPath>
-<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image351"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image351"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 272.5 624.5 L 297.5 624.5 L 297.5 763.5 L 272.5 763.5 Z M 502.5 633.5 L 526.5 633.5 L 526.5 771.5 L 502.5 771.5 Z M 573.5 633.5 L 597.5 633.5 L 597.5 771.5 L 573.5 771.5 Z M 644.5 633.5 L 668.5 633.5 L 668.5 771.5 L 644.5 771.5 Z M 715.5 633.5 L 739.5 633.5 L 739.5 771.5 L 715.5 771.5 Z M 786.5 633.5 L 810.5 633.5 L 810.5 771.5 L 786.5 771.5 Z M 857.5 633.5 L 881.5 633.5 L 881.5 771.5 L 857.5 771.5 Z M 928.5 633.5 L 952.5 633.5 L 952.5 771.5 L 928.5 771.5 Z M 999.5 633.5 L 1023.5 633.5 L 1023.5 771.5 L 999.5 771.5 Z M 1070.5 633.5 L 1094.5 633.5 L 1094.5 771.5 L 1070.5 771.5 Z M 1141.5 633.5 L 1165.5 633.5 L 1165.5 771.5 L 1141.5 771.5 Z M 1212.5 633.5 L 1236.5 633.5 L 1236.5 771.5 L 1212.5 771.5 Z M 1283.5 633.5 L 1307.5 633.5 L 1307.5 771.5 L 1283.5 771.5 Z M 1354.5 633.5 L 1378.5 633.5 L 1378.5 771.5 L 1354.5 771.5 Z M 1425.5 633.5 L 1449.5 633.5 L 1449.5 771.5 L 1425.5 771.5 Z M 1496.5 633.5 L 1521.5 633.5 L 1521.5 771.5 L 1496.5 771.5 Z M 1567.5 633.5 L 1592.5 633.5 L 1592.5 771.5 L 1567.5 771.5 Z M 1567.5 633.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1567.5 299.5 L 1592.5 299.5 L 1592.5 507.5 L 1567.5 507.5 Z M 345.5 299.5 L 370.5 299.5 L 370.5 507.5 L 345.5 507.5 Z M 502.5 299.5 L 526.5 299.5 L 526.5 507.5 L 502.5 507.5 Z M 573.5 299.5 L 597.5 299.5 L 597.5 507.5 L 573.5 507.5 Z M 644.5 299.5 L 668.5 299.5 L 668.5 507.5 L 644.5 507.5 Z M 715.5 299.5 L 739.5 299.5 L 739.5 507.5 L 715.5 507.5 Z M 786.5 299.5 L 810.5 299.5 L 810.5 507.5 L 786.5 507.5 Z M 857.5 299.5 L 881.5 299.5 L 881.5 507.5 L 857.5 507.5 Z M 928.5 299.5 L 952.5 299.5 L 952.5 507.5 L 928.5 507.5 Z M 999.5 299.5 L 1023.5 299.5 L 1023.5 507.5 L 999.5 507.5 Z M 1070.5 299.5 L 1094.5 299.5 L 1094.5 507.5 L 1070.5 507.5 Z M 1141.5 299.5 L 1165.5 299.5 L 1165.5 507.5 L 1141.5 507.5 Z M 1212.5 299.5 L 1236.5 299.5 L 1236.5 507.5 L 1212.5 507.5 Z M 1283.5 299.5 L 1307.5 299.5 L 1307.5 507.5 L 1283.5 507.5 Z M 1354.5 299.5 L 1378.5 299.5 L 1378.5 507.5 L 1354.5 507.5 Z M 1425.5 299.5 L 1449.5 299.5 L 1449.5 507.5 L 1425.5 507.5 Z M 1496.5 299.5 L 1521.5 299.5 L 1521.5 507.5 L 1496.5 507.5 Z M 1496.5 299.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface348">
+<g id="surface376">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1125.769531 603.75 L 1111.972656 603.75 L 1108.195312 614.5 L 1103.335938 614.5 L 1116.097656 578.714844 L 1121.988281 578.714844 L 1134.554688 614.5 L 1129.449219 614.5 Z M 1124.492188 599.921875 L 1118.992188 583.625 L 1113.101562 599.921875 Z M 1124.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 1104 497 L 1132 497 M 1104 469 L 1132 469 M 1104 469 L 1104 497 M 1132 469 L 1132 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 1104 497 L 1132 497 M 1104 469 L 1132 469 M 1132 497 L 1132 469 M 1104 497 L 1104 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/einvn/sky130_fd_sc_lp__einvn_lp.svg b/cells/einvn/sky130_fd_sc_lp__einvn_lp.svg
index 4135e0f..1f20323 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_lp.svg
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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="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="#image299"/>
+  <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 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="#image299"/>
+  <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 1088.5 652.5 L 1122.5 652.5 L 1122.5 749.5 L 1088.5 749.5 Z M 785.5 652.5 L 820.5 652.5 L 820.5 749.5 L 785.5 749.5 Z M 868.5 652.5 L 902.5 652.5 L 902.5 749.5 L 868.5 749.5 Z M 979.5 652.5 L 1013.5 652.5 L 1013.5 749.5 L 979.5 749.5 Z M 979.5 652.5 "/>
 </clipPath>
-<image id="image300" 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="#image300"/>
+  <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 1032.5 215.5 L 1089.5 215.5 L 1089.5 444.5 L 1032.5 444.5 Z M 798.5 215.5 L 855.5 215.5 L 855.5 444.5 L 798.5 444.5 Z M 920.5 215.5 L 977.5 215.5 L 977.5 444.5 L 920.5 444.5 Z M 920.5 215.5 "/>
 </clipPath>
-<image id="image301" 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="#image301"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image302" 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="#image302"/>
+  <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="surface296">
+<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 1203.613281 258.421875 L 1203.613281 264.078125 L 1174.261719 301.980469 L 1203.75 301.980469 L 1203.75 307.5 L 1166.386719 307.5 L 1166.386719 301.980469 L 1195.871094 263.941406 L 1168.269531 263.941406 L 1168.269531 258.421875 Z M 1203.613281 258.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 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/einvn/sky130_fd_sc_lp__einvn_m.svg b/cells/einvn/sky130_fd_sc_lp__einvn_m.svg
index 69094e7..f584c27 100644
--- a/cells/einvn/sky130_fd_sc_lp__einvn_m.svg
+++ b/cells/einvn/sky130_fd_sc_lp__einvn_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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 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="#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 1058.5 645.5 L 1093.5 645.5 L 1093.5 742.5 L 1058.5 742.5 Z M 859.5 645.5 L 893.5 645.5 L 893.5 742.5 L 859.5 742.5 Z M 960.5 645.5 L 994.5 645.5 L 994.5 742.5 L 960.5 742.5 Z M 960.5 645.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 1058.5 209.5 L 1093.5 209.5 L 1093.5 305.5 L 1058.5 305.5 Z M 877.5 209.5 L 911.5 209.5 L 911.5 305.5 L 877.5 305.5 Z M 976.5 209.5 L 1010.5 209.5 L 1010.5 305.5 L 976.5 305.5 Z M 976.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1149.613281 258.421875 L 1149.613281 264.078125 L 1120.261719 301.980469 L 1149.75 301.980469 L 1149.75 307.5 L 1112.386719 307.5 L 1112.386719 301.980469 L 1141.871094 263.941406 L 1114.269531 263.941406 L 1114.269531 258.421875 Z M 1149.613281 258.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 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/einvp/sky130_fd_sc_lp__einvp_0.svg b/cells/einvp/sky130_fd_sc_lp__einvp_0.svg
index ca4ab0a..d86374c 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_0.svg
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image302" 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="#image302"/>
+  <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 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="#image302"/>
+  <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 1030.5 742.5 L 1064.5 742.5 L 1064.5 838.5 L 1030.5 838.5 Z M 842.5 742.5 L 876.5 742.5 L 876.5 838.5 L 842.5 838.5 Z M 940.5 742.5 L 975.5 742.5 L 975.5 838.5 L 940.5 838.5 Z M 940.5 742.5 "/>
 </clipPath>
-<image id="image303" 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="#image303"/>
+  <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 842.5 217.5 L 876.5 217.5 L 876.5 313.5 L 842.5 313.5 Z M 1051.5 217.5 L 1086.5 217.5 L 1086.5 364.5 L 1051.5 364.5 Z M 962.5 217.5 L 996.5 217.5 L 996.5 364.5 L 962.5 364.5 Z M 962.5 217.5 "/>
 </clipPath>
-<image id="image304" 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="#image304"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image305" 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="#image305"/>
+  <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="surface299">
+<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 1149.613281 258.421875 L 1149.613281 264.078125 L 1120.261719 301.980469 L 1149.75 301.980469 L 1149.75 307.5 L 1112.386719 307.5 L 1112.386719 301.980469 L 1141.871094 263.941406 L 1114.269531 263.941406 L 1114.269531 258.421875 Z M 1149.613281 258.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 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/einvp/sky130_fd_sc_lp__einvp_1.svg b/cells/einvp/sky130_fd_sc_lp__einvp_1.svg
index 2c3e78c..dcecbb3 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_1.svg
+++ b/cells/einvp/sky130_fd_sc_lp__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 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image305"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1101.5 672.5 L 1135.5 672.5 L 1135.5 768.5 L 1101.5 768.5 Z M 800.5 672.5 L 835.5 672.5 L 835.5 864.5 L 800.5 864.5 Z M 890.5 672.5 L 924.5 672.5 L 924.5 864.5 L 890.5 864.5 Z M 890.5 672.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 838.5 231.5 L 873.5 231.5 L 873.5 460.5 L 838.5 460.5 Z M 1049.5 364.5 L 1083.5 364.5 L 1083.5 460.5 L 1049.5 460.5 Z M 925.5 231.5 L 960.5 231.5 L 960.5 460.5 L 925.5 460.5 Z M 925.5 231.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface329">
 <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 753.410156 546.757812 L 734.492188 546.757812 L 729.308594 561.5 L 722.644531 561.5 L 740.148438 512.421875 L 748.226562 512.421875 L 765.460938 561.5 L 758.460938 561.5 Z M 751.660156 541.503906 L 744.121094 519.15625 L 736.042969 541.503906 Z M 751.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 724 562 L 763 562 M 724 523 L 763 523 M 724 523 L 724 562 M 763 523 L 763 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 724 562 L 763 562 M 724 523 L 763 523 M 763 562 L 763 523 M 724 562 L 724 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_lp__einvp_2.svg b/cells/einvp/sky130_fd_sc_lp__einvp_2.svg
index 80bfe2e..3c41181 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_2.svg
+++ b/cells/einvp/sky130_fd_sc_lp__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 539.5 L 533.5 539.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 672.5 672.5 L 706.5 672.5 L 706.5 768.5 L 672.5 768.5 Z M 1120.5 647.5 L 1154.5 647.5 L 1154.5 839.5 L 1120.5 839.5 Z M 1219.5 647.5 L 1253.5 647.5 L 1253.5 839.5 L 1219.5 839.5 Z M 891.5 672.5 L 925.5 672.5 L 925.5 864.5 L 891.5 864.5 Z M 792.5 672.5 L 827.5 672.5 L 827.5 864.5 L 792.5 864.5 Z M 792.5 672.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 1120.5 209.5 L 1154.5 209.5 L 1154.5 498.5 L 1120.5 498.5 Z M 672.5 351.5 L 706.5 351.5 L 706.5 498.5 L 672.5 498.5 Z M 1219.5 209.5 L 1253.5 209.5 L 1253.5 498.5 L 1219.5 498.5 Z M 1022.5 209.5 L 1056.5 209.5 L 1056.5 498.5 L 1022.5 498.5 Z M 923.5 209.5 L 957.5 209.5 L 957.5 498.5 L 923.5 498.5 Z M 923.5 209.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 644.886719 285.148438 L 644.886719 301.980469 L 673.832031 301.980469 L 673.832031 307.5 L 638.625 307.5 L 638.625 258.421875 L 672.621094 258.421875 L 672.621094 263.941406 L 644.886719 263.941406 L 644.886719 279.628906 L 671.613281 279.628906 L 671.613281 285.148438 Z M 644.886719 285.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 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/einvp/sky130_fd_sc_lp__einvp_4.svg b/cells/einvp/sky130_fd_sc_lp__einvp_4.svg
index 4be82f7..255d5b0 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_4.svg
+++ b/cells/einvp/sky130_fd_sc_lp__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 539.5 L 256.5 539.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 1278.5 647.5 L 1313.5 647.5 L 1313.5 839.5 L 1278.5 839.5 Z M 1395.5 647.5 L 1429.5 647.5 L 1429.5 839.5 L 1395.5 839.5 Z M 1180.5 647.5 L 1214.5 647.5 L 1214.5 839.5 L 1180.5 839.5 Z M 1494.5 647.5 L 1528.5 647.5 L 1528.5 839.5 L 1494.5 839.5 Z M 696.5 672.5 L 730.5 672.5 L 730.5 864.5 L 696.5 864.5 Z M 795.5 672.5 L 829.5 672.5 L 829.5 864.5 L 795.5 864.5 Z M 598.5 672.5 L 632.5 672.5 L 632.5 864.5 L 598.5 864.5 Z M 400.5 672.5 L 435.5 672.5 L 435.5 864.5 L 400.5 864.5 Z M 499.5 672.5 L 533.5 672.5 L 533.5 864.5 L 499.5 864.5 Z M 499.5 672.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 1494.5 209.5 L 1528.5 209.5 L 1528.5 498.5 L 1494.5 498.5 Z M 400.5 209.5 L 435.5 209.5 L 435.5 498.5 L 400.5 498.5 Z M 705.5 209.5 L 740.5 209.5 L 740.5 498.5 L 705.5 498.5 Z M 804.5 209.5 L 838.5 209.5 L 838.5 498.5 L 804.5 498.5 Z M 902.5 209.5 L 937.5 209.5 L 937.5 498.5 L 902.5 498.5 Z M 1001.5 209.5 L 1035.5 209.5 L 1035.5 498.5 L 1001.5 498.5 Z M 1180.5 209.5 L 1214.5 209.5 L 1214.5 498.5 L 1180.5 498.5 Z M 1278.5 209.5 L 1313.5 209.5 L 1313.5 498.5 L 1278.5 498.5 Z M 1395.5 209.5 L 1429.5 209.5 L 1429.5 498.5 L 1395.5 498.5 Z M 1395.5 209.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1027.886719 624.148438 L 1027.886719 640.980469 L 1056.832031 640.980469 L 1056.832031 646.5 L 1021.625 646.5 L 1021.625 597.421875 L 1055.621094 597.421875 L 1055.621094 602.941406 L 1027.886719 602.941406 L 1027.886719 618.628906 L 1054.613281 618.628906 L 1054.613281 624.148438 Z M 1027.886719 624.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 995 477 L 1034 477 M 995 438 L 1034 438 M 995 438 L 995 477 M 1034 438 L 1034 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 995 477 L 1034 477 M 995 438 L 1034 438 M 1034 477 L 1034 438 M 995 477 L 995 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/einvp/sky130_fd_sc_lp__einvp_8.svg b/cells/einvp/sky130_fd_sc_lp__einvp_8.svg
index e0c85cd..43af10d 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_8.svg
+++ b/cells/einvp/sky130_fd_sc_lp__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 537.5 L 175.5 537.5 Z M 175.5 229.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 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="#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 348.5 615.5 L 373.5 615.5 L 373.5 753.5 L 348.5 753.5 Z M 1621.5 633.5 L 1646.5 633.5 L 1646.5 771.5 L 1621.5 771.5 Z M 1550.5 633.5 L 1575.5 633.5 L 1575.5 771.5 L 1550.5 771.5 Z M 1479.5 633.5 L 1504.5 633.5 L 1504.5 771.5 L 1479.5 771.5 Z M 1408.5 633.5 L 1433.5 633.5 L 1433.5 771.5 L 1408.5 771.5 Z M 1337.5 633.5 L 1362.5 633.5 L 1362.5 771.5 L 1337.5 771.5 Z M 1266.5 633.5 L 1291.5 633.5 L 1291.5 771.5 L 1266.5 771.5 Z M 1195.5 633.5 L 1220.5 633.5 L 1220.5 771.5 L 1195.5 771.5 Z M 1124.5 633.5 L 1149.5 633.5 L 1149.5 771.5 L 1124.5 771.5 Z M 1053.5 633.5 L 1078.5 633.5 L 1078.5 771.5 L 1053.5 771.5 Z M 982.5 633.5 L 1007.5 633.5 L 1007.5 771.5 L 982.5 771.5 Z M 911.5 633.5 L 936.5 633.5 L 936.5 771.5 L 911.5 771.5 Z M 840.5 633.5 L 865.5 633.5 L 865.5 771.5 L 840.5 771.5 Z M 769.5 633.5 L 794.5 633.5 L 794.5 771.5 L 769.5 771.5 Z M 698.5 633.5 L 723.5 633.5 L 723.5 771.5 L 698.5 771.5 Z M 627.5 633.5 L 652.5 633.5 L 652.5 771.5 L 627.5 771.5 Z M 556.5 633.5 L 581.5 633.5 L 581.5 771.5 L 556.5 771.5 Z M 556.5 633.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 1616.5 299.5 L 1641.5 299.5 L 1641.5 507.5 L 1616.5 507.5 Z M 332.5 299.5 L 356.5 299.5 L 356.5 507.5 L 332.5 507.5 Z M 551.5 299.5 L 576.5 299.5 L 576.5 507.5 L 551.5 507.5 Z M 622.5 299.5 L 647.5 299.5 L 647.5 507.5 L 622.5 507.5 Z M 693.5 299.5 L 718.5 299.5 L 718.5 507.5 L 693.5 507.5 Z M 764.5 299.5 L 789.5 299.5 L 789.5 507.5 L 764.5 507.5 Z M 835.5 299.5 L 860.5 299.5 L 860.5 507.5 L 835.5 507.5 Z M 906.5 299.5 L 931.5 299.5 L 931.5 507.5 L 906.5 507.5 Z M 977.5 299.5 L 1002.5 299.5 L 1002.5 507.5 L 977.5 507.5 Z M 1048.5 299.5 L 1073.5 299.5 L 1073.5 507.5 L 1048.5 507.5 Z M 1119.5 299.5 L 1144.5 299.5 L 1144.5 507.5 L 1119.5 507.5 Z M 1190.5 299.5 L 1215.5 299.5 L 1215.5 507.5 L 1190.5 507.5 Z M 1261.5 299.5 L 1286.5 299.5 L 1286.5 507.5 L 1261.5 507.5 Z M 1332.5 299.5 L 1357.5 299.5 L 1357.5 507.5 L 1332.5 507.5 Z M 1403.5 299.5 L 1428.5 299.5 L 1428.5 507.5 L 1403.5 507.5 Z M 1474.5 299.5 L 1499.5 299.5 L 1499.5 507.5 L 1474.5 507.5 Z M 1545.5 299.5 L 1570.5 299.5 L 1570.5 507.5 L 1545.5 507.5 Z M 1545.5 299.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface300">
+<g id="surface328">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -162,6 +162,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1283.769531 603.75 L 1269.972656 603.75 L 1266.195312 614.5 L 1261.335938 614.5 L 1274.097656 578.714844 L 1279.988281 578.714844 L 1292.554688 614.5 L 1287.449219 614.5 Z M 1282.492188 599.921875 L 1276.992188 583.625 L 1271.101562 599.921875 Z M 1282.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 1262 497 L 1290 497 M 1262 469 L 1290 469 M 1262 469 L 1262 497 M 1290 469 L 1290 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 1262 497 L 1290 497 M 1262 469 L 1290 469 M 1290 497 L 1290 469 M 1262 497 L 1262 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/einvp/sky130_fd_sc_lp__einvp_lp.svg b/cells/einvp/sky130_fd_sc_lp__einvp_lp.svg
index 6ffc268..5972af7 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_lp.svg
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image305"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 807.5 660.5 L 842.5 660.5 L 842.5 757.5 L 807.5 757.5 Z M 897.5 660.5 L 931.5 660.5 L 931.5 757.5 L 897.5 757.5 Z M 1013.5 706.5 L 1048.5 706.5 L 1048.5 802.5 L 1013.5 802.5 Z M 1096.5 706.5 L 1130.5 706.5 L 1130.5 802.5 L 1096.5 802.5 Z M 1096.5 706.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1083.5 209.5 L 1141.5 209.5 L 1141.5 438.5 L 1083.5 438.5 Z M 784.5 209.5 L 842.5 209.5 L 842.5 438.5 L 784.5 438.5 Z M 897.5 209.5 L 954.5 209.5 L 954.5 438.5 L 897.5 438.5 Z M 897.5 209.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface329">
 <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 763.613281 258.421875 L 763.613281 264.078125 L 734.261719 301.980469 L 763.75 301.980469 L 763.75 307.5 L 726.386719 307.5 L 726.386719 301.980469 L 755.871094 263.941406 L 728.269531 263.941406 L 728.269531 258.421875 Z M 763.613281 258.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 724 816 L 763 816 M 724 777 L 763 777 M 724 777 L 724 816 M 763 777 L 763 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 724 816 L 763 816 M 724 777 L 763 777 M 763 816 L 763 777 M 724 816 L 724 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/einvp/sky130_fd_sc_lp__einvp_m.svg b/cells/einvp/sky130_fd_sc_lp__einvp_m.svg
index df06d5f..632ddd4 100644
--- a/cells/einvp/sky130_fd_sc_lp__einvp_m.svg
+++ b/cells/einvp/sky130_fd_sc_lp__einvp_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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="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="#image300"/>
+  <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 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="#image300"/>
+  <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 1052.5 674.5 L 1087.5 674.5 L 1087.5 770.5 L 1052.5 770.5 Z M 853.5 674.5 L 887.5 674.5 L 887.5 770.5 L 853.5 770.5 Z M 970.5 674.5 L 1004.5 674.5 L 1004.5 770.5 L 970.5 770.5 Z M 970.5 674.5 "/>
 </clipPath>
-<image id="image301" 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="#image301"/>
+  <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 1052.5 209.5 L 1087.5 209.5 L 1087.5 305.5 L 1052.5 305.5 Z M 871.5 209.5 L 906.5 209.5 L 906.5 305.5 L 871.5 305.5 Z M 970.5 209.5 L 1004.5 209.5 L 1004.5 305.5 L 970.5 305.5 Z M 970.5 209.5 "/>
 </clipPath>
-<image id="image302" 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="#image302"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image303" 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="#image303"/>
+  <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="surface297">
+<g id="surface324">
 <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 921.886719 793.148438 L 921.886719 809.980469 L 950.832031 809.980469 L 950.832031 815.5 L 915.625 815.5 L 915.625 766.421875 L 949.621094 766.421875 L 949.621094 771.941406 L 921.886719 771.941406 L 921.886719 787.628906 L 948.613281 787.628906 L 948.613281 793.148438 Z M 921.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 890 307 L 929 307 M 890 269 L 929 269 M 890 269 L 890 307 M 929 269 L 929 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 890 307 L 929 307 M 890 269 L 929 269 M 929 307 L 929 269 M 890 307 L 890 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 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/fa/sky130_fd_sc_lp__fa_0.svg b/cells/fa/sky130_fd_sc_lp__fa_0.svg
index 8b6a50d..22fb9e2 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_0.svg
+++ b/cells/fa/sky130_fd_sc_lp__fa_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" 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="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="#image392"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 316.5 662.5 L 346.5 662.5 L 346.5 744.5 L 316.5 744.5 Z M 400.5 662.5 L 429.5 662.5 L 429.5 744.5 L 400.5 744.5 Z M 554.5 662.5 L 583.5 662.5 L 583.5 744.5 L 554.5 744.5 Z M 1388.5 662.5 L 1417.5 662.5 L 1417.5 744.5 L 1388.5 744.5 Z M 1296.5 662.5 L 1326.5 662.5 L 1326.5 744.5 L 1296.5 744.5 Z M 1213.5 662.5 L 1242.5 662.5 L 1242.5 744.5 L 1213.5 744.5 Z M 1026.5 662.5 L 1055.5 662.5 L 1055.5 744.5 L 1026.5 744.5 Z M 1129.5 662.5 L 1158.5 662.5 L 1158.5 744.5 L 1129.5 744.5 Z M 942.5 662.5 L 971.5 662.5 L 971.5 744.5 L 942.5 744.5 Z M 752.5 662.5 L 782.5 662.5 L 782.5 744.5 L 752.5 744.5 Z M 645.5 662.5 L 674.5 662.5 L 674.5 744.5 L 645.5 744.5 Z M 470.5 662.5 L 499.5 662.5 L 499.5 744.5 L 470.5 744.5 Z M 1489.5 719.5 L 1518.5 719.5 L 1518.5 801.5 L 1489.5 801.5 Z M 1573.5 719.5 L 1602.5 719.5 L 1602.5 801.5 L 1573.5 801.5 Z M 1573.5 719.5 "/>
 </clipPath>
-<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 394.5 260.5 L 423.5 260.5 L 423.5 342.5 L 394.5 342.5 Z M 575.5 260.5 L 604.5 260.5 L 604.5 342.5 L 575.5 342.5 Z M 659.5 260.5 L 688.5 260.5 L 688.5 342.5 L 659.5 342.5 Z M 470.5 260.5 L 499.5 260.5 L 499.5 342.5 L 470.5 342.5 Z M 750.5 260.5 L 780.5 260.5 L 780.5 342.5 L 750.5 342.5 Z M 289.5 260.5 L 318.5 260.5 L 318.5 385.5 L 289.5 385.5 Z M 1129.5 333.5 L 1158.5 333.5 L 1158.5 415.5 L 1129.5 415.5 Z M 942.5 333.5 L 971.5 333.5 L 971.5 415.5 L 942.5 415.5 Z M 1599.5 291.5 L 1628.5 291.5 L 1628.5 415.5 L 1599.5 415.5 Z M 1388.5 333.5 L 1417.5 333.5 L 1417.5 415.5 L 1388.5 415.5 Z M 1026.5 333.5 L 1055.5 333.5 L 1055.5 415.5 L 1026.5 415.5 Z M 1493.5 333.5 L 1522.5 333.5 L 1522.5 415.5 L 1493.5 415.5 Z M 1312.5 333.5 L 1341.5 333.5 L 1341.5 415.5 L 1312.5 415.5 Z M 1213.5 333.5 L 1242.5 333.5 L 1242.5 415.5 L 1213.5 415.5 Z M 1213.5 333.5 "/>
 </clipPath>
-<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image394"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface389">
+<g id="surface416">
 <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 961.035156 587.257812 L 961.035156 629.175781 L 954.996094 629.175781 L 933.320312 595.191406 L 933.320312 629.175781 L 928.257812 629.175781 L 928.257812 587.257812 L 934.066406 587.257812 L 955.976562 621.53125 L 955.976562 587.257812 Z M 961.035156 587.257812 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 895 488 L 929 488 M 895 455 L 929 455 M 895 455 L 895 488 M 929 455 L 929 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 895 488 L 929 488 M 895 455 L 929 455 M 929 488 L 929 455 M 895 488 L 895 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/fa/sky130_fd_sc_lp__fa_1.svg b/cells/fa/sky130_fd_sc_lp__fa_1.svg
index bdcfa68..6f09062 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_1.svg
+++ b/cells/fa/sky130_fd_sc_lp__fa_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image386" 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="#image386"/>
+  <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 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="#image386"/>
+  <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 427.5 639.5 L 455.5 639.5 L 455.5 716.5 L 427.5 716.5 Z M 578.5 639.5 L 605.5 639.5 L 605.5 716.5 L 578.5 716.5 Z M 657.5 639.5 L 684.5 639.5 L 684.5 716.5 L 657.5 716.5 Z M 499.5 639.5 L 526.5 639.5 L 526.5 716.5 L 499.5 716.5 Z M 736.5 639.5 L 763.5 639.5 L 763.5 716.5 L 736.5 716.5 Z M 1472.5 650.5 L 1500.5 650.5 L 1500.5 727.5 L 1472.5 727.5 Z M 1367.5 650.5 L 1395.5 650.5 L 1395.5 727.5 L 1367.5 727.5 Z M 1217.5 650.5 L 1244.5 650.5 L 1244.5 727.5 L 1217.5 727.5 Z M 1296.5 650.5 L 1323.5 650.5 L 1323.5 727.5 L 1296.5 727.5 Z M 1095.5 688.5 L 1123.5 688.5 L 1123.5 765.5 L 1095.5 765.5 Z M 933.5 688.5 L 961.5 688.5 L 961.5 765.5 L 933.5 765.5 Z M 1013.5 688.5 L 1041.5 688.5 L 1041.5 765.5 L 1013.5 765.5 Z M 283.5 639.5 L 310.5 639.5 L 310.5 793.5 L 283.5 793.5 Z M 1578.5 644.5 L 1605.5 644.5 L 1605.5 799.5 L 1578.5 799.5 Z M 1578.5 644.5 "/>
 </clipPath>
-<image id="image387" 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="#image387"/>
+  <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 394.5 344.5 L 421.5 344.5 L 421.5 422.5 L 394.5 422.5 Z M 565.5 344.5 L 592.5 344.5 L 592.5 422.5 L 565.5 422.5 Z M 644.5 344.5 L 671.5 344.5 L 671.5 422.5 L 644.5 422.5 Z M 752.5 344.5 L 780.5 344.5 L 780.5 422.5 L 752.5 422.5 Z M 486.5 344.5 L 513.5 344.5 L 513.5 422.5 L 486.5 422.5 Z M 1209.5 387.5 L 1237.5 387.5 L 1237.5 464.5 L 1209.5 464.5 Z M 1130.5 387.5 L 1158.5 387.5 L 1158.5 464.5 L 1130.5 464.5 Z M 1472.5 387.5 L 1500.5 387.5 L 1500.5 464.5 L 1472.5 464.5 Z M 967.5 387.5 L 994.5 387.5 L 994.5 464.5 L 967.5 464.5 Z M 1367.5 387.5 L 1395.5 387.5 L 1395.5 464.5 L 1367.5 464.5 Z M 1051.5 387.5 L 1079.5 387.5 L 1079.5 464.5 L 1051.5 464.5 Z M 1296.5 387.5 L 1323.5 387.5 L 1323.5 464.5 L 1296.5 464.5 Z M 1608.5 273.5 L 1636.5 273.5 L 1636.5 504.5 L 1608.5 504.5 Z M 284.5 273.5 L 312.5 273.5 L 312.5 504.5 L 284.5 504.5 Z M 284.5 273.5 "/>
 </clipPath>
-<image id="image388" 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="#image388"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 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 679.5 452.5 L 710.5 452.5 L 710.5 466.5 L 679.5 466.5 Z M 679.5 466.5 L 710.5 466.5 L 710.5 483.5 L 679.5 483.5 Z M 1473.5 452.5 L 1504.5 452.5 L 1504.5 483.5 L 1473.5 483.5 Z M 414.5 452.5 L 445.5 452.5 L 445.5 483.5 L 414.5 483.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="image389" 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="#image389"/>
+  <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="surface383">
+<g id="surface410">
 <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 1329.578125 544.121094 L 1329.46875 545.875 L 1329.195312 547.460938 L 1328.703125 548.9375 L 1328.046875 550.25 L 1327.171875 551.507812 L 1326.132812 552.601562 L 1324.984375 553.53125 L 1323.777344 554.242188 L 1322.410156 554.789062 L 1320.988281 555.226562 L 1319.457031 555.445312 L 1317.816406 555.5 L 1299.820312 555.5 L 1299.820312 515.625 L 1316.011719 515.625 L 1318.363281 515.789062 L 1320.441406 516.171875 L 1322.300781 516.828125 L 1323.886719 517.757812 L 1325.257812 518.960938 L 1326.351562 520.4375 L 1326.789062 521.257812 L 1327.171875 522.132812 L 1327.445312 522.953125 L 1327.664062 523.882812 L 1327.773438 524.8125 L 1327.828125 525.742188 L 1327.664062 527.714844 L 1327.171875 529.410156 L 1326.40625 530.996094 L 1325.3125 532.308594 L 1323.941406 533.511719 L 1322.300781 534.441406 L 1323.886719 535.152344 L 1325.257812 535.917969 L 1326.460938 536.792969 L 1327.445312 537.777344 L 1328.210938 538.816406 L 1328.8125 539.910156 L 1329.03125 540.566406 L 1329.359375 541.878906 L 1329.46875 542.644531 L 1329.523438 543.355469 Z M 1322.738281 526.457031 L 1322.574219 524.8125 L 1322.082031 523.445312 L 1321.316406 522.242188 L 1320.222656 521.367188 L 1318.855469 520.710938 L 1317.160156 520.273438 L 1316.777344 520.273438 L 1316.011719 520.164062 L 1315.136719 520.164062 L 1314.753906 520.109375 L 1304.90625 520.109375 L 1304.90625 532.800781 L 1314.753906 532.800781 L 1316.777344 532.691406 L 1318.527344 532.363281 L 1320.003906 531.761719 L 1321.097656 530.941406 L 1321.972656 529.847656 L 1322.519531 528.535156 L 1322.574219 528.261719 L 1322.683594 527.605469 L 1322.683594 526.839844 Z M 1317.324219 551.015625 L 1318.855469 550.960938 L 1320.222656 550.632812 L 1321.425781 550.085938 L 1322.410156 549.375 L 1323.230469 548.445312 L 1323.886719 547.296875 L 1324.050781 546.859375 L 1324.160156 546.367188 L 1324.324219 545.820312 L 1324.378906 545.324219 L 1324.433594 544.777344 L 1324.488281 544.175781 L 1324.378906 542.972656 L 1324.160156 541.824219 L 1323.777344 540.839844 L 1323.230469 539.910156 L 1322.519531 539.144531 L 1321.699219 538.433594 L 1321.097656 538.105469 L 1320.441406 537.832031 L 1319.730469 537.613281 L 1318.964844 537.449219 L 1318.144531 537.339844 L 1317.324219 537.285156 L 1304.90625 537.285156 L 1304.90625 551.015625 Z M 1317.324219 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 1296 559 L 1328 559 M 1296 528 L 1328 528 M 1296 528 L 1296 559 M 1328 528 L 1328 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 1296 559 L 1328 559 M 1296 528 L 1328 528 M 1328 559 L 1328 528 M 1296 559 L 1296 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/fa/sky130_fd_sc_lp__fa_2.svg b/cells/fa/sky130_fd_sc_lp__fa_2.svg
index d9a5686..0a18d99 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_2.svg
+++ b/cells/fa/sky130_fd_sc_lp__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 537.5 L 175.5 537.5 Z M 175.5 229.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 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="#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 1546.5 628.5 L 1571.5 628.5 L 1571.5 697.5 L 1546.5 697.5 Z M 1606.5 628.5 L 1630.5 628.5 L 1630.5 697.5 L 1606.5 697.5 Z M 540.5 633.5 L 564.5 633.5 L 564.5 702.5 L 540.5 702.5 Z M 436.5 633.5 L 461.5 633.5 L 461.5 702.5 L 436.5 702.5 Z M 827.5 643.5 L 852.5 643.5 L 852.5 712.5 L 827.5 712.5 Z M 886.5 643.5 L 911.5 643.5 L 911.5 712.5 L 886.5 712.5 Z M 1161.5 643.5 L 1186.5 643.5 L 1186.5 712.5 L 1161.5 712.5 Z M 697.5 643.5 L 721.5 643.5 L 721.5 712.5 L 697.5 712.5 Z M 1028.5 643.5 L 1053.5 643.5 L 1053.5 712.5 L 1028.5 712.5 Z M 1232.5 643.5 L 1257.5 643.5 L 1257.5 712.5 L 1232.5 712.5 Z M 768.5 643.5 L 792.5 643.5 L 792.5 712.5 L 768.5 712.5 Z M 957.5 643.5 L 982.5 643.5 L 982.5 712.5 L 957.5 712.5 Z M 1407.5 628.5 L 1431.5 628.5 L 1431.5 766.5 L 1407.5 766.5 Z M 1336.5 628.5 L 1360.5 628.5 L 1360.5 766.5 L 1336.5 766.5 Z M 346.5 633.5 L 371.5 633.5 L 371.5 771.5 L 346.5 771.5 Z M 275.5 633.5 L 300.5 633.5 L 300.5 771.5 L 275.5 771.5 Z M 275.5 633.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 1216.5 338.5 L 1241.5 338.5 L 1241.5 444.5 L 1216.5 444.5 Z M 1067.5 338.5 L 1092.5 338.5 L 1092.5 444.5 L 1067.5 444.5 Z M 1145.5 338.5 L 1170.5 338.5 L 1170.5 444.5 L 1145.5 444.5 Z M 886.5 359.5 L 911.5 359.5 L 911.5 464.5 L 886.5 464.5 Z M 958.5 359.5 L 983.5 359.5 L 983.5 464.5 L 958.5 464.5 Z M 768.5 359.5 L 792.5 359.5 L 792.5 464.5 L 768.5 464.5 Z M 827.5 359.5 L 852.5 359.5 L 852.5 464.5 L 827.5 464.5 Z M 683.5 359.5 L 708.5 359.5 L 708.5 464.5 L 683.5 464.5 Z M 507.5 376.5 L 532.5 376.5 L 532.5 482.5 L 507.5 482.5 Z M 436.5 376.5 L 461.5 376.5 L 461.5 482.5 L 436.5 482.5 Z M 275.5 299.5 L 300.5 299.5 L 300.5 507.5 L 275.5 507.5 Z M 346.5 299.5 L 371.5 299.5 L 371.5 507.5 L 346.5 507.5 Z M 1418.5 299.5 L 1443.5 299.5 L 1443.5 507.5 L 1418.5 507.5 Z M 1606.5 402.5 L 1630.5 402.5 L 1630.5 507.5 L 1606.5 507.5 Z M 1347.5 299.5 L 1372.5 299.5 L 1372.5 507.5 L 1347.5 507.5 Z M 1546.5 402.5 L 1571.5 402.5 L 1571.5 507.5 L 1546.5 507.5 Z M 1546.5 402.5 "/>
 </clipPath>
-<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image350"/>
+  <use xlink:href="#image378"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1658.5 460.5 L 1686.5 460.5 L 1686.5 468.5 L 1658.5 468.5 Z M 1658.5 468.5 L 1686.5 468.5 L 1686.5 488.5 L 1658.5 488.5 Z M 311.5 460.5 L 339.5 460.5 L 339.5 488.5 L 311.5 488.5 Z M 1024.5 460.5 L 1052.5 460.5 L 1052.5 488.5 L 1024.5 488.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="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>
@@ -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 1521.769531 542.75 L 1507.972656 542.75 L 1504.195312 553.5 L 1499.335938 553.5 L 1512.097656 517.714844 L 1517.988281 517.714844 L 1530.554688 553.5 L 1525.449219 553.5 Z M 1520.492188 538.921875 L 1514.992188 522.625 L 1509.101562 538.921875 Z M 1520.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 1500 558 L 1528 558 M 1500 530 L 1528 530 M 1500 530 L 1500 558 M 1528 530 L 1528 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 1500 558 L 1528 558 M 1500 530 L 1528 530 M 1528 558 L 1528 530 M 1500 558 L 1500 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/fa/sky130_fd_sc_lp__fa_4.svg b/cells/fa/sky130_fd_sc_lp__fa_4.svg
index 20e9d24..d23da4c 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_4.svg
+++ b/cells/fa/sky130_fd_sc_lp__fa_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 537.5 L 174.5 537.5 Z M 174.5 243.5 "/>
 </clipPath>
-<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image351"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image351"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1062.5 628.5 L 1086.5 628.5 L 1086.5 694.5 L 1062.5 694.5 Z M 1006.5 628.5 L 1029.5 628.5 L 1029.5 694.5 L 1006.5 694.5 Z M 355.5 628.5 L 378.5 628.5 L 378.5 694.5 L 355.5 694.5 Z M 562.5 628.5 L 586.5 628.5 L 586.5 694.5 L 562.5 694.5 Z M 506.5 628.5 L 529.5 628.5 L 529.5 694.5 L 506.5 694.5 Z M 438.5 628.5 L 462.5 628.5 L 462.5 694.5 L 438.5 694.5 Z M 655.5 628.5 L 679.5 628.5 L 679.5 694.5 L 655.5 694.5 Z M 949.5 628.5 L 973.5 628.5 L 973.5 694.5 L 949.5 694.5 Z M 275.5 628.5 L 298.5 628.5 L 298.5 694.5 L 275.5 694.5 Z M 875.5 628.5 L 899.5 628.5 L 899.5 694.5 L 875.5 694.5 Z M 808.5 628.5 L 831.5 628.5 L 831.5 694.5 L 808.5 694.5 Z M 723.5 628.5 L 746.5 628.5 L 746.5 694.5 L 723.5 694.5 Z M 1423.5 628.5 L 1447.5 628.5 L 1447.5 760.5 L 1423.5 760.5 Z M 1356.5 628.5 L 1379.5 628.5 L 1379.5 760.5 L 1356.5 760.5 Z M 1626.5 628.5 L 1650.5 628.5 L 1650.5 760.5 L 1626.5 760.5 Z M 1288.5 628.5 L 1312.5 628.5 L 1312.5 760.5 L 1288.5 760.5 Z M 1220.5 628.5 L 1244.5 628.5 L 1244.5 760.5 L 1220.5 760.5 Z M 1559.5 628.5 L 1582.5 628.5 L 1582.5 760.5 L 1559.5 760.5 Z M 1153.5 628.5 L 1176.5 628.5 L 1176.5 760.5 L 1153.5 760.5 Z M 1491.5 628.5 L 1515.5 628.5 L 1515.5 760.5 L 1491.5 760.5 Z M 1491.5 628.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 267.5 350.5 L 290.5 350.5 L 290.5 451.5 L 267.5 451.5 Z M 334.5 350.5 L 358.5 350.5 L 358.5 451.5 L 334.5 451.5 Z M 530.5 367.5 L 554.5 367.5 L 554.5 468.5 L 530.5 468.5 Z M 808.5 367.5 L 831.5 367.5 L 831.5 468.5 L 808.5 468.5 Z M 655.5 367.5 L 679.5 367.5 L 679.5 468.5 L 655.5 468.5 Z M 438.5 367.5 L 462.5 367.5 L 462.5 468.5 L 438.5 468.5 Z M 723.5 367.5 L 746.5 367.5 L 746.5 468.5 L 723.5 468.5 Z M 1006.5 367.5 L 1029.5 367.5 L 1029.5 468.5 L 1006.5 468.5 Z M 587.5 367.5 L 610.5 367.5 L 610.5 468.5 L 587.5 468.5 Z M 1062.5 367.5 L 1086.5 367.5 L 1086.5 468.5 L 1062.5 468.5 Z M 875.5 367.5 L 899.5 367.5 L 899.5 468.5 L 875.5 468.5 Z M 949.5 367.5 L 973.5 367.5 L 973.5 468.5 L 949.5 468.5 Z M 1559.5 310.5 L 1582.5 310.5 L 1582.5 508.5 L 1559.5 508.5 Z M 1626.5 310.5 L 1650.5 310.5 L 1650.5 508.5 L 1626.5 508.5 Z M 1356.5 310.5 L 1379.5 310.5 L 1379.5 508.5 L 1356.5 508.5 Z M 1220.5 310.5 L 1244.5 310.5 L 1244.5 508.5 L 1220.5 508.5 Z M 1288.5 310.5 L 1312.5 310.5 L 1312.5 508.5 L 1288.5 508.5 Z M 1423.5 310.5 L 1447.5 310.5 L 1447.5 508.5 L 1423.5 508.5 Z M 1153.5 310.5 L 1176.5 310.5 L 1176.5 508.5 L 1153.5 508.5 Z M 1491.5 310.5 L 1515.5 310.5 L 1515.5 508.5 L 1491.5 508.5 Z M 1491.5 310.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1436.5 580.5 L 1463.5 580.5 L 1463.5 598.5 L 1436.5 598.5 Z M 908.5 580.5 L 934.5 580.5 L 934.5 607.5 L 908.5 607.5 Z M 455.5 580.5 L 481.5 580.5 L 481.5 607.5 L 455.5 607.5 Z M 1436.5 598.5 L 1463.5 598.5 L 1463.5 607.5 L 1436.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="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface348">
+<g id="surface376">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 582.589844 692.695312 L 582.589844 726.433594 L 577.730469 726.433594 L 560.28125 699.082031 L 560.28125 726.433594 L 556.207031 726.433594 L 556.207031 692.695312 L 560.882812 692.695312 L 578.515625 720.28125 L 578.515625 692.695312 Z M 582.589844 692.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 530 383 L 557 383 M 530 356 L 557 356 M 530 356 L 530 383 M 557 356 L 557 383 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 530 383 L 557 383 M 530 356 L 557 356 M 557 383 L 557 356 M 530 383 L 530 356 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/fa/sky130_fd_sc_lp__fa_lp.svg b/cells/fa/sky130_fd_sc_lp__fa_lp.svg
index 3f9740f..a08b8d1 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_lp.svg
+++ b/cells/fa/sky130_fd_sc_lp__fa_lp.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="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask 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="#image383"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1445.5 612.5 L 1467.5 612.5 L 1467.5 673.5 L 1445.5 673.5 Z M 1247.5 612.5 L 1269.5 612.5 L 1269.5 673.5 L 1247.5 673.5 Z M 593.5 612.5 L 615.5 612.5 L 615.5 673.5 L 593.5 673.5 Z M 900.5 612.5 L 922.5 612.5 L 922.5 673.5 L 900.5 673.5 Z M 985.5 612.5 L 1007.5 612.5 L 1007.5 673.5 L 985.5 673.5 Z M 649.5 612.5 L 671.5 612.5 L 671.5 673.5 L 649.5 673.5 Z M 1389.5 612.5 L 1411.5 612.5 L 1411.5 673.5 L 1389.5 673.5 Z M 1309.5 612.5 L 1330.5 612.5 L 1330.5 673.5 L 1309.5 673.5 Z M 508.5 612.5 L 530.5 612.5 L 530.5 673.5 L 508.5 673.5 Z M 731.5 612.5 L 753.5 612.5 L 753.5 673.5 L 731.5 673.5 Z M 816.5 612.5 L 837.5 612.5 L 837.5 673.5 L 816.5 673.5 Z M 276.5 653.5 L 297.5 653.5 L 297.5 713.5 L 276.5 713.5 Z M 327.5 653.5 L 349.5 653.5 L 349.5 713.5 L 327.5 713.5 Z M 1513.5 666.5 L 1535.5 666.5 L 1535.5 726.5 L 1513.5 726.5 Z M 1634.5 666.5 L 1656.5 666.5 L 1656.5 726.5 L 1634.5 726.5 Z M 1583.5 666.5 L 1604.5 666.5 L 1604.5 726.5 L 1583.5 726.5 Z M 1583.5 666.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1469.5 330.5 L 1505.5 330.5 L 1505.5 473.5 L 1469.5 473.5 Z M 1544.5 330.5 L 1580.5 330.5 L 1580.5 473.5 L 1544.5 473.5 Z M 675.5 330.5 L 711.5 330.5 L 711.5 473.5 L 675.5 473.5 Z M 994.5 330.5 L 1030.5 330.5 L 1030.5 473.5 L 994.5 473.5 Z M 1399.5 330.5 L 1435.5 330.5 L 1435.5 473.5 L 1399.5 473.5 Z M 1323.5 330.5 L 1359.5 330.5 L 1359.5 473.5 L 1323.5 473.5 Z M 1247.5 330.5 L 1283.5 330.5 L 1283.5 473.5 L 1247.5 473.5 Z M 751.5 330.5 L 787.5 330.5 L 787.5 473.5 L 751.5 473.5 Z M 918.5 330.5 L 954.5 330.5 L 954.5 473.5 L 918.5 473.5 Z M 842.5 330.5 L 878.5 330.5 L 878.5 473.5 L 842.5 473.5 Z M 1620.5 330.5 L 1656.5 330.5 L 1656.5 473.5 L 1620.5 473.5 Z M 494.5 337.5 L 530.5 337.5 L 530.5 480.5 L 494.5 480.5 Z M 418.5 337.5 L 454.5 337.5 L 454.5 480.5 L 418.5 480.5 Z M 261.5 356.5 L 297.5 356.5 L 297.5 499.5 L 261.5 499.5 Z M 261.5 356.5 "/>
 </clipPath>
-<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image386"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface380">
+<g id="surface407">
 <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 286.761719 364.308594 L 286.761719 391.53125 L 282.847656 391.53125 L 282.847656 364.308594 L 272.75 364.308594 L 272.75 360.859375 L 296.816406 360.859375 L 296.816406 364.308594 Z M 286.761719 364.308594 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 223 716 L 248 716 M 223 691 L 248 691 M 223 691 L 223 716 M 248 691 L 248 716 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 223 716 L 248 716 M 223 691 L 248 691 M 248 716 L 248 691 M 223 716 L 223 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,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/fa/sky130_fd_sc_lp__fa_m.svg b/cells/fa/sky130_fd_sc_lp__fa_m.svg
index ee1972e..f0bbe0c 100644
--- a/cells/fa/sky130_fd_sc_lp__fa_m.svg
+++ b/cells/fa/sky130_fd_sc_lp__fa_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 664.5 538.5 L 886.5 538.5 L 886.5 550.5 L 664.5 550.5 Z M 664.5 538.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image396"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image396"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 770.5 657.5 L 799.5 657.5 L 799.5 738.5 L 770.5 738.5 Z M 656.5 657.5 L 685.5 657.5 L 685.5 738.5 L 656.5 738.5 Z M 473.5 657.5 L 502.5 657.5 L 502.5 738.5 L 473.5 738.5 Z M 403.5 657.5 L 432.5 657.5 L 432.5 738.5 L 403.5 738.5 Z M 557.5 657.5 L 586.5 657.5 L 586.5 738.5 L 557.5 738.5 Z M 319.5 657.5 L 348.5 657.5 L 348.5 738.5 L 319.5 738.5 Z M 1415.5 662.5 L 1444.5 662.5 L 1444.5 744.5 L 1415.5 744.5 Z M 1485.5 662.5 L 1514.5 662.5 L 1514.5 744.5 L 1485.5 744.5 Z M 1569.5 662.5 L 1598.5 662.5 L 1598.5 744.5 L 1569.5 744.5 Z M 1254.5 662.5 L 1283.5 662.5 L 1283.5 744.5 L 1254.5 744.5 Z M 1086.5 662.5 L 1115.5 662.5 L 1115.5 744.5 L 1086.5 744.5 Z M 1003.5 662.5 L 1032.5 662.5 L 1032.5 744.5 L 1003.5 744.5 Z M 1345.5 662.5 L 1374.5 662.5 L 1374.5 744.5 L 1345.5 744.5 Z M 1170.5 662.5 L 1199.5 662.5 L 1199.5 744.5 L 1170.5 744.5 Z M 1170.5 662.5 "/>
 </clipPath>
-<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1415.5 398.5 L 1444.5 398.5 L 1444.5 479.5 L 1415.5 479.5 Z M 1485.5 398.5 L 1514.5 398.5 L 1514.5 479.5 L 1485.5 479.5 Z M 1254.5 398.5 L 1283.5 398.5 L 1283.5 479.5 L 1254.5 479.5 Z M 1086.5 398.5 L 1115.5 398.5 L 1115.5 479.5 L 1086.5 479.5 Z M 1345.5 398.5 L 1374.5 398.5 L 1374.5 479.5 L 1345.5 479.5 Z M 1599.5 398.5 L 1628.5 398.5 L 1628.5 479.5 L 1599.5 479.5 Z M 1170.5 398.5 L 1199.5 398.5 L 1199.5 479.5 L 1170.5 479.5 Z M 1003.5 398.5 L 1032.5 398.5 L 1032.5 479.5 L 1003.5 479.5 Z M 473.5 421.5 L 502.5 421.5 L 502.5 503.5 L 473.5 503.5 Z M 640.5 421.5 L 670.5 421.5 L 670.5 503.5 L 640.5 503.5 Z M 289.5 421.5 L 318.5 421.5 L 318.5 503.5 L 289.5 503.5 Z M 403.5 421.5 L 432.5 421.5 L 432.5 503.5 L 403.5 503.5 Z M 557.5 421.5 L 586.5 421.5 L 586.5 503.5 L 557.5 503.5 Z M 770.5 433.5 L 799.5 433.5 L 799.5 514.5 L 770.5 514.5 Z M 770.5 433.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface393">
+<g id="surface420">
 <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 587.035156 299.257812 L 587.035156 341.175781 L 580.996094 341.175781 L 559.320312 307.191406 L 559.320312 341.175781 L 554.257812 341.175781 L 554.257812 299.257812 L 560.066406 299.257812 L 581.976562 333.53125 L 581.976562 299.257812 Z M 587.035156 299.257812 "/>
 <path style="fill:none;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 776 L 555 776 M 522 743 L 555 743 M 522 743 L 522 776 M 555 743 L 555 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 522 776 L 555 776 M 522 743 L 555 743 M 555 776 L 555 743 M 522 776 L 522 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/fah/sky130_fd_sc_lp__fah_1.svg b/cells/fah/sky130_fd_sc_lp__fah_1.svg
index 94eafdd..751eff0 100644
--- a/cells/fah/sky130_fd_sc_lp__fah_1.svg
+++ b/cells/fah/sky130_fd_sc_lp__fah_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="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 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="#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 314.5 574.5 L 331.5 574.5 L 331.5 647.5 L 314.5 647.5 Z M 788.5 579.5 L 805.5 579.5 L 805.5 651.5 L 788.5 651.5 Z M 739.5 579.5 L 756.5 579.5 L 756.5 651.5 L 739.5 651.5 Z M 836.5 579.5 L 854.5 579.5 L 854.5 651.5 L 836.5 651.5 Z M 1230.5 580.5 L 1248.5 580.5 L 1248.5 652.5 L 1230.5 652.5 Z M 1279.5 580.5 L 1296.5 580.5 L 1296.5 652.5 L 1279.5 652.5 Z M 1403.5 583.5 L 1420.5 583.5 L 1420.5 656.5 L 1403.5 656.5 Z M 1354.5 583.5 L 1371.5 583.5 L 1371.5 656.5 L 1354.5 656.5 Z M 536.5 594.5 L 553.5 594.5 L 553.5 667.5 L 536.5 667.5 Z M 243.5 574.5 L 260.5 574.5 L 260.5 669.5 L 243.5 669.5 Z M 898.5 597.5 L 915.5 597.5 L 915.5 670.5 L 898.5 670.5 Z M 1465.5 583.5 L 1482.5 583.5 L 1482.5 678.5 L 1465.5 678.5 Z M 1657.5 610.5 L 1674.5 610.5 L 1674.5 682.5 L 1657.5 682.5 Z M 1608.5 610.5 L 1625.5 610.5 L 1625.5 682.5 L 1608.5 682.5 Z M 430.5 594.5 L 447.5 594.5 L 447.5 689.5 L 430.5 689.5 Z M 1046.5 601.5 L 1063.5 601.5 L 1063.5 697.5 L 1046.5 697.5 Z M 1046.5 601.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 658.5 380.5 L 675.5 380.5 L 675.5 476.5 L 658.5 476.5 Z M 323.5 372.5 L 340.5 372.5 L 340.5 485.5 L 323.5 485.5 Z M 776.5 393.5 L 793.5 393.5 L 793.5 488.5 L 776.5 488.5 Z M 1657.5 378.5 L 1674.5 378.5 L 1674.5 491.5 L 1657.5 491.5 Z M 1608.5 378.5 L 1625.5 378.5 L 1625.5 491.5 L 1608.5 491.5 Z M 851.5 413.5 L 868.5 413.5 L 868.5 508.5 L 851.5 508.5 Z M 926.5 413.5 L 943.5 413.5 L 943.5 508.5 L 926.5 508.5 Z M 583.5 399.5 L 600.5 399.5 L 600.5 513.5 L 583.5 513.5 Z M 243.5 372.5 L 260.5 372.5 L 260.5 515.5 L 243.5 515.5 Z M 1461.5 372.5 L 1478.5 372.5 L 1478.5 515.5 L 1461.5 515.5 Z M 1345.5 420.5 L 1362.5 420.5 L 1362.5 515.5 L 1345.5 515.5 Z M 1403.5 420.5 L 1420.5 420.5 L 1420.5 515.5 L 1403.5 515.5 Z M 495.5 372.5 L 512.5 372.5 L 512.5 515.5 L 495.5 515.5 Z M 1225.5 420.5 L 1242.5 420.5 L 1242.5 515.5 L 1225.5 515.5 Z M 1274.5 420.5 L 1291.5 420.5 L 1291.5 515.5 L 1274.5 515.5 Z M 988.5 372.5 L 1005.5 372.5 L 1005.5 515.5 L 988.5 515.5 Z M 988.5 372.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 1249.5 483.5 L 1268.5 483.5 L 1268.5 501.5 L 1249.5 501.5 Z M 1249.5 501.5 L 1268.5 501.5 L 1268.5 502.5 L 1249.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 976.5 525.5 L 995.5 525.5 L 995.5 544.5 L 976.5 544.5 Z M 1412.5 525.5 L 1431.5 525.5 L 1431.5 544.5 L 1412.5 544.5 Z M 1249.5 525.5 L 1268.5 525.5 L 1268.5 544.5 L 1249.5 544.5 Z M 922.5 525.5 L 941.5 525.5 L 941.5 544.5 L 922.5 544.5 Z M 540.5 525.5 L 559.5 525.5 L 559.5 544.5 L 540.5 544.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="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>
@@ -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 1106.46875 413.5 L 1106.402344 414.574219 L 1106.234375 415.550781 L 1105.933594 416.460938 L 1105.527344 417.269531 L 1104.988281 418.042969 L 1104.351562 418.714844 L 1103.644531 419.289062 L 1102.902344 419.726562 L 1102.0625 420.0625 L 1101.1875 420.332031 L 1100.242188 420.464844 L 1099.234375 420.5 L 1088.160156 420.5 L 1088.160156 395.960938 L 1098.121094 395.960938 L 1099.570312 396.0625 L 1100.847656 396.296875 L 1101.992188 396.703125 L 1102.96875 397.273438 L 1103.8125 398.015625 L 1104.484375 398.921875 L 1104.753906 399.429688 L 1104.988281 399.96875 L 1105.15625 400.472656 L 1105.292969 401.042969 L 1105.359375 401.617188 L 1105.394531 402.1875 L 1105.292969 403.402344 L 1104.988281 404.445312 L 1104.519531 405.421875 L 1103.84375 406.226562 L 1103.003906 406.96875 L 1101.992188 407.539062 L 1102.96875 407.976562 L 1103.8125 408.449219 L 1104.550781 408.988281 L 1105.15625 409.59375 L 1105.628906 410.234375 L 1106 410.90625 L 1106.132812 411.3125 L 1106.335938 412.117188 L 1106.402344 412.589844 L 1106.4375 413.027344 Z M 1102.261719 402.625 L 1102.160156 401.617188 L 1101.859375 400.773438 L 1101.386719 400.035156 L 1100.714844 399.496094 L 1099.875 399.09375 L 1098.828125 398.824219 L 1098.59375 398.824219 L 1098.359375 398.789062 L 1098.121094 398.753906 L 1097.585938 398.753906 L 1097.347656 398.722656 L 1091.289062 398.722656 L 1091.289062 406.53125 L 1097.347656 406.53125 L 1098.59375 406.464844 L 1099.671875 406.261719 L 1100.578125 405.890625 L 1101.253906 405.386719 L 1101.792969 404.714844 L 1102.128906 403.90625 L 1102.160156 403.738281 L 1102.230469 403.332031 L 1102.230469 402.863281 Z M 1098.929688 417.738281 L 1099.875 417.707031 L 1100.714844 417.503906 L 1101.457031 417.167969 L 1102.0625 416.730469 L 1102.566406 416.15625 L 1102.96875 415.449219 L 1103.070312 415.179688 L 1103.136719 414.878906 L 1103.238281 414.542969 L 1103.273438 414.238281 L 1103.304688 413.902344 L 1103.339844 413.53125 L 1103.273438 412.792969 L 1103.136719 412.085938 L 1102.902344 411.480469 L 1102.566406 410.90625 L 1102.128906 410.433594 L 1101.625 409.996094 L 1101.253906 409.796875 L 1100.847656 409.628906 L 1100.410156 409.492188 L 1099.941406 409.390625 L 1099.433594 409.324219 L 1098.929688 409.292969 L 1091.289062 409.292969 L 1091.289062 417.738281 Z M 1098.929688 417.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 1085 680 L 1104 680 M 1085 661 L 1104 661 M 1085 661 L 1085 680 M 1104 661 L 1104 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 1085 680 L 1104 680 M 1085 661 L 1104 661 M 1104 680 L 1104 661 M 1085 680 L 1085 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/fahcin/sky130_fd_sc_lp__fahcin_1.svg b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.svg
index a07c2b5..ef665f7 100644
--- a/cells/fahcin/sky130_fd_sc_lp__fahcin_1.svg
+++ b/cells/fahcin/sky130_fd_sc_lp__fahcin_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 308.5 L 1743.5 308.5 L 1743.5 511.5 L 174.5 511.5 Z M 493.5 511.5 L 1743.5 511.5 L 1743.5 536.5 L 493.5 536.5 Z M 174.5 511.5 L 338.5 511.5 L 338.5 536.5 L 174.5 536.5 Z M 174.5 511.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image407"/>
 </pattern>
 <mask 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="#image380"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1354.5 577.5 L 1372.5 577.5 L 1372.5 655.5 L 1354.5 655.5 Z M 1439.5 577.5 L 1458.5 577.5 L 1458.5 655.5 L 1439.5 655.5 Z M 603.5 583.5 L 621.5 583.5 L 621.5 661.5 L 603.5 661.5 Z M 688.5 583.5 L 706.5 583.5 L 706.5 661.5 L 688.5 661.5 Z M 1520.5 587.5 L 1538.5 587.5 L 1538.5 665.5 L 1520.5 665.5 Z M 335.5 606.5 L 353.5 606.5 L 353.5 685.5 L 335.5 685.5 Z M 1625.5 587.5 L 1643.5 587.5 L 1643.5 689.5 L 1625.5 689.5 Z M 465.5 615.5 L 483.5 615.5 L 483.5 693.5 L 465.5 693.5 Z M 518.5 615.5 L 536.5 615.5 L 536.5 693.5 L 518.5 693.5 Z M 1287.5 597.5 L 1306.5 597.5 L 1306.5 699.5 L 1287.5 699.5 Z M 810.5 597.5 L 828.5 597.5 L 828.5 699.5 L 810.5 699.5 Z M 949.5 621.5 L 967.5 621.5 L 967.5 699.5 L 949.5 699.5 Z M 1094.5 621.5 L 1112.5 621.5 L 1112.5 699.5 L 1094.5 699.5 Z M 896.5 621.5 L 915.5 621.5 L 915.5 699.5 L 896.5 699.5 Z M 1178.5 621.5 L 1196.5 621.5 L 1196.5 699.5 L 1178.5 699.5 Z M 250.5 606.5 L 268.5 606.5 L 268.5 709.5 L 250.5 709.5 Z M 250.5 606.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image408"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1566.5 360.5 L 1584.5 360.5 L 1584.5 482.5 L 1566.5 482.5 Z M 467.5 387.5 L 485.5 387.5 L 485.5 489.5 L 467.5 489.5 Z M 519.5 387.5 L 538.5 387.5 L 538.5 489.5 L 519.5 489.5 Z M 345.5 367.5 L 363.5 367.5 L 363.5 489.5 L 345.5 489.5 Z M 1380.5 394.5 L 1398.5 394.5 L 1398.5 497.5 L 1380.5 497.5 Z M 1433.5 394.5 L 1451.5 394.5 L 1451.5 497.5 L 1433.5 497.5 Z M 1097.5 398.5 L 1115.5 398.5 L 1115.5 500.5 L 1097.5 500.5 Z M 882.5 378.5 L 900.5 378.5 L 900.5 500.5 L 882.5 500.5 Z M 948.5 398.5 L 967.5 398.5 L 967.5 500.5 L 948.5 500.5 Z M 1164.5 378.5 L 1182.5 378.5 L 1182.5 500.5 L 1164.5 500.5 Z M 600.5 404.5 L 618.5 404.5 L 618.5 506.5 L 600.5 506.5 Z M 684.5 404.5 L 702.5 404.5 L 702.5 506.5 L 684.5 506.5 Z M 1261.5 360.5 L 1279.5 360.5 L 1279.5 514.5 L 1261.5 514.5 Z M 810.5 360.5 L 828.5 360.5 L 828.5 514.5 L 810.5 514.5 Z M 1651.5 360.5 L 1669.5 360.5 L 1669.5 514.5 L 1651.5 514.5 Z M 250.5 360.5 L 268.5 360.5 L 268.5 514.5 L 250.5 514.5 Z M 250.5 360.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image409"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 216.5 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 1446.5 524.5 L 1467.5 524.5 L 1467.5 526.5 L 1446.5 526.5 Z M 1446.5 526.5 L 1467.5 526.5 L 1467.5 545.5 L 1446.5 545.5 Z M 685.5 524.5 L 705.5 524.5 L 705.5 545.5 L 685.5 545.5 Z M 1036.5 524.5 L 1057.5 524.5 L 1057.5 545.5 L 1036.5 545.5 Z M 392.5 524.5 L 413.5 524.5 L 413.5 545.5 L 392.5 545.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="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image410"/>
 </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="surface404">
 <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 1146.71875 661.007812 L 1146.71875 683.695312 L 1143.457031 683.695312 L 1143.457031 661.007812 L 1135.042969 661.007812 L 1135.042969 658.132812 L 1155.097656 658.132812 L 1155.097656 661.007812 Z M 1146.71875 661.007812 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1095 420 L 1115 420 M 1095 399 L 1115 399 M 1095 399 L 1095 420 M 1115 399 L 1115 420 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1095 420 L 1115 420 M 1095 399 L 1115 399 M 1115 420 L 1115 399 M 1095 420 L 1095 399 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(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/fahcon/sky130_fd_sc_lp__fahcon_1.svg b/cells/fahcon/sky130_fd_sc_lp__fahcon_1.svg
index 774ada3..91206f1 100644
--- a/cells/fahcon/sky130_fd_sc_lp__fahcon_1.svg
+++ b/cells/fahcon/sky130_fd_sc_lp__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 536.5 L 175.5 536.5 Z M 441.5 536.5 L 866.5 536.5 L 866.5 541.5 L 441.5 541.5 Z M 441.5 536.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <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 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="#image359"/>
+  <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 554.5 586.5 L 574.5 586.5 L 574.5 670.5 L 554.5 670.5 Z M 655.5 586.5 L 675.5 586.5 L 675.5 670.5 L 655.5 670.5 Z M 494.5 586.5 L 514.5 586.5 L 514.5 670.5 L 494.5 670.5 Z M 422.5 591.5 L 442.5 591.5 L 442.5 676.5 L 422.5 676.5 Z M 365.5 591.5 L 385.5 591.5 L 385.5 676.5 L 365.5 676.5 Z M 1529.5 612.5 L 1549.5 612.5 L 1549.5 697.5 L 1529.5 697.5 Z M 1430.5 612.5 L 1450.5 612.5 L 1450.5 697.5 L 1430.5 697.5 Z M 1196.5 612.5 L 1216.5 612.5 L 1216.5 697.5 L 1196.5 697.5 Z M 1339.5 612.5 L 1359.5 612.5 L 1359.5 697.5 L 1339.5 697.5 Z M 261.5 591.5 L 281.5 591.5 L 281.5 702.5 L 261.5 702.5 Z M 822.5 610.5 L 842.5 610.5 L 842.5 721.5 L 822.5 721.5 Z M 947.5 637.5 L 967.5 637.5 L 967.5 721.5 L 947.5 721.5 Z M 1097.5 637.5 L 1117.5 637.5 L 1117.5 721.5 L 1097.5 721.5 Z M 1004.5 637.5 L 1024.5 637.5 L 1024.5 721.5 L 1004.5 721.5 Z M 1644.5 612.5 L 1663.5 612.5 L 1663.5 723.5 L 1644.5 723.5 Z M 1267.5 612.5 L 1287.5 612.5 L 1287.5 723.5 L 1267.5 723.5 Z M 1267.5 612.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <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 1435.5 372.5 L 1455.5 372.5 L 1455.5 483.5 L 1435.5 483.5 Z M 937.5 372.5 L 957.5 372.5 L 957.5 483.5 L 937.5 483.5 Z M 1063.5 372.5 L 1083.5 372.5 L 1083.5 483.5 L 1063.5 483.5 Z M 1379.5 372.5 L 1398.5 372.5 L 1398.5 483.5 L 1379.5 483.5 Z M 1575.5 357.5 L 1595.5 357.5 L 1595.5 488.5 L 1575.5 488.5 Z M 862.5 372.5 L 881.5 372.5 L 881.5 504.5 L 862.5 504.5 Z M 1148.5 380.5 L 1168.5 380.5 L 1168.5 512.5 L 1148.5 512.5 Z M 343.5 380.5 L 363.5 380.5 L 363.5 512.5 L 343.5 512.5 Z M 259.5 346.5 L 279.5 346.5 L 279.5 512.5 L 259.5 512.5 Z M 1216.5 346.5 L 1236.5 346.5 L 1236.5 512.5 L 1216.5 512.5 Z M 417.5 401.5 L 436.5 401.5 L 436.5 512.5 L 417.5 512.5 Z M 1646.5 346.5 L 1665.5 346.5 L 1665.5 512.5 L 1646.5 512.5 Z M 559.5 407.5 L 579.5 407.5 L 579.5 517.5 L 559.5 517.5 Z M 502.5 407.5 L 522.5 407.5 L 522.5 517.5 L 502.5 517.5 Z M 641.5 407.5 L 661.5 407.5 L 661.5 517.5 L 641.5 517.5 Z M 775.5 351.5 L 794.5 351.5 L 794.5 517.5 L 775.5 517.5 Z M 775.5 351.5 "/>
 </clipPath>
-<image id="image361" 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="#image361"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 600.5 475.5 L 622.5 475.5 L 622.5 497.5 L 600.5 497.5 Z M 1043.5 475.5 L 1065.5 475.5 L 1065.5 497.5 L 1043.5 497.5 Z M 1359.5 475.5 L 1382.5 475.5 L 1382.5 497.5 L 1359.5 497.5 Z M 473.5 621.5 L 496.5 621.5 L 496.5 640.5 L 473.5 640.5 Z M 473.5 640.5 L 496.5 640.5 L 496.5 643.5 L 473.5 643.5 Z M 980.5 621.5 L 1002.5 621.5 L 1002.5 643.5 L 980.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 1423.5 621.5 L 1445.5 621.5 L 1445.5 643.5 L 1423.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="image362" 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="#image362"/>
+  <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="surface356">
+<g id="surface383">
 <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 1263.433594 568.96875 L 1263.433594 597.597656 L 1259.742188 597.597656 L 1259.742188 568.96875 Z M 1263.433594 568.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 1233 507 L 1255 507 M 1233 484 L 1255 484 M 1233 484 L 1233 507 M 1255 484 L 1255 507 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1233 507 L 1255 507 M 1233 484 L 1255 484 M 1255 507 L 1255 484 M 1233 507 L 1233 484 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 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_lp__fill_1.svg b/cells/fill/sky130_fd_sc_lp__fill_1.svg
index a2f4d11..baaaa5a 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_1.svg
+++ b/cells/fill/sky130_fd_sc_lp__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 539.5 L 867.5 539.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_lp__fill_2.svg b/cells/fill/sky130_fd_sc_lp__fill_2.svg
index 8200a11..c5a5d98 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_2.svg
+++ b/cells/fill/sky130_fd_sc_lp__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 539.5 L 812.5 539.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_lp__fill_4.svg b/cells/fill/sky130_fd_sc_lp__fill_4.svg
index 9ab3ace..cd59b93 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_4.svg
+++ b/cells/fill/sky130_fd_sc_lp__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 539.5 L 701.5 539.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_lp__fill_8.svg b/cells/fill/sky130_fd_sc_lp__fill_8.svg
index eb7cf77..bdd7549 100644
--- a/cells/fill/sky130_fd_sc_lp__fill_8.svg
+++ b/cells/fill/sky130_fd_sc_lp__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 539.5 L 478.5 539.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/ha/sky130_fd_sc_lp__ha_0.svg b/cells/ha/sky130_fd_sc_lp__ha_0.svg
index 0692aea..4d9a331 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_0.svg
+++ b/cells/ha/sky130_fd_sc_lp__ha_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image405"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask 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="#image405"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1246.5 667.5 L 1280.5 667.5 L 1280.5 763.5 L 1246.5 763.5 Z M 1385.5 667.5 L 1419.5 667.5 L 1419.5 763.5 L 1385.5 763.5 Z M 1164.5 667.5 L 1198.5 667.5 L 1198.5 763.5 L 1164.5 763.5 Z M 502.5 723.5 L 537.5 723.5 L 537.5 820.5 L 502.5 820.5 Z M 728.5 768.5 L 763.5 768.5 L 763.5 864.5 L 728.5 864.5 Z M 827.5 768.5 L 861.5 768.5 L 861.5 864.5 L 827.5 864.5 Z M 925.5 768.5 L 960.5 768.5 L 960.5 864.5 L 925.5 864.5 Z M 925.5 768.5 "/>
 </clipPath>
-<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image433" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 524.5 209.5 L 559.5 209.5 L 559.5 356.5 L 524.5 356.5 Z M 644.5 259.5 L 679.5 259.5 L 679.5 356.5 L 644.5 356.5 Z M 1232.5 259.5 L 1267.5 259.5 L 1267.5 356.5 L 1232.5 356.5 Z M 1134.5 259.5 L 1168.5 259.5 L 1168.5 356.5 L 1134.5 356.5 Z M 916.5 259.5 L 950.5 259.5 L 950.5 356.5 L 916.5 356.5 Z M 827.5 259.5 L 861.5 259.5 L 861.5 356.5 L 827.5 356.5 Z M 1357.5 209.5 L 1392.5 209.5 L 1392.5 356.5 L 1357.5 356.5 Z M 1357.5 209.5 "/>
 </clipPath>
-<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image434" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image435" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image408"/>
+  <use xlink:href="#image435"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface402">
+<g id="surface429">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -217,6 +217,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 916.410156 631.757812 L 897.492188 631.757812 L 892.308594 646.5 L 885.644531 646.5 L 903.148438 597.421875 L 911.226562 597.421875 L 928.460938 646.5 L 921.460938 646.5 Z M 914.660156 626.503906 L 907.121094 604.15625 L 899.042969 626.503906 Z M 914.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 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/ha/sky130_fd_sc_lp__ha_1.svg b/cells/ha/sky130_fd_sc_lp__ha_1.svg
index a9019e0..0b7d933 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_1.svg
+++ b/cells/ha/sky130_fd_sc_lp__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 539.5 L 367.5 539.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image444" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image444"/>
 </pattern>
 <mask 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="#image417"/>
+  <use xlink:href="#image444"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1239.5 655.5 L 1274.5 655.5 L 1274.5 751.5 L 1239.5 751.5 Z M 1150.5 655.5 L 1184.5 655.5 L 1184.5 751.5 L 1150.5 751.5 Z M 827.5 751.5 L 861.5 751.5 L 861.5 847.5 L 827.5 847.5 Z M 925.5 751.5 L 960.5 751.5 L 960.5 847.5 L 925.5 847.5 Z M 1360.5 655.5 L 1394.5 655.5 L 1394.5 847.5 L 1360.5 847.5 Z M 728.5 751.5 L 763.5 751.5 L 763.5 847.5 L 728.5 847.5 Z M 502.5 661.5 L 537.5 661.5 L 537.5 854.5 L 502.5 854.5 Z M 502.5 661.5 "/>
 </clipPath>
-<image id="image418" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image445" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image445"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 836.5 331.5 L 870.5 331.5 L 870.5 428.5 L 836.5 428.5 Z M 737.5 331.5 L 772.5 331.5 L 772.5 428.5 L 737.5 428.5 Z M 957.5 331.5 L 992.5 331.5 L 992.5 428.5 L 957.5 428.5 Z M 1150.5 331.5 L 1184.5 331.5 L 1184.5 428.5 L 1150.5 428.5 Z M 1248.5 331.5 L 1283.5 331.5 L 1283.5 428.5 L 1248.5 428.5 Z M 1378.5 209.5 L 1412.5 209.5 L 1412.5 498.5 L 1378.5 498.5 Z M 534.5 209.5 L 569.5 209.5 L 569.5 498.5 L 534.5 498.5 Z M 534.5 209.5 "/>
 </clipPath>
-<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image446" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image446"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image447" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image447"/>
 </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="surface441">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -217,6 +217,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1147.441406 547.496094 L 1147.304688 549.652344 L 1146.96875 551.605469 L 1146.363281 553.421875 L 1145.554688 555.039062 L 1144.480469 556.585938 L 1143.199219 557.933594 L 1141.785156 559.078125 L 1140.304688 559.953125 L 1138.621094 560.625 L 1136.871094 561.164062 L 1134.988281 561.433594 L 1132.96875 561.5 L 1110.820312 561.5 L 1110.820312 512.421875 L 1130.746094 512.421875 L 1133.640625 512.625 L 1136.199219 513.097656 L 1138.488281 513.902344 L 1140.441406 515.046875 L 1142.121094 516.53125 L 1143.46875 518.347656 L 1144.007812 519.355469 L 1144.480469 520.433594 L 1144.816406 521.445312 L 1145.085938 522.589844 L 1145.21875 523.734375 L 1145.285156 524.878906 L 1145.085938 527.300781 L 1144.480469 529.386719 L 1143.535156 531.339844 L 1142.191406 532.957031 L 1140.507812 534.4375 L 1138.488281 535.582031 L 1140.441406 536.457031 L 1142.121094 537.398438 L 1143.605469 538.476562 L 1144.816406 539.6875 L 1145.757812 540.96875 L 1146.5 542.3125 L 1146.769531 543.121094 L 1146.96875 543.929688 L 1147.171875 544.738281 L 1147.304688 545.679688 L 1147.375 546.554688 Z M 1139.027344 525.753906 L 1138.824219 523.734375 L 1138.21875 522.050781 L 1137.277344 520.570312 L 1135.929688 519.492188 L 1134.246094 518.683594 L 1132.160156 518.144531 L 1131.6875 518.144531 L 1131.214844 518.078125 L 1130.746094 518.011719 L 1129.667969 518.011719 L 1129.195312 517.941406 L 1117.078125 517.941406 L 1117.078125 533.5625 L 1129.195312 533.5625 L 1131.6875 533.425781 L 1133.84375 533.023438 L 1135.660156 532.28125 L 1137.007812 531.273438 L 1138.082031 529.925781 L 1138.757812 528.3125 L 1138.824219 527.972656 L 1138.957031 527.167969 L 1138.957031 526.222656 Z M 1132.359375 555.980469 L 1134.246094 555.914062 L 1135.929688 555.507812 L 1137.410156 554.835938 L 1138.621094 553.960938 L 1139.632812 552.816406 L 1140.441406 551.402344 L 1140.640625 550.863281 L 1140.777344 550.257812 L 1140.976562 549.585938 L 1141.046875 548.976562 L 1141.113281 548.304688 L 1141.179688 547.566406 L 1141.046875 546.082031 L 1140.777344 544.667969 L 1140.304688 543.457031 L 1139.632812 542.3125 L 1138.757812 541.371094 L 1137.746094 540.496094 L 1137.007812 540.09375 L 1136.199219 539.753906 L 1135.324219 539.484375 L 1134.378906 539.285156 L 1133.371094 539.148438 L 1132.359375 539.082031 L 1117.078125 539.082031 L 1117.078125 555.980469 Z M 1132.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 1106 562 L 1145 562 M 1106 523 L 1145 523 M 1106 523 L 1106 562 M 1145 523 L 1145 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 1106 562 L 1145 562 M 1106 523 L 1145 523 M 1145 562 L 1145 523 M 1106 562 L 1106 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/ha/sky130_fd_sc_lp__ha_2.svg b/cells/ha/sky130_fd_sc_lp__ha_2.svg
index 233837a..d30c026 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_2.svg
+++ b/cells/ha/sky130_fd_sc_lp__ha_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.5 111.5 "/>
 </clipPath>
-<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image397"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 885.5 672.5 L 920.5 672.5 L 920.5 768.5 L 885.5 768.5 Z M 968.5 672.5 L 1002.5 672.5 L 1002.5 768.5 L 968.5 768.5 Z M 665.5 683.5 L 699.5 683.5 L 699.5 780.5 L 665.5 780.5 Z M 567.5 683.5 L 601.5 683.5 L 601.5 780.5 L 567.5 780.5 Z M 468.5 683.5 L 502.5 683.5 L 502.5 780.5 L 468.5 780.5 Z M 1200.5 672.5 L 1235.5 672.5 L 1235.5 864.5 L 1200.5 864.5 Z M 1334.5 672.5 L 1369.5 672.5 L 1369.5 864.5 L 1334.5 864.5 Z M 1102.5 672.5 L 1136.5 672.5 L 1136.5 864.5 L 1102.5 864.5 Z M 1433.5 672.5 L 1467.5 672.5 L 1467.5 864.5 L 1433.5 864.5 Z M 1433.5 672.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 981.5 317.5 L 1016.5 317.5 L 1016.5 463.5 L 981.5 463.5 Z M 581.5 317.5 L 616.5 317.5 L 616.5 463.5 L 581.5 463.5 Z M 705.5 317.5 L 740.5 317.5 L 740.5 463.5 L 705.5 463.5 Z M 499.5 317.5 L 533.5 317.5 L 533.5 463.5 L 499.5 463.5 Z M 883.5 317.5 L 917.5 317.5 L 917.5 463.5 L 883.5 463.5 Z M 1299.5 209.5 L 1333.5 209.5 L 1333.5 498.5 L 1299.5 498.5 Z M 1200.5 209.5 L 1235.5 209.5 L 1235.5 498.5 L 1200.5 498.5 Z M 1397.5 209.5 L 1432.5 209.5 L 1432.5 498.5 L 1397.5 498.5 Z M 1102.5 209.5 L 1136.5 209.5 L 1136.5 498.5 L 1102.5 498.5 Z M 1102.5 209.5 "/>
 </clipPath>
-<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface394">
+<g id="surface422">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 652.441406 547.496094 L 652.304688 549.652344 L 651.96875 551.605469 L 651.363281 553.421875 L 650.554688 555.039062 L 649.480469 556.585938 L 648.199219 557.933594 L 646.785156 559.078125 L 645.304688 559.953125 L 643.621094 560.625 L 641.871094 561.164062 L 639.988281 561.433594 L 637.96875 561.5 L 615.820312 561.5 L 615.820312 512.421875 L 635.746094 512.421875 L 638.640625 512.625 L 641.199219 513.097656 L 643.488281 513.902344 L 645.441406 515.046875 L 647.121094 516.53125 L 648.46875 518.347656 L 649.007812 519.355469 L 649.480469 520.433594 L 649.816406 521.445312 L 650.085938 522.589844 L 650.21875 523.734375 L 650.285156 524.878906 L 650.085938 527.300781 L 649.480469 529.386719 L 648.535156 531.339844 L 647.191406 532.957031 L 645.507812 534.4375 L 643.488281 535.582031 L 645.441406 536.457031 L 647.121094 537.398438 L 648.605469 538.476562 L 649.816406 539.6875 L 650.757812 540.96875 L 651.5 542.3125 L 651.769531 543.121094 L 651.96875 543.929688 L 652.171875 544.738281 L 652.304688 545.679688 L 652.375 546.554688 Z M 644.027344 525.753906 L 643.824219 523.734375 L 643.21875 522.050781 L 642.277344 520.570312 L 640.929688 519.492188 L 639.246094 518.683594 L 637.160156 518.144531 L 636.6875 518.144531 L 636.214844 518.078125 L 635.746094 518.011719 L 634.667969 518.011719 L 634.195312 517.941406 L 622.078125 517.941406 L 622.078125 533.5625 L 634.195312 533.5625 L 636.6875 533.425781 L 638.84375 533.023438 L 640.660156 532.28125 L 642.007812 531.273438 L 643.082031 529.925781 L 643.757812 528.3125 L 643.824219 527.972656 L 643.957031 527.167969 L 643.957031 526.222656 Z M 637.359375 555.980469 L 639.246094 555.914062 L 640.929688 555.507812 L 642.410156 554.835938 L 643.621094 553.960938 L 644.632812 552.816406 L 645.441406 551.402344 L 645.640625 550.863281 L 645.777344 550.257812 L 645.976562 549.585938 L 646.046875 548.976562 L 646.113281 548.304688 L 646.179688 547.566406 L 646.046875 546.082031 L 645.777344 544.667969 L 645.304688 543.457031 L 644.632812 542.3125 L 643.757812 541.371094 L 642.746094 540.496094 L 642.007812 540.09375 L 641.199219 539.753906 L 640.324219 539.484375 L 639.378906 539.285156 L 638.371094 539.148438 L 637.359375 539.082031 L 622.078125 539.082031 L 622.078125 555.980469 Z M 637.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 611 562 L 650 562 M 611 523 L 650 523 M 611 523 L 611 562 M 650 523 L 650 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 611 562 L 650 562 M 611 523 L 650 523 M 650 562 L 650 523 M 611 562 L 611 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/ha/sky130_fd_sc_lp__ha_4.svg b/cells/ha/sky130_fd_sc_lp__ha_4.svg
index 7813793..dab886f 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_4.svg
+++ b/cells/ha/sky130_fd_sc_lp__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 175.5 257.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 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="#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 1604.5 610.5 L 1627.5 610.5 L 1627.5 736.5 L 1604.5 736.5 Z M 1540.5 610.5 L 1562.5 610.5 L 1562.5 736.5 L 1540.5 736.5 Z M 1359.5 610.5 L 1381.5 610.5 L 1381.5 736.5 L 1359.5 736.5 Z M 1294.5 610.5 L 1317.5 610.5 L 1317.5 736.5 L 1294.5 736.5 Z M 1475.5 610.5 L 1498.5 610.5 L 1498.5 736.5 L 1475.5 736.5 Z M 1206.5 610.5 L 1228.5 610.5 L 1228.5 736.5 L 1206.5 736.5 Z M 613.5 623.5 L 636.5 623.5 L 636.5 749.5 L 613.5 749.5 Z M 678.5 623.5 L 700.5 623.5 L 700.5 749.5 L 678.5 749.5 Z M 742.5 623.5 L 765.5 623.5 L 765.5 749.5 L 742.5 749.5 Z M 819.5 623.5 L 841.5 623.5 L 841.5 749.5 L 819.5 749.5 Z M 883.5 623.5 L 906.5 623.5 L 906.5 749.5 L 883.5 749.5 Z M 948.5 623.5 L 970.5 623.5 L 970.5 749.5 L 948.5 749.5 Z M 1018.5 623.5 L 1041.5 623.5 L 1041.5 749.5 L 1018.5 749.5 Z M 484.5 623.5 L 507.5 623.5 L 507.5 749.5 L 484.5 749.5 Z M 355.5 623.5 L 378.5 623.5 L 378.5 749.5 L 355.5 749.5 Z M 291.5 623.5 L 313.5 623.5 L 313.5 749.5 L 291.5 749.5 Z M 549.5 623.5 L 571.5 623.5 L 571.5 749.5 L 549.5 749.5 Z M 420.5 623.5 L 442.5 623.5 L 442.5 749.5 L 420.5 749.5 Z M 420.5 623.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 1633.5 320.5 L 1655.5 320.5 L 1655.5 509.5 L 1633.5 509.5 Z M 286.5 320.5 L 308.5 320.5 L 308.5 509.5 L 286.5 509.5 Z M 350.5 320.5 L 373.5 320.5 L 373.5 509.5 L 350.5 509.5 Z M 415.5 320.5 L 437.5 320.5 L 437.5 509.5 L 415.5 509.5 Z M 479.5 320.5 L 502.5 320.5 L 502.5 509.5 L 479.5 509.5 Z M 544.5 320.5 L 566.5 320.5 L 566.5 509.5 L 544.5 509.5 Z M 608.5 320.5 L 631.5 320.5 L 631.5 509.5 L 608.5 509.5 Z M 673.5 320.5 L 695.5 320.5 L 695.5 509.5 L 673.5 509.5 Z M 737.5 320.5 L 760.5 320.5 L 760.5 509.5 L 737.5 509.5 Z M 819.5 320.5 L 841.5 320.5 L 841.5 509.5 L 819.5 509.5 Z M 883.5 320.5 L 906.5 320.5 L 906.5 509.5 L 883.5 509.5 Z M 954.5 320.5 L 976.5 320.5 L 976.5 509.5 L 954.5 509.5 Z M 1018.5 320.5 L 1041.5 320.5 L 1041.5 509.5 L 1018.5 509.5 Z M 1206.5 320.5 L 1228.5 320.5 L 1228.5 509.5 L 1206.5 509.5 Z M 1270.5 320.5 L 1293.5 320.5 L 1293.5 509.5 L 1270.5 509.5 Z M 1375.5 320.5 L 1398.5 320.5 L 1398.5 509.5 L 1375.5 509.5 Z M 1440.5 320.5 L 1462.5 320.5 L 1462.5 509.5 L 1440.5 509.5 Z M 1529.5 320.5 L 1552.5 320.5 L 1552.5 509.5 L 1529.5 509.5 Z M 1529.5 320.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1594.5 633.5 L 1620.5 633.5 L 1620.5 641.5 L 1594.5 641.5 Z M 1594.5 641.5 L 1620.5 641.5 L 1620.5 659.5 L 1594.5 659.5 Z M 514.5 633.5 L 540.5 633.5 L 540.5 659.5 L 514.5 659.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="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>
@@ -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 1110.109375 541.976562 L 1097.890625 541.976562 L 1094.542969 551.5 L 1090.238281 551.5 L 1101.542969 519.804688 L 1106.761719 519.804688 L 1117.890625 551.5 L 1113.371094 551.5 Z M 1108.976562 538.585938 L 1104.109375 524.152344 L 1098.890625 538.585938 Z M 1108.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 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/ha/sky130_fd_sc_lp__ha_lp.svg b/cells/ha/sky130_fd_sc_lp__ha_lp.svg
index 7ff54ef..da307d8 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_lp.svg
+++ b/cells/ha/sky130_fd_sc_lp__ha_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.5 111.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 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="#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 451.5 617.5 L 485.5 617.5 L 485.5 713.5 L 451.5 713.5 Z M 533.5 617.5 L 568.5 617.5 L 568.5 713.5 L 533.5 713.5 Z M 1255.5 679.5 L 1290.5 679.5 L 1290.5 775.5 L 1255.5 775.5 Z M 1173.5 679.5 L 1207.5 679.5 L 1207.5 775.5 L 1173.5 775.5 Z M 1354.5 679.5 L 1388.5 679.5 L 1388.5 775.5 L 1354.5 775.5 Z M 1436.5 679.5 L 1471.5 679.5 L 1471.5 775.5 L 1436.5 775.5 Z M 744.5 768.5 L 779.5 768.5 L 779.5 864.5 L 744.5 864.5 Z M 941.5 768.5 L 976.5 768.5 L 976.5 864.5 L 941.5 864.5 Z M 843.5 768.5 L 877.5 768.5 L 877.5 864.5 L 843.5 864.5 Z M 843.5 768.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 1392.5 209.5 L 1449.5 209.5 L 1449.5 438.5 L 1392.5 438.5 Z M 573.5 209.5 L 631.5 209.5 L 631.5 438.5 L 573.5 438.5 Z M 695.5 209.5 L 752.5 209.5 L 752.5 438.5 L 695.5 438.5 Z M 863.5 209.5 L 921.5 209.5 L 921.5 438.5 L 863.5 438.5 Z M 994.5 209.5 L 1051.5 209.5 L 1051.5 438.5 L 994.5 438.5 Z M 1127.5 209.5 L 1184.5 209.5 L 1184.5 438.5 L 1127.5 438.5 Z M 1248.5 209.5 L 1306.5 209.5 L 1306.5 438.5 L 1248.5 438.5 Z M 1248.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -220,6 +220,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1591.71875 263.394531 L 1591.71875 306.953125 L 1585.457031 306.953125 L 1585.457031 263.394531 L 1569.300781 263.394531 L 1569.300781 257.875 L 1607.808594 257.875 L 1607.808594 263.394531 Z M 1591.71875 263.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 1491 816 L 1530 816 M 1491 777 L 1530 777 M 1491 777 L 1491 816 M 1530 777 L 1530 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 1491 816 L 1530 816 M 1491 777 L 1530 777 M 1530 816 L 1530 777 M 1491 816 L 1491 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/ha/sky130_fd_sc_lp__ha_m.svg b/cells/ha/sky130_fd_sc_lp__ha_m.svg
index a216093..1e8365a 100644
--- a/cells/ha/sky130_fd_sc_lp__ha_m.svg
+++ b/cells/ha/sky130_fd_sc_lp__ha_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image418" 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="#image418"/>
+  <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 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="#image418"/>
+  <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 1284.5 679.5 L 1318.5 679.5 L 1318.5 775.5 L 1284.5 775.5 Z M 1382.5 679.5 L 1417.5 679.5 L 1417.5 775.5 L 1382.5 775.5 Z M 1201.5 679.5 L 1236.5 679.5 L 1236.5 775.5 L 1201.5 775.5 Z M 502.5 723.5 L 537.5 723.5 L 537.5 820.5 L 502.5 820.5 Z M 721.5 768.5 L 756.5 768.5 L 756.5 864.5 L 721.5 864.5 Z M 820.5 768.5 L 854.5 768.5 L 854.5 864.5 L 820.5 864.5 Z M 955.5 768.5 L 989.5 768.5 L 989.5 864.5 L 955.5 864.5 Z M 955.5 768.5 "/>
 </clipPath>
-<image id="image419" 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="#image419"/>
+  <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 655.5 290.5 L 689.5 290.5 L 689.5 386.5 L 655.5 386.5 Z M 793.5 290.5 L 828.5 290.5 L 828.5 386.5 L 793.5 386.5 Z M 1000.5 290.5 L 1034.5 290.5 L 1034.5 386.5 L 1000.5 386.5 Z M 892.5 290.5 L 926.5 290.5 L 926.5 386.5 L 892.5 386.5 Z M 1382.5 360.5 L 1417.5 360.5 L 1417.5 456.5 L 1382.5 456.5 Z M 1142.5 360.5 L 1176.5 360.5 L 1176.5 456.5 L 1142.5 456.5 Z M 1284.5 360.5 L 1318.5 360.5 L 1318.5 456.5 L 1284.5 456.5 Z M 1284.5 360.5 "/>
 </clipPath>
-<image id="image420" 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="#image420"/>
+  <use xlink:href="#image447"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image421" 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="#image421"/>
+  <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="surface415">
+<g id="surface442">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -217,6 +217,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1147.441406 462.496094 L 1147.304688 464.652344 L 1146.96875 466.605469 L 1146.363281 468.421875 L 1145.554688 470.039062 L 1144.480469 471.585938 L 1143.199219 472.933594 L 1141.785156 474.078125 L 1140.304688 474.953125 L 1138.621094 475.625 L 1136.871094 476.164062 L 1134.988281 476.433594 L 1132.96875 476.5 L 1110.820312 476.5 L 1110.820312 427.421875 L 1130.746094 427.421875 L 1133.640625 427.625 L 1136.199219 428.097656 L 1138.488281 428.902344 L 1140.441406 430.046875 L 1142.121094 431.53125 L 1143.46875 433.347656 L 1144.007812 434.355469 L 1144.480469 435.433594 L 1144.816406 436.445312 L 1145.085938 437.589844 L 1145.21875 438.734375 L 1145.285156 439.878906 L 1145.085938 442.300781 L 1144.480469 444.386719 L 1143.535156 446.339844 L 1142.191406 447.957031 L 1140.507812 449.4375 L 1138.488281 450.582031 L 1140.441406 451.457031 L 1142.121094 452.398438 L 1143.605469 453.476562 L 1144.816406 454.6875 L 1145.757812 455.96875 L 1146.5 457.3125 L 1146.769531 458.121094 L 1146.96875 458.929688 L 1147.171875 459.738281 L 1147.304688 460.679688 L 1147.375 461.554688 Z M 1139.027344 440.753906 L 1138.824219 438.734375 L 1138.21875 437.050781 L 1137.277344 435.570312 L 1135.929688 434.492188 L 1134.246094 433.683594 L 1132.160156 433.144531 L 1131.6875 433.144531 L 1131.214844 433.078125 L 1130.746094 433.011719 L 1129.667969 433.011719 L 1129.195312 432.941406 L 1117.078125 432.941406 L 1117.078125 448.5625 L 1129.195312 448.5625 L 1131.6875 448.425781 L 1133.84375 448.023438 L 1135.660156 447.28125 L 1137.007812 446.273438 L 1138.082031 444.925781 L 1138.757812 443.3125 L 1138.824219 442.972656 L 1138.957031 442.167969 L 1138.957031 441.222656 Z M 1132.359375 470.980469 L 1134.246094 470.914062 L 1135.929688 470.507812 L 1137.410156 469.835938 L 1138.621094 468.960938 L 1139.632812 467.816406 L 1140.441406 466.402344 L 1140.640625 465.863281 L 1140.777344 465.257812 L 1140.976562 464.585938 L 1141.046875 463.976562 L 1141.113281 463.304688 L 1141.179688 462.566406 L 1141.046875 461.082031 L 1140.777344 459.667969 L 1140.304688 458.457031 L 1139.632812 457.3125 L 1138.757812 456.371094 L 1137.746094 455.496094 L 1137.007812 455.09375 L 1136.199219 454.753906 L 1135.324219 454.484375 L 1134.378906 454.285156 L 1133.371094 454.148438 L 1132.359375 454.082031 L 1117.078125 454.082031 L 1117.078125 470.980469 Z M 1132.359375 470.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 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/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.svg b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.svg
index e3f2e1e..651a23f 100644
--- a/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.svg
+++ b/cells/inputiso0n/sky130_fd_sc_lp__inputiso0n_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 534.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 534.5 539.5 Z M 534.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="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 578.5 862.5 L 1348.5 862.5 L 1348.5 918.5 L 578.5 918.5 Z M 578.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="#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 1191.5 715.5 L 1225.5 715.5 L 1225.5 812.5 L 1191.5 812.5 Z M 797.5 715.5 L 831.5 715.5 L 831.5 812.5 L 797.5 812.5 Z M 879.5 715.5 L 914.5 715.5 L 914.5 812.5 L 879.5 812.5 Z M 1109.5 715.5 L 1143.5 715.5 L 1143.5 812.5 L 1109.5 812.5 Z M 1109.5 715.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 895.5 262.5 L 930.5 262.5 L 930.5 358.5 L 895.5 358.5 Z M 978.5 262.5 L 1012.5 262.5 L 1012.5 358.5 L 978.5 358.5 Z M 714.5 262.5 L 749.5 262.5 L 749.5 358.5 L 714.5 358.5 Z M 797.5 262.5 L 831.5 262.5 L 831.5 358.5 L 797.5 358.5 Z M 1191.5 209.5 L 1225.5 209.5 L 1225.5 498.5 L 1191.5 498.5 Z M 1109.5 209.5 L 1143.5 209.5 L 1143.5 498.5 L 1109.5 498.5 Z M 1109.5 209.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 614.5 136.5 L 653.5 136.5 L 653.5 174.5 L 614.5 174.5 Z M 1274.5 136.5 L 1313.5 136.5 L 1313.5 174.5 L 1274.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 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 614.5 899.5 L 653.5 899.5 L 653.5 938.5 L 614.5 938.5 Z M 1274.5 899.5 L 1313.5 899.5 L 1313.5 938.5 L 1274.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 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 724.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="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 996.976562 904.597656 L 996.976562 875.96875 L 1008.011719 875.96875 L 1009.738281 876.085938 L 1011.351562 876.402344 L 1012.84375 876.949219 L 1014.214844 877.65625 L 1015.433594 878.640625 L 1016.574219 879.777344 L 1017.515625 881.152344 L 1018.300781 882.644531 L 1018.890625 884.332031 L 1019.320312 886.140625 L 1019.558594 888.140625 L 1019.675781 890.261719 L 1019.558594 892.5 L 1019.28125 894.582031 L 1018.8125 896.46875 L 1018.183594 898.195312 L 1017.359375 899.726562 L 1016.335938 901.0625 L 1015.238281 902.160156 L 1014.019531 903.027344 L 1012.683594 903.734375 L 1011.230469 904.203125 L 1009.660156 904.519531 L 1008.011719 904.597656 Z M 1000.628906 901.375 L 1007.382812 901.375 L 1009.191406 901.257812 L 1010.800781 900.828125 L 1012.214844 900.082031 L 1013.390625 899.097656 L 1014.335938 897.765625 L 1015.121094 896.152344 L 1015.355469 895.328125 L 1015.589844 894.464844 L 1015.789062 893.523438 L 1015.90625 892.5 L 1015.984375 891.441406 L 1016.023438 890.300781 L 1015.867188 887.75 L 1015.472656 885.511719 L 1014.765625 883.585938 L 1013.824219 882.054688 L 1012.605469 880.796875 L 1011.113281 879.894531 L 1010.566406 879.699219 L 1009.976562 879.503906 L 1009.347656 879.386719 L 1008.71875 879.265625 L 1007.382812 879.1875 L 1000.628906 879.1875 Z M 1000.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 578 217 L 1348 217 M 578 161 L 1348 161 M 578 161 L 578 217 M 1348 161 L 1348 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 578 217 L 1348 217 M 578 161 L 1348 161 M 1348 217 L 1348 161 M 578 217 L 578 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 578 156 L 578 165 M 573 161 L 582 161 M 577 162 L 579 162 M 577 160 L 579 160 M 577 160 L 577 162 M 579 160 L 579 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.svg b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.svg
index 4bd4ce7..5a37728 100644
--- a/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.svg
+++ b/cells/inputiso0p/sky130_fd_sc_lp__inputiso0p_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 479.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 479.5 539.5 Z M 479.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="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 523.5 862.5 L 1403.5 862.5 L 1403.5 918.5 L 523.5 918.5 Z M 523.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="#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 1261.5 715.5 L 1295.5 715.5 L 1295.5 812.5 L 1261.5 812.5 Z M 617.5 715.5 L 651.5 715.5 L 651.5 812.5 L 617.5 812.5 Z M 699.5 715.5 L 734.5 715.5 L 734.5 812.5 L 699.5 812.5 Z M 878.5 715.5 L 913.5 715.5 L 913.5 812.5 L 878.5 812.5 Z M 961.5 715.5 L 995.5 715.5 L 995.5 812.5 L 961.5 812.5 Z M 1178.5 715.5 L 1213.5 715.5 L 1213.5 812.5 L 1178.5 812.5 Z M 1178.5 715.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 798.5 262.5 L 832.5 262.5 L 832.5 358.5 L 798.5 358.5 Z M 881.5 262.5 L 915.5 262.5 L 915.5 358.5 L 881.5 358.5 Z M 617.5 262.5 L 651.5 262.5 L 651.5 358.5 L 617.5 358.5 Z M 699.5 262.5 L 734.5 262.5 L 734.5 358.5 L 699.5 358.5 Z M 984.5 262.5 L 1018.5 262.5 L 1018.5 358.5 L 984.5 358.5 Z M 1066.5 262.5 L 1101.5 262.5 L 1101.5 358.5 L 1066.5 358.5 Z M 1261.5 209.5 L 1295.5 209.5 L 1295.5 498.5 L 1261.5 498.5 Z M 1178.5 209.5 L 1213.5 209.5 L 1213.5 498.5 L 1178.5 498.5 Z M 1178.5 209.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 559.5 136.5 L 598.5 136.5 L 598.5 174.5 L 559.5 174.5 Z M 1329.5 136.5 L 1368.5 136.5 L 1368.5 174.5 L 1329.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 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 559.5 899.5 L 598.5 899.5 L 598.5 938.5 L 559.5 938.5 Z M 1329.5 899.5 L 1368.5 899.5 L 1368.5 938.5 L 1329.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 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 669.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="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface312">
+<g id="surface339">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 996.976562 904.597656 L 996.976562 875.96875 L 1008.011719 875.96875 L 1009.738281 876.085938 L 1011.351562 876.402344 L 1012.84375 876.949219 L 1014.214844 877.65625 L 1015.433594 878.640625 L 1016.574219 879.777344 L 1017.515625 881.152344 L 1018.300781 882.644531 L 1018.890625 884.332031 L 1019.320312 886.140625 L 1019.558594 888.140625 L 1019.675781 890.261719 L 1019.558594 892.5 L 1019.28125 894.582031 L 1018.8125 896.46875 L 1018.183594 898.195312 L 1017.359375 899.726562 L 1016.335938 901.0625 L 1015.238281 902.160156 L 1014.019531 903.027344 L 1012.683594 903.734375 L 1011.230469 904.203125 L 1009.660156 904.519531 L 1008.011719 904.597656 Z M 1000.628906 901.375 L 1007.382812 901.375 L 1009.191406 901.257812 L 1010.800781 900.828125 L 1012.214844 900.082031 L 1013.390625 899.097656 L 1014.335938 897.765625 L 1015.121094 896.152344 L 1015.355469 895.328125 L 1015.589844 894.464844 L 1015.789062 893.523438 L 1015.90625 892.5 L 1015.984375 891.441406 L 1016.023438 890.300781 L 1015.867188 887.75 L 1015.472656 885.511719 L 1014.765625 883.585938 L 1013.824219 882.054688 L 1012.605469 880.796875 L 1011.113281 879.894531 L 1010.566406 879.699219 L 1009.976562 879.503906 L 1009.347656 879.386719 L 1008.71875 879.265625 L 1007.382812 879.1875 L 1000.628906 879.1875 Z M 1000.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 523 217 L 1403 217 M 523 161 L 1403 161 M 523 161 L 523 217 M 1403 161 L 1403 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 523 217 L 1403 217 M 523 161 L 1403 161 M 1403 217 L 1403 161 M 523 217 L 523 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 523 156 L 523 165 M 518 161 L 527 161 M 522 162 L 524 162 M 522 160 L 524 160 M 522 160 L 522 162 M 524 160 L 524 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.svg b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.svg
index 011ea43..132a6d9 100644
--- a/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.svg
+++ b/cells/inputiso1n/sky130_fd_sc_lp__inputiso1n_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 476.5 111.5 L 1449.5 111.5 L 1449.5 539.5 L 476.5 539.5 Z M 476.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="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 526.5 862.5 L 1407.5 862.5 L 1407.5 918.5 L 526.5 918.5 Z M 526.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="#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 1264.5 715.5 L 1299.5 715.5 L 1299.5 812.5 L 1264.5 812.5 Z M 618.5 715.5 L 653.5 715.5 L 653.5 812.5 L 618.5 812.5 Z M 701.5 715.5 L 735.5 715.5 L 735.5 812.5 L 701.5 812.5 Z M 799.5 715.5 L 834.5 715.5 L 834.5 812.5 L 799.5 812.5 Z M 882.5 715.5 L 916.5 715.5 L 916.5 812.5 L 882.5 812.5 Z M 994.5 715.5 L 1028.5 715.5 L 1028.5 812.5 L 994.5 812.5 Z M 1077.5 715.5 L 1111.5 715.5 L 1111.5 812.5 L 1077.5 812.5 Z M 1182.5 715.5 L 1216.5 715.5 L 1216.5 812.5 L 1182.5 812.5 Z M 1182.5 715.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 882.5 262.5 L 916.5 262.5 L 916.5 358.5 L 882.5 358.5 Z M 964.5 262.5 L 999.5 262.5 L 999.5 358.5 L 964.5 358.5 Z M 669.5 262.5 L 703.5 262.5 L 703.5 358.5 L 669.5 358.5 Z M 758.5 262.5 L 792.5 262.5 L 792.5 358.5 L 758.5 358.5 Z M 1264.5 209.5 L 1299.5 209.5 L 1299.5 498.5 L 1264.5 498.5 Z M 1182.5 209.5 L 1216.5 209.5 L 1216.5 498.5 L 1182.5 498.5 Z M 1182.5 209.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 136.5 L 601.5 136.5 L 601.5 174.5 L 562.5 174.5 Z M 1332.5 136.5 L 1371.5 136.5 L 1371.5 174.5 L 1332.5 174.5 Z M 1222.5 136.5 L 1261.5 136.5 L 1261.5 174.5 L 1222.5 174.5 Z M 1112.5 136.5 L 1151.5 136.5 L 1151.5 174.5 L 1112.5 174.5 Z M 1002.5 136.5 L 1041.5 136.5 L 1041.5 174.5 L 1002.5 174.5 Z M 892.5 136.5 L 931.5 136.5 L 931.5 174.5 L 892.5 174.5 Z M 782.5 136.5 L 821.5 136.5 L 821.5 174.5 L 782.5 174.5 Z M 672.5 136.5 L 711.5 136.5 L 711.5 174.5 L 672.5 174.5 Z M 562.5 899.5 L 601.5 899.5 L 601.5 938.5 L 562.5 938.5 Z M 1332.5 899.5 L 1371.5 899.5 L 1371.5 938.5 L 1332.5 938.5 Z M 1222.5 899.5 L 1261.5 899.5 L 1261.5 938.5 L 1222.5 938.5 Z M 1112.5 899.5 L 1151.5 899.5 L 1151.5 938.5 L 1112.5 938.5 Z M 1002.5 899.5 L 1041.5 899.5 L 1041.5 938.5 L 1002.5 938.5 Z M 892.5 899.5 L 931.5 899.5 L 931.5 938.5 L 892.5 938.5 Z M 782.5 899.5 L 821.5 899.5 L 821.5 938.5 L 782.5 938.5 Z M 672.5 899.5 L 711.5 899.5 L 711.5 938.5 L 672.5 938.5 Z M 672.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="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface324">
+<g id="surface351">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1000.976562 904.597656 L 1000.976562 875.96875 L 1012.011719 875.96875 L 1013.738281 876.085938 L 1015.351562 876.402344 L 1016.84375 876.949219 L 1018.214844 877.65625 L 1019.433594 878.640625 L 1020.574219 879.777344 L 1021.515625 881.152344 L 1022.300781 882.644531 L 1022.890625 884.332031 L 1023.320312 886.140625 L 1023.558594 888.140625 L 1023.675781 890.261719 L 1023.558594 892.5 L 1023.28125 894.582031 L 1022.8125 896.46875 L 1022.183594 898.195312 L 1021.359375 899.726562 L 1020.335938 901.0625 L 1019.238281 902.160156 L 1018.019531 903.027344 L 1016.683594 903.734375 L 1015.230469 904.203125 L 1013.660156 904.519531 L 1012.011719 904.597656 Z M 1004.628906 901.375 L 1011.382812 901.375 L 1013.191406 901.257812 L 1014.800781 900.828125 L 1016.214844 900.082031 L 1017.390625 899.097656 L 1018.335938 897.765625 L 1019.121094 896.152344 L 1019.355469 895.328125 L 1019.589844 894.464844 L 1019.789062 893.523438 L 1019.90625 892.5 L 1019.984375 891.441406 L 1020.023438 890.300781 L 1019.867188 887.75 L 1019.472656 885.511719 L 1018.765625 883.585938 L 1017.824219 882.054688 L 1016.605469 880.796875 L 1015.113281 879.894531 L 1014.566406 879.699219 L 1013.976562 879.503906 L 1013.347656 879.386719 L 1012.71875 879.265625 L 1011.382812 879.1875 L 1004.628906 879.1875 Z M 1004.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 526 217 L 1407 217 M 526 161 L 1407 161 M 526 161 L 526 217 M 1407 161 L 1407 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 526 217 L 1407 217 M 526 161 L 1407 161 M 1407 217 L 1407 161 M 526 217 L 526 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 526 156 L 526 165 M 521 161 L 530 161 M 525 162 L 527 162 M 525 160 L 527 160 M 525 160 L 525 162 M 527 160 L 527 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.svg b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.svg
index bc45595..a0a0c0e 100644
--- a/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.svg
+++ b/cells/inputiso1p/sky130_fd_sc_lp__inputiso1p_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 534.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 534.5 539.5 Z M 534.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="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 578.5 862.5 L 1348.5 862.5 L 1348.5 918.5 L 578.5 918.5 Z M 578.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="#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 1191.5 715.5 L 1225.5 715.5 L 1225.5 812.5 L 1191.5 812.5 Z M 746.5 715.5 L 781.5 715.5 L 781.5 812.5 L 746.5 812.5 Z M 829.5 715.5 L 863.5 715.5 L 863.5 812.5 L 829.5 812.5 Z M 928.5 715.5 L 962.5 715.5 L 962.5 812.5 L 928.5 812.5 Z M 1010.5 715.5 L 1044.5 715.5 L 1044.5 812.5 L 1010.5 812.5 Z M 1109.5 715.5 L 1143.5 715.5 L 1143.5 812.5 L 1109.5 812.5 Z M 1109.5 715.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 907.5 262.5 L 941.5 262.5 L 941.5 358.5 L 907.5 358.5 Z M 824.5 262.5 L 859.5 262.5 L 859.5 358.5 L 824.5 358.5 Z M 1191.5 209.5 L 1225.5 209.5 L 1225.5 498.5 L 1191.5 498.5 Z M 1109.5 209.5 L 1143.5 209.5 L 1143.5 498.5 L 1109.5 498.5 Z M 1109.5 209.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 614.5 136.5 L 653.5 136.5 L 653.5 174.5 L 614.5 174.5 Z M 1274.5 136.5 L 1313.5 136.5 L 1313.5 174.5 L 1274.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 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 614.5 899.5 L 653.5 899.5 L 653.5 938.5 L 614.5 938.5 Z M 1274.5 899.5 L 1313.5 899.5 L 1313.5 938.5 L 1274.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 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 724.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="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface300">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 996.976562 904.597656 L 996.976562 875.96875 L 1008.011719 875.96875 L 1009.738281 876.085938 L 1011.351562 876.402344 L 1012.84375 876.949219 L 1014.214844 877.65625 L 1015.433594 878.640625 L 1016.574219 879.777344 L 1017.515625 881.152344 L 1018.300781 882.644531 L 1018.890625 884.332031 L 1019.320312 886.140625 L 1019.558594 888.140625 L 1019.675781 890.261719 L 1019.558594 892.5 L 1019.28125 894.582031 L 1018.8125 896.46875 L 1018.183594 898.195312 L 1017.359375 899.726562 L 1016.335938 901.0625 L 1015.238281 902.160156 L 1014.019531 903.027344 L 1012.683594 903.734375 L 1011.230469 904.203125 L 1009.660156 904.519531 L 1008.011719 904.597656 Z M 1000.628906 901.375 L 1007.382812 901.375 L 1009.191406 901.257812 L 1010.800781 900.828125 L 1012.214844 900.082031 L 1013.390625 899.097656 L 1014.335938 897.765625 L 1015.121094 896.152344 L 1015.355469 895.328125 L 1015.589844 894.464844 L 1015.789062 893.523438 L 1015.90625 892.5 L 1015.984375 891.441406 L 1016.023438 890.300781 L 1015.867188 887.75 L 1015.472656 885.511719 L 1014.765625 883.585938 L 1013.824219 882.054688 L 1012.605469 880.796875 L 1011.113281 879.894531 L 1010.566406 879.699219 L 1009.976562 879.503906 L 1009.347656 879.386719 L 1008.71875 879.265625 L 1007.382812 879.1875 L 1000.628906 879.1875 Z M 1000.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 578 217 L 1348 217 M 578 161 L 1348 161 M 578 161 L 578 217 M 1348 161 L 1348 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 578 217 L 1348 217 M 578 161 L 1348 161 M 1348 217 L 1348 161 M 578 217 L 578 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 578 156 L 578 165 M 573 161 L 582 161 M 577 162 L 579 162 M 577 160 L 579 160 M 577 160 L 577 162 M 579 160 L 579 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.svg b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.svg
index 751837c..a7e1b57 100644
--- a/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.svg
+++ b/cells/inputisolatch/sky130_fd_sc_lp__inputisolatch_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1587.5 611.5 L 1618.5 611.5 L 1618.5 698.5 L 1587.5 698.5 Z M 1512.5 611.5 L 1543.5 611.5 L 1543.5 698.5 L 1512.5 698.5 Z M 423.5 665.5 L 454.5 665.5 L 454.5 752.5 L 423.5 752.5 Z M 504.5 665.5 L 535.5 665.5 L 535.5 752.5 L 504.5 752.5 Z M 1227.5 698.5 L 1258.5 698.5 L 1258.5 785.5 L 1227.5 785.5 Z M 1049.5 698.5 L 1080.5 698.5 L 1080.5 785.5 L 1049.5 785.5 Z M 1302.5 698.5 L 1333.5 698.5 L 1333.5 785.5 L 1302.5 785.5 Z M 1124.5 698.5 L 1155.5 698.5 L 1155.5 785.5 L 1124.5 785.5 Z M 617.5 718.5 L 648.5 718.5 L 648.5 805.5 L 617.5 805.5 Z M 722.5 718.5 L 753.5 718.5 L 753.5 805.5 L 722.5 805.5 Z M 310.5 718.5 L 341.5 718.5 L 341.5 805.5 L 310.5 805.5 Z M 803.5 718.5 L 834.5 718.5 L 834.5 805.5 L 803.5 805.5 Z M 803.5 718.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 304.5 240.5 L 335.5 240.5 L 335.5 327.5 L 304.5 327.5 Z M 474.5 240.5 L 505.5 240.5 L 505.5 327.5 L 474.5 327.5 Z M 688.5 240.5 L 740.5 240.5 L 740.5 447.5 L 688.5 447.5 Z M 798.5 240.5 L 849.5 240.5 L 849.5 447.5 L 798.5 447.5 Z M 586.5 240.5 L 638.5 240.5 L 638.5 447.5 L 586.5 447.5 Z M 1132.5 319.5 L 1163.5 319.5 L 1163.5 451.5 L 1132.5 451.5 Z M 1382.5 273.5 L 1433.5 273.5 L 1433.5 480.5 L 1382.5 480.5 Z M 1491.5 273.5 L 1543.5 273.5 L 1543.5 480.5 L 1491.5 480.5 Z M 1491.5 273.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface308">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1678.734375 481.921875 L 1675.832031 485.5 L 1669.355469 480.132812 L 1667.503906 481.117188 L 1665.652344 481.859375 L 1663.738281 482.476562 L 1661.703125 482.90625 L 1659.664062 483.15625 L 1657.566406 483.277344 L 1654.730469 483.09375 L 1652.074219 482.660156 L 1649.605469 481.921875 L 1647.261719 480.933594 L 1645.039062 479.636719 L 1643.066406 477.972656 L 1641.277344 476.179688 L 1639.734375 474.144531 L 1638.5 471.921875 L 1637.449219 469.515625 L 1636.648438 466.925781 L 1636.152344 464.085938 L 1636.03125 463.40625 L 1635.96875 462.667969 L 1635.90625 461.988281 L 1635.84375 461.246094 L 1635.84375 459.703125 L 1635.96875 456.621094 L 1636.402344 453.65625 L 1637.078125 450.941406 L 1638.066406 448.351562 L 1639.300781 445.941406 L 1640.90625 443.722656 L 1642.511719 441.933594 L 1644.359375 440.328125 L 1646.398438 438.96875 L 1648.558594 437.921875 L 1650.902344 437.058594 L 1653.496094 436.441406 L 1654.113281 436.378906 L 1654.789062 436.316406 L 1656.148438 436.191406 L 1656.828125 436.191406 L 1657.566406 436.132812 L 1660.34375 436.316406 L 1662.996094 436.75 L 1665.464844 437.488281 L 1667.8125 438.476562 L 1670.03125 439.773438 L 1672.070312 441.375 L 1673.796875 443.226562 L 1675.339844 445.203125 L 1676.574219 447.363281 L 1677.625 449.769531 L 1678.425781 452.359375 L 1678.980469 455.078125 L 1679.042969 455.878906 L 1679.105469 456.621094 L 1679.167969 457.359375 L 1679.226562 458.101562 L 1679.226562 458.839844 L 1679.289062 459.582031 L 1679.105469 463.039062 L 1678.550781 466.308594 L 1677.683594 469.332031 L 1676.449219 472.171875 L 1674.847656 474.761719 L 1672.933594 477.167969 Z M 1663.183594 469.207031 L 1668.675781 473.714844 L 1670.15625 471.863281 L 1671.390625 469.765625 L 1672.316406 467.480469 L 1672.996094 465.074219 L 1673.367188 462.480469 L 1673.550781 459.644531 L 1673.425781 457.050781 L 1673.058594 454.582031 L 1672.441406 452.300781 L 1671.636719 450.203125 L 1670.589844 448.226562 L 1669.292969 446.4375 L 1667.8125 444.957031 L 1666.269531 443.722656 L 1664.539062 442.734375 L 1662.6875 441.992188 L 1660.652344 441.5 L 1658.554688 441.191406 L 1657.566406 441.191406 L 1655.347656 441.375 L 1653.246094 441.746094 L 1651.273438 442.363281 L 1649.484375 443.289062 L 1647.816406 444.460938 L 1646.335938 445.882812 L 1644.917969 447.546875 L 1643.804688 449.398438 L 1642.878906 451.433594 L 1642.203125 453.65625 L 1641.769531 456.0625 L 1641.585938 458.65625 L 1641.585938 459.703125 L 1641.644531 462.421875 L 1642.015625 464.886719 L 1642.632812 467.171875 L 1643.433594 469.332031 L 1644.546875 471.304688 L 1645.902344 473.035156 L 1647.324219 474.578125 L 1648.929688 475.8125 L 1650.65625 476.796875 L 1652.507812 477.476562 L 1654.542969 477.972656 L 1656.703125 478.15625 L 1656.828125 478.21875 L 1658.617188 478.21875 L 1659.789062 478.09375 L 1660.960938 477.847656 L 1662.070312 477.601562 L 1663.183594 477.230469 L 1664.355469 476.738281 L 1664.417969 476.738281 L 1664.539062 476.675781 L 1664.601562 476.613281 L 1664.726562 476.613281 L 1664.789062 476.550781 L 1664.910156 476.488281 L 1660.34375 472.664062 Z M 1663.183594 469.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 637 L 1673 637 M 1637 602 L 1673 602 M 1637 602 L 1637 637 M 1673 602 L 1673 637 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 637 L 1673 637 M 1637 602 L 1673 602 M 1673 637 L 1673 602 M 1637 637 L 1637 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(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/inv/sky130_fd_sc_lp__inv_0.svg b/cells/inv/sky130_fd_sc_lp__inv_0.svg
index 7e1fd5a..ab7fd4b 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_0.svg
+++ b/cells/inv/sky130_fd_sc_lp__inv_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 539.5 L 812.5 539.5 Z M 812.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="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="#image292"/>
+  <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 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="#image292"/>
+  <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 949.5 742.5 L 984.5 742.5 L 984.5 838.5 L 949.5 838.5 Z M 949.5 742.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <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 949.5 242.5 L 984.5 242.5 L 984.5 389.5 L 949.5 389.5 Z M 949.5 242.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image295" 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="#image295"/>
+  <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="surface289">
+<g id="surface339">
 <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 1024.554688 288.246094 L 1024.554688 307.5 L 1018.292969 307.5 L 1018.292969 288.246094 L 999.375 258.421875 L 1007.117188 258.421875 L 1021.523438 282.320312 L 1035.527344 258.421875 L 1043 258.421875 Z M 1024.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 1001 816 L 1040 816 M 1001 777 L 1040 777 M 1001 777 L 1001 816 M 1040 777 L 1040 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 1001 816 L 1040 816 M 1001 777 L 1040 777 M 1040 816 L 1040 777 M 1001 816 L 1001 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 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/inv/sky130_fd_sc_lp__inv_1.svg b/cells/inv/sky130_fd_sc_lp__inv_1.svg
index aa41d65..9ed84ee 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_1.svg
+++ b/cells/inv/sky130_fd_sc_lp__inv_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 539.5 L 812.5 539.5 Z M 812.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="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="#image292"/>
+  <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 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="#image292"/>
+  <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 949.5 666.5 L 984.5 666.5 L 984.5 859.5 L 949.5 859.5 Z M 949.5 666.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <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 949.5 209.5 L 984.5 209.5 L 984.5 498.5 L 949.5 498.5 Z M 949.5 209.5 "/>
 </clipPath>
-<image id="image294" 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="#image294"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image295" 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="#image295"/>
+  <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="surface289">
+<g id="surface339">
 <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 1024.554688 288.246094 L 1024.554688 307.5 L 1018.292969 307.5 L 1018.292969 288.246094 L 999.375 258.421875 L 1007.117188 258.421875 L 1021.523438 282.320312 L 1035.527344 258.421875 L 1043 258.421875 Z M 1024.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 1001 816 L 1040 816 M 1001 777 L 1040 777 M 1001 777 L 1001 816 M 1040 777 L 1040 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 1001 816 L 1040 816 M 1001 777 L 1040 777 M 1040 816 L 1040 777 M 1001 816 L 1001 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 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/inv/sky130_fd_sc_lp__inv_16.svg b/cells/inv/sky130_fd_sc_lp__inv_16.svg
index 5c28a1b..9182cb3 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_16.svg
+++ b/cells/inv/sky130_fd_sc_lp__inv_16.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image263" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image263"/>
+  <use xlink:href="#image291"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image263"/>
+  <use xlink:href="#image291"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1559.5 651.5 L 1588.5 651.5 L 1588.5 814.5 L 1559.5 814.5 Z M 304.5 651.5 L 333.5 651.5 L 333.5 814.5 L 304.5 814.5 Z M 387.5 651.5 L 417.5 651.5 L 417.5 814.5 L 387.5 814.5 Z M 471.5 651.5 L 500.5 651.5 L 500.5 814.5 L 471.5 814.5 Z M 555.5 651.5 L 584.5 651.5 L 584.5 814.5 L 555.5 814.5 Z M 638.5 651.5 L 668.5 651.5 L 668.5 814.5 L 638.5 814.5 Z M 722.5 651.5 L 751.5 651.5 L 751.5 814.5 L 722.5 814.5 Z M 806.5 651.5 L 835.5 651.5 L 835.5 814.5 L 806.5 814.5 Z M 890.5 651.5 L 919.5 651.5 L 919.5 814.5 L 890.5 814.5 Z M 973.5 651.5 L 1003.5 651.5 L 1003.5 814.5 L 973.5 814.5 Z M 1057.5 651.5 L 1086.5 651.5 L 1086.5 814.5 L 1057.5 814.5 Z M 1141.5 651.5 L 1170.5 651.5 L 1170.5 814.5 L 1141.5 814.5 Z M 1224.5 651.5 L 1254.5 651.5 L 1254.5 814.5 L 1224.5 814.5 Z M 1308.5 651.5 L 1337.5 651.5 L 1337.5 814.5 L 1308.5 814.5 Z M 1392.5 651.5 L 1421.5 651.5 L 1421.5 814.5 L 1392.5 814.5 Z M 1476.5 651.5 L 1505.5 651.5 L 1505.5 814.5 L 1476.5 814.5 Z M 1476.5 651.5 "/>
 </clipPath>
-<image id="image264" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image264"/>
+  <use xlink:href="#image292"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1559.5 258.5 L 1588.5 258.5 L 1588.5 503.5 L 1559.5 503.5 Z M 304.5 258.5 L 333.5 258.5 L 333.5 503.5 L 304.5 503.5 Z M 387.5 258.5 L 417.5 258.5 L 417.5 503.5 L 387.5 503.5 Z M 471.5 258.5 L 500.5 258.5 L 500.5 503.5 L 471.5 503.5 Z M 555.5 258.5 L 584.5 258.5 L 584.5 503.5 L 555.5 503.5 Z M 638.5 258.5 L 668.5 258.5 L 668.5 503.5 L 638.5 503.5 Z M 722.5 258.5 L 751.5 258.5 L 751.5 503.5 L 722.5 503.5 Z M 806.5 258.5 L 835.5 258.5 L 835.5 503.5 L 806.5 503.5 Z M 890.5 258.5 L 919.5 258.5 L 919.5 503.5 L 890.5 503.5 Z M 973.5 258.5 L 1003.5 258.5 L 1003.5 503.5 L 973.5 503.5 Z M 1057.5 258.5 L 1086.5 258.5 L 1086.5 503.5 L 1057.5 503.5 Z M 1141.5 258.5 L 1170.5 258.5 L 1170.5 503.5 L 1141.5 503.5 Z M 1224.5 258.5 L 1254.5 258.5 L 1254.5 503.5 L 1224.5 503.5 Z M 1308.5 258.5 L 1337.5 258.5 L 1337.5 503.5 L 1308.5 503.5 Z M 1392.5 258.5 L 1421.5 258.5 L 1421.5 503.5 L 1392.5 503.5 Z M 1476.5 258.5 L 1505.5 258.5 L 1505.5 503.5 L 1476.5 503.5 Z M 1476.5 258.5 "/>
 </clipPath>
-<image id="image265" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image293" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image265"/>
+  <use xlink:href="#image293"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 344.5 447.5 L 377.5 447.5 L 377.5 478.5 L 344.5 478.5 Z M 1348.5 447.5 L 1381.5 447.5 L 1381.5 478.5 L 1348.5 478.5 Z M 1181.5 447.5 L 1214.5 447.5 L 1214.5 478.5 L 1181.5 478.5 Z M 1013.5 447.5 L 1046.5 447.5 L 1046.5 478.5 L 1013.5 478.5 Z M 846.5 447.5 L 879.5 447.5 L 879.5 478.5 L 846.5 478.5 Z M 511.5 447.5 L 544.5 447.5 L 544.5 478.5 L 511.5 478.5 Z M 1515.5 447.5 L 1549.5 447.5 L 1549.5 478.5 L 1515.5 478.5 Z M 678.5 447.5 L 711.5 447.5 L 711.5 478.5 L 678.5 478.5 Z M 344.5 478.5 L 377.5 478.5 L 377.5 480.5 L 344.5 480.5 Z M 846.5 478.5 L 879.5 478.5 L 879.5 480.5 L 846.5 480.5 Z M 1181.5 478.5 L 1214.5 478.5 L 1214.5 480.5 L 1181.5 480.5 Z M 1348.5 478.5 L 1381.5 478.5 L 1381.5 480.5 L 1348.5 480.5 Z M 678.5 478.5 L 711.5 478.5 L 711.5 480.5 L 678.5 480.5 Z M 511.5 478.5 L 544.5 478.5 L 544.5 480.5 L 511.5 480.5 Z M 1013.5 478.5 L 1046.5 478.5 L 1046.5 480.5 L 1013.5 480.5 Z M 1515.5 478.5 L 1549.5 478.5 L 1549.5 480.5 L 1515.5 480.5 Z M 1097.5 519.5 L 1130.5 519.5 L 1130.5 551.5 L 1097.5 551.5 Z M 1432.5 519.5 L 1465.5 519.5 L 1465.5 551.5 L 1432.5 551.5 Z M 427.5 519.5 L 460.5 519.5 L 460.5 551.5 L 427.5 551.5 Z M 595.5 519.5 L 628.5 519.5 L 628.5 551.5 L 595.5 551.5 Z M 1264.5 519.5 L 1297.5 519.5 L 1297.5 551.5 L 1264.5 551.5 Z M 762.5 519.5 L 795.5 519.5 L 795.5 551.5 L 762.5 551.5 Z M 930.5 519.5 L 963.5 519.5 L 963.5 551.5 L 930.5 551.5 Z M 930.5 551.5 L 963.5 551.5 L 963.5 552.5 L 930.5 552.5 Z M 1264.5 551.5 L 1297.5 551.5 L 1297.5 552.5 L 1264.5 552.5 Z M 427.5 551.5 L 460.5 551.5 L 460.5 552.5 L 427.5 552.5 Z M 762.5 551.5 L 795.5 551.5 L 795.5 552.5 L 762.5 552.5 Z M 1432.5 551.5 L 1465.5 551.5 L 1465.5 552.5 L 1432.5 552.5 Z M 595.5 551.5 L 628.5 551.5 L 628.5 552.5 L 595.5 552.5 Z M 1097.5 551.5 L 1130.5 551.5 L 1130.5 552.5 L 1097.5 552.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="image266" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image294" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image266"/>
+  <use xlink:href="#image294"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface260">
+<g id="surface288">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -135,6 +135,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 951.457031 541.128906 L 941.996094 541.128906 L 939.40625 548.5 L 936.070312 548.5 L 944.824219 523.960938 L 948.863281 523.960938 L 957.480469 548.5 L 953.980469 548.5 Z M 950.578125 538.503906 L 946.808594 527.328125 L 942.769531 538.503906 Z M 950.578125 538.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 416 565 L 1477 565 M 416 521 L 1477 521 M 416 521 L 416 565 M 1477 521 L 1477 565 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 416 565 L 1477 565 M 416 521 L 1477 521 M 1477 565 L 1477 521 M 416 565 L 416 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(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/inv/sky130_fd_sc_lp__inv_2.svg b/cells/inv/sky130_fd_sc_lp__inv_2.svg
index 4e84a6f..df31fce 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_2.svg
+++ b/cells/inv/sky130_fd_sc_lp__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 539.5 L 756.5 539.5 Z M 756.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 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="#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 992.5 647.5 L 1026.5 647.5 L 1026.5 839.5 L 992.5 839.5 Z M 893.5 647.5 L 928.5 647.5 L 928.5 839.5 L 893.5 839.5 Z M 893.5 647.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 992.5 209.5 L 1026.5 209.5 L 1026.5 498.5 L 992.5 498.5 Z M 893.5 209.5 L 928.5 209.5 L 928.5 498.5 L 893.5 498.5 Z M 893.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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_lp__inv_4.svg b/cells/inv/sky130_fd_sc_lp__inv_4.svg
index 0195861..8bb0e41 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_4.svg
+++ b/cells/inv/sky130_fd_sc_lp__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 539.5 L 644.5 539.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="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 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="#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 1077.5 672.5 L 1111.5 672.5 L 1111.5 864.5 L 1077.5 864.5 Z M 781.5 672.5 L 815.5 672.5 L 815.5 864.5 L 781.5 864.5 Z M 879.5 672.5 L 914.5 672.5 L 914.5 864.5 L 879.5 864.5 Z M 978.5 672.5 L 1012.5 672.5 L 1012.5 864.5 L 978.5 864.5 Z M 978.5 672.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 1077.5 209.5 L 1111.5 209.5 L 1111.5 498.5 L 1077.5 498.5 Z M 781.5 209.5 L 815.5 209.5 L 815.5 498.5 L 781.5 498.5 Z M 879.5 209.5 L 914.5 209.5 L 914.5 498.5 L 879.5 498.5 Z M 978.5 209.5 L 1012.5 209.5 L 1012.5 498.5 L 978.5 498.5 Z M 978.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1187.554688 542.246094 L 1187.554688 561.5 L 1181.292969 561.5 L 1181.292969 542.246094 L 1162.375 512.421875 L 1170.117188 512.421875 L 1184.523438 536.320312 L 1198.527344 512.421875 L 1206 512.421875 Z M 1187.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 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/inv/sky130_fd_sc_lp__inv_8.svg b/cells/inv/sky130_fd_sc_lp__inv_8.svg
index 9712487..c6291ba 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_8.svg
+++ b/cells/inv/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.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="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="#image275"/>
+  <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="#image275"/>
+  <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 1307.5 672.5 L 1341.5 672.5 L 1341.5 864.5 L 1307.5 864.5 Z M 617.5 672.5 L 651.5 672.5 L 651.5 864.5 L 617.5 864.5 Z M 716.5 672.5 L 750.5 672.5 L 750.5 864.5 L 716.5 864.5 Z M 814.5 672.5 L 848.5 672.5 L 848.5 864.5 L 814.5 864.5 Z M 913.5 672.5 L 947.5 672.5 L 947.5 864.5 L 913.5 864.5 Z M 1011.5 672.5 L 1046.5 672.5 L 1046.5 864.5 L 1011.5 864.5 Z M 1110.5 672.5 L 1144.5 672.5 L 1144.5 864.5 L 1110.5 864.5 Z M 1208.5 672.5 L 1243.5 672.5 L 1243.5 864.5 L 1208.5 864.5 Z M 1208.5 672.5 "/>
 </clipPath>
-<image id="image276" 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="#image276"/>
+  <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 1307.5 209.5 L 1341.5 209.5 L 1341.5 498.5 L 1307.5 498.5 Z M 617.5 209.5 L 651.5 209.5 L 651.5 498.5 L 617.5 498.5 Z M 716.5 209.5 L 750.5 209.5 L 750.5 498.5 L 716.5 498.5 Z M 814.5 209.5 L 848.5 209.5 L 848.5 498.5 L 814.5 498.5 Z M 913.5 209.5 L 947.5 209.5 L 947.5 498.5 L 913.5 498.5 Z M 1011.5 209.5 L 1046.5 209.5 L 1046.5 498.5 L 1011.5 498.5 Z M 1110.5 209.5 L 1144.5 209.5 L 1144.5 498.5 L 1110.5 498.5 Z M 1208.5 209.5 L 1243.5 209.5 L 1243.5 498.5 L 1208.5 498.5 Z M 1208.5 209.5 "/>
 </clipPath>
-<image id="image277" 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="#image277"/>
+  <use xlink:href="#image305"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image278" 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="#image278"/>
+  <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="surface272">
+<g id="surface300">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -143,6 +143,5 @@
 <path style=" 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 542.246094 L 1406.554688 561.5 L 1400.292969 561.5 L 1400.292969 542.246094 L 1381.375 512.421875 L 1389.117188 512.421875 L 1403.523438 536.320312 L 1417.527344 512.421875 L 1425 512.421875 Z M 1406.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 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/inv/sky130_fd_sc_lp__inv_lp.svg b/cells/inv/sky130_fd_sc_lp__inv_lp.svg
index 1ef5dea..7917806 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_lp.svg
+++ b/cells/inv/sky130_fd_sc_lp__inv_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image298"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 996.5 745.5 L 1031.5 745.5 L 1031.5 841.5 L 996.5 841.5 Z M 907.5 745.5 L 941.5 745.5 L 941.5 841.5 L 907.5 841.5 Z M 907.5 745.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 973.5 235.5 L 1031.5 235.5 L 1031.5 464.5 L 973.5 464.5 Z M 973.5 235.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface295">
+<g id="surface322">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1078.554688 288.246094 L 1078.554688 307.5 L 1072.292969 307.5 L 1072.292969 288.246094 L 1053.375 258.421875 L 1061.117188 258.421875 L 1075.523438 282.320312 L 1089.527344 258.421875 L 1097 258.421875 Z M 1078.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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1055 777 L 1055 816 M 1094 777 L 1094 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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1094 816 L 1094 777 M 1055 816 L 1055 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_lp__inv_m.svg b/cells/inv/sky130_fd_sc_lp__inv_m.svg
index fb6ee6f..faf7d0d 100644
--- a/cells/inv/sky130_fd_sc_lp__inv_m.svg
+++ b/cells/inv/sky130_fd_sc_lp__inv_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 812.5 111.5 L 1119.5 111.5 L 1119.5 539.5 L 812.5 539.5 Z M 812.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="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="#image296"/>
+  <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 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="#image296"/>
+  <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 949.5 742.5 L 984.5 742.5 L 984.5 838.5 L 949.5 838.5 Z M 949.5 742.5 "/>
 </clipPath>
-<image id="image297" 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="#image297"/>
+  <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 949.5 292.5 L 984.5 292.5 L 984.5 389.5 L 949.5 389.5 Z M 949.5 292.5 "/>
 </clipPath>
-<image id="image298" 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="#image298"/>
+  <use xlink:href="#image348"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image299" 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="#image299"/>
+  <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="surface293">
+<g id="surface343">
 <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 1024.554688 288.246094 L 1024.554688 307.5 L 1018.292969 307.5 L 1018.292969 288.246094 L 999.375 258.421875 L 1007.117188 258.421875 L 1021.523438 282.320312 L 1035.527344 258.421875 L 1043 258.421875 Z M 1024.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 1001 816 L 1040 816 M 1001 777 L 1040 777 M 1001 777 L 1001 816 M 1040 777 L 1040 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 1001 816 L 1040 816 M 1001 777 L 1040 777 M 1040 816 L 1040 777 M 1001 816 L 1001 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 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/invkapwr/sky130_fd_sc_lp__invkapwr_1.svg b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.svg
index b02e38c..49dd41f 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.svg
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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="#image301"/>
+  <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 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="#image301"/>
+  <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 1003.5 742.5 L 1038.5 742.5 L 1038.5 838.5 L 1003.5 838.5 Z M 1003.5 742.5 "/>
 </clipPath>
-<image id="image302" 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="#image302"/>
+  <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 1003.5 242.5 L 1038.5 242.5 L 1038.5 435.5 L 1003.5 435.5 Z M 905.5 242.5 L 939.5 242.5 L 939.5 435.5 L 905.5 435.5 Z M 905.5 242.5 "/>
 </clipPath>
-<image id="image303" 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="#image303"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 850.5 255.5 L 889.5 255.5 L 889.5 276.5 L 850.5 276.5 Z M 1049.5 255.5 L 1088.5 255.5 L 1088.5 276.5 L 1049.5 276.5 Z M 1049.5 276.5 L 1088.5 276.5 L 1088.5 294.5 L 1049.5 294.5 Z M 850.5 276.5 L 889.5 276.5 L 889.5 294.5 L 850.5 294.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="image304" 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="#image304"/>
+  <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="surface298">
+<g id="surface345">
 <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 1078.554688 542.246094 L 1078.554688 561.5 L 1072.292969 561.5 L 1072.292969 542.246094 L 1053.375 512.421875 L 1061.117188 512.421875 L 1075.523438 536.320312 L 1089.527344 512.421875 L 1097 512.421875 Z M 1078.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 1055 562 L 1094 562 M 1055 523 L 1094 523 M 1055 523 L 1055 562 M 1094 523 L 1094 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 1055 562 L 1094 562 M 1055 523 L 1094 523 M 1094 562 L 1094 523 M 1055 562 L 1055 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/invkapwr/sky130_fd_sc_lp__invkapwr_2.svg b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.svg
index e75d90d..2371a5b 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.svg
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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 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="#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 1058.5 742.5 L 1093.5 742.5 L 1093.5 838.5 L 1058.5 838.5 Z M 960.5 742.5 L 994.5 742.5 L 994.5 838.5 L 960.5 838.5 Z M 960.5 742.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 1038.5 209.5 L 1072.5 209.5 L 1072.5 498.5 L 1038.5 498.5 Z M 840.5 209.5 L 875.5 209.5 L 875.5 498.5 L 840.5 498.5 Z M 939.5 209.5 L 973.5 209.5 L 973.5 498.5 L 939.5 498.5 Z M 939.5 209.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 886.5 255.5 L 925.5 255.5 L 925.5 271.5 L 886.5 271.5 Z M 1083.5 255.5 L 1122.5 255.5 L 1122.5 271.5 L 1083.5 271.5 Z M 1083.5 271.5 L 1122.5 271.5 L 1122.5 294.5 L 1083.5 294.5 Z M 886.5 271.5 L 925.5 271.5 L 925.5 294.5 L 886.5 294.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="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>
@@ -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 1133.554688 627.246094 L 1133.554688 646.5 L 1127.292969 646.5 L 1127.292969 627.246094 L 1108.375 597.421875 L 1116.117188 597.421875 L 1130.523438 621.320312 L 1144.527344 597.421875 L 1152 597.421875 Z M 1133.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 1110 477 L 1149 477 M 1110 438 L 1149 438 M 1110 438 L 1110 477 M 1149 438 L 1149 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 1110 477 L 1149 477 M 1110 438 L 1149 438 M 1149 477 L 1149 438 M 1110 477 L 1110 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 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/invkapwr/sky130_fd_sc_lp__invkapwr_4.svg b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.svg
index b32197f..586dc7a 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.svg
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="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="#image323"/>
+  <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 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="#image323"/>
+  <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 1102.5 742.5 L 1136.5 742.5 L 1136.5 838.5 L 1102.5 838.5 Z M 806.5 742.5 L 840.5 742.5 L 840.5 838.5 L 806.5 838.5 Z M 905.5 742.5 L 939.5 742.5 L 939.5 838.5 L 905.5 838.5 Z M 1003.5 742.5 L 1038.5 742.5 L 1038.5 838.5 L 1003.5 838.5 Z M 1003.5 742.5 "/>
 </clipPath>
-<image id="image324" 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="#image324"/>
+  <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 1200.5 209.5 L 1235.5 209.5 L 1235.5 498.5 L 1200.5 498.5 Z M 708.5 209.5 L 742.5 209.5 L 742.5 498.5 L 708.5 498.5 Z M 806.5 209.5 L 840.5 209.5 L 840.5 498.5 L 806.5 498.5 Z M 905.5 209.5 L 939.5 209.5 L 939.5 498.5 L 905.5 498.5 Z M 1003.5 209.5 L 1038.5 209.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1102.5 209.5 L 1136.5 209.5 L 1136.5 498.5 L 1102.5 498.5 Z M 1102.5 209.5 "/>
 </clipPath>
-<image id="image325" 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="#image325"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 656.5 255.5 L 695.5 255.5 L 695.5 271.5 L 656.5 271.5 Z M 1248.5 255.5 L 1287.5 255.5 L 1287.5 271.5 L 1248.5 271.5 Z M 854.5 255.5 L 893.5 255.5 L 893.5 271.5 L 854.5 271.5 Z M 1049.5 255.5 L 1088.5 255.5 L 1088.5 271.5 L 1049.5 271.5 Z M 656.5 271.5 L 695.5 271.5 L 695.5 294.5 L 656.5 294.5 Z M 1248.5 271.5 L 1287.5 271.5 L 1287.5 294.5 L 1248.5 294.5 Z M 1049.5 271.5 L 1088.5 271.5 L 1088.5 294.5 L 1049.5 294.5 Z M 854.5 271.5 L 893.5 271.5 L 893.5 294.5 L 854.5 294.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="image326" 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="#image326"/>
+  <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="surface320">
+<g id="surface350">
 <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 1296.554688 542.246094 L 1296.554688 561.5 L 1290.292969 561.5 L 1290.292969 542.246094 L 1271.375 512.421875 L 1279.117188 512.421875 L 1293.523438 536.320312 L 1307.527344 512.421875 L 1315 512.421875 Z M 1296.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 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/invkapwr/sky130_fd_sc_lp__invkapwr_8.svg b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.svg
index c3dd202..ce65f08 100644
--- a/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.svg
+++ b/cells/invkapwr/sky130_fd_sc_lp__invkapwr_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.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="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 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="#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 1294.5 742.5 L 1329.5 742.5 L 1329.5 838.5 L 1294.5 838.5 Z M 604.5 742.5 L 639.5 742.5 L 639.5 838.5 L 604.5 838.5 Z M 703.5 742.5 L 737.5 742.5 L 737.5 838.5 L 703.5 838.5 Z M 801.5 742.5 L 836.5 742.5 L 836.5 838.5 L 801.5 838.5 Z M 900.5 742.5 L 934.5 742.5 L 934.5 838.5 L 900.5 838.5 Z M 999.5 742.5 L 1033.5 742.5 L 1033.5 838.5 L 999.5 838.5 Z M 1097.5 742.5 L 1132.5 742.5 L 1132.5 838.5 L 1097.5 838.5 Z M 1196.5 742.5 L 1230.5 742.5 L 1230.5 838.5 L 1196.5 838.5 Z M 1196.5 742.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 1491.5 209.5 L 1526.5 209.5 L 1526.5 498.5 L 1491.5 498.5 Z M 407.5 209.5 L 442.5 209.5 L 442.5 498.5 L 407.5 498.5 Z M 506.5 209.5 L 540.5 209.5 L 540.5 498.5 L 506.5 498.5 Z M 604.5 209.5 L 639.5 209.5 L 639.5 498.5 L 604.5 498.5 Z M 703.5 209.5 L 737.5 209.5 L 737.5 498.5 L 703.5 498.5 Z M 801.5 209.5 L 836.5 209.5 L 836.5 498.5 L 801.5 498.5 Z M 900.5 209.5 L 934.5 209.5 L 934.5 498.5 L 900.5 498.5 Z M 999.5 209.5 L 1033.5 209.5 L 1033.5 498.5 L 999.5 498.5 Z M 1097.5 209.5 L 1132.5 209.5 L 1132.5 498.5 L 1097.5 498.5 Z M 1196.5 209.5 L 1230.5 209.5 L 1230.5 498.5 L 1196.5 498.5 Z M 1294.5 209.5 L 1329.5 209.5 L 1329.5 498.5 L 1294.5 498.5 Z M 1393.5 209.5 L 1427.5 209.5 L 1427.5 498.5 L 1393.5 498.5 Z M 1393.5 209.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 356.5 255.5 L 395.5 255.5 L 395.5 271.5 L 356.5 271.5 Z M 751.5 255.5 L 790.5 255.5 L 790.5 271.5 L 751.5 271.5 Z M 1342.5 255.5 L 1381.5 255.5 L 1381.5 271.5 L 1342.5 271.5 Z M 947.5 255.5 L 986.5 255.5 L 986.5 271.5 L 947.5 271.5 Z M 1145.5 255.5 L 1184.5 255.5 L 1184.5 271.5 L 1145.5 271.5 Z M 1539.5 255.5 L 1578.5 255.5 L 1578.5 271.5 L 1539.5 271.5 Z M 552.5 255.5 L 591.5 255.5 L 591.5 271.5 L 552.5 271.5 Z M 1539.5 271.5 L 1578.5 271.5 L 1578.5 294.5 L 1539.5 294.5 Z M 1342.5 271.5 L 1381.5 271.5 L 1381.5 294.5 L 1342.5 294.5 Z M 1145.5 271.5 L 1184.5 271.5 L 1184.5 294.5 L 1145.5 294.5 Z M 751.5 271.5 L 790.5 271.5 L 790.5 294.5 L 751.5 294.5 Z M 552.5 271.5 L 591.5 271.5 L 591.5 294.5 L 552.5 294.5 Z M 947.5 271.5 L 986.5 271.5 L 986.5 294.5 L 947.5 294.5 Z M 356.5 271.5 L 395.5 271.5 L 395.5 294.5 L 356.5 294.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="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>
@@ -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 915.410156 631.757812 L 896.492188 631.757812 L 891.308594 646.5 L 884.644531 646.5 L 902.148438 597.421875 L 910.226562 597.421875 L 927.460938 646.5 L 920.460938 646.5 Z M 913.660156 626.503906 L 906.121094 604.15625 L 898.042969 626.503906 Z M 913.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 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/invlp/sky130_fd_sc_lp__invlp_0.svg b/cells/invlp/sky130_fd_sc_lp__invlp_0.svg
index 033f78f..b03a471 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_0.svg
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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 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="#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 996.5 716.5 L 1031.5 716.5 L 1031.5 813.5 L 996.5 813.5 Z M 907.5 716.5 L 941.5 716.5 L 941.5 813.5 L 907.5 813.5 Z M 907.5 716.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 996.5 235.5 L 1031.5 235.5 L 1031.5 382.5 L 996.5 382.5 Z M 907.5 235.5 L 941.5 235.5 L 941.5 382.5 L 907.5 382.5 Z M 907.5 235.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1078.554688 288.246094 L 1078.554688 307.5 L 1072.292969 307.5 L 1072.292969 288.246094 L 1053.375 258.421875 L 1061.117188 258.421875 L 1075.523438 282.320312 L 1089.527344 258.421875 L 1097 258.421875 Z M 1078.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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1055 777 L 1055 816 M 1094 777 L 1094 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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1094 816 L 1094 777 M 1055 816 L 1055 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/invlp/sky130_fd_sc_lp__invlp_1.svg b/cells/invlp/sky130_fd_sc_lp__invlp_1.svg
index cb33494..b682b5e 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_1.svg
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.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="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#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 996.5 672.5 L 1031.5 672.5 L 1031.5 864.5 L 996.5 864.5 Z M 907.5 672.5 L 941.5 672.5 L 941.5 864.5 L 907.5 864.5 Z M 907.5 672.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 996.5 209.5 L 1031.5 209.5 L 1031.5 498.5 L 996.5 498.5 Z M 914.5 209.5 L 948.5 209.5 L 948.5 498.5 L 914.5 498.5 Z M 914.5 209.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" 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 288.246094 L 1078.554688 307.5 L 1072.292969 307.5 L 1072.292969 288.246094 L 1053.375 258.421875 L 1061.117188 258.421875 L 1075.523438 282.320312 L 1089.527344 258.421875 L 1097 258.421875 Z M 1078.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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1055 777 L 1055 816 M 1094 777 L 1094 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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1094 816 L 1094 777 M 1055 816 L 1055 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/invlp/sky130_fd_sc_lp__invlp_2.svg b/cells/invlp/sky130_fd_sc_lp__invlp_2.svg
index 756b53b..9e03592 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_2.svg
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1098.5 663.5 L 1133.5 663.5 L 1133.5 855.5 L 1098.5 855.5 Z M 787.5 663.5 L 821.5 663.5 L 821.5 855.5 L 787.5 855.5 Z M 885.5 663.5 L 920.5 663.5 L 920.5 855.5 L 885.5 855.5 Z M 984.5 663.5 L 1018.5 663.5 L 1018.5 855.5 L 984.5 855.5 Z M 984.5 663.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 1082.5 209.5 L 1117.5 209.5 L 1117.5 498.5 L 1082.5 498.5 Z M 787.5 209.5 L 821.5 209.5 L 821.5 498.5 L 787.5 498.5 Z M 885.5 209.5 L 920.5 209.5 L 920.5 498.5 L 885.5 498.5 Z M 984.5 209.5 L 1018.5 209.5 L 1018.5 498.5 L 984.5 498.5 Z M 984.5 209.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 753.410156 631.757812 L 734.492188 631.757812 L 729.308594 646.5 L 722.644531 646.5 L 740.148438 597.421875 L 748.226562 597.421875 L 765.460938 646.5 L 758.460938 646.5 Z M 751.660156 626.503906 L 744.121094 604.15625 L 736.042969 626.503906 Z M 751.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 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/invlp/sky130_fd_sc_lp__invlp_4.svg b/cells/invlp/sky130_fd_sc_lp__invlp_4.svg
index f81464d..cc811ac 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_4.svg
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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 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="#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 1317.5 665.5 L 1352.5 665.5 L 1352.5 857.5 L 1317.5 857.5 Z M 563.5 665.5 L 598.5 665.5 L 598.5 857.5 L 563.5 857.5 Z M 662.5 665.5 L 696.5 665.5 L 696.5 857.5 L 662.5 857.5 Z M 792.5 665.5 L 827.5 665.5 L 827.5 857.5 L 792.5 857.5 Z M 891.5 665.5 L 925.5 665.5 L 925.5 857.5 L 891.5 857.5 Z M 989.5 665.5 L 1024.5 665.5 L 1024.5 857.5 L 989.5 857.5 Z M 1088.5 665.5 L 1122.5 665.5 L 1122.5 857.5 L 1088.5 857.5 Z M 1203.5 665.5 L 1237.5 665.5 L 1237.5 857.5 L 1203.5 857.5 Z M 1203.5 665.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 1306.5 209.5 L 1340.5 209.5 L 1340.5 498.5 L 1306.5 498.5 Z M 568.5 209.5 L 602.5 209.5 L 602.5 498.5 L 568.5 498.5 Z M 666.5 209.5 L 701.5 209.5 L 701.5 498.5 L 666.5 498.5 Z M 765.5 209.5 L 799.5 209.5 L 799.5 498.5 L 765.5 498.5 Z M 863.5 209.5 L 898.5 209.5 L 898.5 498.5 L 863.5 498.5 Z M 978.5 209.5 L 1012.5 209.5 L 1012.5 498.5 L 978.5 498.5 Z M 1093.5 209.5 L 1127.5 209.5 L 1127.5 498.5 L 1093.5 498.5 Z M 1207.5 209.5 L 1242.5 209.5 L 1242.5 498.5 L 1207.5 498.5 Z M 1207.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -146,6 +146,5 @@
 <path style=" 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.554688 627.246094 L 636.554688 646.5 L 630.292969 646.5 L 630.292969 627.246094 L 611.375 597.421875 L 619.117188 597.421875 L 633.523438 621.320312 L 647.527344 597.421875 L 655 597.421875 Z M 636.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 612 477 L 651 477 M 612 438 L 651 438 M 612 438 L 612 477 M 651 438 L 651 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 612 477 L 651 477 M 612 438 L 651 438 M 651 477 L 651 438 M 612 477 L 612 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/invlp/sky130_fd_sc_lp__invlp_8.svg b/cells/invlp/sky130_fd_sc_lp__invlp_8.svg
index 77d239a..7105611 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_8.svg
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image281" 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="#image281"/>
+  <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 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="#image281"/>
+  <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 1589.5 645.5 L 1619.5 645.5 L 1619.5 808.5 L 1589.5 808.5 Z M 293.5 645.5 L 322.5 645.5 L 322.5 808.5 L 293.5 808.5 Z M 377.5 645.5 L 406.5 645.5 L 406.5 808.5 L 377.5 808.5 Z M 460.5 645.5 L 490.5 645.5 L 490.5 808.5 L 460.5 808.5 Z M 544.5 645.5 L 573.5 645.5 L 573.5 808.5 L 544.5 808.5 Z M 628.5 645.5 L 657.5 645.5 L 657.5 808.5 L 628.5 808.5 Z M 711.5 645.5 L 741.5 645.5 L 741.5 808.5 L 711.5 808.5 Z M 795.5 645.5 L 824.5 645.5 L 824.5 808.5 L 795.5 808.5 Z M 879.5 645.5 L 908.5 645.5 L 908.5 808.5 L 879.5 808.5 Z M 963.5 645.5 L 992.5 645.5 L 992.5 808.5 L 963.5 808.5 Z M 1046.5 645.5 L 1076.5 645.5 L 1076.5 808.5 L 1046.5 808.5 Z M 1130.5 645.5 L 1159.5 645.5 L 1159.5 808.5 L 1130.5 808.5 Z M 1214.5 645.5 L 1243.5 645.5 L 1243.5 808.5 L 1214.5 808.5 Z M 1297.5 645.5 L 1327.5 645.5 L 1327.5 808.5 L 1297.5 808.5 Z M 1395.5 645.5 L 1424.5 645.5 L 1424.5 808.5 L 1395.5 808.5 Z M 1492.5 645.5 L 1521.5 645.5 L 1521.5 808.5 L 1492.5 808.5 Z M 1492.5 645.5 "/>
 </clipPath>
-<image id="image282" 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="#image282"/>
+  <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 1589.5 258.5 L 1619.5 258.5 L 1619.5 503.5 L 1589.5 503.5 Z M 293.5 258.5 L 322.5 258.5 L 322.5 503.5 L 293.5 503.5 Z M 377.5 258.5 L 406.5 258.5 L 406.5 503.5 L 377.5 503.5 Z M 460.5 258.5 L 490.5 258.5 L 490.5 503.5 L 460.5 503.5 Z M 544.5 258.5 L 573.5 258.5 L 573.5 503.5 L 544.5 503.5 Z M 628.5 258.5 L 657.5 258.5 L 657.5 503.5 L 628.5 503.5 Z M 711.5 258.5 L 741.5 258.5 L 741.5 503.5 L 711.5 503.5 Z M 822.5 258.5 L 852.5 258.5 L 852.5 503.5 L 822.5 503.5 Z M 906.5 258.5 L 935.5 258.5 L 935.5 503.5 L 906.5 503.5 Z M 990.5 258.5 L 1019.5 258.5 L 1019.5 503.5 L 990.5 503.5 Z M 1074.5 258.5 L 1103.5 258.5 L 1103.5 503.5 L 1074.5 503.5 Z M 1157.5 258.5 L 1186.5 258.5 L 1186.5 503.5 L 1157.5 503.5 Z M 1241.5 258.5 L 1270.5 258.5 L 1270.5 503.5 L 1241.5 503.5 Z M 1325.5 258.5 L 1354.5 258.5 L 1354.5 503.5 L 1325.5 503.5 Z M 1408.5 258.5 L 1438.5 258.5 L 1438.5 503.5 L 1408.5 503.5 Z M 1506.5 258.5 L 1535.5 258.5 L 1535.5 503.5 L 1506.5 503.5 Z M 1506.5 258.5 "/>
 </clipPath>
-<image id="image283" 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="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image284" 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="#image284"/>
+  <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="surface278">
+<g id="surface306">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <path style=" 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.753906 541.054688 L 355.753906 557.5 L 350.40625 557.5 L 350.40625 541.054688 L 334.246094 515.578125 L 340.859375 515.578125 L 353.167969 535.992188 L 365.125 515.578125 L 371.511719 515.578125 Z M 355.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 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/invlp/sky130_fd_sc_lp__invlp_m.svg b/cells/invlp/sky130_fd_sc_lp__invlp_m.svg
index acf9528..3b5ce2f 100644
--- a/cells/invlp/sky130_fd_sc_lp__invlp_m.svg
+++ b/cells/invlp/sky130_fd_sc_lp__invlp_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.5 111.5 "/>
 </clipPath>
-<image id="image305" 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="#image305"/>
+  <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 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="#image305"/>
+  <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 996.5 716.5 L 1031.5 716.5 L 1031.5 813.5 L 996.5 813.5 Z M 907.5 716.5 L 941.5 716.5 L 941.5 813.5 L 907.5 813.5 Z M 907.5 716.5 "/>
 </clipPath>
-<image id="image306" 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="#image306"/>
+  <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 996.5 260.5 L 1031.5 260.5 L 1031.5 357.5 L 996.5 357.5 Z M 907.5 260.5 L 941.5 260.5 L 941.5 357.5 L 907.5 357.5 Z M 907.5 260.5 "/>
 </clipPath>
-<image id="image307" 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="#image307"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image308" 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="#image308"/>
+  <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="surface302">
+<g id="surface345">
 <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 1078.554688 288.246094 L 1078.554688 307.5 L 1072.292969 307.5 L 1072.292969 288.246094 L 1053.375 258.421875 L 1061.117188 258.421875 L 1075.523438 282.320312 L 1089.527344 258.421875 L 1097 258.421875 Z M 1078.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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1055 777 L 1055 816 M 1094 777 L 1094 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 1055 816 L 1094 816 M 1055 777 L 1094 777 M 1094 816 L 1094 777 M 1055 816 L 1055 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/iso0n/sky130_fd_sc_lp__iso0n_lp.svg b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.svg
index ed95e1b..03d4c87 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.svg
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 534.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 534.5 539.5 Z M 534.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="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="#image319"/>
+  <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 578.5 862.5 L 1348.5 862.5 L 1348.5 918.5 L 578.5 918.5 Z M 578.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="#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 1191.5 715.5 L 1225.5 715.5 L 1225.5 812.5 L 1191.5 812.5 Z M 797.5 715.5 L 831.5 715.5 L 831.5 812.5 L 797.5 812.5 Z M 879.5 715.5 L 914.5 715.5 L 914.5 812.5 L 879.5 812.5 Z M 1109.5 715.5 L 1143.5 715.5 L 1143.5 812.5 L 1109.5 812.5 Z M 1109.5 715.5 "/>
 </clipPath>
-<image id="image320" 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="#image320"/>
+  <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 895.5 262.5 L 930.5 262.5 L 930.5 358.5 L 895.5 358.5 Z M 978.5 262.5 L 1012.5 262.5 L 1012.5 358.5 L 978.5 358.5 Z M 714.5 262.5 L 749.5 262.5 L 749.5 358.5 L 714.5 358.5 Z M 797.5 262.5 L 831.5 262.5 L 831.5 358.5 L 797.5 358.5 Z M 1191.5 209.5 L 1225.5 209.5 L 1225.5 498.5 L 1191.5 498.5 Z M 1109.5 209.5 L 1143.5 209.5 L 1143.5 498.5 L 1109.5 498.5 Z M 1109.5 209.5 "/>
 </clipPath>
-<image id="image321" 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="#image321"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 614.5 136.5 L 653.5 136.5 L 653.5 174.5 L 614.5 174.5 Z M 1274.5 136.5 L 1313.5 136.5 L 1313.5 174.5 L 1274.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 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 932.5 772.5 L 971.5 772.5 L 971.5 783.5 L 932.5 783.5 Z M 1042.5 772.5 L 1081.5 772.5 L 1081.5 783.5 L 1042.5 783.5 Z M 1042.5 783.5 L 1081.5 783.5 L 1081.5 810.5 L 1042.5 810.5 Z M 932.5 783.5 L 971.5 783.5 L 971.5 810.5 L 932.5 810.5 Z M 614.5 899.5 L 653.5 899.5 L 653.5 938.5 L 614.5 938.5 Z M 1274.5 899.5 L 1313.5 899.5 L 1313.5 938.5 L 1274.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 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 724.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="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="#image322"/>
+  <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="surface316">
+<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 1045.011719 815.953125 L 1045.011719 766.875 L 1063.929688 766.875 L 1066.890625 767.078125 L 1069.648438 767.613281 L 1072.207031 768.558594 L 1074.566406 769.769531 L 1076.652344 771.453125 L 1078.605469 773.40625 L 1080.21875 775.761719 L 1081.566406 778.320312 L 1082.574219 781.214844 L 1083.316406 784.3125 L 1083.71875 787.742188 L 1083.921875 791.378906 L 1083.71875 795.214844 L 1083.25 798.785156 L 1082.441406 802.015625 L 1081.363281 804.976562 L 1079.949219 807.605469 L 1078.199219 809.894531 L 1076.316406 811.777344 L 1074.226562 813.257812 L 1071.9375 814.46875 L 1069.449219 815.277344 L 1066.753906 815.816406 L 1063.929688 815.953125 Z M 1051.269531 810.429688 L 1062.851562 810.429688 L 1065.949219 810.230469 L 1068.707031 809.488281 L 1071.132812 808.210938 L 1073.152344 806.527344 L 1074.765625 804.238281 L 1076.113281 801.476562 L 1076.515625 800.0625 L 1076.921875 798.582031 L 1077.257812 796.96875 L 1077.460938 795.214844 L 1077.59375 793.398438 L 1077.660156 791.445312 L 1077.390625 787.070312 L 1076.71875 783.234375 L 1075.507812 779.933594 L 1073.890625 777.308594 L 1071.804688 775.15625 L 1069.246094 773.605469 L 1068.304688 773.269531 L 1067.292969 772.933594 L 1066.214844 772.730469 L 1065.140625 772.53125 L 1063.996094 772.460938 L 1062.851562 772.394531 L 1051.269531 772.394531 Z M 1051.269531 810.429688 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 594 314 L 1332 314 M 594 262 L 1332 262 M 594 262 L 594 314 M 1332 262 L 1332 314 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 594 314 L 1332 314 M 594 262 L 1332 262 M 1332 314 L 1332 262 M 594 314 L 594 262 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 578 156 L 578 165 M 573 161 L 582 161 M 577 162 L 579 162 M 577 160 L 579 160 M 577 160 L 577 162 M 579 160 L 579 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.svg b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.svg
index 6332b6a..b600fe8 100644
--- a/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.svg
+++ b/cells/iso0n/sky130_fd_sc_lp__iso0n_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image347" 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="#image347"/>
+  <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 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="#image347"/>
+  <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 1105.5 747.5 L 1140.5 747.5 L 1140.5 844.5 L 1105.5 844.5 Z M 828.5 747.5 L 862.5 747.5 L 862.5 844.5 L 828.5 844.5 Z M 917.5 747.5 L 952.5 747.5 L 952.5 844.5 L 917.5 844.5 Z M 1016.5 747.5 L 1050.5 747.5 L 1050.5 844.5 L 1016.5 844.5 Z M 1016.5 747.5 "/>
 </clipPath>
-<image id="image348" 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="#image348"/>
+  <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 1048.5 220.5 L 1105.5 220.5 L 1105.5 449.5 L 1048.5 449.5 Z M 805.5 220.5 L 862.5 220.5 L 862.5 449.5 L 805.5 449.5 Z M 926.5 220.5 L 984.5 220.5 L 984.5 449.5 L 926.5 449.5 Z M 926.5 220.5 "/>
 </clipPath>
-<image id="image349" 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="#image349"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 944.5 772.5 L 983.5 772.5 L 983.5 776.5 L 944.5 776.5 Z M 944.5 776.5 L 983.5 776.5 L 983.5 810.5 L 944.5 810.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="image350" 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="#image350"/>
+  <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="surface344">
+<g id="surface371">
 <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 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/iso0p/sky130_fd_sc_lp__iso0p_lp.svg b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.svg
index c1aa13a..e7bb437 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.svg
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 479.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 479.5 539.5 Z M 479.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="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="#image327"/>
+  <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 523.5 862.5 L 1403.5 862.5 L 1403.5 918.5 L 523.5 918.5 Z M 523.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="#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 1261.5 715.5 L 1295.5 715.5 L 1295.5 812.5 L 1261.5 812.5 Z M 617.5 715.5 L 651.5 715.5 L 651.5 812.5 L 617.5 812.5 Z M 699.5 715.5 L 734.5 715.5 L 734.5 812.5 L 699.5 812.5 Z M 878.5 715.5 L 913.5 715.5 L 913.5 812.5 L 878.5 812.5 Z M 961.5 715.5 L 995.5 715.5 L 995.5 812.5 L 961.5 812.5 Z M 1178.5 715.5 L 1213.5 715.5 L 1213.5 812.5 L 1178.5 812.5 Z M 1178.5 715.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <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 798.5 262.5 L 832.5 262.5 L 832.5 358.5 L 798.5 358.5 Z M 881.5 262.5 L 915.5 262.5 L 915.5 358.5 L 881.5 358.5 Z M 617.5 262.5 L 651.5 262.5 L 651.5 358.5 L 617.5 358.5 Z M 699.5 262.5 L 734.5 262.5 L 734.5 358.5 L 699.5 358.5 Z M 984.5 262.5 L 1018.5 262.5 L 1018.5 358.5 L 984.5 358.5 Z M 1066.5 262.5 L 1101.5 262.5 L 1101.5 358.5 L 1066.5 358.5 Z M 1261.5 209.5 L 1295.5 209.5 L 1295.5 498.5 L 1261.5 498.5 Z M 1178.5 209.5 L 1213.5 209.5 L 1213.5 498.5 L 1178.5 498.5 Z M 1178.5 209.5 "/>
 </clipPath>
-<image id="image329" 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="#image329"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 559.5 136.5 L 598.5 136.5 L 598.5 174.5 L 559.5 174.5 Z M 1329.5 136.5 L 1368.5 136.5 L 1368.5 174.5 L 1329.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 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 1122.5 263.5 L 1161.5 263.5 L 1161.5 291.5 L 1122.5 291.5 Z M 746.5 263.5 L 785.5 263.5 L 785.5 301.5 L 746.5 301.5 Z M 746.5 301.5 L 785.5 301.5 L 785.5 302.5 L 746.5 302.5 Z M 1122.5 291.5 L 1161.5 291.5 L 1161.5 302.5 L 1122.5 302.5 Z M 559.5 899.5 L 598.5 899.5 L 598.5 938.5 L 559.5 938.5 Z M 1329.5 899.5 L 1368.5 899.5 L 1368.5 938.5 L 1329.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 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 669.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="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="#image330"/>
+  <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="surface324">
+<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 996.976562 904.597656 L 996.976562 875.96875 L 1008.011719 875.96875 L 1009.738281 876.085938 L 1011.351562 876.402344 L 1012.84375 876.949219 L 1014.214844 877.65625 L 1015.433594 878.640625 L 1016.574219 879.777344 L 1017.515625 881.152344 L 1018.300781 882.644531 L 1018.890625 884.332031 L 1019.320312 886.140625 L 1019.558594 888.140625 L 1019.675781 890.261719 L 1019.558594 892.5 L 1019.28125 894.582031 L 1018.8125 896.46875 L 1018.183594 898.195312 L 1017.359375 899.726562 L 1016.335938 901.0625 L 1015.238281 902.160156 L 1014.019531 903.027344 L 1012.683594 903.734375 L 1011.230469 904.203125 L 1009.660156 904.519531 L 1008.011719 904.597656 Z M 1000.628906 901.375 L 1007.382812 901.375 L 1009.191406 901.257812 L 1010.800781 900.828125 L 1012.214844 900.082031 L 1013.390625 899.097656 L 1014.335938 897.765625 L 1015.121094 896.152344 L 1015.355469 895.328125 L 1015.589844 894.464844 L 1015.789062 893.523438 L 1015.90625 892.5 L 1015.984375 891.441406 L 1016.023438 890.300781 L 1015.867188 887.75 L 1015.472656 885.511719 L 1014.765625 883.585938 L 1013.824219 882.054688 L 1012.605469 880.796875 L 1011.113281 879.894531 L 1010.566406 879.699219 L 1009.976562 879.503906 L 1009.347656 879.386719 L 1008.71875 879.265625 L 1007.382812 879.1875 L 1000.628906 879.1875 Z M 1000.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 523 217 L 1403 217 M 523 161 L 1403 161 M 523 161 L 523 217 M 1403 161 L 1403 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 523 217 L 1403 217 M 523 161 L 1403 161 M 1403 217 L 1403 161 M 523 217 L 523 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 523 156 L 523 165 M 518 161 L 527 161 M 522 162 L 524 162 M 522 160 L 524 160 M 522 160 L 522 162 M 524 160 L 524 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.svg b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.svg
index 98ee5c0..a1c657e 100644
--- a/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.svg
+++ b/cells/iso0p/sky130_fd_sc_lp__iso0p_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 479.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 479.5 539.5 Z M 479.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="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 523.5 862.5 L 1403.5 862.5 L 1403.5 918.5 L 523.5 918.5 Z M 523.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="#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 1261.5 715.5 L 1295.5 715.5 L 1295.5 812.5 L 1261.5 812.5 Z M 617.5 715.5 L 651.5 715.5 L 651.5 812.5 L 617.5 812.5 Z M 699.5 715.5 L 734.5 715.5 L 734.5 812.5 L 699.5 812.5 Z M 878.5 715.5 L 913.5 715.5 L 913.5 812.5 L 878.5 812.5 Z M 961.5 715.5 L 995.5 715.5 L 995.5 812.5 L 961.5 812.5 Z M 1178.5 715.5 L 1213.5 715.5 L 1213.5 812.5 L 1178.5 812.5 Z M 1178.5 715.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 1238.5 211.5 L 1295.5 211.5 L 1295.5 440.5 L 1238.5 440.5 Z M 617.5 211.5 L 674.5 211.5 L 674.5 440.5 L 617.5 440.5 Z M 858.5 211.5 L 915.5 211.5 L 915.5 440.5 L 858.5 440.5 Z M 984.5 211.5 L 1041.5 211.5 L 1041.5 440.5 L 984.5 440.5 Z M 984.5 211.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 559.5 136.5 L 598.5 136.5 L 598.5 174.5 L 559.5 174.5 Z M 1329.5 136.5 L 1368.5 136.5 L 1368.5 174.5 L 1329.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 136.5 L 708.5 136.5 L 708.5 174.5 L 669.5 174.5 Z M 687.5 263.5 L 726.5 263.5 L 726.5 302.5 L 687.5 302.5 Z M 1187.5 263.5 L 1225.5 263.5 L 1225.5 302.5 L 1187.5 302.5 Z M 1054.5 263.5 L 1093.5 263.5 L 1093.5 302.5 L 1054.5 302.5 Z M 806.5 263.5 L 845.5 263.5 L 845.5 302.5 L 806.5 302.5 Z M 559.5 899.5 L 598.5 899.5 L 598.5 938.5 L 559.5 938.5 Z M 1329.5 899.5 L 1368.5 899.5 L 1368.5 938.5 L 1329.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 669.5 899.5 L 708.5 899.5 L 708.5 938.5 L 669.5 938.5 Z M 669.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="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>
@@ -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 996.976562 904.597656 L 996.976562 875.96875 L 1008.011719 875.96875 L 1009.738281 876.085938 L 1011.351562 876.402344 L 1012.84375 876.949219 L 1014.214844 877.65625 L 1015.433594 878.640625 L 1016.574219 879.777344 L 1017.515625 881.152344 L 1018.300781 882.644531 L 1018.890625 884.332031 L 1019.320312 886.140625 L 1019.558594 888.140625 L 1019.675781 890.261719 L 1019.558594 892.5 L 1019.28125 894.582031 L 1018.8125 896.46875 L 1018.183594 898.195312 L 1017.359375 899.726562 L 1016.335938 901.0625 L 1015.238281 902.160156 L 1014.019531 903.027344 L 1012.683594 903.734375 L 1011.230469 904.203125 L 1009.660156 904.519531 L 1008.011719 904.597656 Z M 1000.628906 901.375 L 1007.382812 901.375 L 1009.191406 901.257812 L 1010.800781 900.828125 L 1012.214844 900.082031 L 1013.390625 899.097656 L 1014.335938 897.765625 L 1015.121094 896.152344 L 1015.355469 895.328125 L 1015.589844 894.464844 L 1015.789062 893.523438 L 1015.90625 892.5 L 1015.984375 891.441406 L 1016.023438 890.300781 L 1015.867188 887.75 L 1015.472656 885.511719 L 1014.765625 883.585938 L 1013.824219 882.054688 L 1012.605469 880.796875 L 1011.113281 879.894531 L 1010.566406 879.699219 L 1009.976562 879.503906 L 1009.347656 879.386719 L 1008.71875 879.265625 L 1007.382812 879.1875 L 1000.628906 879.1875 Z M 1000.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 523 217 L 1403 217 M 523 161 L 1403 161 M 523 161 L 523 217 M 1403 161 L 1403 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 523 217 L 1403 217 M 523 161 L 1403 161 M 1403 217 L 1403 161 M 523 217 L 523 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 523 156 L 523 165 M 518 161 L 527 161 M 522 162 L 524 162 M 522 160 L 524 160 M 522 160 L 522 162 M 524 160 L 524 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.svg b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.svg
index 73cfbdc..3904b5e 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.svg
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 476.5 111.5 L 1449.5 111.5 L 1449.5 539.5 L 476.5 539.5 Z M 476.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="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="#image340"/>
+  <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 526.5 862.5 L 1407.5 862.5 L 1407.5 918.5 L 526.5 918.5 Z M 526.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="#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 1264.5 715.5 L 1299.5 715.5 L 1299.5 812.5 L 1264.5 812.5 Z M 618.5 715.5 L 653.5 715.5 L 653.5 812.5 L 618.5 812.5 Z M 701.5 715.5 L 735.5 715.5 L 735.5 812.5 L 701.5 812.5 Z M 799.5 715.5 L 834.5 715.5 L 834.5 812.5 L 799.5 812.5 Z M 882.5 715.5 L 916.5 715.5 L 916.5 812.5 L 882.5 812.5 Z M 994.5 715.5 L 1028.5 715.5 L 1028.5 812.5 L 994.5 812.5 Z M 1077.5 715.5 L 1111.5 715.5 L 1111.5 812.5 L 1077.5 812.5 Z M 1182.5 715.5 L 1216.5 715.5 L 1216.5 812.5 L 1182.5 812.5 Z M 1182.5 715.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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 882.5 262.5 L 916.5 262.5 L 916.5 358.5 L 882.5 358.5 Z M 964.5 262.5 L 999.5 262.5 L 999.5 358.5 L 964.5 358.5 Z M 669.5 262.5 L 703.5 262.5 L 703.5 358.5 L 669.5 358.5 Z M 758.5 262.5 L 792.5 262.5 L 792.5 358.5 L 758.5 358.5 Z M 1264.5 209.5 L 1299.5 209.5 L 1299.5 498.5 L 1264.5 498.5 Z M 1182.5 209.5 L 1216.5 209.5 L 1216.5 498.5 L 1182.5 498.5 Z M 1182.5 209.5 "/>
 </clipPath>
-<image id="image342" 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="#image342"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 562.5 136.5 L 601.5 136.5 L 601.5 174.5 L 562.5 174.5 Z M 1332.5 136.5 L 1371.5 136.5 L 1371.5 174.5 L 1332.5 174.5 Z M 1222.5 136.5 L 1261.5 136.5 L 1261.5 174.5 L 1222.5 174.5 Z M 1112.5 136.5 L 1151.5 136.5 L 1151.5 174.5 L 1112.5 174.5 Z M 1002.5 136.5 L 1041.5 136.5 L 1041.5 174.5 L 1002.5 174.5 Z M 892.5 136.5 L 931.5 136.5 L 931.5 174.5 L 892.5 174.5 Z M 782.5 136.5 L 821.5 136.5 L 821.5 174.5 L 782.5 174.5 Z M 672.5 136.5 L 711.5 136.5 L 711.5 174.5 L 672.5 174.5 Z M 1117.5 772.5 L 1156.5 772.5 L 1156.5 773.5 L 1117.5 773.5 Z M 741.5 772.5 L 780.5 772.5 L 780.5 775.5 L 741.5 775.5 Z M 1117.5 773.5 L 1156.5 773.5 L 1156.5 810.5 L 1117.5 810.5 Z M 823.5 772.5 L 862.5 772.5 L 862.5 810.5 L 823.5 810.5 Z M 741.5 775.5 L 780.5 775.5 L 780.5 810.5 L 741.5 810.5 Z M 1199.5 772.5 L 1238.5 772.5 L 1238.5 810.5 L 1199.5 810.5 Z M 562.5 899.5 L 601.5 899.5 L 601.5 938.5 L 562.5 938.5 Z M 1332.5 899.5 L 1371.5 899.5 L 1371.5 938.5 L 1332.5 938.5 Z M 1222.5 899.5 L 1261.5 899.5 L 1261.5 938.5 L 1222.5 938.5 Z M 1112.5 899.5 L 1151.5 899.5 L 1151.5 938.5 L 1112.5 938.5 Z M 1002.5 899.5 L 1041.5 899.5 L 1041.5 938.5 L 1002.5 938.5 Z M 892.5 899.5 L 931.5 899.5 L 931.5 938.5 L 892.5 938.5 Z M 782.5 899.5 L 821.5 899.5 L 821.5 938.5 L 782.5 938.5 Z M 672.5 899.5 L 711.5 899.5 L 711.5 938.5 L 672.5 938.5 Z M 672.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="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="#image343"/>
+  <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="surface337">
+<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 1000.976562 904.597656 L 1000.976562 875.96875 L 1012.011719 875.96875 L 1013.738281 876.085938 L 1015.351562 876.402344 L 1016.84375 876.949219 L 1018.214844 877.65625 L 1019.433594 878.640625 L 1020.574219 879.777344 L 1021.515625 881.152344 L 1022.300781 882.644531 L 1022.890625 884.332031 L 1023.320312 886.140625 L 1023.558594 888.140625 L 1023.675781 890.261719 L 1023.558594 892.5 L 1023.28125 894.582031 L 1022.8125 896.46875 L 1022.183594 898.195312 L 1021.359375 899.726562 L 1020.335938 901.0625 L 1019.238281 902.160156 L 1018.019531 903.027344 L 1016.683594 903.734375 L 1015.230469 904.203125 L 1013.660156 904.519531 L 1012.011719 904.597656 Z M 1004.628906 901.375 L 1011.382812 901.375 L 1013.191406 901.257812 L 1014.800781 900.828125 L 1016.214844 900.082031 L 1017.390625 899.097656 L 1018.335938 897.765625 L 1019.121094 896.152344 L 1019.355469 895.328125 L 1019.589844 894.464844 L 1019.789062 893.523438 L 1019.90625 892.5 L 1019.984375 891.441406 L 1020.023438 890.300781 L 1019.867188 887.75 L 1019.472656 885.511719 L 1018.765625 883.585938 L 1017.824219 882.054688 L 1016.605469 880.796875 L 1015.113281 879.894531 L 1014.566406 879.699219 L 1013.976562 879.503906 L 1013.347656 879.386719 L 1012.71875 879.265625 L 1011.382812 879.1875 L 1004.628906 879.1875 Z M 1004.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 526 217 L 1407 217 M 526 161 L 1407 161 M 526 161 L 526 217 M 1407 161 L 1407 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 526 217 L 1407 217 M 526 161 L 1407 161 M 1407 217 L 1407 161 M 526 217 L 526 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 526 156 L 526 165 M 521 161 L 530 161 M 525 162 L 527 162 M 525 160 L 527 160 M 525 160 L 525 162 M 527 160 L 527 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.svg b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.svg
index 025f7df..6fb0d14 100644
--- a/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.svg
+++ b/cells/iso1n/sky130_fd_sc_lp__iso1n_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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="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="#image323"/>
+  <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 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="#image323"/>
+  <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 1269.5 697.5 L 1303.5 697.5 L 1303.5 793.5 L 1269.5 793.5 Z M 618.5 697.5 L 653.5 697.5 L 653.5 793.5 L 618.5 793.5 Z M 701.5 697.5 L 735.5 697.5 L 735.5 793.5 L 701.5 793.5 Z M 799.5 697.5 L 834.5 697.5 L 834.5 793.5 L 799.5 793.5 Z M 889.5 697.5 L 923.5 697.5 L 923.5 793.5 L 889.5 793.5 Z M 1005.5 697.5 L 1040.5 697.5 L 1040.5 793.5 L 1005.5 793.5 Z M 1088.5 697.5 L 1122.5 697.5 L 1122.5 793.5 L 1088.5 793.5 Z M 1187.5 697.5 L 1221.5 697.5 L 1221.5 793.5 L 1187.5 793.5 Z M 1187.5 697.5 "/>
 </clipPath>
-<image id="image324" 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="#image324"/>
+  <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 1246.5 220.5 L 1303.5 220.5 L 1303.5 449.5 L 1246.5 449.5 Z M 678.5 220.5 L 735.5 220.5 L 735.5 449.5 L 678.5 449.5 Z M 808.5 220.5 L 866.5 220.5 L 866.5 449.5 L 808.5 449.5 Z M 921.5 220.5 L 978.5 220.5 L 978.5 449.5 L 921.5 449.5 Z M 921.5 220.5 "/>
 </clipPath>
-<image id="image325" 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="#image325"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 706.5 772.5 L 745.5 772.5 L 745.5 810.5 L 706.5 810.5 Z M 1176.5 772.5 L 1215.5 772.5 L 1215.5 810.5 L 1176.5 810.5 Z M 1094.5 772.5 L 1133.5 772.5 L 1133.5 810.5 L 1094.5 810.5 Z M 789.5 772.5 L 828.5 772.5 L 828.5 810.5 L 789.5 810.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="image326" 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="#image326"/>
+  <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="surface320">
+<g id="surface347">
 <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 1351.824219 451.320312 L 1369.191406 476.5 L 1361.449219 476.5 L 1348.050781 456.035156 L 1334.589844 476.5 L 1326.980469 476.5 L 1344.351562 451.320312 L 1328.058594 427.421875 L 1335.664062 427.421875 L 1348.253906 446.675781 L 1360.910156 427.421875 L 1368.382812 427.421875 Z M 1351.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 1327 647 L 1366 647 M 1327 608 L 1366 608 M 1327 608 L 1327 647 M 1366 608 L 1366 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 1327 647 L 1366 647 M 1327 608 L 1366 608 M 1366 647 L 1366 608 M 1327 647 L 1327 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/iso1p/sky130_fd_sc_lp__iso1p_lp.svg b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.svg
index c518218..01b876f 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.svg
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 534.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 534.5 539.5 Z M 534.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="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="#image315"/>
+  <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 578.5 862.5 L 1348.5 862.5 L 1348.5 918.5 L 578.5 918.5 Z M 578.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="#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 1191.5 715.5 L 1225.5 715.5 L 1225.5 812.5 L 1191.5 812.5 Z M 746.5 715.5 L 781.5 715.5 L 781.5 812.5 L 746.5 812.5 Z M 829.5 715.5 L 863.5 715.5 L 863.5 812.5 L 829.5 812.5 Z M 928.5 715.5 L 962.5 715.5 L 962.5 812.5 L 928.5 812.5 Z M 1010.5 715.5 L 1044.5 715.5 L 1044.5 812.5 L 1010.5 812.5 Z M 1109.5 715.5 L 1143.5 715.5 L 1143.5 812.5 L 1109.5 812.5 Z M 1109.5 715.5 "/>
 </clipPath>
-<image id="image316" 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="#image316"/>
+  <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 907.5 262.5 L 941.5 262.5 L 941.5 358.5 L 907.5 358.5 Z M 824.5 262.5 L 859.5 262.5 L 859.5 358.5 L 824.5 358.5 Z M 1191.5 209.5 L 1225.5 209.5 L 1225.5 498.5 L 1191.5 498.5 Z M 1109.5 209.5 L 1143.5 209.5 L 1143.5 498.5 L 1109.5 498.5 Z M 1109.5 209.5 "/>
 </clipPath>
-<image id="image317" 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="#image317"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 614.5 136.5 L 653.5 136.5 L 653.5 174.5 L 614.5 174.5 Z M 1274.5 136.5 L 1313.5 136.5 L 1313.5 174.5 L 1274.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 136.5 L 763.5 136.5 L 763.5 174.5 L 724.5 174.5 Z M 954.5 263.5 L 993.5 263.5 L 993.5 290.5 L 954.5 290.5 Z M 954.5 290.5 L 993.5 290.5 L 993.5 302.5 L 954.5 302.5 Z M 1052.5 263.5 L 1091.5 263.5 L 1091.5 302.5 L 1052.5 302.5 Z M 614.5 899.5 L 653.5 899.5 L 653.5 938.5 L 614.5 938.5 Z M 1274.5 899.5 L 1313.5 899.5 L 1313.5 938.5 L 1274.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 724.5 899.5 L 763.5 899.5 L 763.5 938.5 L 724.5 938.5 Z M 724.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="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="#image318"/>
+  <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="surface312">
+<g id="surface338">
 <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 996.976562 904.597656 L 996.976562 875.96875 L 1008.011719 875.96875 L 1009.738281 876.085938 L 1011.351562 876.402344 L 1012.84375 876.949219 L 1014.214844 877.65625 L 1015.433594 878.640625 L 1016.574219 879.777344 L 1017.515625 881.152344 L 1018.300781 882.644531 L 1018.890625 884.332031 L 1019.320312 886.140625 L 1019.558594 888.140625 L 1019.675781 890.261719 L 1019.558594 892.5 L 1019.28125 894.582031 L 1018.8125 896.46875 L 1018.183594 898.195312 L 1017.359375 899.726562 L 1016.335938 901.0625 L 1015.238281 902.160156 L 1014.019531 903.027344 L 1012.683594 903.734375 L 1011.230469 904.203125 L 1009.660156 904.519531 L 1008.011719 904.597656 Z M 1000.628906 901.375 L 1007.382812 901.375 L 1009.191406 901.257812 L 1010.800781 900.828125 L 1012.214844 900.082031 L 1013.390625 899.097656 L 1014.335938 897.765625 L 1015.121094 896.152344 L 1015.355469 895.328125 L 1015.589844 894.464844 L 1015.789062 893.523438 L 1015.90625 892.5 L 1015.984375 891.441406 L 1016.023438 890.300781 L 1015.867188 887.75 L 1015.472656 885.511719 L 1014.765625 883.585938 L 1013.824219 882.054688 L 1012.605469 880.796875 L 1011.113281 879.894531 L 1010.566406 879.699219 L 1009.976562 879.503906 L 1009.347656 879.386719 L 1008.71875 879.265625 L 1007.382812 879.1875 L 1000.628906 879.1875 Z M 1000.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 578 217 L 1348 217 M 578 161 L 1348 161 M 578 161 L 578 217 M 1348 161 L 1348 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 578 217 L 1348 217 M 578 161 L 1348 161 M 1348 217 L 1348 161 M 578 217 L 578 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 578 156 L 578 165 M 573 161 L 582 161 M 577 162 L 579 162 M 577 160 L 579 160 M 577 160 L 577 162 M 579 160 L 579 162 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.svg b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.svg
index a40d9db..1ab9b20 100644
--- a/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.svg
+++ b/cells/iso1p/sky130_fd_sc_lp__iso1p_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image373"/>
 </pattern>
 <mask 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="#image346"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask1">
 <rect 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 757.5 L 1204.5 757.5 L 1204.5 853.5 L 1169.5 853.5 Z M 711.5 757.5 L 745.5 757.5 L 745.5 853.5 L 711.5 853.5 Z M 800.5 757.5 L 835.5 757.5 L 835.5 853.5 L 800.5 853.5 Z M 899.5 757.5 L 933.5 757.5 L 933.5 853.5 L 899.5 853.5 Z M 981.5 757.5 L 1016.5 757.5 L 1016.5 853.5 L 981.5 853.5 Z M 1080.5 757.5 L 1114.5 757.5 L 1114.5 853.5 L 1080.5 853.5 Z M 1080.5 757.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image374"/>
 </pattern>
 <mask id="mask2">
 <rect 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 220.5 L 1157.5 220.5 L 1157.5 449.5 L 1099.5 449.5 Z M 795.5 220.5 L 852.5 220.5 L 852.5 449.5 L 795.5 449.5 Z M 900.5 220.5 L 957.5 220.5 L 957.5 449.5 L 900.5 449.5 Z M 900.5 220.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image375"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 979.5 263.5 L 1018.5 263.5 L 1018.5 273.5 L 979.5 273.5 Z M 1062.5 263.5 L 1101.5 263.5 L 1101.5 273.5 L 1062.5 273.5 Z M 897.5 263.5 L 936.5 263.5 L 936.5 302.5 L 897.5 302.5 Z M 1062.5 273.5 L 1101.5 273.5 L 1101.5 302.5 L 1062.5 302.5 Z M 979.5 273.5 L 1018.5 273.5 L 1018.5 302.5 L 979.5 302.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="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image376"/>
 </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="surface370">
 <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 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/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.svg b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.svg
index b6ad2f4..4b3c816 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.svg
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1077.5 672.5 L 1111.5 672.5 L 1111.5 864.5 L 1077.5 864.5 Z M 839.5 768.5 L 874.5 768.5 L 874.5 864.5 L 839.5 864.5 Z M 978.5 672.5 L 1012.5 672.5 L 1012.5 864.5 L 978.5 864.5 Z M 978.5 672.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1060.5 209.5 L 1095.5 209.5 L 1095.5 498.5 L 1060.5 498.5 Z M 854.5 401.5 L 889.5 401.5 L 889.5 498.5 L 854.5 498.5 Z M 978.5 209.5 L 1012.5 209.5 L 1012.5 498.5 L 978.5 498.5 Z M 978.5 209.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 863.410156 546.757812 L 844.492188 546.757812 L 839.308594 561.5 L 832.644531 561.5 L 850.148438 512.421875 L 858.226562 512.421875 L 875.460938 561.5 L 868.460938 561.5 Z M 861.660156 541.503906 L 854.121094 519.15625 L 846.042969 541.503906 Z M 861.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 834 562 L 873 562 M 834 523 L 873 523 M 834 523 L 834 562 M 873 523 L 873 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 834 562 L 873 562 M 834 523 L 873 523 M 873 562 L 873 523 M 834 562 L 834 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/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.svg b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.svg
index ab96ee3..ff742a8 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.svg
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="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="#image313"/>
+  <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="#image313"/>
+  <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 683.5 672.5 L 718.5 672.5 L 718.5 768.5 L 683.5 768.5 Z M 1074.5 672.5 L 1109.5 672.5 L 1109.5 864.5 L 1074.5 864.5 Z M 877.5 672.5 L 911.5 672.5 L 911.5 864.5 L 877.5 864.5 Z M 976.5 672.5 L 1010.5 672.5 L 1010.5 864.5 L 976.5 864.5 Z M 1173.5 672.5 L 1207.5 672.5 L 1207.5 864.5 L 1173.5 864.5 Z M 1173.5 672.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <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 1064.5 209.5 L 1098.5 209.5 L 1098.5 498.5 L 1064.5 498.5 Z M 746.5 401.5 L 781.5 401.5 L 781.5 498.5 L 746.5 498.5 Z M 1162.5 209.5 L 1197.5 209.5 L 1197.5 498.5 L 1162.5 498.5 Z M 965.5 209.5 L 1000.5 209.5 L 1000.5 498.5 L 965.5 498.5 Z M 867.5 209.5 L 901.5 209.5 L 901.5 498.5 L 867.5 498.5 Z M 867.5 209.5 "/>
 </clipPath>
-<image id="image315" 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="#image315"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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="#image316"/>
+  <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="surface310">
+<g id="surface340">
 <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 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 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/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.svg b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.svg
index fb31482..3fdbe88 100644
--- a/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.svg
+++ b/cells/isobufsrc/sky130_fd_sc_lp__isobufsrc_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.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="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="#image325"/>
+  <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="#image325"/>
+  <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 1347.5 672.5 L 1381.5 672.5 L 1381.5 864.5 L 1347.5 864.5 Z M 540.5 672.5 L 575.5 672.5 L 575.5 864.5 L 540.5 864.5 Z M 657.5 672.5 L 691.5 672.5 L 691.5 864.5 L 657.5 864.5 Z M 756.5 672.5 L 790.5 672.5 L 790.5 864.5 L 756.5 864.5 Z M 854.5 672.5 L 889.5 672.5 L 889.5 864.5 L 854.5 864.5 Z M 953.5 672.5 L 987.5 672.5 L 987.5 864.5 L 953.5 864.5 Z M 1051.5 672.5 L 1086.5 672.5 L 1086.5 864.5 L 1051.5 864.5 Z M 1150.5 672.5 L 1184.5 672.5 L 1184.5 864.5 L 1150.5 864.5 Z M 1248.5 672.5 L 1283.5 672.5 L 1283.5 864.5 L 1248.5 864.5 Z M 1248.5 672.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1347.5 209.5 L 1381.5 209.5 L 1381.5 498.5 L 1347.5 498.5 Z M 540.5 209.5 L 575.5 209.5 L 575.5 498.5 L 540.5 498.5 Z M 657.5 209.5 L 691.5 209.5 L 691.5 498.5 L 657.5 498.5 Z M 756.5 209.5 L 790.5 209.5 L 790.5 498.5 L 756.5 498.5 Z M 854.5 209.5 L 889.5 209.5 L 889.5 498.5 L 854.5 498.5 Z M 953.5 209.5 L 987.5 209.5 L 987.5 498.5 L 953.5 498.5 Z M 1051.5 209.5 L 1086.5 209.5 L 1086.5 498.5 L 1051.5 498.5 Z M 1150.5 209.5 L 1184.5 209.5 L 1184.5 498.5 L 1150.5 498.5 Z M 1248.5 209.5 L 1283.5 209.5 L 1283.5 498.5 L 1248.5 498.5 Z M 1248.5 209.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface322">
+<g id="surface352">
 <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 1460.824219 451.320312 L 1478.191406 476.5 L 1470.449219 476.5 L 1457.050781 456.035156 L 1443.589844 476.5 L 1435.980469 476.5 L 1453.351562 451.320312 L 1437.058594 427.421875 L 1444.664062 427.421875 L 1457.253906 446.675781 L 1469.910156 427.421875 L 1477.382812 427.421875 Z M 1460.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 1436 647 L 1475 647 M 1436 608 L 1475 608 M 1436 608 L 1436 647 M 1475 608 L 1475 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 1436 647 L 1475 647 M 1436 608 L 1475 608 M 1475 647 L 1475 608 M 1436 647 L 1436 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/isolatch/sky130_fd_sc_lp__isolatch_lp.svg b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.svg
index 7a420d0..7fe7892 100644
--- a/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.svg
+++ b/cells/isolatch/sky130_fd_sc_lp__isolatch_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 152.5 "/>
 </clipPath>
-<image id="image324" 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="#image324"/>
+  <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 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="#image324"/>
+  <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 1587.5 611.5 L 1618.5 611.5 L 1618.5 698.5 L 1587.5 698.5 Z M 1512.5 611.5 L 1543.5 611.5 L 1543.5 698.5 L 1512.5 698.5 Z M 423.5 665.5 L 454.5 665.5 L 454.5 752.5 L 423.5 752.5 Z M 504.5 665.5 L 535.5 665.5 L 535.5 752.5 L 504.5 752.5 Z M 1227.5 698.5 L 1258.5 698.5 L 1258.5 785.5 L 1227.5 785.5 Z M 1049.5 698.5 L 1080.5 698.5 L 1080.5 785.5 L 1049.5 785.5 Z M 1302.5 698.5 L 1333.5 698.5 L 1333.5 785.5 L 1302.5 785.5 Z M 1124.5 698.5 L 1155.5 698.5 L 1155.5 785.5 L 1124.5 785.5 Z M 617.5 718.5 L 648.5 718.5 L 648.5 805.5 L 617.5 805.5 Z M 722.5 718.5 L 753.5 718.5 L 753.5 805.5 L 722.5 805.5 Z M 310.5 718.5 L 341.5 718.5 L 341.5 805.5 L 310.5 805.5 Z M 803.5 718.5 L 834.5 718.5 L 834.5 805.5 L 803.5 805.5 Z M 803.5 718.5 "/>
 </clipPath>
-<image id="image325" 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="#image325"/>
+  <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 304.5 240.5 L 335.5 240.5 L 335.5 327.5 L 304.5 327.5 Z M 474.5 240.5 L 505.5 240.5 L 505.5 327.5 L 474.5 327.5 Z M 688.5 240.5 L 740.5 240.5 L 740.5 447.5 L 688.5 447.5 Z M 798.5 240.5 L 849.5 240.5 L 849.5 447.5 L 798.5 447.5 Z M 586.5 240.5 L 638.5 240.5 L 638.5 447.5 L 586.5 447.5 Z M 1132.5 319.5 L 1163.5 319.5 L 1163.5 451.5 L 1132.5 451.5 Z M 1382.5 273.5 L 1433.5 273.5 L 1433.5 480.5 L 1382.5 480.5 Z M 1491.5 273.5 L 1543.5 273.5 L 1543.5 480.5 L 1491.5 480.5 Z M 1491.5 273.5 "/>
 </clipPath>
-<image id="image326" 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="#image326"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1439.5 279.5 L 1474.5 279.5 L 1474.5 286.5 L 1439.5 286.5 Z M 743.5 279.5 L 778.5 279.5 L 778.5 298.5 L 743.5 298.5 Z M 1240.5 279.5 L 1275.5 279.5 L 1275.5 315.5 L 1240.5 315.5 Z M 743.5 298.5 L 778.5 298.5 L 778.5 315.5 L 743.5 315.5 Z M 1439.5 286.5 L 1474.5 286.5 L 1474.5 315.5 L 1439.5 315.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="image327" 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="#image327"/>
+  <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="surface321">
+<g id="surface348">
 <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 1678.734375 481.921875 L 1675.832031 485.5 L 1669.355469 480.132812 L 1667.503906 481.117188 L 1665.652344 481.859375 L 1663.738281 482.476562 L 1661.703125 482.90625 L 1659.664062 483.15625 L 1657.566406 483.277344 L 1654.730469 483.09375 L 1652.074219 482.660156 L 1649.605469 481.921875 L 1647.261719 480.933594 L 1645.039062 479.636719 L 1643.066406 477.972656 L 1641.277344 476.179688 L 1639.734375 474.144531 L 1638.5 471.921875 L 1637.449219 469.515625 L 1636.648438 466.925781 L 1636.152344 464.085938 L 1636.03125 463.40625 L 1635.96875 462.667969 L 1635.90625 461.988281 L 1635.84375 461.246094 L 1635.84375 459.703125 L 1635.96875 456.621094 L 1636.402344 453.65625 L 1637.078125 450.941406 L 1638.066406 448.351562 L 1639.300781 445.941406 L 1640.90625 443.722656 L 1642.511719 441.933594 L 1644.359375 440.328125 L 1646.398438 438.96875 L 1648.558594 437.921875 L 1650.902344 437.058594 L 1653.496094 436.441406 L 1654.113281 436.378906 L 1654.789062 436.316406 L 1656.148438 436.191406 L 1656.828125 436.191406 L 1657.566406 436.132812 L 1660.34375 436.316406 L 1662.996094 436.75 L 1665.464844 437.488281 L 1667.8125 438.476562 L 1670.03125 439.773438 L 1672.070312 441.375 L 1673.796875 443.226562 L 1675.339844 445.203125 L 1676.574219 447.363281 L 1677.625 449.769531 L 1678.425781 452.359375 L 1678.980469 455.078125 L 1679.042969 455.878906 L 1679.105469 456.621094 L 1679.167969 457.359375 L 1679.226562 458.101562 L 1679.226562 458.839844 L 1679.289062 459.582031 L 1679.105469 463.039062 L 1678.550781 466.308594 L 1677.683594 469.332031 L 1676.449219 472.171875 L 1674.847656 474.761719 L 1672.933594 477.167969 Z M 1663.183594 469.207031 L 1668.675781 473.714844 L 1670.15625 471.863281 L 1671.390625 469.765625 L 1672.316406 467.480469 L 1672.996094 465.074219 L 1673.367188 462.480469 L 1673.550781 459.644531 L 1673.425781 457.050781 L 1673.058594 454.582031 L 1672.441406 452.300781 L 1671.636719 450.203125 L 1670.589844 448.226562 L 1669.292969 446.4375 L 1667.8125 444.957031 L 1666.269531 443.722656 L 1664.539062 442.734375 L 1662.6875 441.992188 L 1660.652344 441.5 L 1658.554688 441.191406 L 1657.566406 441.191406 L 1655.347656 441.375 L 1653.246094 441.746094 L 1651.273438 442.363281 L 1649.484375 443.289062 L 1647.816406 444.460938 L 1646.335938 445.882812 L 1644.917969 447.546875 L 1643.804688 449.398438 L 1642.878906 451.433594 L 1642.203125 453.65625 L 1641.769531 456.0625 L 1641.585938 458.65625 L 1641.585938 459.703125 L 1641.644531 462.421875 L 1642.015625 464.886719 L 1642.632812 467.171875 L 1643.433594 469.332031 L 1644.546875 471.304688 L 1645.902344 473.035156 L 1647.324219 474.578125 L 1648.929688 475.8125 L 1650.65625 476.796875 L 1652.507812 477.476562 L 1654.542969 477.972656 L 1656.703125 478.15625 L 1656.828125 478.21875 L 1658.617188 478.21875 L 1659.789062 478.09375 L 1660.960938 477.847656 L 1662.070312 477.601562 L 1663.183594 477.230469 L 1664.355469 476.738281 L 1664.417969 476.738281 L 1664.539062 476.675781 L 1664.601562 476.613281 L 1664.726562 476.613281 L 1664.789062 476.550781 L 1664.910156 476.488281 L 1660.34375 472.664062 Z M 1663.183594 469.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 637 L 1673 637 M 1637 602 L 1673 602 M 1637 602 L 1637 637 M 1673 602 L 1673 637 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 637 L 1673 637 M 1637 602 L 1673 602 M 1673 637 L 1673 602 M 1637 637 L 1637 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(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/lsbuf/sky130_fd_sc_lp__lsbuf_lp.svg b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.svg
index 2bbcf58..888702b 100644
--- a/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.svg
+++ b/cells/lsbuf/sky130_fd_sc_lp__lsbuf_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 667.5 105.5 L 1261.5 105.5 L 1261.5 334.5 L 667.5 334.5 Z M 667.5 739.5 L 1261.5 739.5 L 1261.5 967.5 L 667.5 967.5 Z M 667.5 739.5 "/>
 </clipPath>
-<image id="image474" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image502" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image474"/>
+  <use xlink:href="#image502"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 689.5 168.5 L 710.5 168.5 L 710.5 182.5 L 689.5 182.5 Z M 1218.5 168.5 L 1239.5 168.5 L 1239.5 182.5 L 1218.5 182.5 Z M 1218.5 182.5 L 1239.5 182.5 L 1239.5 203.5 L 1218.5 203.5 Z M 689.5 182.5 L 710.5 182.5 L 710.5 203.5 L 689.5 203.5 Z M 689.5 203.5 L 710.5 203.5 L 710.5 236.5 L 689.5 236.5 Z M 1218.5 203.5 L 1239.5 203.5 L 1239.5 236.5 L 1218.5 236.5 Z M 1218.5 236.5 L 1239.5 236.5 L 1239.5 256.5 L 1218.5 256.5 Z M 689.5 236.5 L 710.5 236.5 L 710.5 256.5 L 689.5 256.5 Z M 689.5 256.5 L 710.5 256.5 L 710.5 271.5 L 689.5 271.5 Z M 1218.5 256.5 L 1239.5 256.5 L 1239.5 271.5 L 1218.5 271.5 Z M 689.5 801.5 L 710.5 801.5 L 710.5 816.5 L 689.5 816.5 Z M 1218.5 801.5 L 1239.5 801.5 L 1239.5 816.5 L 1218.5 816.5 Z M 1218.5 816.5 L 1239.5 816.5 L 1239.5 837.5 L 1218.5 837.5 Z M 689.5 816.5 L 710.5 816.5 L 710.5 837.5 L 689.5 837.5 Z M 689.5 837.5 L 710.5 837.5 L 710.5 869.5 L 689.5 869.5 Z M 1218.5 837.5 L 1239.5 837.5 L 1239.5 869.5 L 1218.5 869.5 Z M 1218.5 869.5 L 1239.5 869.5 L 1239.5 890.5 L 1218.5 890.5 Z M 689.5 869.5 L 710.5 869.5 L 710.5 890.5 L 689.5 890.5 Z M 689.5 890.5 L 710.5 890.5 L 710.5 905.5 L 689.5 905.5 Z M 1218.5 890.5 L 1239.5 890.5 L 1239.5 905.5 L 1218.5 905.5 Z M 1218.5 890.5 "/>
 </clipPath>
-<image id="image475" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image503" 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="#image475"/>
+  <use xlink:href="#image503"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 689.5 396.5 L 710.5 396.5 L 710.5 411.5 L 689.5 411.5 Z M 1218.5 396.5 L 1239.5 396.5 L 1239.5 411.5 L 1218.5 411.5 Z M 1218.5 411.5 L 1239.5 411.5 L 1239.5 432.5 L 1218.5 432.5 Z M 689.5 411.5 L 710.5 411.5 L 710.5 432.5 L 689.5 432.5 Z M 689.5 432.5 L 710.5 432.5 L 710.5 462.5 L 689.5 462.5 Z M 1218.5 432.5 L 1239.5 432.5 L 1239.5 462.5 L 1218.5 462.5 Z M 1218.5 462.5 L 1239.5 462.5 L 1239.5 482.5 L 1218.5 482.5 Z M 689.5 462.5 L 710.5 462.5 L 710.5 482.5 L 689.5 482.5 Z M 689.5 482.5 L 710.5 482.5 L 710.5 497.5 L 689.5 497.5 Z M 1218.5 482.5 L 1239.5 482.5 L 1239.5 497.5 L 1218.5 497.5 Z M 689.5 575.5 L 710.5 575.5 L 710.5 590.5 L 689.5 590.5 Z M 1218.5 575.5 L 1239.5 575.5 L 1239.5 590.5 L 1218.5 590.5 Z M 1218.5 590.5 L 1239.5 590.5 L 1239.5 611.5 L 1218.5 611.5 Z M 689.5 590.5 L 710.5 590.5 L 710.5 611.5 L 689.5 611.5 Z M 689.5 611.5 L 710.5 611.5 L 710.5 641.5 L 689.5 641.5 Z M 1218.5 611.5 L 1239.5 611.5 L 1239.5 641.5 L 1218.5 641.5 Z M 1218.5 641.5 L 1239.5 641.5 L 1239.5 662.5 L 1218.5 662.5 Z M 689.5 641.5 L 710.5 641.5 L 710.5 662.5 L 689.5 662.5 Z M 689.5 662.5 L 710.5 662.5 L 710.5 677.5 L 689.5 677.5 Z M 1218.5 662.5 L 1239.5 662.5 L 1239.5 677.5 L 1218.5 677.5 Z M 1218.5 662.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image475"/>
+  <use xlink:href="#image503"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 821.5 402.5 L 839.5 402.5 L 839.5 504.5 L 821.5 504.5 Z M 1132.5 402.5 L 1150.5 402.5 L 1150.5 504.5 L 1132.5 504.5 Z M 1088.5 402.5 L 1106.5 402.5 L 1106.5 504.5 L 1088.5 504.5 Z M 962.5 402.5 L 980.5 402.5 L 980.5 504.5 L 962.5 504.5 Z M 918.5 402.5 L 936.5 402.5 L 936.5 504.5 L 918.5 504.5 Z M 865.5 402.5 L 883.5 402.5 L 883.5 504.5 L 865.5 504.5 Z M 778.5 620.5 L 796.5 620.5 L 796.5 671.5 L 778.5 671.5 Z M 822.5 620.5 L 840.5 620.5 L 840.5 671.5 L 822.5 671.5 Z M 822.5 620.5 "/>
 </clipPath>
-<image id="image476" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image504" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image476"/>
+  <use xlink:href="#image504"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 821.5 157.5 L 839.5 157.5 L 839.5 280.5 L 821.5 280.5 Z M 1132.5 157.5 L 1150.5 157.5 L 1150.5 280.5 L 1132.5 280.5 Z M 1088.5 157.5 L 1106.5 157.5 L 1106.5 280.5 L 1088.5 280.5 Z M 962.5 157.5 L 980.5 157.5 L 980.5 280.5 L 962.5 280.5 Z M 918.5 157.5 L 936.5 157.5 L 936.5 280.5 L 918.5 280.5 Z M 865.5 157.5 L 883.5 157.5 L 883.5 280.5 L 865.5 280.5 Z M 778.5 793.5 L 796.5 793.5 L 796.5 915.5 L 778.5 915.5 Z M 822.5 793.5 L 840.5 793.5 L 840.5 915.5 L 822.5 915.5 Z M 822.5 793.5 "/>
 </clipPath>
-<image id="image477" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image505" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image477"/>
+  <use xlink:href="#image505"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -71,15 +71,15 @@
 <clipPath id="clip12">
   <path d="M 689.5 118.5 L 710.5 118.5 L 710.5 139.5 L 689.5 139.5 Z M 1218.5 118.5 L 1239.5 118.5 L 1239.5 139.5 L 1218.5 139.5 Z M 1159.5 118.5 L 1180.5 118.5 L 1180.5 139.5 L 1159.5 139.5 Z M 1101.5 118.5 L 1121.5 118.5 L 1121.5 139.5 L 1101.5 139.5 Z M 1042.5 118.5 L 1063.5 118.5 L 1063.5 139.5 L 1042.5 139.5 Z M 983.5 118.5 L 1004.5 118.5 L 1004.5 139.5 L 983.5 139.5 Z M 924.5 118.5 L 945.5 118.5 L 945.5 139.5 L 924.5 139.5 Z M 865.5 118.5 L 886.5 118.5 L 886.5 139.5 L 865.5 139.5 Z M 807.5 118.5 L 827.5 118.5 L 827.5 139.5 L 807.5 139.5 Z M 748.5 118.5 L 769.5 118.5 L 769.5 139.5 L 748.5 139.5 Z M 689.5 526.5 L 710.5 526.5 L 710.5 547.5 L 689.5 547.5 Z M 1218.5 526.5 L 1239.5 526.5 L 1239.5 547.5 L 1218.5 547.5 Z M 1159.5 526.5 L 1180.5 526.5 L 1180.5 547.5 L 1159.5 547.5 Z M 1101.5 526.5 L 1121.5 526.5 L 1121.5 547.5 L 1101.5 547.5 Z M 1042.5 526.5 L 1063.5 526.5 L 1063.5 547.5 L 1042.5 547.5 Z M 983.5 526.5 L 1004.5 526.5 L 1004.5 547.5 L 983.5 547.5 Z M 865.5 526.5 L 886.5 526.5 L 886.5 547.5 L 865.5 547.5 Z M 807.5 526.5 L 827.5 526.5 L 827.5 547.5 L 807.5 547.5 Z M 748.5 526.5 L 769.5 526.5 L 769.5 547.5 L 748.5 547.5 Z M 689.5 934.5 L 710.5 934.5 L 710.5 955.5 L 689.5 955.5 Z M 1218.5 934.5 L 1239.5 934.5 L 1239.5 955.5 L 1218.5 955.5 Z M 1159.5 934.5 L 1180.5 934.5 L 1180.5 955.5 L 1159.5 955.5 Z M 1101.5 934.5 L 1121.5 934.5 L 1121.5 955.5 L 1101.5 955.5 Z M 1042.5 934.5 L 1063.5 934.5 L 1063.5 955.5 L 1042.5 955.5 Z M 983.5 934.5 L 1004.5 934.5 L 1004.5 955.5 L 983.5 955.5 Z M 924.5 934.5 L 945.5 934.5 L 945.5 955.5 L 924.5 955.5 Z M 865.5 934.5 L 886.5 934.5 L 886.5 955.5 L 865.5 955.5 Z M 807.5 934.5 L 827.5 934.5 L 827.5 955.5 L 807.5 955.5 Z M 748.5 934.5 L 769.5 934.5 L 769.5 955.5 L 748.5 955.5 Z M 748.5 934.5 "/>
 </clipPath>
-<image id="image478" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image506" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image478"/>
+  <use xlink:href="#image506"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface471">
+<g id="surface499">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -250,6 +250,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 982.898438 544.015625 L 982.898438 528.679688 L 988.808594 528.679688 L 989.734375 528.742188 L 990.597656 528.910156 L 991.398438 529.207031 L 992.132812 529.585938 L 992.785156 530.109375 L 993.394531 530.71875 L 993.902344 531.457031 L 994.320312 532.257812 L 994.636719 533.160156 L 994.867188 534.128906 L 994.996094 535.203125 L 995.058594 536.335938 L 994.996094 537.535156 L 994.847656 538.652344 L 994.59375 539.660156 L 994.257812 540.585938 L 993.816406 541.40625 L 993.269531 542.121094 L 992.679688 542.710938 L 992.027344 543.175781 L 991.3125 543.554688 L 990.535156 543.804688 L 989.695312 543.972656 L 988.808594 544.015625 Z M 984.855469 542.292969 L 988.472656 542.292969 L 989.441406 542.226562 L 990.304688 541.996094 L 991.0625 541.597656 L 991.691406 541.070312 L 992.195312 540.355469 L 992.617188 539.492188 L 992.742188 539.050781 L 992.871094 538.589844 L 992.976562 538.082031 L 993.039062 537.535156 L 993.082031 536.96875 L 993.101562 536.359375 L 993.015625 534.992188 L 992.808594 533.792969 L 992.429688 532.761719 L 991.921875 531.941406 L 991.269531 531.265625 L 990.472656 530.785156 L 990.175781 530.679688 L 989.863281 530.574219 L 989.523438 530.511719 L 989.1875 530.445312 L 988.832031 530.425781 L 988.472656 530.40625 L 984.855469 530.40625 Z M 984.855469 542.292969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 670 573 L 1258 573 M 670 513 L 1258 513 M 670 513 L 670 573 M 1258 513 L 1258 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 670 573 L 1258 573 M 670 513 L 1258 513 M 1258 573 L 1258 513 M 670 573 L 670 513 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 670 130 L 670 139 M 665 135 L 674 135 M 669 136 L 671 136 M 669 134 L 671 134 M 669 134 L 669 136 M 671 134 L 671 136 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.svg b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.svg
index afedcc5..be9a17e 100644
--- a/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.svg
+++ b/cells/lsbufiso0p/sky130_fd_sc_lp__lsbufiso0p_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 548.5 105.5 L 1377.5 105.5 L 1377.5 334.5 L 548.5 334.5 Z M 548.5 739.5 L 1377.5 739.5 L 1377.5 967.5 L 548.5 967.5 Z M 548.5 739.5 "/>
 </clipPath>
-<image id="image539" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image567" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image539"/>
+  <use xlink:href="#image567"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 570.5 168.5 L 591.5 168.5 L 591.5 182.5 L 570.5 182.5 Z M 1334.5 168.5 L 1355.5 168.5 L 1355.5 182.5 L 1334.5 182.5 Z M 1334.5 182.5 L 1355.5 182.5 L 1355.5 203.5 L 1334.5 203.5 Z M 570.5 182.5 L 591.5 182.5 L 591.5 203.5 L 570.5 203.5 Z M 570.5 203.5 L 591.5 203.5 L 591.5 236.5 L 570.5 236.5 Z M 1334.5 203.5 L 1355.5 203.5 L 1355.5 236.5 L 1334.5 236.5 Z M 1334.5 236.5 L 1355.5 236.5 L 1355.5 256.5 L 1334.5 256.5 Z M 570.5 236.5 L 591.5 236.5 L 591.5 256.5 L 570.5 256.5 Z M 570.5 256.5 L 591.5 256.5 L 591.5 271.5 L 570.5 271.5 Z M 1334.5 256.5 L 1355.5 256.5 L 1355.5 271.5 L 1334.5 271.5 Z M 570.5 801.5 L 591.5 801.5 L 591.5 816.5 L 570.5 816.5 Z M 1334.5 801.5 L 1355.5 801.5 L 1355.5 816.5 L 1334.5 816.5 Z M 1334.5 816.5 L 1355.5 816.5 L 1355.5 837.5 L 1334.5 837.5 Z M 570.5 816.5 L 591.5 816.5 L 591.5 837.5 L 570.5 837.5 Z M 570.5 837.5 L 591.5 837.5 L 591.5 869.5 L 570.5 869.5 Z M 1334.5 837.5 L 1355.5 837.5 L 1355.5 869.5 L 1334.5 869.5 Z M 1334.5 869.5 L 1355.5 869.5 L 1355.5 890.5 L 1334.5 890.5 Z M 570.5 869.5 L 591.5 869.5 L 591.5 890.5 L 570.5 890.5 Z M 570.5 890.5 L 591.5 890.5 L 591.5 905.5 L 570.5 905.5 Z M 1334.5 890.5 L 1355.5 890.5 L 1355.5 905.5 L 1334.5 905.5 Z M 1334.5 890.5 "/>
 </clipPath>
-<image id="image540" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image568" 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="#image540"/>
+  <use xlink:href="#image568"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 570.5 396.5 L 591.5 396.5 L 591.5 411.5 L 570.5 411.5 Z M 1334.5 396.5 L 1355.5 396.5 L 1355.5 411.5 L 1334.5 411.5 Z M 1334.5 411.5 L 1355.5 411.5 L 1355.5 432.5 L 1334.5 432.5 Z M 570.5 411.5 L 591.5 411.5 L 591.5 432.5 L 570.5 432.5 Z M 570.5 432.5 L 591.5 432.5 L 591.5 462.5 L 570.5 462.5 Z M 1334.5 432.5 L 1355.5 432.5 L 1355.5 462.5 L 1334.5 462.5 Z M 1334.5 462.5 L 1355.5 462.5 L 1355.5 482.5 L 1334.5 482.5 Z M 570.5 462.5 L 591.5 462.5 L 591.5 482.5 L 570.5 482.5 Z M 570.5 482.5 L 591.5 482.5 L 591.5 497.5 L 570.5 497.5 Z M 1334.5 482.5 L 1355.5 482.5 L 1355.5 497.5 L 1334.5 497.5 Z M 570.5 575.5 L 591.5 575.5 L 591.5 590.5 L 570.5 590.5 Z M 1334.5 575.5 L 1355.5 575.5 L 1355.5 590.5 L 1334.5 590.5 Z M 1334.5 590.5 L 1355.5 590.5 L 1355.5 611.5 L 1334.5 611.5 Z M 570.5 590.5 L 591.5 590.5 L 591.5 611.5 L 570.5 611.5 Z M 570.5 611.5 L 591.5 611.5 L 591.5 641.5 L 570.5 641.5 Z M 1334.5 611.5 L 1355.5 611.5 L 1355.5 641.5 L 1334.5 641.5 Z M 1334.5 641.5 L 1355.5 641.5 L 1355.5 662.5 L 1334.5 662.5 Z M 570.5 641.5 L 591.5 641.5 L 591.5 662.5 L 570.5 662.5 Z M 570.5 662.5 L 591.5 662.5 L 591.5 677.5 L 570.5 677.5 Z M 1334.5 662.5 L 1355.5 662.5 L 1355.5 677.5 L 1334.5 677.5 Z M 1334.5 662.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image540"/>
+  <use xlink:href="#image568"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 919.5 402.5 L 937.5 402.5 L 937.5 453.5 L 919.5 453.5 Z M 963.5 402.5 L 981.5 402.5 L 981.5 453.5 L 963.5 453.5 Z M 1203.5 402.5 L 1222.5 402.5 L 1222.5 504.5 L 1203.5 504.5 Z M 1151.5 402.5 L 1169.5 402.5 L 1169.5 504.5 L 1151.5 504.5 Z M 1107.5 402.5 L 1125.5 402.5 L 1125.5 504.5 L 1107.5 504.5 Z M 755.5 402.5 L 774.5 402.5 L 774.5 504.5 L 755.5 504.5 Z M 703.5 402.5 L 721.5 402.5 L 721.5 504.5 L 703.5 504.5 Z M 799.5 402.5 L 818.5 402.5 L 818.5 504.5 L 799.5 504.5 Z M 1248.5 402.5 L 1266.5 402.5 L 1266.5 504.5 L 1248.5 504.5 Z M 658.5 402.5 L 677.5 402.5 L 677.5 504.5 L 658.5 504.5 Z M 867.5 568.5 L 886.5 568.5 L 886.5 671.5 L 867.5 671.5 Z M 658.5 620.5 L 677.5 620.5 L 677.5 671.5 L 658.5 671.5 Z M 703.5 620.5 L 721.5 620.5 L 721.5 671.5 L 703.5 671.5 Z M 703.5 620.5 "/>
 </clipPath>
-<image id="image541" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image569" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image541"/>
+  <use xlink:href="#image569"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 658.5 157.5 L 677.5 157.5 L 677.5 280.5 L 658.5 280.5 Z M 1248.5 157.5 L 1266.5 157.5 L 1266.5 280.5 L 1248.5 280.5 Z M 1203.5 157.5 L 1222.5 157.5 L 1222.5 280.5 L 1203.5 280.5 Z M 1060.5 157.5 L 1078.5 157.5 L 1078.5 280.5 L 1060.5 280.5 Z M 1015.5 157.5 L 1034.5 157.5 L 1034.5 280.5 L 1015.5 280.5 Z M 963.5 157.5 L 981.5 157.5 L 981.5 280.5 L 963.5 280.5 Z M 799.5 157.5 L 818.5 157.5 L 818.5 280.5 L 799.5 280.5 Z M 755.5 157.5 L 774.5 157.5 L 774.5 280.5 L 755.5 280.5 Z M 703.5 157.5 L 721.5 157.5 L 721.5 280.5 L 703.5 280.5 Z M 658.5 793.5 L 677.5 793.5 L 677.5 915.5 L 658.5 915.5 Z M 703.5 793.5 L 721.5 793.5 L 721.5 915.5 L 703.5 915.5 Z M 703.5 793.5 "/>
 </clipPath>
-<image id="image542" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image570" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image542"/>
+  <use xlink:href="#image570"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -71,15 +71,15 @@
 <clipPath id="clip12">
   <path d="M 570.5 118.5 L 591.5 118.5 L 591.5 139.5 L 570.5 139.5 Z M 1334.5 118.5 L 1355.5 118.5 L 1355.5 139.5 L 1334.5 139.5 Z M 1275.5 118.5 L 1296.5 118.5 L 1296.5 139.5 L 1275.5 139.5 Z M 1216.5 118.5 L 1237.5 118.5 L 1237.5 139.5 L 1216.5 139.5 Z M 1158.5 118.5 L 1178.5 118.5 L 1178.5 139.5 L 1158.5 139.5 Z M 1099.5 118.5 L 1120.5 118.5 L 1120.5 139.5 L 1099.5 139.5 Z M 1040.5 118.5 L 1061.5 118.5 L 1061.5 139.5 L 1040.5 139.5 Z M 981.5 118.5 L 1002.5 118.5 L 1002.5 139.5 L 981.5 139.5 Z M 922.5 118.5 L 943.5 118.5 L 943.5 139.5 L 922.5 139.5 Z M 864.5 118.5 L 884.5 118.5 L 884.5 139.5 L 864.5 139.5 Z M 805.5 118.5 L 826.5 118.5 L 826.5 139.5 L 805.5 139.5 Z M 746.5 118.5 L 767.5 118.5 L 767.5 139.5 L 746.5 139.5 Z M 687.5 118.5 L 708.5 118.5 L 708.5 139.5 L 687.5 139.5 Z M 628.5 118.5 L 649.5 118.5 L 649.5 139.5 L 628.5 139.5 Z M 570.5 526.5 L 591.5 526.5 L 591.5 547.5 L 570.5 547.5 Z M 1334.5 526.5 L 1355.5 526.5 L 1355.5 547.5 L 1334.5 547.5 Z M 1275.5 526.5 L 1296.5 526.5 L 1296.5 547.5 L 1275.5 547.5 Z M 1216.5 526.5 L 1237.5 526.5 L 1237.5 547.5 L 1216.5 547.5 Z M 1158.5 526.5 L 1178.5 526.5 L 1178.5 547.5 L 1158.5 547.5 Z M 1099.5 526.5 L 1120.5 526.5 L 1120.5 547.5 L 1099.5 547.5 Z M 1040.5 526.5 L 1061.5 526.5 L 1061.5 547.5 L 1040.5 547.5 Z M 981.5 526.5 L 1002.5 526.5 L 1002.5 547.5 L 981.5 547.5 Z M 922.5 526.5 L 943.5 526.5 L 943.5 547.5 L 922.5 547.5 Z M 746.5 526.5 L 767.5 526.5 L 767.5 547.5 L 746.5 547.5 Z M 687.5 526.5 L 708.5 526.5 L 708.5 547.5 L 687.5 547.5 Z M 628.5 526.5 L 649.5 526.5 L 649.5 547.5 L 628.5 547.5 Z M 570.5 934.5 L 591.5 934.5 L 591.5 955.5 L 570.5 955.5 Z M 1334.5 934.5 L 1355.5 934.5 L 1355.5 955.5 L 1334.5 955.5 Z M 1275.5 934.5 L 1296.5 934.5 L 1296.5 955.5 L 1275.5 955.5 Z M 1216.5 934.5 L 1237.5 934.5 L 1237.5 955.5 L 1216.5 955.5 Z M 1158.5 934.5 L 1178.5 934.5 L 1178.5 955.5 L 1158.5 955.5 Z M 1099.5 934.5 L 1120.5 934.5 L 1120.5 955.5 L 1099.5 955.5 Z M 1040.5 934.5 L 1061.5 934.5 L 1061.5 955.5 L 1040.5 955.5 Z M 981.5 934.5 L 1002.5 934.5 L 1002.5 955.5 L 981.5 955.5 Z M 922.5 934.5 L 943.5 934.5 L 943.5 955.5 L 922.5 955.5 Z M 864.5 934.5 L 884.5 934.5 L 884.5 955.5 L 864.5 955.5 Z M 805.5 934.5 L 826.5 934.5 L 826.5 955.5 L 805.5 955.5 Z M 746.5 934.5 L 767.5 934.5 L 767.5 955.5 L 746.5 955.5 Z M 687.5 934.5 L 708.5 934.5 L 708.5 955.5 L 687.5 955.5 Z M 628.5 934.5 L 649.5 934.5 L 649.5 955.5 L 628.5 955.5 Z M 628.5 934.5 "/>
 </clipPath>
-<image id="image543" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image571" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image543"/>
+  <use xlink:href="#image571"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface536">
+<g id="surface564">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -275,6 +275,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 980.898438 546.015625 L 980.898438 530.679688 L 986.808594 530.679688 L 987.734375 530.742188 L 988.597656 530.910156 L 989.398438 531.207031 L 990.132812 531.585938 L 990.785156 532.109375 L 991.394531 532.71875 L 991.902344 533.457031 L 992.320312 534.257812 L 992.636719 535.160156 L 992.867188 536.128906 L 992.996094 537.203125 L 993.058594 538.335938 L 992.996094 539.535156 L 992.847656 540.652344 L 992.59375 541.660156 L 992.257812 542.585938 L 991.816406 543.40625 L 991.269531 544.121094 L 990.679688 544.710938 L 990.027344 545.175781 L 989.3125 545.554688 L 988.535156 545.804688 L 987.695312 545.972656 L 986.808594 546.015625 Z M 982.855469 544.292969 L 986.472656 544.292969 L 987.441406 544.226562 L 988.304688 543.996094 L 989.0625 543.597656 L 989.691406 543.070312 L 990.195312 542.355469 L 990.617188 541.492188 L 990.742188 541.050781 L 990.871094 540.589844 L 990.976562 540.082031 L 991.039062 539.535156 L 991.082031 538.96875 L 991.101562 538.359375 L 991.015625 536.992188 L 990.808594 535.792969 L 990.429688 534.761719 L 989.921875 533.941406 L 989.269531 533.265625 L 988.472656 532.785156 L 988.175781 532.679688 L 987.863281 532.574219 L 987.523438 532.511719 L 987.1875 532.445312 L 986.832031 532.425781 L 986.472656 532.40625 L 982.855469 532.40625 Z M 982.855469 544.292969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 551 571 L 1374 571 M 551 511 L 1374 511 M 551 511 L 551 571 M 1374 511 L 1374 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 551 571 L 1374 571 M 551 511 L 1374 511 M 1374 571 L 1374 511 M 551 571 L 551 511 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 551 130 L 551 139 M 546 135 L 555 135 M 550 136 L 552 136 M 550 134 L 552 134 M 550 134 L 550 136 M 552 134 L 552 136 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.svg b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.svg
index 2ec821c..44d16d5 100644
--- a/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.svg
+++ b/cells/lsbufiso1p/sky130_fd_sc_lp__lsbufiso1p_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 518.5 105.5 L 1406.5 105.5 L 1406.5 334.5 L 518.5 334.5 Z M 518.5 739.5 L 1406.5 739.5 L 1406.5 967.5 L 518.5 967.5 Z M 518.5 739.5 "/>
 </clipPath>
-<image id="image542" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image570" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image542"/>
+  <use xlink:href="#image570"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 540.5 168.5 L 561.5 168.5 L 561.5 182.5 L 540.5 182.5 Z M 1363.5 168.5 L 1384.5 168.5 L 1384.5 182.5 L 1363.5 182.5 Z M 1363.5 182.5 L 1384.5 182.5 L 1384.5 203.5 L 1363.5 203.5 Z M 540.5 182.5 L 561.5 182.5 L 561.5 203.5 L 540.5 203.5 Z M 540.5 203.5 L 561.5 203.5 L 561.5 236.5 L 540.5 236.5 Z M 1363.5 203.5 L 1384.5 203.5 L 1384.5 236.5 L 1363.5 236.5 Z M 1363.5 236.5 L 1384.5 236.5 L 1384.5 256.5 L 1363.5 256.5 Z M 540.5 236.5 L 561.5 236.5 L 561.5 256.5 L 540.5 256.5 Z M 540.5 256.5 L 561.5 256.5 L 561.5 271.5 L 540.5 271.5 Z M 1363.5 256.5 L 1384.5 256.5 L 1384.5 271.5 L 1363.5 271.5 Z M 540.5 801.5 L 561.5 801.5 L 561.5 816.5 L 540.5 816.5 Z M 1363.5 801.5 L 1384.5 801.5 L 1384.5 816.5 L 1363.5 816.5 Z M 1363.5 816.5 L 1384.5 816.5 L 1384.5 837.5 L 1363.5 837.5 Z M 540.5 816.5 L 561.5 816.5 L 561.5 837.5 L 540.5 837.5 Z M 540.5 837.5 L 561.5 837.5 L 561.5 869.5 L 540.5 869.5 Z M 1363.5 837.5 L 1384.5 837.5 L 1384.5 869.5 L 1363.5 869.5 Z M 1363.5 869.5 L 1384.5 869.5 L 1384.5 890.5 L 1363.5 890.5 Z M 540.5 869.5 L 561.5 869.5 L 561.5 890.5 L 540.5 890.5 Z M 540.5 890.5 L 561.5 890.5 L 561.5 905.5 L 540.5 905.5 Z M 1363.5 890.5 L 1384.5 890.5 L 1384.5 905.5 L 1363.5 905.5 Z M 1363.5 890.5 "/>
 </clipPath>
-<image id="image543" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAwSURBVDiNY/j/n4EBH2ZiIAAY/xNQQNgEBob/DIx4MB3cwMKA1wWMo+EwGg4jMRwAehZNIEIrpyYAAAAASUVORK5CYII="/>
+<image id="image571" 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="#image543"/>
+  <use xlink:href="#image571"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -37,7 +37,7 @@
   <path d="M 540.5 396.5 L 561.5 396.5 L 561.5 411.5 L 540.5 411.5 Z M 1363.5 396.5 L 1384.5 396.5 L 1384.5 411.5 L 1363.5 411.5 Z M 1363.5 411.5 L 1384.5 411.5 L 1384.5 432.5 L 1363.5 432.5 Z M 540.5 411.5 L 561.5 411.5 L 561.5 432.5 L 540.5 432.5 Z M 540.5 432.5 L 561.5 432.5 L 561.5 462.5 L 540.5 462.5 Z M 1363.5 432.5 L 1384.5 432.5 L 1384.5 462.5 L 1363.5 462.5 Z M 1363.5 462.5 L 1384.5 462.5 L 1384.5 482.5 L 1363.5 482.5 Z M 540.5 462.5 L 561.5 462.5 L 561.5 482.5 L 540.5 482.5 Z M 540.5 482.5 L 561.5 482.5 L 561.5 497.5 L 540.5 497.5 Z M 1363.5 482.5 L 1384.5 482.5 L 1384.5 497.5 L 1363.5 497.5 Z M 540.5 575.5 L 561.5 575.5 L 561.5 590.5 L 540.5 590.5 Z M 1363.5 575.5 L 1384.5 575.5 L 1384.5 590.5 L 1363.5 590.5 Z M 1363.5 590.5 L 1384.5 590.5 L 1384.5 611.5 L 1363.5 611.5 Z M 540.5 590.5 L 561.5 590.5 L 561.5 611.5 L 540.5 611.5 Z M 540.5 611.5 L 561.5 611.5 L 561.5 641.5 L 540.5 641.5 Z M 1363.5 611.5 L 1384.5 611.5 L 1384.5 641.5 L 1363.5 641.5 Z M 1363.5 641.5 L 1384.5 641.5 L 1384.5 662.5 L 1363.5 662.5 Z M 540.5 641.5 L 561.5 641.5 L 561.5 662.5 L 540.5 662.5 Z M 540.5 662.5 L 561.5 662.5 L 561.5 677.5 L 540.5 677.5 Z M 1363.5 662.5 L 1384.5 662.5 L 1384.5 677.5 L 1363.5 677.5 Z M 1363.5 662.5 "/>
 </clipPath>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image543"/>
+  <use xlink:href="#image571"/>
 </pattern>
 <mask id="mask2">
 <rect 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 402.5 L 908.5 402.5 L 908.5 453.5 L 889.5 453.5 Z M 933.5 402.5 L 952.5 402.5 L 952.5 453.5 L 933.5 453.5 Z M 1232.5 402.5 L 1251.5 402.5 L 1251.5 504.5 L 1232.5 504.5 Z M 726.5 402.5 L 744.5 402.5 L 744.5 504.5 L 726.5 504.5 Z M 673.5 402.5 L 692.5 402.5 L 692.5 504.5 L 673.5 504.5 Z M 770.5 402.5 L 788.5 402.5 L 788.5 504.5 L 770.5 504.5 Z M 1276.5 402.5 L 1295.5 402.5 L 1295.5 504.5 L 1276.5 504.5 Z M 629.5 402.5 L 647.5 402.5 L 647.5 504.5 L 629.5 504.5 Z M 838.5 568.5 L 856.5 568.5 L 856.5 671.5 L 838.5 671.5 Z M 629.5 620.5 L 647.5 620.5 L 647.5 671.5 L 629.5 671.5 Z M 673.5 620.5 L 692.5 620.5 L 692.5 671.5 L 673.5 671.5 Z M 673.5 620.5 "/>
 </clipPath>
-<image id="image544" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image572" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image544"/>
+  <use xlink:href="#image572"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -55,9 +55,9 @@
 <clipPath id="clip9">
   <path d="M 629.5 157.5 L 647.5 157.5 L 647.5 280.5 L 629.5 280.5 Z M 1276.5 157.5 L 1295.5 157.5 L 1295.5 280.5 L 1276.5 280.5 Z M 1232.5 157.5 L 1251.5 157.5 L 1251.5 280.5 L 1232.5 280.5 Z M 1180.5 157.5 L 1198.5 157.5 L 1198.5 280.5 L 1180.5 280.5 Z M 1136.5 157.5 L 1154.5 157.5 L 1154.5 280.5 L 1136.5 280.5 Z M 986.5 157.5 L 1004.5 157.5 L 1004.5 280.5 L 986.5 280.5 Z M 942.5 157.5 L 960.5 157.5 L 960.5 280.5 L 942.5 280.5 Z M 889.5 157.5 L 908.5 157.5 L 908.5 280.5 L 889.5 280.5 Z M 770.5 157.5 L 788.5 157.5 L 788.5 280.5 L 770.5 280.5 Z M 726.5 157.5 L 744.5 157.5 L 744.5 280.5 L 726.5 280.5 Z M 673.5 157.5 L 692.5 157.5 L 692.5 280.5 L 673.5 280.5 Z M 629.5 793.5 L 647.5 793.5 L 647.5 915.5 L 629.5 915.5 Z M 673.5 793.5 L 692.5 793.5 L 692.5 915.5 L 673.5 915.5 Z M 673.5 793.5 "/>
 </clipPath>
-<image id="image545" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image573" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image545"/>
+  <use xlink:href="#image573"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
@@ -71,15 +71,15 @@
 <clipPath id="clip12">
   <path d="M 540.5 118.5 L 561.5 118.5 L 561.5 139.5 L 540.5 139.5 Z M 1363.5 118.5 L 1384.5 118.5 L 1384.5 139.5 L 1363.5 139.5 Z M 1305.5 118.5 L 1325.5 118.5 L 1325.5 139.5 L 1305.5 139.5 Z M 1246.5 118.5 L 1267.5 118.5 L 1267.5 139.5 L 1246.5 139.5 Z M 1187.5 118.5 L 1208.5 118.5 L 1208.5 139.5 L 1187.5 139.5 Z M 1128.5 118.5 L 1149.5 118.5 L 1149.5 139.5 L 1128.5 139.5 Z M 1069.5 118.5 L 1090.5 118.5 L 1090.5 139.5 L 1069.5 139.5 Z M 1011.5 118.5 L 1031.5 118.5 L 1031.5 139.5 L 1011.5 139.5 Z M 952.5 118.5 L 973.5 118.5 L 973.5 139.5 L 952.5 139.5 Z M 893.5 118.5 L 914.5 118.5 L 914.5 139.5 L 893.5 139.5 Z M 834.5 118.5 L 855.5 118.5 L 855.5 139.5 L 834.5 139.5 Z M 775.5 118.5 L 796.5 118.5 L 796.5 139.5 L 775.5 139.5 Z M 717.5 118.5 L 737.5 118.5 L 737.5 139.5 L 717.5 139.5 Z M 658.5 118.5 L 679.5 118.5 L 679.5 139.5 L 658.5 139.5 Z M 599.5 118.5 L 620.5 118.5 L 620.5 139.5 L 599.5 139.5 Z M 540.5 526.5 L 561.5 526.5 L 561.5 547.5 L 540.5 547.5 Z M 1363.5 526.5 L 1384.5 526.5 L 1384.5 547.5 L 1363.5 547.5 Z M 1305.5 526.5 L 1325.5 526.5 L 1325.5 547.5 L 1305.5 547.5 Z M 1246.5 526.5 L 1267.5 526.5 L 1267.5 547.5 L 1246.5 547.5 Z M 1187.5 526.5 L 1208.5 526.5 L 1208.5 547.5 L 1187.5 547.5 Z M 1128.5 526.5 L 1149.5 526.5 L 1149.5 547.5 L 1128.5 547.5 Z M 1069.5 526.5 L 1090.5 526.5 L 1090.5 547.5 L 1069.5 547.5 Z M 1011.5 526.5 L 1031.5 526.5 L 1031.5 547.5 L 1011.5 547.5 Z M 952.5 526.5 L 973.5 526.5 L 973.5 547.5 L 952.5 547.5 Z M 893.5 526.5 L 914.5 526.5 L 914.5 547.5 L 893.5 547.5 Z M 717.5 526.5 L 737.5 526.5 L 737.5 547.5 L 717.5 547.5 Z M 658.5 526.5 L 679.5 526.5 L 679.5 547.5 L 658.5 547.5 Z M 599.5 526.5 L 620.5 526.5 L 620.5 547.5 L 599.5 547.5 Z M 540.5 934.5 L 561.5 934.5 L 561.5 955.5 L 540.5 955.5 Z M 1363.5 934.5 L 1384.5 934.5 L 1384.5 955.5 L 1363.5 955.5 Z M 1305.5 934.5 L 1325.5 934.5 L 1325.5 955.5 L 1305.5 955.5 Z M 1246.5 934.5 L 1267.5 934.5 L 1267.5 955.5 L 1246.5 955.5 Z M 1187.5 934.5 L 1208.5 934.5 L 1208.5 955.5 L 1187.5 955.5 Z M 1128.5 934.5 L 1149.5 934.5 L 1149.5 955.5 L 1128.5 955.5 Z M 1069.5 934.5 L 1090.5 934.5 L 1090.5 955.5 L 1069.5 955.5 Z M 1011.5 934.5 L 1031.5 934.5 L 1031.5 955.5 L 1011.5 955.5 Z M 952.5 934.5 L 973.5 934.5 L 973.5 955.5 L 952.5 955.5 Z M 893.5 934.5 L 914.5 934.5 L 914.5 955.5 L 893.5 955.5 Z M 834.5 934.5 L 855.5 934.5 L 855.5 955.5 L 834.5 955.5 Z M 775.5 934.5 L 796.5 934.5 L 796.5 955.5 L 775.5 955.5 Z M 717.5 934.5 L 737.5 934.5 L 737.5 955.5 L 717.5 955.5 Z M 658.5 934.5 L 679.5 934.5 L 679.5 955.5 L 658.5 955.5 Z M 599.5 934.5 L 620.5 934.5 L 620.5 955.5 L 599.5 955.5 Z M 599.5 934.5 "/>
 </clipPath>
-<image id="image546" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image574" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern5" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image546"/>
+  <use xlink:href="#image574"/>
 </pattern>
 <mask id="mask5">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern5);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface539">
+<g id="surface567">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -278,6 +278,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 980.898438 546.015625 L 980.898438 530.679688 L 986.808594 530.679688 L 987.734375 530.742188 L 988.597656 530.910156 L 989.398438 531.207031 L 990.132812 531.585938 L 990.785156 532.109375 L 991.394531 532.71875 L 991.902344 533.457031 L 992.320312 534.257812 L 992.636719 535.160156 L 992.867188 536.128906 L 992.996094 537.203125 L 993.058594 538.335938 L 992.996094 539.535156 L 992.847656 540.652344 L 992.59375 541.660156 L 992.257812 542.585938 L 991.816406 543.40625 L 991.269531 544.121094 L 990.679688 544.710938 L 990.027344 545.175781 L 989.3125 545.554688 L 988.535156 545.804688 L 987.695312 545.972656 L 986.808594 546.015625 Z M 982.855469 544.292969 L 986.472656 544.292969 L 987.441406 544.226562 L 988.304688 543.996094 L 989.0625 543.597656 L 989.691406 543.070312 L 990.195312 542.355469 L 990.617188 541.492188 L 990.742188 541.050781 L 990.871094 540.589844 L 990.976562 540.082031 L 991.039062 539.535156 L 991.082031 538.96875 L 991.101562 538.359375 L 991.015625 536.992188 L 990.808594 535.792969 L 990.429688 534.761719 L 989.921875 533.941406 L 989.269531 533.265625 L 988.472656 532.785156 L 988.175781 532.679688 L 987.863281 532.574219 L 987.523438 532.511719 L 987.1875 532.445312 L 986.832031 532.425781 L 986.472656 532.40625 L 982.855469 532.40625 Z M 982.855469 544.292969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 521 571 L 1403 571 M 521 511 L 1403 511 M 521 511 L 521 571 M 1403 511 L 1403 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 521 571 L 1403 571 M 521 511 L 1403 511 M 1403 571 L 1403 511 M 521 571 L 521 511 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 521 130 L 521 139 M 516 135 L 525 135 M 520 136 L 522 136 M 520 134 L 522 134 M 520 134 L 520 136 M 522 134 L 522 136 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/maj3/sky130_fd_sc_lp__maj3_0.svg b/cells/maj3/sky130_fd_sc_lp__maj3_0.svg
index 5a7ac7e..021cb8f 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_0.svg
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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 1215.5 757.5 L 1250.5 757.5 L 1250.5 853.5 L 1215.5 853.5 Z M 658.5 757.5 L 693.5 757.5 L 693.5 853.5 L 658.5 853.5 Z M 748.5 757.5 L 782.5 757.5 L 782.5 853.5 L 748.5 853.5 Z M 846.5 757.5 L 881.5 757.5 L 881.5 853.5 L 846.5 853.5 Z M 936.5 757.5 L 970.5 757.5 L 970.5 853.5 L 936.5 853.5 Z M 1034.5 757.5 L 1068.5 757.5 L 1068.5 853.5 L 1034.5 853.5 Z M 1117.5 757.5 L 1151.5 757.5 L 1151.5 853.5 L 1117.5 853.5 Z M 1117.5 757.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 1117.5 328.5 L 1151.5 328.5 L 1151.5 424.5 L 1117.5 424.5 Z M 619.5 328.5 L 654.5 328.5 L 654.5 424.5 L 619.5 424.5 Z M 702.5 328.5 L 736.5 328.5 L 736.5 424.5 L 702.5 424.5 Z M 853.5 328.5 L 887.5 328.5 L 887.5 424.5 L 853.5 424.5 Z M 936.5 328.5 L 970.5 328.5 L 970.5 424.5 L 936.5 424.5 Z M 1034.5 328.5 L 1068.5 328.5 L 1068.5 424.5 L 1034.5 424.5 Z M 1243.5 328.5 L 1277.5 328.5 L 1277.5 475.5 L 1243.5 475.5 Z M 1243.5 328.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1351.824219 451.320312 L 1369.191406 476.5 L 1361.449219 476.5 L 1348.050781 456.035156 L 1334.589844 476.5 L 1326.980469 476.5 L 1344.351562 451.320312 L 1328.058594 427.421875 L 1335.664062 427.421875 L 1348.253906 446.675781 L 1360.910156 427.421875 L 1368.382812 427.421875 Z M 1351.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 1327 647 L 1366 647 M 1327 608 L 1366 608 M 1327 608 L 1327 647 M 1366 608 L 1366 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 1327 647 L 1366 647 M 1327 608 L 1366 608 M 1366 647 L 1366 608 M 1327 647 L 1327 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/maj3/sky130_fd_sc_lp__maj3_1.svg b/cells/maj3/sky130_fd_sc_lp__maj3_1.svg
index c6b0ead..ea9e00b 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_1.svg
+++ b/cells/maj3/sky130_fd_sc_lp__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 539.5 L 478.5 539.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 1262.5 660.5 L 1297.5 660.5 L 1297.5 853.5 L 1262.5 853.5 Z M 738.5 757.5 L 773.5 757.5 L 773.5 853.5 L 738.5 853.5 Z M 1119.5 757.5 L 1153.5 757.5 L 1153.5 853.5 L 1119.5 853.5 Z M 1036.5 757.5 L 1071.5 757.5 L 1071.5 853.5 L 1036.5 853.5 Z M 938.5 757.5 L 972.5 757.5 L 972.5 853.5 L 938.5 853.5 Z M 848.5 757.5 L 883.5 757.5 L 883.5 853.5 L 848.5 853.5 Z M 622.5 757.5 L 656.5 757.5 L 656.5 853.5 L 622.5 853.5 Z M 622.5 757.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 622.5 374.5 L 656.5 374.5 L 656.5 470.5 L 622.5 470.5 Z M 885.5 374.5 L 920.5 374.5 L 920.5 470.5 L 885.5 470.5 Z M 704.5 374.5 L 738.5 374.5 L 738.5 470.5 L 704.5 470.5 Z M 803.5 374.5 L 837.5 374.5 L 837.5 470.5 L 803.5 470.5 Z M 1119.5 376.5 L 1153.5 376.5 L 1153.5 472.5 L 1119.5 472.5 Z M 1036.5 376.5 L 1071.5 376.5 L 1071.5 472.5 L 1036.5 472.5 Z M 1271.5 209.5 L 1306.5 209.5 L 1306.5 498.5 L 1271.5 498.5 Z M 1271.5 209.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 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/maj3/sky130_fd_sc_lp__maj3_2.svg b/cells/maj3/sky130_fd_sc_lp__maj3_2.svg
index 1ca2c16..6b241b2 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_2.svg
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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 1191.5 670.5 L 1225.5 670.5 L 1225.5 862.5 L 1191.5 862.5 Z M 698.5 766.5 L 733.5 766.5 L 733.5 862.5 L 698.5 862.5 Z M 609.5 766.5 L 643.5 766.5 L 643.5 862.5 L 609.5 862.5 Z M 1074.5 766.5 L 1109.5 766.5 L 1109.5 862.5 L 1074.5 862.5 Z M 985.5 766.5 L 1019.5 766.5 L 1019.5 862.5 L 985.5 862.5 Z M 886.5 766.5 L 921.5 766.5 L 921.5 862.5 L 886.5 862.5 Z M 797.5 766.5 L 831.5 766.5 L 831.5 862.5 L 797.5 862.5 Z M 1290.5 670.5 L 1324.5 670.5 L 1324.5 862.5 L 1290.5 862.5 Z M 1290.5 670.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 1065.5 209.5 L 1099.5 209.5 L 1099.5 356.5 L 1065.5 356.5 Z M 976.5 209.5 L 1010.5 209.5 L 1010.5 356.5 L 976.5 356.5 Z M 689.5 209.5 L 724.5 209.5 L 724.5 356.5 L 689.5 356.5 Z M 600.5 209.5 L 634.5 209.5 L 634.5 356.5 L 600.5 356.5 Z M 877.5 209.5 L 911.5 209.5 L 911.5 356.5 L 877.5 356.5 Z M 788.5 209.5 L 822.5 209.5 L 822.5 356.5 L 788.5 356.5 Z M 1228.5 209.5 L 1262.5 209.5 L 1262.5 498.5 L 1228.5 498.5 Z M 1326.5 209.5 L 1361.5 209.5 L 1361.5 498.5 L 1326.5 498.5 Z M 1326.5 209.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1163.730469 452.984375 L 1163.796875 450.292969 L 1164.066406 447.667969 L 1164.539062 445.175781 L 1165.144531 442.753906 L 1165.953125 440.464844 L 1167.03125 438.242188 L 1168.714844 435.347656 L 1170.800781 432.855469 L 1173.15625 430.835938 L 1175.847656 429.222656 L 1178.8125 428.078125 L 1182.175781 427.335938 L 1182.785156 427.269531 L 1183.457031 427.203125 L 1184.0625 427.132812 L 1185.410156 427.132812 L 1186.148438 427.066406 L 1190.457031 427.402344 L 1194.226562 428.414062 L 1197.460938 430.027344 L 1200.152344 432.316406 L 1202.304688 435.210938 L 1203.988281 438.78125 L 1204.394531 440.125 L 1204.59375 440.867188 L 1204.730469 441.609375 L 1204.863281 442.347656 L 1205.066406 443.089844 L 1198.671875 443.089844 L 1197.996094 440.734375 L 1197.121094 438.714844 L 1196.046875 436.960938 L 1194.632812 435.480469 L 1193.082031 434.335938 L 1191.265625 433.460938 L 1190.390625 433.191406 L 1189.449219 432.992188 L 1188.503906 432.855469 L 1187.496094 432.722656 L 1186.484375 432.652344 L 1185.410156 432.585938 L 1183.050781 432.789062 L 1180.898438 433.261719 L 1178.878906 434 L 1177.0625 435.144531 L 1175.378906 436.558594 L 1173.964844 438.242188 L 1172.753906 440.195312 L 1171.742188 442.347656 L 1170.933594 444.703125 L 1170.394531 447.261719 L 1170.058594 450.023438 L 1169.992188 452.917969 L 1170.058594 456.082031 L 1170.464844 458.910156 L 1171.136719 461.601562 L 1172.078125 463.957031 L 1173.292969 466.179688 L 1174.773438 468.066406 L 1176.253906 469.613281 L 1177.867188 470.824219 L 1179.621094 471.769531 L 1181.570312 472.441406 L 1183.660156 472.84375 L 1185.949219 472.980469 L 1188.371094 472.84375 L 1190.59375 472.375 L 1192.613281 471.566406 L 1194.296875 470.421875 L 1195.777344 468.941406 L 1197.054688 467.121094 L 1197.59375 466.046875 L 1198.066406 464.832031 L 1198.535156 463.554688 L 1198.941406 462.140625 L 1199.277344 460.660156 L 1199.613281 459.042969 L 1206.078125 459.042969 L 1204.863281 465.035156 L 1202.84375 469.882812 L 1199.882812 473.652344 L 1196.113281 476.347656 L 1191.402344 477.894531 L 1185.878906 478.5 L 1181.976562 478.230469 L 1178.476562 477.421875 L 1175.3125 476.210938 L 1172.484375 474.394531 L 1169.992188 472.039062 L 1167.90625 469.140625 L 1166.695312 467.054688 L 1165.683594 464.765625 L 1164.875 462.34375 L 1164.269531 459.785156 L 1163.867188 457.09375 L 1163.730469 454.265625 Z M 1163.730469 452.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 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 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_lp__maj3_4.svg b/cells/maj3/sky130_fd_sc_lp__maj3_4.svg
index fa58ff5..71eef5d 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_4.svg
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.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 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="#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 1426.5 672.5 L 1460.5 672.5 L 1460.5 864.5 L 1426.5 864.5 Z M 498.5 672.5 L 532.5 672.5 L 532.5 864.5 L 498.5 864.5 Z M 587.5 672.5 L 622.5 672.5 L 622.5 864.5 L 587.5 864.5 Z M 686.5 672.5 L 720.5 672.5 L 720.5 864.5 L 686.5 864.5 Z M 775.5 672.5 L 810.5 672.5 L 810.5 864.5 L 775.5 864.5 Z M 874.5 672.5 L 908.5 672.5 L 908.5 864.5 L 874.5 864.5 Z M 963.5 672.5 L 997.5 672.5 L 997.5 864.5 L 963.5 864.5 Z M 1113.5 672.5 L 1148.5 672.5 L 1148.5 864.5 L 1113.5 864.5 Z M 1212.5 672.5 L 1246.5 672.5 L 1246.5 864.5 L 1212.5 864.5 Z M 1318.5 672.5 L 1353.5 672.5 L 1353.5 864.5 L 1318.5 864.5 Z M 1318.5 672.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 1426.5 209.5 L 1460.5 209.5 L 1460.5 498.5 L 1426.5 498.5 Z M 498.5 209.5 L 532.5 209.5 L 532.5 498.5 L 498.5 498.5 Z M 587.5 209.5 L 622.5 209.5 L 622.5 498.5 L 587.5 498.5 Z M 686.5 209.5 L 720.5 209.5 L 720.5 498.5 L 686.5 498.5 Z M 775.5 209.5 L 810.5 209.5 L 810.5 498.5 L 775.5 498.5 Z M 874.5 209.5 L 908.5 209.5 L 908.5 498.5 L 874.5 498.5 Z M 963.5 209.5 L 997.5 209.5 L 997.5 498.5 L 963.5 498.5 Z M 1094.5 209.5 L 1128.5 209.5 L 1128.5 498.5 L 1094.5 498.5 Z M 1192.5 209.5 L 1227.5 209.5 L 1227.5 498.5 L 1192.5 498.5 Z M 1327.5 209.5 L 1362.5 209.5 L 1362.5 498.5 L 1327.5 498.5 Z M 1327.5 209.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -152,6 +152,5 @@
 <path style=" 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/maj3/sky130_fd_sc_lp__maj3_lp.svg b/cells/maj3/sky130_fd_sc_lp__maj3_lp.svg
index c963e97..4f6b8f6 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_lp.svg
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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 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="#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 609.5 679.5 L 643.5 679.5 L 643.5 775.5 L 609.5 775.5 Z M 698.5 679.5 L 733.5 679.5 L 733.5 775.5 L 698.5 775.5 Z M 923.5 679.5 L 957.5 679.5 L 957.5 775.5 L 923.5 775.5 Z M 834.5 679.5 L 868.5 679.5 L 868.5 775.5 L 834.5 775.5 Z M 1040.5 744.5 L 1074.5 744.5 L 1074.5 840.5 L 1040.5 840.5 Z M 1326.5 744.5 L 1361.5 744.5 L 1361.5 840.5 L 1326.5 840.5 Z M 1145.5 744.5 L 1180.5 744.5 L 1180.5 840.5 L 1145.5 840.5 Z M 1244.5 744.5 L 1278.5 744.5 L 1278.5 840.5 L 1244.5 840.5 Z M 1244.5 744.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 1276.5 209.5 L 1333.5 209.5 L 1333.5 438.5 L 1276.5 438.5 Z M 584.5 209.5 L 641.5 209.5 L 641.5 438.5 L 584.5 438.5 Z M 689.5 209.5 L 746.5 209.5 L 746.5 438.5 L 689.5 438.5 Z M 811.5 209.5 L 868.5 209.5 L 868.5 438.5 L 811.5 438.5 Z M 916.5 209.5 L 973.5 209.5 L 973.5 438.5 L 916.5 438.5 Z M 1038.5 209.5 L 1095.5 209.5 L 1095.5 438.5 L 1038.5 438.5 Z M 1152.5 209.5 L 1209.5 209.5 L 1209.5 438.5 L 1152.5 438.5 Z M 1152.5 209.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image317"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface283">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -155,6 +155,5 @@
 <path style=" 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/maj3/sky130_fd_sc_lp__maj3_m.svg b/cells/maj3/sky130_fd_sc_lp__maj3_m.svg
index 835ed72..2d50046 100644
--- a/cells/maj3/sky130_fd_sc_lp__maj3_m.svg
+++ b/cells/maj3/sky130_fd_sc_lp__maj3_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1253.5 757.5 L 1287.5 757.5 L 1287.5 853.5 L 1253.5 853.5 Z M 626.5 757.5 L 661.5 757.5 L 661.5 853.5 L 626.5 853.5 Z M 716.5 757.5 L 750.5 757.5 L 750.5 853.5 L 716.5 853.5 Z M 814.5 757.5 L 848.5 757.5 L 848.5 853.5 L 814.5 853.5 Z M 903.5 757.5 L 938.5 757.5 L 938.5 853.5 L 903.5 853.5 Z M 1002.5 757.5 L 1036.5 757.5 L 1036.5 853.5 L 1002.5 853.5 Z M 1091.5 757.5 L 1126.5 757.5 L 1126.5 853.5 L 1091.5 853.5 Z M 1091.5 757.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1271.5 335.5 L 1306.5 335.5 L 1306.5 431.5 L 1271.5 431.5 Z M 626.5 335.5 L 661.5 335.5 L 661.5 431.5 L 626.5 431.5 Z M 716.5 335.5 L 750.5 335.5 L 750.5 431.5 L 716.5 431.5 Z M 814.5 335.5 L 848.5 335.5 L 848.5 431.5 L 814.5 431.5 Z M 903.5 335.5 L 938.5 335.5 L 938.5 431.5 L 903.5 431.5 Z M 1002.5 335.5 L 1036.5 335.5 L 1036.5 431.5 L 1002.5 431.5 Z M 1091.5 335.5 L 1126.5 335.5 L 1126.5 431.5 L 1091.5 431.5 Z M 1091.5 335.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface301">
+<g id="surface329">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/mux2/sky130_fd_sc_lp__mux2_0.svg b/cells/mux2/sky130_fd_sc_lp__mux2_0.svg
index 9e71d72..3339929 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_0.svg
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1105.5 679.5 L 1140.5 679.5 L 1140.5 775.5 L 1105.5 775.5 Z M 1234.5 679.5 L 1268.5 679.5 L 1268.5 775.5 L 1234.5 775.5 Z M 1023.5 679.5 L 1057.5 679.5 L 1057.5 775.5 L 1023.5 775.5 Z M 899.5 679.5 L 933.5 679.5 L 933.5 775.5 L 899.5 775.5 Z M 782.5 714.5 L 816.5 714.5 L 816.5 810.5 L 782.5 810.5 Z M 665.5 714.5 L 699.5 714.5 L 699.5 810.5 L 665.5 810.5 Z M 665.5 714.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 1260.5 232.5 L 1294.5 232.5 L 1294.5 328.5 L 1260.5 328.5 Z M 972.5 232.5 L 1007.5 232.5 L 1007.5 328.5 L 972.5 328.5 Z M 1121.5 232.5 L 1156.5 232.5 L 1156.5 328.5 L 1121.5 328.5 Z M 624.5 209.5 L 658.5 209.5 L 658.5 356.5 L 624.5 356.5 Z M 830.5 259.5 L 865.5 259.5 L 865.5 356.5 L 830.5 356.5 Z M 748.5 259.5 L 782.5 259.5 L 782.5 356.5 L 748.5 356.5 Z M 748.5 259.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface311">
+<g id="surface340">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -176,6 +176,5 @@
 <path style=" 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/mux2/sky130_fd_sc_lp__mux2_1.svg b/cells/mux2/sky130_fd_sc_lp__mux2_1.svg
index 2d4f002..b60bef0 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_1.svg
+++ b/cells/mux2/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask 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="#image344"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1274.5 671.5 L 1308.5 671.5 L 1308.5 767.5 L 1274.5 767.5 Z M 1026.5 671.5 L 1060.5 671.5 L 1060.5 767.5 L 1026.5 767.5 Z M 737.5 671.5 L 772.5 671.5 L 772.5 767.5 L 737.5 767.5 Z M 845.5 671.5 L 879.5 671.5 L 879.5 767.5 L 845.5 767.5 Z M 944.5 671.5 L 978.5 671.5 L 978.5 767.5 L 944.5 767.5 Z M 587.5 671.5 L 622.5 671.5 L 622.5 863.5 L 587.5 863.5 Z M 587.5 671.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask2">
 <rect 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 325.5 L 797.5 325.5 L 797.5 421.5 L 763.5 421.5 Z M 1274.5 325.5 L 1308.5 325.5 L 1308.5 421.5 L 1274.5 421.5 Z M 1150.5 325.5 L 1184.5 325.5 L 1184.5 421.5 L 1150.5 421.5 Z M 1026.5 325.5 L 1060.5 325.5 L 1060.5 421.5 L 1026.5 421.5 Z M 845.5 325.5 L 879.5 325.5 L 879.5 421.5 L 845.5 421.5 Z M 587.5 209.5 L 622.5 209.5 L 622.5 498.5 L 587.5 498.5 Z M 587.5 209.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface341">
+<g id="surface370">
 <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 1100.773438 357.503906 L 1090.203125 357.503906 L 1090.203125 353.261719 L 1092.019531 353.058594 L 1093.636719 352.789062 L 1095.050781 352.453125 L 1096.261719 352.183594 L 1097.269531 351.847656 L 1098.148438 351.445312 L 1098.820312 351.039062 L 1099.425781 350.570312 L 1099.964844 350.03125 L 1100.503906 349.355469 L 1100.972656 348.617188 L 1101.445312 347.742188 L 1101.648438 347.269531 L 1101.847656 346.730469 L 1102.050781 346.125 L 1102.320312 345.386719 L 1102.523438 344.644531 L 1102.792969 343.769531 L 1106.695312 343.769531 L 1106.695312 391.5 L 1100.773438 391.5 Z M 1100.773438 357.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 731 L 1091 731 M 1052 693 L 1091 693 M 1052 693 L 1052 731 M 1091 693 L 1091 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 1052 731 L 1091 731 M 1052 693 L 1091 693 M 1091 731 L 1091 693 M 1052 731 L 1052 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 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_lp__mux2_2.svg b/cells/mux2/sky130_fd_sc_lp__mux2_2.svg
index fbfbfb5..f7d5e9f 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_2.svg
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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="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 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="#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 853.5 767.5 L 887.5 767.5 L 887.5 863.5 L 853.5 863.5 Z M 1269.5 767.5 L 1303.5 767.5 L 1303.5 863.5 L 1269.5 863.5 Z M 936.5 767.5 L 970.5 767.5 L 970.5 863.5 L 936.5 863.5 Z M 1059.5 767.5 L 1094.5 767.5 L 1094.5 863.5 L 1059.5 863.5 Z M 1142.5 767.5 L 1176.5 767.5 L 1176.5 863.5 L 1142.5 863.5 Z M 719.5 672.5 L 753.5 672.5 L 753.5 864.5 L 719.5 864.5 Z M 620.5 672.5 L 655.5 672.5 L 655.5 864.5 L 620.5 864.5 Z M 620.5 672.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 889.5 257.5 L 923.5 257.5 L 923.5 404.5 L 889.5 404.5 Z M 1276.5 257.5 L 1310.5 257.5 L 1310.5 404.5 L 1276.5 404.5 Z M 971.5 257.5 L 1005.5 257.5 L 1005.5 404.5 L 971.5 404.5 Z M 1070.5 257.5 L 1104.5 257.5 L 1104.5 404.5 L 1070.5 404.5 Z M 1177.5 257.5 L 1212.5 257.5 L 1212.5 404.5 L 1177.5 404.5 Z M 719.5 209.5 L 753.5 209.5 L 753.5 498.5 L 719.5 498.5 Z M 620.5 209.5 L 655.5 209.5 L 655.5 498.5 L 620.5 498.5 Z M 620.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 612.503906 L 1145.203125 612.503906 L 1145.203125 608.261719 L 1147.019531 608.058594 L 1148.636719 607.789062 L 1150.050781 607.453125 L 1151.261719 607.183594 L 1152.269531 606.847656 L 1153.148438 606.445312 L 1153.820312 606.039062 L 1154.425781 605.570312 L 1154.964844 605.03125 L 1155.503906 604.355469 L 1155.972656 603.617188 L 1156.445312 602.742188 L 1156.648438 602.269531 L 1156.847656 601.730469 L 1157.050781 601.125 L 1157.320312 600.386719 L 1157.523438 599.644531 L 1157.792969 598.769531 L 1161.695312 598.769531 L 1161.695312 646.5 L 1155.773438 646.5 Z M 1155.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 1107 477 L 1146 477 M 1107 438 L 1146 438 M 1107 438 L 1107 477 M 1146 438 L 1146 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 1107 477 L 1146 477 M 1107 438 L 1146 438 M 1146 477 L 1146 438 M 1107 477 L 1107 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/mux2/sky130_fd_sc_lp__mux2_4.svg b/cells/mux2/sky130_fd_sc_lp__mux2_4.svg
index 1067504..183a345 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_4.svg
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 256.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="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 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="#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 1418.5 672.5 L 1452.5 672.5 L 1452.5 864.5 L 1418.5 864.5 Z M 466.5 672.5 L 500.5 672.5 L 500.5 864.5 L 466.5 864.5 Z M 594.5 672.5 L 628.5 672.5 L 628.5 864.5 L 594.5 864.5 Z M 677.5 672.5 L 711.5 672.5 L 711.5 864.5 L 677.5 864.5 Z M 847.5 672.5 L 882.5 672.5 L 882.5 864.5 L 847.5 864.5 Z M 930.5 672.5 L 964.5 672.5 L 964.5 864.5 L 930.5 864.5 Z M 1122.5 672.5 L 1157.5 672.5 L 1157.5 864.5 L 1122.5 864.5 Z M 1221.5 672.5 L 1255.5 672.5 L 1255.5 864.5 L 1221.5 864.5 Z M 1319.5 672.5 L 1354.5 672.5 L 1354.5 864.5 L 1319.5 864.5 Z M 1319.5 672.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 1434.5 209.5 L 1468.5 209.5 L 1468.5 498.5 L 1434.5 498.5 Z M 407.5 209.5 L 442.5 209.5 L 442.5 498.5 L 407.5 498.5 Z M 506.5 209.5 L 540.5 209.5 L 540.5 498.5 L 506.5 498.5 Z M 724.5 209.5 L 758.5 209.5 L 758.5 498.5 L 724.5 498.5 Z M 822.5 209.5 L 856.5 209.5 L 856.5 498.5 L 822.5 498.5 Z M 1040.5 209.5 L 1074.5 209.5 L 1074.5 498.5 L 1040.5 498.5 Z M 1138.5 209.5 L 1173.5 209.5 L 1173.5 498.5 L 1138.5 498.5 Z M 1237.5 209.5 L 1271.5 209.5 L 1271.5 498.5 L 1237.5 498.5 Z M 1335.5 209.5 L 1370.5 209.5 L 1370.5 498.5 L 1335.5 498.5 Z M 1335.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1569.824219 706.320312 L 1587.191406 731.5 L 1579.449219 731.5 L 1566.050781 711.035156 L 1552.589844 731.5 L 1544.980469 731.5 L 1562.351562 706.320312 L 1546.058594 682.421875 L 1553.664062 682.421875 L 1566.253906 701.675781 L 1578.910156 682.421875 L 1586.382812 682.421875 Z M 1569.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 1545 392 L 1584 392 M 1545 353 L 1584 353 M 1545 353 L 1545 392 M 1584 353 L 1584 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 1545 392 L 1584 392 M 1545 353 L 1584 353 M 1584 392 L 1584 353 M 1545 392 L 1545 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/mux2/sky130_fd_sc_lp__mux2_8.svg b/cells/mux2/sky130_fd_sc_lp__mux2_8.svg
index 7740c20..ca266eb 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_8.svg
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 537.5 L 174.5 537.5 Z M 174.5 213.5 "/>
 </clipPath>
-<image id="image288" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image288"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image288"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 280.5 638.5 L 306.5 638.5 L 306.5 784.5 L 280.5 784.5 Z M 911.5 673.5 L 937.5 673.5 L 937.5 784.5 L 911.5 784.5 Z M 1499.5 673.5 L 1525.5 673.5 L 1525.5 784.5 L 1499.5 784.5 Z M 1412.5 673.5 L 1438.5 673.5 L 1438.5 784.5 L 1412.5 784.5 Z M 1337.5 673.5 L 1363.5 673.5 L 1363.5 784.5 L 1337.5 784.5 Z M 1262.5 673.5 L 1288.5 673.5 L 1288.5 784.5 L 1262.5 784.5 Z M 1160.5 673.5 L 1186.5 673.5 L 1186.5 784.5 L 1160.5 784.5 Z M 1073.5 673.5 L 1099.5 673.5 L 1099.5 784.5 L 1073.5 784.5 Z M 986.5 673.5 L 1012.5 673.5 L 1012.5 784.5 L 986.5 784.5 Z M 1606.5 638.5 L 1632.5 638.5 L 1632.5 784.5 L 1606.5 784.5 Z M 816.5 638.5 L 842.5 638.5 L 842.5 784.5 L 816.5 784.5 Z M 741.5 638.5 L 767.5 638.5 L 767.5 784.5 L 741.5 784.5 Z M 654.5 638.5 L 680.5 638.5 L 680.5 784.5 L 654.5 784.5 Z M 579.5 638.5 L 605.5 638.5 L 605.5 784.5 L 579.5 784.5 Z M 505.5 638.5 L 531.5 638.5 L 531.5 784.5 L 505.5 784.5 Z M 430.5 638.5 L 456.5 638.5 L 456.5 784.5 L 430.5 784.5 Z M 355.5 638.5 L 381.5 638.5 L 381.5 784.5 L 355.5 784.5 Z M 355.5 638.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1513.5 287.5 L 1539.5 287.5 L 1539.5 461.5 L 1513.5 461.5 Z M 1337.5 287.5 L 1363.5 287.5 L 1363.5 461.5 L 1337.5 461.5 Z M 1001.5 287.5 L 1027.5 287.5 L 1027.5 461.5 L 1001.5 461.5 Z M 914.5 287.5 L 940.5 287.5 L 940.5 461.5 L 914.5 461.5 Z M 1262.5 287.5 L 1288.5 287.5 L 1288.5 461.5 L 1262.5 461.5 Z M 1424.5 287.5 L 1450.5 287.5 L 1450.5 461.5 L 1424.5 461.5 Z M 1163.5 287.5 L 1189.5 287.5 L 1189.5 461.5 L 1163.5 461.5 Z M 1076.5 287.5 L 1102.5 287.5 L 1102.5 461.5 L 1076.5 461.5 Z M 804.5 287.5 L 830.5 287.5 L 830.5 506.5 L 804.5 506.5 Z M 280.5 287.5 L 306.5 287.5 L 306.5 506.5 L 280.5 506.5 Z M 1608.5 287.5 L 1634.5 287.5 L 1634.5 506.5 L 1608.5 506.5 Z M 654.5 287.5 L 680.5 287.5 L 680.5 506.5 L 654.5 506.5 Z M 579.5 287.5 L 605.5 287.5 L 605.5 506.5 L 579.5 506.5 Z M 430.5 287.5 L 456.5 287.5 L 456.5 506.5 L 430.5 506.5 Z M 355.5 287.5 L 381.5 287.5 L 381.5 506.5 L 355.5 506.5 Z M 729.5 287.5 L 755.5 287.5 L 755.5 506.5 L 729.5 506.5 Z M 505.5 287.5 L 531.5 287.5 L 531.5 506.5 L 505.5 506.5 Z M 505.5 287.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1153.5 456.5 L 1182.5 456.5 L 1182.5 486.5 L 1153.5 486.5 Z M 1570.5 456.5 L 1600.5 456.5 L 1600.5 486.5 L 1570.5 486.5 Z M 1320.5 521.5 L 1349.5 521.5 L 1349.5 550.5 L 1320.5 550.5 Z M 986.5 521.5 L 1015.5 521.5 L 1015.5 550.5 L 986.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="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface285">
+<g id="surface315">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1424.296875 601.019531 L 1424.449219 596.578125 L 1425.054688 592.738281 L 1426.066406 589.507812 L 1427.480469 586.882812 L 1429.296875 584.863281 L 1431.519531 583.449219 L 1432.175781 583.195312 L 1432.882812 582.945312 L 1433.640625 582.792969 L 1434.394531 582.640625 L 1435.152344 582.589844 L 1436.011719 582.539062 L 1438.890625 582.894531 L 1441.414062 583.902344 L 1443.484375 585.621094 L 1445.152344 587.992188 L 1446.414062 591.074219 L 1447.269531 594.757812 L 1447.371094 595.769531 L 1447.523438 596.828125 L 1447.574219 597.890625 L 1447.675781 599 L 1447.675781 600.160156 L 1447.726562 601.324219 L 1447.574219 605.007812 L 1447.121094 608.292969 L 1446.414062 611.167969 L 1445.402344 613.59375 L 1444.140625 615.664062 L 1442.574219 617.277344 L 1441.617188 617.984375 L 1440.65625 618.488281 L 1439.597656 618.894531 L 1438.433594 619.246094 L 1437.222656 619.398438 L 1436.011719 619.5 L 1433.640625 619.246094 L 1431.519531 618.589844 L 1429.648438 617.53125 L 1428.085938 615.964844 L 1426.773438 613.996094 L 1425.761719 611.523438 L 1425.308594 610.058594 L 1424.953125 608.492188 L 1424.652344 606.828125 L 1424.449219 605.007812 L 1424.296875 603.089844 Z M 1436.011719 586.480469 L 1433.789062 586.933594 L 1431.972656 588.144531 L 1430.609375 590.164062 L 1429.597656 592.992188 L 1428.992188 596.628906 L 1428.84375 601.070312 L 1428.992188 605.613281 L 1429.597656 609.300781 L 1430.609375 612.179688 L 1431.972656 614.199219 L 1433.738281 615.410156 L 1435.910156 615.8125 L 1437.425781 615.664062 L 1438.789062 615.105469 L 1439.949219 614.199219 L 1440.910156 612.9375 L 1441.71875 611.320312 L 1442.375 609.351562 L 1442.625 608.242188 L 1442.828125 606.976562 L 1442.980469 605.613281 L 1443.082031 604.152344 L 1443.132812 602.585938 L 1443.179688 600.917969 L 1442.980469 596.527344 L 1442.375 592.890625 L 1441.363281 590.113281 L 1440 588.09375 L 1438.183594 586.882812 Z M 1436.011719 586.480469 "/>
 <path style="fill:none;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 494 L 1433 494 M 1403 464 L 1433 464 M 1403 464 L 1403 494 M 1433 464 L 1433 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 1403 494 L 1433 494 M 1403 464 L 1433 464 M 1433 494 L 1433 464 M 1403 494 L 1403 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/mux2/sky130_fd_sc_lp__mux2_lp.svg b/cells/mux2/sky130_fd_sc_lp__mux2_lp.svg
index fb82161..9901c4c 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp.svg
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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 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="#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 1322.5 759.5 L 1356.5 759.5 L 1356.5 855.5 L 1322.5 855.5 Z M 563.5 759.5 L 598.5 759.5 L 598.5 855.5 L 563.5 855.5 Z M 646.5 759.5 L 680.5 759.5 L 680.5 855.5 L 646.5 855.5 Z M 784.5 759.5 L 819.5 759.5 L 819.5 855.5 L 784.5 855.5 Z M 874.5 759.5 L 908.5 759.5 L 908.5 855.5 L 874.5 855.5 Z M 1024.5 759.5 L 1058.5 759.5 L 1058.5 855.5 L 1024.5 855.5 Z M 1141.5 759.5 L 1175.5 759.5 L 1175.5 855.5 L 1141.5 855.5 Z M 1239.5 759.5 L 1274.5 759.5 L 1274.5 855.5 L 1239.5 855.5 Z M 1239.5 759.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 1319.5 218.5 L 1354.5 218.5 L 1354.5 314.5 L 1319.5 314.5 Z M 573.5 218.5 L 608.5 218.5 L 608.5 314.5 L 573.5 314.5 Z M 656.5 218.5 L 690.5 218.5 L 690.5 314.5 L 656.5 314.5 Z M 755.5 218.5 L 789.5 218.5 L 789.5 314.5 L 755.5 314.5 Z M 844.5 218.5 L 878.5 218.5 L 878.5 314.5 L 844.5 314.5 Z M 942.5 218.5 L 977.5 218.5 L 977.5 314.5 L 942.5 314.5 Z M 1032.5 218.5 L 1066.5 218.5 L 1066.5 314.5 L 1032.5 314.5 Z M 1237.5 218.5 L 1271.5 218.5 L 1271.5 314.5 L 1237.5 314.5 Z M 1237.5 218.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/mux2/sky130_fd_sc_lp__mux2_lp2.svg b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.svg
index 32890c0..367d7f6 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_lp2.svg
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.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 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="#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 1348.5 757.5 L 1382.5 757.5 L 1382.5 853.5 L 1348.5 853.5 Z M 508.5 757.5 L 543.5 757.5 L 543.5 853.5 L 508.5 853.5 Z M 591.5 757.5 L 625.5 757.5 L 625.5 853.5 L 591.5 853.5 Z M 776.5 757.5 L 811.5 757.5 L 811.5 853.5 L 776.5 853.5 Z M 866.5 757.5 L 900.5 757.5 L 900.5 853.5 L 866.5 853.5 Z M 1052.5 757.5 L 1087.5 757.5 L 1087.5 853.5 L 1052.5 853.5 Z M 1167.5 757.5 L 1201.5 757.5 L 1201.5 853.5 L 1167.5 853.5 Z M 1266.5 757.5 L 1300.5 757.5 L 1300.5 853.5 L 1266.5 853.5 Z M 1266.5 757.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 1181.5 229.5 L 1238.5 229.5 L 1238.5 459.5 L 1181.5 459.5 Z M 507.5 229.5 L 564.5 229.5 L 564.5 459.5 L 507.5 459.5 Z M 704.5 229.5 L 761.5 229.5 L 761.5 459.5 L 704.5 459.5 Z M 816.5 229.5 L 874.5 229.5 L 874.5 459.5 L 816.5 459.5 Z M 947.5 229.5 L 1004.5 229.5 L 1004.5 459.5 L 947.5 459.5 Z M 1059.5 229.5 L 1117.5 229.5 L 1117.5 459.5 L 1059.5 459.5 Z M 1059.5 229.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1154.773438 697.503906 L 1144.203125 697.503906 L 1144.203125 693.261719 L 1146.019531 693.058594 L 1147.636719 692.789062 L 1149.050781 692.453125 L 1150.261719 692.183594 L 1151.269531 691.847656 L 1152.148438 691.445312 L 1152.820312 691.039062 L 1153.425781 690.570312 L 1153.964844 690.03125 L 1154.503906 689.355469 L 1154.972656 688.617188 L 1155.445312 687.742188 L 1155.648438 687.269531 L 1155.847656 686.730469 L 1156.050781 686.125 L 1156.320312 685.386719 L 1156.523438 684.644531 L 1156.792969 683.769531 L 1160.695312 683.769531 L 1160.695312 731.5 L 1154.773438 731.5 Z M 1154.773438 697.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 392 L 1145 392 M 1106 353 L 1145 353 M 1106 353 L 1106 392 M 1145 353 L 1145 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 1106 392 L 1145 392 M 1106 353 L 1145 353 M 1145 392 L 1145 353 M 1106 392 L 1106 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/mux2/sky130_fd_sc_lp__mux2_m.svg b/cells/mux2/sky130_fd_sc_lp__mux2_m.svg
index fe247c7..c92ff88 100644
--- a/cells/mux2/sky130_fd_sc_lp__mux2_m.svg
+++ b/cells/mux2/sky130_fd_sc_lp__mux2_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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="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 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="#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 1236.5 679.5 L 1270.5 679.5 L 1270.5 775.5 L 1236.5 775.5 Z M 670.5 679.5 L 704.5 679.5 L 704.5 775.5 L 670.5 775.5 Z M 787.5 679.5 L 821.5 679.5 L 821.5 775.5 L 787.5 775.5 Z M 869.5 679.5 L 903.5 679.5 L 903.5 775.5 L 869.5 775.5 Z M 993.5 679.5 L 1027.5 679.5 L 1027.5 775.5 L 993.5 775.5 Z M 1075.5 679.5 L 1110.5 679.5 L 1110.5 775.5 L 1075.5 775.5 Z M 1075.5 679.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 1270.5 248.5 L 1305.5 248.5 L 1305.5 344.5 L 1270.5 344.5 Z M 704.5 248.5 L 738.5 248.5 L 738.5 344.5 L 704.5 344.5 Z M 865.5 248.5 L 899.5 248.5 L 899.5 344.5 L 865.5 344.5 Z M 947.5 248.5 L 981.5 248.5 L 981.5 344.5 L 947.5 344.5 Z M 1046.5 248.5 L 1080.5 248.5 L 1080.5 344.5 L 1046.5 344.5 Z M 1153.5 248.5 L 1188.5 248.5 L 1188.5 344.5 L 1153.5 344.5 Z M 1153.5 248.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/mux2i/sky130_fd_sc_lp__mux2i_0.svg b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.svg
index 2d9c527..cedf8a0 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_0.svg
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image312"/>
+  <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 1132.5 767.5 L 1166.5 767.5 L 1166.5 863.5 L 1132.5 863.5 Z M 691.5 767.5 L 726.5 767.5 L 726.5 863.5 L 691.5 863.5 Z M 822.5 767.5 L 856.5 767.5 L 856.5 863.5 L 822.5 863.5 Z M 911.5 767.5 L 946.5 767.5 L 946.5 863.5 L 911.5 863.5 Z M 1042.5 767.5 L 1077.5 767.5 L 1077.5 863.5 L 1042.5 863.5 Z M 1042.5 767.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <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 1173.5 209.5 L 1207.5 209.5 L 1207.5 356.5 L 1173.5 356.5 Z M 733.5 209.5 L 767.5 209.5 L 767.5 356.5 L 733.5 356.5 Z M 877.5 209.5 L 911.5 209.5 L 911.5 356.5 L 877.5 356.5 Z M 960.5 209.5 L 994.5 209.5 L 994.5 356.5 L 960.5 356.5 Z M 1075.5 209.5 L 1110.5 209.5 L 1110.5 356.5 L 1075.5 356.5 Z M 1075.5 209.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image315" 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="#image315"/>
+  <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="surface309">
+<g id="surface338">
 <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 745.523438 472.980469 L 748.484375 472.84375 L 751.042969 472.375 L 753.199219 471.632812 L 755.015625 470.554688 L 756.363281 469.210938 L 757.371094 467.460938 L 757.574219 466.988281 L 757.707031 466.449219 L 757.84375 465.910156 L 757.976562 464.699219 L 758.046875 464.09375 L 757.84375 462.679688 L 757.441406 461.402344 L 756.632812 460.1875 L 755.621094 459.113281 L 754.207031 458.167969 L 752.59375 457.292969 L 752.054688 457.160156 L 751.515625 456.957031 L 750.910156 456.753906 L 750.304688 456.554688 L 749.628906 456.351562 L 749.023438 456.148438 L 736.839844 452.917969 L 733.878906 451.90625 L 731.453125 450.5625 L 729.570312 448.8125 L 728.222656 446.792969 L 727.414062 444.300781 L 727.210938 441.472656 L 727.347656 439.25 L 727.75 437.164062 L 728.492188 435.210938 L 729.5 433.53125 L 730.78125 431.980469 L 732.394531 430.566406 L 734.011719 429.488281 L 735.761719 428.613281 L 737.78125 427.941406 L 739.867188 427.46875 L 742.15625 427.203125 L 744.648438 427.066406 L 747.8125 427.269531 L 750.707031 427.671875 L 753.265625 428.480469 L 755.621094 429.488281 L 757.574219 430.902344 L 759.324219 432.519531 L 760.335938 433.867188 L 761.140625 435.347656 L 761.75 436.894531 L 762.21875 438.578125 L 762.488281 440.394531 L 762.625 442.28125 L 756.699219 442.28125 L 756.496094 440.328125 L 756.027344 438.511719 L 755.21875 436.960938 L 754.207031 435.617188 L 752.792969 434.472656 L 751.179688 433.53125 L 750.167969 433.191406 L 749.160156 432.855469 L 748.082031 432.652344 L 746.9375 432.453125 L 745.726562 432.386719 L 744.445312 432.316406 L 742.5625 432.453125 L 740.8125 432.722656 L 739.261719 433.125 L 737.847656 433.730469 L 736.636719 434.472656 L 735.558594 435.414062 L 734.886719 436.15625 L 734.347656 436.960938 L 733.945312 437.839844 L 733.675781 438.714844 L 733.472656 439.65625 L 733.472656 440.597656 L 733.539062 441.675781 L 733.742188 442.617188 L 734.078125 443.492188 L 734.550781 444.300781 L 735.15625 444.972656 L 735.964844 445.578125 L 736.570312 446.050781 L 737.378906 446.457031 L 738.253906 446.859375 L 739.261719 447.195312 L 740.339844 447.53125 L 741.550781 447.867188 L 753.871094 451.167969 L 756.027344 451.90625 L 757.910156 452.851562 L 759.59375 453.929688 L 761.007812 455.207031 L 762.21875 456.621094 L 763.160156 458.234375 L 763.5 459.042969 L 763.769531 459.851562 L 763.96875 460.726562 L 764.171875 461.601562 L 764.238281 462.542969 L 764.304688 463.488281 L 764.171875 465.171875 L 763.902344 466.785156 L 763.5 468.335938 L 762.824219 469.816406 L 762.015625 471.230469 L 761.074219 472.574219 L 759.257812 474.460938 L 757.101562 475.941406 L 754.613281 477.019531 L 751.785156 477.828125 L 748.621094 478.296875 L 745.121094 478.5 L 742.089844 478.367188 L 739.332031 477.960938 L 736.773438 477.289062 L 734.484375 476.480469 L 732.464844 475.335938 L 730.644531 473.855469 L 729.097656 472.304688 L 727.886719 470.554688 L 726.941406 468.605469 L 726.269531 466.382812 L 725.867188 463.957031 L 725.730469 461.332031 L 731.65625 461.332031 L 731.65625 461.667969 L 731.722656 463.421875 L 732.058594 465.035156 L 732.597656 466.515625 L 733.339844 467.863281 L 734.28125 469.074219 L 735.492188 470.152344 L 736.703125 471.027344 L 738.117188 471.769531 L 739.734375 472.304688 L 741.484375 472.710938 L 743.4375 472.914062 Z M 745.523438 472.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 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 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/mux2i/sky130_fd_sc_lp__mux2i_1.svg b/cells/mux2i/sky130_fd_sc_lp__mux2i_1.svg
index d5d2ec8..50d779a 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_1.svg
+++ b/cells/mux2i/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.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="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="#image288"/>
+  <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="#image288"/>
+  <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 620.5 642.5 L 655.5 642.5 L 655.5 835.5 L 620.5 835.5 Z M 730.5 642.5 L 765.5 642.5 L 765.5 835.5 L 730.5 835.5 Z M 1276.5 647.5 L 1310.5 647.5 L 1310.5 839.5 L 1276.5 839.5 Z M 1054.5 672.5 L 1088.5 672.5 L 1088.5 864.5 L 1054.5 864.5 Z M 955.5 672.5 L 989.5 672.5 L 989.5 864.5 L 955.5 864.5 Z M 955.5 672.5 "/>
 </clipPath>
-<image id="image289" 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="#image289"/>
+  <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 1267.5 209.5 L 1301.5 209.5 L 1301.5 498.5 L 1267.5 498.5 Z M 648.5 209.5 L 682.5 209.5 L 682.5 498.5 L 648.5 498.5 Z M 758.5 209.5 L 792.5 209.5 L 792.5 498.5 L 758.5 498.5 Z M 870.5 209.5 L 905.5 209.5 L 905.5 498.5 L 870.5 498.5 Z M 1012.5 209.5 L 1047.5 209.5 L 1047.5 498.5 L 1012.5 498.5 Z M 1012.5 209.5 "/>
 </clipPath>
-<image id="image290" 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="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image291" 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="#image291"/>
+  <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="surface285">
+<g id="surface314">
 <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 825.773438 527.503906 L 815.203125 527.503906 L 815.203125 523.261719 L 817.019531 523.058594 L 818.636719 522.789062 L 820.050781 522.453125 L 821.261719 522.183594 L 822.269531 521.847656 L 823.148438 521.445312 L 823.820312 521.039062 L 824.425781 520.570312 L 824.964844 520.03125 L 825.503906 519.355469 L 825.972656 518.617188 L 826.445312 517.742188 L 826.648438 517.269531 L 826.847656 516.730469 L 827.050781 516.125 L 827.320312 515.386719 L 827.523438 514.644531 L 827.792969 513.769531 L 831.695312 513.769531 L 831.695312 561.5 L 825.773438 561.5 Z M 825.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 777 562 L 816 562 M 777 523 L 816 523 M 777 523 L 777 562 M 816 523 L 816 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 777 562 L 816 562 M 777 523 L 816 523 M 816 562 L 816 523 M 777 562 L 777 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/mux2i/sky130_fd_sc_lp__mux2i_2.svg b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.svg
index e13d26f..8ce0731 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_2.svg
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 256.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="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1243.5 647.5 L 1277.5 647.5 L 1277.5 839.5 L 1243.5 839.5 Z M 1360.5 647.5 L 1394.5 647.5 L 1394.5 839.5 L 1360.5 839.5 Z M 1144.5 647.5 L 1178.5 647.5 L 1178.5 839.5 L 1144.5 839.5 Z M 1476.5 647.5 L 1511.5 647.5 L 1511.5 839.5 L 1476.5 839.5 Z M 750.5 672.5 L 784.5 672.5 L 784.5 864.5 L 750.5 864.5 Z M 848.5 672.5 L 883.5 672.5 L 883.5 864.5 L 848.5 864.5 Z M 651.5 672.5 L 686.5 672.5 L 686.5 864.5 L 651.5 864.5 Z M 454.5 672.5 L 489.5 672.5 L 489.5 864.5 L 454.5 864.5 Z M 553.5 672.5 L 587.5 672.5 L 587.5 864.5 L 553.5 864.5 Z M 553.5 672.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1440.5 209.5 L 1474.5 209.5 L 1474.5 498.5 L 1440.5 498.5 Z M 411.5 209.5 L 445.5 209.5 L 445.5 498.5 L 411.5 498.5 Z M 553.5 209.5 L 587.5 209.5 L 587.5 498.5 L 553.5 498.5 Z M 651.5 209.5 L 686.5 209.5 L 686.5 498.5 L 651.5 498.5 Z M 787.5 209.5 L 821.5 209.5 L 821.5 498.5 L 787.5 498.5 Z M 885.5 209.5 L 920.5 209.5 L 920.5 498.5 L 885.5 498.5 Z M 1144.5 209.5 L 1178.5 209.5 L 1178.5 498.5 L 1144.5 498.5 Z M 1243.5 209.5 L 1277.5 209.5 L 1277.5 498.5 L 1243.5 498.5 Z M 1341.5 209.5 L 1376.5 209.5 L 1376.5 498.5 L 1341.5 498.5 Z M 1341.5 209.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1129.554688 542.246094 L 1129.554688 561.5 L 1123.292969 561.5 L 1123.292969 542.246094 L 1104.375 512.421875 L 1112.117188 512.421875 L 1126.523438 536.320312 L 1140.527344 512.421875 L 1148 512.421875 Z M 1129.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 1105 562 L 1144 562 M 1105 523 L 1144 523 M 1105 523 L 1105 562 M 1144 523 L 1144 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 1105 562 L 1144 562 M 1105 523 L 1144 523 M 1144 562 L 1144 523 M 1105 562 L 1105 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/mux2i/sky130_fd_sc_lp__mux2i_4.svg b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.svg
index 824c4ae..a7da00b 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_4.svg
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 537.5 L 174.5 537.5 Z M 174.5 243.5 "/>
 </clipPath>
-<image id="image325" 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="#image325"/>
+  <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 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="#image325"/>
+  <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 267.5 611.5 L 290.5 611.5 L 290.5 743.5 L 267.5 743.5 Z M 334.5 611.5 L 358.5 611.5 L 358.5 743.5 L 334.5 743.5 Z M 482.5 611.5 L 506.5 611.5 L 506.5 743.5 L 482.5 743.5 Z M 803.5 611.5 L 827.5 611.5 L 827.5 743.5 L 803.5 743.5 Z M 550.5 611.5 L 573.5 611.5 L 573.5 743.5 L 550.5 743.5 Z M 414.5 611.5 L 438.5 611.5 L 438.5 743.5 L 414.5 743.5 Z M 643.5 611.5 L 666.5 611.5 L 666.5 743.5 L 643.5 743.5 Z M 710.5 611.5 L 734.5 611.5 L 734.5 743.5 L 710.5 743.5 Z M 1116.5 628.5 L 1139.5 628.5 L 1139.5 760.5 L 1116.5 760.5 Z M 1048.5 628.5 L 1072.5 628.5 L 1072.5 760.5 L 1048.5 760.5 Z M 1589.5 628.5 L 1613.5 628.5 L 1613.5 760.5 L 1589.5 760.5 Z M 1251.5 628.5 L 1275.5 628.5 L 1275.5 760.5 L 1251.5 760.5 Z M 1319.5 628.5 L 1342.5 628.5 L 1342.5 760.5 L 1319.5 760.5 Z M 1454.5 628.5 L 1478.5 628.5 L 1478.5 760.5 L 1454.5 760.5 Z M 1522.5 628.5 L 1545.5 628.5 L 1545.5 760.5 L 1522.5 760.5 Z M 1184.5 628.5 L 1207.5 628.5 L 1207.5 760.5 L 1184.5 760.5 Z M 1386.5 628.5 L 1410.5 628.5 L 1410.5 760.5 L 1386.5 760.5 Z M 1386.5 628.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1619.5 310.5 L 1643.5 310.5 L 1643.5 508.5 L 1619.5 508.5 Z M 279.5 310.5 L 303.5 310.5 L 303.5 508.5 L 279.5 508.5 Z M 347.5 310.5 L 370.5 310.5 L 370.5 508.5 L 347.5 508.5 Z M 414.5 310.5 L 438.5 310.5 L 438.5 508.5 L 414.5 508.5 Z M 482.5 310.5 L 506.5 310.5 L 506.5 508.5 L 482.5 508.5 Z M 550.5 310.5 L 573.5 310.5 L 573.5 508.5 L 550.5 508.5 Z M 617.5 310.5 L 641.5 310.5 L 641.5 508.5 L 617.5 508.5 Z M 685.5 310.5 L 709.5 310.5 L 709.5 508.5 L 685.5 508.5 Z M 753.5 310.5 L 776.5 310.5 L 776.5 508.5 L 753.5 508.5 Z M 1047.5 310.5 L 1070.5 310.5 L 1070.5 508.5 L 1047.5 508.5 Z M 1114.5 310.5 L 1138.5 310.5 L 1138.5 508.5 L 1114.5 508.5 Z M 1182.5 310.5 L 1206.5 310.5 L 1206.5 508.5 L 1182.5 508.5 Z M 1253.5 310.5 L 1276.5 310.5 L 1276.5 508.5 L 1253.5 508.5 Z M 1320.5 310.5 L 1344.5 310.5 L 1344.5 508.5 L 1320.5 508.5 Z M 1388.5 310.5 L 1412.5 310.5 L 1412.5 508.5 L 1388.5 508.5 Z M 1481.5 310.5 L 1504.5 310.5 L 1504.5 508.5 L 1481.5 508.5 Z M 1548.5 310.5 L 1572.5 310.5 L 1572.5 508.5 L 1548.5 508.5 Z M 1548.5 310.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface322">
+<g id="surface352">
 <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 790.3125 529.125 L 783.046875 529.125 L 783.046875 526.210938 L 784.296875 526.070312 L 785.40625 525.886719 L 786.378906 525.65625 L 787.210938 525.46875 L 787.90625 525.238281 L 788.507812 524.960938 L 788.96875 524.683594 L 789.386719 524.359375 L 789.757812 523.988281 L 790.125 523.527344 L 790.449219 523.015625 L 790.773438 522.414062 L 790.914062 522.09375 L 791.050781 521.722656 L 791.191406 521.304688 L 791.375 520.796875 L 791.515625 520.285156 L 791.699219 519.683594 L 794.386719 519.683594 L 794.386719 552.5 L 790.3125 552.5 Z M 790.3125 529.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 757 557 L 783 557 M 757 530 L 783 530 M 757 530 L 757 557 M 783 530 L 783 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 757 557 L 783 557 M 757 530 L 783 530 M 783 557 L 783 530 M 757 557 L 757 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/mux2i/sky130_fd_sc_lp__mux2i_lp.svg b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.svg
index a47d991..fcb1b49 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.svg
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="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 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="#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 1215.5 766.5 L 1250.5 766.5 L 1250.5 862.5 L 1215.5 862.5 Z M 673.5 766.5 L 708.5 766.5 L 708.5 862.5 L 673.5 862.5 Z M 763.5 766.5 L 797.5 766.5 L 797.5 862.5 L 763.5 862.5 Z M 914.5 766.5 L 948.5 766.5 L 948.5 862.5 L 914.5 862.5 Z M 1003.5 766.5 L 1038.5 766.5 L 1038.5 862.5 L 1003.5 862.5 Z M 1126.5 766.5 L 1160.5 766.5 L 1160.5 862.5 L 1126.5 862.5 Z M 1126.5 766.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 1209.5 218.5 L 1244.5 218.5 L 1244.5 314.5 L 1209.5 314.5 Z M 686.5 218.5 L 720.5 218.5 L 720.5 314.5 L 686.5 314.5 Z M 775.5 218.5 L 810.5 218.5 L 810.5 314.5 L 775.5 314.5 Z M 874.5 218.5 L 908.5 218.5 L 908.5 314.5 L 874.5 314.5 Z M 995.5 218.5 L 1030.5 218.5 L 1030.5 314.5 L 995.5 314.5 Z M 1127.5 218.5 L 1161.5 218.5 L 1161.5 314.5 L 1127.5 314.5 Z M 1127.5 218.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1076.554688 372.246094 L 1076.554688 391.5 L 1070.292969 391.5 L 1070.292969 372.246094 L 1051.375 342.421875 L 1059.117188 342.421875 L 1073.523438 366.320312 L 1087.527344 342.421875 L 1095 342.421875 Z M 1076.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 1052 731 L 1091 731 M 1052 693 L 1091 693 M 1052 693 L 1052 731 M 1091 693 L 1091 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 1052 731 L 1091 731 M 1052 693 L 1091 693 M 1091 731 L 1091 693 M 1052 731 L 1052 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 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/mux2i/sky130_fd_sc_lp__mux2i_lp2.svg b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.svg
index 998690d..7683fab 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.svg
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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 1268.5 768.5 L 1302.5 768.5 L 1302.5 864.5 L 1268.5 864.5 Z M 781.5 768.5 L 815.5 768.5 L 815.5 864.5 L 781.5 864.5 Z M 870.5 768.5 L 905.5 768.5 L 905.5 864.5 L 870.5 864.5 Z M 971.5 768.5 L 1005.5 768.5 L 1005.5 864.5 L 971.5 864.5 Z M 1083.5 768.5 L 1118.5 768.5 L 1118.5 864.5 L 1083.5 864.5 Z M 1185.5 768.5 L 1220.5 768.5 L 1220.5 864.5 L 1185.5 864.5 Z M 1185.5 768.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 1221.5 209.5 L 1278.5 209.5 L 1278.5 438.5 L 1221.5 438.5 Z M 634.5 209.5 L 691.5 209.5 L 691.5 438.5 L 634.5 438.5 Z M 746.5 209.5 L 804.5 209.5 L 804.5 438.5 L 746.5 438.5 Z M 934.5 209.5 L 992.5 209.5 L 992.5 438.5 L 934.5 438.5 Z M 1090.5 209.5 L 1148.5 209.5 L 1148.5 438.5 L 1090.5 438.5 Z M 1090.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 801.554688 288.246094 L 801.554688 307.5 L 795.292969 307.5 L 795.292969 288.246094 L 776.375 258.421875 L 784.117188 258.421875 L 798.523438 282.320312 L 812.527344 258.421875 L 820 258.421875 Z M 801.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 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/mux2i/sky130_fd_sc_lp__mux2i_m.svg b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.svg
index 729f418..a78928e 100644
--- a/cells/mux2i/sky130_fd_sc_lp__mux2i_m.svg
+++ b/cells/mux2i/sky130_fd_sc_lp__mux2i_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1144.5 679.5 L 1178.5 679.5 L 1178.5 775.5 L 1144.5 775.5 Z M 705.5 679.5 L 740.5 679.5 L 740.5 775.5 L 705.5 775.5 Z M 829.5 679.5 L 863.5 679.5 L 863.5 775.5 L 829.5 775.5 Z M 911.5 679.5 L 946.5 679.5 L 946.5 775.5 L 911.5 775.5 Z M 1019.5 679.5 L 1054.5 679.5 L 1054.5 775.5 L 1019.5 775.5 Z M 1019.5 679.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1166.5 252.5 L 1200.5 252.5 L 1200.5 349.5 L 1166.5 349.5 Z M 719.5 252.5 L 753.5 252.5 L 753.5 349.5 L 719.5 349.5 Z M 836.5 252.5 L 870.5 252.5 L 870.5 349.5 L 836.5 349.5 Z M 918.5 252.5 L 953.5 252.5 L 953.5 349.5 L 918.5 349.5 Z M 1060.5 252.5 L 1095.5 252.5 L 1095.5 349.5 L 1060.5 349.5 Z M 1060.5 252.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface300">
+<g id="surface329">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 990.773438 442.503906 L 980.203125 442.503906 L 980.203125 438.261719 L 982.019531 438.058594 L 983.636719 437.789062 L 985.050781 437.453125 L 986.261719 437.183594 L 987.269531 436.847656 L 988.148438 436.445312 L 988.820312 436.039062 L 989.425781 435.570312 L 989.964844 435.03125 L 990.503906 434.355469 L 990.972656 433.617188 L 991.445312 432.742188 L 991.648438 432.269531 L 991.847656 431.730469 L 992.050781 431.125 L 992.320312 430.386719 L 992.523438 429.644531 L 992.792969 428.769531 L 996.695312 428.769531 L 996.695312 476.5 L 990.773438 476.5 Z M 990.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 942 647 L 981 647 M 942 608 L 981 608 M 942 608 L 942 647 M 981 608 L 981 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 942 647 L 981 647 M 942 608 L 981 608 M 981 647 L 981 608 M 942 647 L 942 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/mux4/sky130_fd_sc_lp__mux4_0.svg b/cells/mux4/sky130_fd_sc_lp__mux4_0.svg
index 892c814..4438a39 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_0.svg
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image365"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1318.5 657.5 L 1347.5 657.5 L 1347.5 738.5 L 1318.5 738.5 Z M 1234.5 657.5 L 1263.5 657.5 L 1263.5 738.5 L 1234.5 738.5 Z M 612.5 662.5 L 641.5 662.5 L 641.5 744.5 L 612.5 744.5 Z M 515.5 662.5 L 544.5 662.5 L 544.5 744.5 L 515.5 744.5 Z M 445.5 662.5 L 474.5 662.5 L 474.5 744.5 L 445.5 744.5 Z M 961.5 662.5 L 990.5 662.5 L 990.5 744.5 L 961.5 744.5 Z M 1031.5 662.5 L 1060.5 662.5 L 1060.5 744.5 L 1031.5 744.5 Z M 877.5 662.5 L 906.5 662.5 L 906.5 744.5 L 877.5 744.5 Z M 807.5 662.5 L 836.5 662.5 L 836.5 744.5 L 807.5 744.5 Z M 682.5 662.5 L 711.5 662.5 L 711.5 744.5 L 682.5 744.5 Z M 361.5 662.5 L 390.5 662.5 L 390.5 744.5 L 361.5 744.5 Z M 1515.5 733.5 L 1545.5 733.5 L 1545.5 814.5 L 1515.5 814.5 Z M 1599.5 733.5 L 1628.5 733.5 L 1628.5 814.5 L 1599.5 814.5 Z M 1599.5 733.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 293.5 286.5 L 322.5 286.5 L 322.5 368.5 L 293.5 368.5 Z M 398.5 286.5 L 427.5 286.5 L 427.5 368.5 L 398.5 368.5 Z M 468.5 286.5 L 497.5 286.5 L 497.5 368.5 L 468.5 368.5 Z M 597.5 288.5 L 626.5 288.5 L 626.5 369.5 L 597.5 369.5 Z M 954.5 288.5 L 983.5 288.5 L 983.5 369.5 L 954.5 369.5 Z M 1024.5 288.5 L 1053.5 288.5 L 1053.5 369.5 L 1024.5 369.5 Z M 849.5 288.5 L 878.5 288.5 L 878.5 369.5 L 849.5 369.5 Z M 667.5 288.5 L 696.5 288.5 L 696.5 369.5 L 667.5 369.5 Z M 779.5 288.5 L 808.5 288.5 L 808.5 369.5 L 779.5 369.5 Z M 1228.5 298.5 L 1258.5 298.5 L 1258.5 380.5 L 1228.5 380.5 Z M 1312.5 298.5 L 1341.5 298.5 L 1341.5 380.5 L 1312.5 380.5 Z M 1599.5 343.5 L 1628.5 343.5 L 1628.5 468.5 L 1599.5 468.5 Z M 1497.5 386.5 L 1526.5 386.5 L 1526.5 468.5 L 1497.5 468.5 Z M 1497.5 386.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1363.5 663.5 L 1396.5 663.5 L 1396.5 681.5 L 1363.5 681.5 Z M 1363.5 681.5 L 1396.5 681.5 L 1396.5 696.5 L 1363.5 696.5 Z M 615.5 663.5 L 648.5 663.5 L 648.5 696.5 L 615.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="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image397"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface362">
+<g id="surface391">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1663.984375 463.992188 L 1678.820312 485.5 L 1672.207031 485.5 L 1660.765625 468.019531 L 1649.261719 485.5 L 1642.765625 485.5 L 1657.601562 463.992188 L 1643.683594 443.578125 L 1650.183594 443.578125 L 1660.9375 460.027344 L 1671.746094 443.578125 L 1678.128906 443.578125 Z M 1663.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 1643 632 L 1676 632 M 1643 599 L 1676 599 M 1643 599 L 1643 632 M 1676 599 L 1676 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 1643 632 L 1676 632 M 1643 599 L 1676 599 M 1676 632 L 1676 599 M 1643 632 L 1643 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/mux4/sky130_fd_sc_lp__mux4_1.svg b/cells/mux4/sky130_fd_sc_lp__mux4_1.svg
index 940a8c0..f6c6bf3 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_1.svg
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_1.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="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 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="#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 1471.5 610.5 L 1494.5 610.5 L 1494.5 673.5 L 1471.5 673.5 Z M 1407.5 610.5 L 1429.5 610.5 L 1429.5 673.5 L 1407.5 673.5 Z M 1222.5 632.5 L 1245.5 632.5 L 1245.5 695.5 L 1222.5 695.5 Z M 633.5 632.5 L 655.5 632.5 L 655.5 695.5 L 633.5 695.5 Z M 775.5 634.5 L 798.5 634.5 L 798.5 697.5 L 775.5 697.5 Z M 840.5 634.5 L 862.5 634.5 L 862.5 697.5 L 840.5 697.5 Z M 268.5 661.5 L 290.5 661.5 L 290.5 724.5 L 268.5 724.5 Z M 340.5 661.5 L 362.5 661.5 L 362.5 724.5 L 340.5 724.5 Z M 458.5 661.5 L 481.5 661.5 L 481.5 724.5 L 458.5 724.5 Z M 394.5 661.5 L 416.5 661.5 L 416.5 724.5 L 394.5 724.5 Z M 1633.5 599.5 L 1655.5 599.5 L 1655.5 725.5 L 1633.5 725.5 Z M 982.5 686.5 L 1005.5 686.5 L 1005.5 749.5 L 982.5 749.5 Z M 1059.5 686.5 L 1081.5 686.5 L 1081.5 749.5 L 1059.5 749.5 Z M 1059.5 686.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 263.5 332.5 L 286.5 332.5 L 286.5 395.5 L 263.5 395.5 Z M 328.5 332.5 L 350.5 332.5 L 350.5 395.5 L 328.5 395.5 Z M 961.5 346.5 L 983.5 346.5 L 983.5 409.5 L 961.5 409.5 Z M 1036.5 346.5 L 1058.5 346.5 L 1058.5 409.5 L 1036.5 409.5 Z M 842.5 346.5 L 865.5 346.5 L 865.5 409.5 L 842.5 409.5 Z M 907.5 346.5 L 929.5 346.5 L 929.5 409.5 L 907.5 409.5 Z M 682.5 351.5 L 704.5 351.5 L 704.5 414.5 L 682.5 414.5 Z M 470.5 377.5 L 493.5 377.5 L 493.5 440.5 L 470.5 440.5 Z M 535.5 377.5 L 557.5 377.5 L 557.5 440.5 L 535.5 440.5 Z M 1222.5 388.5 L 1245.5 388.5 L 1245.5 451.5 L 1222.5 451.5 Z M 1407.5 446.5 L 1429.5 446.5 L 1429.5 509.5 L 1407.5 509.5 Z M 1471.5 446.5 L 1494.5 446.5 L 1494.5 509.5 L 1471.5 509.5 Z M 1633.5 320.5 L 1655.5 320.5 L 1655.5 509.5 L 1633.5 509.5 Z M 1633.5 320.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 1378.5 467.5 L 1404.5 467.5 L 1404.5 491.5 L 1378.5 491.5 Z M 1378.5 491.5 L 1404.5 491.5 L 1404.5 492.5 L 1378.5 492.5 Z M 514.5 467.5 L 540.5 467.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="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>
@@ -222,6 +222,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1682.5 368.238281 L 1693.71875 384.5 L 1688.71875 384.5 L 1680.066406 371.28125 L 1671.371094 384.5 L 1666.457031 384.5 L 1677.675781 368.238281 L 1667.152344 352.804688 L 1672.066406 352.804688 L 1680.195312 365.238281 L 1688.371094 352.804688 L 1693.195312 352.804688 Z M 1682.5 368.238281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1666 723 L 1692 723 M 1666 698 L 1692 698 M 1666 698 L 1666 723 M 1692 698 L 1692 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 1666 723 L 1692 723 M 1666 698 L 1692 698 M 1692 723 L 1692 698 M 1666 723 L 1666 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/mux4/sky130_fd_sc_lp__mux4_2.svg b/cells/mux4/sky130_fd_sc_lp__mux4_2.svg
index 3ae2aac..c1e1a4d 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_2.svg
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 537.5 L 174.5 537.5 Z M 455.5 537.5 L 878.5 537.5 L 878.5 548.5 L 455.5 548.5 Z M 455.5 537.5 "/>
 </clipPath>
-<image id="image372" 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="#image372"/>
+  <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 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="#image372"/>
+  <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 598.5 638.5 L 624.5 638.5 L 624.5 711.5 L 598.5 711.5 Z M 351.5 643.5 L 378.5 643.5 L 378.5 716.5 L 351.5 716.5 Z M 277.5 643.5 L 303.5 643.5 L 303.5 716.5 L 277.5 716.5 Z M 961.5 649.5 L 987.5 649.5 L 987.5 722.5 L 961.5 722.5 Z M 1118.5 649.5 L 1144.5 649.5 L 1144.5 722.5 L 1118.5 722.5 Z M 1245.5 649.5 L 1271.5 649.5 L 1271.5 722.5 L 1245.5 722.5 Z M 1382.5 649.5 L 1408.5 649.5 L 1408.5 722.5 L 1382.5 722.5 Z M 1308.5 649.5 L 1334.5 649.5 L 1334.5 722.5 L 1308.5 722.5 Z M 1464.5 649.5 L 1490.5 649.5 L 1490.5 722.5 L 1464.5 722.5 Z M 1036.5 649.5 L 1062.5 649.5 L 1062.5 722.5 L 1036.5 722.5 Z M 899.5 649.5 L 925.5 649.5 L 925.5 722.5 L 899.5 722.5 Z M 1539.5 649.5 L 1565.5 649.5 L 1565.5 722.5 L 1539.5 722.5 Z M 781.5 638.5 L 807.5 638.5 L 807.5 784.5 L 781.5 784.5 Z M 706.5 638.5 L 732.5 638.5 L 732.5 784.5 L 706.5 784.5 Z M 706.5 638.5 "/>
 </clipPath>
-<image id="image373" 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="#image373"/>
+  <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 1562.5 349.5 L 1588.5 349.5 L 1588.5 461.5 L 1562.5 461.5 Z M 1488.5 349.5 L 1514.5 349.5 L 1514.5 461.5 L 1488.5 461.5 Z M 1029.5 349.5 L 1055.5 349.5 L 1055.5 461.5 L 1029.5 461.5 Z M 1092.5 349.5 L 1118.5 349.5 L 1118.5 461.5 L 1092.5 461.5 Z M 1308.5 349.5 L 1334.5 349.5 L 1334.5 461.5 L 1308.5 461.5 Z M 1399.5 349.5 L 1425.5 349.5 L 1425.5 461.5 L 1399.5 461.5 Z M 1245.5 349.5 L 1271.5 349.5 L 1271.5 461.5 L 1245.5 461.5 Z M 892.5 349.5 L 918.5 349.5 L 918.5 461.5 L 892.5 461.5 Z M 954.5 349.5 L 980.5 349.5 L 980.5 461.5 L 954.5 461.5 Z M 351.5 368.5 L 378.5 368.5 L 378.5 480.5 L 351.5 480.5 Z M 277.5 368.5 L 303.5 368.5 L 303.5 480.5 L 277.5 480.5 Z M 549.5 405.5 L 575.5 405.5 L 575.5 516.5 L 549.5 516.5 Z M 774.5 297.5 L 800.5 297.5 L 800.5 516.5 L 774.5 516.5 Z M 699.5 297.5 L 726.5 297.5 L 726.5 516.5 L 699.5 516.5 Z M 699.5 297.5 "/>
 </clipPath>
-<image id="image374" 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="#image374"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 401.5 392.5 L 431.5 392.5 L 431.5 410.5 L 401.5 410.5 Z M 1320.5 392.5 L 1349.5 392.5 L 1349.5 422.5 L 1320.5 422.5 Z M 401.5 410.5 L 431.5 410.5 L 431.5 422.5 L 401.5 422.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="image375" 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="#image375"/>
+  <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="surface369">
+<g id="surface399">
 <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 1592.296875 537.019531 L 1592.449219 532.578125 L 1593.054688 528.738281 L 1594.066406 525.507812 L 1595.480469 522.882812 L 1597.296875 520.863281 L 1599.519531 519.449219 L 1600.175781 519.195312 L 1600.882812 518.945312 L 1601.640625 518.792969 L 1602.394531 518.640625 L 1603.152344 518.589844 L 1604.011719 518.539062 L 1606.890625 518.894531 L 1609.414062 519.902344 L 1611.484375 521.621094 L 1613.152344 523.992188 L 1614.414062 527.074219 L 1615.269531 530.757812 L 1615.371094 531.769531 L 1615.523438 532.828125 L 1615.574219 533.890625 L 1615.675781 535 L 1615.675781 536.160156 L 1615.726562 537.324219 L 1615.574219 541.007812 L 1615.121094 544.292969 L 1614.414062 547.167969 L 1613.402344 549.59375 L 1612.140625 551.664062 L 1610.574219 553.277344 L 1609.617188 553.984375 L 1608.65625 554.488281 L 1607.597656 554.894531 L 1606.433594 555.246094 L 1605.222656 555.398438 L 1604.011719 555.5 L 1601.640625 555.246094 L 1599.519531 554.589844 L 1597.648438 553.53125 L 1596.085938 551.964844 L 1594.773438 549.996094 L 1593.761719 547.523438 L 1593.308594 546.058594 L 1592.953125 544.492188 L 1592.652344 542.828125 L 1592.449219 541.007812 L 1592.296875 539.089844 Z M 1604.011719 522.480469 L 1601.789062 522.933594 L 1599.972656 524.144531 L 1598.609375 526.164062 L 1597.597656 528.992188 L 1596.992188 532.628906 L 1596.84375 537.070312 L 1596.992188 541.613281 L 1597.597656 545.300781 L 1598.609375 548.179688 L 1599.972656 550.199219 L 1601.738281 551.410156 L 1603.910156 551.8125 L 1605.425781 551.664062 L 1606.789062 551.105469 L 1607.949219 550.199219 L 1608.910156 548.9375 L 1609.71875 547.320312 L 1610.375 545.351562 L 1610.625 544.242188 L 1610.828125 542.976562 L 1610.980469 541.613281 L 1611.082031 540.152344 L 1611.132812 538.585938 L 1611.179688 536.917969 L 1610.980469 532.527344 L 1610.375 528.890625 L 1609.363281 526.113281 L 1608 524.09375 L 1606.183594 522.882812 Z M 1604.011719 522.480469 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1570 558 L 1600 558 M 1570 529 L 1600 529 M 1570 529 L 1570 558 M 1600 529 L 1600 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 1570 558 L 1600 558 M 1570 529 L 1600 529 M 1600 558 L 1600 529 M 1570 558 L 1570 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/mux4/sky130_fd_sc_lp__mux4_4.svg b/cells/mux4/sky130_fd_sc_lp__mux4_4.svg
index b568474..8e7f70a 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_4.svg
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 537.5 L 174.5 537.5 Z M 464.5 537.5 L 969.5 537.5 L 969.5 562.5 L 464.5 562.5 Z M 464.5 537.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image362"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask 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="#image362"/>
+  <use xlink:href="#image391"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 534.5 628.5 L 558.5 628.5 L 558.5 694.5 L 534.5 694.5 Z M 1379.5 637.5 L 1403.5 637.5 L 1403.5 703.5 L 1379.5 703.5 Z M 337.5 637.5 L 361.5 637.5 L 361.5 703.5 L 337.5 703.5 Z M 929.5 637.5 L 952.5 637.5 L 952.5 703.5 L 929.5 703.5 Z M 985.5 637.5 L 1009.5 637.5 L 1009.5 703.5 L 985.5 703.5 Z M 1312.5 637.5 L 1335.5 637.5 L 1335.5 703.5 L 1312.5 703.5 Z M 1110.5 637.5 L 1133.5 637.5 L 1133.5 703.5 L 1110.5 703.5 Z M 270.5 637.5 L 293.5 637.5 L 293.5 703.5 L 270.5 703.5 Z M 1255.5 637.5 L 1279.5 637.5 L 1279.5 703.5 L 1255.5 703.5 Z M 1622.5 637.5 L 1646.5 637.5 L 1646.5 703.5 L 1622.5 703.5 Z M 1453.5 637.5 L 1477.5 637.5 L 1477.5 703.5 L 1453.5 703.5 Z M 1053.5 637.5 L 1077.5 637.5 L 1077.5 703.5 L 1053.5 703.5 Z M 776.5 628.5 L 800.5 628.5 L 800.5 760.5 L 776.5 760.5 Z M 709.5 628.5 L 732.5 628.5 L 732.5 760.5 L 709.5 760.5 Z M 641.5 628.5 L 665.5 628.5 L 665.5 760.5 L 641.5 760.5 Z M 844.5 628.5 L 867.5 628.5 L 867.5 760.5 L 844.5 760.5 Z M 844.5 628.5 "/>
 </clipPath>
-<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect 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 357.5 L 1046.5 357.5 L 1046.5 458.5 L 1022.5 458.5 Z M 966.5 357.5 L 989.5 357.5 L 989.5 458.5 L 966.5 458.5 Z M 1430.5 357.5 L 1453.5 357.5 L 1453.5 458.5 L 1430.5 458.5 Z M 1090.5 357.5 L 1114.5 357.5 L 1114.5 458.5 L 1090.5 458.5 Z M 1340.5 367.5 L 1364.5 367.5 L 1364.5 468.5 L 1340.5 468.5 Z M 1510.5 367.5 L 1533.5 367.5 L 1533.5 468.5 L 1510.5 468.5 Z M 1170.5 367.5 L 1194.5 367.5 L 1194.5 468.5 L 1170.5 468.5 Z M 1283.5 367.5 L 1307.5 367.5 L 1307.5 468.5 L 1283.5 468.5 Z M 1577.5 367.5 L 1601.5 367.5 L 1601.5 468.5 L 1577.5 468.5 Z M 337.5 380.5 L 361.5 380.5 L 361.5 481.5 L 337.5 481.5 Z M 270.5 380.5 L 293.5 380.5 L 293.5 481.5 L 270.5 481.5 Z M 753.5 335.5 L 776.5 335.5 L 776.5 534.5 L 753.5 534.5 Z M 685.5 335.5 L 709.5 335.5 L 709.5 534.5 L 685.5 534.5 Z M 532.5 433.5 L 555.5 433.5 L 555.5 534.5 L 532.5 534.5 Z M 820.5 335.5 L 844.5 335.5 L 844.5 534.5 L 820.5 534.5 Z M 617.5 335.5 L 641.5 335.5 L 641.5 534.5 L 617.5 534.5 Z M 617.5 335.5 "/>
 </clipPath>
-<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <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="#image393"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 696.5 L 255.5 696.5 L 255.5 723.5 L 228.5 723.5 Z M 1360.5 696.5 L 1387.5 696.5 L 1387.5 723.5 L 1360.5 723.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="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image394"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface359">
+<g id="surface388">
 <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 849.597656 535.191406 L 861.539062 552.5 L 856.214844 552.5 L 847.003906 538.429688 L 837.75 552.5 L 832.519531 552.5 L 844.460938 535.191406 L 833.257812 518.757812 L 838.488281 518.757812 L 847.144531 531.996094 L 855.84375 518.757812 L 860.984375 518.757812 Z M 849.597656 535.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 832 557 L 859 557 M 832 530 L 859 530 M 832 530 L 832 557 M 859 530 L 859 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 832 557 L 859 557 M 832 530 L 859 530 M 859 557 L 859 530 M 832 557 L 832 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/mux4/sky130_fd_sc_lp__mux4_lp.svg b/cells/mux4/sky130_fd_sc_lp__mux4_lp.svg
index ae390e6..99c2917 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_lp.svg
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_lp.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 625.5 536.5 L 751.5 536.5 L 751.5 560.5 L 625.5 560.5 Z M 625.5 536.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image353"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 867.5 646.5 L 889.5 646.5 L 889.5 709.5 L 867.5 709.5 Z M 938.5 646.5 L 961.5 646.5 L 961.5 709.5 L 938.5 709.5 Z M 694.5 646.5 L 716.5 646.5 L 716.5 709.5 L 694.5 709.5 Z M 748.5 646.5 L 770.5 646.5 L 770.5 709.5 L 748.5 709.5 Z M 533.5 679.5 L 556.5 679.5 L 556.5 742.5 L 533.5 742.5 Z M 469.5 679.5 L 491.5 679.5 L 491.5 742.5 L 469.5 742.5 Z M 1241.5 686.5 L 1264.5 686.5 L 1264.5 749.5 L 1241.5 749.5 Z M 1073.5 686.5 L 1096.5 686.5 L 1096.5 749.5 L 1073.5 749.5 Z M 1015.5 686.5 L 1037.5 686.5 L 1037.5 749.5 L 1015.5 749.5 Z M 320.5 686.5 L 343.5 686.5 L 343.5 749.5 L 320.5 749.5 Z M 266.5 686.5 L 289.5 686.5 L 289.5 749.5 L 266.5 749.5 Z M 1511.5 686.5 L 1534.5 686.5 L 1534.5 749.5 L 1511.5 749.5 Z M 1576.5 686.5 L 1598.5 686.5 L 1598.5 749.5 L 1576.5 749.5 Z M 1630.5 686.5 L 1652.5 686.5 L 1652.5 749.5 L 1630.5 749.5 Z M 1300.5 686.5 L 1322.5 686.5 L 1322.5 749.5 L 1300.5 749.5 Z M 1381.5 686.5 L 1403.5 686.5 L 1403.5 749.5 L 1381.5 749.5 Z M 1381.5 686.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1597.5 320.5 L 1634.5 320.5 L 1634.5 470.5 L 1597.5 470.5 Z M 1516.5 320.5 L 1553.5 320.5 L 1553.5 470.5 L 1516.5 470.5 Z M 1314.5 320.5 L 1351.5 320.5 L 1351.5 470.5 L 1314.5 470.5 Z M 913.5 320.5 L 950.5 320.5 L 950.5 470.5 L 913.5 470.5 Z M 736.5 320.5 L 773.5 320.5 L 773.5 470.5 L 736.5 470.5 Z M 839.5 320.5 L 877.5 320.5 L 877.5 470.5 L 839.5 470.5 Z M 1240.5 320.5 L 1278.5 320.5 L 1278.5 470.5 L 1240.5 470.5 Z M 1073.5 320.5 L 1111.5 320.5 L 1111.5 470.5 L 1073.5 470.5 Z M 1156.5 320.5 L 1194.5 320.5 L 1194.5 470.5 L 1156.5 470.5 Z M 1435.5 320.5 L 1472.5 320.5 L 1472.5 470.5 L 1435.5 470.5 Z M 552.5 326.5 L 589.5 326.5 L 589.5 476.5 L 552.5 476.5 Z M 443.5 326.5 L 481.5 326.5 L 481.5 476.5 L 443.5 476.5 Z M 266.5 328.5 L 304.5 328.5 L 304.5 478.5 L 266.5 478.5 Z M 266.5 328.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface350">
+<g id="surface379">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 617.71875 529.542969 L 610.890625 529.542969 L 610.890625 526.804688 L 612.066406 526.675781 L 613.109375 526.5 L 614.023438 526.28125 L 614.804688 526.109375 L 615.457031 525.890625 L 616.023438 525.628906 L 616.457031 525.371094 L 616.847656 525.066406 L 617.195312 524.71875 L 617.542969 524.28125 L 617.847656 523.804688 L 618.152344 523.238281 L 618.28125 522.933594 L 618.414062 522.585938 L 618.542969 522.195312 L 618.71875 521.71875 L 618.847656 521.238281 L 619.023438 520.675781 L 621.542969 520.675781 L 621.542969 551.5 L 617.71875 551.5 Z M 617.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 586 557 L 612 557 M 586 531 L 612 531 M 586 531 L 586 557 M 612 531 L 612 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 586 557 L 612 557 M 586 531 L 612 531 M 612 557 L 612 531 M 586 557 L 586 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_lp__mux4_m.svg b/cells/mux4/sky130_fd_sc_lp__mux4_m.svg
index c72793f..e7efd4c 100644
--- a/cells/mux4/sky130_fd_sc_lp__mux4_m.svg
+++ b/cells/mux4/sky130_fd_sc_lp__mux4_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image383"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1349.5 607.5 L 1376.5 607.5 L 1376.5 685.5 L 1349.5 685.5 Z M 1270.5 607.5 L 1297.5 607.5 L 1297.5 685.5 L 1270.5 685.5 Z M 432.5 649.5 L 460.5 649.5 L 460.5 726.5 L 432.5 726.5 Z M 499.5 649.5 L 526.5 649.5 L 526.5 726.5 L 499.5 726.5 Z M 598.5 649.5 L 625.5 649.5 L 625.5 726.5 L 598.5 726.5 Z M 893.5 649.5 L 921.5 649.5 L 921.5 726.5 L 893.5 726.5 Z M 959.5 649.5 L 987.5 649.5 L 987.5 726.5 L 959.5 726.5 Z M 814.5 649.5 L 841.5 649.5 L 841.5 726.5 L 814.5 726.5 Z M 748.5 649.5 L 775.5 649.5 L 775.5 726.5 L 748.5 726.5 Z M 664.5 649.5 L 692.5 649.5 L 692.5 726.5 L 664.5 726.5 Z M 333.5 649.5 L 361.5 649.5 L 361.5 726.5 L 333.5 726.5 Z M 1529.5 721.5 L 1557.5 721.5 L 1557.5 799.5 L 1529.5 799.5 Z M 1608.5 721.5 L 1636.5 721.5 L 1636.5 799.5 L 1608.5 799.5 Z M 1608.5 721.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1529.5 280.5 L 1557.5 280.5 L 1557.5 357.5 L 1529.5 357.5 Z M 1608.5 280.5 L 1636.5 280.5 L 1636.5 357.5 L 1608.5 357.5 Z M 312.5 339.5 L 340.5 339.5 L 340.5 416.5 L 312.5 416.5 Z M 1349.5 339.5 L 1376.5 339.5 L 1376.5 416.5 L 1349.5 416.5 Z M 1270.5 339.5 L 1297.5 339.5 L 1297.5 416.5 L 1270.5 416.5 Z M 988.5 339.5 L 1015.5 339.5 L 1015.5 416.5 L 988.5 416.5 Z M 921.5 339.5 L 949.5 339.5 L 949.5 416.5 L 921.5 416.5 Z M 842.5 339.5 L 870.5 339.5 L 870.5 416.5 L 842.5 416.5 Z M 776.5 339.5 L 804.5 339.5 L 804.5 416.5 L 776.5 416.5 Z M 644.5 339.5 L 671.5 339.5 L 671.5 416.5 L 644.5 416.5 Z M 578.5 339.5 L 605.5 339.5 L 605.5 416.5 L 578.5 416.5 Z M 499.5 339.5 L 526.5 339.5 L 526.5 416.5 L 499.5 416.5 Z M 432.5 339.5 L 460.5 339.5 L 460.5 416.5 L 432.5 416.5 Z M 432.5 339.5 "/>
 </clipPath>
-<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image414"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 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="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image386"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface380">
+<g id="surface409">
 <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 1669.886719 331.042969 L 1684 351.5 L 1677.707031 351.5 L 1666.824219 334.871094 L 1655.882812 351.5 L 1649.703125 351.5 L 1663.816406 331.042969 L 1650.578125 311.625 L 1656.757812 311.625 L 1666.988281 327.269531 L 1677.269531 311.625 L 1683.34375 311.625 Z M 1669.886719 331.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 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/nand2/sky130_fd_sc_lp__nand2_0.svg b/cells/nand2/sky130_fd_sc_lp__nand2_0.svg
index 30695c1..f67d9cb 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_0.svg
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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="#image310"/>
+  <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 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="#image310"/>
+  <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 996.5 768.5 L 1031.5 768.5 L 1031.5 864.5 L 996.5 864.5 Z M 907.5 768.5 L 941.5 768.5 L 941.5 864.5 L 907.5 864.5 Z M 907.5 768.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <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 996.5 242.5 L 1031.5 242.5 L 1031.5 389.5 L 996.5 389.5 Z M 898.5 242.5 L 932.5 242.5 L 932.5 389.5 L 898.5 389.5 Z M 898.5 242.5 "/>
 </clipPath>
-<image id="image312" 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="#image312"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image313" 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="#image313"/>
+  <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="surface307">
+<g id="surface350">
 <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 875.441406 462.496094 L 875.304688 464.652344 L 874.96875 466.605469 L 874.363281 468.421875 L 873.554688 470.039062 L 872.480469 471.585938 L 871.199219 472.933594 L 869.785156 474.078125 L 868.304688 474.953125 L 866.621094 475.625 L 864.871094 476.164062 L 862.988281 476.433594 L 860.96875 476.5 L 838.820312 476.5 L 838.820312 427.421875 L 858.746094 427.421875 L 861.640625 427.625 L 864.199219 428.097656 L 866.488281 428.902344 L 868.441406 430.046875 L 870.121094 431.53125 L 871.46875 433.347656 L 872.007812 434.355469 L 872.480469 435.433594 L 872.816406 436.445312 L 873.085938 437.589844 L 873.21875 438.734375 L 873.285156 439.878906 L 873.085938 442.300781 L 872.480469 444.386719 L 871.535156 446.339844 L 870.191406 447.957031 L 868.507812 449.4375 L 866.488281 450.582031 L 868.441406 451.457031 L 870.121094 452.398438 L 871.605469 453.476562 L 872.816406 454.6875 L 873.757812 455.96875 L 874.5 457.3125 L 874.769531 458.121094 L 874.96875 458.929688 L 875.171875 459.738281 L 875.304688 460.679688 L 875.375 461.554688 Z M 867.027344 440.753906 L 866.824219 438.734375 L 866.21875 437.050781 L 865.277344 435.570312 L 863.929688 434.492188 L 862.246094 433.683594 L 860.160156 433.144531 L 859.6875 433.144531 L 859.214844 433.078125 L 858.746094 433.011719 L 857.667969 433.011719 L 857.195312 432.941406 L 845.078125 432.941406 L 845.078125 448.5625 L 857.195312 448.5625 L 859.6875 448.425781 L 861.84375 448.023438 L 863.660156 447.28125 L 865.007812 446.273438 L 866.082031 444.925781 L 866.757812 443.3125 L 866.824219 442.972656 L 866.957031 442.167969 L 866.957031 441.222656 Z M 860.359375 470.980469 L 862.246094 470.914062 L 863.929688 470.507812 L 865.410156 469.835938 L 866.621094 468.960938 L 867.632812 467.816406 L 868.441406 466.402344 L 868.640625 465.863281 L 868.777344 465.257812 L 868.976562 464.585938 L 869.046875 463.976562 L 869.113281 463.304688 L 869.179688 462.566406 L 869.046875 461.082031 L 868.777344 459.667969 L 868.304688 458.457031 L 867.632812 457.3125 L 866.757812 456.371094 L 865.746094 455.496094 L 865.007812 455.09375 L 864.199219 454.753906 L 863.324219 454.484375 L 862.378906 454.285156 L 861.371094 454.148438 L 860.359375 454.082031 L 845.078125 454.082031 L 845.078125 470.980469 Z M 860.359375 470.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 835 647 L 874 647 M 835 608 L 874 608 M 835 608 L 835 647 M 874 608 L 874 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 835 647 L 874 647 M 835 608 L 874 608 M 874 647 L 874 608 M 835 647 L 835 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/nand2/sky130_fd_sc_lp__nand2_1.svg b/cells/nand2/sky130_fd_sc_lp__nand2_1.svg
index a4d090b..0d9fc31 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_1.svg
+++ b/cells/nand2/sky130_fd_sc_lp__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 539.5 L 756.5 539.5 Z M 756.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="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="#image298"/>
+  <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 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="#image298"/>
+  <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 983.5 647.5 L 1017.5 647.5 L 1017.5 839.5 L 983.5 839.5 Z M 893.5 647.5 L 928.5 647.5 L 928.5 839.5 L 893.5 839.5 Z M 893.5 647.5 "/>
 </clipPath>
-<image id="image299" 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="#image299"/>
+  <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 992.5 209.5 L 1026.5 209.5 L 1026.5 498.5 L 992.5 498.5 Z M 893.5 209.5 L 928.5 209.5 L 928.5 498.5 L 893.5 498.5 Z M 893.5 209.5 "/>
 </clipPath>
-<image id="image300" 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="#image300"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image301" 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="#image301"/>
+  <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="surface295">
+<g id="surface338">
 <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 875.441406 547.496094 L 875.304688 549.652344 L 874.96875 551.605469 L 874.363281 553.421875 L 873.554688 555.039062 L 872.480469 556.585938 L 871.199219 557.933594 L 869.785156 559.078125 L 868.304688 559.953125 L 866.621094 560.625 L 864.871094 561.164062 L 862.988281 561.433594 L 860.96875 561.5 L 838.820312 561.5 L 838.820312 512.421875 L 858.746094 512.421875 L 861.640625 512.625 L 864.199219 513.097656 L 866.488281 513.902344 L 868.441406 515.046875 L 870.121094 516.53125 L 871.46875 518.347656 L 872.007812 519.355469 L 872.480469 520.433594 L 872.816406 521.445312 L 873.085938 522.589844 L 873.21875 523.734375 L 873.285156 524.878906 L 873.085938 527.300781 L 872.480469 529.386719 L 871.535156 531.339844 L 870.191406 532.957031 L 868.507812 534.4375 L 866.488281 535.582031 L 868.441406 536.457031 L 870.121094 537.398438 L 871.605469 538.476562 L 872.816406 539.6875 L 873.757812 540.96875 L 874.5 542.3125 L 874.769531 543.121094 L 874.96875 543.929688 L 875.171875 544.738281 L 875.304688 545.679688 L 875.375 546.554688 Z M 867.027344 525.753906 L 866.824219 523.734375 L 866.21875 522.050781 L 865.277344 520.570312 L 863.929688 519.492188 L 862.246094 518.683594 L 860.160156 518.144531 L 859.6875 518.144531 L 859.214844 518.078125 L 858.746094 518.011719 L 857.667969 518.011719 L 857.195312 517.941406 L 845.078125 517.941406 L 845.078125 533.5625 L 857.195312 533.5625 L 859.6875 533.425781 L 861.84375 533.023438 L 863.660156 532.28125 L 865.007812 531.273438 L 866.082031 529.925781 L 866.757812 528.3125 L 866.824219 527.972656 L 866.957031 527.167969 L 866.957031 526.222656 Z M 860.359375 555.980469 L 862.246094 555.914062 L 863.929688 555.507812 L 865.410156 554.835938 L 866.621094 553.960938 L 867.632812 552.816406 L 868.441406 551.402344 L 868.640625 550.863281 L 868.777344 550.257812 L 868.976562 549.585938 L 869.046875 548.976562 L 869.113281 548.304688 L 869.179688 547.566406 L 869.046875 546.082031 L 868.777344 544.667969 L 868.304688 543.457031 L 867.632812 542.3125 L 866.757812 541.371094 L 865.746094 540.496094 L 865.007812 540.09375 L 864.199219 539.753906 L 863.324219 539.484375 L 862.378906 539.285156 L 861.371094 539.148438 L 860.359375 539.082031 L 845.078125 539.082031 L 845.078125 555.980469 Z M 860.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 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/nand2/sky130_fd_sc_lp__nand2_2.svg b/cells/nand2/sky130_fd_sc_lp__nand2_2.svg
index 7996887..6e7e02f 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_2.svg
+++ b/cells/nand2/sky130_fd_sc_lp__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 539.5 L 644.5 539.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 1075.5 651.5 L 1110.5 651.5 L 1110.5 844.5 L 1075.5 844.5 Z M 780.5 651.5 L 814.5 651.5 L 814.5 844.5 L 780.5 844.5 Z M 878.5 651.5 L 913.5 651.5 L 913.5 844.5 L 878.5 844.5 Z M 977.5 651.5 L 1011.5 651.5 L 1011.5 844.5 L 977.5 844.5 Z M 977.5 651.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 1075.5 209.5 L 1110.5 209.5 L 1110.5 498.5 L 1075.5 498.5 Z M 780.5 209.5 L 814.5 209.5 L 814.5 498.5 L 780.5 498.5 Z M 878.5 209.5 L 913.5 209.5 L 913.5 498.5 L 878.5 498.5 Z M 977.5 209.5 L 1011.5 209.5 L 1011.5 498.5 L 977.5 498.5 Z M 977.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -149,6 +149,5 @@
 <path style=" 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.554688 542.246094 L 1187.554688 561.5 L 1181.292969 561.5 L 1181.292969 542.246094 L 1162.375 512.421875 L 1170.117188 512.421875 L 1184.523438 536.320312 L 1198.527344 512.421875 L 1206 512.421875 Z M 1187.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 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/nand2/sky130_fd_sc_lp__nand2_4.svg b/cells/nand2/sky130_fd_sc_lp__nand2_4.svg
index 2d09902..d4bfe28 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_4.svg
+++ b/cells/nand2/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1326.5 651.5 L 1361.5 651.5 L 1361.5 844.5 L 1326.5 844.5 Z M 600.5 651.5 L 634.5 651.5 L 634.5 844.5 L 600.5 844.5 Z M 698.5 651.5 L 733.5 651.5 L 733.5 844.5 L 698.5 844.5 Z M 797.5 651.5 L 831.5 651.5 L 831.5 844.5 L 797.5 844.5 Z M 895.5 651.5 L 930.5 651.5 L 930.5 844.5 L 895.5 844.5 Z M 994.5 651.5 L 1028.5 651.5 L 1028.5 844.5 L 994.5 844.5 Z M 1093.5 651.5 L 1127.5 651.5 L 1127.5 844.5 L 1093.5 844.5 Z M 1228.5 651.5 L 1262.5 651.5 L 1262.5 844.5 L 1228.5 844.5 Z M 1228.5 651.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1326.5 209.5 L 1361.5 209.5 L 1361.5 498.5 L 1326.5 498.5 Z M 600.5 209.5 L 634.5 209.5 L 634.5 498.5 L 600.5 498.5 Z M 698.5 209.5 L 733.5 209.5 L 733.5 498.5 L 698.5 498.5 Z M 797.5 209.5 L 831.5 209.5 L 831.5 498.5 L 797.5 498.5 Z M 895.5 209.5 L 930.5 209.5 L 930.5 498.5 L 895.5 498.5 Z M 994.5 209.5 L 1028.5 209.5 L 1028.5 498.5 L 994.5 498.5 Z M 1093.5 209.5 L 1127.5 209.5 L 1127.5 498.5 L 1093.5 498.5 Z M 1228.5 209.5 L 1262.5 209.5 L 1262.5 498.5 L 1228.5 498.5 Z M 1228.5 209.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/nand2/sky130_fd_sc_lp__nand2_8.svg b/cells/nand2/sky130_fd_sc_lp__nand2_8.svg
index 2a801cc..49a1f6a 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_8.svg
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.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 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="#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 1591.5 633.5 L 1621.5 633.5 L 1621.5 797.5 L 1591.5 797.5 Z M 289.5 633.5 L 318.5 633.5 L 318.5 797.5 L 289.5 797.5 Z M 373.5 633.5 L 402.5 633.5 L 402.5 797.5 L 373.5 797.5 Z M 456.5 633.5 L 486.5 633.5 L 486.5 797.5 L 456.5 797.5 Z M 540.5 633.5 L 569.5 633.5 L 569.5 797.5 L 540.5 797.5 Z M 624.5 633.5 L 653.5 633.5 L 653.5 797.5 L 624.5 797.5 Z M 708.5 633.5 L 737.5 633.5 L 737.5 797.5 L 708.5 797.5 Z M 791.5 633.5 L 820.5 633.5 L 820.5 797.5 L 791.5 797.5 Z M 875.5 633.5 L 904.5 633.5 L 904.5 797.5 L 875.5 797.5 Z M 959.5 633.5 L 988.5 633.5 L 988.5 797.5 L 959.5 797.5 Z M 1042.5 633.5 L 1072.5 633.5 L 1072.5 797.5 L 1042.5 797.5 Z M 1140.5 633.5 L 1169.5 633.5 L 1169.5 797.5 L 1140.5 797.5 Z M 1237.5 633.5 L 1266.5 633.5 L 1266.5 797.5 L 1237.5 797.5 Z M 1334.5 633.5 L 1364.5 633.5 L 1364.5 797.5 L 1334.5 797.5 Z M 1424.5 633.5 L 1453.5 633.5 L 1453.5 797.5 L 1424.5 797.5 Z M 1508.5 633.5 L 1537.5 633.5 L 1537.5 797.5 L 1508.5 797.5 Z M 1508.5 633.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 1591.5 258.5 L 1621.5 258.5 L 1621.5 503.5 L 1591.5 503.5 Z M 289.5 258.5 L 318.5 258.5 L 318.5 503.5 L 289.5 503.5 Z M 373.5 258.5 L 402.5 258.5 L 402.5 503.5 L 373.5 503.5 Z M 456.5 258.5 L 486.5 258.5 L 486.5 503.5 L 456.5 503.5 Z M 540.5 258.5 L 569.5 258.5 L 569.5 503.5 L 540.5 503.5 Z M 624.5 258.5 L 653.5 258.5 L 653.5 503.5 L 624.5 503.5 Z M 708.5 258.5 L 737.5 258.5 L 737.5 503.5 L 708.5 503.5 Z M 791.5 258.5 L 820.5 258.5 L 820.5 503.5 L 791.5 503.5 Z M 875.5 258.5 L 904.5 258.5 L 904.5 503.5 L 875.5 503.5 Z M 959.5 258.5 L 988.5 258.5 L 988.5 503.5 L 959.5 503.5 Z M 1042.5 258.5 L 1072.5 258.5 L 1072.5 503.5 L 1042.5 503.5 Z M 1140.5 258.5 L 1169.5 258.5 L 1169.5 503.5 L 1140.5 503.5 Z M 1237.5 258.5 L 1266.5 258.5 L 1266.5 503.5 L 1237.5 503.5 Z M 1334.5 258.5 L 1364.5 258.5 L 1364.5 503.5 L 1334.5 503.5 Z M 1424.5 258.5 L 1453.5 258.5 L 1453.5 503.5 L 1424.5 503.5 Z M 1508.5 258.5 L 1537.5 258.5 L 1537.5 503.5 L 1508.5 503.5 Z M 1508.5 258.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1009.753906 541.054688 L 1009.753906 557.5 L 1004.40625 557.5 L 1004.40625 541.054688 L 988.246094 515.578125 L 994.859375 515.578125 L 1007.167969 535.992188 L 1019.125 515.578125 L 1025.511719 515.578125 Z M 1009.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 989 560 L 1022 560 M 989 527 L 1022 527 M 989 527 L 989 560 M 1022 527 L 1022 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 989 560 L 1022 560 M 989 527 L 1022 527 M 1022 560 L 1022 527 M 989 560 L 989 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/nand2/sky130_fd_sc_lp__nand2_lp.svg b/cells/nand2/sky130_fd_sc_lp__nand2_lp.svg
index 05e0ed9..9c77c62 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp.svg
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.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="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 993.5 757.5 L 1027.5 757.5 L 1027.5 853.5 L 993.5 853.5 Z M 903.5 757.5 L 938.5 757.5 L 938.5 853.5 L 903.5 853.5 Z M 903.5 757.5 "/>
 </clipPath>
-<image id="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 903.5 243.5 L 938.5 243.5 L 938.5 339.5 L 903.5 339.5 Z M 1002.5 243.5 L 1036.5 243.5 L 1036.5 339.5 L 1002.5 339.5 Z M 903.5 401.5 L 938.5 401.5 L 938.5 498.5 L 903.5 498.5 Z M 1002.5 401.5 L 1036.5 401.5 L 1036.5 498.5 L 1002.5 498.5 Z M 1002.5 401.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface329">
 <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 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/nand2/sky130_fd_sc_lp__nand2_lp2.svg b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.svg
index 9df7af9..565d071 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_lp2.svg
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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 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="#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 972.5 757.5 L 1007.5 757.5 L 1007.5 853.5 L 972.5 853.5 Z M 883.5 757.5 L 917.5 757.5 L 917.5 853.5 L 883.5 853.5 Z M 883.5 757.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 981.5 220.5 L 1039.5 220.5 L 1039.5 449.5 L 981.5 449.5 Z M 860.5 220.5 L 917.5 220.5 L 917.5 449.5 L 860.5 449.5 Z M 860.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -149,6 +149,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1133.554688 796.246094 L 1133.554688 815.5 L 1127.292969 815.5 L 1127.292969 796.246094 L 1108.375 766.421875 L 1116.117188 766.421875 L 1130.523438 790.320312 L 1144.527344 766.421875 L 1152 766.421875 Z M 1133.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 1110 307 L 1149 307 M 1110 269 L 1149 269 M 1110 269 L 1110 307 M 1149 269 L 1149 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 1110 307 L 1149 307 M 1110 269 L 1149 269 M 1149 307 L 1149 269 M 1110 307 L 1110 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 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/nand2/sky130_fd_sc_lp__nand2_m.svg b/cells/nand2/sky130_fd_sc_lp__nand2_m.svg
index e71732e..37f887f 100644
--- a/cells/nand2/sky130_fd_sc_lp__nand2_m.svg
+++ b/cells/nand2/sky130_fd_sc_lp__nand2_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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="#image311"/>
+  <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 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="#image311"/>
+  <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 996.5 768.5 L 1031.5 768.5 L 1031.5 864.5 L 996.5 864.5 Z M 907.5 768.5 L 941.5 768.5 L 941.5 864.5 L 907.5 864.5 Z M 907.5 768.5 "/>
 </clipPath>
-<image id="image312" 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="#image312"/>
+  <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 996.5 292.5 L 1031.5 292.5 L 1031.5 389.5 L 996.5 389.5 Z M 898.5 292.5 L 932.5 292.5 L 932.5 389.5 L 898.5 389.5 Z M 898.5 292.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image314" 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="#image314"/>
+  <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="surface308">
+<g id="surface352">
 <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 875.441406 462.496094 L 875.304688 464.652344 L 874.96875 466.605469 L 874.363281 468.421875 L 873.554688 470.039062 L 872.480469 471.585938 L 871.199219 472.933594 L 869.785156 474.078125 L 868.304688 474.953125 L 866.621094 475.625 L 864.871094 476.164062 L 862.988281 476.433594 L 860.96875 476.5 L 838.820312 476.5 L 838.820312 427.421875 L 858.746094 427.421875 L 861.640625 427.625 L 864.199219 428.097656 L 866.488281 428.902344 L 868.441406 430.046875 L 870.121094 431.53125 L 871.46875 433.347656 L 872.007812 434.355469 L 872.480469 435.433594 L 872.816406 436.445312 L 873.085938 437.589844 L 873.21875 438.734375 L 873.285156 439.878906 L 873.085938 442.300781 L 872.480469 444.386719 L 871.535156 446.339844 L 870.191406 447.957031 L 868.507812 449.4375 L 866.488281 450.582031 L 868.441406 451.457031 L 870.121094 452.398438 L 871.605469 453.476562 L 872.816406 454.6875 L 873.757812 455.96875 L 874.5 457.3125 L 874.769531 458.121094 L 874.96875 458.929688 L 875.171875 459.738281 L 875.304688 460.679688 L 875.375 461.554688 Z M 867.027344 440.753906 L 866.824219 438.734375 L 866.21875 437.050781 L 865.277344 435.570312 L 863.929688 434.492188 L 862.246094 433.683594 L 860.160156 433.144531 L 859.6875 433.144531 L 859.214844 433.078125 L 858.746094 433.011719 L 857.667969 433.011719 L 857.195312 432.941406 L 845.078125 432.941406 L 845.078125 448.5625 L 857.195312 448.5625 L 859.6875 448.425781 L 861.84375 448.023438 L 863.660156 447.28125 L 865.007812 446.273438 L 866.082031 444.925781 L 866.757812 443.3125 L 866.824219 442.972656 L 866.957031 442.167969 L 866.957031 441.222656 Z M 860.359375 470.980469 L 862.246094 470.914062 L 863.929688 470.507812 L 865.410156 469.835938 L 866.621094 468.960938 L 867.632812 467.816406 L 868.441406 466.402344 L 868.640625 465.863281 L 868.777344 465.257812 L 868.976562 464.585938 L 869.046875 463.976562 L 869.113281 463.304688 L 869.179688 462.566406 L 869.046875 461.082031 L 868.777344 459.667969 L 868.304688 458.457031 L 867.632812 457.3125 L 866.757812 456.371094 L 865.746094 455.496094 L 865.007812 455.09375 L 864.199219 454.753906 L 863.324219 454.484375 L 862.378906 454.285156 L 861.371094 454.148438 L 860.359375 454.082031 L 845.078125 454.082031 L 845.078125 470.980469 Z M 860.359375 470.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 835 647 L 874 647 M 835 608 L 874 608 M 835 608 L 835 647 M 874 608 L 874 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 835 647 L 874 647 M 835 608 L 874 608 M 874 647 L 874 608 M 835 647 L 835 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/nand2b/sky130_fd_sc_lp__nand2b_1.svg b/cells/nand2b/sky130_fd_sc_lp__nand2b_1.svg
index 9f8b265..2d0cd21 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_1.svg
+++ b/cells/nand2b/sky130_fd_sc_lp__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 539.5 L 644.5 539.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 1044.5 672.5 L 1079.5 672.5 L 1079.5 864.5 L 1044.5 864.5 Z M 845.5 768.5 L 879.5 768.5 L 879.5 864.5 L 845.5 864.5 Z M 962.5 672.5 L 996.5 672.5 L 996.5 864.5 L 962.5 864.5 Z M 962.5 672.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 1013.5 209.5 L 1048.5 209.5 L 1048.5 498.5 L 1013.5 498.5 Z M 795.5 401.5 L 829.5 401.5 L 829.5 498.5 L 795.5 498.5 Z M 915.5 209.5 L 949.5 209.5 L 949.5 498.5 L 915.5 498.5 Z M 915.5 209.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 807.1875 596.574219 L 807.1875 645.652344 L 800.121094 645.652344 L 774.738281 605.863281 L 774.738281 645.652344 L 768.816406 645.652344 L 768.816406 596.574219 L 775.613281 596.574219 L 801.265625 636.699219 L 801.265625 596.574219 Z M 807.1875 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 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/nand2b/sky130_fd_sc_lp__nand2b_2.svg b/cells/nand2b/sky130_fd_sc_lp__nand2b_2.svg
index ccabac5..2f817ac 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_2.svg
+++ b/cells/nand2b/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.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 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="#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 669.5 672.5 L 703.5 672.5 L 703.5 768.5 L 669.5 768.5 Z M 1020.5 672.5 L 1055.5 672.5 L 1055.5 864.5 L 1020.5 864.5 Z M 805.5 672.5 L 839.5 672.5 L 839.5 864.5 L 805.5 864.5 Z M 914.5 672.5 L 948.5 672.5 L 948.5 864.5 L 914.5 864.5 Z M 1119.5 672.5 L 1153.5 672.5 L 1153.5 864.5 L 1119.5 864.5 Z M 1119.5 672.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 1020.5 209.5 L 1055.5 209.5 L 1055.5 498.5 L 1020.5 498.5 Z M 703.5 401.5 L 737.5 401.5 L 737.5 498.5 L 703.5 498.5 Z M 1119.5 209.5 L 1153.5 209.5 L 1153.5 498.5 L 1119.5 498.5 Z M 922.5 209.5 L 956.5 209.5 L 956.5 498.5 L 922.5 498.5 Z M 823.5 209.5 L 858.5 209.5 L 858.5 498.5 L 823.5 498.5 Z M 823.5 209.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image290" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface284">
+<g id="surface313">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -151,6 +151,5 @@
 <path style=" 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 632.496094 L 873.304688 634.652344 L 872.96875 636.605469 L 872.363281 638.421875 L 871.554688 640.039062 L 870.480469 641.585938 L 869.199219 642.933594 L 867.785156 644.078125 L 866.304688 644.953125 L 864.621094 645.625 L 862.871094 646.164062 L 860.988281 646.433594 L 858.96875 646.5 L 836.820312 646.5 L 836.820312 597.421875 L 856.746094 597.421875 L 859.640625 597.625 L 862.199219 598.097656 L 864.488281 598.902344 L 866.441406 600.046875 L 868.121094 601.53125 L 869.46875 603.347656 L 870.007812 604.355469 L 870.480469 605.433594 L 870.816406 606.445312 L 871.085938 607.589844 L 871.21875 608.734375 L 871.285156 609.878906 L 871.085938 612.300781 L 870.480469 614.386719 L 869.535156 616.339844 L 868.191406 617.957031 L 866.507812 619.4375 L 864.488281 620.582031 L 866.441406 621.457031 L 868.121094 622.398438 L 869.605469 623.476562 L 870.816406 624.6875 L 871.757812 625.96875 L 872.5 627.3125 L 872.769531 628.121094 L 872.96875 628.929688 L 873.171875 629.738281 L 873.304688 630.679688 L 873.375 631.554688 Z M 865.027344 610.753906 L 864.824219 608.734375 L 864.21875 607.050781 L 863.277344 605.570312 L 861.929688 604.492188 L 860.246094 603.683594 L 858.160156 603.144531 L 857.6875 603.144531 L 857.214844 603.078125 L 856.746094 603.011719 L 855.667969 603.011719 L 855.195312 602.941406 L 843.078125 602.941406 L 843.078125 618.5625 L 855.195312 618.5625 L 857.6875 618.425781 L 859.84375 618.023438 L 861.660156 617.28125 L 863.007812 616.273438 L 864.082031 614.925781 L 864.757812 613.3125 L 864.824219 612.972656 L 864.957031 612.167969 L 864.957031 611.222656 Z M 858.359375 640.980469 L 860.246094 640.914062 L 861.929688 640.507812 L 863.410156 639.835938 L 864.621094 638.960938 L 865.632812 637.816406 L 866.441406 636.402344 L 866.640625 635.863281 L 866.777344 635.257812 L 866.976562 634.585938 L 867.046875 633.976562 L 867.113281 633.304688 L 867.179688 632.566406 L 867.046875 631.082031 L 866.777344 629.667969 L 866.304688 628.457031 L 865.632812 627.3125 L 864.757812 626.371094 L 863.746094 625.496094 L 863.007812 625.09375 L 862.199219 624.753906 L 861.324219 624.484375 L 860.378906 624.285156 L 859.371094 624.148438 L 858.359375 624.082031 L 843.078125 624.082031 L 843.078125 640.980469 Z M 858.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 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 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_lp__nand2b_4.svg b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.svg
index a1d7ac6..e049b0b 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_4.svg
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.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="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image294"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#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 1190.5 651.5 L 1224.5 651.5 L 1224.5 844.5 L 1190.5 844.5 Z M 665.5 651.5 L 699.5 651.5 L 699.5 844.5 L 665.5 844.5 Z M 878.5 651.5 L 913.5 651.5 L 913.5 844.5 L 878.5 844.5 Z M 1387.5 651.5 L 1421.5 651.5 L 1421.5 844.5 L 1387.5 844.5 Z M 1091.5 651.5 L 1126.5 651.5 L 1126.5 844.5 L 1091.5 844.5 Z M 993.5 651.5 L 1027.5 651.5 L 1027.5 844.5 L 993.5 844.5 Z M 1289.5 651.5 L 1323.5 651.5 L 1323.5 844.5 L 1289.5 844.5 Z M 764.5 651.5 L 798.5 651.5 L 798.5 844.5 L 764.5 844.5 Z M 447.5 667.5 L 482.5 667.5 L 482.5 860.5 L 447.5 860.5 Z M 447.5 667.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image325"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1401.5 209.5 L 1435.5 209.5 L 1435.5 498.5 L 1401.5 498.5 Z M 447.5 209.5 L 482.5 209.5 L 482.5 498.5 L 447.5 498.5 Z M 647.5 209.5 L 681.5 209.5 L 681.5 498.5 L 647.5 498.5 Z M 745.5 209.5 L 780.5 209.5 L 780.5 498.5 L 745.5 498.5 Z M 862.5 209.5 L 897.5 209.5 L 897.5 498.5 L 862.5 498.5 Z M 961.5 209.5 L 995.5 209.5 L 995.5 498.5 L 961.5 498.5 Z M 1091.5 209.5 L 1126.5 209.5 L 1126.5 498.5 L 1091.5 498.5 Z M 1204.5 209.5 L 1238.5 209.5 L 1238.5 498.5 L 1204.5 498.5 Z M 1302.5 209.5 L 1337.5 209.5 L 1337.5 498.5 L 1302.5 498.5 Z M 1302.5 209.5 "/>
 </clipPath>
-<image id="image296" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image296"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface291">
+<g id="surface321">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1185.554688 457.246094 L 1185.554688 476.5 L 1179.292969 476.5 L 1179.292969 457.246094 L 1160.375 427.421875 L 1168.117188 427.421875 L 1182.523438 451.320312 L 1196.527344 427.421875 L 1204 427.421875 Z M 1185.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 1161 647 L 1200 647 M 1161 608 L 1200 608 M 1161 608 L 1161 647 M 1200 608 L 1200 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 1161 647 L 1200 647 M 1161 608 L 1200 608 M 1200 647 L 1200 608 M 1161 647 L 1161 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/nand2b/sky130_fd_sc_lp__nand2b_lp.svg b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.svg
index 629c2a0..7fada8a 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.svg
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1060.5 763.5 L 1095.5 763.5 L 1095.5 860.5 L 1060.5 860.5 Z M 790.5 763.5 L 824.5 763.5 L 824.5 860.5 L 790.5 860.5 Z M 873.5 763.5 L 907.5 763.5 L 907.5 860.5 L 873.5 860.5 Z M 971.5 763.5 L 1005.5 763.5 L 1005.5 860.5 L 971.5 860.5 Z M 971.5 763.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 1060.5 209.5 L 1118.5 209.5 L 1118.5 438.5 L 1060.5 438.5 Z M 818.5 209.5 L 875.5 209.5 L 875.5 438.5 L 818.5 438.5 Z M 939.5 209.5 L 996.5 209.5 L 996.5 438.5 L 939.5 438.5 Z M 939.5 209.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -148,6 +148,5 @@
 <path style=" 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.554688 457.246094 L 1187.554688 476.5 L 1181.292969 476.5 L 1181.292969 457.246094 L 1162.375 427.421875 L 1170.117188 427.421875 L 1184.523438 451.320312 L 1198.527344 427.421875 L 1206 427.421875 Z M 1187.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 1164 647 L 1203 647 M 1164 608 L 1203 608 M 1164 608 L 1164 647 M 1203 608 L 1203 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 1164 647 L 1203 647 M 1164 608 L 1203 608 M 1203 647 L 1203 608 M 1164 647 L 1164 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/nand2b/sky130_fd_sc_lp__nand2b_m.svg b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.svg
index e2129dd..9e6e7d9 100644
--- a/cells/nand2b/sky130_fd_sc_lp__nand2b_m.svg
+++ b/cells/nand2b/sky130_fd_sc_lp__nand2b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image336"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1059.5 760.5 L 1094.5 760.5 L 1094.5 856.5 L 1059.5 856.5 Z M 801.5 760.5 L 836.5 760.5 L 836.5 856.5 L 801.5 856.5 Z M 977.5 760.5 L 1011.5 760.5 L 1011.5 856.5 L 977.5 856.5 Z M 977.5 760.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1050.5 212.5 L 1085.5 212.5 L 1085.5 309.5 L 1050.5 309.5 Z M 853.5 212.5 L 887.5 212.5 L 887.5 309.5 L 853.5 309.5 Z M 952.5 212.5 L 986.5 212.5 L 986.5 309.5 L 952.5 309.5 Z M 952.5 212.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface333">
+<g id="surface362">
 <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 1187.554688 372.246094 L 1187.554688 391.5 L 1181.292969 391.5 L 1181.292969 372.246094 L 1162.375 342.421875 L 1170.117188 342.421875 L 1184.523438 366.320312 L 1198.527344 342.421875 L 1206 342.421875 Z M 1187.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 1164 731 L 1203 731 M 1164 693 L 1203 693 M 1164 693 L 1164 731 M 1203 693 L 1203 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 1164 731 L 1203 731 M 1164 693 L 1203 693 M 1203 731 L 1203 693 M 1164 731 L 1164 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 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_lp__nand3_0.svg b/cells/nand3/sky130_fd_sc_lp__nand3_0.svg
index 73a018e..4e843fc 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_0.svg
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image303"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1023.5 768.5 L 1057.5 768.5 L 1057.5 864.5 L 1023.5 864.5 Z M 844.5 768.5 L 878.5 768.5 L 878.5 864.5 L 844.5 864.5 Z M 933.5 768.5 L 968.5 768.5 L 968.5 864.5 L 933.5 864.5 Z M 933.5 768.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1039.5 242.5 L 1073.5 242.5 L 1073.5 389.5 L 1039.5 389.5 Z M 842.5 242.5 L 876.5 242.5 L 876.5 389.5 L 842.5 389.5 Z M 940.5 242.5 L 975.5 242.5 L 975.5 389.5 L 940.5 389.5 Z M 940.5 242.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface300">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1133.554688 457.246094 L 1133.554688 476.5 L 1127.292969 476.5 L 1127.292969 457.246094 L 1108.375 427.421875 L 1116.117188 427.421875 L 1130.523438 451.320312 L 1144.527344 427.421875 L 1152 427.421875 Z M 1133.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 1110 647 L 1149 647 M 1110 608 L 1149 608 M 1110 608 L 1110 647 M 1149 608 L 1149 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 1110 647 L 1149 647 M 1110 608 L 1149 608 M 1149 647 L 1149 608 M 1110 647 L 1110 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/nand3/sky130_fd_sc_lp__nand3_1.svg b/cells/nand3/sky130_fd_sc_lp__nand3_1.svg
index ff859ce..c14a8eb 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_1.svg
+++ b/cells/nand3/sky130_fd_sc_lp__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 539.5 L 644.5 539.5 Z M 644.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 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="#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 1035.5 639.5 L 1070.5 639.5 L 1070.5 831.5 L 1035.5 831.5 Z M 815.5 639.5 L 850.5 639.5 L 850.5 831.5 L 815.5 831.5 Z M 905.5 639.5 L 939.5 639.5 L 939.5 831.5 L 905.5 831.5 Z M 905.5 639.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 1035.5 209.5 L 1070.5 209.5 L 1070.5 498.5 L 1035.5 498.5 Z M 815.5 209.5 L 850.5 209.5 L 850.5 498.5 L 815.5 498.5 Z M 914.5 209.5 L 948.5 209.5 L 948.5 498.5 L 914.5 498.5 Z M 914.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 834.730469 536.984375 L 834.796875 534.292969 L 835.066406 531.667969 L 835.539062 529.175781 L 836.144531 526.753906 L 836.953125 524.464844 L 838.03125 522.242188 L 839.714844 519.347656 L 841.800781 516.855469 L 844.15625 514.835938 L 846.847656 513.222656 L 849.8125 512.078125 L 853.175781 511.335938 L 853.785156 511.269531 L 854.457031 511.203125 L 855.0625 511.132812 L 856.410156 511.132812 L 857.148438 511.066406 L 861.457031 511.402344 L 865.226562 512.414062 L 868.460938 514.027344 L 871.152344 516.316406 L 873.304688 519.210938 L 874.988281 522.78125 L 875.394531 524.125 L 875.59375 524.867188 L 875.730469 525.609375 L 875.863281 526.347656 L 876.066406 527.089844 L 869.671875 527.089844 L 868.996094 524.734375 L 868.121094 522.714844 L 867.046875 520.960938 L 865.632812 519.480469 L 864.082031 518.335938 L 862.265625 517.460938 L 861.390625 517.191406 L 860.449219 516.992188 L 859.503906 516.855469 L 858.496094 516.722656 L 857.484375 516.652344 L 856.410156 516.585938 L 854.050781 516.789062 L 851.898438 517.261719 L 849.878906 518 L 848.0625 519.144531 L 846.378906 520.558594 L 844.964844 522.242188 L 843.753906 524.195312 L 842.742188 526.347656 L 841.933594 528.703125 L 841.394531 531.261719 L 841.058594 534.023438 L 840.992188 536.917969 L 841.058594 540.082031 L 841.464844 542.910156 L 842.136719 545.601562 L 843.078125 547.957031 L 844.292969 550.179688 L 845.773438 552.066406 L 847.253906 553.613281 L 848.867188 554.824219 L 850.621094 555.769531 L 852.570312 556.441406 L 854.660156 556.84375 L 856.949219 556.980469 L 859.371094 556.84375 L 861.59375 556.375 L 863.613281 555.566406 L 865.296875 554.421875 L 866.777344 552.941406 L 868.054688 551.121094 L 868.59375 550.046875 L 869.066406 548.832031 L 869.535156 547.554688 L 869.941406 546.140625 L 870.277344 544.660156 L 870.613281 543.042969 L 877.078125 543.042969 L 875.863281 549.035156 L 873.84375 553.882812 L 870.882812 557.652344 L 867.113281 560.347656 L 862.402344 561.894531 L 856.878906 562.5 L 852.976562 562.230469 L 849.476562 561.421875 L 846.3125 560.210938 L 843.484375 558.394531 L 840.992188 556.039062 L 838.90625 553.140625 L 837.695312 551.054688 L 836.683594 548.765625 L 835.875 546.34375 L 835.269531 543.785156 L 834.867188 541.09375 L 834.730469 538.265625 Z M 834.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 834 562 L 873 562 M 834 523 L 873 523 M 834 523 L 834 562 M 873 523 L 873 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 834 562 L 873 562 M 834 523 L 873 523 M 873 562 L 873 523 M 834 562 L 834 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/nand3/sky130_fd_sc_lp__nand3_2.svg b/cells/nand3/sky130_fd_sc_lp__nand3_2.svg
index 67191b8..bc0ec81 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_2.svg
+++ b/cells/nand3/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.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 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="#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 1216.5 651.5 L 1251.5 651.5 L 1251.5 844.5 L 1216.5 844.5 Z M 687.5 651.5 L 721.5 651.5 L 721.5 844.5 L 687.5 844.5 Z M 785.5 651.5 L 820.5 651.5 L 820.5 844.5 L 785.5 844.5 Z M 884.5 651.5 L 918.5 651.5 L 918.5 844.5 L 884.5 844.5 Z M 992.5 651.5 L 1026.5 651.5 L 1026.5 844.5 L 992.5 844.5 Z M 1118.5 651.5 L 1152.5 651.5 L 1152.5 844.5 L 1118.5 844.5 Z M 1118.5 651.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 1200.5 209.5 L 1235.5 209.5 L 1235.5 498.5 L 1200.5 498.5 Z M 687.5 209.5 L 721.5 209.5 L 721.5 498.5 L 687.5 498.5 Z M 785.5 209.5 L 820.5 209.5 L 820.5 498.5 L 785.5 498.5 Z M 893.5 209.5 L 928.5 209.5 L 928.5 498.5 L 893.5 498.5 Z M 992.5 209.5 L 1026.5 209.5 L 1026.5 498.5 L 992.5 498.5 Z M 1102.5 209.5 L 1136.5 209.5 L 1136.5 498.5 L 1102.5 498.5 Z M 1102.5 209.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" 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/nand3/sky130_fd_sc_lp__nand3_4.svg b/cells/nand3/sky130_fd_sc_lp__nand3_4.svg
index eaca415..b29106f 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_4.svg
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 256.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 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="#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 1494.5 660.5 L 1528.5 660.5 L 1528.5 853.5 L 1494.5 853.5 Z M 398.5 660.5 L 432.5 660.5 L 432.5 853.5 L 398.5 853.5 Z M 497.5 660.5 L 531.5 660.5 L 531.5 853.5 L 497.5 853.5 Z M 595.5 660.5 L 630.5 660.5 L 630.5 853.5 L 595.5 853.5 Z M 694.5 660.5 L 728.5 660.5 L 728.5 853.5 L 694.5 853.5 Z M 792.5 660.5 L 827.5 660.5 L 827.5 853.5 L 792.5 853.5 Z M 891.5 660.5 L 925.5 660.5 L 925.5 853.5 L 891.5 853.5 Z M 994.5 660.5 L 1028.5 660.5 L 1028.5 853.5 L 994.5 853.5 Z M 1099.5 660.5 L 1134.5 660.5 L 1134.5 853.5 L 1099.5 853.5 Z M 1198.5 660.5 L 1232.5 660.5 L 1232.5 853.5 L 1198.5 853.5 Z M 1297.5 660.5 L 1331.5 660.5 L 1331.5 853.5 L 1297.5 853.5 Z M 1395.5 660.5 L 1429.5 660.5 L 1429.5 853.5 L 1395.5 853.5 Z M 1395.5 660.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 1494.5 209.5 L 1528.5 209.5 L 1528.5 498.5 L 1494.5 498.5 Z M 403.5 209.5 L 437.5 209.5 L 437.5 498.5 L 403.5 498.5 Z M 501.5 209.5 L 536.5 209.5 L 536.5 498.5 L 501.5 498.5 Z M 600.5 209.5 L 634.5 209.5 L 634.5 498.5 L 600.5 498.5 Z M 698.5 209.5 L 733.5 209.5 L 733.5 498.5 L 698.5 498.5 Z M 797.5 209.5 L 831.5 209.5 L 831.5 498.5 L 797.5 498.5 Z M 895.5 209.5 L 930.5 209.5 L 930.5 498.5 L 895.5 498.5 Z M 994.5 209.5 L 1028.5 209.5 L 1028.5 498.5 L 994.5 498.5 Z M 1093.5 209.5 L 1127.5 209.5 L 1127.5 498.5 L 1093.5 498.5 Z M 1198.5 209.5 L 1232.5 209.5 L 1232.5 498.5 L 1198.5 498.5 Z M 1297.5 209.5 L 1331.5 209.5 L 1331.5 498.5 L 1297.5 498.5 Z M 1395.5 209.5 L 1429.5 209.5 L 1429.5 498.5 L 1395.5 498.5 Z M 1395.5 209.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/nand3/sky130_fd_sc_lp__nand3_lp.svg b/cells/nand3/sky130_fd_sc_lp__nand3_lp.svg
index eb401e7..dbe12b1 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_lp.svg
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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="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="#image291"/>
+  <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 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="#image291"/>
+  <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 1051.5 768.5 L 1086.5 768.5 L 1086.5 864.5 L 1051.5 864.5 Z M 831.5 768.5 L 866.5 768.5 L 866.5 864.5 L 831.5 864.5 Z M 921.5 768.5 L 955.5 768.5 L 955.5 864.5 L 921.5 864.5 Z M 921.5 768.5 "/>
 </clipPath>
-<image id="image292" 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="#image292"/>
+  <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 1051.5 220.5 L 1109.5 220.5 L 1109.5 449.5 L 1051.5 449.5 Z M 808.5 220.5 L 866.5 220.5 L 866.5 449.5 L 808.5 449.5 Z M 930.5 220.5 L 987.5 220.5 L 987.5 449.5 L 930.5 449.5 Z M 930.5 220.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image294" 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="#image294"/>
+  <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="surface288">
+<g id="surface315">
 <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 984.441406 632.496094 L 984.304688 634.652344 L 983.96875 636.605469 L 983.363281 638.421875 L 982.554688 640.039062 L 981.480469 641.585938 L 980.199219 642.933594 L 978.785156 644.078125 L 977.304688 644.953125 L 975.621094 645.625 L 973.871094 646.164062 L 971.988281 646.433594 L 969.96875 646.5 L 947.820312 646.5 L 947.820312 597.421875 L 967.746094 597.421875 L 970.640625 597.625 L 973.199219 598.097656 L 975.488281 598.902344 L 977.441406 600.046875 L 979.121094 601.53125 L 980.46875 603.347656 L 981.007812 604.355469 L 981.480469 605.433594 L 981.816406 606.445312 L 982.085938 607.589844 L 982.21875 608.734375 L 982.285156 609.878906 L 982.085938 612.300781 L 981.480469 614.386719 L 980.535156 616.339844 L 979.191406 617.957031 L 977.507812 619.4375 L 975.488281 620.582031 L 977.441406 621.457031 L 979.121094 622.398438 L 980.605469 623.476562 L 981.816406 624.6875 L 982.757812 625.96875 L 983.5 627.3125 L 983.769531 628.121094 L 983.96875 628.929688 L 984.171875 629.738281 L 984.304688 630.679688 L 984.375 631.554688 Z M 976.027344 610.753906 L 975.824219 608.734375 L 975.21875 607.050781 L 974.277344 605.570312 L 972.929688 604.492188 L 971.246094 603.683594 L 969.160156 603.144531 L 968.6875 603.144531 L 968.214844 603.078125 L 967.746094 603.011719 L 966.667969 603.011719 L 966.195312 602.941406 L 954.078125 602.941406 L 954.078125 618.5625 L 966.195312 618.5625 L 968.6875 618.425781 L 970.84375 618.023438 L 972.660156 617.28125 L 974.007812 616.273438 L 975.082031 614.925781 L 975.757812 613.3125 L 975.824219 612.972656 L 975.957031 612.167969 L 975.957031 611.222656 Z M 969.359375 640.980469 L 971.246094 640.914062 L 972.929688 640.507812 L 974.410156 639.835938 L 975.621094 638.960938 L 976.632812 637.816406 L 977.441406 636.402344 L 977.640625 635.863281 L 977.777344 635.257812 L 977.976562 634.585938 L 978.046875 633.976562 L 978.113281 633.304688 L 978.179688 632.566406 L 978.046875 631.082031 L 977.777344 629.667969 L 977.304688 628.457031 L 976.632812 627.3125 L 975.757812 626.371094 L 974.746094 625.496094 L 974.007812 625.09375 L 973.199219 624.753906 L 972.324219 624.484375 L 971.378906 624.285156 L 970.371094 624.148438 L 969.359375 624.082031 L 954.078125 624.082031 L 954.078125 640.980469 Z M 969.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 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/nand3/sky130_fd_sc_lp__nand3_m.svg b/cells/nand3/sky130_fd_sc_lp__nand3_m.svg
index f760fb1..0b49b1f 100644
--- a/cells/nand3/sky130_fd_sc_lp__nand3_m.svg
+++ b/cells/nand3/sky130_fd_sc_lp__nand3_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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="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 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="#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 1023.5 768.5 L 1057.5 768.5 L 1057.5 864.5 L 1023.5 864.5 Z M 844.5 768.5 L 878.5 768.5 L 878.5 864.5 L 844.5 864.5 Z M 933.5 768.5 L 968.5 768.5 L 968.5 864.5 L 933.5 864.5 Z M 933.5 768.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 1039.5 292.5 L 1073.5 292.5 L 1073.5 389.5 L 1039.5 389.5 Z M 842.5 292.5 L 876.5 292.5 L 876.5 389.5 L 842.5 389.5 Z M 940.5 292.5 L 975.5 292.5 L 975.5 389.5 L 940.5 389.5 Z M 940.5 292.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1133.554688 457.246094 L 1133.554688 476.5 L 1127.292969 476.5 L 1127.292969 457.246094 L 1108.375 427.421875 L 1116.117188 427.421875 L 1130.523438 451.320312 L 1144.527344 427.421875 L 1152 427.421875 Z M 1133.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 1110 647 L 1149 647 M 1110 608 L 1149 608 M 1110 608 L 1110 647 M 1149 608 L 1149 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 1110 647 L 1149 647 M 1110 608 L 1149 608 M 1149 647 L 1149 608 M 1110 647 L 1110 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/nand3b/sky130_fd_sc_lp__nand3b_1.svg b/cells/nand3b/sky130_fd_sc_lp__nand3b_1.svg
index 6443fa6..0dbcef1 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_1.svg
+++ b/cells/nand3b/sky130_fd_sc_lp__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 539.5 L 589.5 539.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 790.5 672.5 L 824.5 672.5 L 824.5 768.5 L 790.5 768.5 Z M 1018.5 672.5 L 1052.5 672.5 L 1052.5 864.5 L 1018.5 864.5 Z M 914.5 672.5 L 948.5 672.5 L 948.5 864.5 L 914.5 864.5 Z M 1120.5 672.5 L 1154.5 672.5 L 1154.5 864.5 L 1120.5 864.5 Z M 1120.5 672.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 1120.5 209.5 L 1154.5 209.5 L 1154.5 498.5 L 1120.5 498.5 Z M 790.5 401.5 L 824.5 401.5 L 824.5 498.5 L 790.5 498.5 Z M 1012.5 209.5 L 1047.5 209.5 L 1047.5 498.5 L 1012.5 498.5 Z M 914.5 209.5 L 948.5 209.5 L 948.5 498.5 L 914.5 498.5 Z M 914.5 209.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1242.554688 288.246094 L 1242.554688 307.5 L 1236.292969 307.5 L 1236.292969 288.246094 L 1217.375 258.421875 L 1225.117188 258.421875 L 1239.523438 282.320312 L 1253.527344 258.421875 L 1261 258.421875 Z M 1242.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 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/nand3b/sky130_fd_sc_lp__nand3b_2.svg b/cells/nand3b/sky130_fd_sc_lp__nand3b_2.svg
index 96a0bfb..00fe802 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_2.svg
+++ b/cells/nand3b/sky130_fd_sc_lp__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 539.5 L 423.5 539.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 591.5 644.5 L 625.5 644.5 L 625.5 741.5 L 591.5 741.5 Z M 1072.5 644.5 L 1106.5 644.5 L 1106.5 837.5 L 1072.5 837.5 Z M 714.5 644.5 L 749.5 644.5 L 749.5 837.5 L 714.5 837.5 Z M 813.5 644.5 L 847.5 644.5 L 847.5 837.5 L 813.5 837.5 Z M 930.5 644.5 L 964.5 644.5 L 964.5 837.5 L 930.5 837.5 Z M 1278.5 644.5 L 1313.5 644.5 L 1313.5 837.5 L 1278.5 837.5 Z M 1170.5 644.5 L 1205.5 644.5 L 1205.5 837.5 L 1170.5 837.5 Z M 1170.5 644.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 1180.5 209.5 L 1214.5 209.5 L 1214.5 498.5 L 1180.5 498.5 Z M 591.5 401.5 L 625.5 401.5 L 625.5 498.5 L 591.5 498.5 Z M 1278.5 209.5 L 1313.5 209.5 L 1313.5 498.5 L 1278.5 498.5 Z M 1051.5 209.5 L 1086.5 209.5 L 1086.5 498.5 L 1051.5 498.5 Z M 953.5 209.5 L 987.5 209.5 L 987.5 498.5 L 953.5 498.5 Z M 818.5 209.5 L 852.5 209.5 L 852.5 498.5 L 818.5 498.5 Z M 719.5 209.5 L 753.5 209.5 L 753.5 498.5 L 719.5 498.5 Z M 719.5 209.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1406.554688 372.246094 L 1406.554688 391.5 L 1400.292969 391.5 L 1400.292969 372.246094 L 1381.375 342.421875 L 1389.117188 342.421875 L 1403.523438 366.320312 L 1417.527344 342.421875 L 1425 342.421875 Z M 1406.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 1382 731 L 1421 731 M 1382 693 L 1421 693 M 1382 693 L 1382 731 M 1421 693 L 1421 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 1382 731 L 1421 731 M 1382 693 L 1421 693 M 1421 731 L 1421 693 M 1382 731 L 1382 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 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_lp__nand3b_4.svg b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.svg
index 7d840d3..e785099 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_4.svg
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 538.5 L 174.5 538.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="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 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="#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 305.5 630.5 L 336.5 630.5 L 336.5 804.5 L 305.5 804.5 Z M 1589.5 658.5 L 1620.5 658.5 L 1620.5 832.5 L 1589.5 832.5 Z M 1500.5 658.5 L 1531.5 658.5 L 1531.5 832.5 L 1500.5 832.5 Z M 1411.5 658.5 L 1442.5 658.5 L 1442.5 832.5 L 1411.5 832.5 Z M 1322.5 658.5 L 1353.5 658.5 L 1353.5 832.5 L 1322.5 832.5 Z M 1125.5 658.5 L 1156.5 658.5 L 1156.5 832.5 L 1125.5 832.5 Z M 1036.5 658.5 L 1067.5 658.5 L 1067.5 832.5 L 1036.5 832.5 Z M 947.5 658.5 L 978.5 658.5 L 978.5 832.5 L 947.5 832.5 Z M 858.5 658.5 L 889.5 658.5 L 889.5 832.5 L 858.5 832.5 Z M 769.5 658.5 L 800.5 658.5 L 800.5 832.5 L 769.5 832.5 Z M 680.5 658.5 L 711.5 658.5 L 711.5 832.5 L 680.5 832.5 Z M 591.5 658.5 L 622.5 658.5 L 622.5 832.5 L 591.5 832.5 Z M 502.5 658.5 L 533.5 658.5 L 533.5 832.5 L 502.5 832.5 Z M 502.5 658.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 1505.5 240.5 L 1536.5 240.5 L 1536.5 501.5 L 1505.5 501.5 Z M 362.5 240.5 L 393.5 240.5 L 393.5 501.5 L 362.5 501.5 Z M 464.5 240.5 L 495.5 240.5 L 495.5 501.5 L 464.5 501.5 Z M 553.5 240.5 L 584.5 240.5 L 584.5 501.5 L 553.5 501.5 Z M 642.5 240.5 L 673.5 240.5 L 673.5 501.5 L 642.5 501.5 Z M 731.5 240.5 L 763.5 240.5 L 763.5 501.5 L 731.5 501.5 Z M 827.5 240.5 L 858.5 240.5 L 858.5 501.5 L 827.5 501.5 Z M 916.5 240.5 L 947.5 240.5 L 947.5 501.5 L 916.5 501.5 Z M 1021.5 240.5 L 1052.5 240.5 L 1052.5 501.5 L 1021.5 501.5 Z M 1110.5 240.5 L 1141.5 240.5 L 1141.5 501.5 L 1110.5 501.5 Z M 1238.5 240.5 L 1269.5 240.5 L 1269.5 501.5 L 1238.5 501.5 Z M 1327.5 240.5 L 1358.5 240.5 L 1358.5 501.5 L 1327.5 501.5 Z M 1416.5 240.5 L 1447.5 240.5 L 1447.5 501.5 L 1416.5 501.5 Z M 1416.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1638.460938 536.113281 L 1638.523438 533.644531 L 1638.769531 531.234375 L 1639.203125 528.953125 L 1639.757812 526.730469 L 1640.5 524.632812 L 1641.484375 522.597656 L 1643.027344 519.941406 L 1644.941406 517.660156 L 1647.101562 515.808594 L 1649.570312 514.328125 L 1652.285156 513.277344 L 1655.371094 512.597656 L 1655.925781 512.539062 L 1656.542969 512.476562 L 1657.097656 512.414062 L 1658.332031 512.414062 L 1659.011719 512.351562 L 1662.960938 512.660156 L 1666.417969 513.585938 L 1669.378906 515.066406 L 1671.847656 517.167969 L 1673.824219 519.820312 L 1675.367188 523.089844 L 1675.734375 524.324219 L 1675.921875 525.003906 L 1676.042969 525.683594 L 1676.167969 526.359375 L 1676.351562 527.039062 L 1670.488281 527.039062 L 1669.875 524.878906 L 1669.070312 523.027344 L 1668.082031 521.425781 L 1666.789062 520.066406 L 1665.367188 519.015625 L 1663.703125 518.214844 L 1662.898438 517.96875 L 1662.035156 517.785156 L 1661.171875 517.660156 L 1660.246094 517.535156 L 1659.320312 517.476562 L 1658.332031 517.414062 L 1656.171875 517.597656 L 1654.199219 518.03125 L 1652.347656 518.707031 L 1650.679688 519.757812 L 1649.136719 521.054688 L 1647.84375 522.597656 L 1646.730469 524.386719 L 1645.804688 526.359375 L 1645.066406 528.519531 L 1644.570312 530.867188 L 1644.261719 533.394531 L 1644.203125 536.050781 L 1644.261719 538.949219 L 1644.632812 541.542969 L 1645.25 544.011719 L 1646.113281 546.171875 L 1647.226562 548.207031 L 1648.582031 549.933594 L 1649.941406 551.355469 L 1651.421875 552.464844 L 1653.027344 553.328125 L 1654.816406 553.945312 L 1656.730469 554.316406 L 1658.828125 554.441406 L 1661.046875 554.316406 L 1663.085938 553.882812 L 1664.9375 553.144531 L 1666.480469 552.09375 L 1667.835938 550.738281 L 1669.007812 549.070312 L 1669.503906 548.082031 L 1669.933594 546.972656 L 1670.367188 545.800781 L 1670.738281 544.503906 L 1671.046875 543.148438 L 1671.355469 541.664062 L 1677.277344 541.664062 L 1676.167969 547.15625 L 1674.316406 551.601562 L 1671.601562 555.058594 L 1668.144531 557.523438 L 1663.824219 558.945312 L 1658.765625 559.5 L 1655.1875 559.253906 L 1651.976562 558.511719 L 1649.078125 557.402344 L 1646.484375 555.734375 L 1644.203125 553.574219 L 1642.289062 550.921875 L 1641.175781 549.007812 L 1640.25 546.910156 L 1639.511719 544.6875 L 1638.957031 542.34375 L 1638.585938 539.875 L 1638.460938 537.285156 Z M 1638.460938 536.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 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/nand3b/sky130_fd_sc_lp__nand3b_lp.svg b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.svg
index 6632666..6ead283 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.svg
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.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 1162.5 660.5 L 1197.5 660.5 L 1197.5 757.5 L 1162.5 757.5 Z M 777.5 660.5 L 812.5 660.5 L 812.5 757.5 L 777.5 757.5 Z M 867.5 660.5 L 901.5 660.5 L 901.5 757.5 L 867.5 757.5 Z M 956.5 660.5 L 991.5 660.5 L 991.5 757.5 L 956.5 757.5 Z M 1080.5 660.5 L 1114.5 660.5 L 1114.5 757.5 L 1080.5 757.5 Z M 1080.5 660.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 1121.5 212.5 L 1178.5 212.5 L 1178.5 441.5 L 1121.5 441.5 Z M 748.5 212.5 L 805.5 212.5 L 805.5 441.5 L 748.5 441.5 Z M 869.5 212.5 L 926.5 212.5 L 926.5 441.5 L 869.5 441.5 Z M 991.5 212.5 L 1048.5 212.5 L 1048.5 441.5 L 991.5 441.5 Z M 991.5 212.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 912.554688 796.246094 L 912.554688 815.5 L 906.292969 815.5 L 906.292969 796.246094 L 887.375 766.421875 L 895.117188 766.421875 L 909.523438 790.320312 L 923.527344 766.421875 L 931 766.421875 Z M 912.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 889 307 L 928 307 M 889 269 L 928 269 M 889 269 L 889 307 M 928 269 L 928 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 889 307 L 928 307 M 889 269 L 928 269 M 928 307 L 928 269 M 889 307 L 889 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 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_lp__nand3b_m.svg b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.svg
index be6ed08..060c356 100644
--- a/cells/nand3b/sky130_fd_sc_lp__nand3b_m.svg
+++ b/cells/nand3b/sky130_fd_sc_lp__nand3b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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="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 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="#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 1106.5 768.5 L 1141.5 768.5 L 1141.5 864.5 L 1106.5 864.5 Z M 791.5 768.5 L 826.5 768.5 L 826.5 864.5 L 791.5 864.5 Z M 941.5 768.5 L 976.5 768.5 L 976.5 864.5 L 941.5 864.5 Z M 1024.5 768.5 L 1058.5 768.5 L 1058.5 864.5 L 1024.5 864.5 Z M 1024.5 768.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 1112.5 374.5 L 1146.5 374.5 L 1146.5 470.5 L 1112.5 470.5 Z M 816.5 374.5 L 851.5 374.5 L 851.5 470.5 L 816.5 470.5 Z M 915.5 374.5 L 949.5 374.5 L 949.5 470.5 L 915.5 470.5 Z M 1013.5 374.5 L 1048.5 374.5 L 1048.5 470.5 L 1013.5 470.5 Z M 1013.5 374.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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 917.1875 512.574219 L 917.1875 561.652344 L 910.121094 561.652344 L 884.738281 521.863281 L 884.738281 561.652344 L 878.816406 561.652344 L 878.816406 512.574219 L 885.613281 512.574219 L 911.265625 552.699219 L 911.265625 512.574219 Z M 917.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 834 562 L 873 562 M 834 523 L 873 523 M 834 523 L 834 562 M 873 523 L 873 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 834 562 L 873 562 M 834 523 L 873 523 M 873 562 L 873 523 M 834 562 L 834 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/nand4/sky130_fd_sc_lp__nand4_0.svg b/cells/nand4/sky130_fd_sc_lp__nand4_0.svg
index d2f2317..5871d67 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_0.svg
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 1132.5 768.5 L 1166.5 768.5 L 1166.5 864.5 L 1132.5 864.5 Z M 781.5 768.5 L 815.5 768.5 L 815.5 864.5 L 781.5 864.5 Z M 870.5 768.5 L 905.5 768.5 L 905.5 864.5 L 870.5 864.5 Z M 1001.5 768.5 L 1035.5 768.5 L 1035.5 864.5 L 1001.5 864.5 Z M 1001.5 768.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 1109.5 242.5 L 1143.5 242.5 L 1143.5 389.5 L 1109.5 389.5 Z M 813.5 242.5 L 847.5 242.5 L 847.5 389.5 L 813.5 389.5 Z M 911.5 242.5 L 946.5 242.5 L 946.5 389.5 L 911.5 389.5 Z M 1010.5 242.5 L 1044.5 242.5 L 1044.5 389.5 L 1010.5 389.5 Z M 1010.5 242.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1132.554688 457.246094 L 1132.554688 476.5 L 1126.292969 476.5 L 1126.292969 457.246094 L 1107.375 427.421875 L 1115.117188 427.421875 L 1129.523438 451.320312 L 1143.527344 427.421875 L 1151 427.421875 Z M 1132.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 1109 647 L 1148 647 M 1109 608 L 1148 608 M 1109 608 L 1109 647 M 1148 608 L 1148 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 1109 647 L 1148 647 M 1109 608 L 1148 608 M 1148 647 L 1148 608 M 1109 647 L 1109 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 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_lp__nand4_1.svg b/cells/nand4/sky130_fd_sc_lp__nand4_1.svg
index 6e5b3cf..edffd30 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_1.svg
+++ b/cells/nand4/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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 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="#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 1102.5 672.5 L 1136.5 672.5 L 1136.5 864.5 L 1102.5 864.5 Z M 751.5 672.5 L 785.5 672.5 L 785.5 864.5 L 751.5 864.5 Z M 840.5 672.5 L 875.5 672.5 L 875.5 864.5 L 840.5 864.5 Z M 971.5 672.5 L 1005.5 672.5 L 1005.5 864.5 L 971.5 864.5 Z M 971.5 672.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 1102.5 209.5 L 1136.5 209.5 L 1136.5 498.5 L 1102.5 498.5 Z M 751.5 209.5 L 785.5 209.5 L 785.5 498.5 L 751.5 498.5 Z M 850.5 209.5 L 884.5 209.5 L 884.5 498.5 L 850.5 498.5 Z M 1003.5 209.5 L 1038.5 209.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1003.5 209.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 782.492188 646.5 L 782.492188 597.421875 L 801.410156 597.421875 L 804.371094 597.625 L 807.132812 598.164062 L 809.6875 599.105469 L 812.046875 600.316406 L 814.132812 602 L 816.085938 603.953125 L 817.699219 606.308594 L 819.046875 608.867188 L 820.058594 611.761719 L 820.796875 614.859375 L 821.203125 618.292969 L 821.402344 621.929688 L 821.203125 625.765625 L 820.730469 629.332031 L 819.921875 632.566406 L 818.84375 635.527344 L 817.429688 638.152344 L 815.679688 640.441406 L 813.796875 642.324219 L 811.707031 643.808594 L 809.421875 645.019531 L 806.929688 645.828125 L 804.234375 646.367188 L 801.410156 646.5 Z M 788.753906 640.980469 L 800.332031 640.980469 L 803.429688 640.777344 L 806.1875 640.039062 L 808.613281 638.757812 L 810.632812 637.074219 L 812.246094 634.785156 L 813.59375 632.027344 L 813.996094 630.613281 L 814.402344 629.132812 L 814.738281 627.515625 L 814.941406 625.765625 L 815.074219 623.949219 L 815.140625 621.996094 L 814.875 617.621094 L 814.199219 613.78125 L 812.988281 610.484375 L 811.371094 607.859375 L 809.285156 605.703125 L 806.726562 604.15625 L 805.785156 603.820312 L 804.773438 603.480469 L 803.699219 603.28125 L 802.621094 603.078125 L 801.476562 603.011719 L 800.332031 602.941406 L 788.753906 602.941406 Z M 788.753906 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 779 477 L 818 477 M 779 438 L 818 438 M 779 438 L 779 477 M 818 438 L 818 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 779 477 L 818 477 M 779 438 L 818 438 M 818 477 L 818 438 M 779 477 L 779 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_lp__nand4_2.svg b/cells/nand4/sky130_fd_sc_lp__nand4_2.svg
index 7fa8e25..7fa78a9 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_2.svg
+++ b/cells/nand4/sky130_fd_sc_lp__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 539.5 L 367.5 539.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 1272.5 649.5 L 1307.5 649.5 L 1307.5 841.5 L 1272.5 841.5 Z M 1371.5 649.5 L 1405.5 649.5 L 1405.5 841.5 L 1371.5 841.5 Z M 1075.5 649.5 L 1110.5 649.5 L 1110.5 841.5 L 1075.5 841.5 Z M 1174.5 649.5 L 1208.5 649.5 L 1208.5 841.5 L 1174.5 841.5 Z M 853.5 672.5 L 887.5 672.5 L 887.5 864.5 L 853.5 864.5 Z M 649.5 672.5 L 683.5 672.5 L 683.5 864.5 L 649.5 864.5 Z M 755.5 672.5 L 789.5 672.5 L 789.5 864.5 L 755.5 864.5 Z M 551.5 672.5 L 585.5 672.5 L 585.5 864.5 L 551.5 864.5 Z M 551.5 672.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 1355.5 209.5 L 1389.5 209.5 L 1389.5 498.5 L 1355.5 498.5 Z M 589.5 209.5 L 624.5 209.5 L 624.5 498.5 L 589.5 498.5 Z M 688.5 209.5 L 722.5 209.5 L 722.5 498.5 L 688.5 498.5 Z M 787.5 209.5 L 821.5 209.5 L 821.5 498.5 L 787.5 498.5 Z M 885.5 209.5 L 920.5 209.5 L 920.5 498.5 L 885.5 498.5 Z M 1002.5 209.5 L 1036.5 209.5 L 1036.5 498.5 L 1002.5 498.5 Z M 1101.5 209.5 L 1135.5 209.5 L 1135.5 498.5 L 1101.5 498.5 Z M 1256.5 209.5 L 1291.5 209.5 L 1291.5 498.5 L 1256.5 498.5 Z M 1256.5 209.5 "/>
 </clipPath>
-<image id="image295" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image295"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 560.492188 476.5 L 560.492188 427.421875 L 579.410156 427.421875 L 582.371094 427.625 L 585.132812 428.164062 L 587.6875 429.105469 L 590.046875 430.316406 L 592.132812 432 L 594.085938 433.953125 L 595.699219 436.308594 L 597.046875 438.867188 L 598.058594 441.761719 L 598.796875 444.859375 L 599.203125 448.292969 L 599.402344 451.929688 L 599.203125 455.765625 L 598.730469 459.332031 L 597.921875 462.566406 L 596.84375 465.527344 L 595.429688 468.152344 L 593.679688 470.441406 L 591.796875 472.324219 L 589.707031 473.808594 L 587.421875 475.019531 L 584.929688 475.828125 L 582.234375 476.367188 L 579.410156 476.5 Z M 566.753906 470.980469 L 578.332031 470.980469 L 581.429688 470.777344 L 584.1875 470.039062 L 586.613281 468.757812 L 588.632812 467.074219 L 590.246094 464.785156 L 591.59375 462.027344 L 591.996094 460.613281 L 592.402344 459.132812 L 592.738281 457.515625 L 592.941406 455.765625 L 593.074219 453.949219 L 593.140625 451.996094 L 592.875 447.621094 L 592.199219 443.78125 L 590.988281 440.484375 L 589.371094 437.859375 L 587.285156 435.703125 L 584.726562 434.15625 L 583.785156 433.820312 L 582.773438 433.480469 L 581.699219 433.28125 L 580.621094 433.078125 L 579.476562 433.011719 L 578.332031 432.941406 L 566.753906 432.941406 Z M 566.753906 470.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 556 647 L 595 647 M 556 608 L 595 608 M 556 608 L 556 647 M 595 608 L 595 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 556 647 L 595 647 M 556 608 L 595 608 M 595 647 L 595 608 M 556 647 L 556 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/nand4/sky130_fd_sc_lp__nand4_4.svg b/cells/nand4/sky130_fd_sc_lp__nand4_4.svg
index d402e75..9989d5c 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_4.svg
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 195.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 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="#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 1590.5 626.5 L 1617.5 626.5 L 1617.5 780.5 L 1590.5 780.5 Z M 1511.5 626.5 L 1538.5 626.5 L 1538.5 780.5 L 1511.5 780.5 Z M 1353.5 626.5 L 1380.5 626.5 L 1380.5 780.5 L 1353.5 780.5 Z M 1036.5 626.5 L 1064.5 626.5 L 1064.5 780.5 L 1036.5 780.5 Z M 1273.5 626.5 L 1301.5 626.5 L 1301.5 780.5 L 1273.5 780.5 Z M 1432.5 626.5 L 1459.5 626.5 L 1459.5 780.5 L 1432.5 780.5 Z M 1194.5 626.5 L 1222.5 626.5 L 1222.5 780.5 L 1194.5 780.5 Z M 1115.5 626.5 L 1143.5 626.5 L 1143.5 780.5 L 1115.5 780.5 Z M 836.5 628.5 L 864.5 628.5 L 864.5 782.5 L 836.5 782.5 Z M 283.5 628.5 L 310.5 628.5 L 310.5 782.5 L 283.5 782.5 Z M 678.5 628.5 L 705.5 628.5 L 705.5 782.5 L 678.5 782.5 Z M 599.5 628.5 L 626.5 628.5 L 626.5 782.5 L 599.5 782.5 Z M 441.5 628.5 L 468.5 628.5 L 468.5 782.5 L 441.5 782.5 Z M 362.5 628.5 L 389.5 628.5 L 389.5 782.5 L 362.5 782.5 Z M 757.5 628.5 L 785.5 628.5 L 785.5 782.5 L 757.5 782.5 Z M 520.5 628.5 L 547.5 628.5 L 547.5 782.5 L 520.5 782.5 Z M 520.5 628.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 1590.5 273.5 L 1617.5 273.5 L 1617.5 504.5 L 1590.5 504.5 Z M 292.5 273.5 L 319.5 273.5 L 319.5 504.5 L 292.5 504.5 Z M 371.5 273.5 L 398.5 273.5 L 398.5 504.5 L 371.5 504.5 Z M 450.5 273.5 L 478.5 273.5 L 478.5 504.5 L 450.5 504.5 Z M 529.5 273.5 L 557.5 273.5 L 557.5 504.5 L 529.5 504.5 Z M 637.5 273.5 L 665.5 273.5 L 665.5 504.5 L 637.5 504.5 Z M 716.5 273.5 L 744.5 273.5 L 744.5 504.5 L 716.5 504.5 Z M 796.5 273.5 L 823.5 273.5 L 823.5 504.5 L 796.5 504.5 Z M 875.5 273.5 L 902.5 273.5 L 902.5 504.5 L 875.5 504.5 Z M 954.5 273.5 L 981.5 273.5 L 981.5 504.5 L 954.5 504.5 Z M 1033.5 273.5 L 1060.5 273.5 L 1060.5 504.5 L 1033.5 504.5 Z M 1112.5 273.5 L 1139.5 273.5 L 1139.5 504.5 L 1112.5 504.5 Z M 1191.5 273.5 L 1218.5 273.5 L 1218.5 504.5 L 1191.5 504.5 Z M 1353.5 273.5 L 1380.5 273.5 L 1380.5 504.5 L 1353.5 504.5 Z M 1432.5 273.5 L 1459.5 273.5 L 1459.5 504.5 L 1432.5 504.5 Z M 1511.5 273.5 L 1538.5 273.5 L 1538.5 504.5 L 1511.5 504.5 Z M 1511.5 273.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 521.667969 471.855469 L 521.667969 487.5 L 516.582031 487.5 L 516.582031 471.855469 L 501.210938 447.625 L 507.5 447.625 L 519.207031 467.042969 L 530.585938 447.625 L 536.65625 447.625 Z M 521.667969 471.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 502 627 L 534 627 M 502 596 L 534 596 M 502 596 L 502 627 M 534 596 L 534 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 502 627 L 534 627 M 502 596 L 534 596 M 534 627 L 534 596 M 502 627 L 502 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/nand4/sky130_fd_sc_lp__nand4_lp.svg b/cells/nand4/sky130_fd_sc_lp__nand4_lp.svg
index bcc1f13..869cb08 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_lp.svg
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.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 1101.5 768.5 L 1135.5 768.5 L 1135.5 864.5 L 1101.5 864.5 Z M 750.5 768.5 L 784.5 768.5 L 784.5 864.5 L 750.5 864.5 Z M 839.5 768.5 L 874.5 768.5 L 874.5 864.5 L 839.5 864.5 Z M 970.5 768.5 L 1004.5 768.5 L 1004.5 864.5 L 970.5 864.5 Z M 970.5 768.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 1101.5 220.5 L 1158.5 220.5 L 1158.5 449.5 L 1101.5 449.5 Z M 734.5 220.5 L 791.5 220.5 L 791.5 449.5 L 734.5 449.5 Z M 855.5 220.5 L 913.5 220.5 L 913.5 449.5 L 855.5 449.5 Z M 979.5 220.5 L 1036.5 220.5 L 1036.5 449.5 L 979.5 449.5 Z M 979.5 220.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1242.554688 796.246094 L 1242.554688 815.5 L 1236.292969 815.5 L 1236.292969 796.246094 L 1217.375 766.421875 L 1225.117188 766.421875 L 1239.523438 790.320312 L 1253.527344 766.421875 L 1261 766.421875 Z M 1242.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 1219 307 L 1258 307 M 1219 269 L 1258 269 M 1219 269 L 1219 307 M 1258 269 L 1258 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 1219 307 L 1258 307 M 1219 269 L 1258 269 M 1258 307 L 1258 269 M 1219 307 L 1219 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 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_lp__nand4_m.svg b/cells/nand4/sky130_fd_sc_lp__nand4_m.svg
index 2098a59..eb6d777 100644
--- a/cells/nand4/sky130_fd_sc_lp__nand4_m.svg
+++ b/cells/nand4/sky130_fd_sc_lp__nand4_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 1132.5 768.5 L 1166.5 768.5 L 1166.5 864.5 L 1132.5 864.5 Z M 781.5 768.5 L 815.5 768.5 L 815.5 864.5 L 781.5 864.5 Z M 870.5 768.5 L 905.5 768.5 L 905.5 864.5 L 870.5 864.5 Z M 1001.5 768.5 L 1035.5 768.5 L 1035.5 864.5 L 1001.5 864.5 Z M 1001.5 768.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 1109.5 292.5 L 1143.5 292.5 L 1143.5 389.5 L 1109.5 389.5 Z M 813.5 292.5 L 847.5 292.5 L 847.5 389.5 L 813.5 389.5 Z M 911.5 292.5 L 946.5 292.5 L 946.5 389.5 L 911.5 389.5 Z M 1010.5 292.5 L 1044.5 292.5 L 1044.5 389.5 L 1010.5 389.5 Z M 1010.5 292.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1132.554688 457.246094 L 1132.554688 476.5 L 1126.292969 476.5 L 1126.292969 457.246094 L 1107.375 427.421875 L 1115.117188 427.421875 L 1129.523438 451.320312 L 1143.527344 427.421875 L 1151 427.421875 Z M 1132.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 1109 647 L 1148 647 M 1109 608 L 1148 608 M 1109 608 L 1109 647 M 1148 608 L 1148 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 1109 647 L 1148 647 M 1109 608 L 1148 608 M 1148 647 L 1148 608 M 1109 647 L 1109 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 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/nand4b/sky130_fd_sc_lp__nand4b_1.svg b/cells/nand4b/sky130_fd_sc_lp__nand4b_1.svg
index 0560692..e4de684 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_1.svg
+++ b/cells/nand4b/sky130_fd_sc_lp__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 539.5 L 533.5 539.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 719.5 672.5 L 753.5 672.5 L 753.5 768.5 L 719.5 768.5 Z M 1049.5 672.5 L 1083.5 672.5 L 1083.5 864.5 L 1049.5 864.5 Z M 843.5 672.5 L 877.5 672.5 L 877.5 864.5 L 843.5 864.5 Z M 925.5 672.5 L 960.5 672.5 L 960.5 864.5 L 925.5 864.5 Z M 1173.5 672.5 L 1207.5 672.5 L 1207.5 864.5 L 1173.5 864.5 Z M 1173.5 672.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 1074.5 209.5 L 1109.5 209.5 L 1109.5 498.5 L 1074.5 498.5 Z M 719.5 401.5 L 753.5 401.5 L 753.5 498.5 L 719.5 498.5 Z M 1173.5 209.5 L 1207.5 209.5 L 1207.5 498.5 L 1173.5 498.5 Z M 941.5 209.5 L 976.5 209.5 L 976.5 498.5 L 941.5 498.5 Z M 843.5 209.5 L 877.5 209.5 L 877.5 498.5 L 843.5 498.5 Z M 843.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 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/nand4b/sky130_fd_sc_lp__nand4b_2.svg b/cells/nand4b/sky130_fd_sc_lp__nand4b_2.svg
index 71b9be5..d9b231e 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_2.svg
+++ b/cells/nand4b/sky130_fd_sc_lp__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 539.5 L 256.5 539.5 Z M 256.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="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 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="#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 1276.5 647.5 L 1310.5 647.5 L 1310.5 839.5 L 1276.5 839.5 Z M 1374.5 647.5 L 1409.5 647.5 L 1409.5 839.5 L 1374.5 839.5 Z M 1177.5 647.5 L 1212.5 647.5 L 1212.5 839.5 L 1177.5 839.5 Z M 1475.5 647.5 L 1510.5 647.5 L 1510.5 839.5 L 1475.5 839.5 Z M 822.5 651.5 L 856.5 651.5 L 856.5 844.5 L 822.5 844.5 Z M 937.5 651.5 L 971.5 651.5 L 971.5 844.5 L 937.5 844.5 Z M 609.5 651.5 L 643.5 651.5 L 643.5 844.5 L 609.5 844.5 Z M 708.5 651.5 L 742.5 651.5 L 742.5 844.5 L 708.5 844.5 Z M 391.5 763.5 L 426.5 763.5 L 426.5 860.5 L 391.5 860.5 Z M 391.5 763.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 1276.5 209.5 L 1310.5 209.5 L 1310.5 498.5 L 1276.5 498.5 Z M 466.5 401.5 L 500.5 401.5 L 500.5 498.5 L 466.5 498.5 Z M 1374.5 209.5 L 1409.5 209.5 L 1409.5 498.5 L 1374.5 498.5 Z M 1473.5 209.5 L 1507.5 209.5 L 1507.5 498.5 L 1473.5 498.5 Z M 1177.5 209.5 L 1212.5 209.5 L 1212.5 498.5 L 1177.5 498.5 Z M 923.5 209.5 L 957.5 209.5 L 957.5 498.5 L 923.5 498.5 Z M 822.5 209.5 L 856.5 209.5 L 856.5 498.5 L 822.5 498.5 Z M 708.5 209.5 L 742.5 209.5 L 742.5 498.5 L 708.5 498.5 Z M 609.5 209.5 L 643.5 209.5 L 643.5 498.5 L 609.5 498.5 Z M 609.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 418.1875 596.574219 L 418.1875 645.652344 L 411.121094 645.652344 L 385.738281 605.863281 L 385.738281 645.652344 L 379.816406 645.652344 L 379.816406 596.574219 L 386.613281 596.574219 L 412.265625 636.699219 L 412.265625 596.574219 Z M 418.1875 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 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/nand4b/sky130_fd_sc_lp__nand4b_4.svg b/cells/nand4b/sky130_fd_sc_lp__nand4b_4.svg
index 44fc5ee..33a0680 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_4.svg
+++ b/cells/nand4b/sky130_fd_sc_lp__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 537.5 L 175.5 537.5 Z M 175.5 229.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 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="#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 1610.5 618.5 L 1634.5 618.5 L 1634.5 757.5 L 1610.5 757.5 Z M 1539.5 618.5 L 1563.5 618.5 L 1563.5 757.5 L 1539.5 757.5 Z M 1397.5 618.5 L 1421.5 618.5 L 1421.5 757.5 L 1397.5 757.5 Z M 1099.5 618.5 L 1124.5 618.5 L 1124.5 757.5 L 1099.5 757.5 Z M 1326.5 618.5 L 1350.5 618.5 L 1350.5 757.5 L 1326.5 757.5 Z M 1468.5 618.5 L 1492.5 618.5 L 1492.5 757.5 L 1468.5 757.5 Z M 1241.5 618.5 L 1266.5 618.5 L 1266.5 757.5 L 1241.5 757.5 Z M 1170.5 618.5 L 1195.5 618.5 L 1195.5 757.5 L 1170.5 757.5 Z M 868.5 629.5 L 893.5 629.5 L 893.5 768.5 L 868.5 768.5 Z M 939.5 629.5 L 964.5 629.5 L 964.5 768.5 L 939.5 768.5 Z M 272.5 629.5 L 297.5 629.5 L 297.5 768.5 L 272.5 768.5 Z M 713.5 629.5 L 738.5 629.5 L 738.5 768.5 L 713.5 768.5 Z M 642.5 629.5 L 667.5 629.5 L 667.5 768.5 L 642.5 768.5 Z M 500.5 629.5 L 525.5 629.5 L 525.5 768.5 L 500.5 768.5 Z M 429.5 629.5 L 454.5 629.5 L 454.5 768.5 L 429.5 768.5 Z M 797.5 629.5 L 822.5 629.5 L 822.5 768.5 L 797.5 768.5 Z M 571.5 629.5 L 596.5 629.5 L 596.5 768.5 L 571.5 768.5 Z M 571.5 629.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 1601.5 299.5 L 1626.5 299.5 L 1626.5 507.5 L 1601.5 507.5 Z M 330.5 299.5 L 355.5 299.5 L 355.5 507.5 L 330.5 507.5 Z M 403.5 299.5 L 427.5 299.5 L 427.5 507.5 L 403.5 507.5 Z M 474.5 299.5 L 498.5 299.5 L 498.5 507.5 L 474.5 507.5 Z M 558.5 299.5 L 583.5 299.5 L 583.5 507.5 L 558.5 507.5 Z M 629.5 299.5 L 654.5 299.5 L 654.5 507.5 L 629.5 507.5 Z M 703.5 299.5 L 728.5 299.5 L 728.5 507.5 L 703.5 507.5 Z M 774.5 299.5 L 799.5 299.5 L 799.5 507.5 L 774.5 507.5 Z M 845.5 299.5 L 870.5 299.5 L 870.5 507.5 L 845.5 507.5 Z M 916.5 299.5 L 941.5 299.5 L 941.5 507.5 L 916.5 507.5 Z M 1043.5 299.5 L 1068.5 299.5 L 1068.5 507.5 L 1043.5 507.5 Z M 1114.5 299.5 L 1139.5 299.5 L 1139.5 507.5 L 1114.5 507.5 Z M 1185.5 299.5 L 1210.5 299.5 L 1210.5 507.5 L 1185.5 507.5 Z M 1256.5 299.5 L 1281.5 299.5 L 1281.5 507.5 L 1256.5 507.5 Z M 1388.5 299.5 L 1413.5 299.5 L 1413.5 507.5 L 1388.5 507.5 Z M 1459.5 299.5 L 1484.5 299.5 L 1484.5 507.5 L 1459.5 507.5 Z M 1530.5 299.5 L 1555.5 299.5 L 1555.5 507.5 L 1530.5 507.5 Z M 1530.5 299.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1200.496094 478.460938 L 1200.496094 492.5 L 1195.933594 492.5 L 1195.933594 478.460938 L 1182.136719 456.714844 L 1187.785156 456.714844 L 1198.289062 474.140625 L 1208.5 456.714844 L 1213.949219 456.714844 Z M 1200.496094 478.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 1183 619 L 1211 619 M 1183 591 L 1211 591 M 1183 591 L 1183 619 M 1211 591 L 1211 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 1183 619 L 1211 619 M 1183 591 L 1211 591 M 1211 619 L 1211 591 M 1183 619 L 1183 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/nand4b/sky130_fd_sc_lp__nand4b_lp.svg b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.svg
index 492ae70..5f1fc6d 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.svg
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1208.5 768.5 L 1243.5 768.5 L 1243.5 864.5 L 1208.5 864.5 Z M 741.5 768.5 L 775.5 768.5 L 775.5 864.5 L 741.5 864.5 Z M 830.5 768.5 L 865.5 768.5 L 865.5 864.5 L 830.5 864.5 Z M 920.5 768.5 L 954.5 768.5 L 954.5 864.5 L 920.5 864.5 Z M 1009.5 768.5 L 1043.5 768.5 L 1043.5 864.5 L 1009.5 864.5 Z M 1126.5 768.5 L 1160.5 768.5 L 1160.5 864.5 L 1126.5 864.5 Z M 1126.5 768.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1167.5 220.5 L 1224.5 220.5 L 1224.5 449.5 L 1167.5 449.5 Z M 677.5 220.5 L 734.5 220.5 L 734.5 449.5 L 677.5 449.5 Z M 798.5 220.5 L 855.5 220.5 L 855.5 449.5 L 798.5 449.5 Z M 920.5 220.5 L 977.5 220.5 L 977.5 449.5 L 920.5 449.5 Z M 1041.5 220.5 L 1098.5 220.5 L 1098.5 449.5 L 1041.5 449.5 Z M 1041.5 220.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface331">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1246.1875 512.574219 L 1246.1875 561.652344 L 1239.121094 561.652344 L 1213.738281 521.863281 L 1213.738281 561.652344 L 1207.816406 561.652344 L 1207.816406 512.574219 L 1214.613281 512.574219 L 1240.265625 552.699219 L 1240.265625 512.574219 Z M 1246.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 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/nand4b/sky130_fd_sc_lp__nand4b_m.svg b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.svg
index ed1111a..af02113 100644
--- a/cells/nand4b/sky130_fd_sc_lp__nand4b_m.svg
+++ b/cells/nand4b/sky130_fd_sc_lp__nand4b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image354" 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="#image354"/>
+  <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 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="#image354"/>
+  <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 1183.5 762.5 L 1217.5 762.5 L 1217.5 859.5 L 1183.5 859.5 Z M 685.5 762.5 L 719.5 762.5 L 719.5 859.5 L 685.5 859.5 Z M 853.5 762.5 L 887.5 762.5 L 887.5 859.5 L 853.5 859.5 Z M 936.5 762.5 L 970.5 762.5 L 970.5 859.5 L 936.5 859.5 Z M 1059.5 762.5 L 1094.5 762.5 L 1094.5 859.5 L 1059.5 859.5 Z M 1059.5 762.5 "/>
 </clipPath>
-<image id="image355" 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="#image355"/>
+  <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 1150.5 373.5 L 1184.5 373.5 L 1184.5 469.5 L 1150.5 469.5 Z M 678.5 373.5 L 712.5 373.5 L 712.5 469.5 L 678.5 469.5 Z M 854.5 373.5 L 889.5 373.5 L 889.5 469.5 L 854.5 469.5 Z M 953.5 373.5 L 987.5 373.5 L 987.5 469.5 L 953.5 469.5 Z M 1051.5 373.5 L 1086.5 373.5 L 1086.5 469.5 L 1051.5 469.5 Z M 1051.5 373.5 "/>
 </clipPath>
-<image id="image356" 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="#image356"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image357" 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="#image357"/>
+  <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="surface351">
+<g id="surface380">
 <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 806.1875 342.574219 L 806.1875 391.652344 L 799.121094 391.652344 L 773.738281 351.863281 L 773.738281 391.652344 L 767.816406 391.652344 L 767.816406 342.574219 L 774.613281 342.574219 L 800.265625 382.699219 L 800.265625 342.574219 Z M 806.1875 342.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 731 L 761 731 M 722 693 L 761 693 M 722 693 L 722 731 M 761 693 L 761 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 722 731 L 761 731 M 722 693 L 761 693 M 761 731 L 761 693 M 722 731 L 722 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 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/nand4bb/sky130_fd_sc_lp__nand4bb_1.svg b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.svg
index 882ad28..32990d5 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_1.svg
+++ b/cells/nand4bb/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask 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="#image344"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 635.5 672.5 L 670.5 672.5 L 670.5 768.5 L 635.5 768.5 Z M 1317.5 762.5 L 1352.5 762.5 L 1352.5 859.5 L 1317.5 859.5 Z M 1099.5 672.5 L 1134.5 672.5 L 1134.5 864.5 L 1099.5 864.5 Z M 976.5 672.5 L 1010.5 672.5 L 1010.5 864.5 L 976.5 864.5 Z M 852.5 672.5 L 886.5 672.5 L 886.5 864.5 L 852.5 864.5 Z M 769.5 672.5 L 804.5 672.5 L 804.5 864.5 L 769.5 864.5 Z M 769.5 672.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask2">
 <rect 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 209.5 L 1134.5 209.5 L 1134.5 498.5 L 1099.5 498.5 Z M 1260.5 401.5 L 1294.5 401.5 L 1294.5 498.5 L 1260.5 498.5 Z M 588.5 401.5 L 623.5 401.5 L 623.5 498.5 L 588.5 498.5 Z M 1001.5 209.5 L 1035.5 209.5 L 1035.5 498.5 L 1001.5 498.5 Z M 868.5 209.5 L 902.5 209.5 L 902.5 498.5 L 868.5 498.5 Z M 769.5 209.5 L 804.5 209.5 L 804.5 498.5 L 769.5 498.5 Z M 769.5 209.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface341">
+<g id="surface370">
 <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 1186.554688 712.246094 L 1186.554688 731.5 L 1180.292969 731.5 L 1180.292969 712.246094 L 1161.375 682.421875 L 1169.117188 682.421875 L 1183.523438 706.320312 L 1197.527344 682.421875 L 1205 682.421875 Z M 1186.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 1162 392 L 1201 392 M 1162 353 L 1201 353 M 1162 353 L 1162 392 M 1201 353 L 1201 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 1162 392 L 1201 392 M 1162 353 L 1201 353 M 1201 392 L 1201 353 M 1162 392 L 1162 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/nand4bb/sky130_fd_sc_lp__nand4bb_2.svg b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.svg
index 83d10a9..28c8be6 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.svg
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 539.5 L 201.5 539.5 Z M 201.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="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="#image321"/>
+  <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 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="#image321"/>
+  <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 466.5 766.5 L 500.5 766.5 L 500.5 862.5 L 466.5 862.5 Z M 367.5 766.5 L 402.5 766.5 L 402.5 862.5 L 367.5 862.5 Z M 813.5 672.5 L 847.5 672.5 L 847.5 864.5 L 813.5 864.5 Z M 1542.5 672.5 L 1576.5 672.5 L 1576.5 864.5 L 1542.5 864.5 Z M 1246.5 672.5 L 1280.5 672.5 L 1280.5 864.5 L 1246.5 864.5 Z M 1028.5 672.5 L 1063.5 672.5 L 1063.5 864.5 L 1028.5 864.5 Z M 1345.5 672.5 L 1379.5 672.5 L 1379.5 864.5 L 1345.5 864.5 Z M 1443.5 672.5 L 1478.5 672.5 L 1478.5 864.5 L 1443.5 864.5 Z M 714.5 672.5 L 749.5 672.5 L 749.5 864.5 L 714.5 864.5 Z M 914.5 672.5 L 948.5 672.5 L 948.5 864.5 L 914.5 864.5 Z M 914.5 672.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 497.5 394.5 L 531.5 394.5 L 531.5 491.5 L 497.5 491.5 Z M 336.5 394.5 L 371.5 394.5 L 371.5 491.5 L 336.5 491.5 Z M 831.5 209.5 L 866.5 209.5 L 866.5 498.5 L 831.5 498.5 Z M 1510.5 209.5 L 1544.5 209.5 L 1544.5 498.5 L 1510.5 498.5 Z M 1127.5 209.5 L 1161.5 209.5 L 1161.5 498.5 L 1127.5 498.5 Z M 1028.5 209.5 L 1063.5 209.5 L 1063.5 498.5 L 1028.5 498.5 Z M 1225.5 209.5 L 1260.5 209.5 L 1260.5 498.5 L 1225.5 498.5 Z M 1324.5 209.5 L 1358.5 209.5 L 1358.5 498.5 L 1324.5 498.5 Z M 733.5 209.5 L 767.5 209.5 L 767.5 498.5 L 733.5 498.5 Z M 930.5 209.5 L 964.5 209.5 L 964.5 498.5 L 930.5 498.5 Z M 930.5 209.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<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 1074.554688 542.246094 L 1074.554688 561.5 L 1068.292969 561.5 L 1068.292969 542.246094 L 1049.375 512.421875 L 1057.117188 512.421875 L 1071.523438 536.320312 L 1085.527344 512.421875 L 1093 512.421875 Z M 1074.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 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/nand4bb/sky130_fd_sc_lp__nand4bb_4.svg b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.svg
index 0069f8c..5acc255 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_4.svg
+++ b/cells/nand4bb/sky130_fd_sc_lp__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="image341" 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="#image341"/>
+  <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 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="#image341"/>
+  <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 343.5 607.5 L 366.5 607.5 L 366.5 733.5 L 343.5 733.5 Z M 279.5 607.5 L 301.5 607.5 L 301.5 733.5 L 279.5 733.5 Z M 941.5 608.5 L 964.5 608.5 L 964.5 734.5 L 941.5 734.5 Z M 659.5 608.5 L 682.5 608.5 L 682.5 734.5 L 659.5 734.5 Z M 571.5 608.5 L 593.5 608.5 L 593.5 734.5 L 571.5 734.5 Z M 877.5 608.5 L 899.5 608.5 L 899.5 734.5 L 877.5 734.5 Z M 506.5 608.5 L 529.5 608.5 L 529.5 734.5 L 506.5 734.5 Z M 1006.5 608.5 L 1028.5 608.5 L 1028.5 734.5 L 1006.5 734.5 Z M 812.5 608.5 L 835.5 608.5 L 835.5 734.5 L 812.5 734.5 Z M 724.5 608.5 L 746.5 608.5 L 746.5 734.5 L 724.5 734.5 Z M 1246.5 623.5 L 1268.5 623.5 L 1268.5 749.5 L 1246.5 749.5 Z M 1181.5 623.5 L 1204.5 623.5 L 1204.5 749.5 L 1181.5 749.5 Z M 1633.5 623.5 L 1655.5 623.5 L 1655.5 749.5 L 1633.5 749.5 Z M 1568.5 623.5 L 1591.5 623.5 L 1591.5 749.5 L 1568.5 749.5 Z M 1439.5 623.5 L 1462.5 623.5 L 1462.5 749.5 L 1439.5 749.5 Z M 1310.5 623.5 L 1333.5 623.5 L 1333.5 749.5 L 1310.5 749.5 Z M 1375.5 623.5 L 1397.5 623.5 L 1397.5 749.5 L 1375.5 749.5 Z M 1504.5 623.5 L 1526.5 623.5 L 1526.5 749.5 L 1504.5 749.5 Z M 1504.5 623.5 "/>
 </clipPath>
-<image id="image342" 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="#image342"/>
+  <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 1628.5 320.5 L 1651.5 320.5 L 1651.5 509.5 L 1628.5 509.5 Z M 279.5 320.5 L 301.5 320.5 L 301.5 509.5 L 279.5 509.5 Z M 343.5 320.5 L 366.5 320.5 L 366.5 509.5 L 343.5 509.5 Z M 526.5 320.5 L 548.5 320.5 L 548.5 509.5 L 526.5 509.5 Z M 590.5 320.5 L 613.5 320.5 L 613.5 509.5 L 590.5 509.5 Z M 655.5 320.5 L 677.5 320.5 L 677.5 509.5 L 655.5 509.5 Z M 719.5 320.5 L 742.5 320.5 L 742.5 509.5 L 719.5 509.5 Z M 784.5 320.5 L 806.5 320.5 L 806.5 509.5 L 784.5 509.5 Z M 848.5 320.5 L 871.5 320.5 L 871.5 509.5 L 848.5 509.5 Z M 913.5 320.5 L 935.5 320.5 L 935.5 509.5 L 913.5 509.5 Z M 977.5 320.5 L 1000.5 320.5 L 1000.5 509.5 L 977.5 509.5 Z M 1177.5 320.5 L 1199.5 320.5 L 1199.5 509.5 L 1177.5 509.5 Z M 1241.5 320.5 L 1264.5 320.5 L 1264.5 509.5 L 1241.5 509.5 Z M 1306.5 320.5 L 1328.5 320.5 L 1328.5 509.5 L 1306.5 509.5 Z M 1370.5 320.5 L 1393.5 320.5 L 1393.5 509.5 L 1370.5 509.5 Z M 1435.5 320.5 L 1457.5 320.5 L 1457.5 509.5 L 1435.5 509.5 Z M 1499.5 320.5 L 1522.5 320.5 L 1522.5 509.5 L 1499.5 509.5 Z M 1564.5 320.5 L 1586.5 320.5 L 1586.5 509.5 L 1564.5 509.5 Z M 1564.5 320.5 "/>
 </clipPath>
-<image id="image343" 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="#image343"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 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="image344" 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="#image344"/>
+  <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="surface338">
+<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 1106.324219 483.066406 L 1106.324219 495.5 L 1102.28125 495.5 L 1102.28125 483.066406 L 1090.066406 463.804688 L 1095.066406 463.804688 L 1104.371094 479.238281 L 1113.414062 463.804688 L 1118.238281 463.804688 Z M 1106.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 1090 612 L 1116 612 M 1090 587 L 1116 587 M 1090 587 L 1090 612 M 1116 587 L 1116 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 1090 612 L 1116 612 M 1090 587 L 1116 587 M 1116 612 L 1116 587 M 1090 612 L 1090 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/nand4bb/sky130_fd_sc_lp__nand4bb_lp.svg b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.svg
index 1169f72..86fad4b 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.svg
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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="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 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="#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 1326.5 768.5 L 1361.5 768.5 L 1361.5 864.5 L 1326.5 864.5 Z M 563.5 768.5 L 598.5 768.5 L 598.5 864.5 L 563.5 864.5 Z M 646.5 768.5 L 680.5 768.5 L 680.5 864.5 L 646.5 864.5 Z M 873.5 768.5 L 907.5 768.5 L 907.5 864.5 L 873.5 864.5 Z M 955.5 768.5 L 989.5 768.5 L 989.5 864.5 L 955.5 864.5 Z M 1044.5 768.5 L 1079.5 768.5 L 1079.5 864.5 L 1044.5 864.5 Z M 1134.5 768.5 L 1168.5 768.5 L 1168.5 864.5 L 1134.5 864.5 Z M 1244.5 768.5 L 1278.5 768.5 L 1278.5 864.5 L 1244.5 864.5 Z M 1244.5 768.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 1292.5 209.5 L 1349.5 209.5 L 1349.5 438.5 L 1292.5 438.5 Z M 604.5 209.5 L 662.5 209.5 L 662.5 438.5 L 604.5 438.5 Z M 726.5 209.5 L 783.5 209.5 L 783.5 438.5 L 726.5 438.5 Z M 847.5 209.5 L 905.5 209.5 L 905.5 438.5 L 847.5 438.5 Z M 1040.5 209.5 L 1097.5 209.5 L 1097.5 438.5 L 1040.5 438.5 Z M 1161.5 209.5 L 1219.5 209.5 L 1219.5 438.5 L 1161.5 438.5 Z M 1161.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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.730469 452.984375 L 1053.796875 450.292969 L 1054.066406 447.667969 L 1054.539062 445.175781 L 1055.144531 442.753906 L 1055.953125 440.464844 L 1057.03125 438.242188 L 1058.714844 435.347656 L 1060.800781 432.855469 L 1063.15625 430.835938 L 1065.847656 429.222656 L 1068.8125 428.078125 L 1072.175781 427.335938 L 1072.785156 427.269531 L 1073.457031 427.203125 L 1074.0625 427.132812 L 1075.410156 427.132812 L 1076.148438 427.066406 L 1080.457031 427.402344 L 1084.226562 428.414062 L 1087.460938 430.027344 L 1090.152344 432.316406 L 1092.304688 435.210938 L 1093.988281 438.78125 L 1094.394531 440.125 L 1094.59375 440.867188 L 1094.730469 441.609375 L 1094.863281 442.347656 L 1095.066406 443.089844 L 1088.671875 443.089844 L 1087.996094 440.734375 L 1087.121094 438.714844 L 1086.046875 436.960938 L 1084.632812 435.480469 L 1083.082031 434.335938 L 1081.265625 433.460938 L 1080.390625 433.191406 L 1079.449219 432.992188 L 1078.503906 432.855469 L 1077.496094 432.722656 L 1076.484375 432.652344 L 1075.410156 432.585938 L 1073.050781 432.789062 L 1070.898438 433.261719 L 1068.878906 434 L 1067.0625 435.144531 L 1065.378906 436.558594 L 1063.964844 438.242188 L 1062.753906 440.195312 L 1061.742188 442.347656 L 1060.933594 444.703125 L 1060.394531 447.261719 L 1060.058594 450.023438 L 1059.992188 452.917969 L 1060.058594 456.082031 L 1060.464844 458.910156 L 1061.136719 461.601562 L 1062.078125 463.957031 L 1063.292969 466.179688 L 1064.773438 468.066406 L 1066.253906 469.613281 L 1067.867188 470.824219 L 1069.621094 471.769531 L 1071.570312 472.441406 L 1073.660156 472.84375 L 1075.949219 472.980469 L 1078.371094 472.84375 L 1080.59375 472.375 L 1082.613281 471.566406 L 1084.296875 470.421875 L 1085.777344 468.941406 L 1087.054688 467.121094 L 1087.59375 466.046875 L 1088.066406 464.832031 L 1088.535156 463.554688 L 1088.941406 462.140625 L 1089.277344 460.660156 L 1089.613281 459.042969 L 1096.078125 459.042969 L 1094.863281 465.035156 L 1092.84375 469.882812 L 1089.882812 473.652344 L 1086.113281 476.347656 L 1081.402344 477.894531 L 1075.878906 478.5 L 1071.976562 478.230469 L 1068.476562 477.421875 L 1065.3125 476.210938 L 1062.484375 474.394531 L 1059.992188 472.039062 L 1057.90625 469.140625 L 1056.695312 467.054688 L 1055.683594 464.765625 L 1054.875 462.34375 L 1054.269531 459.785156 L 1053.867188 457.09375 L 1053.730469 454.265625 Z M 1053.730469 452.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 647 L 1091 647 M 1052 608 L 1091 608 M 1052 608 L 1052 647 M 1091 608 L 1091 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 1052 647 L 1091 647 M 1052 608 L 1091 608 M 1091 647 L 1091 608 M 1052 647 L 1052 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/nand4bb/sky130_fd_sc_lp__nand4bb_m.svg b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.svg
index 8fc6df5..89d6dee 100644
--- a/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.svg
+++ b/cells/nand4bb/sky130_fd_sc_lp__nand4bb_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image330" 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="#image330"/>
+  <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 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="#image330"/>
+  <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 614.5 649.5 L 648.5 649.5 L 648.5 745.5 L 614.5 745.5 Z M 1059.5 649.5 L 1094.5 649.5 L 1094.5 745.5 L 1059.5 745.5 Z M 977.5 649.5 L 1011.5 649.5 L 1011.5 745.5 L 977.5 745.5 Z M 853.5 649.5 L 887.5 649.5 L 887.5 745.5 L 853.5 745.5 Z M 771.5 649.5 L 805.5 649.5 L 805.5 745.5 L 771.5 745.5 Z M 1274.5 768.5 L 1308.5 768.5 L 1308.5 864.5 L 1274.5 864.5 Z M 1274.5 768.5 "/>
 </clipPath>
-<image id="image331" 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="#image331"/>
+  <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 1075.5 351.5 L 1110.5 351.5 L 1110.5 447.5 L 1075.5 447.5 Z M 771.5 351.5 L 805.5 351.5 L 805.5 447.5 L 771.5 447.5 Z M 1228.5 351.5 L 1262.5 351.5 L 1262.5 447.5 L 1228.5 447.5 Z M 977.5 351.5 L 1011.5 351.5 L 1011.5 447.5 L 977.5 447.5 Z M 869.5 351.5 L 903.5 351.5 L 903.5 447.5 L 869.5 447.5 Z M 628.5 360.5 L 663.5 360.5 L 663.5 456.5 L 628.5 456.5 Z M 628.5 360.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image333" 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="#image333"/>
+  <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="surface327">
+<g id="surface356">
 <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 1301.1875 596.574219 L 1301.1875 645.652344 L 1294.121094 645.652344 L 1268.738281 605.863281 L 1268.738281 645.652344 L 1262.816406 645.652344 L 1262.816406 596.574219 L 1269.613281 596.574219 L 1295.265625 636.699219 L 1295.265625 596.574219 Z M 1301.1875 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 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/nor2/sky130_fd_sc_lp__nor2_0.svg b/cells/nor2/sky130_fd_sc_lp__nor2_0.svg
index 3d1afcc..5f84ada 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_0.svg
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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 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="#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 1001.5 742.5 L 1035.5 742.5 L 1035.5 838.5 L 1001.5 838.5 Z M 902.5 742.5 L 937.5 742.5 L 937.5 838.5 L 902.5 838.5 Z M 902.5 742.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 992.5 218.5 L 1026.5 218.5 L 1026.5 365.5 L 992.5 365.5 Z M 902.5 218.5 L 937.5 218.5 L 937.5 365.5 L 902.5 365.5 Z M 902.5 218.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1095.441406 462.496094 L 1095.304688 464.652344 L 1094.96875 466.605469 L 1094.363281 468.421875 L 1093.554688 470.039062 L 1092.480469 471.585938 L 1091.199219 472.933594 L 1089.785156 474.078125 L 1088.304688 474.953125 L 1086.621094 475.625 L 1084.871094 476.164062 L 1082.988281 476.433594 L 1080.96875 476.5 L 1058.820312 476.5 L 1058.820312 427.421875 L 1078.746094 427.421875 L 1081.640625 427.625 L 1084.199219 428.097656 L 1086.488281 428.902344 L 1088.441406 430.046875 L 1090.121094 431.53125 L 1091.46875 433.347656 L 1092.007812 434.355469 L 1092.480469 435.433594 L 1092.816406 436.445312 L 1093.085938 437.589844 L 1093.21875 438.734375 L 1093.285156 439.878906 L 1093.085938 442.300781 L 1092.480469 444.386719 L 1091.535156 446.339844 L 1090.191406 447.957031 L 1088.507812 449.4375 L 1086.488281 450.582031 L 1088.441406 451.457031 L 1090.121094 452.398438 L 1091.605469 453.476562 L 1092.816406 454.6875 L 1093.757812 455.96875 L 1094.5 457.3125 L 1094.769531 458.121094 L 1094.96875 458.929688 L 1095.171875 459.738281 L 1095.304688 460.679688 L 1095.375 461.554688 Z M 1087.027344 440.753906 L 1086.824219 438.734375 L 1086.21875 437.050781 L 1085.277344 435.570312 L 1083.929688 434.492188 L 1082.246094 433.683594 L 1080.160156 433.144531 L 1079.6875 433.144531 L 1079.214844 433.078125 L 1078.746094 433.011719 L 1077.667969 433.011719 L 1077.195312 432.941406 L 1065.078125 432.941406 L 1065.078125 448.5625 L 1077.195312 448.5625 L 1079.6875 448.425781 L 1081.84375 448.023438 L 1083.660156 447.28125 L 1085.007812 446.273438 L 1086.082031 444.925781 L 1086.757812 443.3125 L 1086.824219 442.972656 L 1086.957031 442.167969 L 1086.957031 441.222656 Z M 1080.359375 470.980469 L 1082.246094 470.914062 L 1083.929688 470.507812 L 1085.410156 469.835938 L 1086.621094 468.960938 L 1087.632812 467.816406 L 1088.441406 466.402344 L 1088.640625 465.863281 L 1088.777344 465.257812 L 1088.976562 464.585938 L 1089.046875 463.976562 L 1089.113281 463.304688 L 1089.179688 462.566406 L 1089.046875 461.082031 L 1088.777344 459.667969 L 1088.304688 458.457031 L 1087.632812 457.3125 L 1086.757812 456.371094 L 1085.746094 455.496094 L 1085.007812 455.09375 L 1084.199219 454.753906 L 1083.324219 454.484375 L 1082.378906 454.285156 L 1081.371094 454.148438 L 1080.359375 454.082031 L 1065.078125 454.082031 L 1065.078125 470.980469 Z M 1080.359375 470.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 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/nor2/sky130_fd_sc_lp__nor2_1.svg b/cells/nor2/sky130_fd_sc_lp__nor2_1.svg
index c3f8cb1..67bbe07 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_1.svg
+++ b/cells/nor2/sky130_fd_sc_lp__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 539.5 L 756.5 539.5 Z M 756.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="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 996.5 647.5 L 1031.5 647.5 L 1031.5 839.5 L 996.5 839.5 Z M 898.5 647.5 L 932.5 647.5 L 932.5 839.5 L 898.5 839.5 Z M 898.5 647.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 987.5 209.5 L 1022.5 209.5 L 1022.5 498.5 L 987.5 498.5 Z M 898.5 209.5 L 932.5 209.5 L 932.5 498.5 L 898.5 498.5 Z M 898.5 209.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1095.441406 547.496094 L 1095.304688 549.652344 L 1094.96875 551.605469 L 1094.363281 553.421875 L 1093.554688 555.039062 L 1092.480469 556.585938 L 1091.199219 557.933594 L 1089.785156 559.078125 L 1088.304688 559.953125 L 1086.621094 560.625 L 1084.871094 561.164062 L 1082.988281 561.433594 L 1080.96875 561.5 L 1058.820312 561.5 L 1058.820312 512.421875 L 1078.746094 512.421875 L 1081.640625 512.625 L 1084.199219 513.097656 L 1086.488281 513.902344 L 1088.441406 515.046875 L 1090.121094 516.53125 L 1091.46875 518.347656 L 1092.007812 519.355469 L 1092.480469 520.433594 L 1092.816406 521.445312 L 1093.085938 522.589844 L 1093.21875 523.734375 L 1093.285156 524.878906 L 1093.085938 527.300781 L 1092.480469 529.386719 L 1091.535156 531.339844 L 1090.191406 532.957031 L 1088.507812 534.4375 L 1086.488281 535.582031 L 1088.441406 536.457031 L 1090.121094 537.398438 L 1091.605469 538.476562 L 1092.816406 539.6875 L 1093.757812 540.96875 L 1094.5 542.3125 L 1094.769531 543.121094 L 1094.96875 543.929688 L 1095.171875 544.738281 L 1095.304688 545.679688 L 1095.375 546.554688 Z M 1087.027344 525.753906 L 1086.824219 523.734375 L 1086.21875 522.050781 L 1085.277344 520.570312 L 1083.929688 519.492188 L 1082.246094 518.683594 L 1080.160156 518.144531 L 1079.6875 518.144531 L 1079.214844 518.078125 L 1078.746094 518.011719 L 1077.667969 518.011719 L 1077.195312 517.941406 L 1065.078125 517.941406 L 1065.078125 533.5625 L 1077.195312 533.5625 L 1079.6875 533.425781 L 1081.84375 533.023438 L 1083.660156 532.28125 L 1085.007812 531.273438 L 1086.082031 529.925781 L 1086.757812 528.3125 L 1086.824219 527.972656 L 1086.957031 527.167969 L 1086.957031 526.222656 Z M 1080.359375 555.980469 L 1082.246094 555.914062 L 1083.929688 555.507812 L 1085.410156 554.835938 L 1086.621094 553.960938 L 1087.632812 552.816406 L 1088.441406 551.402344 L 1088.640625 550.863281 L 1088.777344 550.257812 L 1088.976562 549.585938 L 1089.046875 548.976562 L 1089.113281 548.304688 L 1089.179688 547.566406 L 1089.046875 546.082031 L 1088.777344 544.667969 L 1088.304688 543.457031 L 1087.632812 542.3125 L 1086.757812 541.371094 L 1085.746094 540.496094 L 1085.007812 540.09375 L 1084.199219 539.753906 L 1083.324219 539.484375 L 1082.378906 539.285156 L 1081.371094 539.148438 L 1080.359375 539.082031 L 1065.078125 539.082031 L 1065.078125 555.980469 Z M 1080.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 1055 562 L 1094 562 M 1055 523 L 1094 523 M 1055 523 L 1055 562 M 1094 523 L 1094 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 1055 562 L 1094 562 M 1055 523 L 1094 523 M 1094 562 L 1094 523 M 1055 562 L 1055 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_lp__nor2_2.svg b/cells/nor2/sky130_fd_sc_lp__nor2_2.svg
index dba1985..dbb71ee 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_2.svg
+++ b/cells/nor2/sky130_fd_sc_lp__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 539.5 L 644.5 539.5 Z M 644.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 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="#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 1077.5 670.5 L 1111.5 670.5 L 1111.5 862.5 L 1077.5 862.5 Z M 781.5 670.5 L 815.5 670.5 L 815.5 862.5 L 781.5 862.5 Z M 879.5 670.5 L 914.5 670.5 L 914.5 862.5 L 879.5 862.5 Z M 978.5 670.5 L 1012.5 670.5 L 1012.5 862.5 L 978.5 862.5 Z M 978.5 670.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 1077.5 209.5 L 1111.5 209.5 L 1111.5 498.5 L 1077.5 498.5 Z M 781.5 209.5 L 815.5 209.5 L 815.5 498.5 L 781.5 498.5 Z M 879.5 209.5 L 914.5 209.5 L 914.5 498.5 L 879.5 498.5 Z M 978.5 209.5 L 1012.5 209.5 L 1012.5 498.5 L 978.5 498.5 Z M 978.5 209.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image287" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image287"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface281">
+<g id="surface309">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 984.441406 547.496094 L 984.304688 549.652344 L 983.96875 551.605469 L 983.363281 553.421875 L 982.554688 555.039062 L 981.480469 556.585938 L 980.199219 557.933594 L 978.785156 559.078125 L 977.304688 559.953125 L 975.621094 560.625 L 973.871094 561.164062 L 971.988281 561.433594 L 969.96875 561.5 L 947.820312 561.5 L 947.820312 512.421875 L 967.746094 512.421875 L 970.640625 512.625 L 973.199219 513.097656 L 975.488281 513.902344 L 977.441406 515.046875 L 979.121094 516.53125 L 980.46875 518.347656 L 981.007812 519.355469 L 981.480469 520.433594 L 981.816406 521.445312 L 982.085938 522.589844 L 982.21875 523.734375 L 982.285156 524.878906 L 982.085938 527.300781 L 981.480469 529.386719 L 980.535156 531.339844 L 979.191406 532.957031 L 977.507812 534.4375 L 975.488281 535.582031 L 977.441406 536.457031 L 979.121094 537.398438 L 980.605469 538.476562 L 981.816406 539.6875 L 982.757812 540.96875 L 983.5 542.3125 L 983.769531 543.121094 L 983.96875 543.929688 L 984.171875 544.738281 L 984.304688 545.679688 L 984.375 546.554688 Z M 976.027344 525.753906 L 975.824219 523.734375 L 975.21875 522.050781 L 974.277344 520.570312 L 972.929688 519.492188 L 971.246094 518.683594 L 969.160156 518.144531 L 968.6875 518.144531 L 968.214844 518.078125 L 967.746094 518.011719 L 966.667969 518.011719 L 966.195312 517.941406 L 954.078125 517.941406 L 954.078125 533.5625 L 966.195312 533.5625 L 968.6875 533.425781 L 970.84375 533.023438 L 972.660156 532.28125 L 974.007812 531.273438 L 975.082031 529.925781 L 975.757812 528.3125 L 975.824219 527.972656 L 975.957031 527.167969 L 975.957031 526.222656 Z M 969.359375 555.980469 L 971.246094 555.914062 L 972.929688 555.507812 L 974.410156 554.835938 L 975.621094 553.960938 L 976.632812 552.816406 L 977.441406 551.402344 L 977.640625 550.863281 L 977.777344 550.257812 L 977.976562 549.585938 L 978.046875 548.976562 L 978.113281 548.304688 L 978.179688 547.566406 L 978.046875 546.082031 L 977.777344 544.667969 L 977.304688 543.457031 L 976.632812 542.3125 L 975.757812 541.371094 L 974.746094 540.496094 L 974.007812 540.09375 L 973.199219 539.753906 L 972.324219 539.484375 L 971.378906 539.285156 L 970.371094 539.148438 L 969.359375 539.082031 L 954.078125 539.082031 L 954.078125 555.980469 Z M 969.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 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/nor2/sky130_fd_sc_lp__nor2_4.svg b/cells/nor2/sky130_fd_sc_lp__nor2_4.svg
index f17ec31..30569b7 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_4.svg
+++ b/cells/nor2/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.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="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1301.5 661.5 L 1335.5 661.5 L 1335.5 854.5 L 1301.5 854.5 Z M 611.5 661.5 L 646.5 661.5 L 646.5 854.5 L 611.5 854.5 Z M 710.5 661.5 L 744.5 661.5 L 744.5 854.5 L 710.5 854.5 Z M 808.5 661.5 L 843.5 661.5 L 843.5 854.5 L 808.5 854.5 Z M 907.5 661.5 L 941.5 661.5 L 941.5 854.5 L 907.5 854.5 Z M 1005.5 661.5 L 1040.5 661.5 L 1040.5 854.5 L 1005.5 854.5 Z M 1104.5 661.5 L 1138.5 661.5 L 1138.5 854.5 L 1104.5 854.5 Z M 1203.5 661.5 L 1237.5 661.5 L 1237.5 854.5 L 1203.5 854.5 Z M 1203.5 661.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1301.5 209.5 L 1335.5 209.5 L 1335.5 498.5 L 1301.5 498.5 Z M 611.5 209.5 L 646.5 209.5 L 646.5 498.5 L 611.5 498.5 Z M 710.5 209.5 L 744.5 209.5 L 744.5 498.5 L 710.5 498.5 Z M 808.5 209.5 L 843.5 209.5 L 843.5 498.5 L 808.5 498.5 Z M 907.5 209.5 L 941.5 209.5 L 941.5 498.5 L 907.5 498.5 Z M 1005.5 209.5 L 1040.5 209.5 L 1040.5 498.5 L 1005.5 498.5 Z M 1104.5 209.5 L 1138.5 209.5 L 1138.5 498.5 L 1104.5 498.5 Z M 1203.5 209.5 L 1237.5 209.5 L 1237.5 498.5 L 1203.5 498.5 Z M 1203.5 209.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/nor2/sky130_fd_sc_lp__nor2_8.svg b/cells/nor2/sky130_fd_sc_lp__nor2_8.svg
index d82e243..42973a7 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_8.svg
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_8.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1564.5 633.5 L 1593.5 633.5 L 1593.5 797.5 L 1564.5 797.5 Z M 309.5 633.5 L 338.5 633.5 L 338.5 797.5 L 309.5 797.5 Z M 392.5 633.5 L 421.5 633.5 L 421.5 797.5 L 392.5 797.5 Z M 476.5 633.5 L 505.5 633.5 L 505.5 797.5 L 476.5 797.5 Z M 560.5 633.5 L 589.5 633.5 L 589.5 797.5 L 560.5 797.5 Z M 643.5 633.5 L 673.5 633.5 L 673.5 797.5 L 643.5 797.5 Z M 727.5 633.5 L 756.5 633.5 L 756.5 797.5 L 727.5 797.5 Z M 811.5 633.5 L 840.5 633.5 L 840.5 797.5 L 811.5 797.5 Z M 894.5 633.5 L 924.5 633.5 L 924.5 797.5 L 894.5 797.5 Z M 978.5 633.5 L 1007.5 633.5 L 1007.5 797.5 L 978.5 797.5 Z M 1062.5 633.5 L 1091.5 633.5 L 1091.5 797.5 L 1062.5 797.5 Z M 1146.5 633.5 L 1175.5 633.5 L 1175.5 797.5 L 1146.5 797.5 Z M 1229.5 633.5 L 1259.5 633.5 L 1259.5 797.5 L 1229.5 797.5 Z M 1313.5 633.5 L 1342.5 633.5 L 1342.5 797.5 L 1313.5 797.5 Z M 1397.5 633.5 L 1426.5 633.5 L 1426.5 797.5 L 1397.5 797.5 Z M 1480.5 633.5 L 1510.5 633.5 L 1510.5 797.5 L 1480.5 797.5 Z M 1480.5 633.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1564.5 258.5 L 1593.5 258.5 L 1593.5 503.5 L 1564.5 503.5 Z M 309.5 258.5 L 338.5 258.5 L 338.5 503.5 L 309.5 503.5 Z M 392.5 258.5 L 421.5 258.5 L 421.5 503.5 L 392.5 503.5 Z M 476.5 258.5 L 505.5 258.5 L 505.5 503.5 L 476.5 503.5 Z M 560.5 258.5 L 589.5 258.5 L 589.5 503.5 L 560.5 503.5 Z M 643.5 258.5 L 673.5 258.5 L 673.5 503.5 L 643.5 503.5 Z M 727.5 258.5 L 756.5 258.5 L 756.5 503.5 L 727.5 503.5 Z M 811.5 258.5 L 840.5 258.5 L 840.5 503.5 L 811.5 503.5 Z M 894.5 258.5 L 924.5 258.5 L 924.5 503.5 L 894.5 503.5 Z M 978.5 258.5 L 1007.5 258.5 L 1007.5 503.5 L 978.5 503.5 Z M 1062.5 258.5 L 1091.5 258.5 L 1091.5 503.5 L 1062.5 503.5 Z M 1146.5 258.5 L 1175.5 258.5 L 1175.5 503.5 L 1146.5 503.5 Z M 1229.5 258.5 L 1259.5 258.5 L 1259.5 503.5 L 1229.5 503.5 Z M 1313.5 258.5 L 1342.5 258.5 L 1342.5 503.5 L 1313.5 503.5 Z M 1397.5 258.5 L 1426.5 258.5 L 1426.5 503.5 L 1397.5 503.5 Z M 1480.5 258.5 L 1510.5 258.5 L 1510.5 503.5 L 1480.5 503.5 Z M 1480.5 258.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface297">
+<g id="surface326">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 640.757812 544.90625 L 624.597656 544.90625 L 620.171875 557.5 L 614.476562 557.5 L 629.429688 515.578125 L 636.328125 515.578125 L 651.050781 557.5 L 645.070312 557.5 Z M 639.261719 540.421875 L 632.820312 521.332031 L 625.921875 540.421875 Z M 639.261719 540.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 615 560 L 648 560 M 615 527 L 648 527 M 615 527 L 615 560 M 648 527 L 648 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 615 560 L 648 560 M 615 527 L 648 527 M 648 560 L 648 527 M 615 560 L 615 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/nor2/sky130_fd_sc_lp__nor2_lp.svg b/cells/nor2/sky130_fd_sc_lp__nor2_lp.svg
index 8485ed4..f81b7a6 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp.svg
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1080.5 694.5 L 1114.5 694.5 L 1114.5 790.5 L 1080.5 790.5 Z M 803.5 694.5 L 837.5 694.5 L 837.5 790.5 L 803.5 790.5 Z M 892.5 694.5 L 926.5 694.5 L 926.5 790.5 L 892.5 790.5 Z M 991.5 694.5 L 1025.5 694.5 L 1025.5 790.5 L 991.5 790.5 Z M 991.5 694.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 892.5 260.5 L 926.5 260.5 L 926.5 357.5 L 892.5 357.5 Z M 803.5 260.5 L 837.5 260.5 L 837.5 357.5 L 803.5 357.5 Z M 803.5 260.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/nor2/sky130_fd_sc_lp__nor2_lp2.svg b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.svg
index 7f10a70..2ab8b1f 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_lp2.svg
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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="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 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="#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 1080.5 694.5 L 1114.5 694.5 L 1114.5 790.5 L 1080.5 790.5 Z M 803.5 694.5 L 837.5 694.5 L 837.5 790.5 L 803.5 790.5 Z M 892.5 694.5 L 926.5 694.5 L 926.5 790.5 L 892.5 790.5 Z M 991.5 694.5 L 1025.5 694.5 L 1025.5 790.5 L 991.5 790.5 Z M 991.5 694.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 890.5 260.5 L 947.5 260.5 L 947.5 490.5 L 890.5 490.5 Z M 784.5 260.5 L 842.5 260.5 L 842.5 490.5 L 784.5 490.5 Z M 784.5 260.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/nor2/sky130_fd_sc_lp__nor2_m.svg b/cells/nor2/sky130_fd_sc_lp__nor2_m.svg
index 348bf71..e8b0abe 100644
--- a/cells/nor2/sky130_fd_sc_lp__nor2_m.svg
+++ b/cells/nor2/sky130_fd_sc_lp__nor2_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 756.5 111.5 L 1173.5 111.5 L 1173.5 539.5 L 756.5 539.5 Z M 756.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="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="#image309"/>
+  <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 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="#image309"/>
+  <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 1001.5 742.5 L 1035.5 742.5 L 1035.5 838.5 L 1001.5 838.5 Z M 902.5 742.5 L 937.5 742.5 L 937.5 838.5 L 902.5 838.5 Z M 902.5 742.5 "/>
 </clipPath>
-<image id="image310" 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="#image310"/>
+  <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 992.5 268.5 L 1026.5 268.5 L 1026.5 365.5 L 992.5 365.5 Z M 902.5 268.5 L 937.5 268.5 L 937.5 365.5 L 902.5 365.5 Z M 902.5 268.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image312" 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="#image312"/>
+  <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="surface306">
+<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 1095.441406 462.496094 L 1095.304688 464.652344 L 1094.96875 466.605469 L 1094.363281 468.421875 L 1093.554688 470.039062 L 1092.480469 471.585938 L 1091.199219 472.933594 L 1089.785156 474.078125 L 1088.304688 474.953125 L 1086.621094 475.625 L 1084.871094 476.164062 L 1082.988281 476.433594 L 1080.96875 476.5 L 1058.820312 476.5 L 1058.820312 427.421875 L 1078.746094 427.421875 L 1081.640625 427.625 L 1084.199219 428.097656 L 1086.488281 428.902344 L 1088.441406 430.046875 L 1090.121094 431.53125 L 1091.46875 433.347656 L 1092.007812 434.355469 L 1092.480469 435.433594 L 1092.816406 436.445312 L 1093.085938 437.589844 L 1093.21875 438.734375 L 1093.285156 439.878906 L 1093.085938 442.300781 L 1092.480469 444.386719 L 1091.535156 446.339844 L 1090.191406 447.957031 L 1088.507812 449.4375 L 1086.488281 450.582031 L 1088.441406 451.457031 L 1090.121094 452.398438 L 1091.605469 453.476562 L 1092.816406 454.6875 L 1093.757812 455.96875 L 1094.5 457.3125 L 1094.769531 458.121094 L 1094.96875 458.929688 L 1095.171875 459.738281 L 1095.304688 460.679688 L 1095.375 461.554688 Z M 1087.027344 440.753906 L 1086.824219 438.734375 L 1086.21875 437.050781 L 1085.277344 435.570312 L 1083.929688 434.492188 L 1082.246094 433.683594 L 1080.160156 433.144531 L 1079.6875 433.144531 L 1079.214844 433.078125 L 1078.746094 433.011719 L 1077.667969 433.011719 L 1077.195312 432.941406 L 1065.078125 432.941406 L 1065.078125 448.5625 L 1077.195312 448.5625 L 1079.6875 448.425781 L 1081.84375 448.023438 L 1083.660156 447.28125 L 1085.007812 446.273438 L 1086.082031 444.925781 L 1086.757812 443.3125 L 1086.824219 442.972656 L 1086.957031 442.167969 L 1086.957031 441.222656 Z M 1080.359375 470.980469 L 1082.246094 470.914062 L 1083.929688 470.507812 L 1085.410156 469.835938 L 1086.621094 468.960938 L 1087.632812 467.816406 L 1088.441406 466.402344 L 1088.640625 465.863281 L 1088.777344 465.257812 L 1088.976562 464.585938 L 1089.046875 463.976562 L 1089.113281 463.304688 L 1089.179688 462.566406 L 1089.046875 461.082031 L 1088.777344 459.667969 L 1088.304688 458.457031 L 1087.632812 457.3125 L 1086.757812 456.371094 L 1085.746094 455.496094 L 1085.007812 455.09375 L 1084.199219 454.753906 L 1083.324219 454.484375 L 1082.378906 454.285156 L 1081.371094 454.148438 L 1080.359375 454.082031 L 1065.078125 454.082031 L 1065.078125 470.980469 Z M 1080.359375 470.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 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/nor2b/sky130_fd_sc_lp__nor2b_1.svg b/cells/nor2b/sky130_fd_sc_lp__nor2b_1.svg
index 0119454..6e73089 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_1.svg
+++ b/cells/nor2b/sky130_fd_sc_lp__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 539.5 L 644.5 539.5 Z M 644.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="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1077.5 672.5 L 1111.5 672.5 L 1111.5 864.5 L 1077.5 864.5 Z M 839.5 768.5 L 874.5 768.5 L 874.5 864.5 L 839.5 864.5 Z M 978.5 672.5 L 1012.5 672.5 L 1012.5 864.5 L 978.5 864.5 Z M 978.5 672.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1060.5 209.5 L 1095.5 209.5 L 1095.5 498.5 L 1060.5 498.5 Z M 854.5 401.5 L 889.5 401.5 L 889.5 498.5 L 854.5 498.5 Z M 978.5 209.5 L 1012.5 209.5 L 1012.5 498.5 L 978.5 498.5 Z M 978.5 209.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 917.1875 512.574219 L 917.1875 561.652344 L 910.121094 561.652344 L 884.738281 521.863281 L 884.738281 561.652344 L 878.816406 561.652344 L 878.816406 512.574219 L 885.613281 512.574219 L 911.265625 552.699219 L 911.265625 512.574219 Z M 917.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 834 562 L 873 562 M 834 523 L 873 523 M 834 523 L 834 562 M 873 523 L 873 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 834 562 L 873 562 M 834 523 L 873 523 M 873 562 L 873 523 M 834 562 L 834 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/nor2b/sky130_fd_sc_lp__nor2b_2.svg b/cells/nor2b/sky130_fd_sc_lp__nor2b_2.svg
index 176f30c..be5c5ee 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_2.svg
+++ b/cells/nor2b/sky130_fd_sc_lp__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 539.5 L 533.5 539.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="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 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="#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 683.5 672.5 L 718.5 672.5 L 718.5 768.5 L 683.5 768.5 Z M 1074.5 672.5 L 1109.5 672.5 L 1109.5 864.5 L 1074.5 864.5 Z M 877.5 672.5 L 911.5 672.5 L 911.5 864.5 L 877.5 864.5 Z M 976.5 672.5 L 1010.5 672.5 L 1010.5 864.5 L 976.5 864.5 Z M 1173.5 672.5 L 1207.5 672.5 L 1207.5 864.5 L 1173.5 864.5 Z M 1173.5 672.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 1064.5 209.5 L 1098.5 209.5 L 1098.5 498.5 L 1064.5 498.5 Z M 746.5 401.5 L 781.5 401.5 L 781.5 498.5 L 746.5 498.5 Z M 1162.5 209.5 L 1197.5 209.5 L 1197.5 498.5 L 1162.5 498.5 Z M 965.5 209.5 L 1000.5 209.5 L 1000.5 498.5 L 965.5 498.5 Z M 867.5 209.5 L 901.5 209.5 L 901.5 498.5 L 867.5 498.5 Z M 867.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1296.554688 542.246094 L 1296.554688 561.5 L 1290.292969 561.5 L 1290.292969 542.246094 L 1271.375 512.421875 L 1279.117188 512.421875 L 1293.523438 536.320312 L 1307.527344 512.421875 L 1315 512.421875 Z M 1296.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 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/nor2b/sky130_fd_sc_lp__nor2b_4.svg b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.svg
index 9e650bb..abe4237 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_4.svg
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.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="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 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="#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 1347.5 672.5 L 1381.5 672.5 L 1381.5 864.5 L 1347.5 864.5 Z M 540.5 672.5 L 575.5 672.5 L 575.5 864.5 L 540.5 864.5 Z M 657.5 672.5 L 691.5 672.5 L 691.5 864.5 L 657.5 864.5 Z M 756.5 672.5 L 790.5 672.5 L 790.5 864.5 L 756.5 864.5 Z M 854.5 672.5 L 889.5 672.5 L 889.5 864.5 L 854.5 864.5 Z M 953.5 672.5 L 987.5 672.5 L 987.5 864.5 L 953.5 864.5 Z M 1051.5 672.5 L 1086.5 672.5 L 1086.5 864.5 L 1051.5 864.5 Z M 1150.5 672.5 L 1184.5 672.5 L 1184.5 864.5 L 1150.5 864.5 Z M 1248.5 672.5 L 1283.5 672.5 L 1283.5 864.5 L 1248.5 864.5 Z M 1248.5 672.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 1347.5 209.5 L 1381.5 209.5 L 1381.5 498.5 L 1347.5 498.5 Z M 540.5 209.5 L 575.5 209.5 L 575.5 498.5 L 540.5 498.5 Z M 657.5 209.5 L 691.5 209.5 L 691.5 498.5 L 657.5 498.5 Z M 756.5 209.5 L 790.5 209.5 L 790.5 498.5 L 756.5 498.5 Z M 854.5 209.5 L 889.5 209.5 L 889.5 498.5 L 854.5 498.5 Z M 953.5 209.5 L 987.5 209.5 L 987.5 498.5 L 953.5 498.5 Z M 1051.5 209.5 L 1086.5 209.5 L 1086.5 498.5 L 1051.5 498.5 Z M 1150.5 209.5 L 1184.5 209.5 L 1184.5 498.5 L 1150.5 498.5 Z M 1248.5 209.5 L 1283.5 209.5 L 1283.5 498.5 L 1248.5 498.5 Z M 1248.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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.554688 457.246094 L 1460.554688 476.5 L 1454.292969 476.5 L 1454.292969 457.246094 L 1435.375 427.421875 L 1443.117188 427.421875 L 1457.523438 451.320312 L 1471.527344 427.421875 L 1479 427.421875 Z M 1460.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 1436 647 L 1475 647 M 1436 608 L 1475 608 M 1436 608 L 1436 647 M 1475 608 L 1475 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 1436 647 L 1475 647 M 1436 608 L 1475 608 M 1475 647 L 1475 608 M 1436 647 L 1436 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/nor2b/sky130_fd_sc_lp__nor2b_lp.svg b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.svg
index 5d717af..7a33147 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.svg
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image324" 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="#image324"/>
+  <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 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="#image324"/>
+  <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 1211.5 757.5 L 1245.5 757.5 L 1245.5 853.5 L 1211.5 853.5 Z M 766.5 757.5 L 800.5 757.5 L 800.5 853.5 L 766.5 853.5 Z M 848.5 757.5 L 883.5 757.5 L 883.5 853.5 L 848.5 853.5 Z M 947.5 757.5 L 981.5 757.5 L 981.5 853.5 L 947.5 853.5 Z M 1030.5 757.5 L 1064.5 757.5 L 1064.5 853.5 L 1030.5 853.5 Z M 1128.5 757.5 L 1162.5 757.5 L 1162.5 853.5 L 1128.5 853.5 Z M 1128.5 757.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1188.5 220.5 L 1245.5 220.5 L 1245.5 449.5 L 1188.5 449.5 Z M 812.5 221.5 L 869.5 221.5 L 869.5 451.5 L 812.5 451.5 Z M 924.5 221.5 L 981.5 221.5 L 981.5 451.5 L 924.5 451.5 Z M 924.5 221.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface321">
+<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 966.554688 288.246094 L 966.554688 307.5 L 960.292969 307.5 L 960.292969 288.246094 L 941.375 258.421875 L 949.117188 258.421875 L 963.523438 282.320312 L 977.527344 258.421875 L 985 258.421875 Z M 966.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 942 816 L 981 816 M 942 777 L 981 777 M 942 777 L 942 816 M 981 777 L 981 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 942 816 L 981 816 M 942 777 L 981 777 M 981 816 L 981 777 M 942 816 L 942 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/nor2b/sky130_fd_sc_lp__nor2b_m.svg b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.svg
index 808263d..70b5ec0 100644
--- a/cells/nor2b/sky130_fd_sc_lp__nor2b_m.svg
+++ b/cells/nor2b/sky130_fd_sc_lp__nor2b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image343"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image343"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1064.5 742.5 L 1098.5 742.5 L 1098.5 838.5 L 1064.5 838.5 Z M 803.5 742.5 L 837.5 742.5 L 837.5 838.5 L 803.5 838.5 Z M 965.5 742.5 L 1000.5 742.5 L 1000.5 838.5 L 965.5 838.5 Z M 965.5 742.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1112.5 258.5 L 1146.5 258.5 L 1146.5 354.5 L 1112.5 354.5 Z M 895.5 258.5 L 930.5 258.5 L 930.5 354.5 L 895.5 354.5 Z M 1030.5 258.5 L 1064.5 258.5 L 1064.5 354.5 L 1030.5 354.5 Z M 1030.5 258.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface340">
+<g id="surface369">
 <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 1187.554688 288.246094 L 1187.554688 307.5 L 1181.292969 307.5 L 1181.292969 288.246094 L 1162.375 258.421875 L 1170.117188 258.421875 L 1184.523438 282.320312 L 1198.527344 258.421875 L 1206 258.421875 Z M 1187.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 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/nor3/sky130_fd_sc_lp__nor3_0.svg b/cells/nor3/sky130_fd_sc_lp__nor3_0.svg
index 17ef0b7..1c9cc8e 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_0.svg
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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="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="#image310"/>
+  <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 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="#image310"/>
+  <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 1039.5 747.5 L 1073.5 747.5 L 1073.5 844.5 L 1039.5 844.5 Z M 842.5 747.5 L 876.5 747.5 L 876.5 844.5 L 842.5 844.5 Z M 940.5 747.5 L 975.5 747.5 L 975.5 844.5 L 940.5 844.5 Z M 940.5 747.5 "/>
 </clipPath>
-<image id="image311" 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="#image311"/>
+  <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 1030.5 218.5 L 1064.5 218.5 L 1064.5 365.5 L 1030.5 365.5 Z M 851.5 218.5 L 885.5 218.5 L 885.5 365.5 L 851.5 365.5 Z M 940.5 218.5 L 975.5 218.5 L 975.5 365.5 L 940.5 365.5 Z M 940.5 218.5 "/>
 </clipPath>
-<image id="image312" 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="#image312"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image313" 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="#image313"/>
+  <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="surface307">
+<g id="surface334">
 <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 1023.554688 712.246094 L 1023.554688 731.5 L 1017.292969 731.5 L 1017.292969 712.246094 L 998.375 682.421875 L 1006.117188 682.421875 L 1020.523438 706.320312 L 1034.527344 682.421875 L 1042 682.421875 Z M 1023.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 1000 392 L 1039 392 M 1000 353 L 1039 353 M 1000 353 L 1000 392 M 1039 353 L 1039 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 1000 392 L 1039 392 M 1000 353 L 1039 353 M 1039 392 L 1039 353 M 1000 392 L 1000 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 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_lp__nor3_1.svg b/cells/nor3/sky130_fd_sc_lp__nor3_1.svg
index d19fc18..579c06d 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_1.svg
+++ b/cells/nor3/sky130_fd_sc_lp__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 539.5 L 701.5 539.5 Z M 701.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="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="#image295"/>
+  <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 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="#image295"/>
+  <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 1042.5 670.5 L 1077.5 670.5 L 1077.5 862.5 L 1042.5 862.5 Z M 836.5 670.5 L 870.5 670.5 L 870.5 862.5 L 836.5 862.5 Z M 934.5 670.5 L 969.5 670.5 L 969.5 862.5 L 934.5 862.5 Z M 934.5 670.5 "/>
 </clipPath>
-<image id="image296" 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="#image296"/>
+  <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 1042.5 209.5 L 1077.5 209.5 L 1077.5 498.5 L 1042.5 498.5 Z M 836.5 209.5 L 870.5 209.5 L 870.5 498.5 L 836.5 498.5 Z M 941.5 209.5 L 976.5 209.5 L 976.5 498.5 L 941.5 498.5 Z M 941.5 209.5 "/>
 </clipPath>
-<image id="image297" 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="#image297"/>
+  <use xlink:href="#image324"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image298" 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="#image298"/>
+  <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="surface292">
+<g id="surface319">
 <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 1133.554688 372.246094 L 1133.554688 391.5 L 1127.292969 391.5 L 1127.292969 372.246094 L 1108.375 342.421875 L 1116.117188 342.421875 L 1130.523438 366.320312 L 1144.527344 342.421875 L 1152 342.421875 Z M 1133.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 1110 731 L 1149 731 M 1110 693 L 1149 693 M 1110 693 L 1110 731 M 1149 693 L 1149 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 1110 731 L 1149 731 M 1110 693 L 1149 693 M 1149 731 L 1149 693 M 1110 731 L 1110 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 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_lp__nor3_2.svg b/cells/nor3/sky130_fd_sc_lp__nor3_2.svg
index 0eb0b37..86eba5d 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_2.svg
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1207.5 672.5 L 1242.5 672.5 L 1242.5 864.5 L 1207.5 864.5 Z M 698.5 672.5 L 733.5 672.5 L 733.5 864.5 L 698.5 864.5 Z M 801.5 672.5 L 836.5 672.5 L 836.5 864.5 L 801.5 864.5 Z M 900.5 672.5 L 934.5 672.5 L 934.5 864.5 L 900.5 864.5 Z M 1010.5 672.5 L 1044.5 672.5 L 1044.5 864.5 L 1010.5 864.5 Z M 1109.5 672.5 L 1143.5 672.5 L 1143.5 864.5 L 1109.5 864.5 Z M 1109.5 672.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 1276.5 209.5 L 1310.5 209.5 L 1310.5 498.5 L 1276.5 498.5 Z M 624.5 209.5 L 658.5 209.5 L 658.5 498.5 L 624.5 498.5 Z M 801.5 209.5 L 836.5 209.5 L 836.5 498.5 L 801.5 498.5 Z M 900.5 209.5 L 934.5 209.5 L 934.5 498.5 L 900.5 498.5 Z M 1010.5 209.5 L 1044.5 209.5 L 1044.5 498.5 L 1010.5 498.5 Z M 1109.5 209.5 L 1143.5 209.5 L 1143.5 498.5 L 1109.5 498.5 Z M 1109.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 587.410156 631.757812 L 568.492188 631.757812 L 563.308594 646.5 L 556.644531 646.5 L 574.148438 597.421875 L 582.226562 597.421875 L 599.460938 646.5 L 592.460938 646.5 Z M 585.660156 626.503906 L 578.121094 604.15625 L 570.042969 626.503906 Z M 585.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 557 477 L 596 477 M 557 438 L 596 438 M 557 438 L 557 477 M 596 438 L 596 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 557 477 L 596 477 M 557 438 L 596 438 M 596 477 L 596 438 M 557 477 L 557 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/nor3/sky130_fd_sc_lp__nor3_4.svg b/cells/nor3/sky130_fd_sc_lp__nor3_4.svg
index 2796d54..3ce86ac 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_4.svg
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 256.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="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 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="#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 1478.5 672.5 L 1512.5 672.5 L 1512.5 864.5 L 1478.5 864.5 Z M 394.5 672.5 L 428.5 672.5 L 428.5 864.5 L 394.5 864.5 Z M 492.5 672.5 L 526.5 672.5 L 526.5 864.5 L 492.5 864.5 Z M 591.5 672.5 L 625.5 672.5 L 625.5 864.5 L 591.5 864.5 Z M 689.5 672.5 L 724.5 672.5 L 724.5 864.5 L 689.5 864.5 Z M 788.5 672.5 L 822.5 672.5 L 822.5 864.5 L 788.5 864.5 Z M 886.5 672.5 L 921.5 672.5 L 921.5 864.5 L 886.5 864.5 Z M 985.5 672.5 L 1019.5 672.5 L 1019.5 864.5 L 985.5 864.5 Z M 1083.5 672.5 L 1118.5 672.5 L 1118.5 864.5 L 1083.5 864.5 Z M 1182.5 672.5 L 1216.5 672.5 L 1216.5 864.5 L 1182.5 864.5 Z M 1280.5 672.5 L 1315.5 672.5 L 1315.5 864.5 L 1280.5 864.5 Z M 1379.5 672.5 L 1413.5 672.5 L 1413.5 864.5 L 1379.5 864.5 Z M 1379.5 672.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 1478.5 209.5 L 1512.5 209.5 L 1512.5 498.5 L 1478.5 498.5 Z M 394.5 209.5 L 428.5 209.5 L 428.5 498.5 L 394.5 498.5 Z M 492.5 209.5 L 526.5 209.5 L 526.5 498.5 L 492.5 498.5 Z M 591.5 209.5 L 625.5 209.5 L 625.5 498.5 L 591.5 498.5 Z M 689.5 209.5 L 724.5 209.5 L 724.5 498.5 L 689.5 498.5 Z M 788.5 209.5 L 822.5 209.5 L 822.5 498.5 L 788.5 498.5 Z M 886.5 209.5 L 921.5 209.5 L 921.5 498.5 L 886.5 498.5 Z M 985.5 209.5 L 1019.5 209.5 L 1019.5 498.5 L 985.5 498.5 Z M 1083.5 209.5 L 1118.5 209.5 L 1118.5 498.5 L 1083.5 498.5 Z M 1182.5 209.5 L 1216.5 209.5 L 1216.5 498.5 L 1182.5 498.5 Z M 1280.5 209.5 L 1315.5 209.5 L 1315.5 498.5 L 1280.5 498.5 Z M 1379.5 209.5 L 1413.5 209.5 L 1413.5 498.5 L 1379.5 498.5 Z M 1379.5 209.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1215.730469 536.984375 L 1215.796875 534.292969 L 1216.066406 531.667969 L 1216.539062 529.175781 L 1217.144531 526.753906 L 1217.953125 524.464844 L 1219.03125 522.242188 L 1220.714844 519.347656 L 1222.800781 516.855469 L 1225.15625 514.835938 L 1227.847656 513.222656 L 1230.8125 512.078125 L 1234.175781 511.335938 L 1234.785156 511.269531 L 1235.457031 511.203125 L 1236.0625 511.132812 L 1237.410156 511.132812 L 1238.148438 511.066406 L 1242.457031 511.402344 L 1246.226562 512.414062 L 1249.460938 514.027344 L 1252.152344 516.316406 L 1254.304688 519.210938 L 1255.988281 522.78125 L 1256.394531 524.125 L 1256.59375 524.867188 L 1256.730469 525.609375 L 1256.863281 526.347656 L 1257.066406 527.089844 L 1250.671875 527.089844 L 1249.996094 524.734375 L 1249.121094 522.714844 L 1248.046875 520.960938 L 1246.632812 519.480469 L 1245.082031 518.335938 L 1243.265625 517.460938 L 1242.390625 517.191406 L 1241.449219 516.992188 L 1240.503906 516.855469 L 1239.496094 516.722656 L 1238.484375 516.652344 L 1237.410156 516.585938 L 1235.050781 516.789062 L 1232.898438 517.261719 L 1230.878906 518 L 1229.0625 519.144531 L 1227.378906 520.558594 L 1225.964844 522.242188 L 1224.753906 524.195312 L 1223.742188 526.347656 L 1222.933594 528.703125 L 1222.394531 531.261719 L 1222.058594 534.023438 L 1221.992188 536.917969 L 1222.058594 540.082031 L 1222.464844 542.910156 L 1223.136719 545.601562 L 1224.078125 547.957031 L 1225.292969 550.179688 L 1226.773438 552.066406 L 1228.253906 553.613281 L 1229.867188 554.824219 L 1231.621094 555.769531 L 1233.570312 556.441406 L 1235.660156 556.84375 L 1237.949219 556.980469 L 1240.371094 556.84375 L 1242.59375 556.375 L 1244.613281 555.566406 L 1246.296875 554.421875 L 1247.777344 552.941406 L 1249.054688 551.121094 L 1249.59375 550.046875 L 1250.066406 548.832031 L 1250.535156 547.554688 L 1250.941406 546.140625 L 1251.277344 544.660156 L 1251.613281 543.042969 L 1258.078125 543.042969 L 1256.863281 549.035156 L 1254.84375 553.882812 L 1251.882812 557.652344 L 1248.113281 560.347656 L 1243.402344 561.894531 L 1237.878906 562.5 L 1233.976562 562.230469 L 1230.476562 561.421875 L 1227.3125 560.210938 L 1224.484375 558.394531 L 1221.992188 556.039062 L 1219.90625 553.140625 L 1218.695312 551.054688 L 1217.683594 548.765625 L 1216.875 546.34375 L 1216.269531 543.785156 L 1215.867188 541.09375 L 1215.730469 538.265625 Z M 1215.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 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/nor3/sky130_fd_sc_lp__nor3_lp.svg b/cells/nor3/sky130_fd_sc_lp__nor3_lp.svg
index b0a3252..b28791a 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_lp.svg
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="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 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="#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 1185.5 757.5 L 1220.5 757.5 L 1220.5 853.5 L 1185.5 853.5 Z M 741.5 757.5 L 775.5 757.5 L 775.5 853.5 L 741.5 853.5 Z M 823.5 757.5 L 858.5 757.5 L 858.5 853.5 L 823.5 853.5 Z M 922.5 757.5 L 956.5 757.5 L 956.5 853.5 L 922.5 853.5 Z M 1004.5 757.5 L 1039.5 757.5 L 1039.5 853.5 L 1004.5 853.5 Z M 1103.5 757.5 L 1137.5 757.5 L 1137.5 853.5 L 1103.5 853.5 Z M 1103.5 757.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 1103.5 220.5 L 1160.5 220.5 L 1160.5 449.5 L 1103.5 449.5 Z M 860.5 220.5 L 917.5 220.5 L 917.5 449.5 L 860.5 449.5 Z M 972.5 220.5 L 1030.5 220.5 L 1030.5 449.5 L 972.5 449.5 Z M 972.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 746.554688 288.246094 L 746.554688 307.5 L 740.292969 307.5 L 740.292969 288.246094 L 721.375 258.421875 L 729.117188 258.421875 L 743.523438 282.320312 L 757.527344 258.421875 L 765 258.421875 Z M 746.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 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/nor3/sky130_fd_sc_lp__nor3_m.svg b/cells/nor3/sky130_fd_sc_lp__nor3_m.svg
index 5f43ff3..b3c6808 100644
--- a/cells/nor3/sky130_fd_sc_lp__nor3_m.svg
+++ b/cells/nor3/sky130_fd_sc_lp__nor3_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.5 111.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image305"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1039.5 747.5 L 1073.5 747.5 L 1073.5 844.5 L 1039.5 844.5 Z M 842.5 747.5 L 876.5 747.5 L 876.5 844.5 L 842.5 844.5 Z M 940.5 747.5 L 975.5 747.5 L 975.5 844.5 L 940.5 844.5 Z M 940.5 747.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1030.5 268.5 L 1064.5 268.5 L 1064.5 365.5 L 1030.5 365.5 Z M 851.5 268.5 L 885.5 268.5 L 885.5 365.5 L 851.5 365.5 Z M 940.5 268.5 L 975.5 268.5 L 975.5 365.5 L 940.5 365.5 Z M 940.5 268.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface302">
+<g id="surface329">
 <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 913.554688 712.246094 L 913.554688 731.5 L 907.292969 731.5 L 907.292969 712.246094 L 888.375 682.421875 L 896.117188 682.421875 L 910.523438 706.320312 L 924.527344 682.421875 L 932 682.421875 Z M 913.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 890 392 L 929 392 M 890 353 L 929 353 M 890 353 L 890 392 M 929 353 L 929 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 890 392 L 929 392 M 890 353 L 929 353 M 929 392 L 929 353 M 890 392 L 890 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 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/nor3b/sky130_fd_sc_lp__nor3b_1.svg b/cells/nor3b/sky130_fd_sc_lp__nor3b_1.svg
index 1a4b65e..88d6e60 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_1.svg
+++ b/cells/nor3b/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image314"/>
+  <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 788.5 672.5 L 822.5 672.5 L 822.5 768.5 L 788.5 768.5 Z M 1020.5 672.5 L 1055.5 672.5 L 1055.5 864.5 L 1020.5 864.5 Z M 914.5 672.5 L 948.5 672.5 L 948.5 864.5 L 914.5 864.5 Z M 1120.5 672.5 L 1154.5 672.5 L 1154.5 864.5 L 1120.5 864.5 Z M 1120.5 672.5 "/>
 </clipPath>
-<image id="image315" 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="#image315"/>
+  <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 1120.5 209.5 L 1154.5 209.5 L 1154.5 498.5 L 1120.5 498.5 Z M 788.5 401.5 L 822.5 401.5 L 822.5 498.5 L 788.5 498.5 Z M 996.5 209.5 L 1031.5 209.5 L 1031.5 498.5 L 996.5 498.5 Z M 914.5 209.5 L 948.5 209.5 L 948.5 498.5 L 914.5 498.5 Z M 914.5 209.5 "/>
 </clipPath>
-<image id="image316" 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="#image316"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image317" 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="#image317"/>
+  <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="surface311">
+<g id="surface339">
 <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 1242.554688 288.246094 L 1242.554688 307.5 L 1236.292969 307.5 L 1236.292969 288.246094 L 1217.375 258.421875 L 1225.117188 258.421875 L 1239.523438 282.320312 L 1253.527344 258.421875 L 1261 258.421875 Z M 1242.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 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/nor3b/sky130_fd_sc_lp__nor3b_2.svg b/cells/nor3b/sky130_fd_sc_lp__nor3b_2.svg
index 9fd4808..02d6e61 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_2.svg
+++ b/cells/nor3b/sky130_fd_sc_lp__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 539.5 L 367.5 539.5 Z M 618.5 539.5 L 1152.5 539.5 L 1152.5 541.5 L 618.5 541.5 Z M 618.5 539.5 "/>
 </clipPath>
-<image id="image315" 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="#image315"/>
+  <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 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="#image315"/>
+  <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 502.5 672.5 L 537.5 672.5 L 537.5 768.5 L 502.5 768.5 Z M 1074.5 672.5 L 1109.5 672.5 L 1109.5 864.5 L 1074.5 864.5 Z M 734.5 672.5 L 768.5 672.5 L 768.5 864.5 L 734.5 864.5 Z M 856.5 672.5 L 891.5 672.5 L 891.5 864.5 L 856.5 864.5 Z M 976.5 672.5 L 1010.5 672.5 L 1010.5 864.5 L 976.5 864.5 Z M 1271.5 672.5 L 1306.5 672.5 L 1306.5 864.5 L 1271.5 864.5 Z M 1173.5 672.5 L 1207.5 672.5 L 1207.5 864.5 L 1173.5 864.5 Z M 1173.5 672.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 502.5 240.5 L 537.5 240.5 L 537.5 336.5 L 502.5 336.5 Z M 1384.5 209.5 L 1418.5 209.5 L 1418.5 498.5 L 1384.5 498.5 Z M 1285.5 209.5 L 1319.5 209.5 L 1319.5 498.5 L 1285.5 498.5 Z M 1016.5 211.5 L 1050.5 211.5 L 1050.5 500.5 L 1016.5 500.5 Z M 917.5 211.5 L 952.5 211.5 L 952.5 500.5 L 917.5 500.5 Z M 720.5 211.5 L 755.5 211.5 L 755.5 500.5 L 720.5 500.5 Z M 819.5 211.5 L 853.5 211.5 L 853.5 500.5 L 819.5 500.5 Z M 819.5 211.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface312">
+<g id="surface341">
 <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 532.890625 427.574219 L 532.890625 476.652344 L 525.824219 476.652344 L 500.441406 436.863281 L 500.441406 476.652344 L 494.519531 476.652344 L 494.519531 427.574219 L 501.316406 427.574219 L 526.96875 467.699219 L 526.96875 427.574219 Z M 532.890625 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 446 647 L 485 647 M 446 608 L 485 608 M 446 608 L 446 647 M 485 608 L 485 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 446 647 L 485 647 M 446 608 L 485 608 M 485 647 L 485 608 M 446 647 L 446 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/nor3b/sky130_fd_sc_lp__nor3b_4.svg b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.svg
index 406f632..c356030 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_4.svg
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 539.5 L 174.5 539.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image291" 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="#image291"/>
+  <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 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="#image291"/>
+  <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 1561.5 667.5 L 1594.5 667.5 L 1594.5 852.5 L 1561.5 852.5 Z M 357.5 667.5 L 390.5 667.5 L 390.5 852.5 L 357.5 852.5 Z M 469.5 667.5 L 503.5 667.5 L 503.5 852.5 L 469.5 852.5 Z M 564.5 667.5 L 598.5 667.5 L 598.5 852.5 L 564.5 852.5 Z M 677.5 667.5 L 710.5 667.5 L 710.5 852.5 L 677.5 852.5 Z M 772.5 667.5 L 805.5 667.5 L 805.5 852.5 L 772.5 852.5 Z M 867.5 667.5 L 900.5 667.5 L 900.5 852.5 L 867.5 852.5 Z M 962.5 667.5 L 995.5 667.5 L 995.5 852.5 L 962.5 852.5 Z M 1057.5 667.5 L 1090.5 667.5 L 1090.5 852.5 L 1057.5 852.5 Z M 1152.5 667.5 L 1185.5 667.5 L 1185.5 852.5 L 1152.5 852.5 Z M 1276.5 667.5 L 1309.5 667.5 L 1309.5 852.5 L 1276.5 852.5 Z M 1371.5 667.5 L 1404.5 667.5 L 1404.5 852.5 L 1371.5 852.5 Z M 1466.5 667.5 L 1499.5 667.5 L 1499.5 852.5 L 1466.5 852.5 Z M 1466.5 667.5 "/>
 </clipPath>
-<image id="image292" 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="#image292"/>
+  <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 1576.5 220.5 L 1609.5 220.5 L 1609.5 499.5 L 1576.5 499.5 Z M 321.5 220.5 L 354.5 220.5 L 354.5 499.5 L 321.5 499.5 Z M 416.5 220.5 L 449.5 220.5 L 449.5 499.5 L 416.5 499.5 Z M 511.5 220.5 L 545.5 220.5 L 545.5 499.5 L 511.5 499.5 Z M 606.5 220.5 L 640.5 220.5 L 640.5 499.5 L 606.5 499.5 Z M 701.5 220.5 L 735.5 220.5 L 735.5 499.5 L 701.5 499.5 Z M 911.5 220.5 L 944.5 220.5 L 944.5 499.5 L 911.5 499.5 Z M 1006.5 220.5 L 1039.5 220.5 L 1039.5 499.5 L 1006.5 499.5 Z M 1101.5 220.5 L 1134.5 220.5 L 1134.5 499.5 L 1101.5 499.5 Z M 1196.5 220.5 L 1229.5 220.5 L 1229.5 499.5 L 1196.5 499.5 Z M 1291.5 220.5 L 1324.5 220.5 L 1324.5 499.5 L 1291.5 499.5 Z M 1386.5 220.5 L 1419.5 220.5 L 1419.5 499.5 L 1386.5 499.5 Z M 1481.5 220.5 L 1514.5 220.5 L 1514.5 499.5 L 1481.5 499.5 Z M 1481.5 220.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image294" 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="#image294"/>
+  <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="surface288">
+<g id="surface317">
 <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.46875 624.046875 L 1652.46875 642.5 L 1646.46875 642.5 L 1646.46875 624.046875 L 1628.339844 595.46875 L 1635.757812 595.46875 L 1649.566406 618.371094 L 1662.984375 595.46875 L 1670.144531 595.46875 Z M 1652.46875 624.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 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/nor3b/sky130_fd_sc_lp__nor3b_lp.svg b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.svg
index 0541e7a..90f2caa 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.svg
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <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 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="#image332"/>
+  <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 1269.5 757.5 L 1303.5 757.5 L 1303.5 853.5 L 1269.5 853.5 Z M 643.5 757.5 L 678.5 757.5 L 678.5 853.5 L 643.5 853.5 Z M 726.5 757.5 L 760.5 757.5 L 760.5 853.5 L 726.5 853.5 Z M 824.5 757.5 L 859.5 757.5 L 859.5 853.5 L 824.5 853.5 Z M 907.5 757.5 L 941.5 757.5 L 941.5 853.5 L 907.5 853.5 Z M 1005.5 757.5 L 1040.5 757.5 L 1040.5 853.5 L 1005.5 853.5 Z M 1088.5 757.5 L 1122.5 757.5 L 1122.5 853.5 L 1088.5 853.5 Z M 1187.5 757.5 L 1221.5 757.5 L 1221.5 853.5 L 1187.5 853.5 Z M 1187.5 757.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <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 1246.5 220.5 L 1303.5 220.5 L 1303.5 449.5 L 1246.5 449.5 Z M 680.5 220.5 L 737.5 220.5 L 737.5 449.5 L 680.5 449.5 Z M 792.5 220.5 L 850.5 220.5 L 850.5 449.5 L 792.5 449.5 Z M 923.5 220.5 L 980.5 220.5 L 980.5 449.5 L 923.5 449.5 Z M 923.5 220.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image335" 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="#image335"/>
+  <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="surface329">
+<g id="surface357">
 <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 691.554688 796.246094 L 691.554688 815.5 L 685.292969 815.5 L 685.292969 796.246094 L 666.375 766.421875 L 674.117188 766.421875 L 688.523438 790.320312 L 702.527344 766.421875 L 710 766.421875 Z M 691.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 667 307 L 706 307 M 667 269 L 706 269 M 667 269 L 667 307 M 706 269 L 706 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 667 307 L 706 307 M 667 269 L 706 269 M 706 307 L 706 269 M 667 307 L 667 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/nor3b/sky130_fd_sc_lp__nor3b_m.svg b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.svg
index 5bd17c6..3c9da4e 100644
--- a/cells/nor3b/sky130_fd_sc_lp__nor3b_m.svg
+++ b/cells/nor3b/sky130_fd_sc_lp__nor3b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1112.5 757.5 L 1146.5 757.5 L 1146.5 853.5 L 1112.5 853.5 Z M 816.5 757.5 L 851.5 757.5 L 851.5 853.5 L 816.5 853.5 Z M 915.5 757.5 L 949.5 757.5 L 949.5 853.5 L 915.5 853.5 Z M 1013.5 757.5 L 1048.5 757.5 L 1048.5 853.5 L 1013.5 853.5 Z M 1013.5 757.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 1105.5 319.5 L 1140.5 319.5 L 1140.5 415.5 L 1105.5 415.5 Z M 780.5 319.5 L 814.5 319.5 L 814.5 415.5 L 780.5 415.5 Z M 903.5 319.5 L 938.5 319.5 L 938.5 415.5 L 903.5 415.5 Z M 986.5 319.5 L 1020.5 319.5 L 1020.5 415.5 L 986.5 415.5 Z M 986.5 319.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1187.554688 627.246094 L 1187.554688 646.5 L 1181.292969 646.5 L 1181.292969 627.246094 L 1162.375 597.421875 L 1170.117188 597.421875 L 1184.523438 621.320312 L 1198.527344 597.421875 L 1206 597.421875 Z M 1187.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 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/nor4/sky130_fd_sc_lp__nor4_0.svg b/cells/nor4/sky130_fd_sc_lp__nor4_0.svg
index 257c441..3f40e55 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_0.svg
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.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 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="#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 1121.5 742.5 L 1156.5 742.5 L 1156.5 838.5 L 1121.5 838.5 Z M 748.5 742.5 L 782.5 742.5 L 782.5 838.5 L 748.5 838.5 Z M 846.5 742.5 L 881.5 742.5 L 881.5 838.5 L 846.5 838.5 Z M 1023.5 742.5 L 1057.5 742.5 L 1057.5 838.5 L 1023.5 838.5 Z M 1023.5 742.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 1066.5 218.5 L 1101.5 218.5 L 1101.5 365.5 L 1066.5 365.5 Z M 798.5 218.5 L 832.5 218.5 L 832.5 365.5 L 798.5 365.5 Z M 887.5 218.5 L 922.5 218.5 L 922.5 365.5 L 887.5 365.5 Z M 977.5 218.5 L 1011.5 218.5 L 1011.5 365.5 L 977.5 365.5 Z M 977.5 218.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1222.492188 391.5 L 1222.492188 342.421875 L 1241.410156 342.421875 L 1244.371094 342.625 L 1247.132812 343.164062 L 1249.6875 344.105469 L 1252.046875 345.316406 L 1254.132812 347 L 1256.085938 348.953125 L 1257.699219 351.308594 L 1259.046875 353.867188 L 1260.058594 356.761719 L 1260.796875 359.859375 L 1261.203125 363.292969 L 1261.402344 366.929688 L 1261.203125 370.765625 L 1260.730469 374.332031 L 1259.921875 377.566406 L 1258.84375 380.527344 L 1257.429688 383.152344 L 1255.679688 385.441406 L 1253.796875 387.324219 L 1251.707031 388.808594 L 1249.421875 390.019531 L 1246.929688 390.828125 L 1244.234375 391.367188 L 1241.410156 391.5 Z M 1228.753906 385.980469 L 1240.332031 385.980469 L 1243.429688 385.777344 L 1246.1875 385.039062 L 1248.613281 383.757812 L 1250.632812 382.074219 L 1252.246094 379.785156 L 1253.59375 377.027344 L 1253.996094 375.613281 L 1254.402344 374.132812 L 1254.738281 372.515625 L 1254.941406 370.765625 L 1255.074219 368.949219 L 1255.140625 366.996094 L 1254.875 362.621094 L 1254.199219 358.78125 L 1252.988281 355.484375 L 1251.371094 352.859375 L 1249.285156 350.703125 L 1246.726562 349.15625 L 1245.785156 348.820312 L 1244.773438 348.480469 L 1243.699219 348.28125 L 1242.621094 348.078125 L 1241.476562 348.011719 L 1240.332031 347.941406 L 1228.753906 347.941406 Z M 1228.753906 385.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 1219 731 L 1258 731 M 1219 693 L 1258 693 M 1219 693 L 1219 731 M 1258 693 L 1258 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 1219 731 L 1258 731 M 1219 693 L 1258 693 M 1258 731 L 1258 693 M 1219 731 L 1219 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 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_lp__nor4_1.svg b/cells/nor4/sky130_fd_sc_lp__nor4_1.svg
index 6b96afc..5d6101c 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_1.svg
+++ b/cells/nor4/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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 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="#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 1071.5 672.5 L 1105.5 672.5 L 1105.5 864.5 L 1071.5 864.5 Z M 725.5 672.5 L 759.5 672.5 L 759.5 864.5 L 725.5 864.5 Z M 823.5 672.5 L 858.5 672.5 L 858.5 864.5 L 823.5 864.5 Z M 972.5 672.5 L 1007.5 672.5 L 1007.5 864.5 L 972.5 864.5 Z M 972.5 672.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 1071.5 209.5 L 1105.5 209.5 L 1105.5 498.5 L 1071.5 498.5 Z M 725.5 209.5 L 759.5 209.5 L 759.5 498.5 L 725.5 498.5 Z M 835.5 209.5 L 869.5 209.5 L 869.5 498.5 L 835.5 498.5 Z M 947.5 209.5 L 981.5 209.5 L 981.5 498.5 L 947.5 498.5 Z M 947.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 819.441406 462.496094 L 819.304688 464.652344 L 818.96875 466.605469 L 818.363281 468.421875 L 817.554688 470.039062 L 816.480469 471.585938 L 815.199219 472.933594 L 813.785156 474.078125 L 812.304688 474.953125 L 810.621094 475.625 L 808.871094 476.164062 L 806.988281 476.433594 L 804.96875 476.5 L 782.820312 476.5 L 782.820312 427.421875 L 802.746094 427.421875 L 805.640625 427.625 L 808.199219 428.097656 L 810.488281 428.902344 L 812.441406 430.046875 L 814.121094 431.53125 L 815.46875 433.347656 L 816.007812 434.355469 L 816.480469 435.433594 L 816.816406 436.445312 L 817.085938 437.589844 L 817.21875 438.734375 L 817.285156 439.878906 L 817.085938 442.300781 L 816.480469 444.386719 L 815.535156 446.339844 L 814.191406 447.957031 L 812.507812 449.4375 L 810.488281 450.582031 L 812.441406 451.457031 L 814.121094 452.398438 L 815.605469 453.476562 L 816.816406 454.6875 L 817.757812 455.96875 L 818.5 457.3125 L 818.769531 458.121094 L 818.96875 458.929688 L 819.171875 459.738281 L 819.304688 460.679688 L 819.375 461.554688 Z M 811.027344 440.753906 L 810.824219 438.734375 L 810.21875 437.050781 L 809.277344 435.570312 L 807.929688 434.492188 L 806.246094 433.683594 L 804.160156 433.144531 L 803.6875 433.144531 L 803.214844 433.078125 L 802.746094 433.011719 L 801.667969 433.011719 L 801.195312 432.941406 L 789.078125 432.941406 L 789.078125 448.5625 L 801.195312 448.5625 L 803.6875 448.425781 L 805.84375 448.023438 L 807.660156 447.28125 L 809.007812 446.273438 L 810.082031 444.925781 L 810.757812 443.3125 L 810.824219 442.972656 L 810.957031 442.167969 L 810.957031 441.222656 Z M 804.359375 470.980469 L 806.246094 470.914062 L 807.929688 470.507812 L 809.410156 469.835938 L 810.621094 468.960938 L 811.632812 467.816406 L 812.441406 466.402344 L 812.640625 465.863281 L 812.777344 465.257812 L 812.976562 464.585938 L 813.046875 463.976562 L 813.113281 463.304688 L 813.179688 462.566406 L 813.046875 461.082031 L 812.777344 459.667969 L 812.304688 458.457031 L 811.632812 457.3125 L 810.757812 456.371094 L 809.746094 455.496094 L 809.007812 455.09375 L 808.199219 454.753906 L 807.324219 454.484375 L 806.378906 454.285156 L 805.371094 454.148438 L 804.359375 454.082031 L 789.078125 454.082031 L 789.078125 470.980469 Z M 804.359375 470.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 779 647 L 818 647 M 779 608 L 818 608 M 779 608 L 779 647 M 818 608 L 818 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 779 647 L 818 647 M 779 608 L 818 608 M 818 647 L 818 608 M 779 647 L 779 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 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_lp__nor4_2.svg b/cells/nor4/sky130_fd_sc_lp__nor4_2.svg
index 9b1e390..64461d1 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_2.svg
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.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 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="#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 1290.5 672.5 L 1324.5 672.5 L 1324.5 864.5 L 1290.5 864.5 Z M 556.5 672.5 L 591.5 672.5 L 591.5 864.5 L 556.5 864.5 Z M 655.5 672.5 L 689.5 672.5 L 689.5 864.5 L 655.5 864.5 Z M 753.5 672.5 L 788.5 672.5 L 788.5 864.5 L 753.5 864.5 Z M 852.5 672.5 L 886.5 672.5 L 886.5 864.5 L 852.5 864.5 Z M 994.5 672.5 L 1028.5 672.5 L 1028.5 864.5 L 994.5 864.5 Z M 1093.5 672.5 L 1127.5 672.5 L 1127.5 864.5 L 1093.5 864.5 Z M 1191.5 672.5 L 1225.5 672.5 L 1225.5 864.5 L 1191.5 864.5 Z M 1191.5 672.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 1306.5 209.5 L 1340.5 209.5 L 1340.5 498.5 L 1306.5 498.5 Z M 556.5 209.5 L 591.5 209.5 L 591.5 498.5 L 556.5 498.5 Z M 655.5 209.5 L 689.5 209.5 L 689.5 498.5 L 655.5 498.5 Z M 753.5 209.5 L 788.5 209.5 L 788.5 498.5 L 753.5 498.5 Z M 852.5 209.5 L 886.5 209.5 L 886.5 498.5 L 852.5 498.5 Z M 1010.5 209.5 L 1044.5 209.5 L 1044.5 498.5 L 1010.5 498.5 Z M 1109.5 209.5 L 1143.5 209.5 L 1143.5 498.5 L 1109.5 498.5 Z M 1207.5 209.5 L 1242.5 209.5 L 1242.5 498.5 L 1207.5 498.5 Z M 1207.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1460.554688 627.246094 L 1460.554688 646.5 L 1454.292969 646.5 L 1454.292969 627.246094 L 1435.375 597.421875 L 1443.117188 597.421875 L 1457.523438 621.320312 L 1471.527344 597.421875 L 1479 597.421875 Z M 1460.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 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/nor4/sky130_fd_sc_lp__nor4_4.svg b/cells/nor4/sky130_fd_sc_lp__nor4_4.svg
index 1fd3181..2e68825 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_4.svg
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1605.5 644.5 L 1633.5 644.5 L 1633.5 799.5 L 1605.5 799.5 Z M 337.5 644.5 L 364.5 644.5 L 364.5 799.5 L 337.5 799.5 Z M 416.5 644.5 L 443.5 644.5 L 443.5 799.5 L 416.5 799.5 Z M 495.5 644.5 L 523.5 644.5 L 523.5 799.5 L 495.5 799.5 Z M 574.5 644.5 L 602.5 644.5 L 602.5 799.5 L 574.5 799.5 Z M 736.5 644.5 L 763.5 644.5 L 763.5 799.5 L 736.5 799.5 Z M 815.5 644.5 L 842.5 644.5 L 842.5 799.5 L 815.5 799.5 Z M 894.5 644.5 L 921.5 644.5 L 921.5 799.5 L 894.5 799.5 Z M 973.5 644.5 L 1001.5 644.5 L 1001.5 799.5 L 973.5 799.5 Z M 1052.5 644.5 L 1080.5 644.5 L 1080.5 799.5 L 1052.5 799.5 Z M 1131.5 644.5 L 1159.5 644.5 L 1159.5 799.5 L 1131.5 799.5 Z M 1210.5 644.5 L 1238.5 644.5 L 1238.5 799.5 L 1210.5 799.5 Z M 1289.5 644.5 L 1317.5 644.5 L 1317.5 799.5 L 1289.5 799.5 Z M 1368.5 644.5 L 1396.5 644.5 L 1396.5 799.5 L 1368.5 799.5 Z M 1447.5 644.5 L 1475.5 644.5 L 1475.5 799.5 L 1447.5 799.5 Z M 1526.5 644.5 L 1554.5 644.5 L 1554.5 799.5 L 1526.5 799.5 Z M 1526.5 644.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1605.5 273.5 L 1633.5 273.5 L 1633.5 504.5 L 1605.5 504.5 Z M 324.5 273.5 L 352.5 273.5 L 352.5 504.5 L 324.5 504.5 Z M 403.5 273.5 L 431.5 273.5 L 431.5 504.5 L 403.5 504.5 Z M 482.5 273.5 L 510.5 273.5 L 510.5 504.5 L 482.5 504.5 Z M 561.5 273.5 L 589.5 273.5 L 589.5 504.5 L 561.5 504.5 Z M 640.5 273.5 L 668.5 273.5 L 668.5 504.5 L 640.5 504.5 Z M 719.5 273.5 L 747.5 273.5 L 747.5 504.5 L 719.5 504.5 Z M 798.5 273.5 L 826.5 273.5 L 826.5 504.5 L 798.5 504.5 Z M 877.5 273.5 L 905.5 273.5 L 905.5 504.5 L 877.5 504.5 Z M 1052.5 273.5 L 1080.5 273.5 L 1080.5 504.5 L 1052.5 504.5 Z M 1131.5 273.5 L 1159.5 273.5 L 1159.5 504.5 L 1131.5 504.5 Z M 1210.5 273.5 L 1238.5 273.5 L 1238.5 504.5 L 1210.5 504.5 Z M 1289.5 273.5 L 1317.5 273.5 L 1317.5 504.5 L 1289.5 504.5 Z M 1368.5 273.5 L 1396.5 273.5 L 1396.5 504.5 L 1368.5 504.5 Z M 1447.5 273.5 L 1475.5 273.5 L 1475.5 504.5 L 1447.5 504.5 Z M 1526.5 273.5 L 1554.5 273.5 L 1554.5 504.5 L 1526.5 504.5 Z M 1526.5 273.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface327">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -170,6 +170,5 @@
 <path style=" 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 607.855469 L 1668.667969 623.5 L 1663.582031 623.5 L 1663.582031 607.855469 L 1648.210938 583.625 L 1654.5 583.625 L 1666.207031 603.042969 L 1677.585938 583.625 L 1683.65625 583.625 Z M 1668.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 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/nor4/sky130_fd_sc_lp__nor4_lp.svg b/cells/nor4/sky130_fd_sc_lp__nor4_lp.svg
index dce0904..1c614cb 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_lp.svg
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 761.5 539.5 L 1032.5 539.5 L 1032.5 580.5 L 761.5 580.5 Z M 761.5 539.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 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="#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 1271.5 757.5 L 1306.5 757.5 L 1306.5 853.5 L 1271.5 853.5 Z M 646.5 757.5 L 680.5 757.5 L 680.5 853.5 L 646.5 853.5 Z M 728.5 757.5 L 763.5 757.5 L 763.5 853.5 L 728.5 853.5 Z M 827.5 757.5 L 861.5 757.5 L 861.5 853.5 L 827.5 853.5 Z M 909.5 757.5 L 944.5 757.5 L 944.5 853.5 L 909.5 853.5 Z M 1008.5 757.5 L 1042.5 757.5 L 1042.5 853.5 L 1008.5 853.5 Z M 1090.5 757.5 L 1125.5 757.5 L 1125.5 853.5 L 1090.5 853.5 Z M 1189.5 757.5 L 1223.5 757.5 L 1223.5 853.5 L 1189.5 853.5 Z M 1189.5 757.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 618.5 220.5 L 675.5 220.5 L 675.5 449.5 L 618.5 449.5 Z M 1230.5 220.5 L 1287.5 220.5 L 1287.5 449.5 L 1230.5 449.5 Z M 1118.5 220.5 L 1175.5 220.5 L 1175.5 449.5 L 1118.5 449.5 Z M 868.5 310.5 L 925.5 310.5 L 925.5 539.5 L 868.5 539.5 Z M 868.5 310.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 801.554688 542.246094 L 801.554688 561.5 L 795.292969 561.5 L 795.292969 542.246094 L 776.375 512.421875 L 784.117188 512.421875 L 798.523438 536.320312 L 812.527344 512.421875 L 820 512.421875 Z M 801.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 777 562 L 816 562 M 777 523 L 816 523 M 777 523 L 777 562 M 816 523 L 816 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 777 562 L 816 562 M 777 523 L 816 523 M 816 562 L 816 523 M 777 562 L 777 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/nor4/sky130_fd_sc_lp__nor4_m.svg b/cells/nor4/sky130_fd_sc_lp__nor4_m.svg
index 6cdef52..a35a119 100644
--- a/cells/nor4/sky130_fd_sc_lp__nor4_m.svg
+++ b/cells/nor4/sky130_fd_sc_lp__nor4_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.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 1107.5 742.5 L 1142.5 742.5 L 1142.5 838.5 L 1107.5 838.5 Z M 757.5 742.5 L 791.5 742.5 L 791.5 838.5 L 757.5 838.5 Z M 855.5 742.5 L 890.5 742.5 L 890.5 838.5 L 855.5 838.5 Z M 1009.5 742.5 L 1043.5 742.5 L 1043.5 838.5 L 1009.5 838.5 Z M 1009.5 742.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 1066.5 268.5 L 1101.5 268.5 L 1101.5 365.5 L 1066.5 365.5 Z M 798.5 268.5 L 832.5 268.5 L 832.5 365.5 L 798.5 365.5 Z M 887.5 268.5 L 922.5 268.5 L 922.5 365.5 L 887.5 365.5 Z M 977.5 268.5 L 1011.5 268.5 L 1011.5 365.5 L 977.5 365.5 Z M 977.5 268.5 "/>
 </clipPath>
-<image id="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 999.730469 536.984375 L 999.796875 534.292969 L 1000.066406 531.667969 L 1000.539062 529.175781 L 1001.144531 526.753906 L 1001.953125 524.464844 L 1003.03125 522.242188 L 1004.714844 519.347656 L 1006.800781 516.855469 L 1009.15625 514.835938 L 1011.847656 513.222656 L 1014.8125 512.078125 L 1018.175781 511.335938 L 1018.785156 511.269531 L 1019.457031 511.203125 L 1020.0625 511.132812 L 1021.410156 511.132812 L 1022.148438 511.066406 L 1026.457031 511.402344 L 1030.226562 512.414062 L 1033.460938 514.027344 L 1036.152344 516.316406 L 1038.304688 519.210938 L 1039.988281 522.78125 L 1040.394531 524.125 L 1040.59375 524.867188 L 1040.730469 525.609375 L 1040.863281 526.347656 L 1041.066406 527.089844 L 1034.671875 527.089844 L 1033.996094 524.734375 L 1033.121094 522.714844 L 1032.046875 520.960938 L 1030.632812 519.480469 L 1029.082031 518.335938 L 1027.265625 517.460938 L 1026.390625 517.191406 L 1025.449219 516.992188 L 1024.503906 516.855469 L 1023.496094 516.722656 L 1022.484375 516.652344 L 1021.410156 516.585938 L 1019.050781 516.789062 L 1016.898438 517.261719 L 1014.878906 518 L 1013.0625 519.144531 L 1011.378906 520.558594 L 1009.964844 522.242188 L 1008.753906 524.195312 L 1007.742188 526.347656 L 1006.933594 528.703125 L 1006.394531 531.261719 L 1006.058594 534.023438 L 1005.992188 536.917969 L 1006.058594 540.082031 L 1006.464844 542.910156 L 1007.136719 545.601562 L 1008.078125 547.957031 L 1009.292969 550.179688 L 1010.773438 552.066406 L 1012.253906 553.613281 L 1013.867188 554.824219 L 1015.621094 555.769531 L 1017.570312 556.441406 L 1019.660156 556.84375 L 1021.949219 556.980469 L 1024.371094 556.84375 L 1026.59375 556.375 L 1028.613281 555.566406 L 1030.296875 554.421875 L 1031.777344 552.941406 L 1033.054688 551.121094 L 1033.59375 550.046875 L 1034.066406 548.832031 L 1034.535156 547.554688 L 1034.941406 546.140625 L 1035.277344 544.660156 L 1035.613281 543.042969 L 1042.078125 543.042969 L 1040.863281 549.035156 L 1038.84375 553.882812 L 1035.882812 557.652344 L 1032.113281 560.347656 L 1027.402344 561.894531 L 1021.878906 562.5 L 1017.976562 562.230469 L 1014.476562 561.421875 L 1011.3125 560.210938 L 1008.484375 558.394531 L 1005.992188 556.039062 L 1003.90625 553.140625 L 1002.695312 551.054688 L 1001.683594 548.765625 L 1000.875 546.34375 L 1000.269531 543.785156 L 999.867188 541.09375 L 999.730469 538.265625 Z M 999.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 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/nor4b/sky130_fd_sc_lp__nor4b_1.svg b/cells/nor4b/sky130_fd_sc_lp__nor4b_1.svg
index f6c25dd..c0c0ba8 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_1.svg
+++ b/cells/nor4b/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.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="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 729.5 672.5 L 764.5 672.5 L 764.5 768.5 L 729.5 768.5 Z M 1085.5 672.5 L 1119.5 672.5 L 1119.5 864.5 L 1085.5 864.5 Z M 853.5 672.5 L 887.5 672.5 L 887.5 864.5 L 853.5 864.5 Z M 962.5 672.5 L 996.5 672.5 L 996.5 864.5 L 962.5 864.5 Z M 1183.5 672.5 L 1217.5 672.5 L 1217.5 864.5 L 1183.5 864.5 Z M 1183.5 672.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1059.5 209.5 L 1094.5 209.5 L 1094.5 498.5 L 1059.5 498.5 Z M 729.5 401.5 L 764.5 401.5 L 764.5 498.5 L 729.5 498.5 Z M 1183.5 209.5 L 1217.5 209.5 L 1217.5 498.5 L 1183.5 498.5 Z M 936.5 209.5 L 970.5 209.5 L 970.5 498.5 L 936.5 498.5 Z M 853.5 209.5 L 887.5 209.5 L 887.5 498.5 L 853.5 498.5 Z M 853.5 209.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1296.554688 457.246094 L 1296.554688 476.5 L 1290.292969 476.5 L 1290.292969 457.246094 L 1271.375 427.421875 L 1279.117188 427.421875 L 1293.523438 451.320312 L 1307.527344 427.421875 L 1315 427.421875 Z M 1296.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 1272 647 L 1311 647 M 1272 608 L 1311 608 M 1272 608 L 1272 647 M 1311 608 L 1311 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 1272 647 L 1311 647 M 1272 608 L 1311 608 M 1311 647 L 1311 608 M 1272 647 L 1272 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/nor4b/sky130_fd_sc_lp__nor4b_2.svg b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.svg
index bf3bf90..444aa8e 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_2.svg
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.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="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="#image301"/>
+  <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 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="#image301"/>
+  <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 460.5 672.5 L 494.5 672.5 L 494.5 768.5 L 460.5 768.5 Z M 1144.5 672.5 L 1178.5 672.5 L 1178.5 864.5 L 1144.5 864.5 Z M 679.5 672.5 L 713.5 672.5 L 713.5 864.5 L 679.5 864.5 Z M 777.5 672.5 L 812.5 672.5 L 812.5 864.5 L 777.5 864.5 Z M 876.5 672.5 L 910.5 672.5 L 910.5 864.5 L 876.5 864.5 Z M 975.5 672.5 L 1009.5 672.5 L 1009.5 864.5 L 975.5 864.5 Z M 1341.5 672.5 L 1376.5 672.5 L 1376.5 864.5 L 1341.5 864.5 Z M 1243.5 672.5 L 1277.5 672.5 L 1277.5 864.5 L 1243.5 864.5 Z M 1440.5 672.5 L 1474.5 672.5 L 1474.5 864.5 L 1440.5 864.5 Z M 1440.5 672.5 "/>
 </clipPath>
-<image id="image302" 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="#image302"/>
+  <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 447.5 209.5 L 482.5 209.5 L 482.5 305.5 L 447.5 305.5 Z M 1091.5 209.5 L 1126.5 209.5 L 1126.5 498.5 L 1091.5 498.5 Z M 679.5 209.5 L 713.5 209.5 L 713.5 498.5 L 679.5 498.5 Z M 777.5 209.5 L 812.5 209.5 L 812.5 498.5 L 777.5 498.5 Z M 876.5 209.5 L 910.5 209.5 L 910.5 498.5 L 876.5 498.5 Z M 975.5 209.5 L 1009.5 209.5 L 1009.5 498.5 L 975.5 498.5 Z M 1341.5 209.5 L 1376.5 209.5 L 1376.5 498.5 L 1341.5 498.5 Z M 1243.5 209.5 L 1277.5 209.5 L 1277.5 498.5 L 1243.5 498.5 Z M 1440.5 209.5 L 1474.5 209.5 L 1474.5 498.5 L 1440.5 498.5 Z M 1440.5 209.5 "/>
 </clipPath>
-<image id="image303" 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="#image303"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image304" 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="#image304"/>
+  <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="surface298">
+<g id="surface328">
 <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 965.554688 457.246094 L 965.554688 476.5 L 959.292969 476.5 L 959.292969 457.246094 L 940.375 427.421875 L 948.117188 427.421875 L 962.523438 451.320312 L 976.527344 427.421875 L 984 427.421875 Z M 965.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 941 647 L 980 647 M 941 608 L 980 608 M 941 608 L 941 647 M 980 608 L 980 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 941 647 L 980 647 M 941 608 L 980 608 M 980 647 L 980 608 M 941 647 L 941 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/nor4b/sky130_fd_sc_lp__nor4b_4.svg b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.svg
index ac758b8..e2966c0 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_4.svg
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 537.5 L 175.5 537.5 Z M 175.5 229.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image312"/>
+  <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 1573.5 633.5 L 1598.5 633.5 L 1598.5 771.5 L 1573.5 771.5 Z M 274.5 633.5 L 299.5 633.5 L 299.5 771.5 L 274.5 771.5 Z M 353.5 633.5 L 378.5 633.5 L 378.5 771.5 L 353.5 771.5 Z M 424.5 633.5 L 449.5 633.5 L 449.5 771.5 L 424.5 771.5 Z M 503.5 633.5 L 528.5 633.5 L 528.5 771.5 L 503.5 771.5 Z M 574.5 633.5 L 599.5 633.5 L 599.5 771.5 L 574.5 771.5 Z M 703.5 633.5 L 728.5 633.5 L 728.5 771.5 L 703.5 771.5 Z M 774.5 633.5 L 799.5 633.5 L 799.5 771.5 L 774.5 771.5 Z M 845.5 633.5 L 870.5 633.5 L 870.5 771.5 L 845.5 771.5 Z M 916.5 633.5 L 941.5 633.5 L 941.5 771.5 L 916.5 771.5 Z M 1070.5 633.5 L 1094.5 633.5 L 1094.5 771.5 L 1070.5 771.5 Z M 1141.5 633.5 L 1165.5 633.5 L 1165.5 771.5 L 1141.5 771.5 Z M 1212.5 633.5 L 1236.5 633.5 L 1236.5 771.5 L 1212.5 771.5 Z M 1283.5 633.5 L 1307.5 633.5 L 1307.5 771.5 L 1283.5 771.5 Z M 1355.5 633.5 L 1380.5 633.5 L 1380.5 771.5 L 1355.5 771.5 Z M 1431.5 633.5 L 1456.5 633.5 L 1456.5 771.5 L 1431.5 771.5 Z M 1502.5 633.5 L 1527.5 633.5 L 1527.5 771.5 L 1502.5 771.5 Z M 1502.5 633.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <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 1580.5 299.5 L 1605.5 299.5 L 1605.5 507.5 L 1580.5 507.5 Z M 272.5 299.5 L 297.5 299.5 L 297.5 507.5 L 272.5 507.5 Z M 429.5 299.5 L 454.5 299.5 L 454.5 507.5 L 429.5 507.5 Z M 500.5 299.5 L 525.5 299.5 L 525.5 507.5 L 500.5 507.5 Z M 571.5 299.5 L 596.5 299.5 L 596.5 507.5 L 571.5 507.5 Z M 642.5 299.5 L 667.5 299.5 L 667.5 507.5 L 642.5 507.5 Z M 713.5 299.5 L 738.5 299.5 L 738.5 507.5 L 713.5 507.5 Z M 784.5 299.5 L 809.5 299.5 L 809.5 507.5 L 784.5 507.5 Z M 855.5 299.5 L 880.5 299.5 L 880.5 507.5 L 855.5 507.5 Z M 926.5 299.5 L 951.5 299.5 L 951.5 507.5 L 926.5 507.5 Z M 1083.5 299.5 L 1108.5 299.5 L 1108.5 507.5 L 1083.5 507.5 Z M 1154.5 299.5 L 1179.5 299.5 L 1179.5 507.5 L 1154.5 507.5 Z M 1225.5 299.5 L 1250.5 299.5 L 1250.5 507.5 L 1225.5 507.5 Z M 1296.5 299.5 L 1321.5 299.5 L 1321.5 507.5 L 1296.5 507.5 Z M 1367.5 299.5 L 1392.5 299.5 L 1392.5 507.5 L 1367.5 507.5 Z M 1438.5 299.5 L 1463.5 299.5 L 1463.5 507.5 L 1438.5 507.5 Z M 1509.5 299.5 L 1534.5 299.5 L 1534.5 507.5 L 1509.5 507.5 Z M 1509.5 299.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image315" 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="#image315"/>
+  <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="surface309">
+<g id="surface338">
 <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 1121.496094 661.460938 L 1121.496094 675.5 L 1116.933594 675.5 L 1116.933594 661.460938 L 1103.136719 639.714844 L 1108.785156 639.714844 L 1119.289062 657.140625 L 1129.5 639.714844 L 1134.949219 639.714844 Z M 1121.496094 661.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 1104 436 L 1132 436 M 1104 407 L 1132 407 M 1104 407 L 1104 436 M 1132 407 L 1132 436 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1104 436 L 1132 436 M 1104 407 L 1132 407 M 1132 436 L 1132 407 M 1104 436 L 1104 407 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/nor4b/sky130_fd_sc_lp__nor4b_lp.svg b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.svg
index 30b7750..dceb945 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.svg
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" 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="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="#image375"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask1">
 <rect 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 757.5 L 1409.5 757.5 L 1409.5 853.5 L 1374.5 853.5 Z M 541.5 757.5 L 576.5 757.5 L 576.5 853.5 L 541.5 853.5 Z M 624.5 757.5 L 658.5 757.5 L 658.5 853.5 L 624.5 853.5 Z M 722.5 757.5 L 757.5 757.5 L 757.5 853.5 L 722.5 853.5 Z M 812.5 757.5 L 846.5 757.5 L 846.5 853.5 L 812.5 853.5 Z M 910.5 757.5 L 945.5 757.5 L 945.5 853.5 L 910.5 853.5 Z M 993.5 757.5 L 1027.5 757.5 L 1027.5 853.5 L 993.5 853.5 Z M 1111.5 757.5 L 1145.5 757.5 L 1145.5 853.5 L 1111.5 853.5 Z M 1193.5 757.5 L 1228.5 757.5 L 1228.5 853.5 L 1193.5 853.5 Z M 1292.5 757.5 L 1326.5 757.5 L 1326.5 853.5 L 1292.5 853.5 Z M 1292.5 757.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1324.5 220.5 L 1381.5 220.5 L 1381.5 449.5 L 1324.5 449.5 Z M 512.5 220.5 L 569.5 220.5 L 569.5 449.5 L 512.5 449.5 Z M 969.5 220.5 L 1026.5 220.5 L 1026.5 449.5 L 969.5 449.5 Z M 1081.5 220.5 L 1138.5 220.5 L 1138.5 449.5 L 1081.5 449.5 Z M 1193.5 220.5 L 1251.5 220.5 L 1251.5 449.5 L 1193.5 449.5 Z M 1193.5 220.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface372">
+<g id="surface401">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -234,6 +234,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1466.410156 546.757812 L 1447.492188 546.757812 L 1442.308594 561.5 L 1435.644531 561.5 L 1453.148438 512.421875 L 1461.226562 512.421875 L 1478.460938 561.5 L 1471.460938 561.5 Z M 1464.660156 541.503906 L 1457.121094 519.15625 L 1449.042969 541.503906 Z M 1464.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 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/nor4b/sky130_fd_sc_lp__nor4b_m.svg b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.svg
index a030806..49d138a 100644
--- a/cells/nor4b/sky130_fd_sc_lp__nor4b_m.svg
+++ b/cells/nor4b/sky130_fd_sc_lp__nor4b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image355"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1173.5 744.5 L 1207.5 744.5 L 1207.5 840.5 L 1173.5 840.5 Z M 675.5 744.5 L 710.5 744.5 L 710.5 840.5 L 675.5 840.5 Z M 859.5 744.5 L 893.5 744.5 L 893.5 840.5 L 859.5 840.5 Z M 957.5 744.5 L 992.5 744.5 L 992.5 840.5 L 957.5 840.5 Z M 1074.5 744.5 L 1109.5 744.5 L 1109.5 840.5 L 1074.5 840.5 Z M 1074.5 744.5 "/>
 </clipPath>
-<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1148.5 254.5 L 1182.5 254.5 L 1182.5 350.5 L 1148.5 350.5 Z M 776.5 254.5 L 811.5 254.5 L 811.5 350.5 L 776.5 350.5 Z M 900.5 254.5 L 934.5 254.5 L 934.5 350.5 L 900.5 350.5 Z M 983.5 254.5 L 1017.5 254.5 L 1017.5 350.5 L 983.5 350.5 Z M 1065.5 254.5 L 1099.5 254.5 L 1099.5 350.5 L 1065.5 350.5 Z M 1065.5 254.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image358"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface352">
+<g id="surface381">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1296.554688 712.246094 L 1296.554688 731.5 L 1290.292969 731.5 L 1290.292969 712.246094 L 1271.375 682.421875 L 1279.117188 682.421875 L 1293.523438 706.320312 L 1307.527344 682.421875 L 1315 682.421875 Z M 1296.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 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/nor4bb/sky130_fd_sc_lp__nor4bb_1.svg b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.svg
index 581613e..62936b6 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.svg
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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="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="#image318"/>
+  <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 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="#image318"/>
+  <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 1321.5 672.5 L 1355.5 672.5 L 1355.5 768.5 L 1321.5 768.5 Z M 635.5 672.5 L 670.5 672.5 L 670.5 768.5 L 635.5 768.5 Z M 814.5 672.5 L 848.5 672.5 L 848.5 864.5 L 814.5 864.5 Z M 913.5 672.5 L 947.5 672.5 L 947.5 864.5 L 913.5 864.5 Z M 1035.5 672.5 L 1070.5 672.5 L 1070.5 864.5 L 1035.5 864.5 Z M 1144.5 672.5 L 1178.5 672.5 L 1178.5 864.5 L 1144.5 864.5 Z M 1144.5 672.5 "/>
 </clipPath>
-<image id="image319" 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="#image319"/>
+  <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 559.5 240.5 L 593.5 240.5 L 593.5 336.5 L 559.5 336.5 Z M 814.5 209.5 L 848.5 209.5 L 848.5 498.5 L 814.5 498.5 Z M 1268.5 401.5 L 1302.5 401.5 L 1302.5 498.5 L 1268.5 498.5 Z M 1020.5 209.5 L 1055.5 209.5 L 1055.5 498.5 L 1020.5 498.5 Z M 897.5 209.5 L 931.5 209.5 L 931.5 498.5 L 897.5 498.5 Z M 1144.5 209.5 L 1178.5 209.5 L 1178.5 498.5 L 1144.5 498.5 Z M 1144.5 209.5 "/>
 </clipPath>
-<image id="image320" 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="#image320"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image321" 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="#image321"/>
+  <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="surface315">
+<g id="surface344">
 <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 1468.890625 511.574219 L 1468.890625 560.652344 L 1461.824219 560.652344 L 1436.441406 520.863281 L 1436.441406 560.652344 L 1430.519531 560.652344 L 1430.519531 511.574219 L 1437.316406 511.574219 L 1462.96875 551.699219 L 1462.96875 511.574219 Z M 1468.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 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/nor4bb/sky130_fd_sc_lp__nor4bb_2.svg b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.svg
index bd12d69..25eb503 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.svg
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 539.5 L 174.5 539.5 Z M 688.5 539.5 L 1212.5 539.5 L 1212.5 552.5 L 688.5 552.5 Z M 688.5 539.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <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 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="#image328"/>
+  <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 325.5 630.5 L 358.5 630.5 L 358.5 723.5 L 325.5 723.5 Z M 515.5 630.5 L 548.5 630.5 L 548.5 723.5 L 515.5 723.5 Z M 1463.5 667.5 L 1496.5 667.5 L 1496.5 852.5 L 1463.5 852.5 Z M 1368.5 667.5 L 1401.5 667.5 L 1401.5 852.5 L 1368.5 852.5 Z M 1273.5 667.5 L 1306.5 667.5 L 1306.5 852.5 L 1273.5 852.5 Z M 1071.5 667.5 L 1105.5 667.5 L 1105.5 852.5 L 1071.5 852.5 Z M 976.5 667.5 L 1010.5 667.5 L 1010.5 852.5 L 976.5 852.5 Z M 881.5 667.5 L 915.5 667.5 L 915.5 852.5 L 881.5 852.5 Z M 786.5 667.5 L 820.5 667.5 L 820.5 852.5 L 786.5 852.5 Z M 1558.5 667.5 L 1591.5 667.5 L 1591.5 852.5 L 1558.5 852.5 Z M 1558.5 667.5 "/>
 </clipPath>
-<image id="image329" 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="#image329"/>
+  <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 499.5 246.5 L 532.5 246.5 L 532.5 339.5 L 499.5 339.5 Z M 329.5 246.5 L 362.5 246.5 L 362.5 339.5 L 329.5 339.5 Z M 1480.5 220.5 L 1513.5 220.5 L 1513.5 499.5 L 1480.5 499.5 Z M 1290.5 220.5 L 1323.5 220.5 L 1323.5 499.5 L 1290.5 499.5 Z M 1385.5 220.5 L 1418.5 220.5 L 1418.5 499.5 L 1385.5 499.5 Z M 1575.5 220.5 L 1608.5 220.5 L 1608.5 499.5 L 1575.5 499.5 Z M 786.5 234.5 L 820.5 234.5 L 820.5 512.5 L 786.5 512.5 Z M 976.5 234.5 L 1010.5 234.5 L 1010.5 512.5 L 976.5 512.5 Z M 1080.5 234.5 L 1113.5 234.5 L 1113.5 512.5 L 1080.5 512.5 Z M 881.5 234.5 L 915.5 234.5 L 915.5 512.5 L 881.5 512.5 Z M 881.5 234.5 "/>
 </clipPath>
-<image id="image330" 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="#image330"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image331" 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="#image331"/>
+  <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="surface325">
+<g id="surface355">
 <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 1122.46875 542.046875 L 1122.46875 560.5 L 1116.46875 560.5 L 1116.46875 542.046875 L 1098.339844 513.46875 L 1105.757812 513.46875 L 1119.566406 536.371094 L 1132.984375 513.46875 L 1140.144531 513.46875 Z M 1122.46875 542.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 1099 561 L 1137 561 M 1099 524 L 1137 524 M 1099 524 L 1099 561 M 1137 524 L 1137 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 1099 561 L 1137 561 M 1099 524 L 1137 524 M 1137 561 L 1137 524 M 1099 561 L 1099 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/nor4bb/sky130_fd_sc_lp__nor4bb_4.svg b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.svg
index 75532e6..7ca010f 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.svg
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 537.5 L 174.5 537.5 Z M 448.5 537.5 L 1085.5 537.5 L 1085.5 551.5 L 448.5 551.5 Z M 448.5 537.5 "/>
 </clipPath>
-<image id="image306" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image306"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#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 342.5 625.5 L 366.5 625.5 L 366.5 757.5 L 342.5 757.5 Z M 275.5 625.5 L 298.5 625.5 L 298.5 757.5 L 275.5 757.5 Z M 570.5 628.5 L 594.5 628.5 L 594.5 760.5 L 570.5 760.5 Z M 665.5 628.5 L 688.5 628.5 L 688.5 760.5 L 665.5 760.5 Z M 732.5 628.5 L 756.5 628.5 L 756.5 760.5 L 732.5 760.5 Z M 811.5 628.5 L 834.5 628.5 L 834.5 760.5 L 811.5 760.5 Z M 878.5 628.5 L 902.5 628.5 L 902.5 760.5 L 878.5 760.5 Z M 946.5 628.5 L 970.5 628.5 L 970.5 760.5 L 946.5 760.5 Z M 1014.5 628.5 L 1037.5 628.5 L 1037.5 760.5 L 1014.5 760.5 Z M 1142.5 628.5 L 1165.5 628.5 L 1165.5 760.5 L 1142.5 760.5 Z M 1209.5 628.5 L 1233.5 628.5 L 1233.5 760.5 L 1209.5 760.5 Z M 1277.5 628.5 L 1301.5 628.5 L 1301.5 760.5 L 1277.5 760.5 Z M 1345.5 628.5 L 1368.5 628.5 L 1368.5 760.5 L 1345.5 760.5 Z M 1412.5 628.5 L 1436.5 628.5 L 1436.5 760.5 L 1412.5 760.5 Z M 1480.5 628.5 L 1504.5 628.5 L 1504.5 760.5 L 1480.5 760.5 Z M 1548.5 628.5 L 1571.5 628.5 L 1571.5 760.5 L 1548.5 760.5 Z M 1615.5 628.5 L 1639.5 628.5 L 1639.5 760.5 L 1615.5 760.5 Z M 503.5 628.5 L 526.5 628.5 L 526.5 760.5 L 503.5 760.5 Z M 503.5 628.5 "/>
 </clipPath>
-<image id="image307" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image307"/>
+  <use xlink:href="#image336"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1615.5 310.5 L 1639.5 310.5 L 1639.5 508.5 L 1615.5 508.5 Z M 1548.5 310.5 L 1571.5 310.5 L 1571.5 508.5 L 1548.5 508.5 Z M 1412.5 310.5 L 1436.5 310.5 L 1436.5 508.5 L 1412.5 508.5 Z M 1141.5 310.5 L 1165.5 310.5 L 1165.5 508.5 L 1141.5 508.5 Z M 342.5 310.5 L 366.5 310.5 L 366.5 508.5 L 342.5 508.5 Z M 1344.5 310.5 L 1368.5 310.5 L 1368.5 508.5 L 1344.5 508.5 Z M 275.5 310.5 L 298.5 310.5 L 298.5 508.5 L 275.5 508.5 Z M 1480.5 310.5 L 1504.5 310.5 L 1504.5 508.5 L 1480.5 508.5 Z M 1276.5 310.5 L 1300.5 310.5 L 1300.5 508.5 L 1276.5 508.5 Z M 1209.5 310.5 L 1232.5 310.5 L 1232.5 508.5 L 1209.5 508.5 Z M 586.5 324.5 L 610.5 324.5 L 610.5 523.5 L 586.5 523.5 Z M 518.5 324.5 L 542.5 324.5 L 542.5 523.5 L 518.5 523.5 Z M 992.5 324.5 L 1015.5 324.5 L 1015.5 523.5 L 992.5 523.5 Z M 924.5 324.5 L 948.5 324.5 L 948.5 523.5 L 924.5 523.5 Z M 789.5 324.5 L 812.5 324.5 L 812.5 523.5 L 789.5 523.5 Z M 654.5 324.5 L 677.5 324.5 L 677.5 523.5 L 654.5 523.5 Z M 721.5 324.5 L 745.5 324.5 L 745.5 523.5 L 721.5 523.5 Z M 856.5 324.5 L 880.5 324.5 L 880.5 523.5 L 856.5 523.5 Z M 856.5 324.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image338"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface303">
+<g id="surface332">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1075.410156 539.261719 L 1075.410156 552.5 L 1071.105469 552.5 L 1071.105469 539.261719 L 1058.101562 518.757812 L 1063.425781 518.757812 L 1073.328125 535.191406 L 1082.957031 518.757812 L 1088.09375 518.757812 Z M 1075.410156 539.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 1059 557 L 1085 557 M 1059 530 L 1085 530 M 1059 530 L 1059 557 M 1085 530 L 1085 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 1059 557 L 1085 557 M 1059 530 L 1085 530 M 1085 557 L 1085 530 M 1059 557 L 1059 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/nor4bb/sky130_fd_sc_lp__nor4bb_lp.svg b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.svg
index 9aa0479..7ee1c88 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.svg
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 256.5 111.5 L 1663.5 111.5 L 1663.5 539.5 L 256.5 539.5 Z M 789.5 539.5 L 1059.5 539.5 L 1059.5 571.5 L 789.5 571.5 Z M 789.5 539.5 "/>
 </clipPath>
-<image id="image315" 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="#image315"/>
+  <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 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="#image315"/>
+  <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 1478.5 768.5 L 1512.5 768.5 L 1512.5 864.5 L 1478.5 864.5 Z M 430.5 768.5 L 465.5 768.5 L 465.5 864.5 L 430.5 864.5 Z M 513.5 768.5 L 547.5 768.5 L 547.5 864.5 L 513.5 864.5 Z M 611.5 768.5 L 646.5 768.5 L 646.5 864.5 L 611.5 864.5 Z M 694.5 768.5 L 728.5 768.5 L 728.5 864.5 L 694.5 864.5 Z M 792.5 768.5 L 827.5 768.5 L 827.5 864.5 L 792.5 864.5 Z M 875.5 768.5 L 909.5 768.5 L 909.5 864.5 L 875.5 864.5 Z M 980.5 768.5 L 1015.5 768.5 L 1015.5 864.5 L 980.5 864.5 Z M 1063.5 768.5 L 1097.5 768.5 L 1097.5 864.5 L 1063.5 864.5 Z M 1161.5 768.5 L 1196.5 768.5 L 1196.5 864.5 L 1161.5 864.5 Z M 1258.5 768.5 L 1292.5 768.5 L 1292.5 864.5 L 1258.5 864.5 Z M 1388.5 768.5 L 1423.5 768.5 L 1423.5 864.5 L 1388.5 864.5 Z M 1388.5 768.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 396.5 220.5 L 453.5 220.5 L 453.5 449.5 L 396.5 449.5 Z M 646.5 220.5 L 703.5 220.5 L 703.5 449.5 L 646.5 449.5 Z M 1258.5 220.5 L 1315.5 220.5 L 1315.5 449.5 L 1258.5 449.5 Z M 1145.5 220.5 L 1203.5 220.5 L 1203.5 449.5 L 1145.5 449.5 Z M 1388.5 220.5 L 1446.5 220.5 L 1446.5 449.5 L 1388.5 449.5 Z M 895.5 301.5 L 953.5 301.5 L 953.5 530.5 L 895.5 530.5 Z M 895.5 301.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface312">
+<g id="surface341">
 <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 799.554688 542.246094 L 799.554688 561.5 L 793.292969 561.5 L 793.292969 542.246094 L 774.375 512.421875 L 782.117188 512.421875 L 796.523438 536.320312 L 810.527344 512.421875 L 818 512.421875 Z M 799.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 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/nor4bb/sky130_fd_sc_lp__nor4bb_m.svg b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.svg
index a81883d..5995d5a 100644
--- a/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.svg
+++ b/cells/nor4bb/sky130_fd_sc_lp__nor4bb_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.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 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="#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 1239.5 679.5 L 1274.5 679.5 L 1274.5 775.5 L 1239.5 775.5 Z M 641.5 679.5 L 675.5 679.5 L 675.5 775.5 L 641.5 775.5 Z M 749.5 679.5 L 783.5 679.5 L 783.5 775.5 L 749.5 775.5 Z M 847.5 679.5 L 882.5 679.5 L 882.5 775.5 L 847.5 775.5 Z M 1008.5 679.5 L 1042.5 679.5 L 1042.5 775.5 L 1008.5 775.5 Z M 1106.5 679.5 L 1141.5 679.5 L 1141.5 775.5 L 1106.5 775.5 Z M 1106.5 679.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 614.5 241.5 L 648.5 241.5 L 648.5 337.5 L 614.5 337.5 Z M 843.5 367.5 L 877.5 367.5 L 877.5 463.5 L 843.5 463.5 Z M 1266.5 367.5 L 1300.5 367.5 L 1300.5 463.5 L 1266.5 463.5 Z M 1090.5 367.5 L 1125.5 367.5 L 1125.5 463.5 L 1090.5 463.5 Z M 1008.5 367.5 L 1042.5 367.5 L 1042.5 463.5 L 1008.5 463.5 Z M 925.5 367.5 L 960.5 367.5 L 960.5 463.5 L 925.5 463.5 Z M 925.5 367.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 642.890625 427.574219 L 642.890625 476.652344 L 635.824219 476.652344 L 610.441406 436.863281 L 610.441406 476.652344 L 604.519531 476.652344 L 604.519531 427.574219 L 611.316406 427.574219 L 636.96875 467.699219 L 636.96875 427.574219 Z M 642.890625 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 557 647 L 596 647 M 557 608 L 596 608 M 557 608 L 557 647 M 596 608 L 596 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 557 647 L 596 647 M 557 608 L 596 608 M 596 647 L 596 608 M 557 647 L 557 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/o2111a/sky130_fd_sc_lp__o2111a_0.svg b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.svg
index 25870fd..2293f04 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_0.svg
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.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 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="#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 1227.5 768.5 L 1261.5 768.5 L 1261.5 864.5 L 1227.5 864.5 Z M 614.5 768.5 L 648.5 768.5 L 648.5 864.5 L 614.5 864.5 Z M 848.5 768.5 L 883.5 768.5 L 883.5 864.5 L 848.5 864.5 Z M 931.5 768.5 L 965.5 768.5 L 965.5 864.5 L 931.5 864.5 Z M 1013.5 768.5 L 1048.5 768.5 L 1048.5 864.5 L 1013.5 864.5 Z M 1112.5 768.5 L 1146.5 768.5 L 1146.5 864.5 L 1112.5 864.5 Z M 1112.5 768.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 1240.5 220.5 L 1275.5 220.5 L 1275.5 367.5 L 1240.5 367.5 Z M 670.5 220.5 L 704.5 220.5 L 704.5 367.5 L 670.5 367.5 Z M 784.5 220.5 L 819.5 220.5 L 819.5 367.5 L 784.5 367.5 Z M 883.5 220.5 L 917.5 220.5 L 917.5 367.5 L 883.5 367.5 Z M 1059.5 220.5 L 1094.5 220.5 L 1094.5 367.5 L 1059.5 367.5 Z M 1158.5 220.5 L 1192.5 220.5 L 1192.5 367.5 L 1158.5 367.5 Z M 1158.5 220.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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_lp__o2111a_1.svg b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.svg
index df675ab..0b2cfcc 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_1.svg
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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 1300.5 670.5 L 1334.5 670.5 L 1334.5 862.5 L 1300.5 862.5 Z M 1201.5 670.5 L 1236.5 670.5 L 1236.5 862.5 L 1201.5 862.5 Z M 819.5 670.5 L 853.5 670.5 L 853.5 862.5 L 819.5 862.5 Z M 901.5 670.5 L 936.5 670.5 L 936.5 862.5 L 901.5 862.5 Z M 1025.5 670.5 L 1059.5 670.5 L 1059.5 862.5 L 1025.5 862.5 Z M 559.5 672.5 L 593.5 672.5 L 593.5 864.5 L 559.5 864.5 Z M 559.5 672.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 1300.5 209.5 L 1334.5 209.5 L 1334.5 498.5 L 1300.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 803.5 209.5 L 837.5 209.5 L 837.5 498.5 L 803.5 498.5 Z M 901.5 209.5 L 936.5 209.5 L 936.5 498.5 L 901.5 498.5 Z M 1094.5 209.5 L 1128.5 209.5 L 1128.5 498.5 L 1094.5 498.5 Z M 1217.5 209.5 L 1252.5 209.5 L 1252.5 498.5 L 1217.5 498.5 Z M 1217.5 209.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 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/o2111a/sky130_fd_sc_lp__o2111a_2.svg b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.svg
index 39c4688..967ad60 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_2.svg
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.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 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="#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 1329.5 667.5 L 1363.5 667.5 L 1363.5 860.5 L 1329.5 860.5 Z M 1205.5 667.5 L 1239.5 667.5 L 1239.5 860.5 L 1205.5 860.5 Z M 957.5 667.5 L 992.5 667.5 L 992.5 860.5 L 957.5 860.5 Z M 875.5 667.5 L 909.5 667.5 L 909.5 860.5 L 875.5 860.5 Z M 1081.5 667.5 L 1115.5 667.5 L 1115.5 860.5 L 1081.5 860.5 Z M 559.5 672.5 L 593.5 672.5 L 593.5 864.5 L 559.5 864.5 Z M 657.5 672.5 L 691.5 672.5 L 691.5 864.5 L 657.5 864.5 Z M 657.5 672.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 1329.5 209.5 L 1363.5 209.5 L 1363.5 498.5 L 1329.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 657.5 209.5 L 691.5 209.5 L 691.5 498.5 L 657.5 498.5 Z M 859.5 209.5 L 893.5 209.5 L 893.5 498.5 L 859.5 498.5 Z M 957.5 209.5 L 992.5 209.5 L 992.5 498.5 L 957.5 498.5 Z M 1081.5 209.5 L 1115.5 209.5 L 1115.5 498.5 L 1081.5 498.5 Z M 1205.5 209.5 L 1239.5 209.5 L 1239.5 498.5 L 1205.5 498.5 Z M 1205.5 209.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 882.476562 527.503906 L 871.90625 527.503906 L 871.90625 523.261719 L 873.722656 523.058594 L 875.339844 522.789062 L 876.753906 522.453125 L 877.964844 522.183594 L 878.972656 521.847656 L 879.847656 521.445312 L 880.523438 521.039062 L 881.128906 520.570312 L 881.667969 520.03125 L 882.207031 519.355469 L 882.675781 518.617188 L 883.148438 517.742188 L 883.351562 517.269531 L 883.550781 516.730469 L 883.753906 516.125 L 884.023438 515.386719 L 884.226562 514.644531 L 884.496094 513.769531 L 888.398438 513.769531 L 888.398438 561.5 L 882.476562 561.5 Z M 882.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 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/o2111a/sky130_fd_sc_lp__o2111a_4.svg b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.svg
index b8b8f5a..7d62b6a 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_4.svg
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.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 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="#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 296.5 633.5 L 325.5 633.5 L 325.5 797.5 L 296.5 797.5 Z M 380.5 633.5 L 409.5 633.5 L 409.5 797.5 L 380.5 797.5 Z M 561.5 633.5 L 590.5 633.5 L 590.5 797.5 L 561.5 797.5 Z M 644.5 633.5 L 674.5 633.5 L 674.5 797.5 L 644.5 797.5 Z M 463.5 633.5 L 492.5 633.5 L 492.5 797.5 L 463.5 797.5 Z M 728.5 633.5 L 757.5 633.5 L 757.5 797.5 L 728.5 797.5 Z M 1147.5 651.5 L 1176.5 651.5 L 1176.5 814.5 L 1147.5 814.5 Z M 1063.5 651.5 L 1092.5 651.5 L 1092.5 814.5 L 1063.5 814.5 Z M 979.5 651.5 L 1008.5 651.5 L 1008.5 814.5 L 979.5 814.5 Z M 1322.5 651.5 L 1351.5 651.5 L 1351.5 814.5 L 1322.5 814.5 Z M 1489.5 651.5 L 1518.5 651.5 L 1518.5 814.5 L 1489.5 814.5 Z M 1573.5 651.5 L 1602.5 651.5 L 1602.5 814.5 L 1573.5 814.5 Z M 1230.5 651.5 L 1259.5 651.5 L 1259.5 814.5 L 1230.5 814.5 Z M 1405.5 651.5 L 1435.5 651.5 L 1435.5 814.5 L 1405.5 814.5 Z M 1405.5 651.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 1595.5 258.5 L 1624.5 258.5 L 1624.5 503.5 L 1595.5 503.5 Z M 294.5 258.5 L 323.5 258.5 L 323.5 503.5 L 294.5 503.5 Z M 378.5 258.5 L 407.5 258.5 L 407.5 503.5 L 378.5 503.5 Z M 461.5 258.5 L 491.5 258.5 L 491.5 503.5 L 461.5 503.5 Z M 561.5 258.5 L 590.5 258.5 L 590.5 503.5 L 561.5 503.5 Z M 644.5 258.5 L 674.5 258.5 L 674.5 503.5 L 644.5 503.5 Z M 728.5 258.5 L 757.5 258.5 L 757.5 503.5 L 728.5 503.5 Z M 903.5 258.5 L 932.5 258.5 L 932.5 503.5 L 903.5 503.5 Z M 987.5 258.5 L 1016.5 258.5 L 1016.5 503.5 L 987.5 503.5 Z M 1071.5 258.5 L 1100.5 258.5 L 1100.5 503.5 L 1071.5 503.5 Z M 1154.5 258.5 L 1184.5 258.5 L 1184.5 503.5 L 1154.5 503.5 Z M 1344.5 258.5 L 1373.5 258.5 L 1373.5 503.5 L 1344.5 503.5 Z M 1428.5 258.5 L 1457.5 258.5 L 1457.5 503.5 L 1428.5 503.5 Z M 1512.5 258.5 L 1541.5 258.5 L 1541.5 503.5 L 1512.5 503.5 Z M 1512.5 258.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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.851562 456.136719 L 742.824219 456.136719 L 742.824219 452.515625 L 744.378906 452.34375 L 745.757812 452.113281 L 746.964844 451.824219 L 748 451.59375 L 748.863281 451.308594 L 749.609375 450.960938 L 750.1875 450.617188 L 750.703125 450.214844 L 751.164062 449.753906 L 751.625 449.179688 L 752.027344 448.546875 L 752.429688 447.800781 L 752.601562 447.398438 L 752.773438 446.9375 L 752.945312 446.421875 L 753.175781 445.789062 L 753.347656 445.15625 L 753.578125 444.40625 L 756.914062 444.40625 L 756.914062 485.175781 L 751.851562 485.175781 Z M 751.851562 456.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 709 632 L 742 632 M 709 599 L 742 599 M 709 599 L 709 632 M 742 599 L 742 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 709 632 L 742 632 M 709 599 L 742 599 M 742 632 L 742 599 M 709 632 L 709 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/o2111a/sky130_fd_sc_lp__o2111a_lp.svg b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.svg
index dd45b23..38b314b 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.svg
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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 985.5 763.5 L 1019.5 763.5 L 1019.5 860.5 L 985.5 860.5 Z M 895.5 763.5 L 930.5 763.5 L 930.5 860.5 L 895.5 860.5 Z M 682.5 763.5 L 717.5 763.5 L 717.5 860.5 L 682.5 860.5 Z M 565.5 763.5 L 600.5 763.5 L 600.5 860.5 L 565.5 860.5 Z M 806.5 763.5 L 840.5 763.5 L 840.5 860.5 L 806.5 860.5 Z M 1244.5 768.5 L 1278.5 768.5 L 1278.5 864.5 L 1244.5 864.5 Z M 1326.5 768.5 L 1361.5 768.5 L 1361.5 864.5 L 1326.5 864.5 Z M 1326.5 768.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 1248.5 209.5 L 1306.5 209.5 L 1306.5 438.5 L 1248.5 438.5 Z M 563.5 209.5 L 620.5 209.5 L 620.5 438.5 L 563.5 438.5 Z M 675.5 209.5 L 733.5 209.5 L 733.5 438.5 L 675.5 438.5 Z M 806.5 209.5 L 863.5 209.5 L 863.5 438.5 L 806.5 438.5 Z M 1001.5 209.5 L 1058.5 209.5 L 1058.5 438.5 L 1001.5 438.5 Z M 1127.5 209.5 L 1184.5 209.5 L 1184.5 438.5 L 1127.5 438.5 Z M 1127.5 209.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 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/o2111a/sky130_fd_sc_lp__o2111a_m.svg b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.svg
index 73aec81..ef511a7 100644
--- a/cells/o2111a/sky130_fd_sc_lp__o2111a_m.svg
+++ b/cells/o2111a/sky130_fd_sc_lp__o2111a_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image395"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1248.5 768.5 L 1283.5 768.5 L 1283.5 864.5 L 1248.5 864.5 Z M 614.5 768.5 L 648.5 768.5 L 648.5 864.5 L 614.5 864.5 Z M 886.5 768.5 L 921.5 768.5 L 921.5 864.5 L 886.5 864.5 Z M 969.5 768.5 L 1003.5 768.5 L 1003.5 864.5 L 969.5 864.5 Z M 1051.5 768.5 L 1086.5 768.5 L 1086.5 864.5 L 1051.5 864.5 Z M 1150.5 768.5 L 1184.5 768.5 L 1184.5 864.5 L 1150.5 864.5 Z M 1150.5 768.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image396"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1216.5 209.5 L 1251.5 209.5 L 1251.5 305.5 L 1216.5 305.5 Z M 670.5 209.5 L 704.5 209.5 L 704.5 305.5 L 670.5 305.5 Z M 777.5 209.5 L 812.5 209.5 L 812.5 305.5 L 777.5 305.5 Z M 876.5 209.5 L 910.5 209.5 L 910.5 305.5 L 876.5 305.5 Z M 1035.5 209.5 L 1070.5 209.5 L 1070.5 305.5 L 1035.5 305.5 Z M 1134.5 209.5 L 1168.5 209.5 L 1168.5 305.5 L 1134.5 305.5 Z M 1134.5 209.5 "/>
 </clipPath>
-<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface392">
+<g id="surface420">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -227,6 +227,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 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/o2111ai/sky130_fd_sc_lp__o2111ai_0.svg b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.svg
index 5841394..5e17cfa 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.svg
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image389" 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="#image389"/>
+  <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 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="#image389"/>
+  <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 1206.5 768.5 L 1240.5 768.5 L 1240.5 864.5 L 1206.5 864.5 Z M 766.5 768.5 L 800.5 768.5 L 800.5 864.5 L 766.5 864.5 Z M 848.5 768.5 L 883.5 768.5 L 883.5 864.5 L 848.5 864.5 Z M 931.5 768.5 L 965.5 768.5 L 965.5 864.5 L 931.5 864.5 Z M 1107.5 768.5 L 1142.5 768.5 L 1142.5 864.5 L 1107.5 864.5 Z M 1107.5 768.5 "/>
 </clipPath>
-<image id="image390" 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="#image390"/>
+  <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 1221.5 239.5 L 1255.5 239.5 L 1255.5 385.5 L 1221.5 385.5 Z M 675.5 239.5 L 710.5 239.5 L 710.5 385.5 L 675.5 385.5 Z M 774.5 239.5 L 808.5 239.5 L 808.5 385.5 L 774.5 385.5 Z M 1028.5 239.5 L 1063.5 239.5 L 1063.5 385.5 L 1028.5 385.5 Z M 1138.5 239.5 L 1173.5 239.5 L 1173.5 385.5 L 1138.5 385.5 Z M 1138.5 239.5 "/>
 </clipPath>
-<image id="image391" 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="#image391"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image392" 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="#image392"/>
+  <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="surface386">
+<g id="surface414">
 <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 746.554688 372.246094 L 746.554688 391.5 L 740.292969 391.5 L 740.292969 372.246094 L 721.375 342.421875 L 729.117188 342.421875 L 743.523438 366.320312 L 757.527344 342.421875 L 765 342.421875 Z M 746.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 722 731 L 761 731 M 722 693 L 761 693 M 722 693 L 722 731 M 761 693 L 761 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 722 731 L 761 731 M 722 693 L 761 693 M 761 731 L 761 693 M 722 731 L 722 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 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_lp__o2111ai_1.svg b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.svg
index bed7d35..a8790ca 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_1.svg
+++ b/cells/o2111ai/sky130_fd_sc_lp__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 539.5 L 533.5 539.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="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 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="#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 1213.5 672.5 L 1247.5 672.5 L 1247.5 864.5 L 1213.5 864.5 Z M 750.5 672.5 L 784.5 672.5 L 784.5 864.5 L 750.5 864.5 Z M 851.5 672.5 L 885.5 672.5 L 885.5 864.5 L 851.5 864.5 Z M 956.5 672.5 L 991.5 672.5 L 991.5 864.5 L 956.5 864.5 Z M 1082.5 672.5 L 1117.5 672.5 L 1117.5 864.5 L 1082.5 864.5 Z M 1082.5 672.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 1213.5 209.5 L 1247.5 209.5 L 1247.5 498.5 L 1213.5 498.5 Z M 750.5 209.5 L 784.5 209.5 L 784.5 498.5 L 750.5 498.5 Z M 874.5 209.5 L 908.5 209.5 L 908.5 498.5 L 874.5 498.5 Z M 1000.5 209.5 L 1034.5 209.5 L 1034.5 498.5 L 1000.5 498.5 Z M 1130.5 209.5 L 1165.5 209.5 L 1165.5 498.5 L 1130.5 498.5 Z M 1130.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/o2111ai/sky130_fd_sc_lp__o2111ai_2.svg b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.svg
index 3dd92ee..d77f12c 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_2.svg
+++ b/cells/o2111ai/sky130_fd_sc_lp__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 539.5 L 256.5 539.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image338"/>
+  <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 410.5 647.5 L 444.5 647.5 L 444.5 839.5 L 410.5 839.5 Z M 508.5 647.5 L 543.5 647.5 L 543.5 839.5 L 508.5 839.5 Z M 705.5 647.5 L 740.5 647.5 L 740.5 839.5 L 705.5 839.5 Z M 607.5 647.5 L 641.5 647.5 L 641.5 839.5 L 607.5 839.5 Z M 1156.5 672.5 L 1190.5 672.5 L 1190.5 864.5 L 1156.5 864.5 Z M 1057.5 672.5 L 1091.5 672.5 L 1091.5 864.5 L 1057.5 864.5 Z M 958.5 672.5 L 993.5 672.5 L 993.5 864.5 L 958.5 864.5 Z M 1451.5 672.5 L 1486.5 672.5 L 1486.5 864.5 L 1451.5 864.5 Z M 1254.5 672.5 L 1289.5 672.5 L 1289.5 864.5 L 1254.5 864.5 Z M 1353.5 672.5 L 1387.5 672.5 L 1387.5 864.5 L 1353.5 864.5 Z M 1353.5 672.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1451.5 209.5 L 1486.5 209.5 L 1486.5 498.5 L 1451.5 498.5 Z M 410.5 209.5 L 444.5 209.5 L 444.5 498.5 L 410.5 498.5 Z M 508.5 209.5 L 543.5 209.5 L 543.5 498.5 L 508.5 498.5 Z M 607.5 209.5 L 641.5 209.5 L 641.5 498.5 L 607.5 498.5 Z M 705.5 209.5 L 740.5 209.5 L 740.5 498.5 L 705.5 498.5 Z M 804.5 209.5 L 838.5 209.5 L 838.5 498.5 L 804.5 498.5 Z M 902.5 209.5 L 937.5 209.5 L 937.5 498.5 L 902.5 498.5 Z M 1156.5 209.5 L 1190.5 209.5 L 1190.5 498.5 L 1156.5 498.5 Z M 1254.5 209.5 L 1289.5 209.5 L 1289.5 498.5 L 1254.5 498.5 Z M 1353.5 209.5 L 1387.5 209.5 L 1387.5 498.5 L 1353.5 498.5 Z M 1353.5 209.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface335">
+<g id="surface363">
 <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 385.476562 527.503906 L 374.90625 527.503906 L 374.90625 523.261719 L 376.722656 523.058594 L 378.339844 522.789062 L 379.753906 522.453125 L 380.964844 522.183594 L 381.972656 521.847656 L 382.847656 521.445312 L 383.523438 521.039062 L 384.128906 520.570312 L 384.667969 520.03125 L 385.207031 519.355469 L 385.675781 518.617188 L 386.148438 517.742188 L 386.351562 517.269531 L 386.550781 516.730469 L 386.753906 516.125 L 387.023438 515.386719 L 387.226562 514.644531 L 387.496094 513.769531 L 391.398438 513.769531 L 391.398438 561.5 L 385.476562 561.5 Z M 385.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 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/o2111ai/sky130_fd_sc_lp__o2111ai_4.svg b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.svg
index 28e3c22..8411760 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_4.svg
+++ b/cells/o2111ai/sky130_fd_sc_lp__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="image348" 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="#image348"/>
+  <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 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="#image348"/>
+  <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 1621.5 623.5 L 1643.5 623.5 L 1643.5 749.5 L 1621.5 749.5 Z M 263.5 623.5 L 286.5 623.5 L 286.5 749.5 L 263.5 749.5 Z M 328.5 623.5 L 350.5 623.5 L 350.5 749.5 L 328.5 749.5 Z M 392.5 623.5 L 415.5 623.5 L 415.5 749.5 L 392.5 749.5 Z M 457.5 623.5 L 479.5 623.5 L 479.5 749.5 L 457.5 749.5 Z M 521.5 623.5 L 544.5 623.5 L 544.5 749.5 L 521.5 749.5 Z M 586.5 623.5 L 608.5 623.5 L 608.5 749.5 L 586.5 749.5 Z M 650.5 623.5 L 673.5 623.5 L 673.5 749.5 L 650.5 749.5 Z M 715.5 623.5 L 737.5 623.5 L 737.5 749.5 L 715.5 749.5 Z M 857.5 623.5 L 880.5 623.5 L 880.5 749.5 L 857.5 749.5 Z M 922.5 623.5 L 944.5 623.5 L 944.5 749.5 L 922.5 749.5 Z M 986.5 623.5 L 1009.5 623.5 L 1009.5 749.5 L 986.5 749.5 Z M 1051.5 623.5 L 1073.5 623.5 L 1073.5 749.5 L 1051.5 749.5 Z M 1115.5 623.5 L 1138.5 623.5 L 1138.5 749.5 L 1115.5 749.5 Z M 1180.5 623.5 L 1202.5 623.5 L 1202.5 749.5 L 1180.5 749.5 Z M 1244.5 623.5 L 1267.5 623.5 L 1267.5 749.5 L 1244.5 749.5 Z M 1309.5 623.5 L 1331.5 623.5 L 1331.5 749.5 L 1309.5 749.5 Z M 1427.5 623.5 L 1450.5 623.5 L 1450.5 749.5 L 1427.5 749.5 Z M 1492.5 623.5 L 1514.5 623.5 L 1514.5 749.5 L 1492.5 749.5 Z M 1556.5 623.5 L 1579.5 623.5 L 1579.5 749.5 L 1556.5 749.5 Z M 1556.5 623.5 "/>
 </clipPath>
-<image id="image349" 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="#image349"/>
+  <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 1618.5 320.5 L 1640.5 320.5 L 1640.5 509.5 L 1618.5 509.5 Z M 263.5 320.5 L 286.5 320.5 L 286.5 509.5 L 263.5 509.5 Z M 328.5 320.5 L 350.5 320.5 L 350.5 509.5 L 328.5 509.5 Z M 392.5 320.5 L 415.5 320.5 L 415.5 509.5 L 392.5 509.5 Z M 457.5 320.5 L 479.5 320.5 L 479.5 509.5 L 457.5 509.5 Z M 521.5 320.5 L 544.5 320.5 L 544.5 509.5 L 521.5 509.5 Z M 586.5 320.5 L 608.5 320.5 L 608.5 509.5 L 586.5 509.5 Z M 650.5 320.5 L 673.5 320.5 L 673.5 509.5 L 650.5 509.5 Z M 715.5 320.5 L 737.5 320.5 L 737.5 509.5 L 715.5 509.5 Z M 830.5 320.5 L 853.5 320.5 L 853.5 509.5 L 830.5 509.5 Z M 895.5 320.5 L 917.5 320.5 L 917.5 509.5 L 895.5 509.5 Z M 959.5 320.5 L 982.5 320.5 L 982.5 509.5 L 959.5 509.5 Z M 1024.5 320.5 L 1046.5 320.5 L 1046.5 509.5 L 1024.5 509.5 Z M 1088.5 320.5 L 1111.5 320.5 L 1111.5 509.5 L 1088.5 509.5 Z M 1153.5 320.5 L 1175.5 320.5 L 1175.5 509.5 L 1153.5 509.5 Z M 1217.5 320.5 L 1240.5 320.5 L 1240.5 509.5 L 1217.5 509.5 Z M 1282.5 320.5 L 1304.5 320.5 L 1304.5 509.5 L 1282.5 509.5 Z M 1424.5 320.5 L 1447.5 320.5 L 1447.5 509.5 L 1424.5 509.5 Z M 1489.5 320.5 L 1511.5 320.5 L 1511.5 509.5 L 1489.5 509.5 Z M 1553.5 320.5 L 1576.5 320.5 L 1576.5 509.5 L 1553.5 509.5 Z M 1553.5 320.5 "/>
 </clipPath>
-<image id="image350" 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="#image350"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image351" 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="#image351"/>
+  <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="surface345">
+<g id="surface374">
 <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 403.109375 584.542969 L 396.28125 584.542969 L 396.28125 581.804688 L 397.457031 581.675781 L 398.5 581.5 L 399.414062 581.28125 L 400.195312 581.109375 L 400.847656 580.890625 L 401.414062 580.628906 L 401.847656 580.371094 L 402.238281 580.066406 L 402.585938 579.71875 L 402.933594 579.28125 L 403.238281 578.804688 L 403.542969 578.238281 L 403.675781 577.933594 L 403.804688 577.585938 L 403.933594 577.195312 L 404.109375 576.71875 L 404.238281 576.238281 L 404.414062 575.675781 L 406.933594 575.675781 L 406.933594 606.5 L 403.109375 606.5 Z M 403.109375 584.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 501 L 396 501 M 370 476 L 396 476 M 370 476 L 370 501 M 396 476 L 396 501 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 370 501 L 396 501 M 370 476 L 396 476 M 396 501 L 396 476 M 370 501 L 370 476 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/o2111ai/sky130_fd_sc_lp__o2111ai_lp.svg b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.svg
index 759933a..23760bd 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.svg
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image338"/>
+  <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 1195.5 757.5 L 1229.5 757.5 L 1229.5 853.5 L 1195.5 853.5 Z M 734.5 757.5 L 768.5 757.5 L 768.5 853.5 L 734.5 853.5 Z M 823.5 757.5 L 858.5 757.5 L 858.5 853.5 L 823.5 853.5 Z M 940.5 757.5 L 975.5 757.5 L 975.5 853.5 L 940.5 853.5 Z M 1071.5 757.5 L 1105.5 757.5 L 1105.5 853.5 L 1071.5 853.5 Z M 1071.5 757.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1188.5 220.5 L 1245.5 220.5 L 1245.5 449.5 L 1188.5 449.5 Z M 704.5 220.5 L 761.5 220.5 L 761.5 449.5 L 704.5 449.5 Z M 826.5 220.5 L 883.5 220.5 L 883.5 449.5 L 826.5 449.5 Z M 952.5 220.5 L 1009.5 220.5 L 1009.5 449.5 L 952.5 449.5 Z M 1073.5 220.5 L 1130.5 220.5 L 1130.5 449.5 L 1073.5 449.5 Z M 1073.5 220.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface335">
+<g id="surface363">
 <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 636.554688 542.246094 L 636.554688 561.5 L 630.292969 561.5 L 630.292969 542.246094 L 611.375 512.421875 L 619.117188 512.421875 L 633.523438 536.320312 L 647.527344 512.421875 L 655 512.421875 Z M 636.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 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/o2111ai/sky130_fd_sc_lp__o2111ai_m.svg b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.svg
index 6d0ee07..952d8d3 100644
--- a/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.svg
+++ b/cells/o2111ai/sky130_fd_sc_lp__o2111ai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image421"/>
 </pattern>
 <mask 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="#image393"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1149.5 765.5 L 1183.5 765.5 L 1183.5 861.5 L 1149.5 861.5 Z M 787.5 765.5 L 821.5 765.5 L 821.5 861.5 L 787.5 861.5 Z M 869.5 765.5 L 903.5 765.5 L 903.5 861.5 L 869.5 861.5 Z M 952.5 765.5 L 986.5 765.5 L 986.5 861.5 L 952.5 861.5 Z M 1050.5 765.5 L 1085.5 765.5 L 1085.5 861.5 L 1050.5 861.5 Z M 1050.5 765.5 "/>
 </clipPath>
-<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image422"/>
 </pattern>
 <mask id="mask2">
 <rect 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 209.5 L 1167.5 209.5 L 1167.5 305.5 L 1133.5 305.5 Z M 755.5 209.5 L 789.5 209.5 L 789.5 305.5 L 755.5 305.5 Z M 853.5 209.5 L 887.5 209.5 L 887.5 305.5 L 853.5 305.5 Z M 952.5 209.5 L 986.5 209.5 L 986.5 305.5 L 952.5 305.5 Z M 1050.5 209.5 L 1085.5 209.5 L 1085.5 305.5 L 1050.5 305.5 Z M 1050.5 209.5 "/>
 </clipPath>
-<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image423"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image424"/>
 </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="surface418">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -222,6 +222,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 883.476562 442.953125 L 872.90625 442.953125 L 872.90625 438.714844 L 874.722656 438.511719 L 876.339844 438.242188 L 877.753906 437.90625 L 878.964844 437.636719 L 879.972656 437.300781 L 880.847656 436.894531 L 881.523438 436.492188 L 882.128906 436.019531 L 882.667969 435.480469 L 883.207031 434.808594 L 883.675781 434.066406 L 884.148438 433.191406 L 884.351562 432.722656 L 884.550781 432.183594 L 884.753906 431.578125 L 885.023438 430.835938 L 885.226562 430.097656 L 885.496094 429.222656 L 889.398438 429.222656 L 889.398438 476.953125 L 883.476562 476.953125 Z M 883.476562 442.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 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 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/o211a/sky130_fd_sc_lp__o211a_0.svg b/cells/o211a/sky130_fd_sc_lp__o211a_0.svg
index a6eb617..59f618b 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_0.svg
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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 1221.5 768.5 L 1255.5 768.5 L 1255.5 864.5 L 1221.5 864.5 Z M 669.5 768.5 L 703.5 768.5 L 703.5 864.5 L 669.5 864.5 Z M 932.5 768.5 L 967.5 768.5 L 967.5 864.5 L 932.5 864.5 Z M 1033.5 768.5 L 1067.5 768.5 L 1067.5 864.5 L 1033.5 864.5 Z M 1138.5 768.5 L 1173.5 768.5 L 1173.5 864.5 L 1138.5 864.5 Z M 1138.5 768.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 1221.5 216.5 L 1255.5 216.5 L 1255.5 362.5 L 1221.5 362.5 Z M 815.5 216.5 L 850.5 216.5 L 850.5 362.5 L 815.5 362.5 Z M 932.5 216.5 L 967.5 216.5 L 967.5 362.5 L 932.5 362.5 Z M 1015.5 216.5 L 1049.5 216.5 L 1049.5 362.5 L 1015.5 362.5 Z M 1122.5 216.5 L 1157.5 216.5 L 1157.5 362.5 L 1122.5 362.5 Z M 1122.5 216.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 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/o211a/sky130_fd_sc_lp__o211a_1.svg b/cells/o211a/sky130_fd_sc_lp__o211a_1.svg
index 4fd5e80..26c8030 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_1.svg
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1236.5 670.5 L 1270.5 670.5 L 1270.5 862.5 L 1236.5 862.5 Z M 1153.5 670.5 L 1188.5 670.5 L 1188.5 862.5 L 1153.5 862.5 Z M 887.5 670.5 L 922.5 670.5 L 922.5 862.5 L 887.5 862.5 Z M 1030.5 670.5 L 1064.5 670.5 L 1064.5 862.5 L 1030.5 862.5 Z M 627.5 672.5 L 662.5 672.5 L 662.5 864.5 L 627.5 864.5 Z M 627.5 672.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 1236.5 209.5 L 1270.5 209.5 L 1270.5 498.5 L 1236.5 498.5 Z M 729.5 209.5 L 764.5 209.5 L 764.5 498.5 L 729.5 498.5 Z M 906.5 209.5 L 940.5 209.5 L 940.5 498.5 L 906.5 498.5 Z M 988.5 209.5 L 1023.5 209.5 L 1023.5 498.5 L 988.5 498.5 Z M 1112.5 209.5 L 1146.5 209.5 L 1146.5 498.5 L 1112.5 498.5 Z M 1112.5 209.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/o211a/sky130_fd_sc_lp__o211a_2.svg b/cells/o211a/sky130_fd_sc_lp__o211a_2.svg
index 141f6bb..bed3455 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_2.svg
+++ b/cells/o211a/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.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="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1120.5 661.5 L 1154.5 661.5 L 1154.5 854.5 L 1120.5 854.5 Z M 1219.5 661.5 L 1253.5 661.5 L 1253.5 854.5 L 1219.5 854.5 Z M 1012.5 661.5 L 1047.5 661.5 L 1047.5 854.5 L 1012.5 854.5 Z M 914.5 661.5 L 948.5 661.5 L 948.5 854.5 L 914.5 854.5 Z M 696.5 672.5 L 730.5 672.5 L 730.5 864.5 L 696.5 864.5 Z M 614.5 672.5 L 648.5 672.5 L 648.5 864.5 L 614.5 864.5 Z M 614.5 672.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1271.5 209.5 L 1306.5 209.5 L 1306.5 498.5 L 1271.5 498.5 Z M 653.5 209.5 L 687.5 209.5 L 687.5 498.5 L 653.5 498.5 Z M 760.5 209.5 L 795.5 209.5 L 795.5 498.5 L 760.5 498.5 Z M 914.5 209.5 L 948.5 209.5 L 948.5 498.5 L 914.5 498.5 Z M 996.5 209.5 L 1031.5 209.5 L 1031.5 498.5 L 996.5 498.5 Z M 1173.5 209.5 L 1207.5 209.5 L 1207.5 498.5 L 1173.5 498.5 Z M 1173.5 209.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 608.476562 611.953125 L 597.90625 611.953125 L 597.90625 607.714844 L 599.722656 607.511719 L 601.339844 607.242188 L 602.753906 606.90625 L 603.964844 606.636719 L 604.972656 606.300781 L 605.847656 605.894531 L 606.523438 605.492188 L 607.128906 605.019531 L 607.667969 604.480469 L 608.207031 603.808594 L 608.675781 603.066406 L 609.148438 602.191406 L 609.351562 601.722656 L 609.550781 601.183594 L 609.753906 600.578125 L 610.023438 599.835938 L 610.226562 599.097656 L 610.496094 598.222656 L 614.398438 598.222656 L 614.398438 645.953125 L 608.476562 645.953125 Z M 608.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 557 477 L 596 477 M 557 438 L 596 438 M 557 438 L 557 477 M 596 438 L 596 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 557 477 L 596 477 M 557 438 L 596 438 M 596 477 L 596 438 M 557 477 L 557 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_lp__o211a_4.svg b/cells/o211a/sky130_fd_sc_lp__o211a_4.svg
index 1811cde..be037bd 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_4.svg
+++ b/cells/o211a/sky130_fd_sc_lp__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 539.5 L 174.5 539.5 Z M 174.5 127.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 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="#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 1558.5 665.5 L 1591.5 665.5 L 1591.5 850.5 L 1558.5 850.5 Z M 1463.5 665.5 L 1496.5 665.5 L 1496.5 850.5 L 1463.5 850.5 Z M 1248.5 665.5 L 1281.5 665.5 L 1281.5 850.5 L 1248.5 850.5 Z M 817.5 665.5 L 851.5 665.5 L 851.5 850.5 L 817.5 850.5 Z M 1144.5 665.5 L 1177.5 665.5 L 1177.5 850.5 L 1144.5 850.5 Z M 1368.5 665.5 L 1401.5 665.5 L 1401.5 850.5 L 1368.5 850.5 Z M 912.5 665.5 L 946.5 665.5 L 946.5 850.5 L 912.5 850.5 Z M 1049.5 665.5 L 1082.5 665.5 L 1082.5 850.5 L 1049.5 850.5 Z M 495.5 667.5 L 528.5 667.5 L 528.5 852.5 L 495.5 852.5 Z M 400.5 667.5 L 433.5 667.5 L 433.5 852.5 L 400.5 852.5 Z M 305.5 667.5 L 338.5 667.5 L 338.5 852.5 L 305.5 852.5 Z M 590.5 667.5 L 623.5 667.5 L 623.5 852.5 L 590.5 852.5 Z M 590.5 667.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 1558.5 220.5 L 1591.5 220.5 L 1591.5 499.5 L 1558.5 499.5 Z M 391.5 220.5 L 424.5 220.5 L 424.5 499.5 L 391.5 499.5 Z M 486.5 220.5 L 519.5 220.5 L 519.5 499.5 L 486.5 499.5 Z M 581.5 220.5 L 614.5 220.5 L 614.5 499.5 L 581.5 499.5 Z M 676.5 220.5 L 709.5 220.5 L 709.5 499.5 L 676.5 499.5 Z M 771.5 220.5 L 804.5 220.5 L 804.5 499.5 L 771.5 499.5 Z M 954.5 220.5 L 987.5 220.5 L 987.5 499.5 L 954.5 499.5 Z M 1049.5 220.5 L 1082.5 220.5 L 1082.5 499.5 L 1049.5 499.5 Z M 1169.5 220.5 L 1202.5 220.5 L 1202.5 499.5 L 1169.5 499.5 Z M 1273.5 220.5 L 1306.5 220.5 L 1306.5 499.5 L 1273.5 499.5 Z M 1368.5 220.5 L 1401.5 220.5 L 1401.5 499.5 L 1368.5 499.5 Z M 1463.5 220.5 L 1496.5 220.5 L 1496.5 499.5 L 1463.5 499.5 Z M 1463.5 220.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/o211a/sky130_fd_sc_lp__o211a_lp.svg b/cells/o211a/sky130_fd_sc_lp__o211a_lp.svg
index 69f5ba1..0171b56 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_lp.svg
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 618.5 657.5 L 653.5 657.5 L 653.5 753.5 L 618.5 753.5 Z M 941.5 657.5 L 976.5 657.5 L 976.5 753.5 L 941.5 753.5 Z M 852.5 657.5 L 886.5 657.5 L 886.5 753.5 L 852.5 753.5 Z M 753.5 657.5 L 788.5 657.5 L 788.5 753.5 L 753.5 753.5 Z M 1182.5 768.5 L 1216.5 768.5 L 1216.5 864.5 L 1182.5 864.5 Z M 1271.5 768.5 L 1306.5 768.5 L 1306.5 864.5 L 1271.5 864.5 Z M 1271.5 768.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 618.5 209.5 L 675.5 209.5 L 675.5 438.5 L 618.5 438.5 Z M 730.5 209.5 L 788.5 209.5 L 788.5 438.5 L 730.5 438.5 Z M 999.5 209.5 L 1056.5 209.5 L 1056.5 438.5 L 999.5 438.5 Z M 852.5 209.5 L 909.5 209.5 L 909.5 438.5 L 852.5 438.5 Z M 1248.5 220.5 L 1306.5 220.5 L 1306.5 449.5 L 1248.5 449.5 Z M 1248.5 220.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 605.773438 442.503906 L 595.203125 442.503906 L 595.203125 438.261719 L 597.019531 438.058594 L 598.636719 437.789062 L 600.050781 437.453125 L 601.261719 437.183594 L 602.269531 436.847656 L 603.148438 436.445312 L 603.820312 436.039062 L 604.425781 435.570312 L 604.964844 435.03125 L 605.503906 434.355469 L 605.972656 433.617188 L 606.445312 432.742188 L 606.648438 432.269531 L 606.847656 431.730469 L 607.050781 431.125 L 607.320312 430.386719 L 607.523438 429.644531 L 607.792969 428.769531 L 611.695312 428.769531 L 611.695312 476.5 L 605.773438 476.5 Z M 605.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 557 647 L 596 647 M 557 608 L 596 608 M 557 608 L 557 647 M 596 608 L 596 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 557 647 L 596 647 M 557 608 L 596 608 M 596 647 L 596 608 M 557 647 L 557 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/o211a/sky130_fd_sc_lp__o211a_m.svg b/cells/o211a/sky130_fd_sc_lp__o211a_m.svg
index 8c696e2..06ea70e 100644
--- a/cells/o211a/sky130_fd_sc_lp__o211a_m.svg
+++ b/cells/o211a/sky130_fd_sc_lp__o211a_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="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 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="#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 669.5 723.5 L 703.5 723.5 L 703.5 820.5 L 669.5 820.5 Z M 1184.5 766.5 L 1219.5 766.5 L 1219.5 862.5 L 1184.5 862.5 Z M 1102.5 766.5 L 1136.5 766.5 L 1136.5 862.5 L 1102.5 862.5 Z M 1003.5 766.5 L 1038.5 766.5 L 1038.5 862.5 L 1003.5 862.5 Z M 886.5 766.5 L 921.5 766.5 L 921.5 862.5 L 886.5 862.5 Z M 886.5 766.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 1201.5 397.5 L 1236.5 397.5 L 1236.5 493.5 L 1201.5 493.5 Z M 743.5 397.5 L 777.5 397.5 L 777.5 493.5 L 743.5 493.5 Z M 886.5 397.5 L 921.5 397.5 L 921.5 493.5 L 886.5 493.5 Z M 969.5 397.5 L 1003.5 397.5 L 1003.5 493.5 L 969.5 493.5 Z M 1093.5 397.5 L 1127.5 397.5 L 1127.5 493.5 L 1093.5 493.5 Z M 1093.5 397.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/o211ai/sky130_fd_sc_lp__o211ai_0.svg b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.svg
index ace8d40..c1599e9 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_0.svg
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image338"/>
+  <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 1093.5 768.5 L 1127.5 768.5 L 1127.5 864.5 L 1093.5 864.5 Z M 735.5 768.5 L 769.5 768.5 L 769.5 864.5 L 735.5 864.5 Z M 911.5 768.5 L 946.5 768.5 L 946.5 864.5 L 911.5 864.5 Z M 1010.5 768.5 L 1044.5 768.5 L 1044.5 864.5 L 1010.5 864.5 Z M 1010.5 768.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1106.5 239.5 L 1141.5 239.5 L 1141.5 385.5 L 1106.5 385.5 Z M 749.5 239.5 L 783.5 239.5 L 783.5 385.5 L 749.5 385.5 Z M 831.5 239.5 L 866.5 239.5 L 866.5 385.5 L 831.5 385.5 Z M 930.5 239.5 L 964.5 239.5 L 964.5 385.5 L 930.5 385.5 Z M 930.5 239.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface335">
+<g id="surface363">
 <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 1242.554688 372.246094 L 1242.554688 391.5 L 1236.292969 391.5 L 1236.292969 372.246094 L 1217.375 342.421875 L 1225.117188 342.421875 L 1239.523438 366.320312 L 1253.527344 342.421875 L 1261 342.421875 Z M 1242.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 1219 731 L 1258 731 M 1219 693 L 1258 693 M 1219 693 L 1219 731 M 1258 693 L 1258 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 1219 731 L 1258 731 M 1219 693 L 1258 693 M 1258 731 L 1258 693 M 1219 731 L 1219 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 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_lp__o211ai_1.svg b/cells/o211ai/sky130_fd_sc_lp__o211ai_1.svg
index 3a2c3e3..4538906 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_1.svg
+++ b/cells/o211ai/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.5 111.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 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="#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 1055.5 672.5 L 1089.5 672.5 L 1089.5 864.5 L 1055.5 864.5 Z M 725.5 672.5 L 759.5 672.5 L 759.5 864.5 L 725.5 864.5 Z M 848.5 672.5 L 883.5 672.5 L 883.5 864.5 L 848.5 864.5 Z M 972.5 672.5 L 1007.5 672.5 L 1007.5 864.5 L 972.5 864.5 Z M 972.5 672.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 1055.5 209.5 L 1089.5 209.5 L 1089.5 498.5 L 1055.5 498.5 Z M 725.5 209.5 L 759.5 209.5 L 759.5 498.5 L 725.5 498.5 Z M 807.5 209.5 L 842.5 209.5 L 842.5 498.5 L 807.5 498.5 Z M 931.5 209.5 L 965.5 209.5 L 965.5 498.5 L 931.5 498.5 Z M 931.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1046.773438 781.503906 L 1036.203125 781.503906 L 1036.203125 777.261719 L 1038.019531 777.058594 L 1039.636719 776.789062 L 1041.050781 776.453125 L 1042.261719 776.183594 L 1043.269531 775.847656 L 1044.148438 775.445312 L 1044.820312 775.039062 L 1045.425781 774.570312 L 1045.964844 774.03125 L 1046.503906 773.355469 L 1046.972656 772.617188 L 1047.445312 771.742188 L 1047.648438 771.269531 L 1047.847656 770.730469 L 1048.050781 770.125 L 1048.320312 769.386719 L 1048.523438 768.644531 L 1048.792969 767.769531 L 1052.695312 767.769531 L 1052.695312 815.5 L 1046.773438 815.5 Z M 1046.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 999 307 L 1038 307 M 999 269 L 1038 269 M 999 269 L 999 307 M 1038 269 L 1038 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 999 307 L 1038 307 M 999 269 L 1038 269 M 1038 307 L 1038 269 M 999 307 L 999 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 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_lp__o211ai_2.svg b/cells/o211ai/sky130_fd_sc_lp__o211ai_2.svg
index 77693e3..bae4719 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_2.svg
+++ b/cells/o211ai/sky130_fd_sc_lp__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 539.5 L 367.5 539.5 Z M 367.5 111.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 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="#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 507.5 651.5 L 541.5 651.5 L 541.5 844.5 L 507.5 844.5 Z M 606.5 651.5 L 640.5 651.5 L 640.5 844.5 L 606.5 844.5 Z M 803.5 651.5 L 837.5 651.5 L 837.5 844.5 L 803.5 844.5 Z M 704.5 651.5 L 738.5 651.5 L 738.5 844.5 L 704.5 844.5 Z M 1030.5 666.5 L 1064.5 666.5 L 1064.5 859.5 L 1030.5 859.5 Z M 1325.5 666.5 L 1360.5 666.5 L 1360.5 859.5 L 1325.5 859.5 Z M 1128.5 666.5 L 1162.5 666.5 L 1162.5 859.5 L 1128.5 859.5 Z M 1227.5 666.5 L 1261.5 666.5 L 1261.5 859.5 L 1227.5 859.5 Z M 1227.5 666.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 1325.5 209.5 L 1360.5 209.5 L 1360.5 498.5 L 1325.5 498.5 Z M 507.5 209.5 L 541.5 209.5 L 541.5 498.5 L 507.5 498.5 Z M 606.5 209.5 L 640.5 209.5 L 640.5 498.5 L 606.5 498.5 Z M 704.5 209.5 L 738.5 209.5 L 738.5 498.5 L 704.5 498.5 Z M 803.5 209.5 L 837.5 209.5 L 837.5 498.5 L 803.5 498.5 Z M 1030.5 209.5 L 1064.5 209.5 L 1064.5 498.5 L 1030.5 498.5 Z M 1128.5 209.5 L 1162.5 209.5 L 1162.5 498.5 L 1128.5 498.5 Z M 1227.5 209.5 L 1261.5 209.5 L 1261.5 498.5 L 1227.5 498.5 Z M 1227.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 497.476562 526.953125 L 486.90625 526.953125 L 486.90625 522.714844 L 488.722656 522.511719 L 490.339844 522.242188 L 491.753906 521.90625 L 492.964844 521.636719 L 493.972656 521.300781 L 494.847656 520.894531 L 495.523438 520.492188 L 496.128906 520.019531 L 496.667969 519.480469 L 497.207031 518.808594 L 497.675781 518.066406 L 498.148438 517.191406 L 498.351562 516.722656 L 498.550781 516.183594 L 498.753906 515.578125 L 499.023438 514.835938 L 499.226562 514.097656 L 499.496094 513.222656 L 503.398438 513.222656 L 503.398438 560.953125 L 497.476562 560.953125 Z M 497.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 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/o211ai/sky130_fd_sc_lp__o211ai_4.svg b/cells/o211ai/sky130_fd_sc_lp__o211ai_4.svg
index 12ab01c..0b23789 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_4.svg
+++ b/cells/o211ai/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" 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="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="#image375"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1308.5 624.5 L 1336.5 624.5 L 1336.5 778.5 L 1308.5 778.5 Z M 1417.5 624.5 L 1444.5 624.5 L 1444.5 778.5 L 1417.5 778.5 Z M 1604.5 624.5 L 1632.5 624.5 L 1632.5 778.5 L 1604.5 778.5 Z M 1229.5 624.5 L 1257.5 624.5 L 1257.5 778.5 L 1229.5 778.5 Z M 1496.5 624.5 L 1524.5 624.5 L 1524.5 778.5 L 1496.5 778.5 Z M 705.5 644.5 L 733.5 644.5 L 733.5 799.5 L 705.5 799.5 Z M 1108.5 644.5 L 1136.5 644.5 L 1136.5 799.5 L 1108.5 799.5 Z M 1029.5 644.5 L 1057.5 644.5 L 1057.5 799.5 L 1029.5 799.5 Z M 950.5 644.5 L 978.5 644.5 L 978.5 799.5 L 950.5 799.5 Z M 865.5 644.5 L 893.5 644.5 L 893.5 799.5 L 865.5 799.5 Z M 785.5 644.5 L 812.5 644.5 L 812.5 799.5 L 785.5 799.5 Z M 626.5 644.5 L 654.5 644.5 L 654.5 799.5 L 626.5 799.5 Z M 468.5 644.5 L 496.5 644.5 L 496.5 799.5 L 468.5 799.5 Z M 547.5 644.5 L 575.5 644.5 L 575.5 799.5 L 547.5 799.5 Z M 310.5 644.5 L 338.5 644.5 L 338.5 799.5 L 310.5 799.5 Z M 389.5 644.5 L 417.5 644.5 L 417.5 799.5 L 389.5 799.5 Z M 389.5 644.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1566.5 273.5 L 1593.5 273.5 L 1593.5 504.5 L 1566.5 504.5 Z M 310.5 273.5 L 338.5 273.5 L 338.5 504.5 L 310.5 504.5 Z M 389.5 273.5 L 417.5 273.5 L 417.5 504.5 L 389.5 504.5 Z M 468.5 273.5 L 496.5 273.5 L 496.5 504.5 L 468.5 504.5 Z M 547.5 273.5 L 575.5 273.5 L 575.5 504.5 L 547.5 504.5 Z M 626.5 273.5 L 654.5 273.5 L 654.5 504.5 L 626.5 504.5 Z M 705.5 273.5 L 733.5 273.5 L 733.5 504.5 L 705.5 504.5 Z M 785.5 273.5 L 812.5 273.5 L 812.5 504.5 L 785.5 504.5 Z M 864.5 273.5 L 891.5 273.5 L 891.5 504.5 L 864.5 504.5 Z M 950.5 273.5 L 978.5 273.5 L 978.5 504.5 L 950.5 504.5 Z M 1029.5 273.5 L 1057.5 273.5 L 1057.5 504.5 L 1029.5 504.5 Z M 1108.5 273.5 L 1136.5 273.5 L 1136.5 504.5 L 1108.5 504.5 Z M 1187.5 273.5 L 1215.5 273.5 L 1215.5 504.5 L 1187.5 504.5 Z M 1266.5 273.5 L 1294.5 273.5 L 1294.5 504.5 L 1266.5 504.5 Z M 1345.5 273.5 L 1373.5 273.5 L 1373.5 504.5 L 1345.5 504.5 Z M 1487.5 273.5 L 1514.5 273.5 L 1514.5 504.5 L 1487.5 504.5 Z M 1487.5 273.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 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="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface372">
+<g id="surface401">
 <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 1160.097656 527.878906 L 1151.507812 527.878906 L 1151.507812 524.429688 L 1152.984375 524.265625 L 1154.296875 524.046875 L 1155.445312 523.773438 L 1156.429688 523.554688 L 1157.25 523.28125 L 1157.960938 522.953125 L 1158.511719 522.625 L 1159.003906 522.242188 L 1159.441406 521.804688 L 1159.878906 521.257812 L 1160.261719 520.65625 L 1160.644531 519.945312 L 1160.808594 519.5625 L 1160.972656 519.125 L 1161.136719 518.632812 L 1161.355469 518.03125 L 1161.519531 517.429688 L 1161.738281 516.71875 L 1164.910156 516.71875 L 1164.910156 555.5 L 1160.097656 555.5 Z M 1160.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 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/o211ai/sky130_fd_sc_lp__o211ai_lp.svg b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.svg
index c6145ca..a9ee80d 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.svg
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 1065.5 757.5 L 1099.5 757.5 L 1099.5 853.5 L 1065.5 853.5 Z M 742.5 757.5 L 776.5 757.5 L 776.5 853.5 L 742.5 853.5 Z M 877.5 757.5 L 911.5 757.5 L 911.5 853.5 L 877.5 853.5 Z M 976.5 757.5 L 1010.5 757.5 L 1010.5 853.5 L 976.5 853.5 Z M 976.5 757.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 1106.5 220.5 L 1164.5 220.5 L 1164.5 449.5 L 1106.5 449.5 Z M 733.5 220.5 L 790.5 220.5 L 790.5 449.5 L 733.5 449.5 Z M 845.5 220.5 L 902.5 220.5 L 902.5 449.5 L 845.5 449.5 Z M 976.5 220.5 L 1033.5 220.5 L 1033.5 449.5 L 976.5 449.5 Z M 976.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1242.554688 796.246094 L 1242.554688 815.5 L 1236.292969 815.5 L 1236.292969 796.246094 L 1217.375 766.421875 L 1225.117188 766.421875 L 1239.523438 790.320312 L 1253.527344 766.421875 L 1261 766.421875 Z M 1242.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 1219 307 L 1258 307 M 1219 269 L 1258 269 M 1219 269 L 1219 307 M 1258 269 L 1258 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 1219 307 L 1258 307 M 1219 269 L 1258 269 M 1258 307 L 1258 269 M 1219 307 L 1219 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 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_lp__o211ai_m.svg b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.svg
index 0c5c92c..59cc2ca 100644
--- a/cells/o211ai/sky130_fd_sc_lp__o211ai_m.svg
+++ b/cells/o211ai/sky130_fd_sc_lp__o211ai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1071.5 768.5 L 1105.5 768.5 L 1105.5 864.5 L 1071.5 864.5 Z M 782.5 768.5 L 816.5 768.5 L 816.5 864.5 L 782.5 864.5 Z M 890.5 768.5 L 924.5 768.5 L 924.5 864.5 L 890.5 864.5 Z M 988.5 768.5 L 1023.5 768.5 L 1023.5 864.5 L 988.5 864.5 Z M 988.5 768.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 1112.5 209.5 L 1146.5 209.5 L 1146.5 305.5 L 1112.5 305.5 Z M 823.5 209.5 L 858.5 209.5 L 858.5 305.5 L 823.5 305.5 Z M 906.5 209.5 L 940.5 209.5 L 940.5 305.5 L 906.5 305.5 Z M 1004.5 209.5 L 1039.5 209.5 L 1039.5 305.5 L 1004.5 305.5 Z M 1004.5 209.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1101.773438 442.503906 L 1091.203125 442.503906 L 1091.203125 438.261719 L 1093.019531 438.058594 L 1094.636719 437.789062 L 1096.050781 437.453125 L 1097.261719 437.183594 L 1098.269531 436.847656 L 1099.148438 436.445312 L 1099.820312 436.039062 L 1100.425781 435.570312 L 1100.964844 435.03125 L 1101.503906 434.355469 L 1101.972656 433.617188 L 1102.445312 432.742188 L 1102.648438 432.269531 L 1102.847656 431.730469 L 1103.050781 431.125 L 1103.320312 430.386719 L 1103.523438 429.644531 L 1103.792969 428.769531 L 1107.695312 428.769531 L 1107.695312 476.5 L 1101.773438 476.5 Z M 1101.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 1054 647 L 1093 647 M 1054 608 L 1093 608 M 1054 608 L 1054 647 M 1093 608 L 1093 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 1054 647 L 1093 647 M 1054 608 L 1093 608 M 1093 647 L 1093 608 M 1054 647 L 1054 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/o21a/sky130_fd_sc_lp__o21a_0.svg b/cells/o21a/sky130_fd_sc_lp__o21a_0.svg
index f3f1c97..e7d342a 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_0.svg
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 1140.5 755.5 L 1174.5 755.5 L 1174.5 852.5 L 1140.5 852.5 Z M 942.5 755.5 L 977.5 755.5 L 977.5 852.5 L 942.5 852.5 Z M 1041.5 755.5 L 1075.5 755.5 L 1075.5 852.5 L 1041.5 852.5 Z M 725.5 766.5 L 759.5 766.5 L 759.5 862.5 L 725.5 862.5 Z M 725.5 766.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 1067.5 218.5 L 1102.5 218.5 L 1102.5 365.5 L 1067.5 365.5 Z M 763.5 218.5 L 797.5 218.5 L 797.5 365.5 L 763.5 365.5 Z M 874.5 218.5 L 908.5 218.5 L 908.5 365.5 L 874.5 365.5 Z M 985.5 218.5 L 1019.5 218.5 L 1019.5 365.5 L 985.5 365.5 Z M 985.5 218.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 692.824219 282.320312 L 710.191406 307.5 L 702.449219 307.5 L 689.050781 287.035156 L 675.589844 307.5 L 667.980469 307.5 L 685.351562 282.320312 L 669.058594 258.421875 L 676.664062 258.421875 L 689.253906 277.675781 L 701.910156 258.421875 L 709.382812 258.421875 Z M 692.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 669 816 L 708 816 M 669 777 L 708 777 M 669 777 L 669 816 M 708 777 L 708 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 669 816 L 708 816 M 669 777 L 708 777 M 708 816 L 708 777 M 669 816 L 669 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/o21a/sky130_fd_sc_lp__o21a_1.svg b/cells/o21a/sky130_fd_sc_lp__o21a_1.svg
index 873e375..e4f0042 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_1.svg
+++ b/cells/o21a/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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 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="#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 1162.5 667.5 L 1197.5 667.5 L 1197.5 860.5 L 1162.5 860.5 Z M 942.5 667.5 L 977.5 667.5 L 977.5 860.5 L 942.5 860.5 Z M 1041.5 667.5 L 1075.5 667.5 L 1075.5 860.5 L 1041.5 860.5 Z M 725.5 672.5 L 759.5 672.5 L 759.5 864.5 L 725.5 864.5 Z M 725.5 672.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 1162.5 209.5 L 1197.5 209.5 L 1197.5 498.5 L 1162.5 498.5 Z M 768.5 209.5 L 803.5 209.5 L 803.5 498.5 L 768.5 498.5 Z M 956.5 209.5 L 991.5 209.5 L 991.5 498.5 L 956.5 498.5 Z M 1080.5 209.5 L 1114.5 209.5 L 1114.5 498.5 L 1080.5 498.5 Z M 1080.5 209.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/o21a/sky130_fd_sc_lp__o21a_2.svg b/cells/o21a/sky130_fd_sc_lp__o21a_2.svg
index 49a07ec..17efd28 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_2.svg
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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 1090.5 667.5 L 1125.5 667.5 L 1125.5 860.5 L 1090.5 860.5 Z M 1198.5 667.5 L 1232.5 667.5 L 1232.5 860.5 L 1198.5 860.5 Z M 992.5 667.5 L 1026.5 667.5 L 1026.5 860.5 L 992.5 860.5 Z M 675.5 672.5 L 710.5 672.5 L 710.5 864.5 L 675.5 864.5 Z M 774.5 672.5 L 808.5 672.5 L 808.5 864.5 L 774.5 864.5 Z M 774.5 672.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 1198.5 209.5 L 1232.5 209.5 L 1232.5 498.5 L 1198.5 498.5 Z M 675.5 209.5 L 710.5 209.5 L 710.5 498.5 L 675.5 498.5 Z M 774.5 209.5 L 808.5 209.5 L 808.5 498.5 L 774.5 498.5 Z M 992.5 209.5 L 1026.5 209.5 L 1026.5 498.5 L 992.5 498.5 Z M 1090.5 209.5 L 1125.5 209.5 L 1125.5 498.5 L 1090.5 498.5 Z M 1090.5 209.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 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/o21a/sky130_fd_sc_lp__o21a_4.svg b/cells/o21a/sky130_fd_sc_lp__o21a_4.svg
index 8016595..71b3eac 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_4.svg
+++ b/cells/o21a/sky130_fd_sc_lp__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 539.5 L 256.5 539.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image302"/>
+  <use xlink:href="#image331"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1271.5 651.5 L 1306.5 651.5 L 1306.5 844.5 L 1271.5 844.5 Z M 1370.5 651.5 L 1404.5 651.5 L 1404.5 844.5 L 1370.5 844.5 Z M 1154.5 651.5 L 1189.5 651.5 L 1189.5 844.5 L 1154.5 844.5 Z M 939.5 651.5 L 973.5 651.5 L 973.5 844.5 L 939.5 844.5 Z M 1468.5 651.5 L 1503.5 651.5 L 1503.5 844.5 L 1468.5 844.5 Z M 1038.5 651.5 L 1072.5 651.5 L 1072.5 844.5 L 1038.5 844.5 Z M 501.5 670.5 L 536.5 670.5 L 536.5 862.5 L 501.5 862.5 Z M 600.5 670.5 L 634.5 670.5 L 634.5 862.5 L 600.5 862.5 Z M 698.5 670.5 L 733.5 670.5 L 733.5 862.5 L 698.5 862.5 Z M 403.5 670.5 L 437.5 670.5 L 437.5 862.5 L 403.5 862.5 Z M 403.5 670.5 "/>
 </clipPath>
-<image id="image303" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image303"/>
+  <use xlink:href="#image332"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1468.5 209.5 L 1503.5 209.5 L 1503.5 498.5 L 1468.5 498.5 Z M 476.5 209.5 L 510.5 209.5 L 510.5 498.5 L 476.5 498.5 Z M 575.5 209.5 L 609.5 209.5 L 609.5 498.5 L 575.5 498.5 Z M 673.5 209.5 L 708.5 209.5 L 708.5 498.5 L 673.5 498.5 Z M 772.5 209.5 L 806.5 209.5 L 806.5 498.5 L 772.5 498.5 Z M 870.5 209.5 L 905.5 209.5 L 905.5 498.5 L 870.5 498.5 Z M 969.5 209.5 L 1003.5 209.5 L 1003.5 498.5 L 969.5 498.5 Z M 1173.5 209.5 L 1207.5 209.5 L 1207.5 498.5 L 1173.5 498.5 Z M 1271.5 209.5 L 1306.5 209.5 L 1306.5 498.5 L 1271.5 498.5 Z M 1370.5 209.5 L 1404.5 209.5 L 1404.5 498.5 L 1370.5 498.5 Z M 1370.5 209.5 "/>
 </clipPath>
-<image id="image304" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image304"/>
+  <use xlink:href="#image333"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image305" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image305"/>
+  <use xlink:href="#image334"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface299">
+<g id="surface328">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 359.824219 536.320312 L 377.191406 561.5 L 369.449219 561.5 L 356.050781 541.035156 L 342.589844 561.5 L 334.980469 561.5 L 352.351562 536.320312 L 336.058594 512.421875 L 343.664062 512.421875 L 356.253906 531.675781 L 368.910156 512.421875 L 376.382812 512.421875 Z M 359.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 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/o21a/sky130_fd_sc_lp__o21a_lp.svg b/cells/o21a/sky130_fd_sc_lp__o21a_lp.svg
index 93274ad..cd25cfc 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_lp.svg
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 673.5 757.5 L 708.5 757.5 L 708.5 853.5 L 673.5 853.5 Z M 790.5 757.5 L 824.5 757.5 L 824.5 853.5 L 790.5 853.5 Z M 907.5 757.5 L 941.5 757.5 L 941.5 853.5 L 907.5 853.5 Z M 1134.5 768.5 L 1168.5 768.5 L 1168.5 864.5 L 1134.5 864.5 Z M 1216.5 768.5 L 1251.5 768.5 L 1251.5 864.5 L 1216.5 864.5 Z M 1216.5 768.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 1111.5 220.5 L 1168.5 220.5 L 1168.5 449.5 L 1111.5 449.5 Z M 687.5 220.5 L 744.5 220.5 L 744.5 449.5 L 687.5 449.5 Z M 799.5 220.5 L 856.5 220.5 L 856.5 449.5 L 799.5 449.5 Z M 989.5 220.5 L 1047.5 220.5 L 1047.5 449.5 L 989.5 449.5 Z M 989.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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 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/o21a/sky130_fd_sc_lp__o21a_m.svg b/cells/o21a/sky130_fd_sc_lp__o21a_m.svg
index 0581e63..3e81e4a 100644
--- a/cells/o21a/sky130_fd_sc_lp__o21a_m.svg
+++ b/cells/o21a/sky130_fd_sc_lp__o21a_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image347" 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="#image347"/>
+  <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 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="#image347"/>
+  <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 1140.5 737.5 L 1174.5 737.5 L 1174.5 833.5 L 1140.5 833.5 Z M 942.5 737.5 L 977.5 737.5 L 977.5 833.5 L 942.5 833.5 Z M 1041.5 737.5 L 1075.5 737.5 L 1075.5 833.5 L 1041.5 833.5 Z M 725.5 766.5 L 759.5 766.5 L 759.5 862.5 L 725.5 862.5 Z M 725.5 766.5 "/>
 </clipPath>
-<image id="image348" 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="#image348"/>
+  <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 1071.5 209.5 L 1105.5 209.5 L 1105.5 305.5 L 1071.5 305.5 Z M 791.5 209.5 L 826.5 209.5 L 826.5 305.5 L 791.5 305.5 Z M 890.5 209.5 L 924.5 209.5 L 924.5 305.5 L 890.5 305.5 Z M 988.5 209.5 L 1023.5 209.5 L 1023.5 305.5 L 988.5 305.5 Z M 988.5 209.5 "/>
 </clipPath>
-<image id="image349" 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="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image350" 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="#image350"/>
+  <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="surface344">
+<g id="surface372">
 <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 692.824219 282.320312 L 710.191406 307.5 L 702.449219 307.5 L 689.050781 287.035156 L 675.589844 307.5 L 667.980469 307.5 L 685.351562 282.320312 L 669.058594 258.421875 L 676.664062 258.421875 L 689.253906 277.675781 L 701.910156 258.421875 L 709.382812 258.421875 Z M 692.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 669 816 L 708 816 M 669 777 L 708 777 M 669 777 L 669 816 M 708 777 L 708 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 669 816 L 708 816 M 669 777 L 708 777 M 708 816 L 708 777 M 669 816 L 669 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/o21ai/sky130_fd_sc_lp__o21ai_0.svg b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.svg
index d1e08df..92c4c99 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_0.svg
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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 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="#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 1047.5 768.5 L 1081.5 768.5 L 1081.5 864.5 L 1047.5 864.5 Z M 850.5 768.5 L 884.5 768.5 L 884.5 864.5 L 850.5 864.5 Z M 948.5 768.5 L 983.5 768.5 L 983.5 864.5 L 948.5 864.5 Z M 948.5 768.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 1047.5 218.5 L 1081.5 218.5 L 1081.5 365.5 L 1047.5 365.5 Z M 859.5 218.5 L 893.5 218.5 L 893.5 365.5 L 859.5 365.5 Z M 948.5 218.5 L 983.5 218.5 L 983.5 365.5 L 948.5 365.5 Z M 948.5 218.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1157.773438 442.503906 L 1147.203125 442.503906 L 1147.203125 438.261719 L 1149.019531 438.058594 L 1150.636719 437.789062 L 1152.050781 437.453125 L 1153.261719 437.183594 L 1154.269531 436.847656 L 1155.148438 436.445312 L 1155.820312 436.039062 L 1156.425781 435.570312 L 1156.964844 435.03125 L 1157.503906 434.355469 L 1157.972656 433.617188 L 1158.445312 432.742188 L 1158.648438 432.269531 L 1158.847656 431.730469 L 1159.050781 431.125 L 1159.320312 430.386719 L 1159.523438 429.644531 L 1159.792969 428.769531 L 1163.695312 428.769531 L 1163.695312 476.5 L 1157.773438 476.5 Z M 1157.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 1110 647 L 1149 647 M 1110 608 L 1149 608 M 1110 608 L 1110 647 M 1149 608 L 1149 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 1110 647 L 1149 647 M 1110 608 L 1149 608 M 1149 647 L 1149 608 M 1110 647 L 1110 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/o21ai/sky130_fd_sc_lp__o21ai_1.svg b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.svg
index 9f99487..8d102c0 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_1.svg
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image299"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1058.5 672.5 L 1093.5 672.5 L 1093.5 864.5 L 1058.5 864.5 Z M 838.5 672.5 L 873.5 672.5 L 873.5 864.5 L 838.5 864.5 Z M 960.5 672.5 L 994.5 672.5 L 994.5 864.5 L 960.5 864.5 Z M 960.5 672.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1058.5 209.5 L 1093.5 209.5 L 1093.5 498.5 L 1058.5 498.5 Z M 838.5 209.5 L 873.5 209.5 L 873.5 498.5 L 838.5 498.5 Z M 921.5 209.5 L 955.5 209.5 L 955.5 498.5 L 921.5 498.5 Z M 921.5 209.5 "/>
 </clipPath>
-<image id="image301" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image301"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image302" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image302"/>
+  <use xlink:href="#image330"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface296">
+<g id="surface324">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1157.773438 527.503906 L 1147.203125 527.503906 L 1147.203125 523.261719 L 1149.019531 523.058594 L 1150.636719 522.789062 L 1152.050781 522.453125 L 1153.261719 522.183594 L 1154.269531 521.847656 L 1155.148438 521.445312 L 1155.820312 521.039062 L 1156.425781 520.570312 L 1156.964844 520.03125 L 1157.503906 519.355469 L 1157.972656 518.617188 L 1158.445312 517.742188 L 1158.648438 517.269531 L 1158.847656 516.730469 L 1159.050781 516.125 L 1159.320312 515.386719 L 1159.523438 514.644531 L 1159.792969 513.769531 L 1163.695312 513.769531 L 1163.695312 561.5 L 1157.773438 561.5 Z M 1157.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 1110 562 L 1149 562 M 1110 523 L 1149 523 M 1110 523 L 1110 562 M 1149 523 L 1149 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 1110 562 L 1149 562 M 1110 523 L 1149 523 M 1149 562 L 1149 523 M 1110 562 L 1110 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/o21ai/sky130_fd_sc_lp__o21ai_2.svg b/cells/o21ai/sky130_fd_sc_lp__o21ai_2.svg
index 175cc99..caf2cf3 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_2.svg
+++ b/cells/o21ai/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.5 111.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 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="#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 1209.5 672.5 L 1244.5 672.5 L 1244.5 864.5 L 1209.5 864.5 Z M 672.5 672.5 L 706.5 672.5 L 706.5 864.5 L 672.5 864.5 Z M 771.5 672.5 L 805.5 672.5 L 805.5 864.5 L 771.5 864.5 Z M 869.5 672.5 L 903.5 672.5 L 903.5 864.5 L 869.5 864.5 Z M 1012.5 672.5 L 1047.5 672.5 L 1047.5 864.5 L 1012.5 864.5 Z M 1111.5 672.5 L 1145.5 672.5 L 1145.5 864.5 L 1111.5 864.5 Z M 1111.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 1209.5 209.5 L 1244.5 209.5 L 1244.5 498.5 L 1209.5 498.5 Z M 672.5 209.5 L 706.5 209.5 L 706.5 498.5 L 672.5 498.5 Z M 771.5 209.5 L 805.5 209.5 L 805.5 498.5 L 771.5 498.5 Z M 869.5 209.5 L 903.5 209.5 L 903.5 498.5 L 869.5 498.5 Z M 1003.5 209.5 L 1038.5 209.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1111.5 209.5 L 1145.5 209.5 L 1145.5 498.5 L 1111.5 498.5 Z M 1111.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/o21ai/sky130_fd_sc_lp__o21ai_4.svg b/cells/o21ai/sky130_fd_sc_lp__o21ai_4.svg
index ba4c53b..2de5adb 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_4.svg
+++ b/cells/o21ai/sky130_fd_sc_lp__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 539.5 L 256.5 539.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image330" 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="#image330"/>
+  <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="#image330"/>
+  <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 1490.5 672.5 L 1525.5 672.5 L 1525.5 864.5 L 1490.5 864.5 Z M 397.5 672.5 L 431.5 672.5 L 431.5 864.5 L 397.5 864.5 Z M 496.5 672.5 L 530.5 672.5 L 530.5 864.5 L 496.5 864.5 Z M 594.5 672.5 L 628.5 672.5 L 628.5 864.5 L 594.5 864.5 Z M 693.5 672.5 L 727.5 672.5 L 727.5 864.5 L 693.5 864.5 Z M 791.5 672.5 L 826.5 672.5 L 826.5 864.5 L 791.5 864.5 Z M 890.5 672.5 L 924.5 672.5 L 924.5 864.5 L 890.5 864.5 Z M 988.5 672.5 L 1023.5 672.5 L 1023.5 864.5 L 988.5 864.5 Z M 1096.5 672.5 L 1130.5 672.5 L 1130.5 864.5 L 1096.5 864.5 Z M 1195.5 672.5 L 1229.5 672.5 L 1229.5 864.5 L 1195.5 864.5 Z M 1293.5 672.5 L 1327.5 672.5 L 1327.5 864.5 L 1293.5 864.5 Z M 1392.5 672.5 L 1426.5 672.5 L 1426.5 864.5 L 1392.5 864.5 Z M 1392.5 672.5 "/>
 </clipPath>
-<image id="image331" 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="#image331"/>
+  <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 1490.5 209.5 L 1525.5 209.5 L 1525.5 498.5 L 1490.5 498.5 Z M 397.5 209.5 L 431.5 209.5 L 431.5 498.5 L 397.5 498.5 Z M 496.5 209.5 L 530.5 209.5 L 530.5 498.5 L 496.5 498.5 Z M 594.5 209.5 L 628.5 209.5 L 628.5 498.5 L 594.5 498.5 Z M 693.5 209.5 L 727.5 209.5 L 727.5 498.5 L 693.5 498.5 Z M 791.5 209.5 L 826.5 209.5 L 826.5 498.5 L 791.5 498.5 Z M 890.5 209.5 L 924.5 209.5 L 924.5 498.5 L 890.5 498.5 Z M 988.5 209.5 L 1023.5 209.5 L 1023.5 498.5 L 988.5 498.5 Z M 1087.5 209.5 L 1121.5 209.5 L 1121.5 498.5 L 1087.5 498.5 Z M 1195.5 209.5 L 1229.5 209.5 L 1229.5 498.5 L 1195.5 498.5 Z M 1293.5 209.5 L 1327.5 209.5 L 1327.5 498.5 L 1293.5 498.5 Z M 1392.5 209.5 L 1426.5 209.5 L 1426.5 498.5 L 1392.5 498.5 Z M 1392.5 209.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image333" 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="#image333"/>
+  <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="surface327">
+<g id="surface356">
 <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 1569.554688 627.246094 L 1569.554688 646.5 L 1563.292969 646.5 L 1563.292969 627.246094 L 1544.375 597.421875 L 1552.117188 597.421875 L 1566.523438 621.320312 L 1580.527344 597.421875 L 1588 597.421875 Z M 1569.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 1545 477 L 1584 477 M 1545 438 L 1584 438 M 1545 438 L 1545 477 M 1584 438 L 1584 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 1545 477 L 1584 477 M 1545 438 L 1584 438 M 1584 477 L 1584 438 M 1545 477 L 1545 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/o21ai/sky130_fd_sc_lp__o21ai_lp.svg b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.svg
index 7b32fab..9d1c199 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.svg
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1060.5 757.5 L 1095.5 757.5 L 1095.5 853.5 L 1060.5 853.5 Z M 827.5 757.5 L 861.5 757.5 L 861.5 853.5 L 827.5 853.5 Z M 962.5 757.5 L 996.5 757.5 L 996.5 853.5 L 962.5 853.5 Z M 962.5 757.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 1051.5 220.5 L 1109.5 220.5 L 1109.5 449.5 L 1051.5 449.5 Z M 808.5 220.5 L 866.5 220.5 L 866.5 449.5 L 808.5 449.5 Z M 921.5 220.5 L 978.5 220.5 L 978.5 449.5 L 921.5 449.5 Z M 921.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 881.773438 527.503906 L 871.203125 527.503906 L 871.203125 523.261719 L 873.019531 523.058594 L 874.636719 522.789062 L 876.050781 522.453125 L 877.261719 522.183594 L 878.269531 521.847656 L 879.148438 521.445312 L 879.820312 521.039062 L 880.425781 520.570312 L 880.964844 520.03125 L 881.503906 519.355469 L 881.972656 518.617188 L 882.445312 517.742188 L 882.648438 517.269531 L 882.847656 516.730469 L 883.050781 516.125 L 883.320312 515.386719 L 883.523438 514.644531 L 883.792969 513.769531 L 887.695312 513.769531 L 887.695312 561.5 L 881.773438 561.5 Z M 881.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 834 562 L 873 562 M 834 523 L 873 523 M 834 523 L 834 562 M 873 523 L 873 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 834 562 L 873 562 M 834 523 L 873 523 M 873 562 L 873 523 M 834 562 L 834 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/o21ai/sky130_fd_sc_lp__o21ai_m.svg b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.svg
index 7036311..d1af039 100644
--- a/cells/o21ai/sky130_fd_sc_lp__o21ai_m.svg
+++ b/cells/o21ai/sky130_fd_sc_lp__o21ai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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 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="#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 1033.5 763.5 L 1067.5 763.5 L 1067.5 860.5 L 1033.5 860.5 Z M 836.5 763.5 L 870.5 763.5 L 870.5 860.5 L 836.5 860.5 Z M 934.5 763.5 L 969.5 763.5 L 969.5 860.5 L 934.5 860.5 Z M 934.5 763.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 1042.5 325.5 L 1077.5 325.5 L 1077.5 421.5 L 1042.5 421.5 Z M 836.5 325.5 L 870.5 325.5 L 870.5 421.5 L 836.5 421.5 Z M 918.5 325.5 L 953.5 325.5 L 953.5 421.5 L 918.5 421.5 Z M 918.5 325.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1047.773438 527.503906 L 1037.203125 527.503906 L 1037.203125 523.261719 L 1039.019531 523.058594 L 1040.636719 522.789062 L 1042.050781 522.453125 L 1043.261719 522.183594 L 1044.269531 521.847656 L 1045.148438 521.445312 L 1045.820312 521.039062 L 1046.425781 520.570312 L 1046.964844 520.03125 L 1047.503906 519.355469 L 1047.972656 518.617188 L 1048.445312 517.742188 L 1048.648438 517.269531 L 1048.847656 516.730469 L 1049.050781 516.125 L 1049.320312 515.386719 L 1049.523438 514.644531 L 1049.792969 513.769531 L 1053.695312 513.769531 L 1053.695312 561.5 L 1047.773438 561.5 Z M 1047.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 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/o21ba/sky130_fd_sc_lp__o21ba_0.svg b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.svg
index b6dc874..e541bea 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_0.svg
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.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 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="#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 1256.5 768.5 L 1291.5 768.5 L 1291.5 864.5 L 1256.5 864.5 Z M 639.5 768.5 L 673.5 768.5 L 673.5 864.5 L 639.5 864.5 Z M 815.5 768.5 L 850.5 768.5 L 850.5 864.5 L 815.5 864.5 Z M 1059.5 768.5 L 1094.5 768.5 L 1094.5 864.5 L 1059.5 864.5 Z M 1158.5 768.5 L 1192.5 768.5 L 1192.5 864.5 L 1158.5 864.5 Z M 1158.5 768.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 1215.5 213.5 L 1250.5 213.5 L 1250.5 360.5 L 1215.5 360.5 Z M 1027.5 213.5 L 1062.5 213.5 L 1062.5 360.5 L 1027.5 360.5 Z M 1126.5 213.5 L 1160.5 213.5 L 1160.5 360.5 L 1126.5 360.5 Z M 614.5 317.5 L 648.5 317.5 L 648.5 463.5 L 614.5 463.5 Z M 783.5 367.5 L 818.5 367.5 L 818.5 463.5 L 783.5 463.5 Z M 783.5 367.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image378"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/o21ba/sky130_fd_sc_lp__o21ba_1.svg b/cells/o21ba/sky130_fd_sc_lp__o21ba_1.svg
index cc92a08..0b0385e 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_1.svg
+++ b/cells/o21ba/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.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 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="#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 810.5 664.5 L 844.5 664.5 L 844.5 760.5 L 810.5 760.5 Z M 618.5 664.5 L 653.5 664.5 L 653.5 856.5 L 618.5 856.5 Z M 1152.5 667.5 L 1187.5 667.5 L 1187.5 860.5 L 1152.5 860.5 Z M 1274.5 667.5 L 1308.5 667.5 L 1308.5 860.5 L 1274.5 860.5 Z M 1054.5 667.5 L 1088.5 667.5 L 1088.5 860.5 L 1054.5 860.5 Z M 1054.5 667.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 664.5 209.5 L 698.5 209.5 L 698.5 498.5 L 664.5 498.5 Z M 810.5 401.5 L 844.5 401.5 L 844.5 498.5 L 810.5 498.5 Z M 1157.5 209.5 L 1191.5 209.5 L 1191.5 498.5 L 1157.5 498.5 Z M 1054.5 209.5 L 1088.5 209.5 L 1088.5 498.5 L 1054.5 498.5 Z M 1274.5 209.5 L 1308.5 209.5 L 1308.5 498.5 L 1274.5 498.5 Z M 1274.5 209.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface326">
+<g id="surface355">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <path style=" 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 366.320312 L 599.191406 391.5 L 591.449219 391.5 L 578.050781 371.035156 L 564.589844 391.5 L 556.980469 391.5 L 574.351562 366.320312 L 558.058594 342.421875 L 565.664062 342.421875 L 578.253906 361.675781 L 590.910156 342.421875 L 598.382812 342.421875 Z M 581.824219 366.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 731 L 596 731 M 557 693 L 596 693 M 557 693 L 557 731 M 596 693 L 596 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 557 731 L 596 731 M 557 693 L 596 693 M 596 731 L 596 693 M 557 731 L 557 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 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_lp__o21ba_2.svg b/cells/o21ba/sky130_fd_sc_lp__o21ba_2.svg
index 4c4359c..3c2deec 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_2.svg
+++ b/cells/o21ba/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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 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="#image341"/>
+  <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 615.5 672.5 L 649.5 672.5 L 649.5 768.5 L 615.5 768.5 Z M 1051.5 672.5 L 1086.5 672.5 L 1086.5 864.5 L 1051.5 864.5 Z M 735.5 672.5 L 769.5 672.5 L 769.5 864.5 L 735.5 864.5 Z M 834.5 672.5 L 868.5 672.5 L 868.5 864.5 L 834.5 864.5 Z M 1267.5 672.5 L 1301.5 672.5 L 1301.5 864.5 L 1267.5 864.5 Z M 1150.5 672.5 L 1184.5 672.5 L 1184.5 864.5 L 1150.5 864.5 Z M 1150.5 672.5 "/>
 </clipPath>
-<image id="image342" 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="#image342"/>
+  <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 1134.5 209.5 L 1168.5 209.5 L 1168.5 498.5 L 1134.5 498.5 Z M 653.5 401.5 L 687.5 401.5 L 687.5 498.5 L 653.5 498.5 Z M 1266.5 209.5 L 1300.5 209.5 L 1300.5 498.5 L 1266.5 498.5 Z M 1033.5 209.5 L 1067.5 209.5 L 1067.5 498.5 L 1033.5 498.5 Z M 899.5 209.5 L 933.5 209.5 L 933.5 498.5 L 899.5 498.5 Z M 800.5 209.5 L 835.5 209.5 L 835.5 498.5 L 800.5 498.5 Z M 800.5 209.5 "/>
 </clipPath>
-<image id="image343" 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="#image343"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image344" 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="#image344"/>
+  <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="surface338">
+<g id="surface367">
 <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 801.824219 451.320312 L 819.191406 476.5 L 811.449219 476.5 L 798.050781 456.035156 L 784.589844 476.5 L 776.980469 476.5 L 794.351562 451.320312 L 778.058594 427.421875 L 785.664062 427.421875 L 798.253906 446.675781 L 810.910156 427.421875 L 818.382812 427.421875 Z M 801.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 777 647 L 816 647 M 777 608 L 816 608 M 777 608 L 777 647 M 816 608 L 816 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 777 647 L 816 647 M 777 608 L 816 608 M 816 647 L 816 608 M 777 647 L 777 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/o21ba/sky130_fd_sc_lp__o21ba_4.svg b/cells/o21ba/sky130_fd_sc_lp__o21ba_4.svg
index f216c99..1feaf52 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_4.svg
+++ b/cells/o21ba/sky130_fd_sc_lp__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 539.5 L 201.5 539.5 Z M 201.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="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="#image327"/>
+  <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 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="#image327"/>
+  <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 1315.5 651.5 L 1349.5 651.5 L 1349.5 844.5 L 1315.5 844.5 Z M 1413.5 651.5 L 1448.5 651.5 L 1448.5 844.5 L 1413.5 844.5 Z M 1198.5 651.5 L 1232.5 651.5 L 1232.5 844.5 L 1198.5 844.5 Z M 1081.5 651.5 L 1115.5 651.5 L 1115.5 844.5 L 1081.5 844.5 Z M 1512.5 651.5 L 1546.5 651.5 L 1546.5 844.5 L 1512.5 844.5 Z M 983.5 651.5 L 1017.5 651.5 L 1017.5 844.5 L 983.5 844.5 Z M 648.5 670.5 L 682.5 670.5 L 682.5 862.5 L 648.5 862.5 Z M 451.5 670.5 L 485.5 670.5 L 485.5 862.5 L 451.5 862.5 Z M 549.5 670.5 L 584.5 670.5 L 584.5 862.5 L 549.5 862.5 Z M 746.5 670.5 L 781.5 670.5 L 781.5 862.5 L 746.5 862.5 Z M 352.5 670.5 L 387.5 670.5 L 387.5 862.5 L 352.5 862.5 Z M 352.5 670.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <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 1512.5 209.5 L 1546.5 209.5 L 1546.5 498.5 L 1512.5 498.5 Z M 361.5 209.5 L 396.5 209.5 L 396.5 498.5 L 361.5 498.5 Z M 460.5 209.5 L 494.5 209.5 L 494.5 498.5 L 460.5 498.5 Z M 559.5 209.5 L 593.5 209.5 L 593.5 498.5 L 559.5 498.5 Z M 658.5 209.5 L 693.5 209.5 L 693.5 498.5 L 658.5 498.5 Z M 757.5 209.5 L 791.5 209.5 L 791.5 498.5 L 757.5 498.5 Z M 941.5 209.5 L 976.5 209.5 L 976.5 498.5 L 941.5 498.5 Z M 1040.5 209.5 L 1074.5 209.5 L 1074.5 498.5 L 1040.5 498.5 Z M 1216.5 209.5 L 1251.5 209.5 L 1251.5 498.5 L 1216.5 498.5 Z M 1315.5 209.5 L 1349.5 209.5 L 1349.5 498.5 L 1315.5 498.5 Z M 1413.5 209.5 L 1448.5 209.5 L 1448.5 498.5 L 1413.5 498.5 Z M 1413.5 209.5 "/>
 </clipPath>
-<image id="image329" 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="#image329"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image330" 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="#image330"/>
+  <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="surface324">
+<g id="surface354">
 <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 492.550781 512.574219 L 492.550781 561.652344 L 485.484375 561.652344 L 460.101562 521.863281 L 460.101562 561.652344 L 454.179688 561.652344 L 454.179688 512.574219 L 460.976562 512.574219 L 486.628906 552.699219 L 486.628906 512.574219 Z M 492.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 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/o21ba/sky130_fd_sc_lp__o21ba_lp.svg b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.svg
index da41761..f3a3e55 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.svg
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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 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="#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 1244.5 736.5 L 1278.5 736.5 L 1278.5 832.5 L 1244.5 832.5 Z M 1326.5 736.5 L 1361.5 736.5 L 1361.5 832.5 L 1326.5 832.5 Z M 1063.5 736.5 L 1097.5 736.5 L 1097.5 832.5 L 1063.5 832.5 Z M 1145.5 736.5 L 1180.5 736.5 L 1180.5 832.5 L 1145.5 832.5 Z M 706.5 759.5 L 741.5 759.5 L 741.5 855.5 L 706.5 855.5 Z M 830.5 759.5 L 865.5 759.5 L 865.5 855.5 L 830.5 855.5 Z M 571.5 759.5 L 606.5 759.5 L 606.5 855.5 L 571.5 855.5 Z M 571.5 759.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 1303.5 209.5 L 1361.5 209.5 L 1361.5 438.5 L 1303.5 438.5 Z M 699.5 243.5 L 757.5 243.5 L 757.5 472.5 L 699.5 472.5 Z M 988.5 243.5 L 1046.5 243.5 L 1046.5 472.5 L 988.5 472.5 Z M 830.5 243.5 L 887.5 243.5 L 887.5 472.5 L 830.5 472.5 Z M 587.5 243.5 L 644.5 243.5 L 644.5 472.5 L 587.5 472.5 Z M 587.5 243.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image332" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image332"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface326">
+<g id="surface355">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <path style=" 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/o21ba/sky130_fd_sc_lp__o21ba_m.svg b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.svg
index 7e6aba1..8914b8b 100644
--- a/cells/o21ba/sky130_fd_sc_lp__o21ba_m.svg
+++ b/cells/o21ba/sky130_fd_sc_lp__o21ba_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image351" 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="#image351"/>
+  <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 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="#image351"/>
+  <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 661.5 635.5 L 695.5 635.5 L 695.5 731.5 L 661.5 731.5 Z M 781.5 635.5 L 815.5 635.5 L 815.5 828.5 L 781.5 828.5 Z M 1258.5 766.5 L 1292.5 766.5 L 1292.5 862.5 L 1258.5 862.5 Z M 1159.5 766.5 L 1193.5 766.5 L 1193.5 862.5 L 1159.5 862.5 Z M 1060.5 766.5 L 1095.5 766.5 L 1095.5 862.5 L 1060.5 862.5 Z M 1060.5 766.5 "/>
 </clipPath>
-<image id="image352" 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="#image352"/>
+  <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 1097.5 209.5 L 1132.5 209.5 L 1132.5 305.5 L 1097.5 305.5 Z M 1180.5 209.5 L 1214.5 209.5 L 1214.5 305.5 L 1180.5 305.5 Z M 999.5 209.5 L 1033.5 209.5 L 1033.5 305.5 L 999.5 305.5 Z M 781.5 209.5 L 815.5 209.5 L 815.5 498.5 L 781.5 498.5 Z M 661.5 401.5 L 695.5 401.5 L 695.5 498.5 L 661.5 498.5 Z M 661.5 401.5 "/>
 </clipPath>
-<image id="image353" 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="#image353"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image354" 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="#image354"/>
+  <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="surface348">
+<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 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/o21bai/sky130_fd_sc_lp__o21bai_0.svg b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.svg
index f333a98..bf09dc0 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_0.svg
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image348" 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="#image348"/>
+  <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 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="#image348"/>
+  <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 738.5 763.5 L 773.5 763.5 L 773.5 860.5 L 738.5 860.5 Z M 1162.5 768.5 L 1197.5 768.5 L 1197.5 864.5 L 1162.5 864.5 Z M 1064.5 768.5 L 1098.5 768.5 L 1098.5 864.5 L 1064.5 864.5 Z M 965.5 768.5 L 1000.5 768.5 L 1000.5 864.5 L 965.5 864.5 Z M 965.5 768.5 "/>
 </clipPath>
-<image id="image349" 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="#image349"/>
+  <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 1153.5 229.5 L 1188.5 229.5 L 1188.5 376.5 L 1153.5 376.5 Z M 844.5 280.5 L 878.5 280.5 L 878.5 376.5 L 844.5 376.5 Z M 1064.5 229.5 L 1098.5 229.5 L 1098.5 376.5 L 1064.5 376.5 Z M 965.5 229.5 L 1000.5 229.5 L 1000.5 376.5 L 965.5 376.5 Z M 965.5 229.5 "/>
 </clipPath>
-<image id="image350" 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="#image350"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image351" 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="#image351"/>
+  <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="surface345">
+<g id="surface374">
 <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 912.554688 712.246094 L 912.554688 731.5 L 906.292969 731.5 L 906.292969 712.246094 L 887.375 682.421875 L 895.117188 682.421875 L 909.523438 706.320312 L 923.527344 682.421875 L 931 682.421875 Z M 912.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 889 392 L 928 392 M 889 353 L 928 353 M 889 353 L 889 392 M 928 353 L 928 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 889 392 L 928 392 M 889 353 L 928 353 M 928 392 L 928 353 M 889 392 L 889 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/o21bai/sky130_fd_sc_lp__o21bai_1.svg b/cells/o21bai/sky130_fd_sc_lp__o21bai_1.svg
index f775b2d..9833a96 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_1.svg
+++ b/cells/o21bai/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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="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="#image318"/>
+  <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 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="#image318"/>
+  <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 725.5 743.5 L 759.5 743.5 L 759.5 839.5 L 725.5 839.5 Z M 954.5 672.5 L 988.5 672.5 L 988.5 864.5 L 954.5 864.5 Z M 1054.5 672.5 L 1088.5 672.5 L 1088.5 864.5 L 1054.5 864.5 Z M 1167.5 672.5 L 1201.5 672.5 L 1201.5 864.5 L 1167.5 864.5 Z M 1167.5 672.5 "/>
 </clipPath>
-<image id="image319" 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="#image319"/>
+  <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 834.5 360.5 L 868.5 360.5 L 868.5 456.5 L 834.5 456.5 Z M 954.5 209.5 L 988.5 209.5 L 988.5 498.5 L 954.5 498.5 Z M 1085.5 209.5 L 1119.5 209.5 L 1119.5 498.5 L 1085.5 498.5 Z M 1167.5 209.5 L 1201.5 209.5 L 1201.5 498.5 L 1167.5 498.5 Z M 1167.5 209.5 "/>
 </clipPath>
-<image id="image320" 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="#image320"/>
+  <use xlink:href="#image349"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image321" 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="#image321"/>
+  <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="surface315">
+<g id="surface344">
 <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 1022.554688 372.246094 L 1022.554688 391.5 L 1016.292969 391.5 L 1016.292969 372.246094 L 997.375 342.421875 L 1005.117188 342.421875 L 1019.523438 366.320312 L 1033.527344 342.421875 L 1041 342.421875 Z M 1022.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 999 731 L 1038 731 M 999 693 L 1038 693 M 999 693 L 999 731 M 1038 693 L 1038 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 999 731 L 1038 731 M 999 693 L 1038 693 M 1038 731 L 1038 693 M 999 731 L 999 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 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_lp__o21bai_2.svg b/cells/o21bai/sky130_fd_sc_lp__o21bai_2.svg
index 6684117..4c17a49 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_2.svg
+++ b/cells/o21bai/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.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="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="#image327"/>
+  <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 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="#image327"/>
+  <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 1207.5 651.5 L 1242.5 651.5 L 1242.5 844.5 L 1207.5 844.5 Z M 795.5 651.5 L 829.5 651.5 L 829.5 844.5 L 795.5 844.5 Z M 1306.5 651.5 L 1340.5 651.5 L 1340.5 844.5 L 1306.5 844.5 Z M 1109.5 651.5 L 1143.5 651.5 L 1143.5 844.5 L 1109.5 844.5 Z M 992.5 651.5 L 1026.5 651.5 L 1026.5 844.5 L 992.5 844.5 Z M 893.5 651.5 L 928.5 651.5 L 928.5 844.5 L 893.5 844.5 Z M 559.5 751.5 L 593.5 751.5 L 593.5 847.5 L 559.5 847.5 Z M 559.5 751.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <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 1207.5 209.5 L 1242.5 209.5 L 1242.5 498.5 L 1207.5 498.5 Z M 642.5 401.5 L 677.5 401.5 L 677.5 498.5 L 642.5 498.5 Z M 1306.5 209.5 L 1340.5 209.5 L 1340.5 498.5 L 1306.5 498.5 Z M 1109.5 209.5 L 1143.5 209.5 L 1143.5 498.5 L 1109.5 498.5 Z M 1010.5 209.5 L 1044.5 209.5 L 1044.5 498.5 L 1010.5 498.5 Z M 893.5 209.5 L 928.5 209.5 L 928.5 498.5 L 893.5 498.5 Z M 795.5 209.5 L 829.5 209.5 L 829.5 498.5 L 795.5 498.5 Z M 795.5 209.5 "/>
 </clipPath>
-<image id="image329" 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="#image329"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image330" 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="#image330"/>
+  <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="surface324">
+<g id="surface353">
 <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 604.550781 596.574219 L 604.550781 645.652344 L 597.484375 645.652344 L 572.101562 605.863281 L 572.101562 645.652344 L 566.179688 645.652344 L 566.179688 596.574219 L 572.976562 596.574219 L 598.628906 636.699219 L 598.628906 596.574219 Z M 604.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 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/o21bai/sky130_fd_sc_lp__o21bai_4.svg b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.svg
index 2cc8bd0..fd9b58e 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_4.svg
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 127.5 L 1743.5 127.5 L 1743.5 539.5 L 174.5 539.5 Z M 174.5 127.5 "/>
 </clipPath>
-<image id="image325" 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="#image325"/>
+  <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 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="#image325"/>
+  <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 1573.5 665.5 L 1606.5 665.5 L 1606.5 850.5 L 1573.5 850.5 Z M 305.5 665.5 L 338.5 665.5 L 338.5 850.5 L 305.5 850.5 Z M 516.5 665.5 L 549.5 665.5 L 549.5 850.5 L 516.5 850.5 Z M 611.5 665.5 L 644.5 665.5 L 644.5 850.5 L 611.5 850.5 Z M 706.5 665.5 L 739.5 665.5 L 739.5 850.5 L 706.5 850.5 Z M 801.5 665.5 L 834.5 665.5 L 834.5 850.5 L 801.5 850.5 Z M 908.5 665.5 L 941.5 665.5 L 941.5 850.5 L 908.5 850.5 Z M 1003.5 665.5 L 1036.5 665.5 L 1036.5 850.5 L 1003.5 850.5 Z M 1098.5 665.5 L 1131.5 665.5 L 1131.5 850.5 L 1098.5 850.5 Z M 1193.5 665.5 L 1226.5 665.5 L 1226.5 850.5 L 1193.5 850.5 Z M 1288.5 665.5 L 1321.5 665.5 L 1321.5 850.5 L 1288.5 850.5 Z M 1383.5 665.5 L 1416.5 665.5 L 1416.5 850.5 L 1383.5 850.5 Z M 1478.5 665.5 L 1511.5 665.5 L 1511.5 850.5 L 1478.5 850.5 Z M 1478.5 665.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1570.5 220.5 L 1603.5 220.5 L 1603.5 499.5 L 1570.5 499.5 Z M 317.5 220.5 L 350.5 220.5 L 350.5 499.5 L 317.5 499.5 Z M 516.5 220.5 L 549.5 220.5 L 549.5 499.5 L 516.5 499.5 Z M 611.5 220.5 L 644.5 220.5 L 644.5 499.5 L 611.5 499.5 Z M 706.5 220.5 L 739.5 220.5 L 739.5 499.5 L 706.5 499.5 Z M 801.5 220.5 L 834.5 220.5 L 834.5 499.5 L 801.5 499.5 Z M 905.5 220.5 L 938.5 220.5 L 938.5 499.5 L 905.5 499.5 Z M 1000.5 220.5 L 1033.5 220.5 L 1033.5 499.5 L 1000.5 499.5 Z M 1095.5 220.5 L 1128.5 220.5 L 1128.5 499.5 L 1095.5 499.5 Z M 1190.5 220.5 L 1223.5 220.5 L 1223.5 499.5 L 1190.5 499.5 Z M 1285.5 220.5 L 1318.5 220.5 L 1318.5 499.5 L 1285.5 499.5 Z M 1380.5 220.5 L 1413.5 220.5 L 1413.5 499.5 L 1380.5 499.5 Z M 1475.5 220.5 L 1508.5 220.5 L 1508.5 499.5 L 1475.5 499.5 Z M 1475.5 220.5 "/>
 </clipPath>
-<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 251.5 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="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface322">
+<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 1232.695312 530.628906 L 1233.210938 525.789062 L 1234.566406 521.855469 L 1236.695312 518.757812 L 1239.597656 516.566406 L 1243.273438 515.210938 L 1247.789062 514.757812 L 1249.855469 514.886719 L 1251.855469 515.210938 L 1253.726562 515.726562 L 1255.402344 516.5 L 1256.953125 517.46875 L 1258.433594 518.566406 L 1259.597656 519.917969 L 1260.628906 521.339844 L 1261.402344 522.886719 L 1261.984375 524.5 L 1262.304688 526.304688 L 1262.433594 528.175781 L 1262.175781 530.824219 L 1261.46875 533.273438 L 1260.242188 535.53125 L 1258.566406 537.660156 L 1256.371094 539.660156 L 1253.726562 541.402344 L 1252.757812 541.984375 L 1246.304688 545.46875 L 1244.628906 546.433594 L 1243.144531 547.402344 L 1241.855469 548.371094 L 1240.824219 549.339844 L 1239.917969 550.304688 L 1239.273438 551.273438 L 1238.953125 551.855469 L 1238.695312 552.371094 L 1238.5 553.015625 L 1238.304688 553.597656 L 1238.113281 554.242188 L 1238.046875 554.886719 L 1262.113281 554.886719 L 1262.113281 560.5 L 1231.660156 560.5 L 1231.789062 558.242188 L 1232.113281 556.175781 L 1232.5 554.242188 L 1233.015625 552.566406 L 1233.597656 550.953125 L 1234.304688 549.53125 L 1235.082031 548.304688 L 1236.046875 547.082031 L 1237.210938 545.855469 L 1238.5 544.695312 L 1239.984375 543.53125 L 1241.726562 542.371094 L 1242.113281 542.113281 L 1242.566406 541.855469 L 1243.015625 541.53125 L 1243.46875 541.273438 L 1243.984375 541.015625 L 1244.5 540.695312 L 1250.433594 537.339844 L 1252.304688 536.113281 L 1253.855469 534.757812 L 1255.082031 533.339844 L 1255.917969 531.789062 L 1256.433594 530.113281 L 1256.628906 528.304688 L 1256.5 527.082031 L 1256.304688 525.855469 L 1255.855469 524.757812 L 1255.339844 523.726562 L 1254.566406 522.824219 L 1253.726562 521.917969 L 1252.824219 521.273438 L 1251.917969 520.695312 L 1250.886719 520.304688 L 1249.855469 519.984375 L 1248.757812 519.789062 L 1247.597656 519.726562 L 1245.082031 520.046875 L 1242.953125 520.824219 L 1241.210938 522.175781 L 1239.917969 524.046875 L 1239.015625 526.5 L 1238.5 529.402344 L 1238.433594 529.660156 L 1238.433594 530.046875 L 1238.371094 530.242188 L 1238.371094 530.628906 Z M 1232.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 1205 561 L 1243 561 M 1205 524 L 1243 524 M 1205 524 L 1205 561 M 1243 524 L 1243 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 1205 561 L 1243 561 M 1205 524 L 1243 524 M 1243 561 L 1243 524 M 1205 561 L 1205 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/o21bai/sky130_fd_sc_lp__o21bai_lp.svg b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.svg
index fd0b7e8..dde5a15 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.svg
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image321"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#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 674.5 696.5 L 709.5 696.5 L 709.5 792.5 L 674.5 792.5 Z M 808.5 696.5 L 843.5 696.5 L 843.5 792.5 L 808.5 792.5 Z M 907.5 696.5 L 941.5 696.5 L 941.5 792.5 L 907.5 792.5 Z M 1134.5 768.5 L 1168.5 768.5 L 1168.5 864.5 L 1134.5 864.5 Z M 1216.5 768.5 L 1251.5 768.5 L 1251.5 864.5 L 1216.5 864.5 Z M 1216.5 768.5 "/>
 </clipPath>
-<image id="image322" 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="#image322"/>
+  <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 680.5 216.5 L 737.5 216.5 L 737.5 445.5 L 680.5 445.5 Z M 785.5 216.5 L 843.5 216.5 L 843.5 445.5 L 785.5 445.5 Z M 907.5 216.5 L 964.5 216.5 L 964.5 445.5 L 907.5 445.5 Z M 1088.5 231.5 L 1145.5 231.5 L 1145.5 460.5 L 1088.5 460.5 Z M 1088.5 231.5 "/>
 </clipPath>
-<image id="image323" 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="#image323"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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="#image324"/>
+  <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="surface318">
+<g id="surface347">
 <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 660.773438 442.503906 L 650.203125 442.503906 L 650.203125 438.261719 L 652.019531 438.058594 L 653.636719 437.789062 L 655.050781 437.453125 L 656.261719 437.183594 L 657.269531 436.847656 L 658.148438 436.445312 L 658.820312 436.039062 L 659.425781 435.570312 L 659.964844 435.03125 L 660.503906 434.355469 L 660.972656 433.617188 L 661.445312 432.742188 L 661.648438 432.269531 L 661.847656 431.730469 L 662.050781 431.125 L 662.320312 430.386719 L 662.523438 429.644531 L 662.792969 428.769531 L 666.695312 428.769531 L 666.695312 476.5 L 660.773438 476.5 Z M 660.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 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 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/o21bai/sky130_fd_sc_lp__o21bai_m.svg b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.svg
index 7112427..60d97ae 100644
--- a/cells/o21bai/sky130_fd_sc_lp__o21bai_m.svg
+++ b/cells/o21bai/sky130_fd_sc_lp__o21bai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image340"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1162.5 733.5 L 1197.5 733.5 L 1197.5 829.5 L 1162.5 829.5 Z M 965.5 733.5 L 1000.5 733.5 L 1000.5 829.5 L 965.5 829.5 Z M 1064.5 733.5 L 1098.5 733.5 L 1098.5 829.5 L 1064.5 829.5 Z M 730.5 751.5 L 765.5 751.5 L 765.5 847.5 L 730.5 847.5 Z M 730.5 751.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image370"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1042.5 209.5 L 1077.5 209.5 L 1077.5 305.5 L 1042.5 305.5 Z M 737.5 209.5 L 772.5 209.5 L 772.5 305.5 L 737.5 305.5 Z M 861.5 209.5 L 895.5 209.5 L 895.5 305.5 L 861.5 305.5 Z M 960.5 209.5 L 994.5 209.5 L 994.5 305.5 L 960.5 305.5 Z M 960.5 209.5 "/>
 </clipPath>
-<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image371"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image343"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface337">
+<g id="surface366">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 880.550781 596.574219 L 880.550781 645.652344 L 873.484375 645.652344 L 848.101562 605.863281 L 848.101562 645.652344 L 842.179688 645.652344 L 842.179688 596.574219 L 848.976562 596.574219 L 874.628906 636.699219 L 874.628906 596.574219 Z M 880.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 779 477 L 818 477 M 779 438 L 818 438 M 779 438 L 779 477 M 818 438 L 818 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 779 477 L 818 477 M 779 438 L 818 438 M 818 477 L 818 438 M 779 477 L 779 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/o221a/sky130_fd_sc_lp__o221a_0.svg b/cells/o221a/sky130_fd_sc_lp__o221a_0.svg
index 0128036..05b4095 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_0.svg
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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="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 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="#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 633.5 700.5 L 667.5 700.5 L 667.5 797.5 L 633.5 797.5 Z M 732.5 700.5 L 766.5 700.5 L 766.5 797.5 L 732.5 797.5 Z M 830.5 700.5 L 865.5 700.5 L 865.5 797.5 L 830.5 797.5 Z M 1057.5 768.5 L 1091.5 768.5 L 1091.5 864.5 L 1057.5 864.5 Z M 1156.5 768.5 L 1190.5 768.5 L 1190.5 864.5 L 1156.5 864.5 Z M 1274.5 768.5 L 1308.5 768.5 L 1308.5 864.5 L 1274.5 864.5 Z M 1274.5 768.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 1261.5 217.5 L 1295.5 217.5 L 1295.5 364.5 L 1261.5 364.5 Z M 619.5 217.5 L 654.5 217.5 L 654.5 364.5 L 619.5 364.5 Z M 796.5 217.5 L 830.5 217.5 L 830.5 364.5 L 796.5 364.5 Z M 878.5 217.5 L 913.5 217.5 L 913.5 364.5 L 878.5 364.5 Z M 1002.5 217.5 L 1036.5 217.5 L 1036.5 364.5 L 1002.5 364.5 Z M 1085.5 217.5 L 1119.5 217.5 L 1119.5 364.5 L 1085.5 364.5 Z M 1085.5 217.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/o221a/sky130_fd_sc_lp__o221a_1.svg b/cells/o221a/sky130_fd_sc_lp__o221a_1.svg
index bf9d101..bb9ecbf 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_1.svg
+++ b/cells/o221a/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.5 111.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 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="#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 844.5 670.5 L 878.5 670.5 L 878.5 862.5 L 844.5 862.5 Z M 745.5 670.5 L 780.5 670.5 L 780.5 862.5 L 745.5 862.5 Z M 638.5 670.5 L 672.5 670.5 L 672.5 862.5 L 638.5 862.5 Z M 1268.5 672.5 L 1302.5 672.5 L 1302.5 864.5 L 1268.5 864.5 Z M 1160.5 672.5 L 1195.5 672.5 L 1195.5 864.5 L 1160.5 864.5 Z M 1062.5 672.5 L 1096.5 672.5 L 1096.5 864.5 L 1062.5 864.5 Z M 1062.5 672.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 1276.5 209.5 L 1310.5 209.5 L 1310.5 498.5 L 1276.5 498.5 Z M 638.5 209.5 L 672.5 209.5 L 672.5 498.5 L 638.5 498.5 Z M 761.5 209.5 L 796.5 209.5 L 796.5 498.5 L 761.5 498.5 Z M 851.5 209.5 L 885.5 209.5 L 885.5 498.5 L 851.5 498.5 Z M 1062.5 209.5 L 1096.5 209.5 L 1096.5 498.5 L 1062.5 498.5 Z M 1144.5 209.5 L 1178.5 209.5 L 1178.5 498.5 L 1144.5 498.5 Z M 1144.5 209.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 553.476562 442.953125 L 542.90625 442.953125 L 542.90625 438.714844 L 544.722656 438.511719 L 546.339844 438.242188 L 547.753906 437.90625 L 548.964844 437.636719 L 549.972656 437.300781 L 550.847656 436.894531 L 551.523438 436.492188 L 552.128906 436.019531 L 552.667969 435.480469 L 553.207031 434.808594 L 553.675781 434.066406 L 554.148438 433.191406 L 554.351562 432.722656 L 554.550781 432.183594 L 554.753906 431.578125 L 555.023438 430.835938 L 555.226562 430.097656 L 555.496094 429.222656 L 559.398438 429.222656 L 559.398438 476.953125 L 553.476562 476.953125 Z M 553.476562 442.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 647 L 541 647 M 502 608 L 541 608 M 502 608 L 502 647 M 541 608 L 541 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 502 647 L 541 647 M 502 608 L 541 608 M 541 647 L 541 608 M 502 647 L 502 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/o221a/sky130_fd_sc_lp__o221a_2.svg b/cells/o221a/sky130_fd_sc_lp__o221a_2.svg
index e2ffd80..8ba07e5 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_2.svg
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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 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="#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 569.5 649.5 L 603.5 649.5 L 603.5 841.5 L 569.5 841.5 Z M 667.5 649.5 L 702.5 649.5 L 702.5 841.5 L 667.5 841.5 Z M 784.5 649.5 L 819.5 649.5 L 819.5 841.5 L 784.5 841.5 Z M 1118.5 672.5 L 1152.5 672.5 L 1152.5 864.5 L 1118.5 864.5 Z M 1002.5 672.5 L 1036.5 672.5 L 1036.5 864.5 L 1002.5 864.5 Z M 1216.5 672.5 L 1251.5 672.5 L 1251.5 864.5 L 1216.5 864.5 Z M 1315.5 672.5 L 1349.5 672.5 L 1349.5 864.5 L 1315.5 864.5 Z M 1315.5 672.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 1318.5 209.5 L 1353.5 209.5 L 1353.5 498.5 L 1318.5 498.5 Z M 578.5 209.5 L 612.5 209.5 L 612.5 498.5 L 578.5 498.5 Z M 702.5 209.5 L 736.5 209.5 L 736.5 498.5 L 702.5 498.5 Z M 784.5 209.5 L 819.5 209.5 L 819.5 498.5 L 784.5 498.5 Z M 961.5 209.5 L 995.5 209.5 L 995.5 498.5 L 961.5 498.5 Z M 1043.5 209.5 L 1078.5 209.5 L 1078.5 498.5 L 1043.5 498.5 Z M 1220.5 209.5 L 1254.5 209.5 L 1254.5 498.5 L 1220.5 498.5 Z M 1220.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1406.824219 621.320312 L 1424.191406 646.5 L 1416.449219 646.5 L 1403.050781 626.035156 L 1389.589844 646.5 L 1381.980469 646.5 L 1399.351562 621.320312 L 1383.058594 597.421875 L 1390.664062 597.421875 L 1403.253906 616.675781 L 1415.910156 597.421875 L 1423.382812 597.421875 Z M 1406.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 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/o221a/sky130_fd_sc_lp__o221a_4.svg b/cells/o221a/sky130_fd_sc_lp__o221a_4.svg
index 5dab0d8..7bd11e5 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_4.svg
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 538.5 L 174.5 538.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="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 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="#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 299.5 640.5 L 330.5 640.5 L 330.5 814.5 L 299.5 814.5 Z M 388.5 640.5 L 419.5 640.5 L 419.5 814.5 L 388.5 814.5 Z M 574.5 640.5 L 605.5 640.5 L 605.5 814.5 L 574.5 814.5 Z M 663.5 640.5 L 694.5 640.5 L 694.5 814.5 L 663.5 814.5 Z M 477.5 640.5 L 508.5 640.5 L 508.5 814.5 L 477.5 814.5 Z M 752.5 640.5 L 783.5 640.5 L 783.5 814.5 L 752.5 814.5 Z M 1127.5 658.5 L 1158.5 658.5 L 1158.5 832.5 L 1127.5 832.5 Z M 1038.5 658.5 L 1069.5 658.5 L 1069.5 832.5 L 1038.5 832.5 Z M 949.5 658.5 L 980.5 658.5 L 980.5 832.5 L 949.5 832.5 Z M 1313.5 658.5 L 1344.5 658.5 L 1344.5 832.5 L 1313.5 832.5 Z M 1491.5 658.5 L 1523.5 658.5 L 1523.5 832.5 L 1491.5 832.5 Z M 1581.5 658.5 L 1612.5 658.5 L 1612.5 832.5 L 1581.5 832.5 Z M 1216.5 658.5 L 1247.5 658.5 L 1247.5 832.5 L 1216.5 832.5 Z M 1402.5 658.5 L 1433.5 658.5 L 1433.5 832.5 L 1402.5 832.5 Z M 1402.5 658.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 1588.5 240.5 L 1619.5 240.5 L 1619.5 501.5 L 1588.5 501.5 Z M 299.5 240.5 L 330.5 240.5 L 330.5 501.5 L 299.5 501.5 Z M 388.5 240.5 L 419.5 240.5 L 419.5 501.5 L 388.5 501.5 Z M 485.5 240.5 L 516.5 240.5 L 516.5 501.5 L 485.5 501.5 Z M 574.5 240.5 L 605.5 240.5 L 605.5 501.5 L 574.5 501.5 Z M 663.5 240.5 L 694.5 240.5 L 694.5 501.5 L 663.5 501.5 Z M 752.5 240.5 L 783.5 240.5 L 783.5 501.5 L 752.5 501.5 Z M 934.5 240.5 L 965.5 240.5 L 965.5 501.5 L 934.5 501.5 Z M 1023.5 240.5 L 1055.5 240.5 L 1055.5 501.5 L 1023.5 501.5 Z M 1112.5 240.5 L 1144.5 240.5 L 1144.5 501.5 L 1112.5 501.5 Z M 1202.5 240.5 L 1233.5 240.5 L 1233.5 501.5 L 1202.5 501.5 Z M 1321.5 240.5 L 1352.5 240.5 L 1352.5 501.5 L 1321.5 501.5 Z M 1410.5 240.5 L 1441.5 240.5 L 1441.5 501.5 L 1410.5 501.5 Z M 1499.5 240.5 L 1530.5 240.5 L 1530.5 501.5 L 1499.5 501.5 Z M 1499.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 588.582031 604.335938 L 578.894531 604.335938 L 578.894531 600.449219 L 580.558594 600.261719 L 582.042969 600.015625 L 583.335938 599.707031 L 584.449219 599.460938 L 585.375 599.152344 L 586.175781 598.78125 L 586.792969 598.410156 L 587.347656 597.980469 L 587.84375 597.484375 L 588.335938 596.867188 L 588.769531 596.191406 L 589.199219 595.386719 L 589.386719 594.957031 L 589.570312 594.460938 L 589.753906 593.90625 L 590.003906 593.226562 L 590.1875 592.550781 L 590.433594 591.746094 L 594.011719 591.746094 L 594.011719 635.5 L 588.582031 635.5 Z M 588.582031 604.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 544 484 L 579 484 M 544 449 L 579 449 M 544 449 L 544 484 M 579 449 L 579 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 544 484 L 579 484 M 544 449 L 579 449 M 579 484 L 579 449 M 544 484 L 544 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/o221a/sky130_fd_sc_lp__o221a_lp.svg b/cells/o221a/sky130_fd_sc_lp__o221a_lp.svg
index b40b066..48a4d9b 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_lp.svg
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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 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="#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 1093.5 660.5 L 1127.5 660.5 L 1127.5 757.5 L 1093.5 757.5 Z M 1308.5 682.5 L 1342.5 682.5 L 1342.5 778.5 L 1308.5 778.5 Z M 1209.5 682.5 L 1244.5 682.5 L 1244.5 778.5 L 1209.5 778.5 Z M 563.5 768.5 L 598.5 768.5 L 598.5 864.5 L 563.5 864.5 Z M 744.5 768.5 L 779.5 768.5 L 779.5 864.5 L 744.5 864.5 Z M 843.5 768.5 L 877.5 768.5 L 877.5 864.5 L 843.5 864.5 Z M 646.5 768.5 L 680.5 768.5 L 680.5 864.5 L 646.5 864.5 Z M 646.5 768.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 1196.5 209.5 L 1253.5 209.5 L 1253.5 438.5 L 1196.5 438.5 Z M 573.5 209.5 L 631.5 209.5 L 631.5 438.5 L 573.5 438.5 Z M 719.5 209.5 L 776.5 209.5 L 776.5 438.5 L 719.5 438.5 Z M 831.5 209.5 L 889.5 209.5 L 889.5 438.5 L 831.5 438.5 Z M 962.5 209.5 L 1019.5 209.5 L 1019.5 438.5 L 962.5 438.5 Z M 1074.5 209.5 L 1132.5 209.5 L 1132.5 438.5 L 1074.5 438.5 Z M 1074.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1081.703125 530.332031 L 1082.242188 525.28125 L 1083.652344 521.175781 L 1085.875 517.941406 L 1088.90625 515.652344 L 1092.742188 514.242188 L 1097.457031 513.769531 L 1099.609375 513.902344 L 1101.695312 514.242188 L 1103.648438 514.777344 L 1105.398438 515.585938 L 1107.015625 516.597656 L 1108.5625 517.742188 L 1109.773438 519.15625 L 1110.851562 520.636719 L 1111.660156 522.25 L 1112.265625 523.933594 L 1112.601562 525.820312 L 1112.738281 527.773438 L 1112.46875 530.53125 L 1111.726562 533.089844 L 1110.449219 535.445312 L 1108.699219 537.667969 L 1106.410156 539.753906 L 1103.648438 541.574219 L 1102.640625 542.179688 L 1095.90625 545.8125 L 1094.15625 546.824219 L 1092.609375 547.832031 L 1091.261719 548.84375 L 1090.183594 549.851562 L 1089.242188 550.863281 L 1088.570312 551.875 L 1088.230469 552.480469 L 1087.960938 553.015625 L 1087.761719 553.691406 L 1087.558594 554.296875 L 1087.355469 554.96875 L 1087.289062 555.644531 L 1112.402344 555.644531 L 1112.402344 561.5 L 1080.625 561.5 L 1080.757812 559.144531 L 1081.097656 556.988281 L 1081.5 554.96875 L 1082.039062 553.21875 L 1082.644531 551.535156 L 1083.386719 550.054688 L 1084.191406 548.777344 L 1085.203125 547.496094 L 1086.414062 546.21875 L 1087.761719 545.007812 L 1089.308594 543.792969 L 1091.125 542.582031 L 1091.53125 542.3125 L 1092.003906 542.042969 L 1092.472656 541.707031 L 1092.945312 541.4375 L 1093.484375 541.167969 L 1094.023438 540.832031 L 1100.214844 537.332031 L 1102.167969 536.050781 L 1103.785156 534.640625 L 1105.0625 533.15625 L 1105.9375 531.542969 L 1106.476562 529.792969 L 1106.679688 527.90625 L 1106.542969 526.628906 L 1106.339844 525.347656 L 1105.871094 524.203125 L 1105.332031 523.125 L 1104.523438 522.183594 L 1103.648438 521.242188 L 1102.707031 520.570312 L 1101.765625 519.960938 L 1100.6875 519.558594 L 1099.609375 519.222656 L 1098.464844 519.019531 L 1097.253906 518.953125 L 1094.628906 519.289062 L 1092.40625 520.097656 L 1090.589844 521.511719 L 1089.242188 523.464844 L 1088.300781 526.023438 L 1087.761719 529.050781 L 1087.695312 529.320312 L 1087.695312 529.722656 L 1087.625 529.925781 L 1087.625 530.332031 Z M 1081.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 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/o221a/sky130_fd_sc_lp__o221a_m.svg b/cells/o221a/sky130_fd_sc_lp__o221a_m.svg
index e77a97e..52d5312 100644
--- a/cells/o221a/sky130_fd_sc_lp__o221a_m.svg
+++ b/cells/o221a/sky130_fd_sc_lp__o221a_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 532.5 L 533.5 532.5 Z M 1082.5 532.5 L 1390.5 532.5 L 1390.5 539.5 L 1082.5 539.5 Z M 533.5 532.5 L 749.5 532.5 L 749.5 539.5 L 533.5 539.5 Z M 533.5 532.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 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="#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 909.5 610.5 L 944.5 610.5 L 944.5 706.5 L 909.5 706.5 Z M 669.5 617.5 L 703.5 617.5 L 703.5 713.5 L 669.5 713.5 Z M 767.5 617.5 L 801.5 617.5 L 801.5 713.5 L 767.5 713.5 Z M 1024.5 768.5 L 1058.5 768.5 L 1058.5 864.5 L 1024.5 864.5 Z M 1221.5 768.5 L 1255.5 768.5 L 1255.5 864.5 L 1221.5 864.5 Z M 1122.5 768.5 L 1157.5 768.5 L 1157.5 864.5 L 1122.5 864.5 Z M 1122.5 768.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 1211.5 209.5 L 1245.5 209.5 L 1245.5 305.5 L 1211.5 305.5 Z M 679.5 209.5 L 713.5 209.5 L 713.5 305.5 L 679.5 305.5 Z M 815.5 209.5 L 850.5 209.5 L 850.5 305.5 L 815.5 305.5 Z M 898.5 209.5 L 932.5 209.5 L 932.5 305.5 L 898.5 305.5 Z M 996.5 209.5 L 1031.5 209.5 L 1031.5 305.5 L 996.5 305.5 Z M 1104.5 209.5 L 1138.5 209.5 L 1138.5 305.5 L 1104.5 305.5 Z M 1104.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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 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/o221ai/sky130_fd_sc_lp__o221ai_0.svg b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.svg
index 83b1056..9c59be7 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_0.svg
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image365"/>
+  <use xlink:href="#image393"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1177.5 768.5 L 1212.5 768.5 L 1212.5 864.5 L 1177.5 864.5 Z M 669.5 768.5 L 703.5 768.5 L 703.5 864.5 L 669.5 864.5 Z M 767.5 768.5 L 801.5 768.5 L 801.5 864.5 L 767.5 864.5 Z M 866.5 768.5 L 900.5 768.5 L 900.5 864.5 L 866.5 864.5 Z M 1079.5 768.5 L 1113.5 768.5 L 1113.5 864.5 L 1079.5 864.5 Z M 1079.5 768.5 "/>
 </clipPath>
-<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image366"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1077.5 235.5 L 1111.5 235.5 L 1111.5 382.5 L 1077.5 382.5 Z M 689.5 235.5 L 724.5 235.5 L 724.5 382.5 L 689.5 382.5 Z M 788.5 235.5 L 822.5 235.5 L 822.5 382.5 L 788.5 382.5 Z M 870.5 235.5 L 905.5 235.5 L 905.5 382.5 L 870.5 382.5 Z M 994.5 235.5 L 1028.5 235.5 L 1028.5 382.5 L 994.5 382.5 Z M 994.5 235.5 "/>
 </clipPath>
-<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image367"/>
+  <use xlink:href="#image395"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface362">
+<g id="surface390">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1301.703125 445.332031 L 1302.242188 440.28125 L 1303.652344 436.175781 L 1305.875 432.941406 L 1308.90625 430.652344 L 1312.742188 429.242188 L 1317.457031 428.769531 L 1319.609375 428.902344 L 1321.695312 429.242188 L 1323.648438 429.777344 L 1325.398438 430.585938 L 1327.015625 431.597656 L 1328.5625 432.742188 L 1329.773438 434.15625 L 1330.851562 435.636719 L 1331.660156 437.25 L 1332.265625 438.933594 L 1332.601562 440.820312 L 1332.738281 442.773438 L 1332.46875 445.53125 L 1331.726562 448.089844 L 1330.449219 450.445312 L 1328.699219 452.667969 L 1326.410156 454.753906 L 1323.648438 456.574219 L 1322.640625 457.179688 L 1315.90625 460.8125 L 1314.15625 461.824219 L 1312.609375 462.832031 L 1311.261719 463.84375 L 1310.183594 464.851562 L 1309.242188 465.863281 L 1308.570312 466.875 L 1308.230469 467.480469 L 1307.960938 468.015625 L 1307.761719 468.691406 L 1307.558594 469.296875 L 1307.355469 469.96875 L 1307.289062 470.644531 L 1332.402344 470.644531 L 1332.402344 476.5 L 1300.625 476.5 L 1300.757812 474.144531 L 1301.097656 471.988281 L 1301.5 469.96875 L 1302.039062 468.21875 L 1302.644531 466.535156 L 1303.386719 465.054688 L 1304.191406 463.777344 L 1305.203125 462.496094 L 1306.414062 461.21875 L 1307.761719 460.007812 L 1309.308594 458.792969 L 1311.125 457.582031 L 1311.53125 457.3125 L 1312.003906 457.042969 L 1312.472656 456.707031 L 1312.945312 456.4375 L 1313.484375 456.167969 L 1314.023438 455.832031 L 1320.214844 452.332031 L 1322.167969 451.050781 L 1323.785156 449.640625 L 1325.0625 448.15625 L 1325.9375 446.542969 L 1326.476562 444.792969 L 1326.679688 442.90625 L 1326.542969 441.628906 L 1326.339844 440.347656 L 1325.871094 439.203125 L 1325.332031 438.125 L 1324.523438 437.183594 L 1323.648438 436.242188 L 1322.707031 435.570312 L 1321.765625 434.960938 L 1320.6875 434.558594 L 1319.609375 434.222656 L 1318.464844 434.019531 L 1317.253906 433.953125 L 1314.628906 434.289062 L 1312.40625 435.097656 L 1310.589844 436.511719 L 1309.242188 438.464844 L 1308.300781 441.023438 L 1307.761719 444.050781 L 1307.695312 444.320312 L 1307.695312 444.722656 L 1307.625 444.925781 L 1307.625 445.332031 Z M 1301.703125 445.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 647 L 1311 647 M 1272 608 L 1311 608 M 1272 608 L 1272 647 M 1311 608 L 1311 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 1272 647 L 1311 647 M 1272 608 L 1311 608 M 1311 647 L 1311 608 M 1272 647 L 1272 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/o221ai/sky130_fd_sc_lp__o221ai_1.svg b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.svg
index 8beeb2f..95614fb 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_1.svg
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="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 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="#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 1221.5 670.5 L 1255.5 670.5 L 1255.5 862.5 L 1221.5 862.5 Z M 1113.5 670.5 L 1148.5 670.5 L 1148.5 862.5 L 1113.5 862.5 Z M 891.5 670.5 L 925.5 670.5 L 925.5 862.5 L 891.5 862.5 Z M 1015.5 670.5 L 1049.5 670.5 L 1049.5 862.5 L 1015.5 862.5 Z M 673.5 672.5 L 708.5 672.5 L 708.5 864.5 L 673.5 864.5 Z M 673.5 672.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 1221.5 209.5 L 1255.5 209.5 L 1255.5 498.5 L 1221.5 498.5 Z M 714.5 209.5 L 749.5 209.5 L 749.5 498.5 L 714.5 498.5 Z M 891.5 209.5 L 925.5 209.5 L 925.5 498.5 L 891.5 498.5 Z M 973.5 209.5 L 1008.5 209.5 L 1008.5 498.5 L 973.5 498.5 Z M 1138.5 209.5 L 1173.5 209.5 L 1173.5 498.5 L 1138.5 498.5 Z M 1138.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 636.554688 712.246094 L 636.554688 731.5 L 630.292969 731.5 L 630.292969 712.246094 L 611.375 682.421875 L 619.117188 682.421875 L 633.523438 706.320312 L 647.527344 682.421875 L 655 682.421875 Z M 636.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 612 392 L 651 392 M 612 353 L 651 353 M 612 353 L 612 392 M 651 353 L 651 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 612 392 L 651 392 M 612 353 L 651 353 M 651 392 L 651 353 M 612 392 L 612 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/o221ai/sky130_fd_sc_lp__o221ai_2.svg b/cells/o221ai/sky130_fd_sc_lp__o221ai_2.svg
index e2ddfa4..9ca7694 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_2.svg
+++ b/cells/o221ai/sky130_fd_sc_lp__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 539.5 L 256.5 539.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 492.5 647.5 L 526.5 647.5 L 526.5 839.5 L 492.5 839.5 Z M 394.5 647.5 L 428.5 647.5 L 428.5 839.5 L 394.5 839.5 Z M 824.5 651.5 L 859.5 651.5 L 859.5 844.5 L 824.5 844.5 Z M 923.5 651.5 L 957.5 651.5 L 957.5 844.5 L 923.5 844.5 Z M 1060.5 651.5 L 1095.5 651.5 L 1095.5 844.5 L 1060.5 844.5 Z M 1159.5 651.5 L 1193.5 651.5 L 1193.5 844.5 L 1159.5 844.5 Z M 1267.5 651.5 L 1301.5 651.5 L 1301.5 844.5 L 1267.5 844.5 Z M 1365.5 651.5 L 1400.5 651.5 L 1400.5 844.5 L 1365.5 844.5 Z M 1473.5 651.5 L 1507.5 651.5 L 1507.5 844.5 L 1473.5 844.5 Z M 710.5 651.5 L 744.5 651.5 L 744.5 844.5 L 710.5 844.5 Z M 710.5 651.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1489.5 209.5 L 1523.5 209.5 L 1523.5 498.5 L 1489.5 498.5 Z M 394.5 209.5 L 428.5 209.5 L 428.5 498.5 L 394.5 498.5 Z M 492.5 209.5 L 526.5 209.5 L 526.5 498.5 L 492.5 498.5 Z M 710.5 209.5 L 744.5 209.5 L 744.5 498.5 L 710.5 498.5 Z M 824.5 209.5 L 859.5 209.5 L 859.5 498.5 L 824.5 498.5 Z M 923.5 209.5 L 957.5 209.5 L 957.5 498.5 L 923.5 498.5 Z M 1022.5 209.5 L 1056.5 209.5 L 1056.5 498.5 L 1022.5 498.5 Z M 1175.5 209.5 L 1209.5 209.5 L 1209.5 498.5 L 1175.5 498.5 Z M 1292.5 209.5 L 1326.5 209.5 L 1326.5 498.5 L 1292.5 498.5 Z M 1390.5 209.5 L 1425.5 209.5 L 1425.5 498.5 L 1390.5 498.5 Z M 1390.5 209.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 469.554688 457.246094 L 469.554688 476.5 L 463.292969 476.5 L 463.292969 457.246094 L 444.375 427.421875 L 452.117188 427.421875 L 466.523438 451.320312 L 480.527344 427.421875 L 488 427.421875 Z M 469.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 445 647 L 484 647 M 445 608 L 484 608 M 445 608 L 445 647 M 484 608 L 484 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 445 647 L 484 647 M 445 608 L 484 608 M 484 647 L 484 608 M 445 647 L 445 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 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_lp__o221ai_4.svg b/cells/o221ai/sky130_fd_sc_lp__o221ai_4.svg
index 932c22b..aafbe24 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_4.svg
+++ b/cells/o221ai/sky130_fd_sc_lp__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="image363" 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="#image363"/>
+  <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="#image363"/>
+  <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 482.5 610.5 L 505.5 610.5 L 505.5 736.5 L 482.5 736.5 Z M 406.5 610.5 L 428.5 610.5 L 428.5 736.5 L 406.5 736.5 Z M 265.5 610.5 L 287.5 610.5 L 287.5 736.5 L 265.5 736.5 Z M 329.5 610.5 L 352.5 610.5 L 352.5 736.5 L 329.5 736.5 Z M 818.5 623.5 L 841.5 623.5 L 841.5 749.5 L 818.5 749.5 Z M 883.5 623.5 L 905.5 623.5 L 905.5 749.5 L 883.5 749.5 Z M 947.5 623.5 L 970.5 623.5 L 970.5 749.5 L 947.5 749.5 Z M 1012.5 623.5 L 1034.5 623.5 L 1034.5 749.5 L 1012.5 749.5 Z M 1076.5 623.5 L 1099.5 623.5 L 1099.5 749.5 L 1076.5 749.5 Z M 1168.5 623.5 L 1191.5 623.5 L 1191.5 749.5 L 1168.5 749.5 Z M 1233.5 623.5 L 1255.5 623.5 L 1255.5 749.5 L 1233.5 749.5 Z M 1297.5 623.5 L 1320.5 623.5 L 1320.5 749.5 L 1297.5 749.5 Z M 1362.5 623.5 L 1384.5 623.5 L 1384.5 749.5 L 1362.5 749.5 Z M 1426.5 623.5 L 1449.5 623.5 L 1449.5 749.5 L 1426.5 749.5 Z M 1491.5 623.5 L 1513.5 623.5 L 1513.5 749.5 L 1491.5 749.5 Z M 1555.5 623.5 L 1578.5 623.5 L 1578.5 749.5 L 1555.5 749.5 Z M 1620.5 623.5 L 1642.5 623.5 L 1642.5 749.5 L 1620.5 749.5 Z M 625.5 623.5 L 647.5 623.5 L 647.5 749.5 L 625.5 749.5 Z M 754.5 623.5 L 776.5 623.5 L 776.5 749.5 L 754.5 749.5 Z M 689.5 623.5 L 712.5 623.5 L 712.5 749.5 L 689.5 749.5 Z M 689.5 623.5 "/>
 </clipPath>
-<image id="image364" 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="#image364"/>
+  <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 1625.5 320.5 L 1648.5 320.5 L 1648.5 509.5 L 1625.5 509.5 Z M 367.5 320.5 L 389.5 320.5 L 389.5 509.5 L 367.5 509.5 Z M 431.5 320.5 L 454.5 320.5 L 454.5 509.5 L 431.5 509.5 Z M 496.5 320.5 L 518.5 320.5 L 518.5 509.5 L 496.5 509.5 Z M 560.5 320.5 L 583.5 320.5 L 583.5 509.5 L 560.5 509.5 Z M 625.5 320.5 L 647.5 320.5 L 647.5 509.5 L 625.5 509.5 Z M 689.5 320.5 L 712.5 320.5 L 712.5 509.5 L 689.5 509.5 Z M 754.5 320.5 L 776.5 320.5 L 776.5 509.5 L 754.5 509.5 Z M 818.5 320.5 L 841.5 320.5 L 841.5 509.5 L 818.5 509.5 Z M 883.5 320.5 L 905.5 320.5 L 905.5 509.5 L 883.5 509.5 Z M 947.5 320.5 L 970.5 320.5 L 970.5 509.5 L 947.5 509.5 Z M 1012.5 320.5 L 1034.5 320.5 L 1034.5 509.5 L 1012.5 509.5 Z M 1076.5 320.5 L 1099.5 320.5 L 1099.5 509.5 L 1076.5 509.5 Z M 1168.5 320.5 L 1191.5 320.5 L 1191.5 509.5 L 1168.5 509.5 Z M 1233.5 320.5 L 1255.5 320.5 L 1255.5 509.5 L 1233.5 509.5 Z M 1297.5 320.5 L 1320.5 320.5 L 1320.5 509.5 L 1297.5 509.5 Z M 1362.5 320.5 L 1384.5 320.5 L 1384.5 509.5 L 1362.5 509.5 Z M 1426.5 320.5 L 1449.5 320.5 L 1449.5 509.5 L 1426.5 509.5 Z M 1496.5 320.5 L 1519.5 320.5 L 1519.5 509.5 L 1496.5 509.5 Z M 1561.5 320.5 L 1583.5 320.5 L 1583.5 509.5 L 1561.5 509.5 Z M 1561.5 320.5 "/>
 </clipPath>
-<image id="image365" 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="#image365"/>
+  <use xlink:href="#image394"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image366" 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="#image366"/>
+  <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="surface360">
+<g id="surface389">
 <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/o221ai/sky130_fd_sc_lp__o221ai_lp.svg b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.svg
index f4e01b0..9f9d93e 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.svg
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.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 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="#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 1270.5 759.5 L 1305.5 759.5 L 1305.5 855.5 L 1270.5 855.5 Z M 680.5 759.5 L 714.5 759.5 L 714.5 855.5 L 680.5 855.5 Z M 779.5 759.5 L 813.5 759.5 L 813.5 855.5 L 779.5 855.5 Z M 895.5 759.5 L 930.5 759.5 L 930.5 855.5 L 895.5 855.5 Z M 1172.5 759.5 L 1206.5 759.5 L 1206.5 855.5 L 1172.5 855.5 Z M 1172.5 759.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 1162.5 209.5 L 1220.5 209.5 L 1220.5 438.5 L 1162.5 438.5 Z M 662.5 209.5 L 719.5 209.5 L 719.5 438.5 L 662.5 438.5 Z M 807.5 209.5 L 865.5 209.5 L 865.5 438.5 L 807.5 438.5 Z M 920.5 209.5 L 977.5 209.5 L 977.5 438.5 L 920.5 438.5 Z M 1050.5 209.5 L 1107.5 209.5 L 1107.5 438.5 L 1050.5 438.5 Z M 1050.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1301.703125 530.332031 L 1302.242188 525.28125 L 1303.652344 521.175781 L 1305.875 517.941406 L 1308.90625 515.652344 L 1312.742188 514.242188 L 1317.457031 513.769531 L 1319.609375 513.902344 L 1321.695312 514.242188 L 1323.648438 514.777344 L 1325.398438 515.585938 L 1327.015625 516.597656 L 1328.5625 517.742188 L 1329.773438 519.15625 L 1330.851562 520.636719 L 1331.660156 522.25 L 1332.265625 523.933594 L 1332.601562 525.820312 L 1332.738281 527.773438 L 1332.46875 530.53125 L 1331.726562 533.089844 L 1330.449219 535.445312 L 1328.699219 537.667969 L 1326.410156 539.753906 L 1323.648438 541.574219 L 1322.640625 542.179688 L 1315.90625 545.8125 L 1314.15625 546.824219 L 1312.609375 547.832031 L 1311.261719 548.84375 L 1310.183594 549.851562 L 1309.242188 550.863281 L 1308.570312 551.875 L 1308.230469 552.480469 L 1307.960938 553.015625 L 1307.761719 553.691406 L 1307.558594 554.296875 L 1307.355469 554.96875 L 1307.289062 555.644531 L 1332.402344 555.644531 L 1332.402344 561.5 L 1300.625 561.5 L 1300.757812 559.144531 L 1301.097656 556.988281 L 1301.5 554.96875 L 1302.039062 553.21875 L 1302.644531 551.535156 L 1303.386719 550.054688 L 1304.191406 548.777344 L 1305.203125 547.496094 L 1306.414062 546.21875 L 1307.761719 545.007812 L 1309.308594 543.792969 L 1311.125 542.582031 L 1311.53125 542.3125 L 1312.003906 542.042969 L 1312.472656 541.707031 L 1312.945312 541.4375 L 1313.484375 541.167969 L 1314.023438 540.832031 L 1320.214844 537.332031 L 1322.167969 536.050781 L 1323.785156 534.640625 L 1325.0625 533.15625 L 1325.9375 531.542969 L 1326.476562 529.792969 L 1326.679688 527.90625 L 1326.542969 526.628906 L 1326.339844 525.347656 L 1325.871094 524.203125 L 1325.332031 523.125 L 1324.523438 522.183594 L 1323.648438 521.242188 L 1322.707031 520.570312 L 1321.765625 519.960938 L 1320.6875 519.558594 L 1319.609375 519.222656 L 1318.464844 519.019531 L 1317.253906 518.953125 L 1314.628906 519.289062 L 1312.40625 520.097656 L 1310.589844 521.511719 L 1309.242188 523.464844 L 1308.300781 526.023438 L 1307.761719 529.050781 L 1307.695312 529.320312 L 1307.695312 529.722656 L 1307.625 529.925781 L 1307.625 530.332031 Z M 1301.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 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/o221ai/sky130_fd_sc_lp__o221ai_m.svg b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.svg
index d449973..ae813bd 100644
--- a/cells/o221ai/sky130_fd_sc_lp__o221ai_m.svg
+++ b/cells/o221ai/sky130_fd_sc_lp__o221ai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1142.5 768.5 L 1176.5 768.5 L 1176.5 864.5 L 1142.5 864.5 Z M 712.5 768.5 L 746.5 768.5 L 746.5 864.5 L 712.5 864.5 Z M 811.5 768.5 L 845.5 768.5 L 845.5 864.5 L 811.5 864.5 Z M 913.5 768.5 L 947.5 768.5 L 947.5 864.5 L 913.5 864.5 Z M 1043.5 768.5 L 1078.5 768.5 L 1078.5 864.5 L 1043.5 864.5 Z M 1043.5 768.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 697.5 272.5 L 732.5 272.5 L 732.5 368.5 L 697.5 368.5 Z M 823.5 272.5 L 858.5 272.5 L 858.5 368.5 L 823.5 368.5 Z M 906.5 272.5 L 940.5 272.5 L 940.5 368.5 L 906.5 368.5 Z M 1048.5 291.5 L 1082.5 291.5 L 1082.5 388.5 L 1048.5 388.5 Z M 1130.5 291.5 L 1165.5 291.5 L 1165.5 388.5 L 1130.5 388.5 Z M 1130.5 291.5 "/>
 </clipPath>
-<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image326"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface321">
+<g id="surface349">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 636.554688 288.246094 L 636.554688 307.5 L 630.292969 307.5 L 630.292969 288.246094 L 611.375 258.421875 L 619.117188 258.421875 L 633.523438 282.320312 L 647.527344 258.421875 L 655 258.421875 Z M 636.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 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/o22a/sky130_fd_sc_lp__o22a_0.svg b/cells/o22a/sky130_fd_sc_lp__o22a_0.svg
index 044bd88..0c75e72 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_0.svg
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1134.5 679.5 L 1168.5 679.5 L 1168.5 775.5 L 1134.5 775.5 Z M 636.5 679.5 L 671.5 679.5 L 671.5 775.5 L 636.5 775.5 Z M 815.5 679.5 L 850.5 679.5 L 850.5 775.5 L 815.5 775.5 Z M 914.5 679.5 L 948.5 679.5 L 948.5 775.5 L 914.5 775.5 Z M 1017.5 679.5 L 1051.5 679.5 L 1051.5 775.5 L 1017.5 775.5 Z M 1017.5 679.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 1223.5 211.5 L 1258.5 211.5 L 1258.5 358.5 L 1223.5 358.5 Z M 614.5 211.5 L 648.5 211.5 L 648.5 358.5 L 614.5 358.5 Z M 914.5 211.5 L 948.5 211.5 L 948.5 358.5 L 914.5 358.5 Z M 1003.5 211.5 L 1038.5 211.5 L 1038.5 358.5 L 1003.5 358.5 Z M 1102.5 211.5 L 1136.5 211.5 L 1136.5 358.5 L 1102.5 358.5 Z M 1102.5 211.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 825.773438 442.503906 L 815.203125 442.503906 L 815.203125 438.261719 L 817.019531 438.058594 L 818.636719 437.789062 L 820.050781 437.453125 L 821.261719 437.183594 L 822.269531 436.847656 L 823.148438 436.445312 L 823.820312 436.039062 L 824.425781 435.570312 L 824.964844 435.03125 L 825.503906 434.355469 L 825.972656 433.617188 L 826.445312 432.742188 L 826.648438 432.269531 L 826.847656 431.730469 L 827.050781 431.125 L 827.320312 430.386719 L 827.523438 429.644531 L 827.792969 428.769531 L 831.695312 428.769531 L 831.695312 476.5 L 825.773438 476.5 Z M 825.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 777 647 L 816 647 M 777 608 L 816 608 M 777 608 L 777 647 M 816 608 L 816 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 777 647 L 816 647 M 777 608 L 816 608 M 816 647 L 816 608 M 777 647 L 777 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/o22a/sky130_fd_sc_lp__o22a_1.svg b/cells/o22a/sky130_fd_sc_lp__o22a_1.svg
index 4cb4e18..845ddca 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_1.svg
+++ b/cells/o22a/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.5 111.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 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="#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 1243.5 672.5 L 1277.5 672.5 L 1277.5 864.5 L 1243.5 864.5 Z M 614.5 672.5 L 648.5 672.5 L 648.5 864.5 L 614.5 864.5 Z M 886.5 672.5 L 921.5 672.5 L 921.5 864.5 L 886.5 864.5 Z M 989.5 672.5 L 1024.5 672.5 L 1024.5 864.5 L 989.5 864.5 Z M 1112.5 672.5 L 1146.5 672.5 L 1146.5 864.5 L 1112.5 864.5 Z M 1112.5 672.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 1243.5 209.5 L 1277.5 209.5 L 1277.5 498.5 L 1243.5 498.5 Z M 732.5 209.5 L 766.5 209.5 L 766.5 498.5 L 732.5 498.5 Z M 886.5 209.5 L 921.5 209.5 L 921.5 498.5 L 886.5 498.5 Z M 976.5 209.5 L 1010.5 209.5 L 1010.5 498.5 L 976.5 498.5 Z M 1112.5 209.5 L 1146.5 209.5 L 1146.5 498.5 L 1112.5 498.5 Z M 1112.5 209.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/o22a/sky130_fd_sc_lp__o22a_2.svg b/cells/o22a/sky130_fd_sc_lp__o22a_2.svg
index e411ebb..1b1210b 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_2.svg
+++ b/cells/o22a/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.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="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1263.5 670.5 L 1298.5 670.5 L 1298.5 862.5 L 1263.5 862.5 Z M 614.5 670.5 L 648.5 670.5 L 648.5 862.5 L 614.5 862.5 Z M 712.5 670.5 L 746.5 670.5 L 746.5 862.5 L 712.5 862.5 Z M 930.5 670.5 L 964.5 670.5 L 964.5 862.5 L 930.5 862.5 Z M 1033.5 670.5 L 1067.5 670.5 L 1067.5 862.5 L 1033.5 862.5 Z M 1142.5 670.5 L 1176.5 670.5 L 1176.5 862.5 L 1142.5 862.5 Z M 1142.5 670.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1263.5 209.5 L 1298.5 209.5 L 1298.5 498.5 L 1263.5 498.5 Z M 638.5 209.5 L 672.5 209.5 L 672.5 498.5 L 638.5 498.5 Z M 736.5 209.5 L 771.5 209.5 L 771.5 498.5 L 736.5 498.5 Z M 930.5 209.5 L 964.5 209.5 L 964.5 498.5 L 930.5 498.5 Z M 1012.5 209.5 L 1047.5 209.5 L 1047.5 498.5 L 1012.5 498.5 Z M 1136.5 209.5 L 1170.5 209.5 L 1170.5 498.5 L 1136.5 498.5 Z M 1136.5 209.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -177,6 +177,5 @@
 <path style=" 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/o22a/sky130_fd_sc_lp__o22a_4.svg b/cells/o22a/sky130_fd_sc_lp__o22a_4.svg
index 53533b2..c931eda 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_4.svg
+++ b/cells/o22a/sky130_fd_sc_lp__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 539.5 L 174.5 539.5 Z M 174.5 127.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 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="#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 596.5 665.5 L 630.5 665.5 L 630.5 850.5 L 596.5 850.5 Z M 501.5 665.5 L 535.5 665.5 L 535.5 850.5 L 501.5 850.5 Z M 311.5 665.5 L 345.5 665.5 L 345.5 850.5 L 311.5 850.5 Z M 406.5 665.5 L 440.5 665.5 L 440.5 850.5 L 406.5 850.5 Z M 1140.5 667.5 L 1173.5 667.5 L 1173.5 852.5 L 1140.5 852.5 Z M 1253.5 667.5 L 1286.5 667.5 L 1286.5 852.5 L 1253.5 852.5 Z M 1363.5 667.5 L 1396.5 667.5 L 1396.5 852.5 L 1363.5 852.5 Z M 1458.5 667.5 L 1491.5 667.5 L 1491.5 852.5 L 1458.5 852.5 Z M 1553.5 667.5 L 1586.5 667.5 L 1586.5 852.5 L 1553.5 852.5 Z M 855.5 667.5 L 888.5 667.5 L 888.5 852.5 L 855.5 852.5 Z M 1045.5 667.5 L 1078.5 667.5 L 1078.5 852.5 L 1045.5 852.5 Z M 950.5 667.5 L 983.5 667.5 L 983.5 852.5 L 950.5 852.5 Z M 950.5 667.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 1553.5 220.5 L 1586.5 220.5 L 1586.5 499.5 L 1553.5 499.5 Z M 458.5 220.5 L 491.5 220.5 L 491.5 499.5 L 458.5 499.5 Z M 553.5 220.5 L 586.5 220.5 L 586.5 499.5 L 553.5 499.5 Z M 648.5 220.5 L 681.5 220.5 L 681.5 499.5 L 648.5 499.5 Z M 743.5 220.5 L 776.5 220.5 L 776.5 499.5 L 743.5 499.5 Z M 855.5 220.5 L 888.5 220.5 L 888.5 499.5 L 855.5 499.5 Z M 950.5 220.5 L 983.5 220.5 L 983.5 499.5 L 950.5 499.5 Z M 1045.5 220.5 L 1078.5 220.5 L 1078.5 499.5 L 1045.5 499.5 Z M 1140.5 220.5 L 1173.5 220.5 L 1173.5 499.5 L 1140.5 499.5 Z M 1268.5 220.5 L 1301.5 220.5 L 1301.5 499.5 L 1268.5 499.5 Z M 1363.5 220.5 L 1396.5 220.5 L 1396.5 499.5 L 1363.5 499.5 Z M 1458.5 220.5 L 1491.5 220.5 L 1491.5 499.5 L 1458.5 499.5 Z M 1458.5 220.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 933.175781 609.917969 L 923.046875 609.917969 L 923.046875 605.855469 L 924.789062 605.660156 L 926.339844 605.402344 L 927.695312 605.082031 L 928.855469 604.824219 L 929.824219 604.5 L 930.660156 604.113281 L 931.304688 603.726562 L 931.886719 603.273438 L 932.402344 602.757812 L 932.917969 602.113281 L 933.371094 601.402344 L 933.824219 600.566406 L 934.015625 600.113281 L 934.210938 599.597656 L 934.402344 599.015625 L 934.660156 598.304688 L 934.855469 597.597656 L 935.113281 596.757812 L 938.855469 596.757812 L 938.855469 642.5 L 933.175781 642.5 Z M 933.175781 609.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 480 L 925 480 M 887 442 L 925 442 M 887 442 L 887 480 M 925 442 L 925 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 887 480 L 925 480 M 887 442 L 925 442 M 925 480 L 925 442 M 887 480 L 887 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/o22a/sky130_fd_sc_lp__o22a_lp.svg b/cells/o22a/sky130_fd_sc_lp__o22a_lp.svg
index b6f7e10..224a3f0 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_lp.svg
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 479.5 L 478.5 479.5 Z M 1039.5 479.5 L 1446.5 479.5 L 1446.5 539.5 L 1039.5 539.5 Z M 478.5 479.5 L 748.5 479.5 L 748.5 539.5 L 478.5 539.5 Z M 478.5 479.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 622.5 624.5 L 656.5 624.5 L 656.5 720.5 L 622.5 720.5 Z M 978.5 624.5 L 1012.5 624.5 L 1012.5 720.5 L 978.5 720.5 Z M 843.5 624.5 L 877.5 624.5 L 877.5 720.5 L 843.5 720.5 Z M 744.5 624.5 L 779.5 624.5 L 779.5 720.5 L 744.5 720.5 Z M 1189.5 768.5 L 1223.5 768.5 L 1223.5 864.5 L 1189.5 864.5 Z M 1271.5 768.5 L 1306.5 768.5 L 1306.5 864.5 L 1271.5 864.5 Z M 1271.5 768.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1223.5 209.5 L 1280.5 209.5 L 1280.5 438.5 L 1223.5 438.5 Z M 618.5 209.5 L 675.5 209.5 L 675.5 438.5 L 618.5 438.5 Z M 730.5 209.5 L 788.5 209.5 L 788.5 438.5 L 730.5 438.5 Z M 852.5 209.5 L 909.5 209.5 L 909.5 438.5 L 852.5 438.5 Z M 978.5 209.5 L 1035.5 209.5 L 1035.5 438.5 L 978.5 438.5 Z M 978.5 209.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1026.703125 784.332031 L 1027.242188 779.28125 L 1028.652344 775.175781 L 1030.875 771.941406 L 1033.90625 769.652344 L 1037.742188 768.242188 L 1042.457031 767.769531 L 1044.609375 767.902344 L 1046.695312 768.242188 L 1048.648438 768.777344 L 1050.398438 769.585938 L 1052.015625 770.597656 L 1053.5625 771.742188 L 1054.773438 773.15625 L 1055.851562 774.636719 L 1056.660156 776.25 L 1057.265625 777.933594 L 1057.601562 779.820312 L 1057.738281 781.773438 L 1057.46875 784.53125 L 1056.726562 787.089844 L 1055.449219 789.445312 L 1053.699219 791.667969 L 1051.410156 793.753906 L 1048.648438 795.574219 L 1047.640625 796.179688 L 1040.90625 799.8125 L 1039.15625 800.824219 L 1037.609375 801.832031 L 1036.261719 802.84375 L 1035.183594 803.851562 L 1034.242188 804.863281 L 1033.570312 805.875 L 1033.230469 806.480469 L 1032.960938 807.015625 L 1032.761719 807.691406 L 1032.558594 808.296875 L 1032.355469 808.96875 L 1032.289062 809.644531 L 1057.402344 809.644531 L 1057.402344 815.5 L 1025.625 815.5 L 1025.757812 813.144531 L 1026.097656 810.988281 L 1026.5 808.96875 L 1027.039062 807.21875 L 1027.644531 805.535156 L 1028.386719 804.054688 L 1029.191406 802.777344 L 1030.203125 801.496094 L 1031.414062 800.21875 L 1032.761719 799.007812 L 1034.308594 797.792969 L 1036.125 796.582031 L 1036.53125 796.3125 L 1037.003906 796.042969 L 1037.472656 795.707031 L 1037.945312 795.4375 L 1038.484375 795.167969 L 1039.023438 794.832031 L 1045.214844 791.332031 L 1047.167969 790.050781 L 1048.785156 788.640625 L 1050.0625 787.15625 L 1050.9375 785.542969 L 1051.476562 783.792969 L 1051.679688 781.90625 L 1051.542969 780.628906 L 1051.339844 779.347656 L 1050.871094 778.203125 L 1050.332031 777.125 L 1049.523438 776.183594 L 1048.648438 775.242188 L 1047.707031 774.570312 L 1046.765625 773.960938 L 1045.6875 773.558594 L 1044.609375 773.222656 L 1043.464844 773.019531 L 1042.253906 772.953125 L 1039.628906 773.289062 L 1037.40625 774.097656 L 1035.589844 775.511719 L 1034.242188 777.464844 L 1033.300781 780.023438 L 1032.761719 783.050781 L 1032.695312 783.320312 L 1032.695312 783.722656 L 1032.625 783.925781 L 1032.625 784.332031 Z M 1026.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 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/o22a/sky130_fd_sc_lp__o22a_m.svg b/cells/o22a/sky130_fd_sc_lp__o22a_m.svg
index 5b9825d..8c3d08b 100644
--- a/cells/o22a/sky130_fd_sc_lp__o22a_m.svg
+++ b/cells/o22a/sky130_fd_sc_lp__o22a_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <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 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="#image332"/>
+  <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 1146.5 729.5 L 1181.5 729.5 L 1181.5 825.5 L 1146.5 825.5 Z M 683.5 729.5 L 718.5 729.5 L 718.5 825.5 L 683.5 825.5 Z M 814.5 729.5 L 848.5 729.5 L 848.5 825.5 L 814.5 825.5 Z M 931.5 729.5 L 965.5 729.5 L 965.5 825.5 L 931.5 825.5 Z M 1030.5 729.5 L 1064.5 729.5 L 1064.5 825.5 L 1030.5 825.5 Z M 1030.5 729.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <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 1220.5 209.5 L 1254.5 209.5 L 1254.5 305.5 L 1220.5 305.5 Z M 678.5 209.5 L 712.5 209.5 L 712.5 305.5 L 678.5 305.5 Z M 931.5 209.5 L 965.5 209.5 L 965.5 305.5 L 931.5 305.5 Z M 1013.5 209.5 L 1048.5 209.5 L 1048.5 305.5 L 1013.5 305.5 Z M 1137.5 209.5 L 1172.5 209.5 L 1172.5 305.5 L 1137.5 305.5 Z M 1137.5 209.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image335" 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="#image335"/>
+  <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="surface329">
+<g id="surface357">
 <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 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/o22ai/sky130_fd_sc_lp__o22ai_0.svg b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.svg
index f00907c..070a3e7 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_0.svg
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image353"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1112.5 725.5 L 1146.5 725.5 L 1146.5 821.5 L 1112.5 821.5 Z M 785.5 725.5 L 820.5 725.5 L 820.5 821.5 L 785.5 821.5 Z M 901.5 725.5 L 936.5 725.5 L 936.5 821.5 L 901.5 821.5 Z M 1005.5 725.5 L 1040.5 725.5 L 1040.5 821.5 L 1005.5 821.5 Z M 1005.5 725.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1095.5 218.5 L 1129.5 218.5 L 1129.5 365.5 L 1095.5 365.5 Z M 818.5 218.5 L 852.5 218.5 L 852.5 365.5 L 818.5 365.5 Z M 907.5 218.5 L 941.5 218.5 L 941.5 365.5 L 907.5 365.5 Z M 1005.5 218.5 L 1040.5 218.5 L 1040.5 365.5 L 1005.5 365.5 Z M 1005.5 218.5 "/>
 </clipPath>
-<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image383"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image356"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface350">
+<g id="surface378">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 972.703125 445.332031 L 973.242188 440.28125 L 974.652344 436.175781 L 976.875 432.941406 L 979.90625 430.652344 L 983.742188 429.242188 L 988.457031 428.769531 L 990.609375 428.902344 L 992.695312 429.242188 L 994.648438 429.777344 L 996.398438 430.585938 L 998.015625 431.597656 L 999.5625 432.742188 L 1000.773438 434.15625 L 1001.851562 435.636719 L 1002.660156 437.25 L 1003.265625 438.933594 L 1003.601562 440.820312 L 1003.738281 442.773438 L 1003.46875 445.53125 L 1002.726562 448.089844 L 1001.449219 450.445312 L 999.699219 452.667969 L 997.410156 454.753906 L 994.648438 456.574219 L 993.640625 457.179688 L 986.90625 460.8125 L 985.15625 461.824219 L 983.609375 462.832031 L 982.261719 463.84375 L 981.183594 464.851562 L 980.242188 465.863281 L 979.570312 466.875 L 979.230469 467.480469 L 978.960938 468.015625 L 978.761719 468.691406 L 978.558594 469.296875 L 978.355469 469.96875 L 978.289062 470.644531 L 1003.402344 470.644531 L 1003.402344 476.5 L 971.625 476.5 L 971.757812 474.144531 L 972.097656 471.988281 L 972.5 469.96875 L 973.039062 468.21875 L 973.644531 466.535156 L 974.386719 465.054688 L 975.191406 463.777344 L 976.203125 462.496094 L 977.414062 461.21875 L 978.761719 460.007812 L 980.308594 458.792969 L 982.125 457.582031 L 982.53125 457.3125 L 983.003906 457.042969 L 983.472656 456.707031 L 983.945312 456.4375 L 984.484375 456.167969 L 985.023438 455.832031 L 991.214844 452.332031 L 993.167969 451.050781 L 994.785156 449.640625 L 996.0625 448.15625 L 996.9375 446.542969 L 997.476562 444.792969 L 997.679688 442.90625 L 997.542969 441.628906 L 997.339844 440.347656 L 996.871094 439.203125 L 996.332031 438.125 L 995.523438 437.183594 L 994.648438 436.242188 L 993.707031 435.570312 L 992.765625 434.960938 L 991.6875 434.558594 L 990.609375 434.222656 L 989.464844 434.019531 L 988.253906 433.953125 L 985.628906 434.289062 L 983.40625 435.097656 L 981.589844 436.511719 L 980.242188 438.464844 L 979.300781 441.023438 L 978.761719 444.050781 L 978.695312 444.320312 L 978.695312 444.722656 L 978.625 444.925781 L 978.625 445.332031 Z M 972.703125 445.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 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/o22ai/sky130_fd_sc_lp__o22ai_1.svg b/cells/o22ai/sky130_fd_sc_lp__o22ai_1.svg
index d4981e5..f59b43c 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_1.svg
+++ b/cells/o22ai/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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="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 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="#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 1113.5 647.5 L 1148.5 647.5 L 1148.5 839.5 L 1113.5 839.5 Z M 725.5 647.5 L 759.5 647.5 L 759.5 839.5 L 725.5 839.5 Z M 823.5 647.5 L 858.5 647.5 L 858.5 839.5 L 823.5 839.5 Z M 937.5 647.5 L 971.5 647.5 L 971.5 839.5 L 937.5 839.5 Z M 937.5 647.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 1072.5 209.5 L 1106.5 209.5 L 1106.5 498.5 L 1072.5 498.5 Z M 725.5 209.5 L 759.5 209.5 L 759.5 498.5 L 725.5 498.5 Z M 807.5 209.5 L 842.5 209.5 L 842.5 498.5 L 807.5 498.5 Z M 989.5 209.5 L 1024.5 209.5 L 1024.5 498.5 L 989.5 498.5 Z M 989.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 917.703125 530.332031 L 918.242188 525.28125 L 919.652344 521.175781 L 921.875 517.941406 L 924.90625 515.652344 L 928.742188 514.242188 L 933.457031 513.769531 L 935.609375 513.902344 L 937.695312 514.242188 L 939.648438 514.777344 L 941.398438 515.585938 L 943.015625 516.597656 L 944.5625 517.742188 L 945.773438 519.15625 L 946.851562 520.636719 L 947.660156 522.25 L 948.265625 523.933594 L 948.601562 525.820312 L 948.738281 527.773438 L 948.46875 530.53125 L 947.726562 533.089844 L 946.449219 535.445312 L 944.699219 537.667969 L 942.410156 539.753906 L 939.648438 541.574219 L 938.640625 542.179688 L 931.90625 545.8125 L 930.15625 546.824219 L 928.609375 547.832031 L 927.261719 548.84375 L 926.183594 549.851562 L 925.242188 550.863281 L 924.570312 551.875 L 924.230469 552.480469 L 923.960938 553.015625 L 923.761719 553.691406 L 923.558594 554.296875 L 923.355469 554.96875 L 923.289062 555.644531 L 948.402344 555.644531 L 948.402344 561.5 L 916.625 561.5 L 916.757812 559.144531 L 917.097656 556.988281 L 917.5 554.96875 L 918.039062 553.21875 L 918.644531 551.535156 L 919.386719 550.054688 L 920.191406 548.777344 L 921.203125 547.496094 L 922.414062 546.21875 L 923.761719 545.007812 L 925.308594 543.792969 L 927.125 542.582031 L 927.53125 542.3125 L 928.003906 542.042969 L 928.472656 541.707031 L 928.945312 541.4375 L 929.484375 541.167969 L 930.023438 540.832031 L 936.214844 537.332031 L 938.167969 536.050781 L 939.785156 534.640625 L 941.0625 533.15625 L 941.9375 531.542969 L 942.476562 529.792969 L 942.679688 527.90625 L 942.542969 526.628906 L 942.339844 525.347656 L 941.871094 524.203125 L 941.332031 523.125 L 940.523438 522.183594 L 939.648438 521.242188 L 938.707031 520.570312 L 937.765625 519.960938 L 936.6875 519.558594 L 935.609375 519.222656 L 934.464844 519.019531 L 933.253906 518.953125 L 930.628906 519.289062 L 928.40625 520.097656 L 926.589844 521.511719 L 925.242188 523.464844 L 924.300781 526.023438 L 923.761719 529.050781 L 923.695312 529.320312 L 923.695312 529.722656 L 923.625 529.925781 L 923.625 530.332031 Z M 917.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 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/o22ai/sky130_fd_sc_lp__o22ai_2.svg b/cells/o22ai/sky130_fd_sc_lp__o22ai_2.svg
index fd4b411..f7e9a43 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_2.svg
+++ b/cells/o22ai/sky130_fd_sc_lp__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 539.5 L 367.5 539.5 Z M 367.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="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 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="#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 1314.5 651.5 L 1348.5 651.5 L 1348.5 844.5 L 1314.5 844.5 Z M 521.5 651.5 L 555.5 651.5 L 555.5 844.5 L 521.5 844.5 Z M 619.5 651.5 L 654.5 651.5 L 654.5 844.5 L 619.5 844.5 Z M 736.5 651.5 L 771.5 651.5 L 771.5 844.5 L 736.5 844.5 Z M 835.5 651.5 L 869.5 651.5 L 869.5 844.5 L 835.5 844.5 Z M 1018.5 651.5 L 1052.5 651.5 L 1052.5 844.5 L 1018.5 844.5 Z M 1117.5 651.5 L 1151.5 651.5 L 1151.5 844.5 L 1117.5 844.5 Z M 1215.5 651.5 L 1250.5 651.5 L 1250.5 844.5 L 1215.5 844.5 Z M 1215.5 651.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 1330.5 209.5 L 1364.5 209.5 L 1364.5 498.5 L 1330.5 498.5 Z M 521.5 209.5 L 555.5 209.5 L 555.5 498.5 L 521.5 498.5 Z M 619.5 209.5 L 654.5 209.5 L 654.5 498.5 L 619.5 498.5 Z M 718.5 209.5 L 752.5 209.5 L 752.5 498.5 L 718.5 498.5 Z M 816.5 209.5 L 851.5 209.5 L 851.5 498.5 L 816.5 498.5 Z M 1034.5 209.5 L 1068.5 209.5 L 1068.5 498.5 L 1034.5 498.5 Z M 1133.5 209.5 L 1167.5 209.5 L 1167.5 498.5 L 1133.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 1231.5 209.5 "/>
 </clipPath>
-<image id="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 805.703125 615.332031 L 806.242188 610.28125 L 807.652344 606.175781 L 809.875 602.941406 L 812.90625 600.652344 L 816.742188 599.242188 L 821.457031 598.769531 L 823.609375 598.902344 L 825.695312 599.242188 L 827.648438 599.777344 L 829.398438 600.585938 L 831.015625 601.597656 L 832.5625 602.742188 L 833.773438 604.15625 L 834.851562 605.636719 L 835.660156 607.25 L 836.265625 608.933594 L 836.601562 610.820312 L 836.738281 612.773438 L 836.46875 615.53125 L 835.726562 618.089844 L 834.449219 620.445312 L 832.699219 622.667969 L 830.410156 624.753906 L 827.648438 626.574219 L 826.640625 627.179688 L 819.90625 630.8125 L 818.15625 631.824219 L 816.609375 632.832031 L 815.261719 633.84375 L 814.183594 634.851562 L 813.242188 635.863281 L 812.570312 636.875 L 812.230469 637.480469 L 811.960938 638.015625 L 811.761719 638.691406 L 811.558594 639.296875 L 811.355469 639.96875 L 811.289062 640.644531 L 836.402344 640.644531 L 836.402344 646.5 L 804.625 646.5 L 804.757812 644.144531 L 805.097656 641.988281 L 805.5 639.96875 L 806.039062 638.21875 L 806.644531 636.535156 L 807.386719 635.054688 L 808.191406 633.777344 L 809.203125 632.496094 L 810.414062 631.21875 L 811.761719 630.007812 L 813.308594 628.792969 L 815.125 627.582031 L 815.53125 627.3125 L 816.003906 627.042969 L 816.472656 626.707031 L 816.945312 626.4375 L 817.484375 626.167969 L 818.023438 625.832031 L 824.214844 622.332031 L 826.167969 621.050781 L 827.785156 619.640625 L 829.0625 618.15625 L 829.9375 616.542969 L 830.476562 614.792969 L 830.679688 612.90625 L 830.542969 611.628906 L 830.339844 610.347656 L 829.871094 609.203125 L 829.332031 608.125 L 828.523438 607.183594 L 827.648438 606.242188 L 826.707031 605.570312 L 825.765625 604.960938 L 824.6875 604.558594 L 823.609375 604.222656 L 822.464844 604.019531 L 821.253906 603.953125 L 818.628906 604.289062 L 816.40625 605.097656 L 814.589844 606.511719 L 813.242188 608.464844 L 812.300781 611.023438 L 811.761719 614.050781 L 811.695312 614.320312 L 811.695312 614.722656 L 811.625 614.925781 L 811.625 615.332031 Z M 805.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 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/o22ai/sky130_fd_sc_lp__o22ai_4.svg b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.svg
index 37dcbbd..7a02faa 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_4.svg
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image345" 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="#image345"/>
+  <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 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="#image345"/>
+  <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 1561.5 651.5 L 1590.5 651.5 L 1590.5 814.5 L 1561.5 814.5 Z M 295.5 651.5 L 324.5 651.5 L 324.5 814.5 L 295.5 814.5 Z M 379.5 651.5 L 408.5 651.5 L 408.5 814.5 L 379.5 814.5 Z M 462.5 651.5 L 492.5 651.5 L 492.5 814.5 L 462.5 814.5 Z M 546.5 651.5 L 575.5 651.5 L 575.5 814.5 L 546.5 814.5 Z M 630.5 651.5 L 659.5 651.5 L 659.5 814.5 L 630.5 814.5 Z M 713.5 651.5 L 743.5 651.5 L 743.5 814.5 L 713.5 814.5 Z M 797.5 651.5 L 826.5 651.5 L 826.5 814.5 L 797.5 814.5 Z M 881.5 651.5 L 910.5 651.5 L 910.5 814.5 L 881.5 814.5 Z M 975.5 651.5 L 1004.5 651.5 L 1004.5 814.5 L 975.5 814.5 Z M 1059.5 651.5 L 1088.5 651.5 L 1088.5 814.5 L 1059.5 814.5 Z M 1143.5 651.5 L 1172.5 651.5 L 1172.5 814.5 L 1143.5 814.5 Z M 1226.5 651.5 L 1256.5 651.5 L 1256.5 814.5 L 1226.5 814.5 Z M 1310.5 651.5 L 1339.5 651.5 L 1339.5 814.5 L 1310.5 814.5 Z M 1394.5 651.5 L 1423.5 651.5 L 1423.5 814.5 L 1394.5 814.5 Z M 1478.5 651.5 L 1507.5 651.5 L 1507.5 814.5 L 1478.5 814.5 Z M 1478.5 651.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1567.5 258.5 L 1596.5 258.5 L 1596.5 503.5 L 1567.5 503.5 Z M 298.5 258.5 L 327.5 258.5 L 327.5 503.5 L 298.5 503.5 Z M 382.5 258.5 L 411.5 258.5 L 411.5 503.5 L 382.5 503.5 Z M 465.5 258.5 L 494.5 258.5 L 494.5 503.5 L 465.5 503.5 Z M 549.5 258.5 L 578.5 258.5 L 578.5 503.5 L 549.5 503.5 Z M 633.5 258.5 L 662.5 258.5 L 662.5 503.5 L 633.5 503.5 Z M 716.5 258.5 L 746.5 258.5 L 746.5 503.5 L 716.5 503.5 Z M 800.5 258.5 L 829.5 258.5 L 829.5 503.5 L 800.5 503.5 Z M 884.5 258.5 L 913.5 258.5 L 913.5 503.5 L 884.5 503.5 Z M 981.5 258.5 L 1010.5 258.5 L 1010.5 503.5 L 981.5 503.5 Z M 1065.5 258.5 L 1094.5 258.5 L 1094.5 503.5 L 1065.5 503.5 Z M 1149.5 258.5 L 1178.5 258.5 L 1178.5 503.5 L 1149.5 503.5 Z M 1232.5 258.5 L 1261.5 258.5 L 1261.5 503.5 L 1232.5 503.5 Z M 1316.5 258.5 L 1345.5 258.5 L 1345.5 503.5 L 1316.5 503.5 Z M 1400.5 258.5 L 1429.5 258.5 L 1429.5 503.5 L 1400.5 503.5 Z M 1483.5 258.5 L 1513.5 258.5 L 1513.5 503.5 L 1483.5 503.5 Z M 1483.5 258.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface342">
+<g id="surface371">
 <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 1217.691406 600.460938 L 1208.664062 600.460938 L 1208.664062 596.839844 L 1210.214844 596.664062 L 1211.59375 596.433594 L 1212.804688 596.148438 L 1213.839844 595.917969 L 1214.699219 595.628906 L 1215.449219 595.285156 L 1216.023438 594.941406 L 1216.539062 594.539062 L 1217 594.078125 L 1217.460938 593.503906 L 1217.863281 592.871094 L 1218.265625 592.121094 L 1218.4375 591.71875 L 1218.609375 591.261719 L 1218.785156 590.742188 L 1219.011719 590.109375 L 1219.1875 589.476562 L 1219.414062 588.730469 L 1222.75 588.730469 L 1222.75 629.5 L 1217.691406 629.5 Z M 1217.691406 600.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 1176 488 L 1209 488 M 1176 455 L 1209 455 M 1176 455 L 1176 488 M 1209 455 L 1209 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 1176 488 L 1209 488 M 1176 455 L 1209 455 M 1209 488 L 1209 455 M 1176 488 L 1176 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/o22ai/sky130_fd_sc_lp__o22ai_lp.svg b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.svg
index 50fde0a..3b8a9a3 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.svg
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="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 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="#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 1153.5 706.5 L 1188.5 706.5 L 1188.5 802.5 L 1153.5 802.5 Z M 741.5 706.5 L 775.5 706.5 L 775.5 802.5 L 741.5 802.5 Z M 839.5 706.5 L 874.5 706.5 L 874.5 802.5 L 839.5 802.5 Z M 956.5 706.5 L 991.5 706.5 L 991.5 802.5 L 956.5 802.5 Z M 956.5 706.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 1153.5 209.5 L 1211.5 209.5 L 1211.5 438.5 L 1153.5 438.5 Z M 713.5 209.5 L 771.5 209.5 L 771.5 438.5 L 713.5 438.5 Z M 826.5 209.5 L 883.5 209.5 L 883.5 438.5 L 826.5 438.5 Z M 956.5 209.5 L 1013.5 209.5 L 1013.5 438.5 L 956.5 438.5 Z M 956.5 209.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1210.773438 612.503906 L 1200.203125 612.503906 L 1200.203125 608.261719 L 1202.019531 608.058594 L 1203.636719 607.789062 L 1205.050781 607.453125 L 1206.261719 607.183594 L 1207.269531 606.847656 L 1208.148438 606.445312 L 1208.820312 606.039062 L 1209.425781 605.570312 L 1209.964844 605.03125 L 1210.503906 604.355469 L 1210.972656 603.617188 L 1211.445312 602.742188 L 1211.648438 602.269531 L 1211.847656 601.730469 L 1212.050781 601.125 L 1212.320312 600.386719 L 1212.523438 599.644531 L 1212.792969 598.769531 L 1216.695312 598.769531 L 1216.695312 646.5 L 1210.773438 646.5 Z M 1210.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 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 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/o22ai/sky130_fd_sc_lp__o22ai_m.svg b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.svg
index 351bcd4..d14e173 100644
--- a/cells/o22ai/sky130_fd_sc_lp__o22ai_m.svg
+++ b/cells/o22ai/sky130_fd_sc_lp__o22ai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.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 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="#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 1128.5 728.5 L 1162.5 728.5 L 1162.5 824.5 L 1128.5 824.5 Z M 810.5 728.5 L 844.5 728.5 L 844.5 824.5 L 810.5 824.5 Z M 908.5 728.5 L 942.5 728.5 L 942.5 824.5 L 908.5 824.5 Z M 1025.5 728.5 L 1059.5 728.5 L 1059.5 824.5 L 1025.5 824.5 Z M 1025.5 728.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 1089.5 209.5 L 1123.5 209.5 L 1123.5 305.5 L 1089.5 305.5 Z M 826.5 209.5 L 860.5 209.5 L 860.5 305.5 L 826.5 305.5 Z M 908.5 209.5 L 942.5 209.5 L 942.5 305.5 L 908.5 305.5 Z M 1007.5 209.5 L 1041.5 209.5 L 1041.5 305.5 L 1007.5 305.5 Z M 1007.5 209.5 "/>
 </clipPath>
-<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image368"/>
+  <use xlink:href="#image396"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 917.703125 445.332031 L 918.242188 440.28125 L 919.652344 436.175781 L 921.875 432.941406 L 924.90625 430.652344 L 928.742188 429.242188 L 933.457031 428.769531 L 935.609375 428.902344 L 937.695312 429.242188 L 939.648438 429.777344 L 941.398438 430.585938 L 943.015625 431.597656 L 944.5625 432.742188 L 945.773438 434.15625 L 946.851562 435.636719 L 947.660156 437.25 L 948.265625 438.933594 L 948.601562 440.820312 L 948.738281 442.773438 L 948.46875 445.53125 L 947.726562 448.089844 L 946.449219 450.445312 L 944.699219 452.667969 L 942.410156 454.753906 L 939.648438 456.574219 L 938.640625 457.179688 L 931.90625 460.8125 L 930.15625 461.824219 L 928.609375 462.832031 L 927.261719 463.84375 L 926.183594 464.851562 L 925.242188 465.863281 L 924.570312 466.875 L 924.230469 467.480469 L 923.960938 468.015625 L 923.761719 468.691406 L 923.558594 469.296875 L 923.355469 469.96875 L 923.289062 470.644531 L 948.402344 470.644531 L 948.402344 476.5 L 916.625 476.5 L 916.757812 474.144531 L 917.097656 471.988281 L 917.5 469.96875 L 918.039062 468.21875 L 918.644531 466.535156 L 919.386719 465.054688 L 920.191406 463.777344 L 921.203125 462.496094 L 922.414062 461.21875 L 923.761719 460.007812 L 925.308594 458.792969 L 927.125 457.582031 L 927.53125 457.3125 L 928.003906 457.042969 L 928.472656 456.707031 L 928.945312 456.4375 L 929.484375 456.167969 L 930.023438 455.832031 L 936.214844 452.332031 L 938.167969 451.050781 L 939.785156 449.640625 L 941.0625 448.15625 L 941.9375 446.542969 L 942.476562 444.792969 L 942.679688 442.90625 L 942.542969 441.628906 L 942.339844 440.347656 L 941.871094 439.203125 L 941.332031 438.125 L 940.523438 437.183594 L 939.648438 436.242188 L 938.707031 435.570312 L 937.765625 434.960938 L 936.6875 434.558594 L 935.609375 434.222656 L 934.464844 434.019531 L 933.253906 433.953125 L 930.628906 434.289062 L 928.40625 435.097656 L 926.589844 436.511719 L 925.242188 438.464844 L 924.300781 441.023438 L 923.761719 444.050781 L 923.695312 444.320312 L 923.695312 444.722656 L 923.625 444.925781 L 923.625 445.332031 Z M 917.703125 445.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 889 647 L 928 647 M 889 608 L 928 608 M 889 608 L 889 647 M 928 608 L 928 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 889 647 L 928 647 M 889 608 L 928 608 M 928 647 L 928 608 M 889 647 L 889 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 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/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.svg b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.svg
index 8b8c5f2..59a6257 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.svg
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image374"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 646.5 742.5 L 680.5 742.5 L 680.5 838.5 L 646.5 838.5 Z M 744.5 742.5 L 779.5 742.5 L 779.5 838.5 L 744.5 838.5 Z M 834.5 742.5 L 868.5 742.5 L 868.5 838.5 L 834.5 838.5 Z M 1074.5 768.5 L 1109.5 768.5 L 1109.5 864.5 L 1074.5 864.5 Z M 1173.5 768.5 L 1207.5 768.5 L 1207.5 864.5 L 1173.5 864.5 Z M 1271.5 768.5 L 1306.5 768.5 L 1306.5 864.5 L 1271.5 864.5 Z M 1271.5 768.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 614.5 218.5 L 648.5 218.5 L 648.5 365.5 L 614.5 365.5 Z M 1255.5 268.5 L 1290.5 268.5 L 1290.5 365.5 L 1255.5 365.5 Z M 1173.5 268.5 L 1207.5 268.5 L 1207.5 365.5 L 1173.5 365.5 Z M 1074.5 268.5 L 1109.5 268.5 L 1109.5 365.5 L 1074.5 365.5 Z M 882.5 268.5 L 916.5 268.5 L 916.5 365.5 L 882.5 365.5 Z M 750.5 268.5 L 784.5 268.5 L 784.5 365.5 L 750.5 365.5 Z M 750.5 268.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface371">
+<g id="surface400">
 <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 879.550781 596.574219 L 879.550781 645.652344 L 872.484375 645.652344 L 847.101562 605.863281 L 847.101562 645.652344 L 841.179688 645.652344 L 841.179688 596.574219 L 847.976562 596.574219 L 873.628906 636.699219 L 873.628906 596.574219 Z M 879.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 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/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.svg b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.svg
index 6bdb28d..5a7311f 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.svg
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image371"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 759.5 672.5 L 793.5 672.5 L 793.5 768.5 L 759.5 768.5 Z M 848.5 672.5 L 883.5 672.5 L 883.5 768.5 L 848.5 768.5 Z M 1166.5 768.5 L 1200.5 768.5 L 1200.5 864.5 L 1166.5 864.5 Z M 1067.5 768.5 L 1102.5 768.5 L 1102.5 864.5 L 1067.5 864.5 Z M 1264.5 768.5 L 1299.5 768.5 L 1299.5 864.5 L 1264.5 864.5 Z M 614.5 672.5 L 648.5 672.5 L 648.5 864.5 L 614.5 864.5 Z M 614.5 672.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 815.5 258.5 L 850.5 258.5 L 850.5 354.5 L 815.5 354.5 Z M 1255.5 258.5 L 1290.5 258.5 L 1290.5 354.5 L 1255.5 354.5 Z M 1166.5 258.5 L 1200.5 258.5 L 1200.5 354.5 L 1166.5 354.5 Z M 1067.5 258.5 L 1102.5 258.5 L 1102.5 354.5 L 1067.5 354.5 Z M 914.5 258.5 L 948.5 258.5 L 948.5 354.5 L 914.5 354.5 Z M 614.5 209.5 L 648.5 209.5 L 648.5 498.5 L 614.5 498.5 Z M 614.5 209.5 "/>
 </clipPath>
-<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface368">
+<g id="surface397">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1356.703125 530.332031 L 1357.242188 525.28125 L 1358.652344 521.175781 L 1360.875 517.941406 L 1363.90625 515.652344 L 1367.742188 514.242188 L 1372.457031 513.769531 L 1374.609375 513.902344 L 1376.695312 514.242188 L 1378.648438 514.777344 L 1380.398438 515.585938 L 1382.015625 516.597656 L 1383.5625 517.742188 L 1384.773438 519.15625 L 1385.851562 520.636719 L 1386.660156 522.25 L 1387.265625 523.933594 L 1387.601562 525.820312 L 1387.738281 527.773438 L 1387.46875 530.53125 L 1386.726562 533.089844 L 1385.449219 535.445312 L 1383.699219 537.667969 L 1381.410156 539.753906 L 1378.648438 541.574219 L 1377.640625 542.179688 L 1370.90625 545.8125 L 1369.15625 546.824219 L 1367.609375 547.832031 L 1366.261719 548.84375 L 1365.183594 549.851562 L 1364.242188 550.863281 L 1363.570312 551.875 L 1363.230469 552.480469 L 1362.960938 553.015625 L 1362.761719 553.691406 L 1362.558594 554.296875 L 1362.355469 554.96875 L 1362.289062 555.644531 L 1387.402344 555.644531 L 1387.402344 561.5 L 1355.625 561.5 L 1355.757812 559.144531 L 1356.097656 556.988281 L 1356.5 554.96875 L 1357.039062 553.21875 L 1357.644531 551.535156 L 1358.386719 550.054688 L 1359.191406 548.777344 L 1360.203125 547.496094 L 1361.414062 546.21875 L 1362.761719 545.007812 L 1364.308594 543.792969 L 1366.125 542.582031 L 1366.53125 542.3125 L 1367.003906 542.042969 L 1367.472656 541.707031 L 1367.945312 541.4375 L 1368.484375 541.167969 L 1369.023438 540.832031 L 1375.214844 537.332031 L 1377.167969 536.050781 L 1378.785156 534.640625 L 1380.0625 533.15625 L 1380.9375 531.542969 L 1381.476562 529.792969 L 1381.679688 527.90625 L 1381.542969 526.628906 L 1381.339844 525.347656 L 1380.871094 524.203125 L 1380.332031 523.125 L 1379.523438 522.183594 L 1378.648438 521.242188 L 1377.707031 520.570312 L 1376.765625 519.960938 L 1375.6875 519.558594 L 1374.609375 519.222656 L 1373.464844 519.019531 L 1372.253906 518.953125 L 1369.628906 519.289062 L 1367.40625 520.097656 L 1365.589844 521.511719 L 1364.242188 523.464844 L 1363.300781 526.023438 L 1362.761719 529.050781 L 1362.695312 529.320312 L 1362.695312 529.722656 L 1362.625 529.925781 L 1362.625 530.332031 Z M 1356.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 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/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.svg b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.svg
index 1adce15..8f2008f 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.svg
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.5 111.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 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="#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 1263.5 672.5 L 1298.5 672.5 L 1298.5 864.5 L 1263.5 864.5 Z M 656.5 768.5 L 690.5 768.5 L 690.5 864.5 L 656.5 864.5 Z M 548.5 768.5 L 583.5 768.5 L 583.5 864.5 L 548.5 864.5 Z M 1129.5 768.5 L 1164.5 768.5 L 1164.5 864.5 L 1129.5 864.5 Z M 1047.5 768.5 L 1081.5 768.5 L 1081.5 864.5 L 1047.5 864.5 Z M 755.5 768.5 L 789.5 768.5 L 789.5 864.5 L 755.5 864.5 Z M 1362.5 672.5 L 1396.5 672.5 L 1396.5 864.5 L 1362.5 864.5 Z M 1362.5 672.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 1263.5 209.5 L 1298.5 209.5 L 1298.5 498.5 L 1263.5 498.5 Z M 631.5 351.5 L 665.5 351.5 L 665.5 498.5 L 631.5 498.5 Z M 548.5 351.5 L 583.5 351.5 L 583.5 498.5 L 548.5 498.5 Z M 1078.5 351.5 L 1112.5 351.5 L 1112.5 498.5 L 1078.5 498.5 Z M 979.5 351.5 L 1013.5 351.5 L 1013.5 498.5 L 979.5 498.5 Z M 755.5 351.5 L 789.5 351.5 L 789.5 498.5 L 755.5 498.5 Z M 1362.5 209.5 L 1396.5 209.5 L 1396.5 498.5 L 1362.5 498.5 Z M 1362.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 988.550781 681.574219 L 988.550781 730.652344 L 981.484375 730.652344 L 956.101562 690.863281 L 956.101562 730.652344 L 950.179688 730.652344 L 950.179688 681.574219 L 956.976562 681.574219 L 982.628906 721.699219 L 982.628906 681.574219 Z M 988.550781 681.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 886 392 L 925 392 M 886 353 L 925 353 M 886 353 L 886 392 M 925 353 L 925 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 886 392 L 925 392 M 886 353 L 925 353 M 925 392 L 925 353 M 886 392 L 886 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/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.svg b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.svg
index ff466a3..5788f82 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.svg
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 174.5 175.5 "/>
 </clipPath>
-<image id="image321" 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="#image321"/>
+  <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="#image321"/>
+  <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 1582.5 651.5 L 1611.5 651.5 L 1611.5 814.5 L 1582.5 814.5 Z M 310.5 651.5 L 340.5 651.5 L 340.5 814.5 L 310.5 814.5 Z M 394.5 651.5 L 423.5 651.5 L 423.5 814.5 L 394.5 814.5 Z M 478.5 651.5 L 507.5 651.5 L 507.5 814.5 L 478.5 814.5 Z M 577.5 651.5 L 606.5 651.5 L 606.5 814.5 L 577.5 814.5 Z M 661.5 651.5 L 690.5 651.5 L 690.5 814.5 L 661.5 814.5 Z M 745.5 651.5 L 774.5 651.5 L 774.5 814.5 L 745.5 814.5 Z M 930.5 651.5 L 959.5 651.5 L 959.5 814.5 L 930.5 814.5 Z M 1013.5 651.5 L 1042.5 651.5 L 1042.5 814.5 L 1013.5 814.5 Z M 1097.5 651.5 L 1126.5 651.5 L 1126.5 814.5 L 1097.5 814.5 Z M 1181.5 651.5 L 1210.5 651.5 L 1210.5 814.5 L 1181.5 814.5 Z M 1331.5 651.5 L 1360.5 651.5 L 1360.5 814.5 L 1331.5 814.5 Z M 1414.5 651.5 L 1443.5 651.5 L 1443.5 814.5 L 1414.5 814.5 Z M 1498.5 651.5 L 1527.5 651.5 L 1527.5 814.5 L 1498.5 814.5 Z M 1498.5 651.5 "/>
 </clipPath>
-<image id="image322" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1530.5 258.5 L 1559.5 258.5 L 1559.5 503.5 L 1530.5 503.5 Z M 310.5 258.5 L 340.5 258.5 L 340.5 503.5 L 310.5 503.5 Z M 394.5 258.5 L 423.5 258.5 L 423.5 503.5 L 394.5 503.5 Z M 478.5 258.5 L 507.5 258.5 L 507.5 503.5 L 478.5 503.5 Z M 562.5 258.5 L 591.5 258.5 L 591.5 503.5 L 562.5 503.5 Z M 693.5 258.5 L 722.5 258.5 L 722.5 503.5 L 693.5 503.5 Z M 777.5 258.5 L 806.5 258.5 L 806.5 503.5 L 777.5 503.5 Z M 927.5 258.5 L 956.5 258.5 L 956.5 503.5 L 927.5 503.5 Z M 1010.5 258.5 L 1040.5 258.5 L 1040.5 503.5 L 1010.5 503.5 Z M 1097.5 258.5 L 1126.5 258.5 L 1126.5 503.5 L 1097.5 503.5 Z M 1181.5 258.5 L 1210.5 258.5 L 1210.5 503.5 L 1181.5 503.5 Z M 1279.5 258.5 L 1308.5 258.5 L 1308.5 503.5 L 1279.5 503.5 Z M 1363.5 258.5 L 1392.5 258.5 L 1392.5 503.5 L 1363.5 503.5 Z M 1446.5 258.5 L 1476.5 258.5 L 1476.5 503.5 L 1446.5 503.5 Z M 1446.5 258.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface318">
+<g id="surface348">
 <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 1076.773438 587.460938 L 1076.773438 629.378906 L 1070.734375 629.378906 L 1049.058594 595.394531 L 1049.058594 629.378906 L 1043.996094 629.378906 L 1043.996094 587.460938 L 1049.804688 587.460938 L 1071.714844 621.730469 L 1071.714844 587.460938 Z M 1076.773438 587.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 989 488 L 1022 488 M 989 455 L 1022 455 M 989 455 L 989 488 M 1022 455 L 1022 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 989 488 L 1022 488 M 989 455 L 1022 455 M 1022 488 L 1022 455 M 989 488 L 989 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/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.svg b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.svg
index fcdcd21..bb6856b 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.svg
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image383"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1228.5 659.5 L 1262.5 659.5 L 1262.5 755.5 L 1228.5 755.5 Z M 1125.5 659.5 L 1159.5 659.5 L 1159.5 755.5 L 1125.5 755.5 Z M 1326.5 659.5 L 1361.5 659.5 L 1361.5 755.5 L 1326.5 755.5 Z M 836.5 767.5 L 870.5 767.5 L 870.5 863.5 L 836.5 863.5 Z M 648.5 767.5 L 682.5 767.5 L 682.5 863.5 L 648.5 863.5 Z M 565.5 767.5 L 600.5 767.5 L 600.5 863.5 L 565.5 863.5 Z M 746.5 767.5 L 781.5 767.5 L 781.5 863.5 L 746.5 863.5 Z M 746.5 767.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1303.5 212.5 L 1361.5 212.5 L 1361.5 441.5 L 1303.5 441.5 Z M 565.5 212.5 L 623.5 212.5 L 623.5 441.5 L 565.5 441.5 Z M 751.5 212.5 L 808.5 212.5 L 808.5 441.5 L 751.5 441.5 Z M 879.5 212.5 L 937.5 212.5 L 937.5 441.5 L 879.5 441.5 Z M 1060.5 212.5 L 1118.5 212.5 L 1118.5 441.5 L 1060.5 441.5 Z M 1182.5 212.5 L 1239.5 212.5 L 1239.5 441.5 L 1182.5 441.5 Z M 1182.5 212.5 "/>
 </clipPath>
-<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image414"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image386"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface380">
+<g id="surface409">
 <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 536.320312 L 544.191406 561.5 L 536.449219 561.5 L 523.050781 541.035156 L 509.589844 561.5 L 501.980469 561.5 L 519.351562 536.320312 L 503.058594 512.421875 L 510.664062 512.421875 L 523.253906 531.675781 L 535.910156 512.421875 L 543.382812 512.421875 Z M 526.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 502 562 L 541 562 M 502 523 L 541 523 M 502 523 L 502 562 M 541 523 L 541 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 502 562 L 541 562 M 502 523 L 541 523 M 541 562 L 541 523 M 502 562 L 502 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_lp__o2bb2a_m.svg b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.svg
index 88f640b..5f9813e 100644
--- a/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.svg
+++ b/cells/o2bb2a/sky130_fd_sc_lp__o2bb2a_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image455" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image426"/>
+  <use xlink:href="#image455"/>
 </pattern>
 <mask 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="#image426"/>
+  <use xlink:href="#image455"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1046.5 631.5 L 1080.5 631.5 L 1080.5 727.5 L 1046.5 727.5 Z M 1252.5 631.5 L 1286.5 631.5 L 1286.5 727.5 L 1252.5 727.5 Z M 1144.5 631.5 L 1178.5 631.5 L 1178.5 727.5 L 1144.5 727.5 Z M 644.5 768.5 L 679.5 768.5 L 679.5 864.5 L 644.5 864.5 Z M 826.5 768.5 L 860.5 768.5 L 860.5 864.5 L 826.5 864.5 Z M 743.5 768.5 L 777.5 768.5 L 777.5 864.5 L 743.5 864.5 Z M 743.5 768.5 "/>
 </clipPath>
-<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image456" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image427"/>
+  <use xlink:href="#image456"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1211.5 209.5 L 1245.5 209.5 L 1245.5 305.5 L 1211.5 305.5 Z M 619.5 209.5 L 654.5 209.5 L 654.5 305.5 L 619.5 305.5 Z M 727.5 209.5 L 761.5 209.5 L 761.5 305.5 L 727.5 305.5 Z M 826.5 209.5 L 860.5 209.5 L 860.5 305.5 L 826.5 305.5 Z M 1030.5 209.5 L 1064.5 209.5 L 1064.5 305.5 L 1030.5 305.5 Z M 1128.5 209.5 L 1162.5 209.5 L 1162.5 305.5 L 1128.5 305.5 Z M 1128.5 209.5 "/>
 </clipPath>
-<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image457" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image428"/>
+  <use xlink:href="#image457"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image429"/>
+  <use xlink:href="#image458"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface423">
+<g id="surface452">
 <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 879.550781 596.574219 L 879.550781 645.652344 L 872.484375 645.652344 L 847.101562 605.863281 L 847.101562 645.652344 L 841.179688 645.652344 L 841.179688 596.574219 L 847.976562 596.574219 L 873.628906 636.699219 L 873.628906 596.574219 Z M 879.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 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/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.svg b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.svg
index d855046..3c80609 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image452" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image452"/>
 </pattern>
 <mask 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="#image423"/>
+  <use xlink:href="#image452"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 677.5 758.5 L 711.5 758.5 L 711.5 854.5 L 677.5 854.5 Z M 766.5 758.5 L 800.5 758.5 L 800.5 854.5 L 766.5 854.5 Z M 1109.5 768.5 L 1143.5 768.5 L 1143.5 864.5 L 1109.5 864.5 Z M 1001.5 768.5 L 1035.5 768.5 L 1035.5 864.5 L 1001.5 864.5 Z M 1207.5 768.5 L 1242.5 768.5 L 1242.5 864.5 L 1207.5 864.5 Z M 1207.5 768.5 "/>
 </clipPath>
-<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image453"/>
 </pattern>
 <mask id="mask2">
 <rect 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 218.5 L 1223.5 218.5 L 1223.5 365.5 L 1189.5 365.5 Z M 804.5 218.5 L 838.5 218.5 L 838.5 365.5 L 804.5 365.5 Z M 902.5 218.5 L 937.5 218.5 L 937.5 365.5 L 902.5 365.5 Z M 1001.5 218.5 L 1035.5 218.5 L 1035.5 365.5 L 1001.5 365.5 Z M 1099.5 218.5 L 1134.5 218.5 L 1134.5 365.5 L 1099.5 365.5 Z M 1099.5 218.5 "/>
 </clipPath>
-<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image454" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image454"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image455" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image455"/>
 </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="surface449">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -220,6 +220,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 714.550781 257.574219 L 714.550781 306.652344 L 707.484375 306.652344 L 682.101562 266.863281 L 682.101562 306.652344 L 676.179688 306.652344 L 676.179688 257.574219 L 682.976562 257.574219 L 708.628906 297.699219 L 708.628906 257.574219 Z M 714.550781 257.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 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/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.svg b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.svg
index 8725b2c..76f0d98 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_1.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <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 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="#image360"/>
+  <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 674.5 666.5 L 709.5 666.5 L 709.5 859.5 L 674.5 859.5 Z M 757.5 666.5 L 791.5 666.5 L 791.5 859.5 L 757.5 859.5 Z M 1095.5 672.5 L 1129.5 672.5 L 1129.5 864.5 L 1095.5 864.5 Z M 996.5 672.5 L 1031.5 672.5 L 1031.5 864.5 L 996.5 864.5 Z M 1216.5 672.5 L 1251.5 672.5 L 1251.5 864.5 L 1216.5 864.5 Z M 1216.5 672.5 "/>
 </clipPath>
-<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" 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="mask2">
 <rect 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 209.5 L 1251.5 209.5 L 1251.5 498.5 L 1216.5 498.5 Z M 674.5 209.5 L 709.5 209.5 L 709.5 498.5 L 674.5 498.5 Z M 773.5 209.5 L 807.5 209.5 L 807.5 498.5 L 773.5 498.5 Z M 1003.5 209.5 L 1038.5 209.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1120.5 209.5 L 1154.5 209.5 L 1154.5 498.5 L 1120.5 498.5 Z M 1120.5 209.5 "/>
 </clipPath>
-<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" 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="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" 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="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface357">
+<g id="surface386">
 <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 966.554688 796.246094 L 966.554688 815.5 L 960.292969 815.5 L 960.292969 796.246094 L 941.375 766.421875 L 949.117188 766.421875 L 963.523438 790.320312 L 977.527344 766.421875 L 985 766.421875 Z M 966.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 942 307 L 981 307 M 942 269 L 981 269 M 942 269 L 942 307 M 981 269 L 981 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 942 307 L 981 307 M 942 269 L 981 269 M 981 307 L 981 269 M 942 307 L 942 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/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.svg b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.svg
index c30c2f5..57af376 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_2.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__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 539.5 L 256.5 539.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" 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="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="#image375"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1447.5 647.5 L 1481.5 647.5 L 1481.5 839.5 L 1447.5 839.5 Z M 408.5 647.5 L 443.5 647.5 L 443.5 839.5 L 408.5 839.5 Z M 507.5 647.5 L 541.5 647.5 L 541.5 839.5 L 507.5 839.5 Z M 606.5 647.5 L 640.5 647.5 L 640.5 839.5 L 606.5 839.5 Z M 704.5 647.5 L 738.5 647.5 L 738.5 839.5 L 704.5 839.5 Z M 936.5 647.5 L 970.5 647.5 L 970.5 839.5 L 936.5 839.5 Z M 1034.5 647.5 L 1068.5 647.5 L 1068.5 839.5 L 1034.5 839.5 Z M 1151.5 647.5 L 1185.5 647.5 L 1185.5 839.5 L 1151.5 839.5 Z M 1250.5 647.5 L 1284.5 647.5 L 1284.5 839.5 L 1250.5 839.5 Z M 1348.5 647.5 L 1382.5 647.5 L 1382.5 839.5 L 1348.5 839.5 Z M 1348.5 647.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1447.5 209.5 L 1481.5 209.5 L 1481.5 498.5 L 1447.5 498.5 Z M 408.5 209.5 L 443.5 209.5 L 443.5 498.5 L 408.5 498.5 Z M 507.5 209.5 L 541.5 209.5 L 541.5 498.5 L 507.5 498.5 Z M 606.5 209.5 L 640.5 209.5 L 640.5 498.5 L 606.5 498.5 Z M 704.5 209.5 L 738.5 209.5 L 738.5 498.5 L 704.5 498.5 Z M 936.5 209.5 L 970.5 209.5 L 970.5 498.5 L 936.5 498.5 Z M 1034.5 209.5 L 1068.5 209.5 L 1068.5 498.5 L 1034.5 498.5 Z M 1142.5 209.5 L 1176.5 209.5 L 1176.5 498.5 L 1142.5 498.5 Z M 1240.5 209.5 L 1275.5 209.5 L 1275.5 498.5 L 1240.5 498.5 Z M 1348.5 209.5 L 1382.5 209.5 L 1382.5 498.5 L 1348.5 498.5 Z M 1348.5 209.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface372">
+<g id="surface401">
 <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 1593.773438 527.503906 L 1583.203125 527.503906 L 1583.203125 523.261719 L 1585.019531 523.058594 L 1586.636719 522.789062 L 1588.050781 522.453125 L 1589.261719 522.183594 L 1590.269531 521.847656 L 1591.148438 521.445312 L 1591.820312 521.039062 L 1592.425781 520.570312 L 1592.964844 520.03125 L 1593.503906 519.355469 L 1593.972656 518.617188 L 1594.445312 517.742188 L 1594.648438 517.269531 L 1594.847656 516.730469 L 1595.050781 516.125 L 1595.320312 515.386719 L 1595.523438 514.644531 L 1595.792969 513.769531 L 1599.695312 513.769531 L 1599.695312 561.5 L 1593.773438 561.5 Z M 1593.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 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/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.svg b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.svg
index dace869..b0605a0 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_4.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__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="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask 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="#image391"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1621.5 610.5 L 1643.5 610.5 L 1643.5 736.5 L 1621.5 736.5 Z M 269.5 610.5 L 292.5 610.5 L 292.5 736.5 L 269.5 736.5 Z M 334.5 610.5 L 356.5 610.5 L 356.5 736.5 L 334.5 736.5 Z M 398.5 610.5 L 421.5 610.5 L 421.5 736.5 L 398.5 736.5 Z M 463.5 610.5 L 485.5 610.5 L 485.5 736.5 L 463.5 736.5 Z M 527.5 610.5 L 550.5 610.5 L 550.5 736.5 L 527.5 736.5 Z M 592.5 610.5 L 614.5 610.5 L 614.5 736.5 L 592.5 736.5 Z M 656.5 610.5 L 679.5 610.5 L 679.5 736.5 L 656.5 736.5 Z M 733.5 610.5 L 755.5 610.5 L 755.5 736.5 L 733.5 736.5 Z M 806.5 610.5 L 829.5 610.5 L 829.5 736.5 L 806.5 736.5 Z M 874.5 610.5 L 896.5 610.5 L 896.5 736.5 L 874.5 736.5 Z M 950.5 610.5 L 973.5 610.5 L 973.5 736.5 L 950.5 736.5 Z M 1027.5 610.5 L 1049.5 610.5 L 1049.5 736.5 L 1027.5 736.5 Z M 1169.5 610.5 L 1192.5 610.5 L 1192.5 736.5 L 1169.5 736.5 Z M 1234.5 610.5 L 1256.5 610.5 L 1256.5 736.5 L 1234.5 736.5 Z M 1298.5 610.5 L 1321.5 610.5 L 1321.5 736.5 L 1298.5 736.5 Z M 1363.5 610.5 L 1385.5 610.5 L 1385.5 736.5 L 1363.5 736.5 Z M 1427.5 610.5 L 1450.5 610.5 L 1450.5 736.5 L 1427.5 736.5 Z M 1492.5 610.5 L 1514.5 610.5 L 1514.5 736.5 L 1492.5 736.5 Z M 1556.5 610.5 L 1579.5 610.5 L 1579.5 736.5 L 1556.5 736.5 Z M 1556.5 610.5 "/>
 </clipPath>
-<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image392"/>
+  <use xlink:href="#image422"/>
 </pattern>
 <mask id="mask2">
 <rect 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 320.5 L 1641.5 320.5 L 1641.5 509.5 L 1618.5 509.5 Z M 280.5 320.5 L 302.5 320.5 L 302.5 509.5 L 280.5 509.5 Z M 344.5 320.5 L 367.5 320.5 L 367.5 509.5 L 344.5 509.5 Z M 409.5 320.5 L 431.5 320.5 L 431.5 509.5 L 409.5 509.5 Z M 478.5 320.5 L 500.5 320.5 L 500.5 509.5 L 478.5 509.5 Z M 542.5 320.5 L 565.5 320.5 L 565.5 509.5 L 542.5 509.5 Z M 607.5 320.5 L 629.5 320.5 L 629.5 509.5 L 607.5 509.5 Z M 671.5 320.5 L 694.5 320.5 L 694.5 509.5 L 671.5 509.5 Z M 736.5 320.5 L 758.5 320.5 L 758.5 509.5 L 736.5 509.5 Z M 806.5 320.5 L 829.5 320.5 L 829.5 509.5 L 806.5 509.5 Z M 871.5 320.5 L 893.5 320.5 L 893.5 509.5 L 871.5 509.5 Z M 935.5 320.5 L 958.5 320.5 L 958.5 509.5 L 935.5 509.5 Z M 1000.5 320.5 L 1022.5 320.5 L 1022.5 509.5 L 1000.5 509.5 Z M 1116.5 320.5 L 1138.5 320.5 L 1138.5 509.5 L 1116.5 509.5 Z M 1180.5 320.5 L 1203.5 320.5 L 1203.5 509.5 L 1180.5 509.5 Z M 1245.5 320.5 L 1267.5 320.5 L 1267.5 509.5 L 1245.5 509.5 Z M 1309.5 320.5 L 1332.5 320.5 L 1332.5 509.5 L 1309.5 509.5 Z M 1425.5 320.5 L 1447.5 320.5 L 1447.5 509.5 L 1425.5 509.5 Z M 1489.5 320.5 L 1512.5 320.5 L 1512.5 509.5 L 1489.5 509.5 Z M 1554.5 320.5 L 1576.5 320.5 L 1576.5 509.5 L 1554.5 509.5 Z M 1554.5 320.5 "/>
 </clipPath>
-<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image393"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 226.5 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="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image394"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface388">
+<g id="surface418">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -213,6 +213,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 676.628906 531.371094 L 676.976562 528.109375 L 677.890625 525.457031 L 679.324219 523.371094 L 681.28125 521.890625 L 683.761719 520.976562 L 686.804688 520.675781 L 688.195312 520.761719 L 689.542969 520.976562 L 690.804688 521.324219 L 691.933594 521.847656 L 692.976562 522.5 L 693.976562 523.238281 L 694.761719 524.152344 L 695.457031 525.109375 L 695.976562 526.152344 L 696.371094 527.238281 L 696.585938 528.457031 L 696.675781 529.71875 L 696.5 531.5 L 696.023438 533.152344 L 695.195312 534.675781 L 694.066406 536.109375 L 692.585938 537.457031 L 690.804688 538.628906 L 690.152344 539.023438 L 685.804688 541.371094 L 684.675781 542.023438 L 683.675781 542.675781 L 682.804688 543.324219 L 682.109375 543.976562 L 681.5 544.628906 L 681.066406 545.28125 L 680.847656 545.675781 L 680.675781 546.023438 L 680.542969 546.457031 L 680.414062 546.847656 L 680.28125 547.28125 L 680.238281 547.71875 L 696.457031 547.71875 L 696.457031 551.5 L 675.933594 551.5 L 676.023438 549.976562 L 676.238281 548.585938 L 676.5 547.28125 L 676.847656 546.152344 L 677.238281 545.066406 L 677.71875 544.109375 L 678.238281 543.28125 L 678.890625 542.457031 L 679.675781 541.628906 L 680.542969 540.847656 L 681.542969 540.066406 L 682.71875 539.28125 L 682.976562 539.109375 L 683.28125 538.933594 L 683.585938 538.71875 L 683.890625 538.542969 L 684.238281 538.371094 L 684.585938 538.152344 L 688.585938 535.890625 L 689.847656 535.066406 L 690.890625 534.152344 L 691.71875 533.195312 L 692.28125 532.152344 L 692.628906 531.023438 L 692.761719 529.804688 L 692.675781 528.976562 L 692.542969 528.152344 L 692.238281 527.414062 L 691.890625 526.71875 L 691.371094 526.109375 L 690.804688 525.5 L 690.195312 525.066406 L 689.585938 524.675781 L 688.890625 524.414062 L 688.195312 524.195312 L 687.457031 524.066406 L 686.675781 524.023438 L 684.976562 524.238281 L 683.542969 524.761719 L 682.371094 525.675781 L 681.5 526.933594 L 680.890625 528.585938 L 680.542969 530.542969 L 680.5 530.71875 L 680.5 530.976562 L 680.457031 531.109375 L 680.457031 531.371094 Z M 676.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 658 557 L 684 557 M 658 531 L 684 531 M 658 531 L 658 557 M 684 531 L 684 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 658 557 L 684 557 M 658 531 L 684 531 M 684 557 L 684 531 M 658 557 L 658 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/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.svg b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.svg
index da1c0e3..dfe683b 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="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="#image333"/>
+  <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 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="#image333"/>
+  <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 1099.5 727.5 L 1134.5 727.5 L 1134.5 823.5 L 1099.5 823.5 Z M 1205.5 727.5 L 1239.5 727.5 L 1239.5 823.5 L 1205.5 823.5 Z M 1001.5 727.5 L 1035.5 727.5 L 1035.5 823.5 L 1001.5 823.5 Z M 673.5 757.5 L 708.5 757.5 L 708.5 853.5 L 673.5 853.5 Z M 763.5 757.5 L 797.5 757.5 L 797.5 853.5 L 763.5 853.5 Z M 763.5 757.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <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 1193.5 209.5 L 1251.5 209.5 L 1251.5 438.5 L 1193.5 438.5 Z M 686.5 209.5 L 743.5 209.5 L 743.5 438.5 L 686.5 438.5 Z M 807.5 209.5 L 865.5 209.5 L 865.5 438.5 L 807.5 438.5 Z M 960.5 209.5 L 1017.5 209.5 L 1017.5 438.5 L 960.5 438.5 Z M 1081.5 209.5 L 1138.5 209.5 L 1138.5 438.5 L 1081.5 438.5 Z M 1081.5 209.5 "/>
 </clipPath>
-<image id="image335" 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="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image336" 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="#image336"/>
+  <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="surface330">
+<g id="surface359">
 <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 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/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.svg b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.svg
index a452d49..933b5ad 100644
--- a/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.svg
+++ b/cells/o2bb2ai/sky130_fd_sc_lp__o2bb2ai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image421" 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="#image421"/>
+  <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 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="#image421"/>
+  <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 675.5 729.5 L 710.5 729.5 L 710.5 825.5 L 675.5 825.5 Z M 758.5 729.5 L 792.5 729.5 L 792.5 825.5 L 758.5 825.5 Z M 1111.5 733.5 L 1145.5 733.5 L 1145.5 829.5 L 1111.5 829.5 Z M 1012.5 733.5 L 1047.5 733.5 L 1047.5 829.5 L 1012.5 829.5 Z M 1209.5 733.5 L 1244.5 733.5 L 1244.5 829.5 L 1209.5 829.5 Z M 1209.5 733.5 "/>
 </clipPath>
-<image id="image422" 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="#image422"/>
+  <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 1072.5 209.5 L 1106.5 209.5 L 1106.5 305.5 L 1072.5 305.5 Z M 669.5 209.5 L 703.5 209.5 L 703.5 305.5 L 669.5 305.5 Z M 767.5 209.5 L 801.5 209.5 L 801.5 305.5 L 767.5 305.5 Z M 891.5 209.5 L 925.5 209.5 L 925.5 305.5 L 891.5 305.5 Z M 989.5 209.5 L 1024.5 209.5 L 1024.5 305.5 L 989.5 305.5 Z M 989.5 209.5 "/>
 </clipPath>
-<image id="image423" 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="#image423"/>
+  <use xlink:href="#image452"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image424" 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="#image424"/>
+  <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="surface418">
+<g id="surface447">
 <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 1320.773438 357.503906 L 1310.203125 357.503906 L 1310.203125 353.261719 L 1312.019531 353.058594 L 1313.636719 352.789062 L 1315.050781 352.453125 L 1316.261719 352.183594 L 1317.269531 351.847656 L 1318.148438 351.445312 L 1318.820312 351.039062 L 1319.425781 350.570312 L 1319.964844 350.03125 L 1320.503906 349.355469 L 1320.972656 348.617188 L 1321.445312 347.742188 L 1321.648438 347.269531 L 1321.847656 346.730469 L 1322.050781 346.125 L 1322.320312 345.386719 L 1322.523438 344.644531 L 1322.792969 343.769531 L 1326.695312 343.769531 L 1326.695312 391.5 L 1320.773438 391.5 Z M 1320.773438 357.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 731 L 1311 731 M 1272 693 L 1311 693 M 1272 693 L 1272 731 M 1311 693 L 1311 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 1272 731 L 1311 731 M 1272 693 L 1311 693 M 1311 731 L 1311 693 M 1272 731 L 1272 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 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/o311a/sky130_fd_sc_lp__o311a_0.svg b/cells/o311a/sky130_fd_sc_lp__o311a_0.svg
index 50348e3..ee13f88 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_0.svg
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image357"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image357"/>
+  <use xlink:href="#image384"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1216.5 759.5 L 1251.5 759.5 L 1251.5 855.5 L 1216.5 855.5 Z M 714.5 759.5 L 749.5 759.5 L 749.5 855.5 L 714.5 855.5 Z M 822.5 759.5 L 856.5 759.5 L 856.5 855.5 L 822.5 855.5 Z M 921.5 759.5 L 955.5 759.5 L 955.5 855.5 L 921.5 855.5 Z M 1035.5 759.5 L 1070.5 759.5 L 1070.5 855.5 L 1035.5 855.5 Z M 1134.5 759.5 L 1168.5 759.5 L 1168.5 855.5 L 1134.5 855.5 Z M 1134.5 759.5 "/>
 </clipPath>
-<image id="image358" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image358"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1223.5 220.5 L 1258.5 220.5 L 1258.5 367.5 L 1223.5 367.5 Z M 673.5 220.5 L 708.5 220.5 L 708.5 367.5 L 673.5 367.5 Z M 797.5 220.5 L 831.5 220.5 L 831.5 367.5 L 797.5 367.5 Z M 900.5 220.5 L 934.5 220.5 L 934.5 367.5 L 900.5 367.5 Z M 1003.5 220.5 L 1038.5 220.5 L 1038.5 367.5 L 1003.5 367.5 Z M 1109.5 220.5 L 1143.5 220.5 L 1143.5 367.5 L 1109.5 367.5 Z M 1109.5 220.5 "/>
 </clipPath>
-<image id="image359" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image386" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image359"/>
+  <use xlink:href="#image386"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image387" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface354">
+<g id="surface381">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/o311a/sky130_fd_sc_lp__o311a_1.svg b/cells/o311a/sky130_fd_sc_lp__o311a_1.svg
index f90a149..f9ae550 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_1.svg
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image327"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image327"/>
+  <use xlink:href="#image354"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1247.5 672.5 L 1282.5 672.5 L 1282.5 864.5 L 1247.5 864.5 Z M 614.5 672.5 L 648.5 672.5 L 648.5 864.5 L 614.5 864.5 Z M 793.5 672.5 L 828.5 672.5 L 828.5 864.5 L 793.5 864.5 Z M 907.5 672.5 L 941.5 672.5 L 941.5 864.5 L 907.5 864.5 Z M 1041.5 672.5 L 1075.5 672.5 L 1075.5 864.5 L 1041.5 864.5 Z M 1165.5 672.5 L 1199.5 672.5 L 1199.5 864.5 L 1165.5 864.5 Z M 1165.5 672.5 "/>
 </clipPath>
-<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image328"/>
+  <use xlink:href="#image355"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1247.5 209.5 L 1282.5 209.5 L 1282.5 498.5 L 1247.5 498.5 Z M 670.5 209.5 L 704.5 209.5 L 704.5 498.5 L 670.5 498.5 Z M 793.5 209.5 L 828.5 209.5 L 828.5 498.5 L 793.5 498.5 Z M 895.5 209.5 L 930.5 209.5 L 930.5 498.5 L 895.5 498.5 Z M 1000.5 209.5 L 1034.5 209.5 L 1034.5 498.5 L 1000.5 498.5 Z M 1123.5 209.5 L 1158.5 209.5 L 1158.5 498.5 L 1123.5 498.5 Z M 1123.5 209.5 "/>
 </clipPath>
-<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image356" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image329"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image330" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image357" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image330"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface324">
+<g id="surface351">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <path style=" 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/o311a/sky130_fd_sc_lp__o311a_2.svg b/cells/o311a/sky130_fd_sc_lp__o311a_2.svg
index e3b3a3b..1261b96 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_2.svg
+++ b/cells/o311a/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1293.5 672.5 L 1327.5 672.5 L 1327.5 864.5 L 1293.5 864.5 Z M 564.5 672.5 L 599.5 672.5 L 599.5 864.5 L 564.5 864.5 Z M 663.5 672.5 L 697.5 672.5 L 697.5 864.5 L 663.5 864.5 Z M 839.5 672.5 L 874.5 672.5 L 874.5 864.5 L 839.5 864.5 Z M 962.5 672.5 L 996.5 672.5 L 996.5 864.5 L 962.5 864.5 Z M 1087.5 672.5 L 1121.5 672.5 L 1121.5 864.5 L 1087.5 864.5 Z M 1211.5 672.5 L 1245.5 672.5 L 1245.5 864.5 L 1211.5 864.5 Z M 1211.5 672.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1294.5 209.5 L 1329.5 209.5 L 1329.5 498.5 L 1294.5 498.5 Z M 572.5 209.5 L 607.5 209.5 L 607.5 498.5 L 572.5 498.5 Z M 671.5 209.5 L 705.5 209.5 L 705.5 498.5 L 671.5 498.5 Z M 839.5 209.5 L 874.5 209.5 L 874.5 498.5 L 839.5 498.5 Z M 922.5 209.5 L 956.5 209.5 L 956.5 498.5 L 922.5 498.5 Z M 1046.5 209.5 L 1080.5 209.5 L 1080.5 498.5 L 1046.5 498.5 Z M 1196.5 209.5 L 1230.5 209.5 L 1230.5 498.5 L 1196.5 498.5 Z M 1196.5 209.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface367">
+<g id="surface395">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1433.476562 526.953125 L 1422.90625 526.953125 L 1422.90625 522.714844 L 1424.722656 522.511719 L 1426.339844 522.242188 L 1427.753906 521.90625 L 1428.964844 521.636719 L 1429.972656 521.300781 L 1430.847656 520.894531 L 1431.523438 520.492188 L 1432.128906 520.019531 L 1432.667969 519.480469 L 1433.207031 518.808594 L 1433.675781 518.066406 L 1434.148438 517.191406 L 1434.351562 516.722656 L 1434.550781 516.183594 L 1434.753906 515.578125 L 1435.023438 514.835938 L 1435.226562 514.097656 L 1435.496094 513.222656 L 1439.398438 513.222656 L 1439.398438 560.953125 L 1433.476562 560.953125 Z M 1433.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 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/o311a/sky130_fd_sc_lp__o311a_4.svg b/cells/o311a/sky130_fd_sc_lp__o311a_4.svg
index 8951851..e461cb8 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_4.svg
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 1012.5 538.5 L 1283.5 538.5 L 1283.5 558.5 L 1012.5 558.5 Z M 1012.5 538.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 521.5 642.5 L 548.5 642.5 L 548.5 797.5 L 521.5 797.5 Z M 442.5 642.5 L 469.5 642.5 L 469.5 797.5 L 442.5 797.5 Z M 284.5 642.5 L 311.5 642.5 L 311.5 797.5 L 284.5 797.5 Z M 363.5 642.5 L 390.5 642.5 L 390.5 797.5 L 363.5 797.5 Z M 932.5 644.5 L 960.5 644.5 L 960.5 799.5 L 932.5 799.5 Z M 1107.5 644.5 L 1135.5 644.5 L 1135.5 799.5 L 1107.5 799.5 Z M 1278.5 644.5 L 1306.5 644.5 L 1306.5 799.5 L 1278.5 799.5 Z M 1357.5 644.5 L 1385.5 644.5 L 1385.5 799.5 L 1357.5 799.5 Z M 1436.5 644.5 L 1464.5 644.5 L 1464.5 799.5 L 1436.5 799.5 Z M 1515.5 644.5 L 1543.5 644.5 L 1543.5 799.5 L 1515.5 799.5 Z M 1594.5 644.5 L 1622.5 644.5 L 1622.5 799.5 L 1594.5 799.5 Z M 695.5 644.5 L 723.5 644.5 L 723.5 799.5 L 695.5 799.5 Z M 853.5 644.5 L 881.5 644.5 L 881.5 799.5 L 853.5 799.5 Z M 774.5 644.5 L 802.5 644.5 L 802.5 799.5 L 774.5 799.5 Z M 774.5 644.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 353.5 273.5 L 380.5 273.5 L 380.5 504.5 L 353.5 504.5 Z M 432.5 273.5 L 459.5 273.5 L 459.5 504.5 L 432.5 504.5 Z M 590.5 273.5 L 617.5 273.5 L 617.5 504.5 L 590.5 504.5 Z M 1436.5 273.5 L 1464.5 273.5 L 1464.5 504.5 L 1436.5 504.5 Z M 1357.5 273.5 L 1385.5 273.5 L 1385.5 504.5 L 1357.5 504.5 Z M 1594.5 273.5 L 1622.5 273.5 L 1622.5 504.5 L 1594.5 504.5 Z M 920.5 273.5 L 947.5 273.5 L 947.5 504.5 L 920.5 504.5 Z M 1515.5 273.5 L 1543.5 273.5 L 1543.5 504.5 L 1515.5 504.5 Z M 841.5 273.5 L 868.5 273.5 L 868.5 504.5 L 841.5 504.5 Z M 748.5 273.5 L 775.5 273.5 L 775.5 504.5 L 748.5 504.5 Z M 669.5 273.5 L 696.5 273.5 L 696.5 504.5 L 669.5 504.5 Z M 511.5 273.5 L 538.5 273.5 L 538.5 504.5 L 511.5 504.5 Z M 1094.5 293.5 L 1122.5 293.5 L 1122.5 525.5 L 1094.5 525.5 Z M 1173.5 293.5 L 1201.5 293.5 L 1201.5 525.5 L 1173.5 525.5 Z M 1173.5 293.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface334">
+<g id="surface362">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 257.886719 535.042969 L 272 555.5 L 265.707031 555.5 L 254.824219 538.871094 L 243.882812 555.5 L 237.703125 555.5 L 251.816406 535.042969 L 238.578125 515.625 L 244.757812 515.625 L 254.988281 531.269531 L 265.269531 515.625 L 271.34375 515.625 Z M 257.886719 535.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 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/o311a/sky130_fd_sc_lp__o311a_lp.svg b/cells/o311a/sky130_fd_sc_lp__o311a_lp.svg
index 303677e..20238dd 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_lp.svg
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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="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="#image300"/>
+  <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="#image300"/>
+  <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 1215.5 660.5 L 1250.5 660.5 L 1250.5 757.5 L 1215.5 757.5 Z M 618.5 660.5 L 653.5 660.5 L 653.5 757.5 L 618.5 757.5 Z M 701.5 660.5 L 735.5 660.5 L 735.5 757.5 L 701.5 757.5 Z M 800.5 660.5 L 835.5 660.5 L 835.5 757.5 L 800.5 757.5 Z M 899.5 660.5 L 933.5 660.5 L 933.5 757.5 L 899.5 757.5 Z M 1034.5 660.5 L 1068.5 660.5 L 1068.5 757.5 L 1034.5 757.5 Z M 1133.5 660.5 L 1167.5 660.5 L 1167.5 757.5 L 1133.5 757.5 Z M 1133.5 660.5 "/>
 </clipPath>
-<image id="image301" 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="#image301"/>
+  <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 1244.5 209.5 L 1301.5 209.5 L 1301.5 438.5 L 1244.5 438.5 Z M 622.5 209.5 L 679.5 209.5 L 679.5 438.5 L 622.5 438.5 Z M 760.5 209.5 L 818.5 209.5 L 818.5 438.5 L 760.5 438.5 Z M 873.5 209.5 L 930.5 209.5 L 930.5 438.5 L 873.5 438.5 Z M 996.5 209.5 L 1054.5 209.5 L 1054.5 438.5 L 996.5 438.5 Z M 1120.5 209.5 L 1177.5 209.5 L 1177.5 438.5 L 1120.5 438.5 Z M 1120.5 209.5 "/>
 </clipPath>
-<image id="image302" 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="#image302"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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="#image303"/>
+  <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="surface297">
+<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 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/o311a/sky130_fd_sc_lp__o311a_m.svg b/cells/o311a/sky130_fd_sc_lp__o311a_m.svg
index f47945b..18969e6 100644
--- a/cells/o311a/sky130_fd_sc_lp__o311a_m.svg
+++ b/cells/o311a/sky130_fd_sc_lp__o311a_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image358" 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="#image358"/>
+  <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 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="#image358"/>
+  <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 1219.5 768.5 L 1253.5 768.5 L 1253.5 864.5 L 1219.5 864.5 Z M 675.5 768.5 L 710.5 768.5 L 710.5 864.5 L 675.5 864.5 Z M 774.5 768.5 L 808.5 768.5 L 808.5 864.5 L 774.5 864.5 Z M 873.5 768.5 L 907.5 768.5 L 907.5 864.5 L 873.5 864.5 Z M 971.5 768.5 L 1005.5 768.5 L 1005.5 864.5 L 971.5 864.5 Z M 1095.5 768.5 L 1129.5 768.5 L 1129.5 864.5 L 1095.5 864.5 Z M 1095.5 768.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <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 1193.5 367.5 L 1228.5 367.5 L 1228.5 463.5 L 1193.5 463.5 Z M 628.5 367.5 L 663.5 367.5 L 663.5 463.5 L 628.5 463.5 Z M 765.5 367.5 L 799.5 367.5 L 799.5 463.5 L 765.5 463.5 Z M 847.5 367.5 L 882.5 367.5 L 882.5 463.5 L 847.5 463.5 Z M 971.5 367.5 L 1005.5 367.5 L 1005.5 463.5 L 971.5 463.5 Z M 1095.5 367.5 L 1129.5 367.5 L 1129.5 463.5 L 1095.5 463.5 Z M 1095.5 367.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image361" 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="#image361"/>
+  <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="surface355">
+<g id="surface382">
 <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 581.824219 790.320312 L 599.191406 815.5 L 591.449219 815.5 L 578.050781 795.035156 L 564.589844 815.5 L 556.980469 815.5 L 574.351562 790.320312 L 558.058594 766.421875 L 565.664062 766.421875 L 578.253906 785.675781 L 590.910156 766.421875 L 598.382812 766.421875 Z M 581.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 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/o311ai/sky130_fd_sc_lp__o311ai_0.svg b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.svg
index d5cffca..d2d6d91 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_0.svg
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image352"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1162.5 767.5 L 1197.5 767.5 L 1197.5 863.5 L 1162.5 863.5 Z M 764.5 767.5 L 798.5 767.5 L 798.5 863.5 L 764.5 863.5 Z M 862.5 767.5 L 897.5 767.5 L 897.5 863.5 L 862.5 863.5 Z M 975.5 767.5 L 1009.5 767.5 L 1009.5 863.5 L 975.5 863.5 Z M 1073.5 767.5 L 1107.5 767.5 L 1107.5 863.5 L 1073.5 863.5 Z M 1073.5 767.5 "/>
 </clipPath>
-<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image353"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1162.5 237.5 L 1197.5 237.5 L 1197.5 384.5 L 1162.5 384.5 Z M 764.5 237.5 L 798.5 237.5 L 798.5 384.5 L 764.5 384.5 Z M 846.5 237.5 L 881.5 237.5 L 881.5 384.5 L 846.5 384.5 Z M 929.5 237.5 L 963.5 237.5 L 963.5 384.5 L 929.5 384.5 Z M 1041.5 237.5 L 1075.5 237.5 L 1075.5 384.5 L 1041.5 384.5 Z M 1041.5 237.5 "/>
 </clipPath>
-<image id="image354" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image354"/>
+  <use xlink:href="#image381"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image355" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image355"/>
+  <use xlink:href="#image382"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface349">
+<g id="surface376">
 <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 1296.554688 457.246094 L 1296.554688 476.5 L 1290.292969 476.5 L 1290.292969 457.246094 L 1271.375 427.421875 L 1279.117188 427.421875 L 1293.523438 451.320312 L 1307.527344 427.421875 L 1315 427.421875 Z M 1296.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 1272 647 L 1311 647 M 1272 608 L 1311 608 M 1272 608 L 1272 647 M 1311 608 L 1311 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 1272 647 L 1311 647 M 1272 608 L 1311 608 M 1311 647 L 1311 608 M 1272 647 L 1272 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/o311ai/sky130_fd_sc_lp__o311ai_1.svg b/cells/o311ai/sky130_fd_sc_lp__o311ai_1.svg
index a5079d7..1c9e25a 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_1.svg
+++ b/cells/o311ai/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.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="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="#image334"/>
+  <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 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="#image334"/>
+  <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 1215.5 672.5 L 1250.5 672.5 L 1250.5 864.5 L 1215.5 864.5 Z M 741.5 672.5 L 775.5 672.5 L 775.5 864.5 L 741.5 864.5 Z M 839.5 672.5 L 874.5 672.5 L 874.5 864.5 L 839.5 864.5 Z M 956.5 672.5 L 991.5 672.5 L 991.5 864.5 L 956.5 864.5 Z M 1133.5 672.5 L 1167.5 672.5 L 1167.5 864.5 L 1133.5 864.5 Z M 1133.5 672.5 "/>
 </clipPath>
-<image id="image335" 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="#image335"/>
+  <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 1215.5 209.5 L 1250.5 209.5 L 1250.5 498.5 L 1215.5 498.5 Z M 741.5 209.5 L 775.5 209.5 L 775.5 498.5 L 741.5 498.5 Z M 842.5 209.5 L 876.5 209.5 L 876.5 498.5 L 842.5 498.5 Z M 947.5 209.5 L 981.5 209.5 L 981.5 498.5 L 947.5 498.5 Z M 1071.5 209.5 L 1105.5 209.5 L 1105.5 498.5 L 1071.5 498.5 Z M 1071.5 209.5 "/>
 </clipPath>
-<image id="image336" 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="#image336"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image337" 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="#image337"/>
+  <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="surface331">
+<g id="surface358">
 <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 861.703125 445.332031 L 862.242188 440.28125 L 863.652344 436.175781 L 865.875 432.941406 L 868.90625 430.652344 L 872.742188 429.242188 L 877.457031 428.769531 L 879.609375 428.902344 L 881.695312 429.242188 L 883.648438 429.777344 L 885.398438 430.585938 L 887.015625 431.597656 L 888.5625 432.742188 L 889.773438 434.15625 L 890.851562 435.636719 L 891.660156 437.25 L 892.265625 438.933594 L 892.601562 440.820312 L 892.738281 442.773438 L 892.46875 445.53125 L 891.726562 448.089844 L 890.449219 450.445312 L 888.699219 452.667969 L 886.410156 454.753906 L 883.648438 456.574219 L 882.640625 457.179688 L 875.90625 460.8125 L 874.15625 461.824219 L 872.609375 462.832031 L 871.261719 463.84375 L 870.183594 464.851562 L 869.242188 465.863281 L 868.570312 466.875 L 868.230469 467.480469 L 867.960938 468.015625 L 867.761719 468.691406 L 867.558594 469.296875 L 867.355469 469.96875 L 867.289062 470.644531 L 892.402344 470.644531 L 892.402344 476.5 L 860.625 476.5 L 860.757812 474.144531 L 861.097656 471.988281 L 861.5 469.96875 L 862.039062 468.21875 L 862.644531 466.535156 L 863.386719 465.054688 L 864.191406 463.777344 L 865.203125 462.496094 L 866.414062 461.21875 L 867.761719 460.007812 L 869.308594 458.792969 L 871.125 457.582031 L 871.53125 457.3125 L 872.003906 457.042969 L 872.472656 456.707031 L 872.945312 456.4375 L 873.484375 456.167969 L 874.023438 455.832031 L 880.214844 452.332031 L 882.167969 451.050781 L 883.785156 449.640625 L 885.0625 448.15625 L 885.9375 446.542969 L 886.476562 444.792969 L 886.679688 442.90625 L 886.542969 441.628906 L 886.339844 440.347656 L 885.871094 439.203125 L 885.332031 438.125 L 884.523438 437.183594 L 883.648438 436.242188 L 882.707031 435.570312 L 881.765625 434.960938 L 880.6875 434.558594 L 879.609375 434.222656 L 878.464844 434.019531 L 877.253906 433.953125 L 874.628906 434.289062 L 872.40625 435.097656 L 870.589844 436.511719 L 869.242188 438.464844 L 868.300781 441.023438 L 867.761719 444.050781 L 867.695312 444.320312 L 867.695312 444.722656 L 867.625 444.925781 L 867.625 445.332031 Z M 861.703125 445.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 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 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_lp__o311ai_2.svg b/cells/o311ai/sky130_fd_sc_lp__o311ai_2.svg
index 968ed0c..4350b1a 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_2.svg
+++ b/cells/o311ai/sky130_fd_sc_lp__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 539.5 L 256.5 539.5 Z M 256.5 111.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <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 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="#image332"/>
+  <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 1494.5 647.5 L 1528.5 647.5 L 1528.5 839.5 L 1494.5 839.5 Z M 1395.5 647.5 L 1429.5 647.5 L 1429.5 839.5 L 1395.5 839.5 Z M 499.5 672.5 L 533.5 672.5 L 533.5 864.5 L 499.5 864.5 Z M 1177.5 672.5 L 1212.5 672.5 L 1212.5 864.5 L 1177.5 864.5 Z M 1079.5 672.5 L 1113.5 672.5 L 1113.5 864.5 L 1079.5 864.5 Z M 980.5 672.5 L 1015.5 672.5 L 1015.5 864.5 L 980.5 864.5 Z M 804.5 672.5 L 838.5 672.5 L 838.5 864.5 L 804.5 864.5 Z M 696.5 672.5 L 730.5 672.5 L 730.5 864.5 L 696.5 864.5 Z M 400.5 672.5 L 435.5 672.5 L 435.5 864.5 L 400.5 864.5 Z M 598.5 672.5 L 632.5 672.5 L 632.5 864.5 L 598.5 864.5 Z M 598.5 672.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <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 1494.5 209.5 L 1528.5 209.5 L 1528.5 498.5 L 1494.5 498.5 Z M 400.5 209.5 L 435.5 209.5 L 435.5 498.5 L 400.5 498.5 Z M 499.5 209.5 L 533.5 209.5 L 533.5 498.5 L 499.5 498.5 Z M 598.5 209.5 L 632.5 209.5 L 632.5 498.5 L 598.5 498.5 Z M 696.5 209.5 L 730.5 209.5 L 730.5 498.5 L 696.5 498.5 Z M 914.5 209.5 L 948.5 209.5 L 948.5 498.5 L 914.5 498.5 Z M 1012.5 209.5 L 1047.5 209.5 L 1047.5 498.5 L 1012.5 498.5 Z M 1111.5 209.5 L 1145.5 209.5 L 1145.5 498.5 L 1111.5 498.5 Z M 1297.5 209.5 L 1331.5 209.5 L 1331.5 498.5 L 1297.5 498.5 Z M 1395.5 209.5 L 1429.5 209.5 L 1429.5 498.5 L 1395.5 498.5 Z M 1395.5 209.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image335" 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="#image335"/>
+  <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="surface329">
+<g id="surface357">
 <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 583.703125 615.332031 L 584.242188 610.28125 L 585.652344 606.175781 L 587.875 602.941406 L 590.90625 600.652344 L 594.742188 599.242188 L 599.457031 598.769531 L 601.609375 598.902344 L 603.695312 599.242188 L 605.648438 599.777344 L 607.398438 600.585938 L 609.015625 601.597656 L 610.5625 602.742188 L 611.773438 604.15625 L 612.851562 605.636719 L 613.660156 607.25 L 614.265625 608.933594 L 614.601562 610.820312 L 614.738281 612.773438 L 614.46875 615.53125 L 613.726562 618.089844 L 612.449219 620.445312 L 610.699219 622.667969 L 608.410156 624.753906 L 605.648438 626.574219 L 604.640625 627.179688 L 597.90625 630.8125 L 596.15625 631.824219 L 594.609375 632.832031 L 593.261719 633.84375 L 592.183594 634.851562 L 591.242188 635.863281 L 590.570312 636.875 L 590.230469 637.480469 L 589.960938 638.015625 L 589.761719 638.691406 L 589.558594 639.296875 L 589.355469 639.96875 L 589.289062 640.644531 L 614.402344 640.644531 L 614.402344 646.5 L 582.625 646.5 L 582.757812 644.144531 L 583.097656 641.988281 L 583.5 639.96875 L 584.039062 638.21875 L 584.644531 636.535156 L 585.386719 635.054688 L 586.191406 633.777344 L 587.203125 632.496094 L 588.414062 631.21875 L 589.761719 630.007812 L 591.308594 628.792969 L 593.125 627.582031 L 593.53125 627.3125 L 594.003906 627.042969 L 594.472656 626.707031 L 594.945312 626.4375 L 595.484375 626.167969 L 596.023438 625.832031 L 602.214844 622.332031 L 604.167969 621.050781 L 605.785156 619.640625 L 607.0625 618.15625 L 607.9375 616.542969 L 608.476562 614.792969 L 608.679688 612.90625 L 608.542969 611.628906 L 608.339844 610.347656 L 607.871094 609.203125 L 607.332031 608.125 L 606.523438 607.183594 L 605.648438 606.242188 L 604.707031 605.570312 L 603.765625 604.960938 L 602.6875 604.558594 L 601.609375 604.222656 L 600.464844 604.019531 L 599.253906 603.953125 L 596.628906 604.289062 L 594.40625 605.097656 L 592.589844 606.511719 L 591.242188 608.464844 L 590.300781 611.023438 L 589.761719 614.050781 L 589.695312 614.320312 L 589.695312 614.722656 L 589.625 614.925781 L 589.625 615.332031 Z M 583.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 555 477 L 594 477 M 555 438 L 594 438 M 555 438 L 555 477 M 594 438 L 594 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 555 477 L 594 477 M 555 438 L 594 438 M 594 477 L 594 438 M 555 477 L 555 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/o311ai/sky130_fd_sc_lp__o311ai_4.svg b/cells/o311ai/sky130_fd_sc_lp__o311ai_4.svg
index 0389904..80a696c 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_4.svg
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_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="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image395"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1614.5 610.5 L 1636.5 610.5 L 1636.5 736.5 L 1614.5 736.5 Z M 1539.5 610.5 L 1561.5 610.5 L 1561.5 736.5 L 1539.5 736.5 Z M 1389.5 610.5 L 1411.5 610.5 L 1411.5 736.5 L 1389.5 736.5 Z M 1120.5 610.5 L 1143.5 610.5 L 1143.5 736.5 L 1120.5 736.5 Z M 1323.5 610.5 L 1345.5 610.5 L 1345.5 736.5 L 1323.5 736.5 Z M 1471.5 610.5 L 1494.5 610.5 L 1494.5 736.5 L 1471.5 736.5 Z M 1249.5 610.5 L 1272.5 610.5 L 1272.5 736.5 L 1249.5 736.5 Z M 1185.5 610.5 L 1207.5 610.5 L 1207.5 736.5 L 1185.5 736.5 Z M 717.5 623.5 L 739.5 623.5 L 739.5 749.5 L 717.5 749.5 Z M 781.5 623.5 L 804.5 623.5 L 804.5 749.5 L 781.5 749.5 Z M 846.5 623.5 L 868.5 623.5 L 868.5 749.5 L 846.5 749.5 Z M 910.5 623.5 L 933.5 623.5 L 933.5 749.5 L 910.5 749.5 Z M 975.5 623.5 L 997.5 623.5 L 997.5 749.5 L 975.5 749.5 Z M 265.5 623.5 L 288.5 623.5 L 288.5 749.5 L 265.5 749.5 Z M 588.5 623.5 L 610.5 623.5 L 610.5 749.5 L 588.5 749.5 Z M 523.5 623.5 L 546.5 623.5 L 546.5 749.5 L 523.5 749.5 Z M 394.5 623.5 L 417.5 623.5 L 417.5 749.5 L 394.5 749.5 Z M 330.5 623.5 L 352.5 623.5 L 352.5 749.5 L 330.5 749.5 Z M 652.5 623.5 L 675.5 623.5 L 675.5 749.5 L 652.5 749.5 Z M 459.5 623.5 L 481.5 623.5 L 481.5 749.5 L 459.5 749.5 Z M 459.5 623.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image396"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1570.5 320.5 L 1593.5 320.5 L 1593.5 509.5 L 1570.5 509.5 Z M 265.5 320.5 L 288.5 320.5 L 288.5 509.5 L 265.5 509.5 Z M 330.5 320.5 L 352.5 320.5 L 352.5 509.5 L 330.5 509.5 Z M 394.5 320.5 L 417.5 320.5 L 417.5 509.5 L 394.5 509.5 Z M 459.5 320.5 L 481.5 320.5 L 481.5 509.5 L 459.5 509.5 Z M 523.5 320.5 L 546.5 320.5 L 546.5 509.5 L 523.5 509.5 Z M 588.5 320.5 L 610.5 320.5 L 610.5 509.5 L 588.5 509.5 Z M 652.5 320.5 L 675.5 320.5 L 675.5 509.5 L 652.5 509.5 Z M 717.5 320.5 L 739.5 320.5 L 739.5 509.5 L 717.5 509.5 Z M 861.5 320.5 L 883.5 320.5 L 883.5 509.5 L 861.5 509.5 Z M 925.5 320.5 L 948.5 320.5 L 948.5 509.5 L 925.5 509.5 Z M 990.5 320.5 L 1012.5 320.5 L 1012.5 509.5 L 990.5 509.5 Z M 1054.5 320.5 L 1077.5 320.5 L 1077.5 509.5 L 1054.5 509.5 Z M 1119.5 320.5 L 1141.5 320.5 L 1141.5 509.5 L 1119.5 509.5 Z M 1183.5 320.5 L 1206.5 320.5 L 1206.5 509.5 L 1183.5 509.5 Z M 1248.5 320.5 L 1270.5 320.5 L 1270.5 509.5 L 1248.5 509.5 Z M 1312.5 320.5 L 1335.5 320.5 L 1335.5 509.5 L 1312.5 509.5 Z M 1377.5 320.5 L 1399.5 320.5 L 1399.5 509.5 L 1377.5 509.5 Z M 1441.5 320.5 L 1464.5 320.5 L 1464.5 509.5 L 1441.5 509.5 Z M 1506.5 320.5 L 1528.5 320.5 L 1528.5 509.5 L 1506.5 509.5 Z M 1506.5 320.5 "/>
 </clipPath>
-<image id="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface392">
+<g id="surface420">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1106.324219 483.066406 L 1106.324219 495.5 L 1102.28125 495.5 L 1102.28125 483.066406 L 1090.066406 463.804688 L 1095.066406 463.804688 L 1104.371094 479.238281 L 1113.414062 463.804688 L 1118.238281 463.804688 Z M 1106.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 1090 612 L 1116 612 M 1090 587 L 1116 587 M 1090 587 L 1090 612 M 1116 587 L 1116 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 1090 612 L 1116 612 M 1090 587 L 1116 587 M 1116 612 L 1116 587 M 1090 612 L 1090 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/o311ai/sky130_fd_sc_lp__o311ai_lp.svg b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.svg
index 6a7773a..492f8ea 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.svg
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="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="#image340"/>
+  <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 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="#image340"/>
+  <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 1143.5 652.5 L 1177.5 652.5 L 1177.5 749.5 L 1143.5 749.5 Z M 673.5 652.5 L 708.5 652.5 L 708.5 749.5 L 673.5 749.5 Z M 779.5 652.5 L 813.5 652.5 L 813.5 749.5 L 779.5 749.5 Z M 925.5 652.5 L 960.5 652.5 L 960.5 749.5 L 925.5 749.5 Z M 1060.5 652.5 L 1095.5 652.5 L 1095.5 749.5 L 1060.5 749.5 Z M 1060.5 652.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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 1150.5 209.5 L 1207.5 209.5 L 1207.5 438.5 L 1150.5 438.5 Z M 673.5 209.5 L 730.5 209.5 L 730.5 438.5 L 673.5 438.5 Z M 785.5 209.5 L 843.5 209.5 L 843.5 438.5 L 785.5 438.5 Z M 902.5 209.5 L 960.5 209.5 L 960.5 438.5 L 902.5 438.5 Z M 1024.5 209.5 L 1081.5 209.5 L 1081.5 438.5 L 1024.5 438.5 Z M 1024.5 209.5 "/>
 </clipPath>
-<image id="image342" 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="#image342"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image343" 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="#image343"/>
+  <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="surface337">
+<g id="surface364">
 <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 660.773438 527.503906 L 650.203125 527.503906 L 650.203125 523.261719 L 652.019531 523.058594 L 653.636719 522.789062 L 655.050781 522.453125 L 656.261719 522.183594 L 657.269531 521.847656 L 658.148438 521.445312 L 658.820312 521.039062 L 659.425781 520.570312 L 659.964844 520.03125 L 660.503906 519.355469 L 660.972656 518.617188 L 661.445312 517.742188 L 661.648438 517.269531 L 661.847656 516.730469 L 662.050781 516.125 L 662.320312 515.386719 L 662.523438 514.644531 L 662.792969 513.769531 L 666.695312 513.769531 L 666.695312 561.5 L 660.773438 561.5 Z M 660.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 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/o311ai/sky130_fd_sc_lp__o311ai_m.svg b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.svg
index e008ad0..80f53fc 100644
--- a/cells/o311ai/sky130_fd_sc_lp__o311ai_m.svg
+++ b/cells/o311ai/sky130_fd_sc_lp__o311ai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image350" 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="#image350"/>
+  <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 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="#image350"/>
+  <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 1133.5 728.5 L 1167.5 728.5 L 1167.5 824.5 L 1133.5 824.5 Z M 755.5 728.5 L 789.5 728.5 L 789.5 824.5 L 755.5 824.5 Z M 853.5 728.5 L 887.5 728.5 L 887.5 824.5 L 853.5 824.5 Z M 952.5 728.5 L 986.5 728.5 L 986.5 824.5 L 952.5 824.5 Z M 1050.5 728.5 L 1085.5 728.5 L 1085.5 824.5 L 1050.5 824.5 Z M 1050.5 728.5 "/>
 </clipPath>
-<image id="image351" 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="#image351"/>
+  <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 1167.5 360.5 L 1201.5 360.5 L 1201.5 456.5 L 1167.5 456.5 Z M 768.5 360.5 L 803.5 360.5 L 803.5 456.5 L 768.5 456.5 Z M 851.5 360.5 L 885.5 360.5 L 885.5 456.5 L 851.5 456.5 Z M 933.5 360.5 L 968.5 360.5 L 968.5 456.5 L 933.5 456.5 Z M 1032.5 360.5 L 1066.5 360.5 L 1066.5 456.5 L 1032.5 456.5 Z M 1032.5 360.5 "/>
 </clipPath>
-<image id="image352" 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="#image352"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image353" 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="#image353"/>
+  <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="surface347">
+<g id="surface374">
 <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 1269.476562 526.953125 L 1258.90625 526.953125 L 1258.90625 522.714844 L 1260.722656 522.511719 L 1262.339844 522.242188 L 1263.753906 521.90625 L 1264.964844 521.636719 L 1265.972656 521.300781 L 1266.847656 520.894531 L 1267.523438 520.492188 L 1268.128906 520.019531 L 1268.667969 519.480469 L 1269.207031 518.808594 L 1269.675781 518.066406 L 1270.148438 517.191406 L 1270.351562 516.722656 L 1270.550781 516.183594 L 1270.753906 515.578125 L 1271.023438 514.835938 L 1271.226562 514.097656 L 1271.496094 513.222656 L 1275.398438 513.222656 L 1275.398438 560.953125 L 1269.476562 560.953125 Z M 1269.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 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/o31a/sky130_fd_sc_lp__o31a_0.svg b/cells/o31a/sky130_fd_sc_lp__o31a_0.svg
index d4f8c20..36041ce 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_0.svg
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image339"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1175.5 759.5 L 1209.5 759.5 L 1209.5 855.5 L 1175.5 855.5 Z M 721.5 759.5 L 756.5 759.5 L 756.5 855.5 L 721.5 855.5 Z M 852.5 759.5 L 886.5 759.5 L 886.5 855.5 L 852.5 855.5 Z M 969.5 759.5 L 1003.5 759.5 L 1003.5 855.5 L 969.5 855.5 Z M 1077.5 759.5 L 1111.5 759.5 L 1111.5 855.5 L 1077.5 855.5 Z M 1077.5 759.5 "/>
 </clipPath>
-<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1141.5 220.5 L 1175.5 220.5 L 1175.5 367.5 L 1141.5 367.5 Z M 716.5 220.5 L 750.5 220.5 L 750.5 367.5 L 716.5 367.5 Z M 852.5 220.5 L 886.5 220.5 L 886.5 367.5 L 852.5 367.5 Z M 948.5 220.5 L 983.5 220.5 L 983.5 367.5 L 948.5 367.5 Z M 1031.5 220.5 L 1065.5 220.5 L 1065.5 367.5 L 1031.5 367.5 Z M 1031.5 220.5 "/>
 </clipPath>
-<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image341"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image369" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image342"/>
+  <use xlink:href="#image369"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface336">
+<g id="surface363">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1096.511719 518.40625 L 1094.292969 518.605469 L 1092.40625 519.078125 L 1090.859375 519.886719 L 1089.578125 521.03125 L 1088.636719 522.511719 L 1087.960938 524.328125 L 1087.761719 524.933594 L 1087.625 525.609375 L 1087.558594 526.28125 L 1087.492188 527.089844 L 1087.425781 527.828125 L 1087.425781 528.636719 L 1081.5 528.636719 L 1081.769531 524.867188 L 1082.644531 521.636719 L 1083.921875 518.941406 L 1085.808594 516.722656 L 1088.097656 515.039062 L 1090.992188 513.894531 L 1091.800781 513.691406 L 1092.675781 513.558594 L 1093.550781 513.421875 L 1095.433594 513.289062 L 1096.445312 513.222656 L 1098.9375 513.355469 L 1101.292969 513.757812 L 1103.378906 514.433594 L 1105.265625 515.308594 L 1106.878906 516.519531 L 1108.292969 517.933594 L 1109.101562 519.144531 L 1109.773438 520.355469 L 1110.3125 521.703125 L 1110.648438 523.183594 L 1110.851562 524.734375 L 1110.988281 526.347656 L 1110.785156 528.703125 L 1110.246094 530.722656 L 1109.304688 532.476562 L 1108.023438 534.023438 L 1106.339844 535.300781 L 1104.320312 536.246094 L 1106.003906 536.917969 L 1107.484375 537.726562 L 1108.765625 538.601562 L 1109.84375 539.609375 L 1110.71875 540.753906 L 1111.390625 541.96875 L 1111.660156 542.773438 L 1111.929688 543.648438 L 1112.132812 544.59375 L 1112.265625 545.535156 L 1112.332031 546.542969 L 1112.402344 547.621094 L 1112.265625 549.910156 L 1111.863281 551.996094 L 1111.1875 553.882812 L 1110.3125 555.699219 L 1109.167969 557.316406 L 1107.753906 558.730469 L 1106.207031 559.875 L 1104.523438 560.816406 L 1102.707031 561.488281 L 1100.6875 562.027344 L 1098.53125 562.367188 L 1096.242188 562.5 L 1092.609375 562.230469 L 1089.511719 561.421875 L 1086.820312 560.210938 L 1084.597656 558.394531 L 1082.847656 556.105469 L 1081.632812 553.277344 L 1081.296875 552.402344 L 1081.097656 551.390625 L 1080.894531 550.382812 L 1080.691406 549.371094 L 1080.558594 548.296875 L 1080.488281 547.082031 L 1086.414062 547.082031 L 1086.683594 549.507812 L 1087.222656 551.59375 L 1088.03125 553.34375 L 1089.105469 554.757812 L 1090.453125 555.902344 L 1092.136719 556.644531 L 1092.742188 556.84375 L 1093.414062 556.980469 L 1094.089844 557.113281 L 1094.828125 557.179688 L 1095.570312 557.25 L 1096.445312 557.25 L 1098.261719 557.179688 L 1099.945312 556.84375 L 1101.425781 556.304688 L 1102.773438 555.566406 L 1103.917969 554.554688 L 1104.859375 553.34375 L 1105.265625 552.605469 L 1105.667969 551.730469 L 1105.9375 550.785156 L 1106.140625 549.84375 L 1106.273438 548.832031 L 1106.339844 547.6875 L 1106.070312 545.265625 L 1105.398438 543.246094 L 1104.253906 541.5625 L 1102.640625 540.351562 L 1100.550781 539.542969 L 1097.992188 539.070312 L 1096.648438 539.070312 L 1096.445312 539.003906 L 1093.953125 539.070312 L 1093.214844 539.070312 L 1093.214844 534.023438 L 1095.234375 533.957031 L 1097.050781 533.820312 L 1098.667969 533.621094 L 1100.011719 533.351562 L 1101.15625 533.011719 L 1102.167969 532.542969 L 1102.976562 531.9375 L 1103.648438 531.128906 L 1104.1875 530.253906 L 1104.589844 529.175781 L 1104.792969 527.964844 L 1104.929688 526.550781 L 1104.792969 525.070312 L 1104.523438 523.65625 L 1104.050781 522.445312 L 1103.378906 521.367188 L 1102.503906 520.425781 L 1101.425781 519.617188 L 1100.6875 519.28125 L 1099.878906 518.941406 L 1099.136719 518.742188 L 1098.261719 518.539062 Z M 1096.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 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/o31a/sky130_fd_sc_lp__o31a_1.svg b/cells/o31a/sky130_fd_sc_lp__o31a_1.svg
index 00fac24..cfd07b1 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_1.svg
+++ b/cells/o31a/sky130_fd_sc_lp__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 539.5 L 533.5 539.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="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image315"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#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 1188.5 670.5 L 1222.5 670.5 L 1222.5 862.5 L 1188.5 862.5 Z M 675.5 670.5 L 710.5 670.5 L 710.5 862.5 L 675.5 862.5 Z M 858.5 670.5 L 892.5 670.5 L 892.5 862.5 L 858.5 862.5 Z M 962.5 670.5 L 996.5 670.5 L 996.5 862.5 L 962.5 862.5 Z M 1089.5 670.5 L 1123.5 670.5 L 1123.5 862.5 L 1089.5 862.5 Z M 1089.5 670.5 "/>
 </clipPath>
-<image id="image316" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image343" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image316"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1188.5 209.5 L 1222.5 209.5 L 1222.5 498.5 L 1188.5 498.5 Z M 675.5 209.5 L 710.5 209.5 L 710.5 498.5 L 675.5 498.5 Z M 858.5 209.5 L 892.5 209.5 L 892.5 498.5 L 858.5 498.5 Z M 963.5 209.5 L 997.5 209.5 L 997.5 498.5 L 963.5 498.5 Z M 1064.5 209.5 L 1098.5 209.5 L 1098.5 498.5 L 1064.5 498.5 Z M 1064.5 209.5 "/>
 </clipPath>
-<image id="image317" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image317"/>
+  <use xlink:href="#image344"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image345"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface312">
+<g id="surface339">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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_lp__o31a_2.svg b/cells/o31a/sky130_fd_sc_lp__o31a_2.svg
index 1dd7f54..fc491d6 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_2.svg
+++ b/cells/o31a/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.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="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 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="#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 1224.5 672.5 L 1259.5 672.5 L 1259.5 864.5 L 1224.5 864.5 Z M 619.5 672.5 L 654.5 672.5 L 654.5 864.5 L 619.5 864.5 Z M 718.5 672.5 L 752.5 672.5 L 752.5 864.5 L 718.5 864.5 Z M 894.5 672.5 L 929.5 672.5 L 929.5 864.5 L 894.5 864.5 Z M 1011.5 672.5 L 1046.5 672.5 L 1046.5 864.5 L 1011.5 864.5 Z M 1110.5 672.5 L 1144.5 672.5 L 1144.5 864.5 L 1110.5 864.5 Z M 1110.5 672.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 1224.5 209.5 L 1259.5 209.5 L 1259.5 498.5 L 1224.5 498.5 Z M 627.5 209.5 L 662.5 209.5 L 662.5 498.5 L 627.5 498.5 Z M 726.5 209.5 L 760.5 209.5 L 760.5 498.5 L 726.5 498.5 Z M 894.5 209.5 L 929.5 209.5 L 929.5 498.5 L 894.5 498.5 Z M 977.5 209.5 L 1011.5 209.5 L 1011.5 498.5 L 977.5 498.5 Z M 1101.5 209.5 L 1135.5 209.5 L 1135.5 498.5 L 1101.5 498.5 Z M 1101.5 209.5 "/>
 </clipPath>
-<image id="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image376"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface343">
+<g id="surface371">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -195,6 +195,5 @@
 <path style=" 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/o31a/sky130_fd_sc_lp__o31a_4.svg b/cells/o31a/sky130_fd_sc_lp__o31a_4.svg
index 39d8e43..bb67b4c 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_4.svg
+++ b/cells/o31a/sky130_fd_sc_lp__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 539.5 L 174.5 539.5 Z M 174.5 127.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 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="#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 1580.5 647.5 L 1613.5 647.5 L 1613.5 832.5 L 1580.5 832.5 Z M 1390.5 647.5 L 1423.5 647.5 L 1423.5 832.5 L 1390.5 832.5 Z M 1165.5 647.5 L 1198.5 647.5 L 1198.5 832.5 L 1165.5 832.5 Z M 1260.5 647.5 L 1293.5 647.5 L 1293.5 832.5 L 1260.5 832.5 Z M 880.5 647.5 L 913.5 647.5 L 913.5 832.5 L 880.5 832.5 Z M 1485.5 647.5 L 1518.5 647.5 L 1518.5 832.5 L 1485.5 832.5 Z M 1070.5 647.5 L 1103.5 647.5 L 1103.5 832.5 L 1070.5 832.5 Z M 975.5 647.5 L 1008.5 647.5 L 1008.5 832.5 L 975.5 832.5 Z M 423.5 665.5 L 456.5 665.5 L 456.5 850.5 L 423.5 850.5 Z M 518.5 665.5 L 551.5 665.5 L 551.5 850.5 L 518.5 850.5 Z M 328.5 665.5 L 361.5 665.5 L 361.5 850.5 L 328.5 850.5 Z M 613.5 665.5 L 646.5 665.5 L 646.5 850.5 L 613.5 850.5 Z M 613.5 665.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 1580.5 220.5 L 1613.5 220.5 L 1613.5 499.5 L 1580.5 499.5 Z M 378.5 220.5 L 411.5 220.5 L 411.5 499.5 L 378.5 499.5 Z M 473.5 220.5 L 506.5 220.5 L 506.5 499.5 L 473.5 499.5 Z M 568.5 220.5 L 601.5 220.5 L 601.5 499.5 L 568.5 499.5 Z M 663.5 220.5 L 696.5 220.5 L 696.5 499.5 L 663.5 499.5 Z M 758.5 220.5 L 791.5 220.5 L 791.5 499.5 L 758.5 499.5 Z M 853.5 220.5 L 886.5 220.5 L 886.5 499.5 L 853.5 499.5 Z M 1070.5 220.5 L 1103.5 220.5 L 1103.5 499.5 L 1070.5 499.5 Z M 1165.5 220.5 L 1198.5 220.5 L 1198.5 499.5 L 1165.5 499.5 Z M 1260.5 220.5 L 1293.5 220.5 L 1293.5 499.5 L 1260.5 499.5 Z M 1390.5 220.5 L 1423.5 220.5 L 1423.5 499.5 L 1390.5 499.5 Z M 1485.5 220.5 L 1518.5 220.5 L 1518.5 499.5 L 1485.5 499.5 Z M 1485.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1338.695312 530.628906 L 1339.210938 525.789062 L 1340.566406 521.855469 L 1342.695312 518.757812 L 1345.597656 516.566406 L 1349.273438 515.210938 L 1353.789062 514.757812 L 1355.855469 514.886719 L 1357.855469 515.210938 L 1359.726562 515.726562 L 1361.402344 516.5 L 1362.953125 517.46875 L 1364.433594 518.566406 L 1365.597656 519.917969 L 1366.628906 521.339844 L 1367.402344 522.886719 L 1367.984375 524.5 L 1368.304688 526.304688 L 1368.433594 528.175781 L 1368.175781 530.824219 L 1367.46875 533.273438 L 1366.242188 535.53125 L 1364.566406 537.660156 L 1362.371094 539.660156 L 1359.726562 541.402344 L 1358.757812 541.984375 L 1352.304688 545.46875 L 1350.628906 546.433594 L 1349.144531 547.402344 L 1347.855469 548.371094 L 1346.824219 549.339844 L 1345.917969 550.304688 L 1345.273438 551.273438 L 1344.953125 551.855469 L 1344.695312 552.371094 L 1344.5 553.015625 L 1344.304688 553.597656 L 1344.113281 554.242188 L 1344.046875 554.886719 L 1368.113281 554.886719 L 1368.113281 560.5 L 1337.660156 560.5 L 1337.789062 558.242188 L 1338.113281 556.175781 L 1338.5 554.242188 L 1339.015625 552.566406 L 1339.597656 550.953125 L 1340.304688 549.53125 L 1341.082031 548.304688 L 1342.046875 547.082031 L 1343.210938 545.855469 L 1344.5 544.695312 L 1345.984375 543.53125 L 1347.726562 542.371094 L 1348.113281 542.113281 L 1348.566406 541.855469 L 1349.015625 541.53125 L 1349.46875 541.273438 L 1349.984375 541.015625 L 1350.5 540.695312 L 1356.433594 537.339844 L 1358.304688 536.113281 L 1359.855469 534.757812 L 1361.082031 533.339844 L 1361.917969 531.789062 L 1362.433594 530.113281 L 1362.628906 528.304688 L 1362.5 527.082031 L 1362.304688 525.855469 L 1361.855469 524.757812 L 1361.339844 523.726562 L 1360.566406 522.824219 L 1359.726562 521.917969 L 1358.824219 521.273438 L 1357.917969 520.695312 L 1356.886719 520.304688 L 1355.855469 519.984375 L 1354.757812 519.789062 L 1353.597656 519.726562 L 1351.082031 520.046875 L 1348.953125 520.824219 L 1347.210938 522.175781 L 1345.917969 524.046875 L 1345.015625 526.5 L 1344.5 529.402344 L 1344.433594 529.660156 L 1344.433594 530.046875 L 1344.371094 530.242188 L 1344.371094 530.628906 Z M 1338.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 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/o31a/sky130_fd_sc_lp__o31a_lp.svg b/cells/o31a/sky130_fd_sc_lp__o31a_lp.svg
index f4448da..8e3249c 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_lp.svg
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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 1216.5 757.5 L 1251.5 757.5 L 1251.5 853.5 L 1216.5 853.5 Z M 703.5 757.5 L 737.5 757.5 L 737.5 853.5 L 703.5 853.5 Z M 808.5 757.5 L 843.5 757.5 L 843.5 853.5 L 808.5 853.5 Z M 937.5 757.5 L 971.5 757.5 L 971.5 853.5 L 937.5 853.5 Z M 1035.5 757.5 L 1070.5 757.5 L 1070.5 853.5 L 1035.5 853.5 Z M 1134.5 757.5 L 1168.5 757.5 L 1168.5 853.5 L 1134.5 853.5 Z M 1134.5 757.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 1177.5 219.5 L 1235.5 219.5 L 1235.5 448.5 L 1177.5 448.5 Z M 691.5 219.5 L 749.5 219.5 L 749.5 448.5 L 691.5 448.5 Z M 813.5 219.5 L 870.5 219.5 L 870.5 448.5 L 813.5 448.5 Z M 932.5 219.5 L 989.5 219.5 L 989.5 448.5 L 932.5 448.5 Z M 1056.5 219.5 L 1113.5 219.5 L 1113.5 448.5 L 1056.5 448.5 Z M 1056.5 219.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 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/o31a/sky130_fd_sc_lp__o31a_m.svg b/cells/o31a/sky130_fd_sc_lp__o31a_m.svg
index b8c3366..57807cd 100644
--- a/cells/o31a/sky130_fd_sc_lp__o31a_m.svg
+++ b/cells/o31a/sky130_fd_sc_lp__o31a_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="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="#image328"/>
+  <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 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="#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 1146.5 768.5 L 1181.5 768.5 L 1181.5 864.5 L 1146.5 864.5 Z M 718.5 768.5 L 752.5 768.5 L 752.5 864.5 L 718.5 864.5 Z M 816.5 768.5 L 851.5 768.5 L 851.5 864.5 L 816.5 864.5 Z M 915.5 768.5 L 949.5 768.5 L 949.5 864.5 L 915.5 864.5 Z M 1035.5 768.5 L 1070.5 768.5 L 1070.5 864.5 L 1035.5 864.5 Z M 1035.5 768.5 "/>
 </clipPath>
-<image id="image329" 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="#image329"/>
+  <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 1146.5 367.5 L 1181.5 367.5 L 1181.5 463.5 L 1146.5 463.5 Z M 693.5 367.5 L 727.5 367.5 L 727.5 463.5 L 693.5 463.5 Z M 816.5 367.5 L 851.5 367.5 L 851.5 463.5 L 816.5 463.5 Z M 899.5 367.5 L 933.5 367.5 L 933.5 463.5 L 899.5 463.5 Z M 1023.5 367.5 L 1057.5 367.5 L 1057.5 463.5 L 1023.5 463.5 Z M 1023.5 367.5 "/>
 </clipPath>
-<image id="image330" 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="#image330"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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="#image331"/>
+  <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="surface325">
+<g id="surface352">
 <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 636.824219 706.320312 L 654.191406 731.5 L 646.449219 731.5 L 633.050781 711.035156 L 619.589844 731.5 L 611.980469 731.5 L 629.351562 706.320312 L 613.058594 682.421875 L 620.664062 682.421875 L 633.253906 701.675781 L 645.910156 682.421875 L 653.382812 682.421875 Z M 636.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 612 392 L 651 392 M 612 353 L 651 353 M 612 353 L 612 392 M 651 353 L 651 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 612 392 L 651 392 M 612 353 L 651 353 M 651 392 L 651 353 M 612 392 L 612 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/o31ai/sky130_fd_sc_lp__o31ai_0.svg b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.svg
index 915fa83..2615577 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_0.svg
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.5 111.5 "/>
 </clipPath>
-<image id="image358" 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="#image358"/>
+  <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 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="#image358"/>
+  <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 1075.5 747.5 L 1110.5 747.5 L 1110.5 844.5 L 1075.5 844.5 Z M 757.5 747.5 L 791.5 747.5 L 791.5 844.5 L 757.5 844.5 Z M 855.5 747.5 L 890.5 747.5 L 890.5 844.5 L 855.5 844.5 Z M 977.5 747.5 L 1011.5 747.5 L 1011.5 844.5 L 977.5 844.5 Z M 977.5 747.5 "/>
 </clipPath>
-<image id="image359" 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="#image359"/>
+  <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 1043.5 218.5 L 1078.5 218.5 L 1078.5 365.5 L 1043.5 365.5 Z M 766.5 218.5 L 800.5 218.5 L 800.5 365.5 L 766.5 365.5 Z M 855.5 218.5 L 890.5 218.5 L 890.5 365.5 L 855.5 365.5 Z M 945.5 218.5 L 979.5 218.5 L 979.5 365.5 L 945.5 365.5 Z M 945.5 218.5 "/>
 </clipPath>
-<image id="image360" 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="#image360"/>
+  <use xlink:href="#image387"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image361" 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="#image361"/>
+  <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="surface355">
+<g id="surface382">
 <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 1242.554688 457.246094 L 1242.554688 476.5 L 1236.292969 476.5 L 1236.292969 457.246094 L 1217.375 427.421875 L 1225.117188 427.421875 L 1239.523438 451.320312 L 1253.527344 427.421875 L 1261 427.421875 Z M 1242.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 1219 647 L 1258 647 M 1219 608 L 1258 608 M 1219 608 L 1219 647 M 1258 608 L 1258 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 1219 647 L 1258 647 M 1219 608 L 1258 608 M 1258 647 L 1258 608 M 1219 647 L 1219 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 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_lp__o31ai_1.svg b/cells/o31ai/sky130_fd_sc_lp__o31ai_1.svg
index 5ccb263..e240abe 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_1.svg
+++ b/cells/o31ai/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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="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="#image328"/>
+  <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 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="#image328"/>
+  <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 1114.5 672.5 L 1149.5 672.5 L 1149.5 864.5 L 1114.5 864.5 Z M 725.5 672.5 L 759.5 672.5 L 759.5 864.5 L 725.5 864.5 Z M 823.5 672.5 L 858.5 672.5 L 858.5 864.5 L 823.5 864.5 Z M 1000.5 672.5 L 1034.5 672.5 L 1034.5 864.5 L 1000.5 864.5 Z M 1000.5 672.5 "/>
 </clipPath>
-<image id="image329" 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="#image329"/>
+  <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 1111.5 209.5 L 1145.5 209.5 L 1145.5 498.5 L 1111.5 498.5 Z M 725.5 209.5 L 759.5 209.5 L 759.5 498.5 L 725.5 498.5 Z M 807.5 209.5 L 842.5 209.5 L 842.5 498.5 L 807.5 498.5 Z M 931.5 209.5 L 965.5 209.5 L 965.5 498.5 L 931.5 498.5 Z M 931.5 209.5 "/>
 </clipPath>
-<image id="image330" 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="#image330"/>
+  <use xlink:href="#image357"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image331" 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="#image331"/>
+  <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="surface325">
+<g id="surface352">
 <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 1152.511719 518.40625 L 1150.292969 518.605469 L 1148.40625 519.078125 L 1146.859375 519.886719 L 1145.578125 521.03125 L 1144.636719 522.511719 L 1143.960938 524.328125 L 1143.761719 524.933594 L 1143.625 525.609375 L 1143.558594 526.28125 L 1143.492188 527.089844 L 1143.425781 527.828125 L 1143.425781 528.636719 L 1137.5 528.636719 L 1137.769531 524.867188 L 1138.644531 521.636719 L 1139.921875 518.941406 L 1141.808594 516.722656 L 1144.097656 515.039062 L 1146.992188 513.894531 L 1147.800781 513.691406 L 1148.675781 513.558594 L 1149.550781 513.421875 L 1151.433594 513.289062 L 1152.445312 513.222656 L 1154.9375 513.355469 L 1157.292969 513.757812 L 1159.378906 514.433594 L 1161.265625 515.308594 L 1162.878906 516.519531 L 1164.292969 517.933594 L 1165.101562 519.144531 L 1165.773438 520.355469 L 1166.3125 521.703125 L 1166.648438 523.183594 L 1166.851562 524.734375 L 1166.988281 526.347656 L 1166.785156 528.703125 L 1166.246094 530.722656 L 1165.304688 532.476562 L 1164.023438 534.023438 L 1162.339844 535.300781 L 1160.320312 536.246094 L 1162.003906 536.917969 L 1163.484375 537.726562 L 1164.765625 538.601562 L 1165.84375 539.609375 L 1166.71875 540.753906 L 1167.390625 541.96875 L 1167.660156 542.773438 L 1167.929688 543.648438 L 1168.132812 544.59375 L 1168.265625 545.535156 L 1168.332031 546.542969 L 1168.402344 547.621094 L 1168.265625 549.910156 L 1167.863281 551.996094 L 1167.1875 553.882812 L 1166.3125 555.699219 L 1165.167969 557.316406 L 1163.753906 558.730469 L 1162.207031 559.875 L 1160.523438 560.816406 L 1158.707031 561.488281 L 1156.6875 562.027344 L 1154.53125 562.367188 L 1152.242188 562.5 L 1148.609375 562.230469 L 1145.511719 561.421875 L 1142.820312 560.210938 L 1140.597656 558.394531 L 1138.847656 556.105469 L 1137.632812 553.277344 L 1137.296875 552.402344 L 1137.097656 551.390625 L 1136.894531 550.382812 L 1136.691406 549.371094 L 1136.558594 548.296875 L 1136.488281 547.082031 L 1142.414062 547.082031 L 1142.683594 549.507812 L 1143.222656 551.59375 L 1144.03125 553.34375 L 1145.105469 554.757812 L 1146.453125 555.902344 L 1148.136719 556.644531 L 1148.742188 556.84375 L 1149.414062 556.980469 L 1150.089844 557.113281 L 1150.828125 557.179688 L 1151.570312 557.25 L 1152.445312 557.25 L 1154.261719 557.179688 L 1155.945312 556.84375 L 1157.425781 556.304688 L 1158.773438 555.566406 L 1159.917969 554.554688 L 1160.859375 553.34375 L 1161.265625 552.605469 L 1161.667969 551.730469 L 1161.9375 550.785156 L 1162.140625 549.84375 L 1162.273438 548.832031 L 1162.339844 547.6875 L 1162.070312 545.265625 L 1161.398438 543.246094 L 1160.253906 541.5625 L 1158.640625 540.351562 L 1156.550781 539.542969 L 1153.992188 539.070312 L 1152.648438 539.070312 L 1152.445312 539.003906 L 1149.953125 539.070312 L 1149.214844 539.070312 L 1149.214844 534.023438 L 1151.234375 533.957031 L 1153.050781 533.820312 L 1154.667969 533.621094 L 1156.011719 533.351562 L 1157.15625 533.011719 L 1158.167969 532.542969 L 1158.976562 531.9375 L 1159.648438 531.128906 L 1160.1875 530.253906 L 1160.589844 529.175781 L 1160.792969 527.964844 L 1160.929688 526.550781 L 1160.792969 525.070312 L 1160.523438 523.65625 L 1160.050781 522.445312 L 1159.378906 521.367188 L 1158.503906 520.425781 L 1157.425781 519.617188 L 1156.6875 519.28125 L 1155.878906 518.941406 L 1155.136719 518.742188 L 1154.261719 518.539062 Z M 1152.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 1109 562 L 1148 562 M 1109 523 L 1148 523 M 1109 523 L 1109 562 M 1148 523 L 1148 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 1109 562 L 1148 562 M 1109 523 L 1148 523 M 1148 562 L 1148 523 M 1109 562 L 1109 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/o31ai/sky130_fd_sc_lp__o31ai_2.svg b/cells/o31ai/sky130_fd_sc_lp__o31ai_2.svg
index 762d726..30a7012 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_2.svg
+++ b/cells/o31ai/sky130_fd_sc_lp__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 539.5 L 367.5 539.5 Z M 367.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="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 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="#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 1340.5 651.5 L 1374.5 651.5 L 1374.5 844.5 L 1340.5 844.5 Z M 538.5 651.5 L 572.5 651.5 L 572.5 844.5 L 538.5 844.5 Z M 636.5 651.5 L 671.5 651.5 L 671.5 844.5 L 636.5 844.5 Z M 735.5 651.5 L 769.5 651.5 L 769.5 844.5 L 735.5 844.5 Z M 930.5 651.5 L 964.5 651.5 L 964.5 844.5 L 930.5 844.5 Z M 1028.5 651.5 L 1063.5 651.5 L 1063.5 844.5 L 1028.5 844.5 Z M 1127.5 651.5 L 1161.5 651.5 L 1161.5 844.5 L 1127.5 844.5 Z M 1242.5 651.5 L 1276.5 651.5 L 1276.5 844.5 L 1242.5 844.5 Z M 1242.5 651.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 1385.5 209.5 L 1419.5 209.5 L 1419.5 498.5 L 1385.5 498.5 Z M 522.5 209.5 L 556.5 209.5 L 556.5 498.5 L 522.5 498.5 Z M 620.5 209.5 L 655.5 209.5 L 655.5 498.5 L 620.5 498.5 Z M 719.5 209.5 L 753.5 209.5 L 753.5 498.5 L 719.5 498.5 Z M 818.5 209.5 L 852.5 209.5 L 852.5 498.5 L 818.5 498.5 Z M 1035.5 209.5 L 1070.5 209.5 L 1070.5 498.5 L 1035.5 498.5 Z M 1152.5 209.5 L 1187.5 209.5 L 1187.5 498.5 L 1152.5 498.5 Z M 1286.5 209.5 L 1321.5 209.5 L 1321.5 498.5 L 1286.5 498.5 Z M 1286.5 209.5 "/>
 </clipPath>
-<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image319"/>
+  <use xlink:href="#image347"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 805.703125 615.332031 L 806.242188 610.28125 L 807.652344 606.175781 L 809.875 602.941406 L 812.90625 600.652344 L 816.742188 599.242188 L 821.457031 598.769531 L 823.609375 598.902344 L 825.695312 599.242188 L 827.648438 599.777344 L 829.398438 600.585938 L 831.015625 601.597656 L 832.5625 602.742188 L 833.773438 604.15625 L 834.851562 605.636719 L 835.660156 607.25 L 836.265625 608.933594 L 836.601562 610.820312 L 836.738281 612.773438 L 836.46875 615.53125 L 835.726562 618.089844 L 834.449219 620.445312 L 832.699219 622.667969 L 830.410156 624.753906 L 827.648438 626.574219 L 826.640625 627.179688 L 819.90625 630.8125 L 818.15625 631.824219 L 816.609375 632.832031 L 815.261719 633.84375 L 814.183594 634.851562 L 813.242188 635.863281 L 812.570312 636.875 L 812.230469 637.480469 L 811.960938 638.015625 L 811.761719 638.691406 L 811.558594 639.296875 L 811.355469 639.96875 L 811.289062 640.644531 L 836.402344 640.644531 L 836.402344 646.5 L 804.625 646.5 L 804.757812 644.144531 L 805.097656 641.988281 L 805.5 639.96875 L 806.039062 638.21875 L 806.644531 636.535156 L 807.386719 635.054688 L 808.191406 633.777344 L 809.203125 632.496094 L 810.414062 631.21875 L 811.761719 630.007812 L 813.308594 628.792969 L 815.125 627.582031 L 815.53125 627.3125 L 816.003906 627.042969 L 816.472656 626.707031 L 816.945312 626.4375 L 817.484375 626.167969 L 818.023438 625.832031 L 824.214844 622.332031 L 826.167969 621.050781 L 827.785156 619.640625 L 829.0625 618.15625 L 829.9375 616.542969 L 830.476562 614.792969 L 830.679688 612.90625 L 830.542969 611.628906 L 830.339844 610.347656 L 829.871094 609.203125 L 829.332031 608.125 L 828.523438 607.183594 L 827.648438 606.242188 L 826.707031 605.570312 L 825.765625 604.960938 L 824.6875 604.558594 L 823.609375 604.222656 L 822.464844 604.019531 L 821.253906 603.953125 L 818.628906 604.289062 L 816.40625 605.097656 L 814.589844 606.511719 L 813.242188 608.464844 L 812.300781 611.023438 L 811.761719 614.050781 L 811.695312 614.320312 L 811.695312 614.722656 L 811.625 614.925781 L 811.625 615.332031 Z M 805.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 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/o31ai/sky130_fd_sc_lp__o31ai_4.svg b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.svg
index a824137..2c0b4c4 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_4.svg
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 195.5 L 1744.5 195.5 L 1744.5 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image311" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image311"/>
+  <use xlink:href="#image339"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1569.5 644.5 L 1597.5 644.5 L 1597.5 799.5 L 1569.5 799.5 Z M 303.5 644.5 L 330.5 644.5 L 330.5 799.5 L 303.5 799.5 Z M 382.5 644.5 L 409.5 644.5 L 409.5 799.5 L 382.5 799.5 Z M 461.5 644.5 L 489.5 644.5 L 489.5 799.5 L 461.5 799.5 Z M 540.5 644.5 L 568.5 644.5 L 568.5 799.5 L 540.5 799.5 Z M 619.5 644.5 L 647.5 644.5 L 647.5 799.5 L 619.5 799.5 Z M 698.5 644.5 L 726.5 644.5 L 726.5 799.5 L 698.5 799.5 Z M 777.5 644.5 L 805.5 644.5 L 805.5 799.5 L 777.5 799.5 Z M 856.5 644.5 L 884.5 644.5 L 884.5 799.5 L 856.5 799.5 Z M 935.5 644.5 L 963.5 644.5 L 963.5 799.5 L 935.5 799.5 Z M 1014.5 644.5 L 1042.5 644.5 L 1042.5 799.5 L 1014.5 799.5 Z M 1106.5 644.5 L 1134.5 644.5 L 1134.5 799.5 L 1106.5 799.5 Z M 1185.5 644.5 L 1213.5 644.5 L 1213.5 799.5 L 1185.5 799.5 Z M 1264.5 644.5 L 1292.5 644.5 L 1292.5 799.5 L 1264.5 799.5 Z M 1343.5 644.5 L 1371.5 644.5 L 1371.5 799.5 L 1343.5 799.5 Z M 1490.5 644.5 L 1518.5 644.5 L 1518.5 799.5 L 1490.5 799.5 Z M 1490.5 644.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1599.5 273.5 L 1626.5 273.5 L 1626.5 504.5 L 1599.5 504.5 Z M 303.5 273.5 L 330.5 273.5 L 330.5 504.5 L 303.5 504.5 Z M 382.5 273.5 L 409.5 273.5 L 409.5 504.5 L 382.5 504.5 Z M 461.5 273.5 L 489.5 273.5 L 489.5 504.5 L 461.5 504.5 Z M 540.5 273.5 L 568.5 273.5 L 568.5 504.5 L 540.5 504.5 Z M 619.5 273.5 L 647.5 273.5 L 647.5 504.5 L 619.5 504.5 Z M 698.5 273.5 L 726.5 273.5 L 726.5 504.5 L 698.5 504.5 Z M 777.5 273.5 L 805.5 273.5 L 805.5 504.5 L 777.5 504.5 Z M 856.5 273.5 L 884.5 273.5 L 884.5 504.5 L 856.5 504.5 Z M 935.5 273.5 L 963.5 273.5 L 963.5 504.5 L 935.5 504.5 Z M 1014.5 273.5 L 1042.5 273.5 L 1042.5 504.5 L 1014.5 504.5 Z M 1093.5 273.5 L 1121.5 273.5 L 1121.5 504.5 L 1093.5 504.5 Z M 1172.5 273.5 L 1200.5 273.5 L 1200.5 504.5 L 1172.5 504.5 Z M 1301.5 273.5 L 1329.5 273.5 L 1329.5 504.5 L 1301.5 504.5 Z M 1380.5 273.5 L 1408.5 273.5 L 1408.5 504.5 L 1380.5 504.5 Z M 1501.5 273.5 L 1529.5 273.5 L 1529.5 504.5 L 1501.5 504.5 Z M 1501.5 273.5 "/>
 </clipPath>
-<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image313"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image342" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image314"/>
+  <use xlink:href="#image342"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface308">
+<g id="surface336">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1424.097656 595.878906 L 1415.507812 595.878906 L 1415.507812 592.429688 L 1416.984375 592.265625 L 1418.296875 592.046875 L 1419.445312 591.773438 L 1420.429688 591.554688 L 1421.25 591.28125 L 1421.960938 590.953125 L 1422.511719 590.625 L 1423.003906 590.242188 L 1423.441406 589.804688 L 1423.878906 589.257812 L 1424.261719 588.65625 L 1424.644531 587.945312 L 1424.808594 587.5625 L 1424.972656 587.125 L 1425.136719 586.632812 L 1425.355469 586.03125 L 1425.519531 585.429688 L 1425.738281 584.71875 L 1428.910156 584.71875 L 1428.910156 623.5 L 1424.097656 623.5 Z M 1424.097656 595.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 1385 491 L 1416 491 M 1385 460 L 1416 460 M 1385 460 L 1385 491 M 1416 460 L 1416 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 1385 491 L 1416 491 M 1385 460 L 1416 460 M 1416 491 L 1416 460 M 1385 491 L 1385 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/o31ai/sky130_fd_sc_lp__o31ai_lp.svg b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.svg
index 4d0a1fa..84f6405 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.svg
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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="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="#image322"/>
+  <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 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="#image322"/>
+  <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 1115.5 757.5 L 1150.5 757.5 L 1150.5 853.5 L 1115.5 853.5 Z M 783.5 757.5 L 818.5 757.5 L 818.5 853.5 L 783.5 853.5 Z M 882.5 757.5 L 916.5 757.5 L 916.5 853.5 L 882.5 853.5 Z M 1017.5 757.5 L 1051.5 757.5 L 1051.5 853.5 L 1017.5 853.5 Z M 1017.5 757.5 "/>
 </clipPath>
-<image id="image323" 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="#image323"/>
+  <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 1106.5 209.5 L 1164.5 209.5 L 1164.5 438.5 L 1106.5 438.5 Z M 733.5 209.5 L 790.5 209.5 L 790.5 438.5 L 733.5 438.5 Z M 845.5 209.5 L 902.5 209.5 L 902.5 438.5 L 845.5 438.5 Z M 976.5 209.5 L 1033.5 209.5 L 1033.5 438.5 L 976.5 438.5 Z M 976.5 209.5 "/>
 </clipPath>
-<image id="image324" 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="#image324"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image325" 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="#image325"/>
+  <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="surface319">
+<g id="surface346">
 <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 917.703125 276.332031 L 918.242188 271.28125 L 919.652344 267.175781 L 921.875 263.941406 L 924.90625 261.652344 L 928.742188 260.242188 L 933.457031 259.769531 L 935.609375 259.902344 L 937.695312 260.242188 L 939.648438 260.777344 L 941.398438 261.585938 L 943.015625 262.597656 L 944.5625 263.742188 L 945.773438 265.15625 L 946.851562 266.636719 L 947.660156 268.25 L 948.265625 269.933594 L 948.601562 271.820312 L 948.738281 273.773438 L 948.46875 276.53125 L 947.726562 279.089844 L 946.449219 281.445312 L 944.699219 283.667969 L 942.410156 285.753906 L 939.648438 287.574219 L 938.640625 288.179688 L 931.90625 291.8125 L 930.15625 292.824219 L 928.609375 293.832031 L 927.261719 294.84375 L 926.183594 295.851562 L 925.242188 296.863281 L 924.570312 297.875 L 924.230469 298.480469 L 923.960938 299.015625 L 923.761719 299.691406 L 923.558594 300.296875 L 923.355469 300.96875 L 923.289062 301.644531 L 948.402344 301.644531 L 948.402344 307.5 L 916.625 307.5 L 916.757812 305.144531 L 917.097656 302.988281 L 917.5 300.96875 L 918.039062 299.21875 L 918.644531 297.535156 L 919.386719 296.054688 L 920.191406 294.777344 L 921.203125 293.496094 L 922.414062 292.21875 L 923.761719 291.007812 L 925.308594 289.792969 L 927.125 288.582031 L 927.53125 288.3125 L 928.003906 288.042969 L 928.472656 287.707031 L 928.945312 287.4375 L 929.484375 287.167969 L 930.023438 286.832031 L 936.214844 283.332031 L 938.167969 282.050781 L 939.785156 280.640625 L 941.0625 279.15625 L 941.9375 277.542969 L 942.476562 275.792969 L 942.679688 273.90625 L 942.542969 272.628906 L 942.339844 271.347656 L 941.871094 270.203125 L 941.332031 269.125 L 940.523438 268.183594 L 939.648438 267.242188 L 938.707031 266.570312 L 937.765625 265.960938 L 936.6875 265.558594 L 935.609375 265.222656 L 934.464844 265.019531 L 933.253906 264.953125 L 930.628906 265.289062 L 928.40625 266.097656 L 926.589844 267.511719 L 925.242188 269.464844 L 924.300781 272.023438 L 923.761719 275.050781 L 923.695312 275.320312 L 923.695312 275.722656 L 923.625 275.925781 L 923.625 276.332031 Z M 917.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 889 816 L 928 816 M 889 777 L 928 777 M 889 777 L 889 816 M 928 777 L 928 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 889 816 L 928 816 M 889 777 L 928 777 M 928 816 L 928 777 M 889 816 L 889 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_lp__o31ai_m.svg b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.svg
index 54b9474..89115d8 100644
--- a/cells/o31ai/sky130_fd_sc_lp__o31ai_m.svg
+++ b/cells/o31ai/sky130_fd_sc_lp__o31ai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.5 111.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image335"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1094.5 674.5 L 1128.5 674.5 L 1128.5 770.5 L 1094.5 770.5 Z M 798.5 674.5 L 832.5 674.5 L 832.5 770.5 L 798.5 770.5 Z M 897.5 674.5 L 931.5 674.5 L 931.5 770.5 L 897.5 770.5 Z M 995.5 674.5 L 1030.5 674.5 L 1030.5 770.5 L 995.5 770.5 Z M 995.5 674.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1094.5 209.5 L 1128.5 209.5 L 1128.5 305.5 L 1094.5 305.5 Z M 830.5 209.5 L 865.5 209.5 L 865.5 305.5 L 830.5 305.5 Z M 913.5 209.5 L 947.5 209.5 L 947.5 305.5 L 913.5 305.5 Z M 995.5 209.5 L 1030.5 209.5 L 1030.5 305.5 L 995.5 305.5 Z M 995.5 209.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface359">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1211.773438 781.503906 L 1201.203125 781.503906 L 1201.203125 777.261719 L 1203.019531 777.058594 L 1204.636719 776.789062 L 1206.050781 776.453125 L 1207.261719 776.183594 L 1208.269531 775.847656 L 1209.148438 775.445312 L 1209.820312 775.039062 L 1210.425781 774.570312 L 1210.964844 774.03125 L 1211.503906 773.355469 L 1211.972656 772.617188 L 1212.445312 771.742188 L 1212.648438 771.269531 L 1212.847656 770.730469 L 1213.050781 770.125 L 1213.320312 769.386719 L 1213.523438 768.644531 L 1213.792969 767.769531 L 1217.695312 767.769531 L 1217.695312 815.5 L 1211.773438 815.5 Z M 1211.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 1164 307 L 1203 307 M 1164 269 L 1203 269 M 1164 269 L 1164 307 M 1203 269 L 1203 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 1164 307 L 1203 307 M 1164 269 L 1203 269 M 1203 307 L 1203 269 M 1164 307 L 1164 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 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/o32a/sky130_fd_sc_lp__o32a_0.svg b/cells/o32a/sky130_fd_sc_lp__o32a_0.svg
index 13dbd95..5a46d49 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_0.svg
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.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 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="#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 1259.5 725.5 L 1293.5 725.5 L 1293.5 821.5 L 1259.5 821.5 Z M 667.5 725.5 L 702.5 725.5 L 702.5 821.5 L 667.5 821.5 Z M 798.5 725.5 L 832.5 725.5 L 832.5 821.5 L 798.5 821.5 Z M 897.5 725.5 L 931.5 725.5 L 931.5 821.5 L 897.5 821.5 Z M 1046.5 725.5 L 1080.5 725.5 L 1080.5 821.5 L 1046.5 821.5 Z M 1144.5 725.5 L 1178.5 725.5 L 1178.5 821.5 L 1144.5 821.5 Z M 1144.5 725.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 1217.5 220.5 L 1252.5 220.5 L 1252.5 367.5 L 1217.5 367.5 Z M 674.5 220.5 L 709.5 220.5 L 709.5 367.5 L 674.5 367.5 Z M 832.5 220.5 L 867.5 220.5 L 867.5 367.5 L 832.5 367.5 Z M 922.5 220.5 L 956.5 220.5 L 956.5 367.5 L 922.5 367.5 Z M 1011.5 220.5 L 1046.5 220.5 L 1046.5 367.5 L 1011.5 367.5 Z M 1128.5 220.5 L 1162.5 220.5 L 1162.5 367.5 L 1128.5 367.5 Z M 1128.5 220.5 "/>
 </clipPath>
-<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image388" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image360"/>
+  <use xlink:href="#image388"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image361"/>
+  <use xlink:href="#image389"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface355">
+<g id="surface383">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -203,6 +203,5 @@
 <path style=" 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/o32a/sky130_fd_sc_lp__o32a_1.svg b/cells/o32a/sky130_fd_sc_lp__o32a_1.svg
index 20bd602..01728b9 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_1.svg
+++ b/cells/o32a/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.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 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="#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 1262.5 647.5 L 1297.5 647.5 L 1297.5 839.5 L 1262.5 839.5 Z M 664.5 647.5 L 698.5 647.5 L 698.5 839.5 L 664.5 839.5 Z M 774.5 647.5 L 808.5 647.5 L 808.5 839.5 L 774.5 839.5 Z M 873.5 647.5 L 907.5 647.5 L 907.5 839.5 L 873.5 839.5 Z M 1049.5 647.5 L 1083.5 647.5 L 1083.5 839.5 L 1049.5 839.5 Z M 1148.5 647.5 L 1182.5 647.5 L 1182.5 839.5 L 1148.5 839.5 Z M 1148.5 647.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 1262.5 209.5 L 1297.5 209.5 L 1297.5 498.5 L 1262.5 498.5 Z M 663.5 209.5 L 697.5 209.5 L 697.5 498.5 L 663.5 498.5 Z M 790.5 209.5 L 824.5 209.5 L 824.5 498.5 L 790.5 498.5 Z M 898.5 209.5 L 932.5 209.5 L 932.5 498.5 L 898.5 498.5 Z M 1003.5 209.5 L 1038.5 209.5 L 1038.5 498.5 L 1003.5 498.5 Z M 1180.5 209.5 L 1214.5 209.5 L 1214.5 498.5 L 1180.5 498.5 Z M 1180.5 209.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" 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_lp__o32a_2.svg b/cells/o32a/sky130_fd_sc_lp__o32a_2.svg
index 5e5b04d..190b9cb 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_2.svg
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.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="image350" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image322"/>
+  <use xlink:href="#image350"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1293.5 672.5 L 1327.5 672.5 L 1327.5 864.5 L 1293.5 864.5 Z M 564.5 672.5 L 599.5 672.5 L 599.5 864.5 L 564.5 864.5 Z M 663.5 672.5 L 697.5 672.5 L 697.5 864.5 L 663.5 864.5 Z M 823.5 672.5 L 858.5 672.5 L 858.5 864.5 L 823.5 864.5 Z M 922.5 672.5 L 956.5 672.5 L 956.5 864.5 L 922.5 864.5 Z M 1087.5 672.5 L 1121.5 672.5 L 1121.5 864.5 L 1087.5 864.5 Z M 1185.5 672.5 L 1220.5 672.5 L 1220.5 864.5 L 1185.5 864.5 Z M 1185.5 672.5 "/>
 </clipPath>
-<image id="image323" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image323"/>
+  <use xlink:href="#image351"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1293.5 209.5 L 1327.5 209.5 L 1327.5 498.5 L 1293.5 498.5 Z M 564.5 209.5 L 599.5 209.5 L 599.5 498.5 L 564.5 498.5 Z M 663.5 209.5 L 697.5 209.5 L 697.5 498.5 L 663.5 498.5 Z M 839.5 209.5 L 874.5 209.5 L 874.5 498.5 L 839.5 498.5 Z M 922.5 209.5 L 956.5 209.5 L 956.5 498.5 L 922.5 498.5 Z M 1046.5 209.5 L 1080.5 209.5 L 1080.5 498.5 L 1046.5 498.5 Z M 1169.5 209.5 L 1204.5 209.5 L 1204.5 498.5 L 1169.5 498.5 Z M 1169.5 209.5 "/>
 </clipPath>
-<image id="image324" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image324"/>
+  <use xlink:href="#image352"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image325" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image353" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image325"/>
+  <use xlink:href="#image353"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface319">
+<g id="surface347">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1191.703125 615.332031 L 1192.242188 610.28125 L 1193.652344 606.175781 L 1195.875 602.941406 L 1198.90625 600.652344 L 1202.742188 599.242188 L 1207.457031 598.769531 L 1209.609375 598.902344 L 1211.695312 599.242188 L 1213.648438 599.777344 L 1215.398438 600.585938 L 1217.015625 601.597656 L 1218.5625 602.742188 L 1219.773438 604.15625 L 1220.851562 605.636719 L 1221.660156 607.25 L 1222.265625 608.933594 L 1222.601562 610.820312 L 1222.738281 612.773438 L 1222.46875 615.53125 L 1221.726562 618.089844 L 1220.449219 620.445312 L 1218.699219 622.667969 L 1216.410156 624.753906 L 1213.648438 626.574219 L 1212.640625 627.179688 L 1205.90625 630.8125 L 1204.15625 631.824219 L 1202.609375 632.832031 L 1201.261719 633.84375 L 1200.183594 634.851562 L 1199.242188 635.863281 L 1198.570312 636.875 L 1198.230469 637.480469 L 1197.960938 638.015625 L 1197.761719 638.691406 L 1197.558594 639.296875 L 1197.355469 639.96875 L 1197.289062 640.644531 L 1222.402344 640.644531 L 1222.402344 646.5 L 1190.625 646.5 L 1190.757812 644.144531 L 1191.097656 641.988281 L 1191.5 639.96875 L 1192.039062 638.21875 L 1192.644531 636.535156 L 1193.386719 635.054688 L 1194.191406 633.777344 L 1195.203125 632.496094 L 1196.414062 631.21875 L 1197.761719 630.007812 L 1199.308594 628.792969 L 1201.125 627.582031 L 1201.53125 627.3125 L 1202.003906 627.042969 L 1202.472656 626.707031 L 1202.945312 626.4375 L 1203.484375 626.167969 L 1204.023438 625.832031 L 1210.214844 622.332031 L 1212.167969 621.050781 L 1213.785156 619.640625 L 1215.0625 618.15625 L 1215.9375 616.542969 L 1216.476562 614.792969 L 1216.679688 612.90625 L 1216.542969 611.628906 L 1216.339844 610.347656 L 1215.871094 609.203125 L 1215.332031 608.125 L 1214.523438 607.183594 L 1213.648438 606.242188 L 1212.707031 605.570312 L 1211.765625 604.960938 L 1210.6875 604.558594 L 1209.609375 604.222656 L 1208.464844 604.019531 L 1207.253906 603.953125 L 1204.628906 604.289062 L 1202.40625 605.097656 L 1200.589844 606.511719 L 1199.242188 608.464844 L 1198.300781 611.023438 L 1197.761719 614.050781 L 1197.695312 614.320312 L 1197.695312 614.722656 L 1197.625 614.925781 L 1197.625 615.332031 Z M 1191.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 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/o32a/sky130_fd_sc_lp__o32a_4.svg b/cells/o32a/sky130_fd_sc_lp__o32a_4.svg
index 326a912..48a9ccc 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_4.svg
+++ b/cells/o32a/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <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="#image332"/>
+  <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 298.5 628.5 L 326.5 628.5 L 326.5 782.5 L 298.5 782.5 Z M 440.5 628.5 L 467.5 628.5 L 467.5 782.5 L 440.5 782.5 Z M 598.5 628.5 L 625.5 628.5 L 625.5 782.5 L 598.5 782.5 Z M 1018.5 628.5 L 1046.5 628.5 L 1046.5 782.5 L 1018.5 782.5 Z M 1097.5 628.5 L 1125.5 628.5 L 1125.5 782.5 L 1097.5 782.5 Z M 684.5 628.5 L 712.5 628.5 L 712.5 782.5 L 684.5 782.5 Z M 1177.5 628.5 L 1205.5 628.5 L 1205.5 782.5 L 1177.5 782.5 Z M 519.5 628.5 L 546.5 628.5 L 546.5 782.5 L 519.5 782.5 Z M 926.5 628.5 L 954.5 628.5 L 954.5 782.5 L 926.5 782.5 Z M 767.5 628.5 L 795.5 628.5 L 795.5 782.5 L 767.5 782.5 Z M 1365.5 642.5 L 1393.5 642.5 L 1393.5 797.5 L 1365.5 797.5 Z M 1444.5 642.5 L 1472.5 642.5 L 1472.5 797.5 L 1444.5 797.5 Z M 1603.5 642.5 L 1630.5 642.5 L 1630.5 797.5 L 1603.5 797.5 Z M 1524.5 642.5 L 1551.5 642.5 L 1551.5 797.5 L 1524.5 797.5 Z M 1524.5 642.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <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 273.5 L 1630.5 273.5 L 1630.5 504.5 L 1603.5 504.5 Z M 361.5 273.5 L 388.5 273.5 L 388.5 504.5 L 361.5 504.5 Z M 440.5 273.5 L 467.5 273.5 L 467.5 504.5 L 440.5 504.5 Z M 519.5 273.5 L 546.5 273.5 L 546.5 504.5 L 519.5 504.5 Z M 605.5 273.5 L 633.5 273.5 L 633.5 504.5 L 605.5 504.5 Z M 684.5 273.5 L 712.5 273.5 L 712.5 504.5 L 684.5 504.5 Z M 763.5 273.5 L 791.5 273.5 L 791.5 504.5 L 763.5 504.5 Z M 938.5 273.5 L 966.5 273.5 L 966.5 504.5 L 938.5 504.5 Z M 1018.5 273.5 L 1046.5 273.5 L 1046.5 504.5 L 1018.5 504.5 Z M 1097.5 273.5 L 1125.5 273.5 L 1125.5 504.5 L 1097.5 504.5 Z M 1176.5 273.5 L 1204.5 273.5 L 1204.5 504.5 L 1176.5 504.5 Z M 1365.5 273.5 L 1393.5 273.5 L 1393.5 504.5 L 1365.5 504.5 Z M 1444.5 273.5 L 1472.5 273.5 L 1472.5 504.5 L 1444.5 504.5 Z M 1524.5 273.5 L 1551.5 273.5 L 1551.5 504.5 L 1524.5 504.5 Z M 1524.5 273.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 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="image335" 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="#image335"/>
+  <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="surface329">
+<g id="surface358">
 <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 1231.664062 530.175781 L 1232.101562 526.070312 L 1233.25 522.734375 L 1235.054688 520.109375 L 1237.515625 518.25 L 1240.632812 517.101562 L 1244.464844 516.71875 L 1246.214844 516.828125 L 1247.910156 517.101562 L 1249.496094 517.539062 L 1250.917969 518.195312 L 1252.230469 519.015625 L 1253.488281 519.945312 L 1254.472656 521.09375 L 1255.347656 522.296875 L 1256.003906 523.609375 L 1256.496094 524.976562 L 1256.769531 526.511719 L 1256.878906 528.097656 L 1256.660156 530.339844 L 1256.058594 532.417969 L 1255.019531 534.332031 L 1253.597656 536.136719 L 1251.738281 537.832031 L 1249.496094 539.308594 L 1248.675781 539.800781 L 1243.207031 542.753906 L 1241.785156 543.574219 L 1240.523438 544.394531 L 1239.429688 545.214844 L 1238.554688 546.039062 L 1237.789062 546.859375 L 1237.242188 547.679688 L 1236.96875 548.171875 L 1236.75 548.609375 L 1236.585938 549.15625 L 1236.421875 549.648438 L 1236.257812 550.195312 L 1236.203125 550.742188 L 1256.605469 550.742188 L 1256.605469 555.5 L 1230.789062 555.5 L 1230.898438 553.585938 L 1231.171875 551.835938 L 1231.5 550.195312 L 1231.9375 548.773438 L 1232.429688 547.40625 L 1233.03125 546.203125 L 1233.6875 545.160156 L 1234.507812 544.121094 L 1235.492188 543.082031 L 1236.585938 542.097656 L 1237.84375 541.113281 L 1239.648438 539.910156 L 1240.03125 539.691406 L 1240.414062 539.417969 L 1240.796875 539.199219 L 1241.234375 538.980469 L 1241.675781 538.707031 L 1246.707031 535.863281 L 1248.292969 534.824219 L 1249.605469 533.675781 L 1250.644531 532.472656 L 1251.355469 531.160156 L 1251.792969 529.738281 L 1251.957031 528.207031 L 1251.847656 527.167969 L 1251.683594 526.125 L 1251.300781 525.195312 L 1250.863281 524.320312 L 1250.207031 523.554688 L 1249.496094 522.789062 L 1248.730469 522.242188 L 1247.964844 521.75 L 1247.089844 521.421875 L 1246.214844 521.148438 L 1245.285156 520.984375 L 1244.300781 520.929688 L 1242.167969 521.203125 L 1240.359375 521.859375 L 1238.882812 523.007812 L 1237.789062 524.59375 L 1237.023438 526.675781 L 1236.585938 529.136719 L 1236.53125 529.355469 L 1236.53125 529.683594 L 1236.476562 529.847656 L 1236.476562 530.175781 Z M 1231.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 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/o32a/sky130_fd_sc_lp__o32a_lp.svg b/cells/o32a/sky130_fd_sc_lp__o32a_lp.svg
index 5e85523..02c7022 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_lp.svg
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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 641.5 706.5 L 675.5 706.5 L 675.5 802.5 L 641.5 802.5 Z M 1271.5 720.5 L 1306.5 720.5 L 1306.5 816.5 L 1271.5 816.5 Z M 1189.5 720.5 L 1223.5 720.5 L 1223.5 816.5 L 1189.5 816.5 Z M 1090.5 720.5 L 1125.5 720.5 L 1125.5 816.5 L 1090.5 816.5 Z M 992.5 720.5 L 1026.5 720.5 L 1026.5 816.5 L 992.5 816.5 Z M 856.5 720.5 L 891.5 720.5 L 891.5 816.5 L 856.5 816.5 Z M 758.5 720.5 L 792.5 720.5 L 792.5 816.5 L 758.5 816.5 Z M 758.5 720.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 1244.5 209.5 L 1301.5 209.5 L 1301.5 438.5 L 1244.5 438.5 Z M 638.5 209.5 L 695.5 209.5 L 695.5 438.5 L 638.5 438.5 Z M 750.5 209.5 L 807.5 209.5 L 807.5 438.5 L 750.5 438.5 Z M 895.5 209.5 L 953.5 209.5 L 953.5 438.5 L 895.5 438.5 Z M 1008.5 209.5 L 1065.5 209.5 L 1065.5 438.5 L 1008.5 438.5 Z M 1120.5 209.5 L 1177.5 209.5 L 1177.5 438.5 L 1120.5 438.5 Z M 1120.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 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/o32a/sky130_fd_sc_lp__o32a_m.svg b/cells/o32a/sky130_fd_sc_lp__o32a_m.svg
index 11adb05..ce91582 100644
--- a/cells/o32a/sky130_fd_sc_lp__o32a_m.svg
+++ b/cells/o32a/sky130_fd_sc_lp__o32a_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask 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="#image377"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1227.5 729.5 L 1261.5 729.5 L 1261.5 825.5 L 1227.5 825.5 Z M 620.5 729.5 L 655.5 729.5 L 655.5 825.5 L 620.5 825.5 Z M 773.5 729.5 L 807.5 729.5 L 807.5 825.5 L 773.5 825.5 Z M 871.5 729.5 L 906.5 729.5 L 906.5 825.5 L 871.5 825.5 Z M 1020.5 729.5 L 1055.5 729.5 L 1055.5 825.5 L 1020.5 825.5 Z M 1119.5 729.5 L 1153.5 729.5 L 1153.5 825.5 L 1119.5 825.5 Z M 1119.5 729.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1227.5 360.5 L 1261.5 360.5 L 1261.5 456.5 L 1227.5 456.5 Z M 620.5 360.5 L 655.5 360.5 L 655.5 456.5 L 620.5 456.5 Z M 773.5 360.5 L 807.5 360.5 L 807.5 456.5 L 773.5 456.5 Z M 855.5 360.5 L 890.5 360.5 L 890.5 456.5 L 855.5 456.5 Z M 979.5 360.5 L 1013.5 360.5 L 1013.5 456.5 L 979.5 456.5 Z M 1136.5 360.5 L 1170.5 360.5 L 1170.5 456.5 L 1136.5 456.5 Z M 1136.5 360.5 "/>
 </clipPath>
-<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image380"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface374">
+<g id="surface402">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -215,6 +215,5 @@
 <path style=" 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/o32ai/sky130_fd_sc_lp__o32ai_0.svg b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.svg
index fffa35d..23441b9 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_0.svg
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image398"/>
+  <use xlink:href="#image426"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1176.5 728.5 L 1211.5 728.5 L 1211.5 824.5 L 1176.5 824.5 Z M 675.5 728.5 L 710.5 728.5 L 710.5 824.5 L 675.5 824.5 Z M 790.5 728.5 L 824.5 728.5 L 824.5 824.5 L 790.5 824.5 Z M 889.5 728.5 L 923.5 728.5 L 923.5 824.5 L 889.5 824.5 Z M 1078.5 728.5 L 1112.5 728.5 L 1112.5 824.5 L 1078.5 824.5 Z M 1078.5 728.5 "/>
 </clipPath>
-<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image399"/>
+  <use xlink:href="#image427"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1135.5 209.5 L 1169.5 209.5 L 1169.5 356.5 L 1135.5 356.5 Z M 695.5 209.5 L 729.5 209.5 L 729.5 356.5 L 695.5 356.5 Z M 784.5 209.5 L 819.5 209.5 L 819.5 356.5 L 784.5 356.5 Z M 915.5 209.5 L 949.5 209.5 L 949.5 356.5 L 915.5 356.5 Z M 1046.5 209.5 L 1080.5 209.5 L 1080.5 356.5 L 1046.5 356.5 Z M 1046.5 209.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface395">
+<g id="surface423">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 746.554688 542.246094 L 746.554688 561.5 L 740.292969 561.5 L 740.292969 542.246094 L 721.375 512.421875 L 729.117188 512.421875 L 743.523438 536.320312 L 757.527344 512.421875 L 765 512.421875 Z M 746.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 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 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_lp__o32ai_1.svg b/cells/o32ai/sky130_fd_sc_lp__o32ai_1.svg
index 41de550..1da3785 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_1.svg
+++ b/cells/o32ai/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.5 111.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 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="#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 1213.5 647.5 L 1247.5 647.5 L 1247.5 839.5 L 1213.5 839.5 Z M 725.5 647.5 L 759.5 647.5 L 759.5 839.5 L 725.5 839.5 Z M 835.5 647.5 L 869.5 647.5 L 869.5 839.5 L 835.5 839.5 Z M 938.5 647.5 L 972.5 647.5 L 972.5 839.5 L 938.5 839.5 Z M 1114.5 647.5 L 1149.5 647.5 L 1149.5 839.5 L 1114.5 839.5 Z M 1114.5 647.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 1206.5 209.5 L 1240.5 209.5 L 1240.5 498.5 L 1206.5 498.5 Z M 725.5 209.5 L 759.5 209.5 L 759.5 498.5 L 725.5 498.5 Z M 807.5 209.5 L 842.5 209.5 L 842.5 498.5 L 807.5 498.5 Z M 1000.5 209.5 L 1034.5 209.5 L 1034.5 498.5 L 1000.5 498.5 Z M 1103.5 209.5 L 1137.5 209.5 L 1137.5 498.5 L 1103.5 498.5 Z M 1103.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 966.554688 288.246094 L 966.554688 307.5 L 960.292969 307.5 L 960.292969 288.246094 L 941.375 258.421875 L 949.117188 258.421875 L 963.523438 282.320312 L 977.527344 258.421875 L 985 258.421875 Z M 966.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 942 816 L 981 816 M 942 777 L 981 777 M 942 777 L 942 816 M 981 777 L 981 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 942 816 L 981 816 M 942 777 L 981 777 M 981 816 L 981 777 M 942 816 L 942 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/o32ai/sky130_fd_sc_lp__o32ai_2.svg b/cells/o32ai/sky130_fd_sc_lp__o32ai_2.svg
index 9d89b9c..2cf7c72 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_2.svg
+++ b/cells/o32ai/sky130_fd_sc_lp__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 539.5 L 201.5 539.5 Z M 798.5 539.5 L 1337.5 539.5 L 1337.5 541.5 L 798.5 541.5 Z M 798.5 539.5 "/>
 </clipPath>
-<image id="image350" 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="#image350"/>
+  <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 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="#image350"/>
+  <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 1423.5 651.5 L 1457.5 651.5 L 1457.5 844.5 L 1423.5 844.5 Z M 350.5 651.5 L 384.5 651.5 L 384.5 844.5 L 350.5 844.5 Z M 449.5 651.5 L 483.5 651.5 L 483.5 844.5 L 449.5 844.5 Z M 565.5 651.5 L 600.5 651.5 L 600.5 844.5 L 565.5 844.5 Z M 682.5 651.5 L 717.5 651.5 L 717.5 844.5 L 682.5 844.5 Z M 799.5 651.5 L 834.5 651.5 L 834.5 844.5 L 799.5 844.5 Z M 1019.5 651.5 L 1054.5 651.5 L 1054.5 844.5 L 1019.5 844.5 Z M 1120.5 651.5 L 1154.5 651.5 L 1154.5 844.5 L 1120.5 844.5 Z M 1225.5 651.5 L 1260.5 651.5 L 1260.5 844.5 L 1225.5 844.5 Z M 1324.5 651.5 L 1358.5 651.5 L 1358.5 844.5 L 1324.5 844.5 Z M 1324.5 651.5 "/>
 </clipPath>
-<image id="image351" 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="#image351"/>
+  <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 1517.5 209.5 L 1551.5 209.5 L 1551.5 498.5 L 1517.5 498.5 Z M 1418.5 209.5 L 1452.5 209.5 L 1452.5 498.5 L 1418.5 498.5 Z M 547.5 209.5 L 581.5 209.5 L 581.5 498.5 L 547.5 498.5 Z M 449.5 209.5 L 483.5 209.5 L 483.5 498.5 L 449.5 498.5 Z M 646.5 209.5 L 680.5 209.5 L 680.5 498.5 L 646.5 498.5 Z M 350.5 209.5 L 384.5 209.5 L 384.5 498.5 L 350.5 498.5 Z M 1003.5 211.5 L 1038.5 211.5 L 1038.5 500.5 L 1003.5 500.5 Z M 905.5 211.5 L 939.5 211.5 L 939.5 500.5 L 905.5 500.5 Z M 1200.5 211.5 L 1235.5 211.5 L 1235.5 500.5 L 1200.5 500.5 Z M 1102.5 211.5 L 1136.5 211.5 L 1136.5 500.5 L 1102.5 500.5 Z M 1102.5 211.5 "/>
 </clipPath>
-<image id="image352" 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="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image353" 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="#image353"/>
+  <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="surface347">
+<g id="surface375">
 <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 528.703125 530.332031 L 529.242188 525.28125 L 530.652344 521.175781 L 532.875 517.941406 L 535.90625 515.652344 L 539.742188 514.242188 L 544.457031 513.769531 L 546.609375 513.902344 L 548.695312 514.242188 L 550.648438 514.777344 L 552.398438 515.585938 L 554.015625 516.597656 L 555.5625 517.742188 L 556.773438 519.15625 L 557.851562 520.636719 L 558.660156 522.25 L 559.265625 523.933594 L 559.601562 525.820312 L 559.738281 527.773438 L 559.46875 530.53125 L 558.726562 533.089844 L 557.449219 535.445312 L 555.699219 537.667969 L 553.410156 539.753906 L 550.648438 541.574219 L 549.640625 542.179688 L 542.90625 545.8125 L 541.15625 546.824219 L 539.609375 547.832031 L 538.261719 548.84375 L 537.183594 549.851562 L 536.242188 550.863281 L 535.570312 551.875 L 535.230469 552.480469 L 534.960938 553.015625 L 534.761719 553.691406 L 534.558594 554.296875 L 534.355469 554.96875 L 534.289062 555.644531 L 559.402344 555.644531 L 559.402344 561.5 L 527.625 561.5 L 527.757812 559.144531 L 528.097656 556.988281 L 528.5 554.96875 L 529.039062 553.21875 L 529.644531 551.535156 L 530.386719 550.054688 L 531.191406 548.777344 L 532.203125 547.496094 L 533.414062 546.21875 L 534.761719 545.007812 L 536.308594 543.792969 L 538.125 542.582031 L 538.53125 542.3125 L 539.003906 542.042969 L 539.472656 541.707031 L 539.945312 541.4375 L 540.484375 541.167969 L 541.023438 540.832031 L 547.214844 537.332031 L 549.167969 536.050781 L 550.785156 534.640625 L 552.0625 533.15625 L 552.9375 531.542969 L 553.476562 529.792969 L 553.679688 527.90625 L 553.542969 526.628906 L 553.339844 525.347656 L 552.871094 524.203125 L 552.332031 523.125 L 551.523438 522.183594 L 550.648438 521.242188 L 549.707031 520.570312 L 548.765625 519.960938 L 547.6875 519.558594 L 546.609375 519.222656 L 545.464844 519.019531 L 544.253906 518.953125 L 541.628906 519.289062 L 539.40625 520.097656 L 537.589844 521.511719 L 536.242188 523.464844 L 535.300781 526.023438 L 534.761719 529.050781 L 534.695312 529.320312 L 534.695312 529.722656 L 534.625 529.925781 L 534.625 530.332031 Z M 528.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 500 562 L 539 562 M 500 523 L 539 523 M 500 523 L 500 562 M 539 523 L 539 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 500 562 L 539 562 M 500 523 L 539 523 M 539 562 L 539 523 M 500 562 L 500 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/o32ai/sky130_fd_sc_lp__o32ai_4.svg b/cells/o32ai/sky130_fd_sc_lp__o32ai_4.svg
index e2e7cd5..edfe016 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_4.svg
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_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 770.5 536.5 L 1351.5 536.5 L 1351.5 549.5 L 770.5 549.5 Z M 770.5 536.5 "/>
 </clipPath>
-<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image422"/>
 </pattern>
 <mask 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="#image393"/>
+  <use xlink:href="#image422"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1595.5 620.5 L 1616.5 620.5 L 1616.5 740.5 L 1595.5 740.5 Z M 261.5 620.5 L 282.5 620.5 L 282.5 740.5 L 261.5 740.5 Z M 322.5 620.5 L 344.5 620.5 L 344.5 740.5 L 322.5 740.5 Z M 384.5 620.5 L 405.5 620.5 L 405.5 740.5 L 384.5 740.5 Z M 446.5 620.5 L 467.5 620.5 L 467.5 740.5 L 446.5 740.5 Z M 507.5 620.5 L 529.5 620.5 L 529.5 740.5 L 507.5 740.5 Z M 569.5 620.5 L 591.5 620.5 L 591.5 740.5 L 569.5 740.5 Z M 631.5 620.5 L 652.5 620.5 L 652.5 740.5 L 631.5 740.5 Z M 692.5 620.5 L 714.5 620.5 L 714.5 740.5 L 692.5 740.5 Z M 770.5 620.5 L 791.5 620.5 L 791.5 740.5 L 770.5 740.5 Z M 832.5 620.5 L 853.5 620.5 L 853.5 740.5 L 832.5 740.5 Z M 903.5 620.5 L 925.5 620.5 L 925.5 740.5 L 903.5 740.5 Z M 975.5 620.5 L 997.5 620.5 L 997.5 740.5 L 975.5 740.5 Z M 1104.5 620.5 L 1125.5 620.5 L 1125.5 740.5 L 1104.5 740.5 Z M 1165.5 620.5 L 1187.5 620.5 L 1187.5 740.5 L 1165.5 740.5 Z M 1227.5 620.5 L 1248.5 620.5 L 1248.5 740.5 L 1227.5 740.5 Z M 1342.5 620.5 L 1363.5 620.5 L 1363.5 740.5 L 1342.5 740.5 Z M 1410.5 620.5 L 1431.5 620.5 L 1431.5 740.5 L 1410.5 740.5 Z M 1472.5 620.5 L 1493.5 620.5 L 1493.5 740.5 L 1472.5 740.5 Z M 1533.5 620.5 L 1555.5 620.5 L 1555.5 740.5 L 1533.5 740.5 Z M 1533.5 620.5 "/>
 </clipPath>
-<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image423"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1595.5 330.5 L 1616.5 330.5 L 1616.5 510.5 L 1595.5 510.5 Z M 1533.5 330.5 L 1555.5 330.5 L 1555.5 510.5 L 1533.5 510.5 Z M 1410.5 330.5 L 1431.5 330.5 L 1431.5 510.5 L 1410.5 510.5 Z M 512.5 330.5 L 534.5 330.5 L 534.5 510.5 L 512.5 510.5 Z M 446.5 330.5 L 467.5 330.5 L 467.5 510.5 L 446.5 510.5 Z M 697.5 330.5 L 719.5 330.5 L 719.5 510.5 L 697.5 510.5 Z M 384.5 330.5 L 405.5 330.5 L 405.5 510.5 L 384.5 510.5 Z M 322.5 330.5 L 344.5 330.5 L 344.5 510.5 L 322.5 510.5 Z M 1472.5 330.5 L 1493.5 330.5 L 1493.5 510.5 L 1472.5 510.5 Z M 636.5 330.5 L 657.5 330.5 L 657.5 510.5 L 636.5 510.5 Z M 261.5 330.5 L 282.5 330.5 L 282.5 510.5 L 261.5 510.5 Z M 574.5 330.5 L 596.5 330.5 L 596.5 510.5 L 574.5 510.5 Z M 895.5 343.5 L 917.5 343.5 L 917.5 523.5 L 895.5 523.5 Z M 834.5 343.5 L 855.5 343.5 L 855.5 523.5 L 834.5 523.5 Z M 1081.5 343.5 L 1102.5 343.5 L 1102.5 523.5 L 1081.5 523.5 Z M 1266.5 343.5 L 1287.5 343.5 L 1287.5 523.5 L 1266.5 523.5 Z M 1142.5 343.5 L 1164.5 343.5 L 1164.5 523.5 L 1142.5 523.5 Z M 957.5 343.5 L 979.5 343.5 L 979.5 523.5 L 957.5 523.5 Z M 1019.5 343.5 L 1040.5 343.5 L 1040.5 523.5 L 1019.5 523.5 Z M 1204.5 343.5 L 1225.5 343.5 L 1225.5 523.5 L 1204.5 523.5 Z M 1204.5 343.5 "/>
 </clipPath>
-<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image424"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image425"/>
 </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="surface419">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -220,6 +220,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 444.785156 432.464844 L 444.785156 444.5 L 440.871094 444.5 L 440.871094 432.464844 L 429.046875 413.828125 L 433.886719 413.828125 L 442.890625 428.765625 L 451.640625 413.828125 L 456.3125 413.828125 Z M 444.785156 432.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 430 663 L 454 663 M 430 638 L 454 638 M 430 638 L 430 663 M 454 638 L 454 663 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 430 663 L 454 663 M 430 638 L 454 638 M 454 663 L 454 638 M 430 663 L 430 638 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/o32ai/sky130_fd_sc_lp__o32ai_lp.svg b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.svg
index 1ed078f..312d313 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.svg
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image363" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image335"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 691.5 617.5 L 726.5 617.5 L 726.5 713.5 L 691.5 713.5 Z M 790.5 617.5 L 824.5 617.5 L 824.5 713.5 L 790.5 713.5 Z M 1099.5 647.5 L 1134.5 647.5 L 1134.5 743.5 L 1099.5 743.5 Z M 925.5 647.5 L 960.5 647.5 L 960.5 743.5 L 925.5 743.5 Z M 1198.5 647.5 L 1232.5 647.5 L 1232.5 743.5 L 1198.5 743.5 Z M 1198.5 647.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1181.5 209.5 L 1238.5 209.5 L 1238.5 438.5 L 1181.5 438.5 Z M 673.5 209.5 L 730.5 209.5 L 730.5 438.5 L 673.5 438.5 Z M 785.5 209.5 L 843.5 209.5 L 843.5 438.5 L 785.5 438.5 Z M 907.5 209.5 L 964.5 209.5 L 964.5 438.5 L 907.5 438.5 Z M 1050.5 209.5 L 1107.5 209.5 L 1107.5 438.5 L 1050.5 438.5 Z M 1050.5 209.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <path style=" 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/o32ai/sky130_fd_sc_lp__o32ai_m.svg b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.svg
index b569309..94c00f2 100644
--- a/cells/o32ai/sky130_fd_sc_lp__o32ai_m.svg
+++ b/cells/o32ai/sky130_fd_sc_lp__o32ai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image414" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image442" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image414"/>
+  <use xlink:href="#image442"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image414"/>
+  <use xlink:href="#image442"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1135.5 728.5 L 1169.5 728.5 L 1169.5 824.5 L 1135.5 824.5 Z M 732.5 728.5 L 766.5 728.5 L 766.5 824.5 L 732.5 824.5 Z M 830.5 728.5 L 865.5 728.5 L 865.5 824.5 L 830.5 824.5 Z M 929.5 728.5 L 963.5 728.5 L 963.5 824.5 L 929.5 824.5 Z M 1036.5 728.5 L 1071.5 728.5 L 1071.5 824.5 L 1036.5 824.5 Z M 1036.5 728.5 "/>
 </clipPath>
-<image id="image415" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image443" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image415"/>
+  <use xlink:href="#image443"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1119.5 209.5 L 1153.5 209.5 L 1153.5 305.5 L 1119.5 305.5 Z M 748.5 209.5 L 782.5 209.5 L 782.5 305.5 L 748.5 305.5 Z M 830.5 209.5 L 865.5 209.5 L 865.5 305.5 L 830.5 305.5 Z M 929.5 209.5 L 963.5 209.5 L 963.5 305.5 L 929.5 305.5 Z M 1036.5 209.5 L 1071.5 209.5 L 1071.5 305.5 L 1036.5 305.5 Z M 1036.5 209.5 "/>
 </clipPath>
-<image id="image416" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image444" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image416"/>
+  <use xlink:href="#image444"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image417" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image445" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image417"/>
+  <use xlink:href="#image445"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface411">
+<g id="surface439">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -237,6 +237,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 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/o41a/sky130_fd_sc_lp__o41a_0.svg b/cells/o41a/sky130_fd_sc_lp__o41a_0.svg
index 56c4af2..dd62279 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_0.svg
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image422" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image394"/>
+  <use xlink:href="#image422"/>
 </pattern>
 <mask 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="#image394"/>
+  <use xlink:href="#image422"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1153.5 763.5 L 1188.5 763.5 L 1188.5 860.5 L 1153.5 860.5 Z M 853.5 763.5 L 887.5 763.5 L 887.5 860.5 L 853.5 860.5 Z M 1261.5 763.5 L 1295.5 763.5 L 1295.5 860.5 L 1261.5 860.5 Z M 1055.5 763.5 L 1089.5 763.5 L 1089.5 860.5 L 1055.5 860.5 Z M 952.5 763.5 L 986.5 763.5 L 986.5 860.5 L 952.5 860.5 Z M 614.5 768.5 L 648.5 768.5 L 648.5 864.5 L 614.5 864.5 Z M 614.5 768.5 "/>
 </clipPath>
-<image id="image395" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image423" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image395"/>
+  <use xlink:href="#image423"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1261.5 218.5 L 1295.5 218.5 L 1295.5 365.5 L 1261.5 365.5 Z M 656.5 218.5 L 690.5 218.5 L 690.5 365.5 L 656.5 365.5 Z M 755.5 218.5 L 789.5 218.5 L 789.5 365.5 L 755.5 365.5 Z M 972.5 218.5 L 1007.5 218.5 L 1007.5 365.5 L 972.5 365.5 Z M 1075.5 218.5 L 1110.5 218.5 L 1110.5 365.5 L 1075.5 365.5 Z M 1178.5 218.5 L 1213.5 218.5 L 1213.5 365.5 L 1178.5 365.5 Z M 1178.5 218.5 "/>
 </clipPath>
-<image id="image396" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image396"/>
+  <use xlink:href="#image424"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image397" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image397"/>
+  <use xlink:href="#image425"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface391">
+<g id="surface419">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -227,6 +227,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 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/o41a/sky130_fd_sc_lp__o41a_1.svg b/cells/o41a/sky130_fd_sc_lp__o41a_1.svg
index 8f70721..f3a6c66 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_1.svg
+++ b/cells/o41a/sky130_fd_sc_lp__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 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1316.5 670.5 L 1350.5 670.5 L 1350.5 862.5 L 1316.5 862.5 Z M 644.5 670.5 L 679.5 670.5 L 679.5 862.5 L 644.5 862.5 Z M 862.5 670.5 L 897.5 670.5 L 897.5 862.5 L 862.5 862.5 Z M 961.5 670.5 L 995.5 670.5 L 995.5 862.5 L 961.5 862.5 Z M 1094.5 670.5 L 1128.5 670.5 L 1128.5 862.5 L 1094.5 862.5 Z M 1192.5 670.5 L 1227.5 670.5 L 1227.5 862.5 L 1192.5 862.5 Z M 1192.5 670.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1316.5 209.5 L 1350.5 209.5 L 1350.5 498.5 L 1316.5 498.5 Z M 687.5 209.5 L 721.5 209.5 L 721.5 498.5 L 687.5 498.5 Z M 818.5 209.5 L 852.5 209.5 L 852.5 498.5 L 818.5 498.5 Z M 945.5 209.5 L 979.5 209.5 L 979.5 498.5 L 945.5 498.5 Z M 1089.5 209.5 L 1123.5 209.5 L 1123.5 498.5 L 1089.5 498.5 Z M 1192.5 209.5 L 1227.5 209.5 L 1227.5 498.5 L 1192.5 498.5 Z M 1192.5 209.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface367">
+<g id="surface395">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/o41a/sky130_fd_sc_lp__o41a_2.svg b/cells/o41a/sky130_fd_sc_lp__o41a_2.svg
index e136e83..3f5c137 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_2.svg
+++ b/cells/o41a/sky130_fd_sc_lp__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 539.5 L 367.5 539.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image389" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image418" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image389"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image389"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 528.5 635.5 L 562.5 635.5 L 562.5 828.5 L 528.5 828.5 Z M 626.5 635.5 L 661.5 635.5 L 661.5 828.5 L 626.5 828.5 Z M 1239.5 670.5 L 1274.5 670.5 L 1274.5 862.5 L 1239.5 862.5 Z M 1141.5 670.5 L 1175.5 670.5 L 1175.5 862.5 L 1141.5 862.5 Z M 1018.5 670.5 L 1052.5 670.5 L 1052.5 862.5 L 1018.5 862.5 Z M 909.5 670.5 L 944.5 670.5 L 944.5 862.5 L 909.5 862.5 Z M 1363.5 670.5 L 1397.5 670.5 L 1397.5 862.5 L 1363.5 862.5 Z M 1363.5 670.5 "/>
 </clipPath>
-<image id="image390" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image390"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1363.5 209.5 L 1397.5 209.5 L 1397.5 498.5 L 1363.5 498.5 Z M 528.5 209.5 L 562.5 209.5 L 562.5 498.5 L 528.5 498.5 Z M 626.5 209.5 L 661.5 209.5 L 661.5 498.5 L 626.5 498.5 Z M 856.5 209.5 L 891.5 209.5 L 891.5 498.5 L 856.5 498.5 Z M 1033.5 209.5 L 1067.5 209.5 L 1067.5 498.5 L 1033.5 498.5 Z M 1115.5 209.5 L 1150.5 209.5 L 1150.5 498.5 L 1115.5 498.5 Z M 1239.5 209.5 L 1274.5 209.5 L 1274.5 498.5 L 1239.5 498.5 Z M 1239.5 209.5 "/>
 </clipPath>
-<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image420"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image392"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface386">
+<g id="surface415">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1043.351562 465.054688 L 1023.222656 465.054688 L 1023.222656 458.792969 L 1044.898438 428.769531 L 1049.273438 428.769531 L 1049.273438 459.738281 L 1056.34375 459.738281 L 1056.34375 465.054688 L 1049.273438 465.054688 L 1049.273438 476.5 L 1043.351562 476.5 Z M 1043.351562 459.738281 L 1043.351562 438.867188 L 1028.40625 459.738281 Z M 1043.351562 459.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 996 647 L 1035 647 M 996 608 L 1035 608 M 996 608 L 996 647 M 1035 608 L 1035 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 996 647 L 1035 647 M 996 608 L 1035 608 M 1035 647 L 1035 608 M 996 647 L 996 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/o41a/sky130_fd_sc_lp__o41a_4.svg b/cells/o41a/sky130_fd_sc_lp__o41a_4.svg
index ba3c289..a4ea968 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_4.svg
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 175.5 L 1743.5 175.5 L 1743.5 538.5 L 174.5 538.5 Z M 811.5 538.5 L 1272.5 538.5 L 1272.5 559.5 L 811.5 559.5 Z M 811.5 538.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 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="#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 543.5 649.5 L 572.5 649.5 L 572.5 812.5 L 543.5 812.5 Z M 459.5 649.5 L 489.5 649.5 L 489.5 812.5 L 459.5 812.5 Z M 292.5 649.5 L 321.5 649.5 L 321.5 812.5 L 292.5 812.5 Z M 376.5 649.5 L 405.5 649.5 L 405.5 812.5 L 376.5 812.5 Z M 981.5 651.5 L 1010.5 651.5 L 1010.5 814.5 L 981.5 814.5 Z M 1065.5 651.5 L 1094.5 651.5 L 1094.5 814.5 L 1065.5 814.5 Z M 1149.5 651.5 L 1178.5 651.5 L 1178.5 814.5 L 1149.5 814.5 Z M 1232.5 651.5 L 1261.5 651.5 L 1261.5 814.5 L 1232.5 814.5 Z M 1411.5 651.5 L 1441.5 651.5 L 1441.5 814.5 L 1411.5 814.5 Z M 1495.5 651.5 L 1524.5 651.5 L 1524.5 814.5 L 1495.5 814.5 Z M 1579.5 651.5 L 1608.5 651.5 L 1608.5 814.5 L 1579.5 814.5 Z M 730.5 651.5 L 759.5 651.5 L 759.5 814.5 L 730.5 814.5 Z M 897.5 651.5 L 927.5 651.5 L 927.5 814.5 L 897.5 814.5 Z M 814.5 651.5 L 843.5 651.5 L 843.5 814.5 L 814.5 814.5 Z M 814.5 651.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 292.5 258.5 L 321.5 258.5 L 321.5 503.5 L 292.5 503.5 Z M 376.5 258.5 L 405.5 258.5 L 405.5 503.5 L 376.5 503.5 Z M 543.5 258.5 L 572.5 258.5 L 572.5 503.5 L 543.5 503.5 Z M 1592.5 258.5 L 1622.5 258.5 L 1622.5 503.5 L 1592.5 503.5 Z M 1425.5 258.5 L 1454.5 258.5 L 1454.5 503.5 L 1425.5 503.5 Z M 627.5 258.5 L 656.5 258.5 L 656.5 503.5 L 627.5 503.5 Z M 1341.5 258.5 L 1370.5 258.5 L 1370.5 503.5 L 1341.5 503.5 Z M 459.5 258.5 L 489.5 258.5 L 489.5 503.5 L 459.5 503.5 Z M 1509.5 258.5 L 1538.5 258.5 L 1538.5 503.5 L 1509.5 503.5 Z M 711.5 258.5 L 740.5 258.5 L 740.5 503.5 L 711.5 503.5 Z M 1149.5 279.5 L 1178.5 279.5 L 1178.5 524.5 L 1149.5 524.5 Z M 1065.5 279.5 L 1094.5 279.5 L 1094.5 524.5 L 1065.5 524.5 Z M 981.5 279.5 L 1010.5 279.5 L 1010.5 524.5 L 981.5 524.5 Z M 897.5 279.5 L 927.5 279.5 L 927.5 524.5 L 897.5 524.5 Z M 897.5 279.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image361" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image361"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image334" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image362" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image362"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface328">
+<g id="surface356">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -180,6 +180,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 262.984375 535.992188 L 277.820312 557.5 L 271.207031 557.5 L 259.765625 540.019531 L 248.261719 557.5 L 241.765625 557.5 L 256.601562 535.992188 L 242.683594 515.578125 L 249.183594 515.578125 L 259.9375 532.027344 L 270.746094 515.578125 L 277.128906 515.578125 Z M 262.984375 535.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 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/o41a/sky130_fd_sc_lp__o41a_lp.svg b/cells/o41a/sky130_fd_sc_lp__o41a_lp.svg
index b542a9d..eb60158 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_lp.svg
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image370" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image398" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image370"/>
+  <use xlink:href="#image398"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 568.5 757.5 L 602.5 757.5 L 602.5 853.5 L 568.5 853.5 Z M 703.5 757.5 L 737.5 757.5 L 737.5 853.5 L 703.5 853.5 Z M 918.5 757.5 L 953.5 757.5 L 953.5 853.5 L 918.5 853.5 Z M 1017.5 757.5 L 1051.5 757.5 L 1051.5 853.5 L 1017.5 853.5 Z M 810.5 757.5 L 844.5 757.5 L 844.5 853.5 L 810.5 853.5 Z M 1326.5 768.5 L 1361.5 768.5 L 1361.5 864.5 L 1326.5 864.5 Z M 1244.5 768.5 L 1278.5 768.5 L 1278.5 864.5 L 1244.5 864.5 Z M 1244.5 768.5 "/>
 </clipPath>
-<image id="image371" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image399" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image371"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1268.5 217.5 L 1325.5 217.5 L 1325.5 446.5 L 1268.5 446.5 Z M 567.5 217.5 L 624.5 217.5 L 624.5 446.5 L 567.5 446.5 Z M 679.5 217.5 L 736.5 217.5 L 736.5 446.5 L 679.5 446.5 Z M 810.5 217.5 L 867.5 217.5 L 867.5 446.5 L 810.5 446.5 Z M 933.5 217.5 L 991.5 217.5 L 991.5 446.5 L 933.5 446.5 Z M 1120.5 217.5 L 1177.5 217.5 L 1177.5 446.5 L 1120.5 446.5 Z M 1120.5 217.5 "/>
 </clipPath>
-<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image372"/>
+  <use xlink:href="#image400"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image373"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface367">
+<g id="surface395">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/o41a/sky130_fd_sc_lp__o41a_m.svg b/cells/o41a/sky130_fd_sc_lp__o41a_m.svg
index 34d3a24..564a5c7 100644
--- a/cells/o41a/sky130_fd_sc_lp__o41a_m.svg
+++ b/cells/o41a/sky130_fd_sc_lp__o41a_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image401"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1127.5 763.5 L 1161.5 763.5 L 1161.5 860.5 L 1127.5 860.5 Z M 831.5 763.5 L 866.5 763.5 L 866.5 860.5 L 831.5 860.5 Z M 1225.5 763.5 L 1260.5 763.5 L 1260.5 860.5 L 1225.5 860.5 Z M 1028.5 763.5 L 1063.5 763.5 L 1063.5 860.5 L 1028.5 860.5 Z M 930.5 763.5 L 964.5 763.5 L 964.5 860.5 L 930.5 860.5 Z M 614.5 768.5 L 648.5 768.5 L 648.5 864.5 L 614.5 864.5 Z M 614.5 768.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image402"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1161.5 209.5 L 1196.5 209.5 L 1196.5 305.5 L 1161.5 305.5 Z M 658.5 209.5 L 693.5 209.5 L 693.5 305.5 L 658.5 305.5 Z M 760.5 209.5 L 795.5 209.5 L 795.5 305.5 L 760.5 305.5 Z M 865.5 209.5 L 899.5 209.5 L 899.5 305.5 L 865.5 305.5 Z M 996.5 209.5 L 1031.5 209.5 L 1031.5 305.5 L 996.5 305.5 Z M 1079.5 209.5 L 1113.5 209.5 L 1113.5 305.5 L 1079.5 305.5 Z M 1079.5 209.5 "/>
 </clipPath>
-<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image403"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image404"/>
+  <use xlink:href="#image432"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface398">
+<g id="surface426">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 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/o41ai/sky130_fd_sc_lp__o41ai_0.svg b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.svg
index c96566a..a85c442 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_0.svg
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image408"/>
 </pattern>
 <mask 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="#image380"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1221.5 757.5 L 1255.5 757.5 L 1255.5 853.5 L 1221.5 853.5 Z M 792.5 757.5 L 827.5 757.5 L 827.5 853.5 L 792.5 853.5 Z M 891.5 757.5 L 925.5 757.5 L 925.5 853.5 L 891.5 853.5 Z M 1011.5 757.5 L 1046.5 757.5 L 1046.5 853.5 L 1011.5 853.5 Z M 1110.5 757.5 L 1144.5 757.5 L 1144.5 853.5 L 1110.5 853.5 Z M 1110.5 757.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image409"/>
 </pattern>
 <mask id="mask2">
 <rect 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 218.5 L 1214.5 218.5 L 1214.5 365.5 L 1180.5 365.5 Z M 777.5 218.5 L 812.5 218.5 L 812.5 365.5 L 777.5 365.5 Z M 876.5 218.5 L 910.5 218.5 L 910.5 365.5 L 876.5 365.5 Z M 994.5 218.5 L 1028.5 218.5 L 1028.5 365.5 L 994.5 365.5 Z M 1097.5 218.5 L 1132.5 218.5 L 1132.5 365.5 L 1097.5 365.5 Z M 1097.5 218.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image410"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image411"/>
 </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="surface405">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -216,6 +216,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 636.554688 542.246094 L 636.554688 561.5 L 630.292969 561.5 L 630.292969 542.246094 L 611.375 512.421875 L 619.117188 512.421875 L 633.523438 536.320312 L 647.527344 512.421875 L 655 512.421875 Z M 636.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 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/o41ai/sky130_fd_sc_lp__o41ai_1.svg b/cells/o41ai/sky130_fd_sc_lp__o41ai_1.svg
index 098ad50..9a5b348 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_1.svg
+++ b/cells/o41ai/sky130_fd_sc_lp__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 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image344" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image344"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image344"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1180.5 670.5 L 1214.5 670.5 L 1214.5 862.5 L 1180.5 862.5 Z M 721.5 670.5 L 756.5 670.5 L 756.5 862.5 L 721.5 862.5 Z M 843.5 670.5 L 877.5 670.5 L 877.5 862.5 L 843.5 862.5 Z M 946.5 670.5 L 980.5 670.5 L 980.5 862.5 L 946.5 862.5 Z M 1051.5 670.5 L 1086.5 670.5 L 1086.5 862.5 L 1051.5 862.5 Z M 1051.5 670.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1175.5 209.5 L 1209.5 209.5 L 1209.5 498.5 L 1175.5 498.5 Z M 721.5 209.5 L 756.5 209.5 L 756.5 498.5 L 721.5 498.5 Z M 845.5 209.5 L 879.5 209.5 L 879.5 498.5 L 845.5 498.5 Z M 928.5 209.5 L 962.5 209.5 L 962.5 498.5 L 928.5 498.5 Z M 1051.5 209.5 L 1086.5 209.5 L 1086.5 498.5 L 1051.5 498.5 Z M 1051.5 209.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface341">
+<g id="surface369">
 <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 986.511719 264.40625 L 984.292969 264.605469 L 982.40625 265.078125 L 980.859375 265.886719 L 979.578125 267.03125 L 978.636719 268.511719 L 977.960938 270.328125 L 977.761719 270.933594 L 977.625 271.609375 L 977.558594 272.28125 L 977.492188 273.089844 L 977.425781 273.828125 L 977.425781 274.636719 L 971.5 274.636719 L 971.769531 270.867188 L 972.644531 267.636719 L 973.921875 264.941406 L 975.808594 262.722656 L 978.097656 261.039062 L 980.992188 259.894531 L 981.800781 259.691406 L 982.675781 259.558594 L 983.550781 259.421875 L 985.433594 259.289062 L 986.445312 259.222656 L 988.9375 259.355469 L 991.292969 259.757812 L 993.378906 260.433594 L 995.265625 261.308594 L 996.878906 262.519531 L 998.292969 263.933594 L 999.101562 265.144531 L 999.773438 266.355469 L 1000.3125 267.703125 L 1000.648438 269.183594 L 1000.851562 270.734375 L 1000.988281 272.347656 L 1000.785156 274.703125 L 1000.246094 276.722656 L 999.304688 278.476562 L 998.023438 280.023438 L 996.339844 281.300781 L 994.320312 282.246094 L 996.003906 282.917969 L 997.484375 283.726562 L 998.765625 284.601562 L 999.84375 285.609375 L 1000.71875 286.753906 L 1001.390625 287.96875 L 1001.660156 288.773438 L 1001.929688 289.648438 L 1002.132812 290.59375 L 1002.265625 291.535156 L 1002.332031 292.542969 L 1002.402344 293.621094 L 1002.265625 295.910156 L 1001.863281 297.996094 L 1001.1875 299.882812 L 1000.3125 301.699219 L 999.167969 303.316406 L 997.753906 304.730469 L 996.207031 305.875 L 994.523438 306.816406 L 992.707031 307.488281 L 990.6875 308.027344 L 988.53125 308.367188 L 986.242188 308.5 L 982.609375 308.230469 L 979.511719 307.421875 L 976.820312 306.210938 L 974.597656 304.394531 L 972.847656 302.105469 L 971.632812 299.277344 L 971.296875 298.402344 L 971.097656 297.390625 L 970.894531 296.382812 L 970.691406 295.371094 L 970.558594 294.296875 L 970.488281 293.082031 L 976.414062 293.082031 L 976.683594 295.507812 L 977.222656 297.59375 L 978.03125 299.34375 L 979.105469 300.757812 L 980.453125 301.902344 L 982.136719 302.644531 L 982.742188 302.84375 L 983.414062 302.980469 L 984.089844 303.113281 L 984.828125 303.179688 L 985.570312 303.25 L 986.445312 303.25 L 988.261719 303.179688 L 989.945312 302.84375 L 991.425781 302.304688 L 992.773438 301.566406 L 993.917969 300.554688 L 994.859375 299.34375 L 995.265625 298.605469 L 995.667969 297.730469 L 995.9375 296.785156 L 996.140625 295.84375 L 996.273438 294.832031 L 996.339844 293.6875 L 996.070312 291.265625 L 995.398438 289.246094 L 994.253906 287.5625 L 992.640625 286.351562 L 990.550781 285.542969 L 987.992188 285.070312 L 986.648438 285.070312 L 986.445312 285.003906 L 983.953125 285.070312 L 983.214844 285.070312 L 983.214844 280.023438 L 985.234375 279.957031 L 987.050781 279.820312 L 988.667969 279.621094 L 990.011719 279.351562 L 991.15625 279.011719 L 992.167969 278.542969 L 992.976562 277.9375 L 993.648438 277.128906 L 994.1875 276.253906 L 994.589844 275.175781 L 994.792969 273.964844 L 994.929688 272.550781 L 994.792969 271.070312 L 994.523438 269.65625 L 994.050781 268.445312 L 993.378906 267.367188 L 992.503906 266.425781 L 991.425781 265.617188 L 990.6875 265.28125 L 989.878906 264.941406 L 989.136719 264.742188 L 988.261719 264.539062 Z M 986.511719 264.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 816 L 981 816 M 942 777 L 981 777 M 942 777 L 942 816 M 981 777 L 981 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 942 816 L 981 816 M 942 777 L 981 777 M 981 816 L 981 777 M 942 816 L 942 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/o41ai/sky130_fd_sc_lp__o41ai_2.svg b/cells/o41ai/sky130_fd_sc_lp__o41ai_2.svg
index eee5ebe..07eaed6 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_2.svg
+++ b/cells/o41ai/sky130_fd_sc_lp__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 539.5 L 201.5 539.5 Z M 562.5 539.5 L 1150.5 539.5 L 1150.5 541.5 L 562.5 541.5 Z M 562.5 539.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <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 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="#image333"/>
+  <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 1421.5 672.5 L 1456.5 672.5 L 1456.5 864.5 L 1421.5 864.5 Z M 483.5 672.5 L 517.5 672.5 L 517.5 864.5 L 483.5 864.5 Z M 581.5 672.5 L 616.5 672.5 L 616.5 864.5 L 581.5 864.5 Z M 680.5 672.5 L 714.5 672.5 L 714.5 864.5 L 680.5 864.5 Z M 816.5 672.5 L 851.5 672.5 L 851.5 864.5 L 816.5 864.5 Z M 915.5 672.5 L 949.5 672.5 L 949.5 864.5 L 915.5 864.5 Z M 1027.5 672.5 L 1062.5 672.5 L 1062.5 864.5 L 1027.5 864.5 Z M 1126.5 672.5 L 1160.5 672.5 L 1160.5 864.5 L 1126.5 864.5 Z M 1224.5 672.5 L 1259.5 672.5 L 1259.5 864.5 L 1224.5 864.5 Z M 1323.5 672.5 L 1357.5 672.5 L 1357.5 864.5 L 1323.5 864.5 Z M 1323.5 672.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <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 1527.5 209.5 L 1561.5 209.5 L 1561.5 498.5 L 1527.5 498.5 Z M 1428.5 209.5 L 1463.5 209.5 L 1463.5 498.5 L 1428.5 498.5 Z M 1231.5 209.5 L 1266.5 209.5 L 1266.5 498.5 L 1231.5 498.5 Z M 446.5 209.5 L 481.5 209.5 L 481.5 498.5 L 446.5 498.5 Z M 1330.5 209.5 L 1364.5 209.5 L 1364.5 498.5 L 1330.5 498.5 Z M 348.5 209.5 L 382.5 209.5 L 382.5 498.5 L 348.5 498.5 Z M 763.5 211.5 L 797.5 211.5 L 797.5 500.5 L 763.5 500.5 Z M 664.5 211.5 L 698.5 211.5 L 698.5 500.5 L 664.5 500.5 Z M 1013.5 211.5 L 1048.5 211.5 L 1048.5 500.5 L 1013.5 500.5 Z M 915.5 211.5 L 949.5 211.5 L 949.5 500.5 L 915.5 500.5 Z M 915.5 211.5 "/>
 </clipPath>
-<image id="image335" 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="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image336" 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="#image336"/>
+  <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="surface330">
+<g id="surface359">
 <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 1538.773438 527.503906 L 1528.203125 527.503906 L 1528.203125 523.261719 L 1530.019531 523.058594 L 1531.636719 522.789062 L 1533.050781 522.453125 L 1534.261719 522.183594 L 1535.269531 521.847656 L 1536.148438 521.445312 L 1536.820312 521.039062 L 1537.425781 520.570312 L 1537.964844 520.03125 L 1538.503906 519.355469 L 1538.972656 518.617188 L 1539.445312 517.742188 L 1539.648438 517.269531 L 1539.847656 516.730469 L 1540.050781 516.125 L 1540.320312 515.386719 L 1540.523438 514.644531 L 1540.792969 513.769531 L 1544.695312 513.769531 L 1544.695312 561.5 L 1538.773438 561.5 Z M 1538.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 1490 562 L 1529 562 M 1490 523 L 1529 523 M 1490 523 L 1490 562 M 1529 523 L 1529 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 1490 562 L 1529 562 M 1490 523 L 1529 523 M 1529 562 L 1529 523 M 1490 562 L 1490 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_lp__o41ai_4.svg b/cells/o41ai/sky130_fd_sc_lp__o41ai_4.svg
index 8d9d39d..fc5d9bd 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_4.svg
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_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 573.5 536.5 L 1154.5 536.5 L 1154.5 541.5 L 573.5 541.5 Z M 573.5 536.5 "/>
 </clipPath>
-<image id="image362" 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="#image362"/>
+  <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 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="#image362"/>
+  <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 1627.5 620.5 L 1648.5 620.5 L 1648.5 740.5 L 1627.5 740.5 Z M 377.5 620.5 L 398.5 620.5 L 398.5 740.5 L 377.5 740.5 Z M 438.5 620.5 L 460.5 620.5 L 460.5 740.5 L 438.5 740.5 Z M 500.5 620.5 L 522.5 620.5 L 522.5 740.5 L 500.5 740.5 Z M 562.5 620.5 L 583.5 620.5 L 583.5 740.5 L 562.5 740.5 Z M 635.5 620.5 L 657.5 620.5 L 657.5 740.5 L 635.5 740.5 Z M 708.5 620.5 L 730.5 620.5 L 730.5 740.5 L 708.5 740.5 Z M 770.5 620.5 L 791.5 620.5 L 791.5 740.5 L 770.5 740.5 Z M 845.5 620.5 L 866.5 620.5 L 866.5 740.5 L 845.5 740.5 Z M 916.5 620.5 L 938.5 620.5 L 938.5 740.5 L 916.5 740.5 Z M 989.5 620.5 L 1011.5 620.5 L 1011.5 740.5 L 989.5 740.5 Z M 1051.5 620.5 L 1073.5 620.5 L 1073.5 740.5 L 1051.5 740.5 Z M 1113.5 620.5 L 1134.5 620.5 L 1134.5 740.5 L 1113.5 740.5 Z M 1175.5 620.5 L 1196.5 620.5 L 1196.5 740.5 L 1175.5 740.5 Z M 1236.5 620.5 L 1258.5 620.5 L 1258.5 740.5 L 1236.5 740.5 Z M 1298.5 620.5 L 1319.5 620.5 L 1319.5 740.5 L 1298.5 740.5 Z M 1379.5 620.5 L 1401.5 620.5 L 1401.5 740.5 L 1379.5 740.5 Z M 1441.5 620.5 L 1463.5 620.5 L 1463.5 740.5 L 1441.5 740.5 Z M 1503.5 620.5 L 1525.5 620.5 L 1525.5 740.5 L 1503.5 740.5 Z M 1565.5 620.5 L 1586.5 620.5 L 1586.5 740.5 L 1565.5 740.5 Z M 1565.5 620.5 "/>
 </clipPath>
-<image id="image363" 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="#image363"/>
+  <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 1637.5 330.5 L 1658.5 330.5 L 1658.5 510.5 L 1637.5 510.5 Z M 1575.5 330.5 L 1596.5 330.5 L 1596.5 510.5 L 1575.5 510.5 Z M 1451.5 330.5 L 1473.5 330.5 L 1473.5 510.5 L 1451.5 510.5 Z M 1205.5 330.5 L 1226.5 330.5 L 1226.5 510.5 L 1205.5 510.5 Z M 500.5 330.5 L 522.5 330.5 L 522.5 510.5 L 500.5 510.5 Z M 1390.5 330.5 L 1411.5 330.5 L 1411.5 510.5 L 1390.5 510.5 Z M 438.5 330.5 L 460.5 330.5 L 460.5 510.5 L 438.5 510.5 Z M 377.5 330.5 L 398.5 330.5 L 398.5 510.5 L 377.5 510.5 Z M 1513.5 330.5 L 1535.5 330.5 L 1535.5 510.5 L 1513.5 510.5 Z M 1328.5 330.5 L 1350.5 330.5 L 1350.5 510.5 L 1328.5 510.5 Z M 315.5 330.5 L 337.5 330.5 L 337.5 510.5 L 315.5 510.5 Z M 1266.5 330.5 L 1288.5 330.5 L 1288.5 510.5 L 1266.5 510.5 Z M 698.5 334.5 L 720.5 334.5 L 720.5 515.5 L 698.5 515.5 Z M 636.5 334.5 L 658.5 334.5 L 658.5 515.5 L 636.5 515.5 Z M 883.5 334.5 L 905.5 334.5 L 905.5 515.5 L 883.5 515.5 Z M 1068.5 334.5 L 1090.5 334.5 L 1090.5 515.5 L 1068.5 515.5 Z M 945.5 334.5 L 967.5 334.5 L 967.5 515.5 L 945.5 515.5 Z M 760.5 334.5 L 781.5 334.5 L 781.5 515.5 L 760.5 515.5 Z M 822.5 334.5 L 843.5 334.5 L 843.5 515.5 L 822.5 515.5 Z M 1007.5 334.5 L 1028.5 334.5 L 1028.5 515.5 L 1007.5 515.5 Z M 1007.5 334.5 "/>
 </clipPath>
-<image id="image364" 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="#image364"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image365" 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="#image365"/>
+  <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="surface359">
+<g id="surface387">
 <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 857.785156 538.464844 L 857.785156 550.5 L 853.871094 550.5 L 853.871094 538.464844 L 842.046875 519.828125 L 846.886719 519.828125 L 855.890625 534.765625 L 864.640625 519.828125 L 869.3125 519.828125 Z M 857.785156 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 843 556 L 867 556 M 843 532 L 867 532 M 843 532 L 843 556 M 867 532 L 867 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 843 556 L 867 556 M 843 532 L 867 532 M 867 556 L 867 532 M 843 556 L 843 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/o41ai/sky130_fd_sc_lp__o41ai_lp.svg b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.svg
index da8c974..3afe14e 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.svg
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image347" 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="#image347"/>
+  <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 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="#image347"/>
+  <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 1197.5 757.5 L 1231.5 757.5 L 1231.5 853.5 L 1197.5 853.5 Z M 718.5 757.5 L 752.5 757.5 L 752.5 853.5 L 718.5 853.5 Z M 816.5 757.5 L 851.5 757.5 L 851.5 853.5 L 816.5 853.5 Z M 963.5 757.5 L 997.5 757.5 L 997.5 853.5 L 963.5 853.5 Z M 1062.5 757.5 L 1096.5 757.5 L 1096.5 853.5 L 1062.5 853.5 Z M 1062.5 757.5 "/>
 </clipPath>
-<image id="image348" 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="#image348"/>
+  <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 1192.5 209.5 L 1250.5 209.5 L 1250.5 438.5 L 1192.5 438.5 Z M 695.5 209.5 L 752.5 209.5 L 752.5 438.5 L 695.5 438.5 Z M 816.5 209.5 L 874.5 209.5 L 874.5 438.5 L 816.5 438.5 Z M 931.5 209.5 L 988.5 209.5 L 988.5 438.5 L 931.5 438.5 Z M 1062.5 209.5 L 1119.5 209.5 L 1119.5 438.5 L 1062.5 438.5 Z M 1062.5 209.5 "/>
 </clipPath>
-<image id="image349" 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="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image350" 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="#image350"/>
+  <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="surface344">
+<g id="surface372">
 <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 636.554688 796.246094 L 636.554688 815.5 L 630.292969 815.5 L 630.292969 796.246094 L 611.375 766.421875 L 619.117188 766.421875 L 633.523438 790.320312 L 647.527344 766.421875 L 655 766.421875 Z M 636.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 612 307 L 651 307 M 612 269 L 651 269 M 612 269 L 612 307 M 651 269 L 651 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 612 307 L 651 307 M 612 269 L 651 269 M 651 307 L 651 269 M 612 307 L 612 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/o41ai/sky130_fd_sc_lp__o41ai_m.svg b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.svg
index 4d4c8ad..f3a2957 100644
--- a/cells/o41ai/sky130_fd_sc_lp__o41ai_m.svg
+++ b/cells/o41ai/sky130_fd_sc_lp__o41ai_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image457" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image429"/>
+  <use xlink:href="#image457"/>
 </pattern>
 <mask id="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="#image429"/>
+  <use xlink:href="#image457"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1176.5 768.5 L 1211.5 768.5 L 1211.5 864.5 L 1176.5 864.5 Z M 743.5 768.5 L 777.5 768.5 L 777.5 864.5 L 743.5 864.5 Z M 854.5 768.5 L 889.5 768.5 L 889.5 864.5 L 854.5 864.5 Z M 975.5 768.5 L 1009.5 768.5 L 1009.5 864.5 L 975.5 864.5 Z M 1073.5 768.5 L 1107.5 768.5 L 1107.5 864.5 L 1073.5 864.5 Z M 1073.5 768.5 "/>
 </clipPath>
-<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image458" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image430"/>
+  <use xlink:href="#image458"/>
 </pattern>
 <mask id="mask2">
 <rect 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 397.5 L 1190.5 397.5 L 1190.5 493.5 L 1156.5 493.5 Z M 687.5 397.5 L 721.5 397.5 L 721.5 493.5 L 687.5 493.5 Z M 826.5 397.5 L 860.5 397.5 L 860.5 493.5 L 826.5 493.5 Z M 949.5 397.5 L 984.5 397.5 L 984.5 493.5 L 949.5 493.5 Z M 1073.5 397.5 L 1107.5 397.5 L 1107.5 493.5 L 1073.5 493.5 Z M 1073.5 397.5 "/>
 </clipPath>
-<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image459" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image431"/>
+  <use xlink:href="#image459"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image432" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image460" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image432"/>
+  <use xlink:href="#image460"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface426">
+<g id="surface454">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -246,6 +246,5 @@
 <path style=" 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.554688 542.246094 L 636.554688 561.5 L 630.292969 561.5 L 630.292969 542.246094 L 611.375 512.421875 L 619.117188 512.421875 L 633.523438 536.320312 L 647.527344 512.421875 L 655 512.421875 Z M 636.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 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/or2/sky130_fd_sc_lp__or2_0.svg b/cells/or2/sky130_fd_sc_lp__or2_0.svg
index f20e726..83c3d09 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_0.svg
+++ b/cells/or2/sky130_fd_sc_lp__or2_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 644.5 111.5 L 1282.5 111.5 L 1282.5 539.5 L 644.5 539.5 Z M 644.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 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="#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 1024.5 768.5 L 1058.5 768.5 L 1058.5 864.5 L 1024.5 864.5 Z M 827.5 768.5 L 861.5 768.5 L 861.5 864.5 L 827.5 864.5 Z M 925.5 768.5 L 960.5 768.5 L 960.5 864.5 L 925.5 864.5 Z M 925.5 768.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 1102.5 229.5 L 1136.5 229.5 L 1136.5 376.5 L 1102.5 376.5 Z M 836.5 280.5 L 870.5 280.5 L 870.5 376.5 L 836.5 376.5 Z M 925.5 280.5 L 960.5 280.5 L 960.5 376.5 L 925.5 376.5 Z M 925.5 280.5 "/>
 </clipPath>
-<image id="image309" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image309"/>
+  <use xlink:href="#image337"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 764.441406 462.496094 L 764.304688 464.652344 L 763.96875 466.605469 L 763.363281 468.421875 L 762.554688 470.039062 L 761.480469 471.585938 L 760.199219 472.933594 L 758.785156 474.078125 L 757.304688 474.953125 L 755.621094 475.625 L 753.871094 476.164062 L 751.988281 476.433594 L 749.96875 476.5 L 727.820312 476.5 L 727.820312 427.421875 L 747.746094 427.421875 L 750.640625 427.625 L 753.199219 428.097656 L 755.488281 428.902344 L 757.441406 430.046875 L 759.121094 431.53125 L 760.46875 433.347656 L 761.007812 434.355469 L 761.480469 435.433594 L 761.816406 436.445312 L 762.085938 437.589844 L 762.21875 438.734375 L 762.285156 439.878906 L 762.085938 442.300781 L 761.480469 444.386719 L 760.535156 446.339844 L 759.191406 447.957031 L 757.507812 449.4375 L 755.488281 450.582031 L 757.441406 451.457031 L 759.121094 452.398438 L 760.605469 453.476562 L 761.816406 454.6875 L 762.757812 455.96875 L 763.5 457.3125 L 763.769531 458.121094 L 763.96875 458.929688 L 764.171875 459.738281 L 764.304688 460.679688 L 764.375 461.554688 Z M 756.027344 440.753906 L 755.824219 438.734375 L 755.21875 437.050781 L 754.277344 435.570312 L 752.929688 434.492188 L 751.246094 433.683594 L 749.160156 433.144531 L 748.6875 433.144531 L 748.214844 433.078125 L 747.746094 433.011719 L 746.667969 433.011719 L 746.195312 432.941406 L 734.078125 432.941406 L 734.078125 448.5625 L 746.195312 448.5625 L 748.6875 448.425781 L 750.84375 448.023438 L 752.660156 447.28125 L 754.007812 446.273438 L 755.082031 444.925781 L 755.757812 443.3125 L 755.824219 442.972656 L 755.957031 442.167969 L 755.957031 441.222656 Z M 749.359375 470.980469 L 751.246094 470.914062 L 752.929688 470.507812 L 754.410156 469.835938 L 755.621094 468.960938 L 756.632812 467.816406 L 757.441406 466.402344 L 757.640625 465.863281 L 757.777344 465.257812 L 757.976562 464.585938 L 758.046875 463.976562 L 758.113281 463.304688 L 758.179688 462.566406 L 758.046875 461.082031 L 757.777344 459.667969 L 757.304688 458.457031 L 756.632812 457.3125 L 755.757812 456.371094 L 754.746094 455.496094 L 754.007812 455.09375 L 753.199219 454.753906 L 752.324219 454.484375 L 751.378906 454.285156 L 750.371094 454.148438 L 749.359375 454.082031 L 734.078125 454.082031 L 734.078125 470.980469 Z M 749.359375 470.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 724 647 L 763 647 M 724 608 L 763 608 M 724 608 L 724 647 M 763 608 L 763 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 724 647 L 763 647 M 724 608 L 763 608 M 763 647 L 763 608 M 724 647 L 724 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_lp__or2_1.svg b/cells/or2/sky130_fd_sc_lp__or2_1.svg
index 2076bf7..9852a05 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_1.svg
+++ b/cells/or2/sky130_fd_sc_lp__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 539.5 L 644.5 539.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 934.5 672.5 L 969.5 672.5 L 969.5 768.5 L 934.5 768.5 Z M 836.5 672.5 L 870.5 672.5 L 870.5 768.5 L 836.5 768.5 Z M 1080.5 672.5 L 1114.5 672.5 L 1114.5 864.5 L 1080.5 864.5 Z M 1080.5 672.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 1112.5 209.5 L 1146.5 209.5 L 1146.5 498.5 L 1112.5 498.5 Z M 836.5 401.5 L 870.5 401.5 L 870.5 498.5 L 836.5 498.5 Z M 925.5 401.5 L 960.5 401.5 L 960.5 498.5 L 925.5 498.5 Z M 925.5 401.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 764.441406 632.496094 L 764.304688 634.652344 L 763.96875 636.605469 L 763.363281 638.421875 L 762.554688 640.039062 L 761.480469 641.585938 L 760.199219 642.933594 L 758.785156 644.078125 L 757.304688 644.953125 L 755.621094 645.625 L 753.871094 646.164062 L 751.988281 646.433594 L 749.96875 646.5 L 727.820312 646.5 L 727.820312 597.421875 L 747.746094 597.421875 L 750.640625 597.625 L 753.199219 598.097656 L 755.488281 598.902344 L 757.441406 600.046875 L 759.121094 601.53125 L 760.46875 603.347656 L 761.007812 604.355469 L 761.480469 605.433594 L 761.816406 606.445312 L 762.085938 607.589844 L 762.21875 608.734375 L 762.285156 609.878906 L 762.085938 612.300781 L 761.480469 614.386719 L 760.535156 616.339844 L 759.191406 617.957031 L 757.507812 619.4375 L 755.488281 620.582031 L 757.441406 621.457031 L 759.121094 622.398438 L 760.605469 623.476562 L 761.816406 624.6875 L 762.757812 625.96875 L 763.5 627.3125 L 763.769531 628.121094 L 763.96875 628.929688 L 764.171875 629.738281 L 764.304688 630.679688 L 764.375 631.554688 Z M 756.027344 610.753906 L 755.824219 608.734375 L 755.21875 607.050781 L 754.277344 605.570312 L 752.929688 604.492188 L 751.246094 603.683594 L 749.160156 603.144531 L 748.6875 603.144531 L 748.214844 603.078125 L 747.746094 603.011719 L 746.667969 603.011719 L 746.195312 602.941406 L 734.078125 602.941406 L 734.078125 618.5625 L 746.195312 618.5625 L 748.6875 618.425781 L 750.84375 618.023438 L 752.660156 617.28125 L 754.007812 616.273438 L 755.082031 614.925781 L 755.757812 613.3125 L 755.824219 612.972656 L 755.957031 612.167969 L 755.957031 611.222656 Z M 749.359375 640.980469 L 751.246094 640.914062 L 752.929688 640.507812 L 754.410156 639.835938 L 755.621094 638.960938 L 756.632812 637.816406 L 757.441406 636.402344 L 757.640625 635.863281 L 757.777344 635.257812 L 757.976562 634.585938 L 758.046875 633.976562 L 758.113281 633.304688 L 758.179688 632.566406 L 758.046875 631.082031 L 757.777344 629.667969 L 757.304688 628.457031 L 756.632812 627.3125 L 755.757812 626.371094 L 754.746094 625.496094 L 754.007812 625.09375 L 753.199219 624.753906 L 752.324219 624.484375 L 751.378906 624.285156 L 750.371094 624.148438 L 749.359375 624.082031 L 734.078125 624.082031 L 734.078125 640.980469 Z M 749.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 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/or2/sky130_fd_sc_lp__or2_2.svg b/cells/or2/sky130_fd_sc_lp__or2_2.svg
index 08a98b4..794c80d 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_2.svg
+++ b/cells/or2/sky130_fd_sc_lp__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 539.5 L 644.5 539.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 1105.5 672.5 L 1140.5 672.5 L 1140.5 864.5 L 1105.5 864.5 Z M 788.5 768.5 L 822.5 768.5 L 822.5 864.5 L 788.5 864.5 Z M 886.5 768.5 L 921.5 768.5 L 921.5 864.5 L 886.5 864.5 Z M 1007.5 672.5 L 1041.5 672.5 L 1041.5 864.5 L 1007.5 864.5 Z M 1007.5 672.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 886.5 375.5 L 921.5 375.5 L 921.5 471.5 L 886.5 471.5 Z M 804.5 375.5 L 838.5 375.5 L 838.5 471.5 L 804.5 471.5 Z M 1105.5 209.5 L 1140.5 209.5 L 1140.5 498.5 L 1105.5 498.5 Z M 1007.5 209.5 L 1041.5 209.5 L 1041.5 498.5 L 1007.5 498.5 Z M 1007.5 209.5 "/>
 </clipPath>
-<image id="image285" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image285"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -152,6 +152,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 764.441406 632.496094 L 764.304688 634.652344 L 763.96875 636.605469 L 763.363281 638.421875 L 762.554688 640.039062 L 761.480469 641.585938 L 760.199219 642.933594 L 758.785156 644.078125 L 757.304688 644.953125 L 755.621094 645.625 L 753.871094 646.164062 L 751.988281 646.433594 L 749.96875 646.5 L 727.820312 646.5 L 727.820312 597.421875 L 747.746094 597.421875 L 750.640625 597.625 L 753.199219 598.097656 L 755.488281 598.902344 L 757.441406 600.046875 L 759.121094 601.53125 L 760.46875 603.347656 L 761.007812 604.355469 L 761.480469 605.433594 L 761.816406 606.445312 L 762.085938 607.589844 L 762.21875 608.734375 L 762.285156 609.878906 L 762.085938 612.300781 L 761.480469 614.386719 L 760.535156 616.339844 L 759.191406 617.957031 L 757.507812 619.4375 L 755.488281 620.582031 L 757.441406 621.457031 L 759.121094 622.398438 L 760.605469 623.476562 L 761.816406 624.6875 L 762.757812 625.96875 L 763.5 627.3125 L 763.769531 628.121094 L 763.96875 628.929688 L 764.171875 629.738281 L 764.304688 630.679688 L 764.375 631.554688 Z M 756.027344 610.753906 L 755.824219 608.734375 L 755.21875 607.050781 L 754.277344 605.570312 L 752.929688 604.492188 L 751.246094 603.683594 L 749.160156 603.144531 L 748.6875 603.144531 L 748.214844 603.078125 L 747.746094 603.011719 L 746.667969 603.011719 L 746.195312 602.941406 L 734.078125 602.941406 L 734.078125 618.5625 L 746.195312 618.5625 L 748.6875 618.425781 L 750.84375 618.023438 L 752.660156 617.28125 L 754.007812 616.273438 L 755.082031 614.925781 L 755.757812 613.3125 L 755.824219 612.972656 L 755.957031 612.167969 L 755.957031 611.222656 Z M 749.359375 640.980469 L 751.246094 640.914062 L 752.929688 640.507812 L 754.410156 639.835938 L 755.621094 638.960938 L 756.632812 637.816406 L 757.441406 636.402344 L 757.640625 635.863281 L 757.777344 635.257812 L 757.976562 634.585938 L 758.046875 633.976562 L 758.113281 633.304688 L 758.179688 632.566406 L 758.046875 631.082031 L 757.777344 629.667969 L 757.304688 628.457031 L 756.632812 627.3125 L 755.757812 626.371094 L 754.746094 625.496094 L 754.007812 625.09375 L 753.199219 624.753906 L 752.324219 624.484375 L 751.378906 624.285156 L 750.371094 624.148438 L 749.359375 624.082031 L 734.078125 624.082031 L 734.078125 640.980469 Z M 749.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 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/or2/sky130_fd_sc_lp__or2_4.svg b/cells/or2/sky130_fd_sc_lp__or2_4.svg
index a2c4ba0..65fcf25 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_4.svg
+++ b/cells/or2/sky130_fd_sc_lp__or2_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.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 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="#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 1178.5 672.5 L 1213.5 672.5 L 1213.5 864.5 L 1178.5 864.5 Z M 669.5 672.5 L 703.5 672.5 L 703.5 864.5 L 669.5 864.5 Z M 771.5 672.5 L 805.5 672.5 L 805.5 864.5 L 771.5 864.5 Z M 883.5 672.5 L 917.5 672.5 L 917.5 864.5 L 883.5 864.5 Z M 981.5 672.5 L 1016.5 672.5 L 1016.5 864.5 L 981.5 864.5 Z M 1080.5 672.5 L 1114.5 672.5 L 1114.5 864.5 L 1080.5 864.5 Z M 1080.5 672.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 1178.5 209.5 L 1213.5 209.5 L 1213.5 498.5 L 1178.5 498.5 Z M 669.5 209.5 L 703.5 209.5 L 703.5 498.5 L 669.5 498.5 Z M 751.5 209.5 L 785.5 209.5 L 785.5 498.5 L 751.5 498.5 Z M 883.5 209.5 L 917.5 209.5 L 917.5 498.5 L 883.5 498.5 Z M 981.5 209.5 L 1016.5 209.5 L 1016.5 498.5 L 981.5 498.5 Z M 1080.5 209.5 L 1114.5 209.5 L 1114.5 498.5 L 1080.5 498.5 Z M 1080.5 209.5 "/>
 </clipPath>
-<image id="image283" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image283"/>
+  <use xlink:href="#image312"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image313" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image313"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface278">
+<g id="surface307">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <path style=" 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 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/or2/sky130_fd_sc_lp__or2_lp.svg b/cells/or2/sky130_fd_sc_lp__or2_lp.svg
index c8d58de..8504b8d 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp.svg
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 1187.5 691.5 L 1221.5 691.5 L 1221.5 788.5 L 1187.5 788.5 Z M 678.5 691.5 L 712.5 691.5 L 712.5 788.5 L 678.5 788.5 Z M 767.5 691.5 L 801.5 691.5 L 801.5 788.5 L 767.5 788.5 Z M 866.5 691.5 L 900.5 691.5 L 900.5 788.5 L 866.5 788.5 Z M 948.5 691.5 L 983.5 691.5 L 983.5 788.5 L 948.5 788.5 Z M 1097.5 691.5 L 1132.5 691.5 L 1132.5 788.5 L 1097.5 788.5 Z M 1097.5 691.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 1123.5 260.5 L 1158.5 260.5 L 1158.5 357.5 L 1123.5 357.5 Z M 1041.5 260.5 L 1075.5 260.5 L 1075.5 357.5 L 1041.5 357.5 Z M 808.5 286.5 L 843.5 286.5 L 843.5 382.5 L 808.5 382.5 Z M 719.5 286.5 L 753.5 286.5 L 753.5 382.5 L 719.5 382.5 Z M 719.5 286.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/or2/sky130_fd_sc_lp__or2_lp2.svg b/cells/or2/sky130_fd_sc_lp__or2_lp2.svg
index f6dd4fe..9ae567e 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_lp2.svg
+++ b/cells/or2/sky130_fd_sc_lp__or2_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 1214.5 757.5 L 1248.5 757.5 L 1248.5 853.5 L 1214.5 853.5 Z M 763.5 757.5 L 797.5 757.5 L 797.5 853.5 L 763.5 853.5 Z M 852.5 757.5 L 886.5 757.5 L 886.5 853.5 L 852.5 853.5 Z M 950.5 757.5 L 985.5 757.5 L 985.5 853.5 L 950.5 853.5 Z M 1033.5 757.5 L 1067.5 757.5 L 1067.5 853.5 L 1033.5 853.5 Z M 1132.5 757.5 L 1166.5 757.5 L 1166.5 853.5 L 1132.5 853.5 Z M 1132.5 757.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 1191.5 220.5 L 1248.5 220.5 L 1248.5 449.5 L 1191.5 449.5 Z M 901.5 220.5 L 958.5 220.5 L 958.5 449.5 L 901.5 449.5 Z M 1013.5 220.5 L 1071.5 220.5 L 1071.5 449.5 L 1013.5 449.5 Z M 1013.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/or2/sky130_fd_sc_lp__or2_m.svg b/cells/or2/sky130_fd_sc_lp__or2_m.svg
index 1d194ae..8c9aaf3 100644
--- a/cells/or2/sky130_fd_sc_lp__or2_m.svg
+++ b/cells/or2/sky130_fd_sc_lp__or2_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 701.5 111.5 L 1228.5 111.5 L 1228.5 539.5 L 701.5 539.5 Z M 701.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="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 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="#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 1058.5 768.5 L 1093.5 768.5 L 1093.5 864.5 L 1058.5 864.5 Z M 861.5 768.5 L 895.5 768.5 L 895.5 864.5 L 861.5 864.5 Z M 960.5 768.5 L 994.5 768.5 L 994.5 864.5 L 960.5 864.5 Z M 960.5 768.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 1058.5 367.5 L 1093.5 367.5 L 1093.5 463.5 L 1058.5 463.5 Z M 877.5 367.5 L 911.5 367.5 L 911.5 463.5 L 877.5 463.5 Z M 960.5 367.5 L 994.5 367.5 L 994.5 463.5 L 960.5 463.5 Z M 960.5 367.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/or2b/sky130_fd_sc_lp__or2b_1.svg b/cells/or2b/sky130_fd_sc_lp__or2b_1.svg
index 7e05e6a..9c1f296 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_1.svg
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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 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="#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 1167.5 670.5 L 1201.5 670.5 L 1201.5 862.5 L 1167.5 862.5 Z M 850.5 766.5 L 884.5 766.5 L 884.5 862.5 L 850.5 862.5 Z M 1047.5 766.5 L 1081.5 766.5 L 1081.5 862.5 L 1047.5 862.5 Z M 948.5 766.5 L 983.5 766.5 L 983.5 862.5 L 948.5 862.5 Z M 948.5 766.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 725.5 209.5 L 759.5 209.5 L 759.5 305.5 L 725.5 305.5 Z M 1153.5 209.5 L 1188.5 209.5 L 1188.5 498.5 L 1153.5 498.5 Z M 950.5 401.5 L 985.5 401.5 L 985.5 498.5 L 950.5 498.5 Z M 1033.5 401.5 L 1067.5 401.5 L 1067.5 498.5 L 1033.5 498.5 Z M 1033.5 401.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1028.410156 292.757812 L 1009.492188 292.757812 L 1004.308594 307.5 L 997.644531 307.5 L 1015.148438 258.421875 L 1023.226562 258.421875 L 1040.460938 307.5 L 1033.460938 307.5 Z M 1026.660156 287.503906 L 1019.121094 265.15625 L 1011.042969 287.503906 Z M 1026.660156 287.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 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/or2b/sky130_fd_sc_lp__or2b_2.svg b/cells/or2b/sky130_fd_sc_lp__or2b_2.svg
index ce9fe08..07bae76 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_2.svg
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 995.5 670.5 L 1030.5 670.5 L 1030.5 766.5 L 995.5 766.5 Z M 1119.5 670.5 L 1153.5 670.5 L 1153.5 766.5 L 1119.5 766.5 Z M 749.5 670.5 L 783.5 670.5 L 783.5 862.5 L 749.5 862.5 Z M 847.5 670.5 L 882.5 670.5 L 882.5 862.5 L 847.5 862.5 Z M 614.5 766.5 L 648.5 766.5 L 648.5 862.5 L 614.5 862.5 Z M 614.5 766.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 839.5 209.5 L 874.5 209.5 L 874.5 498.5 L 839.5 498.5 Z M 1119.5 401.5 L 1153.5 401.5 L 1153.5 498.5 L 1119.5 498.5 Z M 1036.5 401.5 L 1071.5 401.5 L 1071.5 498.5 L 1036.5 498.5 Z M 628.5 401.5 L 663.5 401.5 L 663.5 498.5 L 628.5 498.5 Z M 741.5 209.5 L 775.5 209.5 L 775.5 498.5 L 741.5 498.5 Z M 741.5 209.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 801.824219 282.320312 L 819.191406 307.5 L 811.449219 307.5 L 798.050781 287.035156 L 784.589844 307.5 L 776.980469 307.5 L 794.351562 282.320312 L 778.058594 258.421875 L 785.664062 258.421875 L 798.253906 277.675781 L 810.910156 258.421875 L 818.382812 258.421875 Z M 801.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 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/or2b/sky130_fd_sc_lp__or2b_4.svg b/cells/or2b/sky130_fd_sc_lp__or2b_4.svg
index de94bd7..9373636 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_4.svg
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image324" 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="#image324"/>
+  <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 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="#image324"/>
+  <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 1224.5 672.5 L 1259.5 672.5 L 1259.5 864.5 L 1224.5 864.5 Z M 701.5 768.5 L 735.5 768.5 L 735.5 864.5 L 701.5 864.5 Z M 1323.5 672.5 L 1357.5 672.5 L 1357.5 864.5 L 1323.5 864.5 Z M 1126.5 672.5 L 1160.5 672.5 L 1160.5 864.5 L 1126.5 864.5 Z M 1027.5 672.5 L 1062.5 672.5 L 1062.5 864.5 L 1027.5 864.5 Z M 920.5 672.5 L 954.5 672.5 L 954.5 864.5 L 920.5 864.5 Z M 821.5 672.5 L 855.5 672.5 L 855.5 864.5 L 821.5 864.5 Z M 821.5 672.5 "/>
 </clipPath>
-<image id="image325" 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="#image325"/>
+  <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 559.5 254.5 L 593.5 254.5 L 593.5 350.5 L 559.5 350.5 Z M 903.5 209.5 L 938.5 209.5 L 938.5 498.5 L 903.5 498.5 Z M 1323.5 209.5 L 1357.5 209.5 L 1357.5 498.5 L 1323.5 498.5 Z M 1126.5 209.5 L 1160.5 209.5 L 1160.5 498.5 L 1126.5 498.5 Z M 1027.5 209.5 L 1062.5 209.5 L 1062.5 498.5 L 1027.5 498.5 Z M 1224.5 209.5 L 1259.5 209.5 L 1259.5 498.5 L 1224.5 498.5 Z M 821.5 209.5 L 855.5 209.5 L 855.5 498.5 L 821.5 498.5 Z M 821.5 209.5 "/>
 </clipPath>
-<image id="image326" 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="#image326"/>
+  <use xlink:href="#image356"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image327" 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="#image327"/>
+  <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="surface321">
+<g id="surface351">
 <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 1406.824219 536.320312 L 1424.191406 561.5 L 1416.449219 561.5 L 1403.050781 541.035156 L 1389.589844 561.5 L 1381.980469 561.5 L 1399.351562 536.320312 L 1383.058594 512.421875 L 1390.664062 512.421875 L 1403.253906 531.675781 L 1415.910156 512.421875 L 1423.382812 512.421875 Z M 1406.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 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/or2b/sky130_fd_sc_lp__or2b_lp.svg b/cells/or2b/sky130_fd_sc_lp__or2b_lp.svg
index e950502..da8a0ad 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_lp.svg
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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 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="#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 1261.5 757.5 L 1295.5 757.5 L 1295.5 853.5 L 1261.5 853.5 Z M 622.5 757.5 L 656.5 757.5 L 656.5 853.5 L 622.5 853.5 Z M 704.5 757.5 L 738.5 757.5 L 738.5 853.5 L 704.5 853.5 Z M 803.5 757.5 L 837.5 757.5 L 837.5 853.5 L 803.5 853.5 Z M 892.5 757.5 L 926.5 757.5 L 926.5 853.5 L 892.5 853.5 Z M 991.5 757.5 L 1025.5 757.5 L 1025.5 853.5 L 991.5 853.5 Z M 1073.5 757.5 L 1107.5 757.5 L 1107.5 853.5 L 1073.5 853.5 Z M 1172.5 757.5 L 1206.5 757.5 L 1206.5 853.5 L 1172.5 853.5 Z M 1172.5 757.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 1219.5 220.5 L 1276.5 220.5 L 1276.5 449.5 L 1219.5 449.5 Z M 622.5 220.5 L 679.5 220.5 L 679.5 449.5 L 622.5 449.5 Z M 920.5 220.5 L 977.5 220.5 L 977.5 449.5 L 920.5 449.5 Z M 1032.5 220.5 L 1089.5 220.5 L 1089.5 449.5 L 1032.5 449.5 Z M 1032.5 220.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/or2b/sky130_fd_sc_lp__or2b_m.svg b/cells/or2b/sky130_fd_sc_lp__or2b_m.svg
index 73fd749..21948ca 100644
--- a/cells/or2b/sky130_fd_sc_lp__or2b_m.svg
+++ b/cells/or2b/sky130_fd_sc_lp__or2b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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="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="#image327"/>
+  <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 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="#image327"/>
+  <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 1167.5 746.5 L 1201.5 746.5 L 1201.5 843.5 L 1167.5 843.5 Z M 818.5 746.5 L 852.5 746.5 L 852.5 843.5 L 818.5 843.5 Z M 925.5 746.5 L 960.5 746.5 L 960.5 843.5 L 925.5 843.5 Z M 1024.5 746.5 L 1058.5 746.5 L 1058.5 843.5 L 1024.5 843.5 Z M 1024.5 746.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <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 725.5 254.5 L 759.5 254.5 L 759.5 350.5 L 725.5 350.5 Z M 950.5 389.5 L 985.5 389.5 L 985.5 485.5 L 950.5 485.5 Z M 1149.5 389.5 L 1183.5 389.5 L 1183.5 485.5 L 1149.5 485.5 Z M 1033.5 389.5 L 1067.5 389.5 L 1067.5 485.5 L 1033.5 485.5 Z M 1033.5 389.5 "/>
 </clipPath>
-<image id="image329" 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="#image329"/>
+  <use xlink:href="#image358"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image330" 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="#image330"/>
+  <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="surface324">
+<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 752.1875 427.574219 L 752.1875 476.652344 L 745.121094 476.652344 L 719.738281 436.863281 L 719.738281 476.652344 L 713.816406 476.652344 L 713.816406 427.574219 L 720.613281 427.574219 L 746.265625 467.699219 L 746.265625 427.574219 Z M 752.1875 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 669 647 L 708 647 M 669 608 L 708 608 M 669 608 L 669 647 M 708 608 L 708 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 669 647 L 708 647 M 669 608 L 708 608 M 708 647 L 708 608 M 669 647 L 669 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 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_lp__or3_0.svg b/cells/or3/sky130_fd_sc_lp__or3_0.svg
index 5ea47a5..f625a4c 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_0.svg
+++ b/cells/or3/sky130_fd_sc_lp__or3_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.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 1130.5 759.5 L 1165.5 759.5 L 1165.5 855.5 L 1130.5 855.5 Z M 727.5 759.5 L 761.5 759.5 L 761.5 855.5 L 727.5 855.5 Z M 933.5 759.5 L 968.5 759.5 L 968.5 855.5 L 933.5 855.5 Z M 1032.5 759.5 L 1066.5 759.5 L 1066.5 855.5 L 1032.5 855.5 Z M 1032.5 759.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 1159.5 220.5 L 1193.5 220.5 L 1193.5 367.5 L 1159.5 367.5 Z M 818.5 271.5 L 852.5 271.5 L 852.5 367.5 L 818.5 367.5 Z M 983.5 271.5 L 1017.5 271.5 L 1017.5 367.5 L 983.5 367.5 Z M 900.5 271.5 L 934.5 271.5 L 934.5 367.5 L 900.5 367.5 Z M 900.5 271.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 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/or3/sky130_fd_sc_lp__or3_1.svg b/cells/or3/sky130_fd_sc_lp__or3_1.svg
index 141b545..c474777 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_1.svg
+++ b/cells/or3/sky130_fd_sc_lp__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 539.5 L 589.5 539.5 Z M 589.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="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 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="#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 1150.5 672.5 L 1184.5 672.5 L 1184.5 864.5 L 1150.5 864.5 Z M 748.5 768.5 L 782.5 768.5 L 782.5 864.5 L 748.5 864.5 Z M 1025.5 768.5 L 1059.5 768.5 L 1059.5 864.5 L 1025.5 864.5 Z M 926.5 768.5 L 961.5 768.5 L 961.5 864.5 L 926.5 864.5 Z M 926.5 768.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 879.5 292.5 L 914.5 292.5 L 914.5 389.5 L 879.5 389.5 Z M 779.5 292.5 L 813.5 292.5 L 813.5 389.5 L 779.5 389.5 Z M 985.5 292.5 L 1019.5 292.5 L 1019.5 389.5 L 985.5 389.5 Z M 1167.5 209.5 L 1201.5 209.5 L 1201.5 498.5 L 1167.5 498.5 Z M 1167.5 209.5 "/>
 </clipPath>
-<image id="image308" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image308"/>
+  <use xlink:href="#image335"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 929.441406 547.496094 L 929.304688 549.652344 L 928.96875 551.605469 L 928.363281 553.421875 L 927.554688 555.039062 L 926.480469 556.585938 L 925.199219 557.933594 L 923.785156 559.078125 L 922.304688 559.953125 L 920.621094 560.625 L 918.871094 561.164062 L 916.988281 561.433594 L 914.96875 561.5 L 892.820312 561.5 L 892.820312 512.421875 L 912.746094 512.421875 L 915.640625 512.625 L 918.199219 513.097656 L 920.488281 513.902344 L 922.441406 515.046875 L 924.121094 516.53125 L 925.46875 518.347656 L 926.007812 519.355469 L 926.480469 520.433594 L 926.816406 521.445312 L 927.085938 522.589844 L 927.21875 523.734375 L 927.285156 524.878906 L 927.085938 527.300781 L 926.480469 529.386719 L 925.535156 531.339844 L 924.191406 532.957031 L 922.507812 534.4375 L 920.488281 535.582031 L 922.441406 536.457031 L 924.121094 537.398438 L 925.605469 538.476562 L 926.816406 539.6875 L 927.757812 540.96875 L 928.5 542.3125 L 928.769531 543.121094 L 928.96875 543.929688 L 929.171875 544.738281 L 929.304688 545.679688 L 929.375 546.554688 Z M 921.027344 525.753906 L 920.824219 523.734375 L 920.21875 522.050781 L 919.277344 520.570312 L 917.929688 519.492188 L 916.246094 518.683594 L 914.160156 518.144531 L 913.6875 518.144531 L 913.214844 518.078125 L 912.746094 518.011719 L 911.667969 518.011719 L 911.195312 517.941406 L 899.078125 517.941406 L 899.078125 533.5625 L 911.195312 533.5625 L 913.6875 533.425781 L 915.84375 533.023438 L 917.660156 532.28125 L 919.007812 531.273438 L 920.082031 529.925781 L 920.757812 528.3125 L 920.824219 527.972656 L 920.957031 527.167969 L 920.957031 526.222656 Z M 914.359375 555.980469 L 916.246094 555.914062 L 917.929688 555.507812 L 919.410156 554.835938 L 920.621094 553.960938 L 921.632812 552.816406 L 922.441406 551.402344 L 922.640625 550.863281 L 922.777344 550.257812 L 922.976562 549.585938 L 923.046875 548.976562 L 923.113281 548.304688 L 923.179688 547.566406 L 923.046875 546.082031 L 922.777344 544.667969 L 922.304688 543.457031 L 921.632812 542.3125 L 920.757812 541.371094 L 919.746094 540.496094 L 919.007812 540.09375 L 918.199219 539.753906 L 917.324219 539.484375 L 916.378906 539.285156 L 915.371094 539.148438 L 914.359375 539.082031 L 899.078125 539.082031 L 899.078125 555.980469 Z M 914.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 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/or3/sky130_fd_sc_lp__or3_2.svg b/cells/or3/sky130_fd_sc_lp__or3_2.svg
index 17e854c..b040b58 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_2.svg
+++ b/cells/or3/sky130_fd_sc_lp__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 539.5 L 533.5 539.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 1088.5 657.5 L 1122.5 657.5 L 1122.5 849.5 L 1088.5 849.5 Z M 854.5 753.5 L 889.5 753.5 L 889.5 849.5 L 854.5 849.5 Z M 678.5 753.5 L 712.5 753.5 L 712.5 849.5 L 678.5 849.5 Z M 953.5 753.5 L 987.5 753.5 L 987.5 849.5 L 953.5 849.5 Z M 1187.5 657.5 L 1221.5 657.5 L 1221.5 849.5 L 1187.5 849.5 Z M 1187.5 657.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 1095.5 209.5 L 1129.5 209.5 L 1129.5 498.5 L 1095.5 498.5 Z M 780.5 401.5 L 814.5 401.5 L 814.5 498.5 L 780.5 498.5 Z M 694.5 401.5 L 728.5 401.5 L 728.5 498.5 L 694.5 498.5 Z M 862.5 401.5 L 897.5 401.5 L 897.5 498.5 L 862.5 498.5 Z M 1193.5 209.5 L 1228.5 209.5 L 1228.5 498.5 L 1193.5 498.5 Z M 1193.5 209.5 "/>
 </clipPath>
-<image id="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 1186.824219 366.320312 L 1204.191406 391.5 L 1196.449219 391.5 L 1183.050781 371.035156 L 1169.589844 391.5 L 1161.980469 391.5 L 1179.351562 366.320312 L 1163.058594 342.421875 L 1170.664062 342.421875 L 1183.253906 361.675781 L 1195.910156 342.421875 L 1203.382812 342.421875 Z M 1186.824219 366.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 1162 731 L 1201 731 M 1162 693 L 1201 693 M 1162 693 L 1162 731 M 1201 693 L 1201 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 1162 731 L 1201 731 M 1162 693 L 1201 693 M 1201 731 L 1201 693 M 1162 731 L 1162 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 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_lp__or3_4.svg b/cells/or3/sky130_fd_sc_lp__or3_4.svg
index d1d8fc8..a4ae183 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_4.svg
+++ b/cells/or3/sky130_fd_sc_lp__or3_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.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="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 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="#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 1250.5 670.5 L 1284.5 670.5 L 1284.5 862.5 L 1250.5 862.5 Z M 616.5 670.5 L 650.5 670.5 L 650.5 862.5 L 616.5 862.5 Z M 733.5 670.5 L 767.5 670.5 L 767.5 862.5 L 733.5 862.5 Z M 831.5 670.5 L 866.5 670.5 L 866.5 862.5 L 831.5 862.5 Z M 954.5 670.5 L 988.5 670.5 L 988.5 862.5 L 954.5 862.5 Z M 1052.5 670.5 L 1087.5 670.5 L 1087.5 862.5 L 1052.5 862.5 Z M 1151.5 670.5 L 1185.5 670.5 L 1185.5 862.5 L 1151.5 862.5 Z M 1151.5 670.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 1250.5 209.5 L 1284.5 209.5 L 1284.5 498.5 L 1250.5 498.5 Z M 616.5 209.5 L 650.5 209.5 L 650.5 498.5 L 616.5 498.5 Z M 698.5 209.5 L 733.5 209.5 L 733.5 498.5 L 698.5 498.5 Z M 822.5 209.5 L 856.5 209.5 L 856.5 498.5 L 822.5 498.5 Z M 954.5 209.5 L 988.5 209.5 L 988.5 498.5 L 954.5 498.5 Z M 1052.5 209.5 L 1087.5 209.5 L 1087.5 498.5 L 1052.5 498.5 Z M 1151.5 209.5 L 1185.5 209.5 L 1185.5 498.5 L 1151.5 498.5 Z M 1151.5 209.5 "/>
 </clipPath>
-<image id="image291" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image319" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image291"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image320" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image320"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface286">
+<g id="surface314">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -158,6 +158,5 @@
 <path style=" 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 536.320312 L 1424.191406 561.5 L 1416.449219 561.5 L 1403.050781 541.035156 L 1389.589844 561.5 L 1381.980469 561.5 L 1399.351562 536.320312 L 1383.058594 512.421875 L 1390.664062 512.421875 L 1403.253906 531.675781 L 1415.910156 512.421875 L 1423.382812 512.421875 Z M 1406.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 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/or3/sky130_fd_sc_lp__or3_lp.svg b/cells/or3/sky130_fd_sc_lp__or3_lp.svg
index 33445fc..0952742 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_lp.svg
+++ b/cells/or3/sky130_fd_sc_lp__or3_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image372" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image345"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1271.5 757.5 L 1306.5 757.5 L 1306.5 853.5 L 1271.5 853.5 Z M 646.5 757.5 L 680.5 757.5 L 680.5 853.5 L 646.5 853.5 Z M 728.5 757.5 L 763.5 757.5 L 763.5 853.5 L 728.5 853.5 Z M 827.5 757.5 L 861.5 757.5 L 861.5 853.5 L 827.5 853.5 Z M 909.5 757.5 L 944.5 757.5 L 944.5 853.5 L 909.5 853.5 Z M 1008.5 757.5 L 1042.5 757.5 L 1042.5 853.5 L 1008.5 853.5 Z M 1090.5 757.5 L 1125.5 757.5 L 1125.5 853.5 L 1090.5 853.5 Z M 1189.5 757.5 L 1223.5 757.5 L 1223.5 853.5 L 1189.5 853.5 Z M 1189.5 757.5 "/>
 </clipPath>
-<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1215.5 220.5 L 1272.5 220.5 L 1272.5 449.5 L 1215.5 449.5 Z M 710.5 220.5 L 767.5 220.5 L 767.5 449.5 L 710.5 449.5 Z M 972.5 220.5 L 1030.5 220.5 L 1030.5 449.5 L 972.5 449.5 Z M 1085.5 220.5 L 1142.5 220.5 L 1142.5 449.5 L 1085.5 449.5 Z M 1085.5 220.5 "/>
 </clipPath>
-<image id="image347" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image347"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image348" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image348"/>
+  <use xlink:href="#image375"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface342">
+<g id="surface369">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -215,6 +215,5 @@
 <path style=" 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/or3/sky130_fd_sc_lp__or3_m.svg b/cells/or3/sky130_fd_sc_lp__or3_m.svg
index e9f4fa0..9ade6e3 100644
--- a/cells/or3/sky130_fd_sc_lp__or3_m.svg
+++ b/cells/or3/sky130_fd_sc_lp__or3_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 589.5 111.5 L 1337.5 111.5 L 1337.5 539.5 L 589.5 539.5 Z M 589.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="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 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="#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 1135.5 768.5 L 1169.5 768.5 L 1169.5 864.5 L 1135.5 864.5 Z M 743.5 768.5 L 777.5 768.5 L 777.5 864.5 L 743.5 864.5 Z M 929.5 768.5 L 963.5 768.5 L 963.5 864.5 L 929.5 864.5 Z M 1027.5 768.5 L 1062.5 768.5 L 1062.5 864.5 L 1027.5 864.5 Z M 1027.5 768.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 1135.5 367.5 L 1169.5 367.5 L 1169.5 463.5 L 1135.5 463.5 Z M 846.5 367.5 L 881.5 367.5 L 881.5 463.5 L 846.5 463.5 Z M 929.5 367.5 L 963.5 367.5 L 963.5 463.5 L 929.5 463.5 Z M 1011.5 367.5 L 1046.5 367.5 L 1046.5 463.5 L 1011.5 463.5 Z M 1011.5 367.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/or3b/sky130_fd_sc_lp__or3b_1.svg b/cells/or3b/sky130_fd_sc_lp__or3b_1.svg
index 0d8d009..c4369f7 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_1.svg
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 1216.5 641.5 L 1251.5 641.5 L 1251.5 833.5 L 1216.5 833.5 Z M 1096.5 737.5 L 1130.5 737.5 L 1130.5 833.5 L 1096.5 833.5 Z M 890.5 737.5 L 924.5 737.5 L 924.5 833.5 L 890.5 833.5 Z M 997.5 737.5 L 1032.5 737.5 L 1032.5 833.5 L 997.5 833.5 Z M 669.5 742.5 L 703.5 742.5 L 703.5 838.5 L 669.5 838.5 Z M 669.5 742.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 669.5 235.5 L 703.5 235.5 L 703.5 331.5 L 669.5 331.5 Z M 1216.5 209.5 L 1251.5 209.5 L 1251.5 498.5 L 1216.5 498.5 Z M 890.5 401.5 L 924.5 401.5 L 924.5 498.5 L 890.5 498.5 Z M 1096.5 401.5 L 1130.5 401.5 L 1130.5 498.5 L 1096.5 498.5 Z M 972.5 401.5 L 1007.5 401.5 L 1007.5 498.5 L 972.5 498.5 Z M 972.5 401.5 "/>
 </clipPath>
-<image id="image345" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image373" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image345"/>
+  <use xlink:href="#image373"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image346"/>
+  <use xlink:href="#image374"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface340">
+<g id="surface368">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -192,6 +192,5 @@
 <path style=" 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 451.320312 L 1314.191406 476.5 L 1306.449219 476.5 L 1293.050781 456.035156 L 1279.589844 476.5 L 1271.980469 476.5 L 1289.351562 451.320312 L 1273.058594 427.421875 L 1280.664062 427.421875 L 1293.253906 446.675781 L 1305.910156 427.421875 L 1313.382812 427.421875 Z M 1296.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 1272 647 L 1311 647 M 1272 608 L 1311 608 M 1272 608 L 1272 647 M 1311 608 L 1311 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 1272 647 L 1311 647 M 1272 608 L 1311 608 M 1311 647 L 1311 608 M 1272 647 L 1272 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/or3b/sky130_fd_sc_lp__or3b_2.svg b/cells/or3b/sky130_fd_sc_lp__or3b_2.svg
index e4676e8..25b81aa 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_2.svg
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="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 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="#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 675.5 672.5 L 710.5 672.5 L 710.5 768.5 L 675.5 768.5 Z M 1221.5 768.5 L 1255.5 768.5 L 1255.5 864.5 L 1221.5 864.5 Z M 1118.5 768.5 L 1152.5 768.5 L 1152.5 864.5 L 1118.5 864.5 Z M 1019.5 768.5 L 1054.5 768.5 L 1054.5 864.5 L 1019.5 864.5 Z M 899.5 672.5 L 933.5 672.5 L 933.5 864.5 L 899.5 864.5 Z M 800.5 672.5 L 835.5 672.5 L 835.5 864.5 L 800.5 864.5 Z M 800.5 672.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 1138.5 381.5 L 1173.5 381.5 L 1173.5 477.5 L 1138.5 477.5 Z M 1056.5 381.5 L 1090.5 381.5 L 1090.5 477.5 L 1056.5 477.5 Z M 1221.5 381.5 L 1255.5 381.5 L 1255.5 477.5 L 1221.5 477.5 Z M 834.5 209.5 L 868.5 209.5 L 868.5 498.5 L 834.5 498.5 Z M 932.5 209.5 L 967.5 209.5 L 967.5 498.5 L 932.5 498.5 Z M 713.5 401.5 L 748.5 401.5 L 748.5 498.5 L 713.5 498.5 Z M 713.5 401.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 698.890625 511.574219 L 698.890625 560.652344 L 691.824219 560.652344 L 666.441406 520.863281 L 666.441406 560.652344 L 660.519531 560.652344 L 660.519531 511.574219 L 667.316406 511.574219 L 692.96875 551.699219 L 692.96875 511.574219 Z M 698.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 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/or3b/sky130_fd_sc_lp__or3b_4.svg b/cells/or3b/sky130_fd_sc_lp__or3b_4.svg
index cdb973e..6c79d84 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_4.svg
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.5 Z M 367.5 111.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image364" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 528.5 670.5 L 562.5 670.5 L 562.5 766.5 L 528.5 766.5 Z M 996.5 670.5 L 1031.5 670.5 L 1031.5 862.5 L 996.5 862.5 Z M 701.5 670.5 L 735.5 670.5 L 735.5 862.5 L 701.5 862.5 Z M 799.5 670.5 L 834.5 670.5 L 834.5 862.5 L 799.5 862.5 Z M 898.5 670.5 L 932.5 670.5 L 932.5 862.5 L 898.5 862.5 Z M 1212.5 670.5 L 1246.5 670.5 L 1246.5 862.5 L 1212.5 862.5 Z M 1113.5 670.5 L 1148.5 670.5 L 1148.5 862.5 L 1113.5 862.5 Z M 1334.5 670.5 L 1369.5 670.5 L 1369.5 862.5 L 1334.5 862.5 Z M 1334.5 670.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image336"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1211.5 209.5 L 1245.5 209.5 L 1245.5 498.5 L 1211.5 498.5 Z M 528.5 401.5 L 562.5 401.5 L 562.5 498.5 L 528.5 498.5 Z M 1334.5 209.5 L 1369.5 209.5 L 1369.5 498.5 L 1334.5 498.5 Z M 1128.5 209.5 L 1162.5 209.5 L 1162.5 498.5 L 1128.5 498.5 Z M 1004.5 209.5 L 1039.5 209.5 L 1039.5 498.5 L 1004.5 498.5 Z M 906.5 209.5 L 940.5 209.5 L 940.5 498.5 L 906.5 498.5 Z M 807.5 209.5 L 842.5 209.5 L 842.5 498.5 L 807.5 498.5 Z M 709.5 209.5 L 743.5 209.5 L 743.5 498.5 L 709.5 498.5 Z M 709.5 209.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface332">
+<g id="surface361">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -183,6 +183,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1020.824219 451.320312 L 1038.191406 476.5 L 1030.449219 476.5 L 1017.050781 456.035156 L 1003.589844 476.5 L 995.980469 476.5 L 1013.351562 451.320312 L 997.058594 427.421875 L 1004.664062 427.421875 L 1017.253906 446.675781 L 1029.910156 427.421875 L 1037.382812 427.421875 Z M 1020.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 996 647 L 1035 647 M 996 608 L 1035 608 M 996 608 L 996 647 M 1035 608 L 1035 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 996 647 L 1035 647 M 996 608 L 1035 608 M 1035 647 L 1035 608 M 996 647 L 996 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/or3b/sky130_fd_sc_lp__or3b_lp.svg b/cells/or3b/sky130_fd_sc_lp__or3b_lp.svg
index 83b73f5..10d57dd 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_lp.svg
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 532.5 L 367.5 532.5 Z M 1162.5 532.5 L 1554.5 532.5 L 1554.5 539.5 L 1162.5 539.5 Z M 367.5 532.5 L 767.5 532.5 L 767.5 539.5 L 367.5 539.5 Z M 367.5 532.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 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="#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 910.5 610.5 L 945.5 610.5 L 945.5 706.5 L 910.5 706.5 Z M 993.5 610.5 L 1027.5 610.5 L 1027.5 706.5 L 993.5 706.5 Z M 1199.5 706.5 L 1234.5 706.5 L 1234.5 802.5 L 1199.5 802.5 Z M 1110.5 706.5 L 1144.5 706.5 L 1144.5 802.5 L 1110.5 802.5 Z M 1298.5 706.5 L 1332.5 706.5 L 1332.5 802.5 L 1298.5 802.5 Z M 1380.5 706.5 L 1415.5 706.5 L 1415.5 802.5 L 1380.5 802.5 Z M 777.5 768.5 L 812.5 768.5 L 812.5 864.5 L 777.5 864.5 Z M 507.5 768.5 L 541.5 768.5 L 541.5 864.5 L 507.5 864.5 Z M 688.5 768.5 L 722.5 768.5 L 722.5 864.5 L 688.5 864.5 Z M 589.5 768.5 L 624.5 768.5 L 624.5 864.5 L 589.5 864.5 Z M 589.5 768.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 1185.5 209.5 L 1243.5 209.5 L 1243.5 438.5 L 1185.5 438.5 Z M 1332.5 209.5 L 1389.5 209.5 L 1389.5 438.5 L 1332.5 438.5 Z M 1073.5 209.5 L 1130.5 209.5 L 1130.5 438.5 L 1073.5 438.5 Z M 507.5 220.5 L 564.5 220.5 L 564.5 449.5 L 507.5 449.5 Z M 777.5 262.5 L 835.5 262.5 L 835.5 491.5 L 777.5 491.5 Z M 777.5 262.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1460.824219 282.320312 L 1478.191406 307.5 L 1470.449219 307.5 L 1457.050781 287.035156 L 1443.589844 307.5 L 1435.980469 307.5 L 1453.351562 282.320312 L 1437.058594 258.421875 L 1444.664062 258.421875 L 1457.253906 277.675781 L 1469.910156 258.421875 L 1477.382812 258.421875 Z M 1460.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 1436 816 L 1475 816 M 1436 777 L 1475 777 M 1436 777 L 1436 816 M 1475 777 L 1475 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 1436 816 L 1475 816 M 1436 777 L 1475 777 M 1475 816 L 1475 777 M 1436 816 L 1436 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/or3b/sky130_fd_sc_lp__or3b_m.svg b/cells/or3b/sky130_fd_sc_lp__or3b_m.svg
index 080fa3f..e270929 100644
--- a/cells/or3b/sky130_fd_sc_lp__or3b_m.svg
+++ b/cells/or3b/sky130_fd_sc_lp__or3b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.5 111.5 "/>
 </clipPath>
-<image id="image347" 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="#image347"/>
+  <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 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="#image347"/>
+  <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 671.5 759.5 L 705.5 759.5 L 705.5 855.5 L 671.5 855.5 Z M 1190.5 767.5 L 1224.5 767.5 L 1224.5 863.5 L 1190.5 863.5 Z M 1091.5 767.5 L 1126.5 767.5 L 1126.5 863.5 L 1091.5 863.5 Z M 993.5 767.5 L 1027.5 767.5 L 1027.5 863.5 L 993.5 863.5 Z M 894.5 767.5 L 929.5 767.5 L 929.5 863.5 L 894.5 863.5 Z M 894.5 767.5 "/>
 </clipPath>
-<image id="image348" 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="#image348"/>
+  <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 671.5 209.5 L 705.5 209.5 L 705.5 305.5 L 671.5 305.5 Z M 885.5 343.5 L 920.5 343.5 L 920.5 439.5 L 885.5 439.5 Z M 1200.5 343.5 L 1235.5 343.5 L 1235.5 439.5 L 1200.5 439.5 Z M 1091.5 343.5 L 1126.5 343.5 L 1126.5 439.5 L 1091.5 439.5 Z M 968.5 343.5 L 1002.5 343.5 L 1002.5 439.5 L 968.5 439.5 Z M 968.5 343.5 "/>
 </clipPath>
-<image id="image349" 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="#image349"/>
+  <use xlink:href="#image377"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image350" 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="#image350"/>
+  <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="surface344">
+<g id="surface372">
 <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 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/or4/sky130_fd_sc_lp__or4_0.svg b/cells/or4/sky130_fd_sc_lp__or4_0.svg
index 593c03a..3347baf 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_0.svg
+++ b/cells/or4/sky130_fd_sc_lp__or4_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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 1174.5 762.5 L 1208.5 762.5 L 1208.5 859.5 L 1174.5 859.5 Z M 686.5 762.5 L 720.5 762.5 L 720.5 859.5 L 686.5 859.5 Z M 784.5 762.5 L 819.5 762.5 L 819.5 859.5 L 784.5 859.5 Z M 961.5 762.5 L 995.5 762.5 L 995.5 859.5 L 961.5 859.5 Z M 1059.5 762.5 L 1094.5 762.5 L 1094.5 859.5 L 1059.5 859.5 Z M 1059.5 762.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 1180.5 219.5 L 1214.5 219.5 L 1214.5 366.5 L 1180.5 366.5 Z M 803.5 270.5 L 837.5 270.5 L 837.5 366.5 L 803.5 366.5 Z M 988.5 270.5 L 1023.5 270.5 L 1023.5 366.5 L 988.5 366.5 Z M 906.5 270.5 L 940.5 270.5 L 940.5 366.5 L 906.5 366.5 Z M 699.5 270.5 L 734.5 270.5 L 734.5 366.5 L 699.5 366.5 Z M 699.5 270.5 "/>
 </clipPath>
-<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image346" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image318"/>
+  <use xlink:href="#image346"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 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/or4/sky130_fd_sc_lp__or4_1.svg b/cells/or4/sky130_fd_sc_lp__or4_1.svg
index da23225..5d9f204 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_1.svg
+++ b/cells/or4/sky130_fd_sc_lp__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 539.5 L 533.5 539.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 1167.5 672.5 L 1201.5 672.5 L 1201.5 864.5 L 1167.5 864.5 Z M 775.5 768.5 L 810.5 768.5 L 810.5 864.5 L 775.5 864.5 Z M 1055.5 768.5 L 1089.5 768.5 L 1089.5 864.5 L 1055.5 864.5 Z M 952.5 768.5 L 986.5 768.5 L 986.5 864.5 L 952.5 864.5 Z M 677.5 768.5 L 711.5 768.5 L 711.5 864.5 L 677.5 864.5 Z M 677.5 768.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 683.5 272.5 L 718.5 272.5 L 718.5 368.5 L 683.5 368.5 Z M 766.5 272.5 L 800.5 272.5 L 800.5 368.5 L 766.5 368.5 Z M 931.5 272.5 L 965.5 272.5 L 965.5 368.5 L 931.5 368.5 Z M 848.5 272.5 L 883.5 272.5 L 883.5 368.5 L 848.5 368.5 Z M 1221.5 209.5 L 1255.5 209.5 L 1255.5 498.5 L 1221.5 498.5 Z M 1221.5 209.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image340"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 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_lp__or4_2.svg b/cells/or4/sky130_fd_sc_lp__or4_2.svg
index 35c2041..321dea6 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_2.svg
+++ b/cells/or4/sky130_fd_sc_lp__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 539.5 L 478.5 539.5 Z M 478.5 111.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 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="#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 1172.5 670.5 L 1206.5 670.5 L 1206.5 862.5 L 1172.5 862.5 Z M 764.5 766.5 L 798.5 766.5 L 798.5 862.5 L 764.5 862.5 Z M 665.5 766.5 L 699.5 766.5 L 699.5 862.5 L 665.5 862.5 Z M 995.5 766.5 L 1030.5 766.5 L 1030.5 862.5 L 995.5 862.5 Z M 897.5 766.5 L 931.5 766.5 L 931.5 862.5 L 897.5 862.5 Z M 1270.5 670.5 L 1305.5 670.5 L 1305.5 862.5 L 1270.5 862.5 Z M 1270.5 670.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 1170.5 209.5 L 1205.5 209.5 L 1205.5 498.5 L 1170.5 498.5 Z M 748.5 401.5 L 782.5 401.5 L 782.5 498.5 L 748.5 498.5 Z M 665.5 401.5 L 699.5 401.5 L 699.5 498.5 L 665.5 498.5 Z M 995.5 401.5 L 1030.5 401.5 L 1030.5 498.5 L 995.5 498.5 Z M 871.5 401.5 L 906.5 401.5 L 906.5 498.5 L 871.5 498.5 Z M 1270.5 209.5 L 1305.5 209.5 L 1305.5 498.5 L 1270.5 498.5 Z M 1270.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 561.492188 561.5 L 561.492188 512.421875 L 580.410156 512.421875 L 583.371094 512.625 L 586.132812 513.164062 L 588.6875 514.105469 L 591.046875 515.316406 L 593.132812 517 L 595.085938 518.953125 L 596.699219 521.308594 L 598.046875 523.867188 L 599.058594 526.761719 L 599.796875 529.859375 L 600.203125 533.292969 L 600.402344 536.929688 L 600.203125 540.765625 L 599.730469 544.332031 L 598.921875 547.566406 L 597.84375 550.527344 L 596.429688 553.152344 L 594.679688 555.441406 L 592.796875 557.324219 L 590.707031 558.808594 L 588.421875 560.019531 L 585.929688 560.828125 L 583.234375 561.367188 L 580.410156 561.5 Z M 567.753906 555.980469 L 579.332031 555.980469 L 582.429688 555.777344 L 585.1875 555.039062 L 587.613281 553.757812 L 589.632812 552.074219 L 591.246094 549.785156 L 592.59375 547.027344 L 592.996094 545.613281 L 593.402344 544.132812 L 593.738281 542.515625 L 593.941406 540.765625 L 594.074219 538.949219 L 594.140625 536.996094 L 593.875 532.621094 L 593.199219 528.78125 L 591.988281 525.484375 L 590.371094 522.859375 L 588.285156 520.703125 L 585.726562 519.15625 L 584.785156 518.820312 L 583.773438 518.480469 L 582.699219 518.28125 L 581.621094 518.078125 L 580.476562 518.011719 L 579.332031 517.941406 L 567.753906 517.941406 Z M 567.753906 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 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/or4/sky130_fd_sc_lp__or4_4.svg b/cells/or4/sky130_fd_sc_lp__or4_4.svg
index ce0c100..b529204 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_4.svg
+++ b/cells/or4/sky130_fd_sc_lp__or4_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 539.5 L 367.5 539.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="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 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="#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 1295.5 670.5 L 1330.5 670.5 L 1330.5 862.5 L 1295.5 862.5 Z M 538.5 670.5 L 572.5 670.5 L 572.5 862.5 L 538.5 862.5 Z M 636.5 670.5 L 671.5 670.5 L 671.5 862.5 L 636.5 862.5 Z M 769.5 670.5 L 804.5 670.5 L 804.5 862.5 L 769.5 862.5 Z M 868.5 670.5 L 902.5 670.5 L 902.5 862.5 L 868.5 862.5 Z M 1000.5 670.5 L 1034.5 670.5 L 1034.5 862.5 L 1000.5 862.5 Z M 1098.5 670.5 L 1133.5 670.5 L 1133.5 862.5 L 1098.5 862.5 Z M 1197.5 670.5 L 1231.5 670.5 L 1231.5 862.5 L 1197.5 862.5 Z M 1197.5 670.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 1295.5 209.5 L 1330.5 209.5 L 1330.5 498.5 L 1295.5 498.5 Z M 538.5 209.5 L 572.5 209.5 L 572.5 498.5 L 538.5 498.5 Z M 620.5 209.5 L 655.5 209.5 L 655.5 498.5 L 620.5 498.5 Z M 744.5 209.5 L 779.5 209.5 L 779.5 498.5 L 744.5 498.5 Z M 868.5 209.5 L 902.5 209.5 L 902.5 498.5 L 868.5 498.5 Z M 1000.5 209.5 L 1034.5 209.5 L 1034.5 498.5 L 1000.5 498.5 Z M 1098.5 209.5 L 1133.5 209.5 L 1133.5 498.5 L 1098.5 498.5 Z M 1197.5 209.5 L 1231.5 209.5 L 1231.5 498.5 L 1197.5 498.5 Z M 1197.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 450.492188 561.5 L 450.492188 512.421875 L 469.410156 512.421875 L 472.371094 512.625 L 475.132812 513.164062 L 477.6875 514.105469 L 480.046875 515.316406 L 482.132812 517 L 484.085938 518.953125 L 485.699219 521.308594 L 487.046875 523.867188 L 488.058594 526.761719 L 488.796875 529.859375 L 489.203125 533.292969 L 489.402344 536.929688 L 489.203125 540.765625 L 488.730469 544.332031 L 487.921875 547.566406 L 486.84375 550.527344 L 485.429688 553.152344 L 483.679688 555.441406 L 481.796875 557.324219 L 479.707031 558.808594 L 477.421875 560.019531 L 474.929688 560.828125 L 472.234375 561.367188 L 469.410156 561.5 Z M 456.753906 555.980469 L 468.332031 555.980469 L 471.429688 555.777344 L 474.1875 555.039062 L 476.613281 553.757812 L 478.632812 552.074219 L 480.246094 549.785156 L 481.59375 547.027344 L 481.996094 545.613281 L 482.402344 544.132812 L 482.738281 542.515625 L 482.941406 540.765625 L 483.074219 538.949219 L 483.140625 536.996094 L 482.875 532.621094 L 482.199219 528.78125 L 480.988281 525.484375 L 479.371094 522.859375 L 477.285156 520.703125 L 474.726562 519.15625 L 473.785156 518.820312 L 472.773438 518.480469 L 471.699219 518.28125 L 470.621094 518.078125 L 469.476562 518.011719 L 468.332031 517.941406 L 456.753906 517.941406 Z M 456.753906 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 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/or4/sky130_fd_sc_lp__or4_lp.svg b/cells/or4/sky130_fd_sc_lp__or4_lp.svg
index 0048a37..6dd1502 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_lp.svg
+++ b/cells/or4/sky130_fd_sc_lp__or4_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 367.5 111.5 L 1554.5 111.5 L 1554.5 479.5 L 367.5 479.5 Z M 1079.5 479.5 L 1554.5 479.5 L 1554.5 539.5 L 1079.5 539.5 Z M 367.5 479.5 L 556.5 479.5 L 556.5 539.5 L 367.5 539.5 Z M 367.5 479.5 "/>
 </clipPath>
-<image id="image337" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image337"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 909.5 610.5 L 944.5 610.5 L 944.5 706.5 L 909.5 706.5 Z M 1380.5 631.5 L 1415.5 631.5 L 1415.5 727.5 L 1380.5 727.5 Z M 1298.5 631.5 L 1332.5 631.5 L 1332.5 727.5 L 1298.5 727.5 Z M 1199.5 631.5 L 1234.5 631.5 L 1234.5 727.5 L 1199.5 727.5 Z M 1117.5 631.5 L 1151.5 631.5 L 1151.5 727.5 L 1117.5 727.5 Z M 1018.5 631.5 L 1052.5 631.5 L 1052.5 727.5 L 1018.5 727.5 Z M 507.5 768.5 L 541.5 768.5 L 541.5 864.5 L 507.5 864.5 Z M 771.5 768.5 L 805.5 768.5 L 805.5 864.5 L 771.5 864.5 Z M 688.5 768.5 L 722.5 768.5 L 722.5 864.5 L 688.5 864.5 Z M 589.5 768.5 L 624.5 768.5 L 624.5 864.5 L 589.5 864.5 Z M 589.5 768.5 "/>
 </clipPath>
-<image id="image338" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image338"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1294.5 209.5 L 1352.5 209.5 L 1352.5 438.5 L 1294.5 438.5 Z M 530.5 209.5 L 587.5 209.5 L 587.5 438.5 L 530.5 438.5 Z M 642.5 209.5 L 699.5 209.5 L 699.5 438.5 L 642.5 438.5 Z M 773.5 209.5 L 830.5 209.5 L 830.5 438.5 L 773.5 438.5 Z M 1107.5 209.5 L 1165.5 209.5 L 1165.5 438.5 L 1107.5 438.5 Z M 1107.5 209.5 "/>
 </clipPath>
-<image id="image339" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image367" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image339"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image340" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image340"/>
+  <use xlink:href="#image368"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface334">
+<g id="surface362">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1460.824219 282.320312 L 1478.191406 307.5 L 1470.449219 307.5 L 1457.050781 287.035156 L 1443.589844 307.5 L 1435.980469 307.5 L 1453.351562 282.320312 L 1437.058594 258.421875 L 1444.664062 258.421875 L 1457.253906 277.675781 L 1469.910156 258.421875 L 1477.382812 258.421875 Z M 1460.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 1436 816 L 1475 816 M 1436 777 L 1475 777 M 1436 777 L 1436 816 M 1475 777 L 1475 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 1436 816 L 1475 816 M 1436 777 L 1475 777 M 1475 816 L 1475 777 M 1436 816 L 1436 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/or4/sky130_fd_sc_lp__or4_m.svg b/cells/or4/sky130_fd_sc_lp__or4_m.svg
index 3d970fc..0210e71 100644
--- a/cells/or4/sky130_fd_sc_lp__or4_m.svg
+++ b/cells/or4/sky130_fd_sc_lp__or4_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 1221.5 768.5 L 1255.5 768.5 L 1255.5 864.5 L 1221.5 864.5 Z M 703.5 768.5 L 737.5 768.5 L 737.5 864.5 L 703.5 864.5 Z M 801.5 768.5 L 836.5 768.5 L 836.5 864.5 L 801.5 864.5 Z M 983.5 768.5 L 1017.5 768.5 L 1017.5 864.5 L 983.5 864.5 Z M 1081.5 768.5 L 1115.5 768.5 L 1115.5 864.5 L 1081.5 864.5 Z M 1081.5 768.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 1189.5 367.5 L 1223.5 367.5 L 1223.5 463.5 L 1189.5 463.5 Z M 771.5 367.5 L 805.5 367.5 L 805.5 463.5 L 771.5 463.5 Z M 853.5 367.5 L 887.5 367.5 L 887.5 463.5 L 853.5 463.5 Z M 936.5 367.5 L 970.5 367.5 L 970.5 463.5 L 936.5 463.5 Z M 1018.5 367.5 L 1052.5 367.5 L 1052.5 463.5 L 1018.5 463.5 Z M 1018.5 367.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 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/or4b/sky130_fd_sc_lp__or4b_1.svg b/cells/or4b/sky130_fd_sc_lp__or4b_1.svg
index eab2fbc..04cd894 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_1.svg
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.5 111.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <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 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="#image332"/>
+  <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 1123.5 672.5 L 1158.5 672.5 L 1158.5 768.5 L 1123.5 768.5 Z M 656.5 672.5 L 690.5 672.5 L 690.5 768.5 L 656.5 768.5 Z M 764.5 672.5 L 798.5 672.5 L 798.5 768.5 L 764.5 768.5 Z M 862.5 672.5 L 897.5 672.5 L 897.5 768.5 L 862.5 768.5 Z M 1025.5 672.5 L 1059.5 672.5 L 1059.5 768.5 L 1025.5 768.5 Z M 1258.5 672.5 L 1292.5 672.5 L 1292.5 864.5 L 1258.5 864.5 Z M 1258.5 672.5 "/>
 </clipPath>
-<image id="image333" 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="#image333"/>
+  <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 656.5 213.5 L 690.5 213.5 L 690.5 310.5 L 656.5 310.5 Z M 1244.5 209.5 L 1278.5 209.5 L 1278.5 498.5 L 1244.5 498.5 Z M 835.5 401.5 L 869.5 401.5 L 869.5 498.5 L 835.5 498.5 Z M 1123.5 401.5 L 1158.5 401.5 L 1158.5 498.5 L 1123.5 498.5 Z M 1041.5 401.5 L 1075.5 401.5 L 1075.5 498.5 L 1041.5 498.5 Z M 942.5 401.5 L 977.5 401.5 L 977.5 498.5 L 942.5 498.5 Z M 942.5 401.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image335" 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="#image335"/>
+  <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="surface329">
+<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 642.890625 427.574219 L 642.890625 476.652344 L 635.824219 476.652344 L 610.441406 436.863281 L 610.441406 476.652344 L 604.519531 476.652344 L 604.519531 427.574219 L 611.316406 427.574219 L 636.96875 467.699219 L 636.96875 427.574219 Z M 642.890625 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 557 647 L 596 647 M 557 608 L 596 608 M 557 608 L 557 647 M 596 608 L 596 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 557 647 L 596 647 M 557 608 L 596 608 M 596 647 L 596 608 M 557 647 L 557 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/or4b/sky130_fd_sc_lp__or4b_2.svg b/cells/or4b/sky130_fd_sc_lp__or4b_2.svg
index d37762b..b985a10 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_2.svg
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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="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 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="#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 618.5 672.5 L 653.5 672.5 L 653.5 768.5 L 618.5 768.5 Z M 1276.5 768.5 L 1310.5 768.5 L 1310.5 864.5 L 1276.5 864.5 Z M 1177.5 768.5 L 1212.5 768.5 L 1212.5 864.5 L 1177.5 864.5 Z M 1056.5 768.5 L 1090.5 768.5 L 1090.5 864.5 L 1056.5 864.5 Z M 957.5 768.5 L 992.5 768.5 L 992.5 864.5 L 957.5 864.5 Z M 837.5 672.5 L 871.5 672.5 L 871.5 864.5 L 837.5 864.5 Z M 738.5 672.5 L 773.5 672.5 L 773.5 864.5 L 738.5 864.5 Z M 738.5 672.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 1193.5 381.5 L 1228.5 381.5 L 1228.5 477.5 L 1193.5 477.5 Z M 987.5 381.5 L 1022.5 381.5 L 1022.5 477.5 L 987.5 477.5 Z M 1070.5 381.5 L 1104.5 381.5 L 1104.5 477.5 L 1070.5 477.5 Z M 1276.5 381.5 L 1310.5 381.5 L 1310.5 477.5 L 1276.5 477.5 Z M 738.5 209.5 L 773.5 209.5 L 773.5 498.5 L 738.5 498.5 Z M 618.5 401.5 L 653.5 401.5 L 653.5 498.5 L 618.5 498.5 Z M 837.5 209.5 L 871.5 209.5 L 871.5 498.5 L 837.5 498.5 Z M 837.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1027.410156 546.757812 L 1008.492188 546.757812 L 1003.308594 561.5 L 996.644531 561.5 L 1014.148438 512.421875 L 1022.226562 512.421875 L 1039.460938 561.5 L 1032.460938 561.5 Z M 1025.660156 541.503906 L 1018.121094 519.15625 L 1010.042969 541.503906 Z M 1025.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 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/or4b/sky130_fd_sc_lp__or4b_4.svg b/cells/or4b/sky130_fd_sc_lp__or4b_4.svg
index c30cba2..6a6b4e2 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_4.svg
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.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 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="#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 1427.5 672.5 L 1462.5 672.5 L 1462.5 768.5 L 1427.5 768.5 Z M 451.5 672.5 L 485.5 672.5 L 485.5 864.5 L 451.5 864.5 Z M 549.5 672.5 L 584.5 672.5 L 584.5 864.5 L 549.5 864.5 Z M 648.5 672.5 L 682.5 672.5 L 682.5 864.5 L 648.5 864.5 Z M 746.5 672.5 L 781.5 672.5 L 781.5 864.5 L 746.5 864.5 Z M 854.5 672.5 L 889.5 672.5 L 889.5 864.5 L 854.5 864.5 Z M 953.5 672.5 L 987.5 672.5 L 987.5 864.5 L 953.5 864.5 Z M 1129.5 672.5 L 1164.5 672.5 L 1164.5 864.5 L 1129.5 864.5 Z M 1228.5 672.5 L 1262.5 672.5 L 1262.5 864.5 L 1228.5 864.5 Z M 1228.5 672.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 1440.5 220.5 L 1474.5 220.5 L 1474.5 317.5 L 1440.5 317.5 Z M 746.5 209.5 L 781.5 209.5 L 781.5 498.5 L 746.5 498.5 Z M 1200.5 209.5 L 1235.5 209.5 L 1235.5 498.5 L 1200.5 498.5 Z M 1077.5 209.5 L 1111.5 209.5 L 1111.5 498.5 L 1077.5 498.5 Z M 953.5 209.5 L 987.5 209.5 L 987.5 498.5 L 953.5 498.5 Z M 870.5 209.5 L 905.5 209.5 L 905.5 498.5 L 870.5 498.5 Z M 549.5 209.5 L 584.5 209.5 L 584.5 498.5 L 549.5 498.5 Z M 648.5 209.5 L 682.5 209.5 L 682.5 498.5 L 648.5 498.5 Z M 451.5 209.5 L 485.5 209.5 L 485.5 498.5 L 451.5 498.5 Z M 451.5 209.5 "/>
 </clipPath>
-<image id="image331" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image360" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image331"/>
+  <use xlink:href="#image360"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 415.824219 536.320312 L 433.191406 561.5 L 425.449219 561.5 L 412.050781 541.035156 L 398.589844 561.5 L 390.980469 561.5 L 408.351562 536.320312 L 392.058594 512.421875 L 399.664062 512.421875 L 412.253906 531.675781 L 424.910156 512.421875 L 432.382812 512.421875 Z M 415.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 391 562 L 430 562 M 391 523 L 430 523 M 391 523 L 391 562 M 430 523 L 430 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 391 562 L 430 562 M 391 523 L 430 523 M 430 562 L 430 523 M 391 562 L 391 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/or4b/sky130_fd_sc_lp__or4b_lp.svg b/cells/or4b/sky130_fd_sc_lp__or4b_lp.svg
index 5483c51..91012fd 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_lp.svg
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 312.5 111.5 L 1609.5 111.5 L 1609.5 539.5 L 312.5 539.5 Z M 312.5 111.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 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="#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 1437.5 757.5 L 1472.5 757.5 L 1472.5 853.5 L 1437.5 853.5 Z M 450.5 757.5 L 484.5 757.5 L 484.5 853.5 L 450.5 853.5 Z M 532.5 757.5 L 567.5 757.5 L 567.5 853.5 L 532.5 853.5 Z M 631.5 757.5 L 665.5 757.5 L 665.5 853.5 L 631.5 853.5 Z M 713.5 757.5 L 748.5 757.5 L 748.5 853.5 L 713.5 853.5 Z M 812.5 757.5 L 846.5 757.5 L 846.5 853.5 L 812.5 853.5 Z M 894.5 757.5 L 929.5 757.5 L 929.5 853.5 L 894.5 853.5 Z M 993.5 757.5 L 1027.5 757.5 L 1027.5 853.5 L 993.5 853.5 Z M 1075.5 757.5 L 1110.5 757.5 L 1110.5 853.5 L 1075.5 853.5 Z M 1174.5 757.5 L 1208.5 757.5 L 1208.5 853.5 L 1174.5 853.5 Z M 1256.5 757.5 L 1291.5 757.5 L 1291.5 853.5 L 1256.5 853.5 Z M 1355.5 757.5 L 1389.5 757.5 L 1389.5 853.5 L 1355.5 853.5 Z M 1355.5 757.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 1165.5 211.5 L 1222.5 211.5 L 1222.5 440.5 L 1165.5 440.5 Z M 782.5 211.5 L 839.5 211.5 L 839.5 440.5 L 782.5 440.5 Z M 1307.5 211.5 L 1364.5 211.5 L 1364.5 440.5 L 1307.5 440.5 Z M 1025.5 211.5 L 1082.5 211.5 L 1082.5 440.5 L 1025.5 440.5 Z M 894.5 211.5 L 952.5 211.5 L 952.5 440.5 L 894.5 440.5 Z M 452.5 220.5 L 509.5 220.5 L 509.5 449.5 L 452.5 449.5 Z M 452.5 220.5 "/>
 </clipPath>
-<image id="image349" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image349"/>
+  <use xlink:href="#image378"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1515.824219 282.320312 L 1533.191406 307.5 L 1525.449219 307.5 L 1512.050781 287.035156 L 1498.589844 307.5 L 1490.980469 307.5 L 1508.351562 282.320312 L 1492.058594 258.421875 L 1499.664062 258.421875 L 1512.253906 277.675781 L 1524.910156 258.421875 L 1532.382812 258.421875 Z M 1515.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 1491 816 L 1530 816 M 1491 777 L 1530 777 M 1491 777 L 1491 816 M 1530 777 L 1530 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 1491 816 L 1530 816 M 1491 777 L 1530 777 M 1530 816 L 1530 777 M 1491 816 L 1491 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/or4b/sky130_fd_sc_lp__or4b_m.svg b/cells/or4b/sky130_fd_sc_lp__or4b_m.svg
index 137c825..8196716 100644
--- a/cells/or4b/sky130_fd_sc_lp__or4b_m.svg
+++ b/cells/or4b/sky130_fd_sc_lp__or4b_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.5 Z M 478.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="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="#image333"/>
+  <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 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="#image333"/>
+  <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 1251.5 679.5 L 1285.5 679.5 L 1285.5 775.5 L 1251.5 775.5 Z M 626.5 679.5 L 661.5 679.5 L 661.5 775.5 L 626.5 775.5 Z M 734.5 679.5 L 768.5 679.5 L 768.5 775.5 L 734.5 775.5 Z M 832.5 679.5 L 867.5 679.5 L 867.5 775.5 L 832.5 775.5 Z M 1040.5 679.5 L 1074.5 679.5 L 1074.5 775.5 L 1040.5 775.5 Z M 1138.5 679.5 L 1173.5 679.5 L 1173.5 775.5 L 1138.5 775.5 Z M 1138.5 679.5 "/>
 </clipPath>
-<image id="image334" 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="#image334"/>
+  <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 626.5 244.5 L 661.5 244.5 L 661.5 341.5 L 626.5 341.5 Z M 875.5 367.5 L 909.5 367.5 L 909.5 463.5 L 875.5 463.5 Z M 1246.5 367.5 L 1280.5 367.5 L 1280.5 463.5 L 1246.5 463.5 Z M 1122.5 367.5 L 1157.5 367.5 L 1157.5 463.5 L 1122.5 463.5 Z M 1040.5 367.5 L 1074.5 367.5 L 1074.5 463.5 L 1040.5 463.5 Z M 957.5 367.5 L 992.5 367.5 L 992.5 463.5 L 957.5 463.5 Z M 957.5 367.5 "/>
 </clipPath>
-<image id="image335" 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="#image335"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image336" 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="#image336"/>
+  <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="surface330">
+<g id="surface359">
 <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 642.890625 427.574219 L 642.890625 476.652344 L 635.824219 476.652344 L 610.441406 436.863281 L 610.441406 476.652344 L 604.519531 476.652344 L 604.519531 427.574219 L 611.316406 427.574219 L 636.96875 467.699219 L 636.96875 427.574219 Z M 642.890625 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 557 647 L 596 647 M 557 608 L 596 608 M 557 608 L 557 647 M 596 608 L 596 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 557 647 L 596 647 M 557 608 L 596 608 M 596 647 L 596 608 M 557 647 L 557 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/or4bb/sky130_fd_sc_lp__or4bb_1.svg b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.svg
index ba11672..3ee60d2 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_1.svg
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.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 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="#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 1331.5 672.5 L 1365.5 672.5 L 1365.5 864.5 L 1331.5 864.5 Z M 674.5 768.5 L 709.5 768.5 L 709.5 864.5 L 674.5 864.5 Z M 1197.5 768.5 L 1231.5 768.5 L 1231.5 864.5 L 1197.5 864.5 Z M 1098.5 768.5 L 1133.5 768.5 L 1133.5 864.5 L 1098.5 864.5 Z M 991.5 768.5 L 1025.5 768.5 L 1025.5 864.5 L 991.5 864.5 Z M 892.5 768.5 L 926.5 768.5 L 926.5 864.5 L 892.5 864.5 Z M 576.5 768.5 L 610.5 768.5 L 610.5 864.5 L 576.5 864.5 Z M 576.5 768.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 559.5 209.5 L 593.5 209.5 L 593.5 305.5 L 559.5 305.5 Z M 657.5 209.5 L 691.5 209.5 L 691.5 305.5 L 657.5 305.5 Z M 908.5 374.5 L 942.5 374.5 L 942.5 470.5 L 908.5 470.5 Z M 991.5 374.5 L 1025.5 374.5 L 1025.5 470.5 L 991.5 470.5 Z M 1197.5 374.5 L 1231.5 374.5 L 1231.5 470.5 L 1197.5 470.5 Z M 1114.5 374.5 L 1149.5 374.5 L 1149.5 470.5 L 1114.5 470.5 Z M 1317.5 209.5 L 1352.5 209.5 L 1352.5 498.5 L 1317.5 498.5 Z M 1317.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1192.410156 292.757812 L 1173.492188 292.757812 L 1168.308594 307.5 L 1161.644531 307.5 L 1179.148438 258.421875 L 1187.226562 258.421875 L 1204.460938 307.5 L 1197.460938 307.5 Z M 1190.660156 287.503906 L 1183.121094 265.15625 L 1175.042969 287.503906 Z M 1190.660156 287.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 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 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/or4bb/sky130_fd_sc_lp__or4bb_2.svg b/cells/or4bb/sky130_fd_sc_lp__or4bb_2.svg
index a5b8add..412b8cf 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_2.svg
+++ b/cells/or4bb/sky130_fd_sc_lp__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 539.5 L 367.5 539.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="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="#image327"/>
+  <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 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="#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 1376.5 672.5 L 1410.5 672.5 L 1410.5 768.5 L 1376.5 768.5 Z M 693.5 768.5 L 727.5 768.5 L 727.5 864.5 L 693.5 864.5 Z M 517.5 768.5 L 552.5 768.5 L 552.5 864.5 L 517.5 864.5 Z M 791.5 768.5 L 826.5 768.5 L 826.5 864.5 L 791.5 864.5 Z M 1039.5 768.5 L 1073.5 768.5 L 1073.5 864.5 L 1039.5 864.5 Z M 940.5 768.5 L 975.5 768.5 L 975.5 864.5 L 940.5 864.5 Z M 1157.5 672.5 L 1191.5 672.5 L 1191.5 864.5 L 1157.5 864.5 Z M 1255.5 672.5 L 1290.5 672.5 L 1290.5 864.5 L 1255.5 864.5 Z M 1255.5 672.5 "/>
 </clipPath>
-<image id="image328" 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="#image328"/>
+  <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 775.5 360.5 L 810.5 360.5 L 810.5 456.5 L 775.5 456.5 Z M 858.5 360.5 L 892.5 360.5 L 892.5 456.5 L 858.5 456.5 Z M 594.5 360.5 L 628.5 360.5 L 628.5 456.5 L 594.5 456.5 Z M 940.5 360.5 L 975.5 360.5 L 975.5 456.5 L 940.5 456.5 Z M 693.5 360.5 L 727.5 360.5 L 727.5 456.5 L 693.5 456.5 Z M 1165.5 209.5 L 1199.5 209.5 L 1199.5 498.5 L 1165.5 498.5 Z M 1384.5 401.5 L 1418.5 401.5 L 1418.5 498.5 L 1384.5 498.5 Z M 1263.5 209.5 L 1298.5 209.5 L 1298.5 498.5 L 1263.5 498.5 Z M 1263.5 209.5 "/>
 </clipPath>
-<image id="image329" 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="#image329"/>
+  <use xlink:href="#image359"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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="#image330"/>
+  <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="surface324">
+<g id="surface354">
 <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 451.320312 L 1258.191406 476.5 L 1250.449219 476.5 L 1237.050781 456.035156 L 1223.589844 476.5 L 1215.980469 476.5 L 1233.351562 451.320312 L 1217.058594 427.421875 L 1224.664062 427.421875 L 1237.253906 446.675781 L 1249.910156 427.421875 L 1257.382812 427.421875 Z M 1240.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 1216 647 L 1255 647 M 1216 608 L 1255 608 M 1216 608 L 1216 647 M 1255 608 L 1255 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 1216 647 L 1255 647 M 1216 608 L 1255 608 M 1255 647 L 1255 608 M 1216 647 L 1216 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/or4bb/sky130_fd_sc_lp__or4bb_4.svg b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.svg
index 8aa7bca..4d14a70 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_4.svg
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 539.5 L 201.5 539.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 396.5 665.5 L 430.5 665.5 L 430.5 761.5 L 396.5 761.5 Z M 1484.5 761.5 L 1519.5 761.5 L 1519.5 857.5 L 1484.5 857.5 Z M 1333.5 665.5 L 1368.5 665.5 L 1368.5 857.5 L 1333.5 857.5 Z M 1235.5 665.5 L 1269.5 665.5 L 1269.5 857.5 L 1235.5 857.5 Z M 1109.5 665.5 L 1143.5 665.5 L 1143.5 857.5 L 1109.5 857.5 Z M 1010.5 665.5 L 1044.5 665.5 L 1044.5 857.5 L 1010.5 857.5 Z M 850.5 665.5 L 884.5 665.5 L 884.5 857.5 L 850.5 857.5 Z M 751.5 665.5 L 785.5 665.5 L 785.5 857.5 L 751.5 857.5 Z M 632.5 665.5 L 666.5 665.5 L 666.5 857.5 L 632.5 857.5 Z M 520.5 665.5 L 554.5 665.5 L 554.5 857.5 L 520.5 857.5 Z M 520.5 665.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 1266.5 209.5 L 1300.5 209.5 L 1300.5 498.5 L 1266.5 498.5 Z M 1484.5 401.5 L 1519.5 401.5 L 1519.5 498.5 L 1484.5 498.5 Z M 396.5 401.5 L 430.5 401.5 L 430.5 498.5 L 396.5 498.5 Z M 1364.5 209.5 L 1399.5 209.5 L 1399.5 498.5 L 1364.5 498.5 Z M 1167.5 209.5 L 1201.5 209.5 L 1201.5 498.5 L 1167.5 498.5 Z M 1068.5 209.5 L 1103.5 209.5 L 1103.5 498.5 L 1068.5 498.5 Z M 850.5 209.5 L 884.5 209.5 L 884.5 498.5 L 850.5 498.5 Z M 726.5 209.5 L 760.5 209.5 L 760.5 498.5 L 726.5 498.5 Z M 623.5 209.5 L 657.5 209.5 L 657.5 498.5 L 623.5 498.5 Z M 520.5 209.5 L 554.5 209.5 L 554.5 498.5 L 520.5 498.5 Z M 520.5 209.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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>
@@ -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 1404.824219 536.320312 L 1422.191406 561.5 L 1414.449219 561.5 L 1401.050781 541.035156 L 1387.589844 561.5 L 1379.980469 561.5 L 1397.351562 536.320312 L 1381.058594 512.421875 L 1388.664062 512.421875 L 1401.253906 531.675781 L 1413.910156 512.421875 L 1421.382812 512.421875 Z M 1404.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 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/or4bb/sky130_fd_sc_lp__or4bb_lp.svg b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.svg
index 7b574b6..d5ccc87 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.svg
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 152.5 L 1744.5 152.5 L 1744.5 484.5 L 174.5 484.5 Z M 174.5 484.5 L 1249.5 484.5 L 1249.5 504.5 L 174.5 504.5 Z M 174.5 504.5 L 574.5 504.5 L 574.5 538.5 L 174.5 538.5 Z M 1556.5 484.5 L 1744.5 484.5 L 1744.5 538.5 L 1556.5 538.5 Z M 1556.5 484.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 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="#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 1395.5 602.5 L 1426.5 602.5 L 1426.5 689.5 L 1395.5 689.5 Z M 1109.5 665.5 L 1140.5 665.5 L 1140.5 752.5 L 1109.5 752.5 Z M 1198.5 665.5 L 1229.5 665.5 L 1229.5 752.5 L 1198.5 752.5 Z M 1035.5 665.5 L 1066.5 665.5 L 1066.5 752.5 L 1035.5 752.5 Z M 782.5 665.5 L 813.5 665.5 L 813.5 752.5 L 782.5 752.5 Z M 1273.5 665.5 L 1304.5 665.5 L 1304.5 752.5 L 1273.5 752.5 Z M 871.5 665.5 L 902.5 665.5 L 902.5 752.5 L 871.5 752.5 Z M 946.5 665.5 L 977.5 665.5 L 977.5 752.5 L 946.5 752.5 Z M 377.5 745.5 L 408.5 745.5 L 408.5 832.5 L 377.5 832.5 Z M 466.5 745.5 L 497.5 745.5 L 497.5 832.5 L 466.5 832.5 Z M 1512.5 745.5 L 1543.5 745.5 L 1543.5 832.5 L 1512.5 832.5 Z M 1587.5 745.5 L 1618.5 745.5 L 1618.5 832.5 L 1587.5 832.5 Z M 541.5 745.5 L 572.5 745.5 L 572.5 832.5 L 541.5 832.5 Z M 303.5 745.5 L 334.5 745.5 L 334.5 832.5 L 303.5 832.5 Z M 303.5 745.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 1378.5 240.5 L 1429.5 240.5 L 1429.5 447.5 L 1378.5 447.5 Z M 1491.5 240.5 L 1543.5 240.5 L 1543.5 447.5 L 1491.5 447.5 Z M 1276.5 240.5 L 1328.5 240.5 L 1328.5 447.5 L 1276.5 447.5 Z M 381.5 250.5 L 433.5 250.5 L 433.5 457.5 L 381.5 457.5 Z M 491.5 250.5 L 543.5 250.5 L 543.5 457.5 L 491.5 457.5 Z M 796.5 260.5 L 847.5 260.5 L 847.5 467.5 L 796.5 467.5 Z M 891.5 260.5 L 943.5 260.5 L 943.5 467.5 L 891.5 467.5 Z M 891.5 260.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 268.628906 305.421875 L 284.550781 328.5 L 277.453125 328.5 L 265.171875 309.738281 L 252.832031 328.5 L 245.859375 328.5 L 261.777344 305.421875 L 246.84375 283.511719 L 253.820312 283.511719 L 265.359375 301.160156 L 276.960938 283.511719 L 283.808594 283.511719 Z M 268.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 246 790 L 281 790 M 246 755 L 281 755 M 246 755 L 246 790 M 281 755 L 281 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 246 790 L 281 790 M 246 755 L 281 755 M 281 790 L 281 755 M 246 790 L 246 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/or4bb/sky130_fd_sc_lp__or4bb_m.svg b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.svg
index 8233bea..905cc3f 100644
--- a/cells/or4bb/sky130_fd_sc_lp__or4bb_m.svg
+++ b/cells/or4bb/sky130_fd_sc_lp__or4bb_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 423.5 111.5 L 1501.5 111.5 L 1501.5 539.5 L 423.5 539.5 Z M 423.5 111.5 "/>
 </clipPath>
-<image id="image354" 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="#image354"/>
+  <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 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="#image354"/>
+  <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 683.5 766.5 L 718.5 766.5 L 718.5 862.5 L 683.5 862.5 Z M 585.5 766.5 L 619.5 766.5 L 619.5 862.5 L 585.5 862.5 Z M 1000.5 768.5 L 1034.5 768.5 L 1034.5 864.5 L 1000.5 864.5 Z M 1117.5 768.5 L 1151.5 768.5 L 1151.5 864.5 L 1117.5 864.5 Z M 1215.5 768.5 L 1250.5 768.5 L 1250.5 864.5 L 1215.5 864.5 Z M 1331.5 768.5 L 1365.5 768.5 L 1365.5 864.5 L 1331.5 864.5 Z M 901.5 768.5 L 936.5 768.5 L 936.5 864.5 L 901.5 864.5 Z M 901.5 768.5 "/>
 </clipPath>
-<image id="image355" 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="#image355"/>
+  <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 559.5 215.5 L 593.5 215.5 L 593.5 311.5 L 559.5 311.5 Z M 657.5 215.5 L 691.5 215.5 L 691.5 311.5 L 657.5 311.5 Z M 1326.5 266.5 L 1361.5 266.5 L 1361.5 362.5 L 1326.5 362.5 Z M 1112.5 266.5 L 1146.5 266.5 L 1146.5 362.5 L 1112.5 362.5 Z M 1195.5 266.5 L 1229.5 266.5 L 1229.5 362.5 L 1195.5 362.5 Z M 913.5 319.5 L 947.5 319.5 L 947.5 415.5 L 913.5 415.5 Z M 995.5 319.5 L 1030.5 319.5 L 1030.5 415.5 L 995.5 415.5 Z M 995.5 319.5 "/>
 </clipPath>
-<image id="image356" 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="#image356"/>
+  <use xlink:href="#image385"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image357" 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="#image357"/>
+  <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="surface351">
+<g id="surface380">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -179,6 +179,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 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/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.svg b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.svg
index 03e5edd..df2dbe2 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.svg
+++ b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 373.5 L 1743.5 373.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 373.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 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="#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 1216.5 571.5 L 1229.5 571.5 L 1229.5 607.5 L 1216.5 607.5 Z M 1250.5 571.5 L 1263.5 571.5 L 1263.5 607.5 L 1250.5 607.5 Z M 738.5 587.5 L 751.5 587.5 L 751.5 624.5 L 738.5 624.5 Z M 1172.5 571.5 L 1185.5 571.5 L 1185.5 626.5 L 1172.5 626.5 Z M 1318.5 571.5 L 1331.5 571.5 L 1331.5 626.5 L 1318.5 626.5 Z M 440.5 590.5 L 453.5 590.5 L 453.5 626.5 L 440.5 626.5 Z M 230.5 590.5 L 243.5 590.5 L 243.5 626.5 L 230.5 626.5 Z M 1369.5 571.5 L 1382.5 571.5 L 1382.5 626.5 L 1369.5 626.5 Z M 1128.5 571.5 L 1141.5 571.5 L 1141.5 626.5 L 1128.5 626.5 Z M 264.5 590.5 L 277.5 590.5 L 277.5 626.5 L 264.5 626.5 Z M 369.5 590.5 L 382.5 590.5 L 382.5 626.5 L 369.5 626.5 Z M 313.5 590.5 L 326.5 590.5 L 326.5 626.5 L 313.5 626.5 Z M 800.5 596.5 L 813.5 596.5 L 813.5 633.5 L 800.5 633.5 Z M 849.5 596.5 L 862.5 596.5 L 862.5 633.5 L 849.5 633.5 Z M 1420.5 592.5 L 1433.5 592.5 L 1433.5 647.5 L 1420.5 647.5 Z M 1024.5 594.5 L 1037.5 594.5 L 1037.5 649.5 L 1024.5 649.5 Z M 646.5 613.5 L 659.5 613.5 L 659.5 649.5 L 646.5 649.5 Z M 973.5 596.5 L 986.5 596.5 L 986.5 652.5 L 973.5 652.5 Z M 935.5 596.5 L 948.5 596.5 L 948.5 652.5 L 935.5 652.5 Z M 1637.5 617.5 L 1650.5 617.5 L 1650.5 653.5 L 1637.5 653.5 Z M 1507.5 617.5 L 1520.5 617.5 L 1520.5 653.5 L 1507.5 653.5 Z M 1678.5 580.5 L 1691.5 580.5 L 1691.5 653.5 L 1678.5 653.5 Z M 1551.5 580.5 L 1564.5 580.5 L 1564.5 653.5 L 1551.5 653.5 Z M 540.5 620.5 L 553.5 620.5 L 553.5 656.5 L 540.5 656.5 Z M 540.5 620.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 1216.5 423.5 L 1229.5 423.5 L 1229.5 459.5 L 1216.5 459.5 Z M 1287.5 423.5 L 1300.5 423.5 L 1300.5 459.5 L 1287.5 459.5 Z M 295.5 417.5 L 308.5 417.5 L 308.5 473.5 L 295.5 473.5 Z M 332.5 417.5 L 345.5 417.5 L 345.5 473.5 L 332.5 473.5 Z M 227.5 417.5 L 240.5 417.5 L 240.5 473.5 L 227.5 473.5 Z M 264.5 417.5 L 277.5 417.5 L 277.5 473.5 L 264.5 473.5 Z M 1419.5 410.5 L 1432.5 410.5 L 1432.5 483.5 L 1419.5 483.5 Z M 1351.5 410.5 L 1364.5 410.5 L 1364.5 483.5 L 1351.5 483.5 Z M 1388.5 410.5 L 1401.5 410.5 L 1401.5 483.5 L 1388.5 483.5 Z M 1172.5 420.5 L 1185.5 420.5 L 1185.5 493.5 L 1172.5 493.5 Z M 440.5 445.5 L 453.5 445.5 L 453.5 500.5 L 440.5 500.5 Z M 562.5 445.5 L 575.5 445.5 L 575.5 500.5 L 562.5 500.5 Z M 1041.5 441.5 L 1054.5 441.5 L 1054.5 514.5 L 1041.5 514.5 Z M 782.5 477.5 L 795.5 477.5 L 795.5 514.5 L 782.5 514.5 Z M 942.5 441.5 L 955.5 441.5 L 955.5 514.5 L 942.5 514.5 Z M 738.5 477.5 L 751.5 477.5 L 751.5 514.5 L 738.5 514.5 Z M 816.5 477.5 L 829.5 477.5 L 829.5 514.5 L 816.5 514.5 Z M 1075.5 441.5 L 1088.5 441.5 L 1088.5 514.5 L 1075.5 514.5 Z M 1128.5 441.5 L 1141.5 441.5 L 1141.5 514.5 L 1128.5 514.5 Z M 1504.5 464.5 L 1517.5 464.5 L 1517.5 519.5 L 1504.5 519.5 Z M 1634.5 464.5 L 1647.5 464.5 L 1647.5 519.5 L 1634.5 519.5 Z M 1678.5 410.5 L 1691.5 410.5 L 1691.5 519.5 L 1678.5 519.5 Z M 646.5 464.5 L 659.5 464.5 L 659.5 519.5 L 646.5 519.5 Z M 1548.5 410.5 L 1561.5 410.5 L 1561.5 519.5 L 1548.5 519.5 Z M 1548.5 410.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 951.5 558.5 L 966.5 558.5 L 966.5 573.5 L 951.5 573.5 Z M 1325.5 558.5 L 1340.5 558.5 L 1340.5 573.5 L 1325.5 573.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="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>
@@ -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 1373.265625 537.804688 L 1373.214844 538.613281 L 1373.089844 539.347656 L 1372.863281 540.027344 L 1372.558594 540.632812 L 1372.15625 541.214844 L 1371.675781 541.71875 L 1371.144531 542.148438 L 1370.589844 542.476562 L 1369.957031 542.730469 L 1369.300781 542.929688 L 1368.59375 543.03125 L 1367.839844 543.058594 L 1359.53125 543.058594 L 1359.53125 524.652344 L 1367.003906 524.652344 L 1368.089844 524.730469 L 1369.050781 524.90625 L 1369.90625 525.207031 L 1370.640625 525.636719 L 1371.269531 526.191406 L 1371.777344 526.875 L 1371.976562 527.253906 L 1372.15625 527.65625 L 1372.28125 528.035156 L 1372.382812 528.464844 L 1372.433594 528.894531 L 1372.457031 529.324219 L 1372.382812 530.230469 L 1372.15625 531.015625 L 1371.800781 531.746094 L 1371.296875 532.351562 L 1370.664062 532.90625 L 1369.90625 533.335938 L 1370.640625 533.664062 L 1371.269531 534.019531 L 1371.828125 534.421875 L 1372.28125 534.878906 L 1372.632812 535.355469 L 1372.914062 535.863281 L 1373.011719 536.164062 L 1373.089844 536.46875 L 1373.164062 536.769531 L 1373.214844 537.125 L 1373.242188 537.453125 Z M 1370.109375 529.652344 L 1370.035156 528.894531 L 1369.808594 528.261719 L 1369.453125 527.707031 L 1368.949219 527.304688 L 1368.316406 527 L 1367.535156 526.796875 L 1367.359375 526.796875 L 1367.179688 526.773438 L 1367.003906 526.75 L 1366.601562 526.75 L 1366.425781 526.722656 L 1361.878906 526.722656 L 1361.878906 532.578125 L 1366.425781 532.578125 L 1367.359375 532.53125 L 1368.167969 532.378906 L 1368.847656 532.101562 L 1369.351562 531.722656 L 1369.757812 531.214844 L 1370.007812 530.609375 L 1370.035156 530.484375 L 1370.058594 530.332031 L 1370.085938 530.179688 L 1370.085938 529.828125 Z M 1367.609375 540.988281 L 1368.316406 540.960938 L 1368.949219 540.808594 L 1369.503906 540.558594 L 1369.957031 540.230469 L 1370.335938 539.800781 L 1370.640625 539.269531 L 1370.714844 539.066406 L 1370.765625 538.839844 L 1370.84375 538.589844 L 1370.867188 538.359375 L 1370.894531 538.109375 L 1370.917969 537.832031 L 1370.867188 537.277344 L 1370.765625 536.746094 L 1370.589844 536.292969 L 1370.335938 535.863281 L 1370.007812 535.507812 L 1369.628906 535.179688 L 1369.351562 535.027344 L 1369.050781 534.902344 L 1368.722656 534.800781 L 1368.367188 534.726562 L 1367.988281 534.675781 L 1367.609375 534.648438 L 1361.878906 534.648438 L 1361.878906 540.988281 Z M 1367.609375 540.988281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1325 553 L 1340 553 M 1325 538 L 1340 538 M 1325 538 L 1325 553 M 1340 538 L 1340 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 1325 553 L 1340 553 M 1325 538 L 1340 538 M 1340 553 L 1340 538 M 1325 553 L 1325 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 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/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.svg b/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.svg
index 184970c..65d419a 100644
--- a/cells/sdfbbn/sky130_fd_sc_lp__sdfbbn_2.svg
+++ b/cells/sdfbbn/sky130_fd_sc_lp__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 535.5 L 174.5 535.5 Z M 406.5 535.5 L 493.5 535.5 L 493.5 560.5 L 406.5 560.5 Z M 406.5 535.5 "/>
 </clipPath>
-<image id="image451" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image479" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image451"/>
+  <use xlink:href="#image479"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image451"/>
+  <use xlink:href="#image479"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1175.5 570.5 L 1188.5 570.5 L 1188.5 605.5 L 1175.5 605.5 Z M 1208.5 570.5 L 1221.5 570.5 L 1221.5 605.5 L 1208.5 605.5 Z M 714.5 581.5 L 727.5 581.5 L 727.5 616.5 L 714.5 616.5 Z M 750.5 581.5 L 763.5 581.5 L 763.5 616.5 L 750.5 616.5 Z M 802.5 581.5 L 815.5 581.5 L 815.5 616.5 L 802.5 616.5 Z M 1436.5 581.5 L 1448.5 581.5 L 1448.5 616.5 L 1436.5 616.5 Z M 1312.5 570.5 L 1325.5 570.5 L 1325.5 624.5 L 1312.5 624.5 Z M 263.5 588.5 L 275.5 588.5 L 275.5 624.5 L 263.5 624.5 Z M 362.5 588.5 L 374.5 588.5 L 374.5 624.5 L 362.5 624.5 Z M 1112.5 570.5 L 1125.5 570.5 L 1125.5 624.5 L 1112.5 624.5 Z M 314.5 588.5 L 326.5 588.5 L 326.5 624.5 L 314.5 624.5 Z M 428.5 588.5 L 441.5 588.5 L 441.5 624.5 L 428.5 624.5 Z M 230.5 588.5 L 242.5 588.5 L 242.5 624.5 L 230.5 624.5 Z M 1069.5 570.5 L 1082.5 570.5 L 1082.5 624.5 L 1069.5 624.5 Z M 1262.5 570.5 L 1275.5 570.5 L 1275.5 624.5 L 1262.5 624.5 Z M 532.5 599.5 L 544.5 599.5 L 544.5 634.5 L 532.5 634.5 Z M 919.5 581.5 L 932.5 581.5 L 932.5 635.5 L 919.5 635.5 Z M 881.5 581.5 L 894.5 581.5 L 894.5 635.5 L 881.5 635.5 Z M 966.5 581.5 L 978.5 581.5 L 978.5 635.5 L 966.5 635.5 Z M 1352.5 590.5 L 1365.5 590.5 L 1365.5 644.5 L 1352.5 644.5 Z M 631.5 610.5 L 644.5 610.5 L 644.5 646.5 L 631.5 646.5 Z M 1479.5 581.5 L 1491.5 581.5 L 1491.5 652.5 L 1479.5 652.5 Z M 1515.5 581.5 L 1527.5 581.5 L 1527.5 652.5 L 1515.5 652.5 Z M 1600.5 619.5 L 1613.5 619.5 L 1613.5 654.5 L 1600.5 654.5 Z M 1680.5 583.5 L 1692.5 583.5 L 1692.5 654.5 L 1680.5 654.5 Z M 1643.5 583.5 L 1656.5 583.5 L 1656.5 654.5 L 1643.5 654.5 Z M 1643.5 583.5 "/>
 </clipPath>
-<image id="image452" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image480" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image452"/>
+  <use xlink:href="#image480"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1224.5 425.5 L 1236.5 425.5 L 1236.5 461.5 L 1224.5 461.5 Z M 1152.5 425.5 L 1165.5 425.5 L 1165.5 461.5 L 1152.5 461.5 Z M 238.5 417.5 L 250.5 417.5 L 250.5 471.5 L 238.5 471.5 Z M 281.5 417.5 L 293.5 417.5 L 293.5 471.5 L 281.5 471.5 Z M 362.5 417.5 L 374.5 417.5 L 374.5 471.5 L 362.5 471.5 Z M 314.5 417.5 L 326.5 417.5 L 326.5 471.5 L 314.5 471.5 Z M 631.5 422.5 L 644.5 422.5 L 644.5 476.5 L 631.5 476.5 Z M 790.5 443.5 L 803.5 443.5 L 803.5 479.5 L 790.5 479.5 Z M 757.5 443.5 L 770.5 443.5 L 770.5 479.5 L 757.5 479.5 Z M 714.5 443.5 L 727.5 443.5 L 727.5 479.5 L 714.5 479.5 Z M 1354.5 413.5 L 1367.5 413.5 L 1367.5 484.5 L 1354.5 484.5 Z M 1321.5 413.5 L 1334.5 413.5 L 1334.5 484.5 L 1321.5 484.5 Z M 1285.5 413.5 L 1298.5 413.5 L 1298.5 484.5 L 1285.5 484.5 Z M 1109.5 423.5 L 1122.5 423.5 L 1122.5 494.5 L 1109.5 494.5 Z M 532.5 447.5 L 544.5 447.5 L 544.5 501.5 L 532.5 501.5 Z M 1600.5 453.5 L 1613.5 453.5 L 1613.5 507.5 L 1600.5 507.5 Z M 886.5 443.5 L 899.5 443.5 L 899.5 514.5 L 886.5 514.5 Z M 934.5 443.5 L 947.5 443.5 L 947.5 514.5 L 934.5 514.5 Z M 1069.5 443.5 L 1082.5 443.5 L 1082.5 514.5 L 1069.5 514.5 Z M 967.5 443.5 L 980.5 443.5 L 980.5 514.5 L 967.5 514.5 Z M 1435.5 465.5 L 1448.5 465.5 L 1448.5 519.5 L 1435.5 519.5 Z M 1643.5 413.5 L 1656.5 413.5 L 1656.5 519.5 L 1643.5 519.5 Z M 1478.5 413.5 L 1491.5 413.5 L 1491.5 519.5 L 1478.5 519.5 Z M 1680.5 413.5 L 1692.5 413.5 L 1692.5 519.5 L 1680.5 519.5 Z M 1514.5 413.5 L 1527.5 413.5 L 1527.5 519.5 L 1514.5 519.5 Z M 442.5 491.5 L 455.5 491.5 L 455.5 545.5 L 442.5 545.5 Z M 442.5 491.5 "/>
 </clipPath>
-<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image481" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image453"/>
+  <use xlink:href="#image481"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 891.5 558.5 L 905.5 558.5 L 905.5 565.5 L 891.5 565.5 Z M 1255.5 558.5 L 1270.5 558.5 L 1270.5 572.5 L 1255.5 572.5 Z M 891.5 565.5 L 905.5 565.5 L 905.5 572.5 L 891.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="image454" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image482" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image454"/>
+  <use xlink:href="#image482"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface448">
+<g id="surface476">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -234,6 +234,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1528.660156 431.921875 L 1528.660156 449.304688 L 1526.15625 449.304688 L 1517.167969 435.210938 L 1517.167969 449.304688 L 1515.070312 449.304688 L 1515.070312 431.921875 L 1517.480469 431.921875 L 1526.5625 446.132812 L 1526.5625 431.921875 Z M 1528.660156 431.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 1498 646 L 1512 646 M 1498 632 L 1512 632 M 1498 632 L 1498 646 M 1512 632 L 1512 646 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1498 646 L 1512 646 M 1498 632 L 1512 632 M 1512 646 L 1512 632 M 1498 646 L 1498 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(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_lp__sdfbbp_1.svg b/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.svg
index 2cccf62..0bf709b 100644
--- a/cells/sdfbbp/sky130_fd_sc_lp__sdfbbp_1.svg
+++ b/cells/sdfbbp/sky130_fd_sc_lp__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 494.5 L 174.5 494.5 Z M 1411.5 494.5 L 1743.5 494.5 L 1743.5 535.5 L 1411.5 535.5 Z M 174.5 494.5 L 1288.5 494.5 L 1288.5 535.5 L 174.5 535.5 Z M 1411.5 535.5 L 1583.5 535.5 L 1583.5 540.5 L 1411.5 540.5 Z M 1411.5 535.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 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="#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 1619.5 588.5 L 1634.5 588.5 L 1634.5 629.5 L 1619.5 629.5 Z M 1474.5 591.5 L 1489.5 591.5 L 1489.5 632.5 L 1474.5 632.5 Z M 239.5 597.5 L 253.5 597.5 L 253.5 637.5 L 239.5 637.5 Z M 318.5 597.5 L 333.5 597.5 L 333.5 637.5 L 318.5 637.5 Z M 353.5 597.5 L 368.5 597.5 L 368.5 637.5 L 353.5 637.5 Z M 277.5 597.5 L 291.5 597.5 L 291.5 637.5 L 277.5 637.5 Z M 421.5 597.5 L 435.5 597.5 L 435.5 637.5 L 421.5 637.5 Z M 543.5 603.5 L 558.5 603.5 L 558.5 644.5 L 543.5 644.5 Z M 1177.5 606.5 L 1192.5 606.5 L 1192.5 646.5 L 1177.5 646.5 Z M 1215.5 606.5 L 1230.5 606.5 L 1230.5 646.5 L 1215.5 646.5 Z M 652.5 606.5 L 667.5 606.5 L 667.5 646.5 L 652.5 646.5 Z M 1128.5 606.5 L 1143.5 606.5 L 1143.5 667.5 L 1128.5 667.5 Z M 1280.5 606.5 L 1295.5 606.5 L 1295.5 667.5 L 1280.5 667.5 Z M 1380.5 606.5 L 1395.5 606.5 L 1395.5 667.5 L 1380.5 667.5 Z M 1322.5 606.5 L 1337.5 606.5 L 1337.5 667.5 L 1322.5 667.5 Z M 1087.5 606.5 L 1102.5 606.5 L 1102.5 667.5 L 1087.5 667.5 Z M 1669.5 588.5 L 1683.5 588.5 L 1683.5 669.5 L 1669.5 669.5 Z M 774.5 632.5 L 788.5 632.5 L 788.5 672.5 L 774.5 672.5 Z M 816.5 632.5 L 830.5 632.5 L 830.5 672.5 L 816.5 672.5 Z M 900.5 610.5 L 914.5 610.5 L 914.5 672.5 L 900.5 672.5 Z M 991.5 610.5 L 1005.5 610.5 L 1005.5 672.5 L 991.5 672.5 Z M 941.5 610.5 L 956.5 610.5 L 956.5 672.5 L 941.5 672.5 Z M 1523.5 591.5 L 1538.5 591.5 L 1538.5 672.5 L 1523.5 672.5 Z M 850.5 632.5 L 865.5 632.5 L 865.5 672.5 L 850.5 672.5 Z M 850.5 632.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 1128.5 405.5 L 1142.5 405.5 L 1142.5 446.5 L 1128.5 446.5 Z M 1191.5 405.5 L 1206.5 405.5 L 1206.5 446.5 L 1191.5 446.5 Z M 233.5 400.5 L 248.5 400.5 L 248.5 462.5 L 233.5 462.5 Z M 469.5 400.5 L 484.5 400.5 L 484.5 462.5 L 469.5 462.5 Z M 366.5 400.5 L 380.5 400.5 L 380.5 462.5 L 366.5 462.5 Z M 324.5 400.5 L 339.5 400.5 L 339.5 462.5 L 324.5 462.5 Z M 286.5 400.5 L 301.5 400.5 L 301.5 462.5 L 286.5 462.5 Z M 565.5 404.5 L 579.5 404.5 L 579.5 466.5 L 565.5 466.5 Z M 846.5 433.5 L 860.5 433.5 L 860.5 474.5 L 846.5 474.5 Z M 766.5 433.5 L 781.5 433.5 L 781.5 474.5 L 766.5 474.5 Z M 808.5 433.5 L 822.5 433.5 L 822.5 474.5 L 808.5 474.5 Z M 661.5 412.5 L 675.5 412.5 L 675.5 474.5 L 661.5 474.5 Z M 1287.5 396.5 L 1302.5 396.5 L 1302.5 477.5 L 1287.5 477.5 Z M 1377.5 396.5 L 1392.5 396.5 L 1392.5 477.5 L 1377.5 477.5 Z M 1337.5 396.5 L 1351.5 396.5 L 1351.5 477.5 L 1337.5 477.5 Z M 1078.5 405.5 L 1093.5 405.5 L 1093.5 487.5 L 1078.5 487.5 Z M 1032.5 433.5 L 1047.5 433.5 L 1047.5 515.5 L 1032.5 515.5 Z M 991.5 433.5 L 1005.5 433.5 L 1005.5 515.5 L 991.5 515.5 Z M 944.5 433.5 L 959.5 433.5 L 959.5 515.5 L 944.5 515.5 Z M 903.5 433.5 L 917.5 433.5 L 917.5 515.5 L 903.5 515.5 Z M 1619.5 456.5 L 1634.5 456.5 L 1634.5 517.5 L 1619.5 517.5 Z M 1669.5 396.5 L 1683.5 396.5 L 1683.5 517.5 L 1669.5 517.5 Z M 1523.5 400.5 L 1538.5 400.5 L 1538.5 522.5 L 1523.5 522.5 Z M 1474.5 460.5 L 1489.5 460.5 L 1489.5 522.5 L 1474.5 522.5 Z M 1474.5 460.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 1276.5 490.5 L 1292.5 490.5 L 1292.5 500.5 L 1276.5 500.5 Z M 1276.5 500.5 L 1292.5 500.5 L 1292.5 506.5 L 1276.5 506.5 Z M 858.5 490.5 L 874.5 490.5 L 874.5 506.5 L 858.5 506.5 Z M 672.5 562.5 L 688.5 562.5 L 688.5 578.5 L 672.5 578.5 Z M 1136.5 562.5 L 1153.5 562.5 L 1153.5 578.5 L 1136.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="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>
@@ -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 228.902344 544.855469 L 228.902344 524.40625 L 236.785156 524.40625 L 238.019531 524.488281 L 239.167969 524.714844 L 240.234375 525.105469 L 241.214844 525.613281 L 242.085938 526.3125 L 242.898438 527.125 L 243.574219 528.109375 L 244.132812 529.175781 L 244.554688 530.378906 L 244.863281 531.671875 L 245.03125 533.101562 L 245.117188 534.617188 L 245.03125 536.214844 L 244.835938 537.703125 L 244.5 539.046875 L 244.050781 540.28125 L 243.460938 541.375 L 242.730469 542.332031 L 241.945312 543.117188 L 241.078125 543.734375 L 240.121094 544.238281 L 239.085938 544.574219 L 237.960938 544.796875 L 236.785156 544.855469 Z M 231.511719 542.554688 L 236.335938 542.554688 L 237.625 542.46875 L 238.777344 542.160156 L 239.785156 541.628906 L 240.628906 540.929688 L 241.300781 539.972656 L 241.863281 538.824219 L 242.03125 538.234375 L 242.199219 537.617188 L 242.339844 536.945312 L 242.421875 536.214844 L 242.480469 535.457031 L 242.507812 534.644531 L 242.394531 532.820312 L 242.113281 531.222656 L 241.609375 529.847656 L 240.9375 528.753906 L 240.066406 527.855469 L 239 527.210938 L 238.609375 527.070312 L 238.1875 526.929688 L 237.738281 526.847656 L 237.289062 526.761719 L 236.335938 526.707031 L 231.511719 526.707031 Z M 231.511719 542.554688 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 207 553 L 224 553 M 207 537 L 224 537 M 207 537 L 207 553 M 224 537 L 224 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 207 553 L 224 553 M 207 537 L 224 537 M 224 553 L 224 537 M 207 553 L 207 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/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.svg b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.svg
index eee0347..561aebc 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_1.svg
+++ b/cells/sdfrbp/sky130_fd_sc_lp__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 1415.5 535.5 L 1534.5 535.5 L 1534.5 557.5 L 1415.5 557.5 Z M 1415.5 535.5 "/>
 </clipPath>
-<image id="image603" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image631" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image603"/>
+  <use xlink:href="#image631"/>
 </pattern>
 <mask 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="#image603"/>
+  <use xlink:href="#image631"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 916.5 606.5 L 932.5 606.5 L 932.5 652.5 L 916.5 652.5 Z M 963.5 606.5 L 980.5 606.5 L 980.5 652.5 L 963.5 652.5 Z M 687.5 606.5 L 703.5 606.5 L 703.5 652.5 L 687.5 652.5 Z M 747.5 606.5 L 763.5 606.5 L 763.5 652.5 L 747.5 652.5 Z M 1042.5 606.5 L 1059.5 606.5 L 1059.5 652.5 L 1042.5 652.5 Z M 794.5 606.5 L 811.5 606.5 L 811.5 652.5 L 794.5 652.5 Z M 1003.5 606.5 L 1019.5 606.5 L 1019.5 652.5 L 1003.5 652.5 Z M 639.5 606.5 L 656.5 606.5 L 656.5 652.5 L 639.5 652.5 Z M 399.5 626.5 L 416.5 626.5 L 416.5 672.5 L 399.5 672.5 Z M 541.5 626.5 L 557.5 626.5 L 557.5 672.5 L 541.5 672.5 Z M 446.5 626.5 L 463.5 626.5 L 463.5 672.5 L 446.5 672.5 Z M 486.5 626.5 L 502.5 626.5 L 502.5 672.5 L 486.5 672.5 Z M 1647.5 584.5 L 1664.5 584.5 L 1664.5 676.5 L 1647.5 676.5 Z M 343.5 630.5 L 360.5 630.5 L 360.5 676.5 L 343.5 676.5 Z M 239.5 630.5 L 255.5 630.5 L 255.5 676.5 L 239.5 676.5 Z M 1600.5 584.5 L 1617.5 584.5 L 1617.5 676.5 L 1600.5 676.5 Z M 1294.5 634.5 L 1310.5 634.5 L 1310.5 680.5 L 1294.5 680.5 Z M 1254.5 634.5 L 1270.5 634.5 L 1270.5 680.5 L 1254.5 680.5 Z M 1352.5 634.5 L 1368.5 634.5 L 1368.5 680.5 L 1352.5 680.5 Z M 1391.5 634.5 L 1408.5 634.5 L 1408.5 680.5 L 1391.5 680.5 Z M 1194.5 609.5 L 1210.5 609.5 L 1210.5 680.5 L 1194.5 680.5 Z M 1115.5 609.5 L 1131.5 609.5 L 1131.5 680.5 L 1115.5 680.5 Z M 1495.5 645.5 L 1512.5 645.5 L 1512.5 691.5 L 1495.5 691.5 Z M 1495.5 645.5 "/>
 </clipPath>
-<image id="image604" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image632" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image604"/>
+  <use xlink:href="#image632"/>
 </pattern>
 <mask id="mask2">
 <rect 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 392.5 L 1380.5 392.5 L 1380.5 438.5 L 1363.5 438.5 Z M 1410.5 392.5 L 1427.5 392.5 L 1427.5 438.5 L 1410.5 438.5 Z M 1311.5 399.5 L 1328.5 399.5 L 1328.5 445.5 L 1311.5 445.5 Z M 1250.5 399.5 L 1267.5 399.5 L 1267.5 445.5 L 1250.5 445.5 Z M 293.5 377.5 L 310.5 377.5 L 310.5 448.5 L 293.5 448.5 Z M 427.5 377.5 L 444.5 377.5 L 444.5 448.5 L 427.5 448.5 Z M 340.5 377.5 L 357.5 377.5 L 357.5 448.5 L 340.5 448.5 Z M 481.5 377.5 L 498.5 377.5 L 498.5 448.5 L 481.5 448.5 Z M 541.5 377.5 L 557.5 377.5 L 557.5 448.5 L 541.5 448.5 Z M 380.5 377.5 L 396.5 377.5 L 396.5 448.5 L 380.5 448.5 Z M 949.5 417.5 L 965.5 417.5 L 965.5 463.5 L 949.5 463.5 Z M 909.5 417.5 L 926.5 417.5 L 926.5 463.5 L 909.5 463.5 Z M 1021.5 417.5 L 1038.5 417.5 L 1038.5 463.5 L 1021.5 463.5 Z M 862.5 417.5 L 879.5 417.5 L 879.5 463.5 L 862.5 463.5 Z M 1126.5 417.5 L 1142.5 417.5 L 1142.5 509.5 L 1126.5 509.5 Z M 1173.5 417.5 L 1189.5 417.5 L 1189.5 509.5 L 1173.5 509.5 Z M 1644.5 377.5 L 1661.5 377.5 L 1661.5 516.5 L 1644.5 516.5 Z M 1597.5 377.5 L 1613.5 377.5 L 1613.5 516.5 L 1597.5 516.5 Z M 693.5 377.5 L 710.5 377.5 L 710.5 516.5 L 693.5 516.5 Z M 740.5 377.5 L 757.5 377.5 L 757.5 516.5 L 740.5 516.5 Z M 1469.5 467.5 L 1486.5 467.5 L 1486.5 537.5 L 1469.5 537.5 Z M 1469.5 467.5 "/>
 </clipPath>
-<image id="image605" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image633" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image605"/>
+  <use xlink:href="#image633"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 484.5 L 1073.5 484.5 L 1073.5 489.5 L 1055.5 489.5 Z M 581.5 484.5 L 599.5 484.5 L 599.5 494.5 L 581.5 494.5 Z M 1055.5 489.5 L 1073.5 489.5 L 1073.5 503.5 L 1055.5 503.5 Z M 1318.5 484.5 L 1337.5 484.5 L 1337.5 503.5 L 1318.5 503.5 Z M 581.5 494.5 L 599.5 494.5 L 599.5 503.5 L 581.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="image606" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image634" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image606"/>
+  <use xlink:href="#image634"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface600">
+<g id="surface628">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -299,6 +299,5 @@
 <path style=" 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.304688 401.304688 L 1729.304688 424.824219 L 1725.917969 424.824219 L 1713.757812 405.757812 L 1713.757812 424.824219 L 1710.917969 424.824219 L 1710.917969 401.304688 L 1714.175781 401.304688 L 1726.46875 420.53125 L 1726.46875 401.304688 Z M 1729.304688 401.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 1687 676 L 1706 676 M 1687 657 L 1706 657 M 1687 657 L 1687 676 M 1706 657 L 1706 676 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1687 676 L 1706 676 M 1687 657 L 1706 657 M 1706 676 L 1706 657 M 1687 676 L 1687 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 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_lp__sdfrbp_2.svg b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.svg
index 46dc540..8f613c3 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_2.svg
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_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="image538" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image567" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image538"/>
+  <use xlink:href="#image567"/>
 </pattern>
 <mask 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="#image538"/>
+  <use xlink:href="#image567"/>
 </pattern>
 <mask id="mask1">
 <rect 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 603.5 L 910.5 603.5 L 910.5 648.5 L 894.5 648.5 Z M 627.5 603.5 L 643.5 603.5 L 643.5 648.5 L 627.5 648.5 Z M 685.5 603.5 L 701.5 603.5 L 701.5 648.5 L 685.5 648.5 Z M 971.5 603.5 L 987.5 603.5 L 987.5 648.5 L 971.5 648.5 Z M 849.5 603.5 L 865.5 603.5 L 865.5 648.5 L 849.5 648.5 Z M 731.5 603.5 L 747.5 603.5 L 747.5 648.5 L 731.5 648.5 Z M 933.5 603.5 L 948.5 603.5 L 948.5 648.5 L 933.5 648.5 Z M 581.5 603.5 L 597.5 603.5 L 597.5 648.5 L 581.5 648.5 Z M 436.5 623.5 L 452.5 623.5 L 452.5 668.5 L 436.5 668.5 Z M 529.5 623.5 L 545.5 623.5 L 545.5 668.5 L 529.5 668.5 Z M 483.5 623.5 L 499.5 623.5 L 499.5 668.5 L 483.5 668.5 Z M 350.5 623.5 L 366.5 623.5 L 366.5 668.5 L 350.5 668.5 Z M 388.5 623.5 L 404.5 623.5 L 404.5 668.5 L 388.5 668.5 Z M 237.5 623.5 L 252.5 623.5 L 252.5 668.5 L 237.5 668.5 Z M 1230.5 630.5 L 1246.5 630.5 L 1246.5 675.5 L 1230.5 675.5 Z M 1176.5 630.5 L 1192.5 630.5 L 1192.5 675.5 L 1176.5 675.5 Z M 1275.5 630.5 L 1291.5 630.5 L 1291.5 675.5 L 1275.5 675.5 Z M 1123.5 607.5 L 1139.5 607.5 L 1139.5 675.5 L 1123.5 675.5 Z M 1314.5 630.5 L 1330.5 630.5 L 1330.5 675.5 L 1314.5 675.5 Z M 1046.5 607.5 L 1062.5 607.5 L 1062.5 675.5 L 1046.5 675.5 Z M 1617.5 592.5 L 1633.5 592.5 L 1633.5 681.5 L 1617.5 681.5 Z M 1662.5 592.5 L 1678.5 592.5 L 1678.5 681.5 L 1662.5 681.5 Z M 1415.5 596.5 L 1430.5 596.5 L 1430.5 685.5 L 1415.5 685.5 Z M 1460.5 596.5 L 1476.5 596.5 L 1476.5 685.5 L 1460.5 685.5 Z M 1516.5 641.5 L 1532.5 641.5 L 1532.5 685.5 L 1516.5 685.5 Z M 1516.5 641.5 "/>
 </clipPath>
-<image id="image539" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image568" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image539"/>
+  <use xlink:href="#image568"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1303.5 403.5 L 1318.5 403.5 L 1318.5 448.5 L 1303.5 448.5 Z M 1236.5 403.5 L 1252.5 403.5 L 1252.5 448.5 L 1236.5 448.5 Z M 1348.5 403.5 L 1364.5 403.5 L 1364.5 448.5 L 1348.5 448.5 Z M 1179.5 403.5 L 1195.5 403.5 L 1195.5 448.5 L 1179.5 448.5 Z M 414.5 383.5 L 430.5 383.5 L 430.5 451.5 L 414.5 451.5 Z M 464.5 383.5 L 480.5 383.5 L 480.5 451.5 L 464.5 451.5 Z M 522.5 383.5 L 538.5 383.5 L 538.5 451.5 L 522.5 451.5 Z M 331.5 383.5 L 346.5 383.5 L 346.5 451.5 L 331.5 451.5 Z M 369.5 383.5 L 385.5 383.5 L 385.5 451.5 L 369.5 451.5 Z M 285.5 383.5 L 301.5 383.5 L 301.5 451.5 L 285.5 451.5 Z M 795.5 421.5 L 811.5 421.5 L 811.5 465.5 L 795.5 465.5 Z M 879.5 421.5 L 895.5 421.5 L 895.5 465.5 L 879.5 465.5 Z M 949.5 421.5 L 965.5 421.5 L 965.5 465.5 L 949.5 465.5 Z M 841.5 421.5 L 857.5 421.5 L 857.5 465.5 L 841.5 465.5 Z M 1118.5 403.5 L 1134.5 403.5 L 1134.5 492.5 L 1118.5 492.5 Z M 1057.5 421.5 L 1073.5 421.5 L 1073.5 510.5 L 1057.5 510.5 Z M 1617.5 382.5 L 1633.5 382.5 L 1633.5 516.5 L 1617.5 516.5 Z M 628.5 382.5 L 644.5 382.5 L 644.5 516.5 L 628.5 516.5 Z M 674.5 382.5 L 690.5 382.5 L 690.5 516.5 L 674.5 516.5 Z M 1662.5 382.5 L 1678.5 382.5 L 1678.5 516.5 L 1662.5 516.5 Z M 1458.5 382.5 L 1474.5 382.5 L 1474.5 516.5 L 1458.5 516.5 Z M 1412.5 382.5 L 1428.5 382.5 L 1428.5 516.5 L 1412.5 516.5 Z M 1514.5 448.5 L 1530.5 448.5 L 1530.5 516.5 L 1514.5 516.5 Z M 1514.5 448.5 "/>
 </clipPath>
-<image id="image540" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image569" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image540"/>
+  <use xlink:href="#image569"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 211.5 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 486.5 L 993.5 486.5 L 993.5 491.5 L 975.5 491.5 Z M 1278.5 486.5 L 1296.5 486.5 L 1296.5 491.5 L 1278.5 491.5 Z M 1278.5 491.5 L 1296.5 491.5 L 1296.5 504.5 L 1278.5 504.5 Z M 567.5 486.5 L 585.5 486.5 L 585.5 504.5 L 567.5 504.5 Z M 975.5 491.5 L 993.5 491.5 L 993.5 504.5 L 975.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="image541" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image570" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image541"/>
+  <use xlink:href="#image570"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface535">
+<g id="surface564">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -275,6 +275,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 365.246094 585.5 L 365.246094 563.007812 L 373.917969 563.007812 L 375.273438 563.097656 L 376.539062 563.347656 L 377.710938 563.777344 L 378.792969 564.332031 L 379.75 565.105469 L 380.644531 566 L 381.382812 567.078125 L 382 568.25 L 382.464844 569.578125 L 382.804688 570.996094 L 382.988281 572.570312 L 383.082031 574.238281 L 382.988281 575.996094 L 382.773438 577.632812 L 382.402344 579.113281 L 381.90625 580.46875 L 381.261719 581.675781 L 380.457031 582.722656 L 379.59375 583.585938 L 378.636719 584.265625 L 377.589844 584.820312 L 376.445312 585.191406 L 375.210938 585.4375 L 373.917969 585.5 Z M 368.117188 582.96875 L 373.421875 582.96875 L 374.84375 582.878906 L 376.105469 582.539062 L 377.21875 581.953125 L 378.144531 581.179688 L 378.882812 580.132812 L 379.5 578.867188 L 379.6875 578.21875 L 379.871094 577.539062 L 380.027344 576.796875 L 380.117188 575.996094 L 380.179688 575.164062 L 380.210938 574.269531 L 380.085938 572.261719 L 379.777344 570.503906 L 379.222656 568.992188 L 378.484375 567.789062 L 377.527344 566.800781 L 376.355469 566.09375 L 375.921875 565.9375 L 375.460938 565.785156 L 374.964844 565.691406 L 374.472656 565.597656 L 373.949219 565.566406 L 373.421875 565.535156 L 368.117188 565.535156 Z M 368.117188 582.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 363 515 L 381 515 M 363 497 L 381 497 M 363 497 L 363 515 M 381 497 L 381 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 363 515 L 381 515 M 363 497 L 381 497 M 381 515 L 381 497 M 363 515 L 363 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/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.svg b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.svg
index f7c8a61..c2cb07d 100644
--- a/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.svg
+++ b/cells/sdfrbp/sky130_fd_sc_lp__sdfrbp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 385.5 L 1744.5 385.5 L 1744.5 485.5 L 174.5 485.5 Z M 648.5 485.5 L 1744.5 485.5 L 1744.5 534.5 L 648.5 534.5 Z M 174.5 485.5 L 264.5 485.5 L 264.5 534.5 L 174.5 534.5 Z M 1372.5 534.5 L 1551.5 534.5 L 1551.5 538.5 L 1372.5 538.5 Z M 1372.5 534.5 "/>
 </clipPath>
-<image id="image507" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image535" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image507"/>
+  <use xlink:href="#image535"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 189.5 647.5 L 1728.5 647.5 L 1728.5 667.5 L 189.5 667.5 Z M 189.5 647.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image507"/>
+  <use xlink:href="#image535"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 314.5 529.5 L 326.5 529.5 L 326.5 562.5 L 314.5 562.5 Z M 349.5 529.5 L 361.5 529.5 L 361.5 562.5 L 349.5 562.5 Z M 412.5 529.5 L 424.5 529.5 L 424.5 562.5 L 412.5 562.5 Z M 378.5 529.5 L 390.5 529.5 L 390.5 562.5 L 378.5 562.5 Z M 542.5 546.5 L 554.5 546.5 L 554.5 579.5 L 542.5 579.5 Z M 577.5 546.5 L 589.5 546.5 L 589.5 579.5 L 577.5 579.5 Z M 1146.5 577.5 L 1158.5 577.5 L 1158.5 611.5 L 1146.5 611.5 Z M 1284.5 577.5 L 1296.5 577.5 L 1296.5 611.5 L 1284.5 611.5 Z M 1115.5 577.5 L 1127.5 577.5 L 1127.5 611.5 L 1115.5 611.5 Z M 1252.5 577.5 L 1264.5 577.5 L 1264.5 611.5 L 1252.5 611.5 Z M 1610.5 578.5 L 1622.5 578.5 L 1622.5 612.5 L 1610.5 612.5 Z M 1581.5 578.5 L 1593.5 578.5 L 1593.5 612.5 L 1581.5 612.5 Z M 731.5 586.5 L 743.5 586.5 L 743.5 619.5 L 731.5 619.5 Z M 700.5 586.5 L 712.5 586.5 L 712.5 619.5 L 700.5 619.5 Z M 1072.5 568.5 L 1084.5 568.5 L 1084.5 619.5 L 1072.5 619.5 Z M 843.5 581.5 L 855.5 581.5 L 855.5 632.5 L 843.5 632.5 Z M 874.5 581.5 L 886.5 581.5 L 886.5 632.5 L 874.5 632.5 Z M 491.5 607.5 L 503.5 607.5 L 503.5 641.5 L 491.5 641.5 Z M 1683.5 578.5 L 1695.5 578.5 L 1695.5 646.5 L 1683.5 646.5 Z M 1654.5 578.5 L 1666.5 578.5 L 1666.5 646.5 L 1654.5 646.5 Z M 224.5 615.5 L 236.5 615.5 L 236.5 648.5 L 224.5 648.5 Z M 1410.5 581.5 L 1422.5 581.5 L 1422.5 648.5 L 1410.5 648.5 Z M 962.5 581.5 L 974.5 581.5 L 974.5 648.5 L 962.5 648.5 Z M 255.5 615.5 L 267.5 615.5 L 267.5 648.5 L 255.5 648.5 Z M 1473.5 581.5 L 1485.5 581.5 L 1485.5 648.5 L 1473.5 648.5 Z M 1439.5 581.5 L 1451.5 581.5 L 1451.5 648.5 L 1439.5 648.5 Z M 931.5 581.5 L 943.5 581.5 L 943.5 648.5 L 931.5 648.5 Z M 1502.5 581.5 L 1514.5 581.5 L 1514.5 648.5 L 1502.5 648.5 Z M 1502.5 581.5 "/>
 </clipPath>
-<image id="image508" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image536" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image508"/>
+  <use xlink:href="#image536"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1175.5 419.5 L 1187.5 419.5 L 1187.5 453.5 L 1175.5 453.5 Z M 649.5 419.5 L 661.5 419.5 L 661.5 453.5 L 649.5 453.5 Z M 728.5 419.5 L 740.5 419.5 L 740.5 453.5 L 728.5 453.5 Z M 757.5 419.5 L 769.5 419.5 L 769.5 453.5 L 757.5 453.5 Z M 1267.5 426.5 L 1279.5 426.5 L 1279.5 459.5 L 1267.5 459.5 Z M 1296.5 426.5 L 1308.5 426.5 L 1308.5 459.5 L 1296.5 459.5 Z M 1330.5 426.5 L 1342.5 426.5 L 1342.5 459.5 L 1330.5 459.5 Z M 256.5 419.5 L 268.5 419.5 L 268.5 470.5 L 256.5 470.5 Z M 503.5 419.5 L 515.5 419.5 L 515.5 470.5 L 503.5 470.5 Z M 346.5 419.5 L 358.5 419.5 L 358.5 470.5 L 346.5 470.5 Z M 227.5 419.5 L 239.5 419.5 L 239.5 470.5 L 227.5 470.5 Z M 380.5 419.5 L 392.5 419.5 L 392.5 470.5 L 380.5 470.5 Z M 411.5 419.5 L 423.5 419.5 L 423.5 470.5 L 411.5 470.5 Z M 586.5 437.5 L 598.5 437.5 L 598.5 470.5 L 586.5 470.5 Z M 542.5 437.5 L 554.5 437.5 L 554.5 470.5 L 542.5 470.5 Z M 314.5 419.5 L 326.5 419.5 L 326.5 470.5 L 314.5 470.5 Z M 472.5 419.5 L 484.5 419.5 L 484.5 470.5 L 472.5 470.5 Z M 1046.5 457.5 L 1058.5 457.5 L 1058.5 491.5 L 1046.5 491.5 Z M 1223.5 474.5 L 1235.5 474.5 L 1235.5 508.5 L 1223.5 508.5 Z M 1090.5 445.5 L 1102.5 445.5 L 1102.5 512.5 L 1090.5 512.5 Z M 848.5 449.5 L 860.5 449.5 L 860.5 517.5 L 848.5 517.5 Z M 877.5 449.5 L 889.5 449.5 L 889.5 517.5 L 877.5 517.5 Z M 1654.5 419.5 L 1666.5 419.5 L 1666.5 520.5 L 1654.5 520.5 Z M 1610.5 469.5 L 1622.5 469.5 L 1622.5 520.5 L 1610.5 520.5 Z M 1581.5 469.5 L 1593.5 469.5 L 1593.5 520.5 L 1581.5 520.5 Z M 1683.5 419.5 L 1695.5 419.5 L 1695.5 520.5 L 1683.5 520.5 Z M 956.5 419.5 L 968.5 419.5 L 968.5 520.5 L 956.5 520.5 Z M 927.5 419.5 L 939.5 419.5 L 939.5 520.5 L 927.5 520.5 Z M 1439.5 423.5 L 1451.5 423.5 L 1451.5 524.5 L 1439.5 524.5 Z M 1410.5 423.5 L 1422.5 423.5 L 1422.5 524.5 L 1410.5 524.5 Z M 1502.5 423.5 L 1514.5 423.5 L 1514.5 524.5 L 1502.5 524.5 Z M 1473.5 423.5 L 1485.5 423.5 L 1485.5 524.5 L 1473.5 524.5 Z M 1473.5 423.5 "/>
 </clipPath>
-<image id="image509" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image537" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image509"/>
+  <use xlink:href="#image537"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 202.5 393.5 L 215.5 393.5 L 215.5 407.5 L 202.5 407.5 Z M 1702.5 393.5 L 1716.5 393.5 L 1716.5 407.5 L 1702.5 407.5 Z M 1664.5 393.5 L 1677.5 393.5 L 1677.5 407.5 L 1664.5 407.5 Z M 1625.5 393.5 L 1639.5 393.5 L 1639.5 407.5 L 1625.5 407.5 Z M 1587.5 393.5 L 1601.5 393.5 L 1601.5 407.5 L 1587.5 407.5 Z M 1548.5 393.5 L 1562.5 393.5 L 1562.5 407.5 L 1548.5 407.5 Z M 1510.5 393.5 L 1524.5 393.5 L 1524.5 407.5 L 1510.5 407.5 Z M 1471.5 393.5 L 1485.5 393.5 L 1485.5 407.5 L 1471.5 407.5 Z M 1433.5 393.5 L 1447.5 393.5 L 1447.5 407.5 L 1433.5 407.5 Z M 1395.5 393.5 L 1408.5 393.5 L 1408.5 407.5 L 1395.5 407.5 Z M 1356.5 393.5 L 1370.5 393.5 L 1370.5 407.5 L 1356.5 407.5 Z M 1318.5 393.5 L 1331.5 393.5 L 1331.5 407.5 L 1318.5 407.5 Z M 1279.5 393.5 L 1293.5 393.5 L 1293.5 407.5 L 1279.5 407.5 Z M 1241.5 393.5 L 1254.5 393.5 L 1254.5 407.5 L 1241.5 407.5 Z M 1202.5 393.5 L 1216.5 393.5 L 1216.5 407.5 L 1202.5 407.5 Z M 1164.5 393.5 L 1177.5 393.5 L 1177.5 407.5 L 1164.5 407.5 Z M 1125.5 393.5 L 1139.5 393.5 L 1139.5 407.5 L 1125.5 407.5 Z M 1087.5 393.5 L 1100.5 393.5 L 1100.5 407.5 L 1087.5 407.5 Z M 1048.5 393.5 L 1062.5 393.5 L 1062.5 407.5 L 1048.5 407.5 Z M 1010.5 393.5 L 1023.5 393.5 L 1023.5 407.5 L 1010.5 407.5 Z M 971.5 393.5 L 985.5 393.5 L 985.5 407.5 L 971.5 407.5 Z M 933.5 393.5 L 946.5 393.5 L 946.5 407.5 L 933.5 407.5 Z M 894.5 393.5 L 908.5 393.5 L 908.5 407.5 L 894.5 407.5 Z M 856.5 393.5 L 870.5 393.5 L 870.5 407.5 L 856.5 407.5 Z M 817.5 393.5 L 831.5 393.5 L 831.5 407.5 L 817.5 407.5 Z M 779.5 393.5 L 793.5 393.5 L 793.5 407.5 L 779.5 407.5 Z M 740.5 393.5 L 754.5 393.5 L 754.5 407.5 L 740.5 407.5 Z M 702.5 393.5 L 716.5 393.5 L 716.5 407.5 L 702.5 407.5 Z M 664.5 393.5 L 677.5 393.5 L 677.5 407.5 L 664.5 407.5 Z M 625.5 393.5 L 639.5 393.5 L 639.5 407.5 L 625.5 407.5 Z M 587.5 393.5 L 600.5 393.5 L 600.5 407.5 L 587.5 407.5 Z M 548.5 393.5 L 562.5 393.5 L 562.5 407.5 L 548.5 407.5 Z M 510.5 393.5 L 523.5 393.5 L 523.5 407.5 L 510.5 407.5 Z M 471.5 393.5 L 485.5 393.5 L 485.5 407.5 L 471.5 407.5 Z M 433.5 393.5 L 446.5 393.5 L 446.5 407.5 L 433.5 407.5 Z M 394.5 393.5 L 408.5 393.5 L 408.5 407.5 L 394.5 407.5 Z M 356.5 393.5 L 369.5 393.5 L 369.5 407.5 L 356.5 407.5 Z M 317.5 393.5 L 331.5 393.5 L 331.5 407.5 L 317.5 407.5 Z M 279.5 393.5 L 292.5 393.5 L 292.5 407.5 L 279.5 407.5 Z M 240.5 393.5 L 254.5 393.5 L 254.5 407.5 L 240.5 407.5 Z M 740.5 467.5 L 754.5 467.5 L 754.5 472.5 L 740.5 472.5 Z M 740.5 472.5 L 754.5 472.5 L 754.5 481.5 L 740.5 481.5 Z M 1318.5 467.5 L 1331.5 467.5 L 1331.5 481.5 L 1318.5 481.5 Z M 510.5 467.5 L 523.5 467.5 L 523.5 481.5 L 510.5 481.5 Z M 202.5 660.5 L 215.5 660.5 L 215.5 674.5 L 202.5 674.5 Z M 1702.5 660.5 L 1716.5 660.5 L 1716.5 674.5 L 1702.5 674.5 Z M 1664.5 660.5 L 1677.5 660.5 L 1677.5 674.5 L 1664.5 674.5 Z M 1625.5 660.5 L 1639.5 660.5 L 1639.5 674.5 L 1625.5 674.5 Z M 1587.5 660.5 L 1601.5 660.5 L 1601.5 674.5 L 1587.5 674.5 Z M 1548.5 660.5 L 1562.5 660.5 L 1562.5 674.5 L 1548.5 674.5 Z M 1510.5 660.5 L 1524.5 660.5 L 1524.5 674.5 L 1510.5 674.5 Z M 1471.5 660.5 L 1485.5 660.5 L 1485.5 674.5 L 1471.5 674.5 Z M 1433.5 660.5 L 1447.5 660.5 L 1447.5 674.5 L 1433.5 674.5 Z M 1395.5 660.5 L 1408.5 660.5 L 1408.5 674.5 L 1395.5 674.5 Z M 1356.5 660.5 L 1370.5 660.5 L 1370.5 674.5 L 1356.5 674.5 Z M 1318.5 660.5 L 1331.5 660.5 L 1331.5 674.5 L 1318.5 674.5 Z M 1279.5 660.5 L 1293.5 660.5 L 1293.5 674.5 L 1279.5 674.5 Z M 1241.5 660.5 L 1254.5 660.5 L 1254.5 674.5 L 1241.5 674.5 Z M 1202.5 660.5 L 1216.5 660.5 L 1216.5 674.5 L 1202.5 674.5 Z M 1164.5 660.5 L 1177.5 660.5 L 1177.5 674.5 L 1164.5 674.5 Z M 1125.5 660.5 L 1139.5 660.5 L 1139.5 674.5 L 1125.5 674.5 Z M 1087.5 660.5 L 1100.5 660.5 L 1100.5 674.5 L 1087.5 674.5 Z M 1048.5 660.5 L 1062.5 660.5 L 1062.5 674.5 L 1048.5 674.5 Z M 1010.5 660.5 L 1023.5 660.5 L 1023.5 674.5 L 1010.5 674.5 Z M 971.5 660.5 L 985.5 660.5 L 985.5 674.5 L 971.5 674.5 Z M 933.5 660.5 L 946.5 660.5 L 946.5 674.5 L 933.5 674.5 Z M 894.5 660.5 L 908.5 660.5 L 908.5 674.5 L 894.5 674.5 Z M 856.5 660.5 L 870.5 660.5 L 870.5 674.5 L 856.5 674.5 Z M 817.5 660.5 L 831.5 660.5 L 831.5 674.5 L 817.5 674.5 Z M 779.5 660.5 L 793.5 660.5 L 793.5 674.5 L 779.5 674.5 Z M 740.5 660.5 L 754.5 660.5 L 754.5 674.5 L 740.5 674.5 Z M 702.5 660.5 L 716.5 660.5 L 716.5 674.5 L 702.5 674.5 Z M 664.5 660.5 L 677.5 660.5 L 677.5 674.5 L 664.5 674.5 Z M 625.5 660.5 L 639.5 660.5 L 639.5 674.5 L 625.5 674.5 Z M 587.5 660.5 L 600.5 660.5 L 600.5 674.5 L 587.5 674.5 Z M 548.5 660.5 L 562.5 660.5 L 562.5 674.5 L 548.5 674.5 Z M 510.5 660.5 L 523.5 660.5 L 523.5 674.5 L 510.5 674.5 Z M 471.5 660.5 L 485.5 660.5 L 485.5 674.5 L 471.5 674.5 Z M 433.5 660.5 L 446.5 660.5 L 446.5 674.5 L 433.5 674.5 Z M 394.5 660.5 L 408.5 660.5 L 408.5 674.5 L 394.5 674.5 Z M 356.5 660.5 L 369.5 660.5 L 369.5 674.5 L 356.5 674.5 Z M 317.5 660.5 L 331.5 660.5 L 331.5 674.5 L 317.5 674.5 Z M 279.5 660.5 L 292.5 660.5 L 292.5 674.5 L 279.5 674.5 Z M 240.5 660.5 L 254.5 660.5 L 254.5 674.5 L 240.5 674.5 Z M 240.5 660.5 "/>
 </clipPath>
-<image id="image510" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image538" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image510"/>
+  <use xlink:href="#image538"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface504">
+<g id="surface532">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -247,6 +247,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 434.621094 631.5 L 434.621094 614.117188 L 441.320312 614.117188 L 442.371094 614.191406 L 443.347656 614.378906 L 444.253906 614.714844 L 445.089844 615.144531 L 445.828125 615.738281 L 446.519531 616.429688 L 447.09375 617.265625 L 447.570312 618.171875 L 447.925781 619.195312 L 448.1875 620.292969 L 448.332031 621.511719 L 448.402344 622.796875 L 448.332031 624.15625 L 448.164062 625.421875 L 447.878906 626.566406 L 447.496094 627.613281 L 446.996094 628.542969 L 446.375 629.355469 L 445.707031 630.023438 L 444.96875 630.546875 L 444.160156 630.976562 L 443.277344 631.261719 L 442.324219 631.453125 L 441.320312 631.5 Z M 436.839844 629.542969 L 440.941406 629.542969 L 442.039062 629.472656 L 443.015625 629.210938 L 443.875 628.757812 L 444.589844 628.160156 L 445.160156 627.351562 L 445.636719 626.375 L 445.78125 625.875 L 445.921875 625.347656 L 446.042969 624.777344 L 446.113281 624.15625 L 446.160156 623.511719 L 446.1875 622.820312 L 446.089844 621.269531 L 445.851562 619.914062 L 445.421875 618.742188 L 444.851562 617.8125 L 444.113281 617.050781 L 443.207031 616.503906 L 442.871094 616.382812 L 442.515625 616.265625 L 442.132812 616.191406 L 441.75 616.121094 L 441.347656 616.097656 L 440.941406 616.074219 L 436.839844 616.074219 Z M 436.839844 629.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 433 463 L 446 463 M 433 450 L 446 450 M 433 450 L 433 463 M 446 450 L 446 463 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 433 463 L 446 463 M 433 450 L 446 450 M 446 463 L 446 450 M 433 463 L 433 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(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 189 407 L 189 416 M 184 412 L 193 412 M 188 413 L 190 413 M 188 411 L 190 411 M 188 411 L 188 413 M 190 411 L 190 413 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.svg b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.svg
index 6a67ab5..61e0360 100644
--- a/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_1.svg
+++ b/cells/sdfrtn/sky130_fd_sc_lp__sdfrtn_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 1521.5 535.5 L 1649.5 535.5 L 1649.5 544.5 L 1521.5 544.5 Z M 1521.5 535.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image382"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1240.5 579.5 L 1257.5 579.5 L 1257.5 651.5 L 1240.5 651.5 Z M 1165.5 579.5 L 1182.5 579.5 L 1182.5 651.5 L 1165.5 651.5 Z M 1326.5 604.5 L 1343.5 604.5 L 1343.5 651.5 L 1326.5 651.5 Z M 945.5 604.5 L 963.5 604.5 L 963.5 651.5 L 945.5 651.5 Z M 994.5 604.5 L 1011.5 604.5 L 1011.5 651.5 L 994.5 651.5 Z M 1035.5 604.5 L 1052.5 604.5 L 1052.5 651.5 L 1035.5 651.5 Z M 1483.5 604.5 L 1500.5 604.5 L 1500.5 651.5 L 1483.5 651.5 Z M 1076.5 604.5 L 1093.5 604.5 L 1093.5 651.5 L 1076.5 651.5 Z M 1442.5 604.5 L 1459.5 604.5 L 1459.5 651.5 L 1442.5 651.5 Z M 1367.5 604.5 L 1384.5 604.5 L 1384.5 651.5 L 1367.5 651.5 Z M 679.5 589.5 L 696.5 589.5 L 696.5 684.5 L 679.5 684.5 Z M 1659.5 592.5 L 1676.5 592.5 L 1676.5 688.5 L 1659.5 688.5 Z M 243.5 640.5 L 260.5 640.5 L 260.5 688.5 L 243.5 688.5 Z M 1599.5 640.5 L 1617.5 640.5 L 1617.5 688.5 L 1599.5 688.5 Z M 424.5 642.5 L 441.5 642.5 L 441.5 690.5 L 424.5 690.5 Z M 547.5 642.5 L 564.5 642.5 L 564.5 690.5 L 547.5 690.5 Z M 383.5 642.5 L 400.5 642.5 L 400.5 690.5 L 383.5 690.5 Z M 608.5 642.5 L 625.5 642.5 L 625.5 690.5 L 608.5 690.5 Z M 499.5 642.5 L 516.5 642.5 L 516.5 690.5 L 499.5 690.5 Z M 792.5 601.5 L 809.5 601.5 L 809.5 697.5 L 792.5 697.5 Z M 792.5 601.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1367.5 373.5 L 1384.5 373.5 L 1384.5 421.5 L 1367.5 421.5 Z M 1488.5 373.5 L 1505.5 373.5 L 1505.5 421.5 L 1488.5 421.5 Z M 1439.5 373.5 L 1456.5 373.5 L 1456.5 421.5 L 1439.5 421.5 Z M 1326.5 373.5 L 1343.5 373.5 L 1343.5 421.5 L 1326.5 421.5 Z M 904.5 375.5 L 921.5 375.5 L 921.5 423.5 L 904.5 423.5 Z M 994.5 375.5 L 1011.5 375.5 L 1011.5 423.5 L 994.5 423.5 Z M 953.5 375.5 L 970.5 375.5 L 970.5 423.5 L 953.5 423.5 Z M 1043.5 375.5 L 1060.5 375.5 L 1060.5 423.5 L 1043.5 423.5 Z M 356.5 372.5 L 373.5 372.5 L 373.5 445.5 L 356.5 445.5 Z M 498.5 372.5 L 515.5 372.5 L 515.5 445.5 L 498.5 445.5 Z M 538.5 372.5 L 555.5 372.5 L 555.5 445.5 L 538.5 445.5 Z M 600.5 372.5 L 617.5 372.5 L 617.5 445.5 L 600.5 445.5 Z M 397.5 372.5 L 414.5 372.5 L 414.5 445.5 L 397.5 445.5 Z M 1218.5 373.5 L 1235.5 373.5 L 1235.5 468.5 L 1218.5 468.5 Z M 1267.5 373.5 L 1284.5 373.5 L 1284.5 468.5 L 1267.5 468.5 Z M 665.5 372.5 L 682.5 372.5 L 682.5 515.5 L 665.5 515.5 Z M 243.5 442.5 L 260.5 442.5 L 260.5 515.5 L 243.5 515.5 Z M 1641.5 372.5 L 1659.5 372.5 L 1659.5 515.5 L 1641.5 515.5 Z M 792.5 372.5 L 809.5 372.5 L 809.5 515.5 L 792.5 515.5 Z M 1571.5 451.5 L 1588.5 451.5 L 1588.5 524.5 L 1571.5 524.5 Z M 1571.5 451.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 595.5 483.5 L 614.5 483.5 L 614.5 502.5 L 595.5 502.5 Z M 1085.5 483.5 L 1104.5 483.5 L 1104.5 502.5 L 1085.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="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface379">
+<g id="surface406">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1707.171875 420.546875 L 1705.589844 422.5 L 1702.058594 419.570312 L 1701.046875 420.109375 L 1700.039062 420.515625 L 1698.992188 420.851562 L 1697.882812 421.085938 L 1696.773438 421.222656 L 1695.628906 421.289062 L 1694.078125 421.1875 L 1692.632812 420.953125 L 1691.285156 420.546875 L 1690.007812 420.007812 L 1688.792969 419.300781 L 1687.71875 418.394531 L 1686.742188 417.417969 L 1685.898438 416.304688 L 1685.226562 415.09375 L 1684.652344 413.78125 L 1684.214844 412.367188 L 1683.949219 410.820312 L 1683.878906 410.449219 L 1683.847656 410.046875 L 1683.8125 409.675781 L 1683.777344 409.269531 L 1683.777344 408.429688 L 1683.847656 406.746094 L 1684.082031 405.132812 L 1684.453125 403.648438 L 1684.992188 402.234375 L 1685.664062 400.921875 L 1686.539062 399.710938 L 1687.414062 398.734375 L 1688.425781 397.859375 L 1689.535156 397.121094 L 1690.714844 396.546875 L 1691.992188 396.078125 L 1693.40625 395.738281 L 1693.742188 395.707031 L 1694.113281 395.671875 L 1694.484375 395.640625 L 1694.851562 395.605469 L 1695.222656 395.605469 L 1695.628906 395.570312 L 1697.140625 395.671875 L 1698.589844 395.90625 L 1699.9375 396.3125 L 1701.214844 396.851562 L 1702.425781 397.558594 L 1703.539062 398.433594 L 1704.480469 399.441406 L 1705.320312 400.519531 L 1705.996094 401.699219 L 1706.566406 403.011719 L 1707.003906 404.425781 L 1707.308594 405.90625 L 1707.339844 406.34375 L 1707.375 406.746094 L 1707.410156 407.152344 L 1707.441406 407.554688 L 1707.441406 407.957031 L 1707.476562 408.363281 L 1707.375 410.246094 L 1707.070312 412.03125 L 1706.601562 413.679688 L 1705.929688 415.230469 L 1705.050781 416.644531 L 1704.007812 417.957031 Z M 1698.691406 413.613281 L 1701.6875 416.070312 L 1702.496094 415.0625 L 1703.167969 413.917969 L 1703.671875 412.671875 L 1704.042969 411.359375 L 1704.246094 409.945312 L 1704.347656 408.394531 L 1704.277344 406.984375 L 1704.078125 405.636719 L 1703.738281 404.390625 L 1703.300781 403.246094 L 1702.730469 402.167969 L 1702.023438 401.191406 L 1701.214844 400.386719 L 1700.375 399.710938 L 1699.429688 399.171875 L 1698.421875 398.769531 L 1697.3125 398.5 L 1696.167969 398.332031 L 1695.628906 398.332031 L 1694.414062 398.433594 L 1693.269531 398.632812 L 1692.195312 398.972656 L 1691.21875 399.476562 L 1690.308594 400.117188 L 1689.5 400.890625 L 1688.726562 401.796875 L 1688.121094 402.808594 L 1687.617188 403.917969 L 1687.246094 405.132812 L 1687.011719 406.445312 L 1686.910156 407.859375 L 1686.910156 408.429688 L 1686.941406 409.910156 L 1687.144531 411.257812 L 1687.480469 412.503906 L 1687.917969 413.679688 L 1688.523438 414.757812 L 1689.265625 415.699219 L 1690.039062 416.542969 L 1690.914062 417.214844 L 1691.859375 417.753906 L 1692.867188 418.125 L 1693.976562 418.394531 L 1695.15625 418.496094 L 1695.222656 418.527344 L 1696.199219 418.527344 L 1696.839844 418.460938 L 1697.480469 418.324219 L 1698.085938 418.191406 L 1698.691406 417.988281 L 1699.332031 417.71875 L 1699.363281 417.71875 L 1699.429688 417.6875 L 1699.464844 417.652344 L 1699.53125 417.652344 L 1699.566406 417.621094 L 1699.632812 417.585938 L 1697.140625 415.5 Z M 1698.691406 413.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 680 L 1704 680 M 1685 661 L 1704 661 M 1685 661 L 1685 680 M 1704 661 L 1704 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 1685 680 L 1704 680 M 1685 661 L 1704 661 M 1704 680 L 1704 661 M 1685 680 L 1685 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/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.svg b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.svg
index d8ced0e..0091b56 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_1.svg
+++ b/cells/sdfrtp/sky130_fd_sc_lp__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 174.5 324.5 "/>
 </clipPath>
-<image id="image480" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image507" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image507"/>
 </pattern>
 <mask 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="#image480"/>
+  <use xlink:href="#image507"/>
 </pattern>
 <mask id="mask1">
 <rect 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 608.5 L 1228.5 608.5 L 1228.5 656.5 L 1211.5 656.5 Z M 1251.5 608.5 L 1269.5 608.5 L 1269.5 656.5 L 1251.5 656.5 Z M 741.5 608.5 L 758.5 608.5 L 758.5 656.5 L 741.5 656.5 Z M 794.5 608.5 L 812.5 608.5 L 812.5 656.5 L 794.5 656.5 Z M 692.5 608.5 L 709.5 608.5 L 709.5 656.5 L 692.5 656.5 Z M 1127.5 611.5 L 1144.5 611.5 L 1144.5 659.5 L 1127.5 659.5 Z M 852.5 611.5 L 869.5 611.5 L 869.5 659.5 L 852.5 659.5 Z M 1086.5 611.5 L 1103.5 611.5 L 1103.5 659.5 L 1086.5 659.5 Z M 469.5 630.5 L 486.5 630.5 L 486.5 677.5 L 469.5 677.5 Z M 510.5 630.5 L 527.5 630.5 L 527.5 677.5 L 510.5 677.5 Z M 564.5 630.5 L 581.5 630.5 L 581.5 677.5 L 564.5 677.5 Z M 246.5 634.5 L 263.5 634.5 L 263.5 681.5 L 246.5 681.5 Z M 1464.5 586.5 L 1481.5 586.5 L 1481.5 682.5 L 1464.5 682.5 Z M 1393.5 586.5 L 1410.5 586.5 L 1410.5 682.5 L 1393.5 682.5 Z M 928.5 611.5 L 945.5 611.5 L 945.5 684.5 L 928.5 684.5 Z M 999.5 611.5 L 1016.5 611.5 L 1016.5 684.5 L 999.5 684.5 Z M 394.5 647.5 L 411.5 647.5 L 411.5 695.5 L 394.5 695.5 Z M 353.5 647.5 L 370.5 647.5 L 370.5 695.5 L 353.5 695.5 Z M 1601.5 649.5 L 1618.5 649.5 L 1618.5 697.5 L 1601.5 697.5 Z M 1659.5 601.5 L 1676.5 601.5 L 1676.5 697.5 L 1659.5 697.5 Z M 1659.5 601.5 "/>
 </clipPath>
-<image id="image481" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image508" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image508"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1236.5 373.5 L 1253.5 373.5 L 1253.5 421.5 L 1236.5 421.5 Z M 1285.5 373.5 L 1302.5 373.5 L 1302.5 421.5 L 1285.5 421.5 Z M 1141.5 373.5 L 1158.5 373.5 L 1158.5 421.5 L 1141.5 421.5 Z M 1074.5 373.5 L 1091.5 373.5 L 1091.5 421.5 L 1074.5 421.5 Z M 727.5 413.5 L 745.5 413.5 L 745.5 460.5 L 727.5 460.5 Z M 331.5 388.5 L 348.5 388.5 L 348.5 460.5 L 331.5 460.5 Z M 687.5 413.5 L 704.5 413.5 L 704.5 460.5 L 687.5 460.5 Z M 789.5 413.5 L 806.5 413.5 L 806.5 460.5 L 789.5 460.5 Z M 523.5 388.5 L 540.5 388.5 L 540.5 460.5 L 523.5 460.5 Z M 578.5 388.5 L 595.5 388.5 L 595.5 460.5 L 578.5 460.5 Z M 380.5 388.5 L 397.5 388.5 L 397.5 460.5 L 380.5 460.5 Z M 470.5 388.5 L 487.5 388.5 L 487.5 460.5 L 470.5 460.5 Z M 421.5 388.5 L 438.5 388.5 L 438.5 460.5 L 421.5 460.5 Z M 638.5 413.5 L 655.5 413.5 L 655.5 460.5 L 638.5 460.5 Z M 1004.5 413.5 L 1021.5 413.5 L 1021.5 508.5 L 1004.5 508.5 Z M 955.5 413.5 L 972.5 413.5 L 972.5 508.5 L 955.5 508.5 Z M 1593.5 442.5 L 1610.5 442.5 L 1610.5 515.5 L 1593.5 515.5 Z M 1464.5 372.5 L 1481.5 372.5 L 1481.5 515.5 L 1464.5 515.5 Z M 1398.5 372.5 L 1415.5 372.5 L 1415.5 515.5 L 1398.5 515.5 Z M 1659.5 372.5 L 1676.5 372.5 L 1676.5 515.5 L 1659.5 515.5 Z M 1659.5 372.5 "/>
 </clipPath>
-<image id="image482" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image509" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image509"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 213.5 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 1031.5 567.5 L 1050.5 567.5 L 1050.5 571.5 L 1031.5 571.5 Z M 1031.5 571.5 L 1050.5 571.5 L 1050.5 586.5 L 1031.5 586.5 Z M 1358.5 567.5 L 1377.5 567.5 L 1377.5 586.5 L 1358.5 586.5 Z M 758.5 567.5 L 777.5 567.5 L 777.5 586.5 L 758.5 586.5 Z M 649.5 567.5 L 668.5 567.5 L 668.5 586.5 L 649.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="image483" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image510" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image510"/>
 </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="surface504">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -252,6 +252,5 @@
 <path style=" 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 420.546875 L 1705.589844 422.5 L 1702.058594 419.570312 L 1701.046875 420.109375 L 1700.039062 420.515625 L 1698.992188 420.851562 L 1697.882812 421.085938 L 1696.773438 421.222656 L 1695.628906 421.289062 L 1694.078125 421.1875 L 1692.632812 420.953125 L 1691.285156 420.546875 L 1690.007812 420.007812 L 1688.792969 419.300781 L 1687.71875 418.394531 L 1686.742188 417.417969 L 1685.898438 416.304688 L 1685.226562 415.09375 L 1684.652344 413.78125 L 1684.214844 412.367188 L 1683.949219 410.820312 L 1683.878906 410.449219 L 1683.847656 410.046875 L 1683.8125 409.675781 L 1683.777344 409.269531 L 1683.777344 408.429688 L 1683.847656 406.746094 L 1684.082031 405.132812 L 1684.453125 403.648438 L 1684.992188 402.234375 L 1685.664062 400.921875 L 1686.539062 399.710938 L 1687.414062 398.734375 L 1688.425781 397.859375 L 1689.535156 397.121094 L 1690.714844 396.546875 L 1691.992188 396.078125 L 1693.40625 395.738281 L 1693.742188 395.707031 L 1694.113281 395.671875 L 1694.484375 395.640625 L 1694.851562 395.605469 L 1695.222656 395.605469 L 1695.628906 395.570312 L 1697.140625 395.671875 L 1698.589844 395.90625 L 1699.9375 396.3125 L 1701.214844 396.851562 L 1702.425781 397.558594 L 1703.539062 398.433594 L 1704.480469 399.441406 L 1705.320312 400.519531 L 1705.996094 401.699219 L 1706.566406 403.011719 L 1707.003906 404.425781 L 1707.308594 405.90625 L 1707.339844 406.34375 L 1707.375 406.746094 L 1707.410156 407.152344 L 1707.441406 407.554688 L 1707.441406 407.957031 L 1707.476562 408.363281 L 1707.375 410.246094 L 1707.070312 412.03125 L 1706.601562 413.679688 L 1705.929688 415.230469 L 1705.050781 416.644531 L 1704.007812 417.957031 Z M 1698.691406 413.613281 L 1701.6875 416.070312 L 1702.496094 415.0625 L 1703.167969 413.917969 L 1703.671875 412.671875 L 1704.042969 411.359375 L 1704.246094 409.945312 L 1704.347656 408.394531 L 1704.277344 406.984375 L 1704.078125 405.636719 L 1703.738281 404.390625 L 1703.300781 403.246094 L 1702.730469 402.167969 L 1702.023438 401.191406 L 1701.214844 400.386719 L 1700.375 399.710938 L 1699.429688 399.171875 L 1698.421875 398.769531 L 1697.3125 398.5 L 1696.167969 398.332031 L 1695.628906 398.332031 L 1694.414062 398.433594 L 1693.269531 398.632812 L 1692.195312 398.972656 L 1691.21875 399.476562 L 1690.308594 400.117188 L 1689.5 400.890625 L 1688.726562 401.796875 L 1688.121094 402.808594 L 1687.617188 403.917969 L 1687.246094 405.132812 L 1687.011719 406.445312 L 1686.910156 407.859375 L 1686.910156 408.429688 L 1686.941406 409.910156 L 1687.144531 411.257812 L 1687.480469 412.503906 L 1687.917969 413.679688 L 1688.523438 414.757812 L 1689.265625 415.699219 L 1690.039062 416.542969 L 1690.914062 417.214844 L 1691.859375 417.753906 L 1692.867188 418.125 L 1693.976562 418.394531 L 1695.15625 418.496094 L 1695.222656 418.527344 L 1696.199219 418.527344 L 1696.839844 418.460938 L 1697.480469 418.324219 L 1698.085938 418.191406 L 1698.691406 417.988281 L 1699.332031 417.71875 L 1699.363281 417.71875 L 1699.429688 417.6875 L 1699.464844 417.652344 L 1699.53125 417.652344 L 1699.566406 417.621094 L 1699.632812 417.585938 L 1697.140625 415.5 Z M 1698.691406 413.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 680 L 1704 680 M 1685 661 L 1704 661 M 1685 661 L 1685 680 M 1704 661 L 1704 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 1685 680 L 1704 680 M 1685 661 L 1704 661 M 1704 680 L 1704 661 M 1685 680 L 1685 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/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.svg b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.svg
index ad65620..1fc8866 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.svg
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_2.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 174.5 331.5 "/>
 </clipPath>
-<image id="image454" 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="#image454"/>
+  <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 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="#image454"/>
+  <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 1171.5 606.5 L 1188.5 606.5 L 1188.5 652.5 L 1171.5 652.5 Z M 722.5 606.5 L 739.5 606.5 L 739.5 652.5 L 722.5 652.5 Z M 774.5 606.5 L 790.5 606.5 L 790.5 652.5 L 774.5 652.5 Z M 1211.5 606.5 L 1227.5 606.5 L 1227.5 652.5 L 1211.5 652.5 Z M 675.5 606.5 L 692.5 606.5 L 692.5 652.5 L 675.5 652.5 Z M 1092.5 609.5 L 1109.5 609.5 L 1109.5 655.5 L 1092.5 655.5 Z M 1053.5 609.5 L 1069.5 609.5 L 1069.5 655.5 L 1053.5 655.5 Z M 830.5 609.5 L 846.5 609.5 L 846.5 655.5 L 830.5 655.5 Z M 548.5 626.5 L 564.5 626.5 L 564.5 672.5 L 548.5 672.5 Z M 460.5 626.5 L 476.5 626.5 L 476.5 672.5 L 460.5 672.5 Z M 499.5 626.5 L 515.5 626.5 L 515.5 672.5 L 499.5 672.5 Z M 243.5 630.5 L 260.5 630.5 L 260.5 676.5 L 243.5 676.5 Z M 1431.5 585.5 L 1448.5 585.5 L 1448.5 677.5 L 1431.5 677.5 Z M 1366.5 585.5 L 1383.5 585.5 L 1383.5 677.5 L 1366.5 677.5 Z M 950.5 609.5 L 967.5 609.5 L 967.5 679.5 L 950.5 679.5 Z M 903.5 609.5 L 919.5 609.5 L 919.5 679.5 L 903.5 679.5 Z M 348.5 643.5 L 364.5 643.5 L 364.5 689.5 L 348.5 689.5 Z M 387.5 643.5 L 404.5 643.5 L 404.5 689.5 L 387.5 689.5 Z M 1614.5 599.5 L 1630.5 599.5 L 1630.5 691.5 L 1614.5 691.5 Z M 1558.5 645.5 L 1574.5 645.5 L 1574.5 691.5 L 1558.5 691.5 Z M 1661.5 599.5 L 1678.5 599.5 L 1678.5 691.5 L 1661.5 691.5 Z M 1661.5 599.5 "/>
 </clipPath>
-<image id="image455" 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="#image455"/>
+  <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 1203.5 378.5 L 1219.5 378.5 L 1219.5 424.5 L 1203.5 424.5 Z M 1250.5 378.5 L 1267.5 378.5 L 1267.5 424.5 L 1250.5 424.5 Z M 1104.5 378.5 L 1121.5 378.5 L 1121.5 424.5 L 1104.5 424.5 Z M 1039.5 378.5 L 1056.5 378.5 L 1056.5 424.5 L 1039.5 424.5 Z M 499.5 390.5 L 515.5 390.5 L 515.5 460.5 L 499.5 460.5 Z M 447.5 390.5 L 464.5 390.5 L 464.5 460.5 L 447.5 460.5 Z M 314.5 390.5 L 330.5 390.5 L 330.5 460.5 L 314.5 460.5 Z M 361.5 390.5 L 377.5 390.5 L 377.5 460.5 L 361.5 460.5 Z M 400.5 390.5 L 417.5 390.5 L 417.5 460.5 L 400.5 460.5 Z M 768.5 417.5 L 784.5 417.5 L 784.5 463.5 L 768.5 463.5 Z M 622.5 417.5 L 638.5 417.5 L 638.5 463.5 L 622.5 463.5 Z M 669.5 417.5 L 686.5 417.5 L 686.5 463.5 L 669.5 463.5 Z M 564.5 393.5 L 581.5 393.5 L 581.5 463.5 L 564.5 463.5 Z M 709.5 417.5 L 725.5 417.5 L 725.5 463.5 L 709.5 463.5 Z M 924.5 417.5 L 941.5 417.5 L 941.5 509.5 L 924.5 509.5 Z M 971.5 417.5 L 988.5 417.5 L 988.5 509.5 L 971.5 509.5 Z M 1614.5 377.5 L 1630.5 377.5 L 1630.5 516.5 L 1614.5 516.5 Z M 1661.5 377.5 L 1678.5 377.5 L 1678.5 516.5 L 1661.5 516.5 Z M 1431.5 377.5 L 1448.5 377.5 L 1448.5 516.5 L 1431.5 516.5 Z M 1558.5 445.5 L 1574.5 445.5 L 1574.5 516.5 L 1558.5 516.5 Z M 1367.5 377.5 L 1383.5 377.5 L 1383.5 516.5 L 1367.5 516.5 Z M 1367.5 377.5 "/>
 </clipPath>
-<image id="image456" 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="#image456"/>
+  <use xlink:href="#image484"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 739.5 565.5 L 757.5 565.5 L 757.5 566.5 L 739.5 566.5 Z M 1002.5 565.5 L 1021.5 565.5 L 1021.5 569.5 L 1002.5 569.5 Z M 1002.5 569.5 L 1021.5 569.5 L 1021.5 584.5 L 1002.5 584.5 Z M 633.5 565.5 L 652.5 565.5 L 652.5 584.5 L 633.5 584.5 Z M 1318.5 565.5 L 1337.5 565.5 L 1337.5 584.5 L 1318.5 584.5 Z M 739.5 566.5 L 757.5 566.5 L 757.5 584.5 L 739.5 584.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="image457" 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="#image457"/>
+  <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="surface451">
+<g id="surface479">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -237,6 +237,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1656.144531 424.628906 L 1654.628906 426.5 L 1651.242188 423.695312 L 1650.273438 424.210938 L 1649.304688 424.597656 L 1648.304688 424.917969 L 1647.242188 425.144531 L 1646.175781 425.273438 L 1645.082031 425.339844 L 1643.597656 425.242188 L 1642.210938 425.015625 L 1640.917969 424.628906 L 1639.695312 424.113281 L 1638.53125 423.433594 L 1637.5 422.566406 L 1636.566406 421.628906 L 1635.757812 420.566406 L 1635.113281 419.402344 L 1634.566406 418.144531 L 1634.144531 416.789062 L 1633.886719 415.304688 L 1633.824219 414.953125 L 1633.789062 414.566406 L 1633.757812 414.210938 L 1633.726562 413.824219 L 1633.726562 413.015625 L 1633.789062 411.402344 L 1634.015625 409.855469 L 1634.371094 408.433594 L 1634.886719 407.082031 L 1635.53125 405.824219 L 1636.371094 404.660156 L 1637.210938 403.726562 L 1638.175781 402.886719 L 1639.242188 402.175781 L 1640.371094 401.628906 L 1641.597656 401.175781 L 1642.953125 400.855469 L 1643.273438 400.824219 L 1643.628906 400.789062 L 1644.339844 400.726562 L 1644.695312 400.726562 L 1645.082031 400.695312 L 1646.53125 400.789062 L 1647.917969 401.015625 L 1649.210938 401.402344 L 1650.433594 401.917969 L 1651.597656 402.597656 L 1652.660156 403.433594 L 1653.566406 404.402344 L 1654.371094 405.433594 L 1655.015625 406.566406 L 1655.566406 407.824219 L 1655.984375 409.175781 L 1656.273438 410.597656 L 1656.304688 411.015625 L 1656.339844 411.402344 L 1656.402344 412.175781 L 1656.402344 412.566406 L 1656.433594 412.953125 L 1656.339844 414.757812 L 1656.046875 416.46875 L 1655.597656 418.046875 L 1654.953125 419.53125 L 1654.113281 420.886719 L 1653.113281 422.144531 Z M 1648.015625 417.984375 L 1650.886719 420.339844 L 1651.660156 419.371094 L 1652.304688 418.273438 L 1652.789062 417.082031 L 1653.144531 415.824219 L 1653.339844 414.46875 L 1653.433594 412.984375 L 1653.371094 411.628906 L 1653.175781 410.339844 L 1652.855469 409.144531 L 1652.433594 408.046875 L 1651.886719 407.015625 L 1651.210938 406.082031 L 1650.433594 405.304688 L 1649.628906 404.660156 L 1648.726562 404.144531 L 1647.757812 403.757812 L 1646.695312 403.5 L 1645.597656 403.339844 L 1645.082031 403.339844 L 1643.917969 403.433594 L 1642.824219 403.628906 L 1641.789062 403.953125 L 1640.855469 404.433594 L 1639.984375 405.046875 L 1639.210938 405.789062 L 1638.46875 406.660156 L 1637.886719 407.628906 L 1637.402344 408.695312 L 1637.046875 409.855469 L 1636.824219 411.113281 L 1636.726562 412.46875 L 1636.726562 413.015625 L 1636.757812 414.433594 L 1636.953125 415.726562 L 1637.273438 416.917969 L 1637.695312 418.046875 L 1638.273438 419.082031 L 1638.984375 419.984375 L 1639.726562 420.789062 L 1640.566406 421.433594 L 1641.46875 421.953125 L 1642.433594 422.304688 L 1643.5 422.566406 L 1644.628906 422.660156 L 1644.695312 422.695312 L 1645.628906 422.695312 L 1646.242188 422.628906 L 1646.855469 422.5 L 1647.433594 422.371094 L 1648.015625 422.175781 L 1648.628906 421.917969 L 1648.660156 421.917969 L 1648.726562 421.886719 L 1648.757812 421.855469 L 1648.824219 421.855469 L 1648.855469 421.824219 L 1648.917969 421.789062 L 1646.53125 419.789062 Z M 1648.015625 417.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 1634 676 L 1653 676 M 1634 657 L 1653 657 M 1634 657 L 1634 676 M 1653 657 L 1653 676 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1634 676 L 1653 676 M 1634 657 L 1653 657 M 1653 676 L 1653 657 M 1634 676 L 1634 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 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_lp__sdfrtp_4.svg b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.svg
index 023db17..91b393f 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.svg
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 349.5 L 1743.5 349.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 349.5 "/>
 </clipPath>
-<image id="image424" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image452" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image424"/>
+  <use xlink:href="#image452"/>
 </pattern>
 <mask 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="#image424"/>
+  <use xlink:href="#image452"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 730.5 599.5 L 745.5 599.5 L 745.5 641.5 L 730.5 641.5 Z M 687.5 599.5 L 702.5 599.5 L 702.5 641.5 L 687.5 641.5 Z M 812.5 599.5 L 827.5 599.5 L 827.5 641.5 L 812.5 641.5 Z M 777.5 599.5 L 792.5 599.5 L 792.5 641.5 L 777.5 641.5 Z M 1162.5 599.5 L 1177.5 599.5 L 1177.5 641.5 L 1162.5 641.5 Z M 1126.5 599.5 L 1141.5 599.5 L 1141.5 641.5 L 1126.5 641.5 Z M 1064.5 602.5 L 1079.5 602.5 L 1079.5 644.5 L 1064.5 644.5 Z M 1028.5 602.5 L 1043.5 602.5 L 1043.5 644.5 L 1028.5 644.5 Z M 465.5 618.5 L 480.5 618.5 L 480.5 660.5 L 465.5 660.5 Z M 508.5 618.5 L 523.5 618.5 L 523.5 660.5 L 508.5 660.5 Z M 429.5 618.5 L 444.5 618.5 L 444.5 660.5 L 429.5 660.5 Z M 233.5 621.5 L 248.5 621.5 L 248.5 663.5 L 233.5 663.5 Z M 938.5 602.5 L 953.5 602.5 L 953.5 666.5 L 938.5 666.5 Z M 1287.5 582.5 L 1302.5 582.5 L 1302.5 666.5 L 1287.5 666.5 Z M 874.5 602.5 L 889.5 602.5 L 889.5 666.5 L 874.5 666.5 Z M 1356.5 582.5 L 1371.5 582.5 L 1371.5 666.5 L 1356.5 666.5 Z M 327.5 633.5 L 342.5 633.5 L 342.5 675.5 L 327.5 675.5 Z M 363.5 633.5 L 378.5 633.5 L 378.5 675.5 L 363.5 675.5 Z M 1622.5 593.5 L 1637.5 593.5 L 1637.5 677.5 L 1622.5 677.5 Z M 1493.5 593.5 L 1508.5 593.5 L 1508.5 677.5 L 1493.5 677.5 Z M 1668.5 593.5 L 1683.5 593.5 L 1683.5 677.5 L 1668.5 677.5 Z M 1536.5 593.5 L 1551.5 593.5 L 1551.5 677.5 L 1536.5 677.5 Z M 1579.5 593.5 L 1594.5 593.5 L 1594.5 677.5 L 1579.5 677.5 Z M 1579.5 593.5 "/>
 </clipPath>
-<image id="image425" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image453" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image425"/>
+  <use xlink:href="#image453"/>
 </pattern>
 <mask id="mask2">
 <rect 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 392.5 L 1195.5 392.5 L 1195.5 434.5 L 1180.5 434.5 Z M 1137.5 392.5 L 1152.5 392.5 L 1152.5 434.5 L 1137.5 434.5 Z M 1065.5 392.5 L 1080.5 392.5 L 1080.5 434.5 L 1065.5 434.5 Z M 1006.5 392.5 L 1021.5 392.5 L 1021.5 434.5 L 1006.5 434.5 Z M 679.5 427.5 L 694.5 427.5 L 694.5 469.5 L 679.5 469.5 Z M 459.5 405.5 L 474.5 405.5 L 474.5 469.5 L 459.5 469.5 Z M 506.5 405.5 L 521.5 405.5 L 521.5 469.5 L 506.5 469.5 Z M 715.5 427.5 L 730.5 427.5 L 730.5 469.5 L 715.5 469.5 Z M 617.5 427.5 L 632.5 427.5 L 632.5 469.5 L 617.5 469.5 Z M 417.5 405.5 L 432.5 405.5 L 432.5 469.5 L 417.5 469.5 Z M 775.5 427.5 L 790.5 427.5 L 790.5 469.5 L 775.5 469.5 Z M 338.5 405.5 L 353.5 405.5 L 353.5 469.5 L 338.5 469.5 Z M 381.5 405.5 L 396.5 405.5 L 396.5 469.5 L 381.5 469.5 Z M 565.5 405.5 L 580.5 405.5 L 580.5 469.5 L 565.5 469.5 Z M 902.5 427.5 L 917.5 427.5 L 917.5 511.5 L 902.5 511.5 Z M 945.5 427.5 L 960.5 427.5 L 960.5 511.5 L 945.5 511.5 Z M 1626.5 391.5 L 1641.5 391.5 L 1641.5 517.5 L 1626.5 517.5 Z M 1668.5 391.5 L 1683.5 391.5 L 1683.5 517.5 L 1668.5 517.5 Z M 1536.5 391.5 L 1551.5 391.5 L 1551.5 517.5 L 1536.5 517.5 Z M 1579.5 391.5 L 1594.5 391.5 L 1594.5 517.5 L 1579.5 517.5 Z M 1493.5 391.5 L 1508.5 391.5 L 1508.5 517.5 L 1493.5 517.5 Z M 1356.5 391.5 L 1371.5 391.5 L 1371.5 517.5 L 1356.5 517.5 Z M 1287.5 391.5 L 1302.5 391.5 L 1302.5 517.5 L 1287.5 517.5 Z M 1287.5 391.5 "/>
 </clipPath>
-<image id="image426" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image454" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image426"/>
+  <use xlink:href="#image454"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 208.5 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 735.5 562.5 L 752.5 562.5 L 752.5 563.5 L 735.5 563.5 Z M 974.5 562.5 L 991.5 562.5 L 991.5 566.5 L 974.5 566.5 Z M 639.5 562.5 L 656.5 562.5 L 656.5 571.5 L 639.5 571.5 Z M 974.5 566.5 L 991.5 566.5 L 991.5 579.5 L 974.5 579.5 Z M 735.5 563.5 L 752.5 563.5 L 752.5 579.5 L 735.5 579.5 Z M 1261.5 562.5 L 1278.5 562.5 L 1278.5 579.5 L 1261.5 579.5 Z M 639.5 571.5 L 656.5 571.5 L 656.5 579.5 L 639.5 579.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="image427" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image455" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image427"/>
+  <use xlink:href="#image455"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface421">
+<g id="surface449">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -215,6 +215,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1664.089844 618.792969 L 1662.703125 620.5 L 1659.613281 617.9375 L 1658.730469 618.410156 L 1657.84375 618.761719 L 1656.933594 619.058594 L 1655.960938 619.261719 L 1654.988281 619.378906 L 1653.988281 619.441406 L 1652.632812 619.351562 L 1651.367188 619.144531 L 1650.1875 618.792969 L 1649.066406 618.320312 L 1648.007812 617.703125 L 1647.066406 616.90625 L 1646.210938 616.050781 L 1645.476562 615.082031 L 1644.886719 614.019531 L 1644.386719 612.871094 L 1644.003906 611.632812 L 1643.765625 610.28125 L 1643.707031 609.957031 L 1643.679688 609.601562 L 1643.648438 609.277344 L 1643.621094 608.925781 L 1643.621094 608.1875 L 1643.679688 606.714844 L 1643.882812 605.300781 L 1644.207031 604.007812 L 1644.679688 602.769531 L 1645.269531 601.621094 L 1646.035156 600.558594 L 1646.800781 599.707031 L 1647.683594 598.941406 L 1648.65625 598.292969 L 1649.6875 597.792969 L 1650.804688 597.378906 L 1652.042969 597.085938 L 1652.335938 597.054688 L 1652.660156 597.027344 L 1652.984375 596.996094 L 1653.308594 596.96875 L 1653.632812 596.96875 L 1653.988281 596.9375 L 1655.3125 597.027344 L 1656.578125 597.230469 L 1657.757812 597.585938 L 1658.875 598.058594 L 1659.9375 598.675781 L 1660.90625 599.441406 L 1661.734375 600.324219 L 1662.46875 601.265625 L 1663.058594 602.296875 L 1663.558594 603.445312 L 1663.941406 604.683594 L 1664.207031 605.980469 L 1664.234375 606.363281 L 1664.265625 606.714844 L 1664.296875 607.070312 L 1664.324219 607.421875 L 1664.324219 607.777344 L 1664.355469 608.128906 L 1664.265625 609.777344 L 1664 611.339844 L 1663.589844 612.785156 L 1663 614.136719 L 1662.234375 615.375 L 1661.320312 616.523438 Z M 1656.667969 612.722656 L 1659.289062 614.875 L 1659.996094 613.992188 L 1660.585938 612.988281 L 1661.027344 611.898438 L 1661.351562 610.75 L 1661.527344 609.515625 L 1661.613281 608.160156 L 1661.554688 606.921875 L 1661.378906 605.742188 L 1661.085938 604.652344 L 1660.703125 603.652344 L 1660.203125 602.710938 L 1659.582031 601.855469 L 1658.875 601.148438 L 1658.140625 600.558594 L 1657.316406 600.089844 L 1656.429688 599.734375 L 1655.460938 599.5 L 1654.457031 599.351562 L 1653.988281 599.351562 L 1652.925781 599.441406 L 1651.925781 599.617188 L 1650.984375 599.914062 L 1650.128906 600.355469 L 1649.332031 600.914062 L 1648.625 601.589844 L 1647.949219 602.386719 L 1647.417969 603.269531 L 1646.976562 604.242188 L 1646.652344 605.300781 L 1646.445312 606.449219 L 1646.359375 607.6875 L 1646.359375 608.1875 L 1646.386719 609.484375 L 1646.566406 610.664062 L 1646.859375 611.753906 L 1647.242188 612.785156 L 1647.773438 613.726562 L 1648.421875 614.550781 L 1649.097656 615.285156 L 1649.863281 615.875 L 1650.6875 616.347656 L 1651.570312 616.671875 L 1652.542969 616.90625 L 1653.574219 616.996094 L 1653.632812 617.023438 L 1654.488281 617.023438 L 1655.046875 616.964844 L 1655.605469 616.847656 L 1656.136719 616.730469 L 1656.667969 616.554688 L 1657.226562 616.316406 L 1657.257812 616.316406 L 1657.316406 616.289062 L 1657.34375 616.257812 L 1657.402344 616.257812 L 1657.433594 616.230469 L 1657.492188 616.199219 L 1655.3125 614.375 Z M 1656.667969 612.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 1644 480 L 1661 480 M 1644 463 L 1661 463 M 1644 463 L 1644 480 M 1661 463 L 1661 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 1644 480 L 1661 480 M 1644 463 L 1661 463 M 1661 480 L 1661 463 M 1644 480 L 1644 463 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.svg b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.svg
index f44d382..4013e9a 100644
--- a/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.svg
+++ b/cells/sdfrtp/sky130_fd_sc_lp__sdfrtp_lp2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 360.5 L 1744.5 360.5 L 1744.5 535.5 L 174.5 535.5 Z M 822.5 535.5 L 1300.5 535.5 L 1300.5 547.5 L 822.5 547.5 Z M 822.5 535.5 "/>
 </clipPath>
-<image id="image517" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image545" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image517"/>
+  <use xlink:href="#image545"/>
 </pattern>
 <mask id="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="#image517"/>
+  <use xlink:href="#image545"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 851.5 595.5 L 865.5 595.5 L 865.5 634.5 L 851.5 634.5 Z M 912.5 595.5 L 926.5 595.5 L 926.5 634.5 L 912.5 634.5 Z M 718.5 595.5 L 732.5 595.5 L 732.5 634.5 L 718.5 634.5 Z M 629.5 595.5 L 643.5 595.5 L 643.5 634.5 L 629.5 634.5 Z M 663.5 595.5 L 677.5 595.5 L 677.5 634.5 L 663.5 634.5 Z M 752.5 595.5 L 766.5 595.5 L 766.5 634.5 L 752.5 634.5 Z M 946.5 595.5 L 960.5 595.5 L 960.5 634.5 L 946.5 634.5 Z M 506.5 595.5 L 520.5 595.5 L 520.5 634.5 L 506.5 634.5 Z M 539.5 595.5 L 554.5 595.5 L 554.5 634.5 L 539.5 634.5 Z M 1598.5 609.5 L 1612.5 609.5 L 1612.5 648.5 L 1598.5 648.5 Z M 1638.5 609.5 L 1652.5 609.5 L 1652.5 648.5 L 1638.5 648.5 Z M 1672.5 609.5 L 1686.5 609.5 L 1686.5 648.5 L 1672.5 648.5 Z M 1564.5 609.5 L 1578.5 609.5 L 1578.5 648.5 L 1564.5 648.5 Z M 373.5 610.5 L 387.5 610.5 L 387.5 649.5 L 373.5 649.5 Z M 414.5 610.5 L 428.5 610.5 L 428.5 649.5 L 414.5 649.5 Z M 336.5 610.5 L 351.5 610.5 L 351.5 649.5 L 336.5 649.5 Z M 244.5 610.5 L 259.5 610.5 L 259.5 649.5 L 244.5 649.5 Z M 281.5 610.5 L 295.5 610.5 L 295.5 649.5 L 281.5 649.5 Z M 1005.5 620.5 L 1019.5 620.5 L 1019.5 659.5 L 1005.5 659.5 Z M 1071.5 629.5 L 1085.5 629.5 L 1085.5 668.5 L 1071.5 668.5 Z M 1465.5 629.5 L 1479.5 629.5 L 1479.5 668.5 L 1465.5 668.5 Z M 1305.5 629.5 L 1319.5 629.5 L 1319.5 668.5 L 1305.5 668.5 Z M 1107.5 629.5 L 1122.5 629.5 L 1122.5 668.5 L 1107.5 668.5 Z M 1161.5 629.5 L 1175.5 629.5 L 1175.5 668.5 L 1161.5 668.5 Z M 1356.5 629.5 L 1370.5 629.5 L 1370.5 668.5 L 1356.5 668.5 Z M 1428.5 629.5 L 1442.5 629.5 L 1442.5 668.5 L 1428.5 668.5 Z M 1428.5 629.5 "/>
 </clipPath>
-<image id="image518" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image546" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image518"/>
+  <use xlink:href="#image546"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 274.5 400.5 L 297.5 400.5 L 297.5 493.5 L 274.5 493.5 Z M 320.5 400.5 L 343.5 400.5 L 343.5 493.5 L 320.5 493.5 Z M 424.5 400.5 L 447.5 400.5 L 447.5 493.5 L 424.5 493.5 Z M 1336.5 400.5 L 1360.5 400.5 L 1360.5 493.5 L 1336.5 493.5 Z M 1439.5 400.5 L 1463.5 400.5 L 1463.5 493.5 L 1439.5 493.5 Z M 474.5 400.5 L 497.5 400.5 L 497.5 493.5 L 474.5 493.5 Z M 1290.5 400.5 L 1314.5 400.5 L 1314.5 493.5 L 1290.5 493.5 Z M 375.5 400.5 L 399.5 400.5 L 399.5 493.5 L 375.5 493.5 Z M 531.5 400.5 L 555.5 400.5 L 555.5 493.5 L 531.5 493.5 Z M 1489.5 400.5 L 1512.5 400.5 L 1512.5 493.5 L 1489.5 493.5 Z M 636.5 405.5 L 660.5 405.5 L 660.5 499.5 L 636.5 499.5 Z M 708.5 405.5 L 731.5 405.5 L 731.5 499.5 L 708.5 499.5 Z M 1591.5 414.5 L 1615.5 414.5 L 1615.5 508.5 L 1591.5 508.5 Z M 1641.5 414.5 L 1665.5 414.5 L 1665.5 508.5 L 1641.5 508.5 Z M 1029.5 433.5 L 1052.5 433.5 L 1052.5 527.5 L 1029.5 527.5 Z M 979.5 433.5 L 1003.5 433.5 L 1003.5 527.5 L 979.5 527.5 Z M 872.5 433.5 L 896.5 433.5 L 896.5 527.5 L 872.5 527.5 Z M 936.5 433.5 L 959.5 433.5 L 959.5 527.5 L 936.5 527.5 Z M 1225.5 436.5 L 1249.5 436.5 L 1249.5 530.5 L 1225.5 530.5 Z M 1168.5 436.5 L 1192.5 436.5 L 1192.5 530.5 L 1168.5 530.5 Z M 1168.5 436.5 "/>
 </clipPath>
-<image id="image519" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image547" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image519"/>
+  <use xlink:href="#image547"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 526.5 L 493.5 526.5 L 493.5 531.5 L 477.5 531.5 Z M 477.5 531.5 L 493.5 531.5 L 493.5 542.5 L 477.5 542.5 Z M 1019.5 526.5 L 1035.5 526.5 L 1035.5 542.5 L 1019.5 542.5 Z M 1379.5 526.5 L 1395.5 526.5 L 1395.5 542.5 L 1379.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="image520" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image548" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image520"/>
+  <use xlink:href="#image548"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface514">
+<g id="surface542">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -242,6 +242,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 320.335938 535.039062 L 320.335938 541.703125 L 331.796875 541.703125 L 331.796875 543.886719 L 317.859375 543.886719 L 317.859375 524.460938 L 331.316406 524.460938 L 331.316406 526.644531 L 320.335938 526.644531 L 320.335938 532.855469 L 330.917969 532.855469 L 330.917969 535.039062 Z M 320.335938 535.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 297 553 L 313 553 M 297 537 L 313 537 M 297 537 L 297 553 M 313 537 L 313 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 297 553 L 313 553 M 297 537 L 313 537 M 313 553 L 313 537 M 297 553 L 297 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/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.svg b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.svg
index 3d8eb8e..e0023e2 100644
--- a/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.svg
+++ b/cells/sdfrtp_ov2/sky130_fd_sc_lp__sdfrtp_ov2.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="image483" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image512" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image483"/>
+  <use xlink:href="#image512"/>
 </pattern>
 <mask 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="#image483"/>
+  <use xlink:href="#image512"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1464.5 586.5 L 1481.5 586.5 L 1481.5 634.5 L 1464.5 634.5 Z M 1393.5 586.5 L 1410.5 586.5 L 1410.5 634.5 L 1393.5 634.5 Z M 1211.5 608.5 L 1228.5 608.5 L 1228.5 656.5 L 1211.5 656.5 Z M 741.5 608.5 L 758.5 608.5 L 758.5 656.5 L 741.5 656.5 Z M 1251.5 608.5 L 1269.5 608.5 L 1269.5 656.5 L 1251.5 656.5 Z M 794.5 608.5 L 812.5 608.5 L 812.5 656.5 L 794.5 656.5 Z M 692.5 608.5 L 709.5 608.5 L 709.5 656.5 L 692.5 656.5 Z M 1127.5 611.5 L 1144.5 611.5 L 1144.5 659.5 L 1127.5 659.5 Z M 852.5 611.5 L 869.5 611.5 L 869.5 659.5 L 852.5 659.5 Z M 928.5 611.5 L 945.5 611.5 L 945.5 659.5 L 928.5 659.5 Z M 999.5 611.5 L 1016.5 611.5 L 1016.5 659.5 L 999.5 659.5 Z M 1086.5 611.5 L 1103.5 611.5 L 1103.5 659.5 L 1086.5 659.5 Z M 510.5 630.5 L 527.5 630.5 L 527.5 677.5 L 510.5 677.5 Z M 469.5 630.5 L 486.5 630.5 L 486.5 677.5 L 469.5 677.5 Z M 564.5 630.5 L 581.5 630.5 L 581.5 677.5 L 564.5 677.5 Z M 246.5 634.5 L 263.5 634.5 L 263.5 681.5 L 246.5 681.5 Z M 353.5 647.5 L 370.5 647.5 L 370.5 695.5 L 353.5 695.5 Z M 394.5 647.5 L 411.5 647.5 L 411.5 695.5 L 394.5 695.5 Z M 1601.5 649.5 L 1618.5 649.5 L 1618.5 697.5 L 1601.5 697.5 Z M 1659.5 601.5 L 1676.5 601.5 L 1676.5 697.5 L 1659.5 697.5 Z M 1659.5 601.5 "/>
 </clipPath>
-<image id="image484" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image513" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image484"/>
+  <use xlink:href="#image513"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1464.5 372.5 L 1481.5 372.5 L 1481.5 420.5 L 1464.5 420.5 Z M 1236.5 373.5 L 1253.5 373.5 L 1253.5 421.5 L 1236.5 421.5 Z M 1141.5 373.5 L 1158.5 373.5 L 1158.5 421.5 L 1141.5 421.5 Z M 1285.5 373.5 L 1302.5 373.5 L 1302.5 421.5 L 1285.5 421.5 Z M 1074.5 373.5 L 1091.5 373.5 L 1091.5 421.5 L 1074.5 421.5 Z M 470.5 413.5 L 487.5 413.5 L 487.5 460.5 L 470.5 460.5 Z M 380.5 413.5 L 397.5 413.5 L 397.5 460.5 L 380.5 460.5 Z M 589.5 413.5 L 606.5 413.5 L 606.5 460.5 L 589.5 460.5 Z M 523.5 413.5 L 540.5 413.5 L 540.5 460.5 L 523.5 460.5 Z M 687.5 413.5 L 704.5 413.5 L 704.5 460.5 L 687.5 460.5 Z M 727.5 413.5 L 745.5 413.5 L 745.5 460.5 L 727.5 460.5 Z M 789.5 413.5 L 806.5 413.5 L 806.5 460.5 L 789.5 460.5 Z M 638.5 413.5 L 655.5 413.5 L 655.5 460.5 L 638.5 460.5 Z M 326.5 388.5 L 343.5 388.5 L 343.5 460.5 L 326.5 460.5 Z M 421.5 413.5 L 438.5 413.5 L 438.5 460.5 L 421.5 460.5 Z M 1004.5 460.5 L 1021.5 460.5 L 1021.5 508.5 L 1004.5 508.5 Z M 955.5 460.5 L 972.5 460.5 L 972.5 508.5 L 955.5 508.5 Z M 1659.5 372.5 L 1676.5 372.5 L 1676.5 515.5 L 1659.5 515.5 Z M 1593.5 442.5 L 1610.5 442.5 L 1610.5 515.5 L 1593.5 515.5 Z M 1393.5 467.5 L 1410.5 467.5 L 1410.5 515.5 L 1393.5 515.5 Z M 1393.5 467.5 "/>
 </clipPath>
-<image id="image485" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image514" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image485"/>
+  <use xlink:href="#image514"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 213.5 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 1031.5 567.5 L 1050.5 567.5 L 1050.5 571.5 L 1031.5 571.5 Z M 1031.5 571.5 L 1050.5 571.5 L 1050.5 586.5 L 1031.5 586.5 Z M 1358.5 567.5 L 1377.5 567.5 L 1377.5 586.5 L 1358.5 586.5 Z M 758.5 567.5 L 777.5 567.5 L 777.5 586.5 L 758.5 586.5 Z M 649.5 567.5 L 668.5 567.5 L 668.5 586.5 L 649.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="image486" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image515" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image486"/>
+  <use xlink:href="#image515"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface480">
+<g id="surface509">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -252,6 +252,5 @@
 <path style=" 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 420.546875 L 1705.589844 422.5 L 1702.058594 419.570312 L 1701.046875 420.109375 L 1700.039062 420.515625 L 1698.992188 420.851562 L 1697.882812 421.085938 L 1696.773438 421.222656 L 1695.628906 421.289062 L 1694.078125 421.1875 L 1692.632812 420.953125 L 1691.285156 420.546875 L 1690.007812 420.007812 L 1688.792969 419.300781 L 1687.71875 418.394531 L 1686.742188 417.417969 L 1685.898438 416.304688 L 1685.226562 415.09375 L 1684.652344 413.78125 L 1684.214844 412.367188 L 1683.949219 410.820312 L 1683.878906 410.449219 L 1683.847656 410.046875 L 1683.8125 409.675781 L 1683.777344 409.269531 L 1683.777344 408.429688 L 1683.847656 406.746094 L 1684.082031 405.132812 L 1684.453125 403.648438 L 1684.992188 402.234375 L 1685.664062 400.921875 L 1686.539062 399.710938 L 1687.414062 398.734375 L 1688.425781 397.859375 L 1689.535156 397.121094 L 1690.714844 396.546875 L 1691.992188 396.078125 L 1693.40625 395.738281 L 1693.742188 395.707031 L 1694.113281 395.671875 L 1694.484375 395.640625 L 1694.851562 395.605469 L 1695.222656 395.605469 L 1695.628906 395.570312 L 1697.140625 395.671875 L 1698.589844 395.90625 L 1699.9375 396.3125 L 1701.214844 396.851562 L 1702.425781 397.558594 L 1703.539062 398.433594 L 1704.480469 399.441406 L 1705.320312 400.519531 L 1705.996094 401.699219 L 1706.566406 403.011719 L 1707.003906 404.425781 L 1707.308594 405.90625 L 1707.339844 406.34375 L 1707.375 406.746094 L 1707.410156 407.152344 L 1707.441406 407.554688 L 1707.441406 407.957031 L 1707.476562 408.363281 L 1707.375 410.246094 L 1707.070312 412.03125 L 1706.601562 413.679688 L 1705.929688 415.230469 L 1705.050781 416.644531 L 1704.007812 417.957031 Z M 1698.691406 413.613281 L 1701.6875 416.070312 L 1702.496094 415.0625 L 1703.167969 413.917969 L 1703.671875 412.671875 L 1704.042969 411.359375 L 1704.246094 409.945312 L 1704.347656 408.394531 L 1704.277344 406.984375 L 1704.078125 405.636719 L 1703.738281 404.390625 L 1703.300781 403.246094 L 1702.730469 402.167969 L 1702.023438 401.191406 L 1701.214844 400.386719 L 1700.375 399.710938 L 1699.429688 399.171875 L 1698.421875 398.769531 L 1697.3125 398.5 L 1696.167969 398.332031 L 1695.628906 398.332031 L 1694.414062 398.433594 L 1693.269531 398.632812 L 1692.195312 398.972656 L 1691.21875 399.476562 L 1690.308594 400.117188 L 1689.5 400.890625 L 1688.726562 401.796875 L 1688.121094 402.808594 L 1687.617188 403.917969 L 1687.246094 405.132812 L 1687.011719 406.445312 L 1686.910156 407.859375 L 1686.910156 408.429688 L 1686.941406 409.910156 L 1687.144531 411.257812 L 1687.480469 412.503906 L 1687.917969 413.679688 L 1688.523438 414.757812 L 1689.265625 415.699219 L 1690.039062 416.542969 L 1690.914062 417.214844 L 1691.859375 417.753906 L 1692.867188 418.125 L 1693.976562 418.394531 L 1695.15625 418.496094 L 1695.222656 418.527344 L 1696.199219 418.527344 L 1696.839844 418.460938 L 1697.480469 418.324219 L 1698.085938 418.191406 L 1698.691406 417.988281 L 1699.332031 417.71875 L 1699.363281 417.71875 L 1699.429688 417.6875 L 1699.464844 417.652344 L 1699.53125 417.652344 L 1699.566406 417.621094 L 1699.632812 417.585938 L 1697.140625 415.5 Z M 1698.691406 413.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 680 L 1704 680 M 1685 661 L 1704 661 M 1685 661 L 1685 680 M 1704 661 L 1704 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 1685 680 L 1704 680 M 1685 661 L 1704 661 M 1704 680 L 1704 661 M 1685 680 L 1685 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/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.svg b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.svg
index 9db7b8a..c0758b4 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.svg
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 349.5 L 1743.5 349.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 349.5 "/>
 </clipPath>
-<image id="image482" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image509" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image482"/>
+  <use xlink:href="#image509"/>
 </pattern>
 <mask 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="#image482"/>
+  <use xlink:href="#image509"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1465.5 583.5 L 1480.5 583.5 L 1480.5 625.5 L 1465.5 625.5 Z M 1363.5 583.5 L 1378.5 583.5 L 1378.5 625.5 L 1363.5 625.5 Z M 1223.5 599.5 L 1238.5 599.5 L 1238.5 641.5 L 1223.5 641.5 Z M 1099.5 577.5 L 1114.5 577.5 L 1114.5 641.5 L 1099.5 641.5 Z M 756.5 599.5 L 771.5 599.5 L 771.5 641.5 L 756.5 641.5 Z M 798.5 599.5 L 813.5 599.5 L 813.5 641.5 L 798.5 641.5 Z M 1135.5 577.5 L 1150.5 577.5 L 1150.5 641.5 L 1135.5 641.5 Z M 834.5 599.5 L 849.5 599.5 L 849.5 641.5 L 834.5 641.5 Z M 963.5 599.5 L 978.5 599.5 L 978.5 641.5 L 963.5 641.5 Z M 999.5 599.5 L 1014.5 599.5 L 1014.5 641.5 L 999.5 641.5 Z M 1259.5 599.5 L 1274.5 599.5 L 1274.5 641.5 L 1259.5 641.5 Z M 1187.5 599.5 L 1202.5 599.5 L 1202.5 641.5 L 1187.5 641.5 Z M 1611.5 577.5 L 1626.5 577.5 L 1626.5 661.5 L 1611.5 661.5 Z M 1669.5 577.5 L 1684.5 577.5 L 1684.5 661.5 L 1669.5 661.5 Z M 646.5 622.5 L 661.5 622.5 L 661.5 664.5 L 646.5 664.5 Z M 458.5 635.5 L 473.5 635.5 L 473.5 677.5 L 458.5 677.5 Z M 303.5 635.5 L 318.5 635.5 L 318.5 677.5 L 303.5 677.5 Z M 261.5 635.5 L 276.5 635.5 L 276.5 677.5 L 261.5 677.5 Z M 501.5 635.5 L 516.5 635.5 L 516.5 677.5 L 501.5 677.5 Z M 416.5 635.5 L 431.5 635.5 L 431.5 677.5 L 416.5 677.5 Z M 339.5 635.5 L 354.5 635.5 L 354.5 677.5 L 339.5 677.5 Z M 339.5 635.5 "/>
 </clipPath>
-<image id="image483" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image510" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image483"/>
+  <use xlink:href="#image510"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1187.5 415.5 L 1202.5 415.5 L 1202.5 457.5 L 1187.5 457.5 Z M 1223.5 415.5 L 1238.5 415.5 L 1238.5 457.5 L 1223.5 457.5 Z M 1310.5 415.5 L 1324.5 415.5 L 1324.5 457.5 L 1310.5 457.5 Z M 1421.5 417.5 L 1436.5 417.5 L 1436.5 459.5 L 1421.5 459.5 Z M 279.5 396.5 L 294.5 396.5 L 294.5 460.5 L 279.5 460.5 Z M 369.5 396.5 L 384.5 396.5 L 384.5 460.5 L 369.5 460.5 Z M 236.5 396.5 L 251.5 396.5 L 251.5 460.5 L 236.5 460.5 Z M 315.5 396.5 L 330.5 396.5 L 330.5 460.5 L 315.5 460.5 Z M 497.5 396.5 L 512.5 396.5 L 512.5 460.5 L 497.5 460.5 Z M 405.5 396.5 L 420.5 396.5 L 420.5 460.5 L 405.5 460.5 Z M 893.5 427.5 L 908.5 427.5 L 908.5 469.5 L 893.5 469.5 Z M 828.5 427.5 L 843.5 427.5 L 843.5 469.5 L 828.5 469.5 Z M 936.5 427.5 L 951.5 427.5 L 951.5 469.5 L 936.5 469.5 Z M 749.5 427.5 L 764.5 427.5 L 764.5 469.5 L 749.5 469.5 Z M 792.5 427.5 L 807.5 427.5 L 807.5 469.5 L 792.5 469.5 Z M 627.5 416.5 L 642.5 416.5 L 642.5 480.5 L 627.5 480.5 Z M 1498.5 417.5 L 1513.5 417.5 L 1513.5 481.5 L 1498.5 481.5 Z M 1135.5 415.5 L 1150.5 415.5 L 1150.5 499.5 L 1135.5 499.5 Z M 1084.5 427.5 L 1099.5 427.5 L 1099.5 511.5 L 1084.5 511.5 Z M 1611.5 391.5 L 1626.5 391.5 L 1626.5 517.5 L 1611.5 517.5 Z M 1654.5 391.5 L 1668.5 391.5 L 1668.5 517.5 L 1654.5 517.5 Z M 1654.5 391.5 "/>
 </clipPath>
-<image id="image484" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image511" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image484"/>
+  <use xlink:href="#image511"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 208.5 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 926.5 489.5 L 943.5 489.5 L 943.5 497.5 L 926.5 497.5 Z M 926.5 497.5 L 943.5 497.5 L 943.5 506.5 L 926.5 506.5 Z M 1261.5 489.5 L 1278.5 489.5 L 1278.5 506.5 L 1261.5 506.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="image485" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image512" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image485"/>
+  <use xlink:href="#image512"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface479">
+<g id="surface506">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -259,6 +259,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1730.757812 412.84375 L 1730.757812 434.316406 L 1727.664062 434.316406 L 1716.5625 416.910156 L 1716.5625 434.316406 L 1713.96875 434.316406 L 1713.96875 412.84375 L 1716.945312 412.84375 L 1728.167969 430.398438 L 1728.167969 412.84375 Z M 1730.757812 412.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 1692 664 L 1709 664 M 1692 647 L 1709 647 M 1692 647 L 1692 664 M 1709 647 L 1709 664 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1692 664 L 1709 664 M 1692 647 L 1709 647 M 1709 664 L 1709 647 M 1692 664 L 1692 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(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/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.svg b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.svg
index 65e90a3..4e52bd0 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.svg
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 349.5 L 1743.5 349.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 349.5 "/>
 </clipPath>
-<image id="image465" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image493" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image465"/>
+  <use xlink:href="#image493"/>
 </pattern>
 <mask 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="#image465"/>
+  <use xlink:href="#image493"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1332.5 592.5 L 1347.5 592.5 L 1347.5 634.5 L 1332.5 634.5 Z M 1087.5 577.5 L 1102.5 577.5 L 1102.5 641.5 L 1087.5 641.5 Z M 1043.5 577.5 L 1058.5 577.5 L 1058.5 641.5 L 1043.5 641.5 Z M 1211.5 599.5 L 1226.5 599.5 L 1226.5 641.5 L 1211.5 641.5 Z M 800.5 599.5 L 815.5 599.5 L 815.5 641.5 L 800.5 641.5 Z M 836.5 599.5 L 851.5 599.5 L 851.5 641.5 L 836.5 641.5 Z M 941.5 599.5 L 956.5 599.5 L 956.5 641.5 L 941.5 641.5 Z M 976.5 599.5 L 991.5 599.5 L 991.5 641.5 L 976.5 641.5 Z M 1139.5 599.5 L 1154.5 599.5 L 1154.5 641.5 L 1139.5 641.5 Z M 758.5 599.5 L 773.5 599.5 L 773.5 641.5 L 758.5 641.5 Z M 1175.5 599.5 L 1190.5 599.5 L 1190.5 641.5 L 1175.5 641.5 Z M 636.5 622.5 L 651.5 622.5 L 651.5 664.5 L 636.5 664.5 Z M 1486.5 634.5 L 1501.5 634.5 L 1501.5 676.5 L 1486.5 676.5 Z M 1391.5 592.5 L 1406.5 592.5 L 1406.5 676.5 L 1391.5 676.5 Z M 1434.5 592.5 L 1449.5 592.5 L 1449.5 676.5 L 1434.5 676.5 Z M 491.5 635.5 L 506.5 635.5 L 506.5 677.5 L 491.5 677.5 Z M 311.5 635.5 L 326.5 635.5 L 326.5 677.5 L 311.5 677.5 Z M 449.5 635.5 L 463.5 635.5 L 463.5 677.5 L 449.5 677.5 Z M 1585.5 593.5 L 1600.5 593.5 L 1600.5 677.5 L 1585.5 677.5 Z M 1664.5 593.5 L 1679.5 593.5 L 1679.5 677.5 L 1664.5 677.5 Z M 258.5 635.5 L 273.5 635.5 L 273.5 677.5 L 258.5 677.5 Z M 347.5 635.5 L 362.5 635.5 L 362.5 677.5 L 347.5 677.5 Z M 413.5 635.5 L 428.5 635.5 L 428.5 677.5 L 413.5 677.5 Z M 413.5 635.5 "/>
 </clipPath>
-<image id="image466" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image494" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image466"/>
+  <use xlink:href="#image494"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1222.5 413.5 L 1237.5 413.5 L 1237.5 455.5 L 1222.5 455.5 Z M 1163.5 413.5 L 1178.5 413.5 L 1178.5 455.5 L 1163.5 455.5 Z M 1127.5 413.5 L 1142.5 413.5 L 1142.5 455.5 L 1127.5 455.5 Z M 233.5 403.5 L 248.5 403.5 L 248.5 467.5 L 233.5 467.5 Z M 416.5 403.5 L 431.5 403.5 L 431.5 467.5 L 416.5 467.5 Z M 276.5 403.5 L 290.5 403.5 L 290.5 467.5 L 276.5 467.5 Z M 512.5 403.5 L 527.5 403.5 L 527.5 467.5 L 512.5 467.5 Z M 365.5 403.5 L 380.5 403.5 L 380.5 467.5 L 365.5 467.5 Z M 311.5 403.5 L 326.5 403.5 L 326.5 467.5 L 311.5 467.5 Z M 951.5 427.5 L 966.5 427.5 L 966.5 469.5 L 951.5 469.5 Z M 908.5 427.5 L 923.5 427.5 L 923.5 469.5 L 908.5 469.5 Z M 813.5 427.5 L 828.5 427.5 L 828.5 469.5 L 813.5 469.5 Z M 849.5 427.5 L 864.5 427.5 L 864.5 469.5 L 849.5 469.5 Z M 771.5 427.5 L 786.5 427.5 L 786.5 469.5 L 771.5 469.5 Z M 1075.5 413.5 L 1090.5 413.5 L 1090.5 497.5 L 1075.5 497.5 Z M 636.5 442.5 L 651.5 442.5 L 651.5 506.5 L 636.5 506.5 Z M 1024.5 427.5 L 1039.5 427.5 L 1039.5 511.5 L 1024.5 511.5 Z M 1353.5 475.5 L 1368.5 475.5 L 1368.5 517.5 L 1353.5 517.5 Z M 1664.5 391.5 L 1679.5 391.5 L 1679.5 517.5 L 1664.5 517.5 Z M 1449.5 391.5 L 1464.5 391.5 L 1464.5 517.5 L 1449.5 517.5 Z M 1501.5 453.5 L 1516.5 453.5 L 1516.5 517.5 L 1501.5 517.5 Z M 1406.5 391.5 L 1421.5 391.5 L 1421.5 517.5 L 1406.5 517.5 Z M 1622.5 391.5 L 1637.5 391.5 L 1637.5 517.5 L 1622.5 517.5 Z M 1622.5 391.5 "/>
 </clipPath>
-<image id="image467" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image495" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image467"/>
+  <use xlink:href="#image495"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 208.5 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 1261.5 489.5 L 1278.5 489.5 L 1278.5 496.5 L 1261.5 496.5 Z M 1261.5 496.5 L 1278.5 496.5 L 1278.5 506.5 L 1261.5 506.5 Z M 926.5 489.5 L 943.5 489.5 L 943.5 506.5 L 926.5 506.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="image468" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image496" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image468"/>
+  <use xlink:href="#image496"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface462">
+<g id="surface490">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -249,6 +249,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1443.757812 486.84375 L 1443.757812 508.316406 L 1440.664062 508.316406 L 1429.5625 490.910156 L 1429.5625 508.316406 L 1426.96875 508.316406 L 1426.96875 486.84375 L 1429.945312 486.84375 L 1441.167969 504.398438 L 1441.167969 486.84375 Z M 1443.757812 486.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 1405 590 L 1422 590 M 1405 573 L 1422 573 M 1405 573 L 1405 590 M 1422 573 L 1422 590 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1405 590 L 1422 590 M 1405 573 L 1422 573 M 1422 590 L 1422 573 M 1405 590 L 1405 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 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/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.svg b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.svg
index e36308c..86a2443 100644
--- a/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.svg
+++ b/cells/sdfsbp/sky130_fd_sc_lp__sdfsbp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 360.5 L 1744.5 360.5 L 1744.5 535.5 L 174.5 535.5 Z M 174.5 360.5 "/>
 </clipPath>
-<image id="image374" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image374"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask 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="#image374"/>
+  <use xlink:href="#image401"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1129.5 592.5 L 1143.5 592.5 L 1143.5 632.5 L 1129.5 632.5 Z M 990.5 592.5 L 1005.5 592.5 L 1005.5 632.5 L 990.5 632.5 Z M 1078.5 592.5 L 1092.5 592.5 L 1092.5 632.5 L 1078.5 632.5 Z M 861.5 592.5 L 875.5 592.5 L 875.5 632.5 L 861.5 632.5 Z M 1027.5 592.5 L 1041.5 592.5 L 1041.5 632.5 L 1027.5 632.5 Z M 827.5 592.5 L 841.5 592.5 L 841.5 632.5 L 827.5 632.5 Z M 610.5 598.5 L 624.5 598.5 L 624.5 637.5 L 610.5 637.5 Z M 651.5 598.5 L 665.5 598.5 L 665.5 637.5 L 651.5 637.5 Z M 685.5 598.5 L 699.5 598.5 L 699.5 637.5 L 685.5 637.5 Z M 577.5 598.5 L 591.5 598.5 L 591.5 637.5 L 577.5 637.5 Z M 779.5 612.5 L 793.5 612.5 L 793.5 651.5 L 779.5 651.5 Z M 1639.5 616.5 L 1653.5 616.5 L 1653.5 656.5 L 1639.5 656.5 Z M 1598.5 616.5 L 1612.5 616.5 L 1612.5 656.5 L 1598.5 656.5 Z M 1673.5 616.5 L 1687.5 616.5 L 1687.5 656.5 L 1673.5 656.5 Z M 1565.5 616.5 L 1579.5 616.5 L 1579.5 656.5 L 1565.5 656.5 Z M 1235.5 620.5 L 1249.5 620.5 L 1249.5 659.5 L 1235.5 659.5 Z M 1199.5 620.5 L 1213.5 620.5 L 1213.5 659.5 L 1199.5 659.5 Z M 1270.5 620.5 L 1284.5 620.5 L 1284.5 659.5 L 1270.5 659.5 Z M 1398.5 624.5 L 1412.5 624.5 L 1412.5 664.5 L 1398.5 664.5 Z M 1438.5 624.5 L 1452.5 624.5 L 1452.5 664.5 L 1438.5 664.5 Z M 1472.5 624.5 L 1486.5 624.5 L 1486.5 664.5 L 1472.5 664.5 Z M 1364.5 624.5 L 1378.5 624.5 L 1378.5 664.5 L 1364.5 664.5 Z M 243.5 629.5 L 257.5 629.5 L 257.5 668.5 L 243.5 668.5 Z M 425.5 629.5 L 439.5 629.5 L 439.5 668.5 L 425.5 668.5 Z M 348.5 629.5 L 362.5 629.5 L 362.5 668.5 L 348.5 668.5 Z M 385.5 629.5 L 399.5 629.5 L 399.5 668.5 L 385.5 668.5 Z M 280.5 629.5 L 294.5 629.5 L 294.5 668.5 L 280.5 668.5 Z M 462.5 629.5 L 476.5 629.5 L 476.5 668.5 L 462.5 668.5 Z M 462.5 629.5 "/>
 </clipPath>
-<image id="image375" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#image402"/>
 </pattern>
 <mask id="mask2">
 <rect 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 400.5 L 1342.5 400.5 L 1342.5 493.5 L 1318.5 493.5 Z M 1117.5 400.5 L 1141.5 400.5 L 1141.5 493.5 L 1117.5 493.5 Z M 1253.5 400.5 L 1276.5 400.5 L 1276.5 493.5 L 1253.5 493.5 Z M 733.5 400.5 L 756.5 400.5 L 756.5 493.5 L 733.5 493.5 Z M 814.5 400.5 L 837.5 400.5 L 837.5 493.5 L 814.5 493.5 Z M 1071.5 400.5 L 1095.5 400.5 L 1095.5 493.5 L 1071.5 493.5 Z M 864.5 400.5 L 887.5 400.5 L 887.5 493.5 L 864.5 493.5 Z M 1199.5 400.5 L 1223.5 400.5 L 1223.5 493.5 L 1199.5 493.5 Z M 998.5 400.5 L 1021.5 400.5 L 1021.5 493.5 L 998.5 493.5 Z M 948.5 400.5 L 972.5 400.5 L 972.5 493.5 L 948.5 493.5 Z M 583.5 404.5 L 606.5 404.5 L 606.5 498.5 L 583.5 498.5 Z M 430.5 404.5 L 453.5 404.5 L 453.5 498.5 L 430.5 498.5 Z M 232.5 404.5 L 255.5 404.5 L 255.5 498.5 L 232.5 498.5 Z M 632.5 404.5 L 656.5 404.5 L 656.5 498.5 L 632.5 498.5 Z M 480.5 404.5 L 503.5 404.5 L 503.5 498.5 L 480.5 498.5 Z M 334.5 404.5 L 358.5 404.5 L 358.5 498.5 L 334.5 498.5 Z M 384.5 404.5 L 407.5 404.5 L 407.5 498.5 L 384.5 498.5 Z M 1420.5 408.5 L 1444.5 408.5 L 1444.5 502.5 L 1420.5 502.5 Z M 1486.5 408.5 L 1510.5 408.5 L 1510.5 502.5 L 1486.5 502.5 Z M 1638.5 421.5 L 1662.5 421.5 L 1662.5 515.5 L 1638.5 515.5 Z M 1589.5 421.5 L 1612.5 421.5 L 1612.5 515.5 L 1589.5 515.5 Z M 1589.5 421.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image403"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 1334.5 526.5 L 1350.5 526.5 L 1350.5 536.5 L 1334.5 536.5 Z M 1019.5 526.5 L 1035.5 526.5 L 1035.5 537.5 L 1019.5 537.5 Z M 1019.5 537.5 L 1035.5 537.5 L 1035.5 542.5 L 1019.5 542.5 Z M 1334.5 536.5 L 1350.5 536.5 L 1350.5 542.5 L 1334.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="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface371">
+<g id="surface398">
 <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 410.335938 605.039062 L 410.335938 611.703125 L 421.796875 611.703125 L 421.796875 613.886719 L 407.859375 613.886719 L 407.859375 594.460938 L 421.316406 594.460938 L 421.316406 596.644531 L 410.335938 596.644531 L 410.335938 602.855469 L 420.917969 602.855469 L 420.917969 605.039062 Z M 410.335938 605.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 387 484 L 403 484 M 387 468 L 403 468 M 387 468 L 387 484 M 403 468 L 403 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 387 484 L 403 484 M 387 468 L 403 468 M 403 484 L 403 468 M 387 484 L 387 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(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/sdfstp/sky130_fd_sc_lp__sdfstp_1.svg b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.svg
index d7604eb..cb16c39 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_1.svg
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_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 174.5 337.5 "/>
 </clipPath>
-<image id="image536" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image562" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image536"/>
+  <use xlink:href="#image562"/>
 </pattern>
 <mask 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="#image536"/>
+  <use xlink:href="#image562"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1601.5 585.5 L 1617.5 585.5 L 1617.5 630.5 L 1601.5 630.5 Z M 244.5 598.5 L 260.5 598.5 L 260.5 643.5 L 244.5 643.5 Z M 366.5 598.5 L 382.5 598.5 L 382.5 643.5 L 366.5 643.5 Z M 416.5 598.5 L 432.5 598.5 L 432.5 643.5 L 416.5 643.5 Z M 328.5 598.5 L 344.5 598.5 L 344.5 643.5 L 328.5 643.5 Z M 282.5 598.5 L 298.5 598.5 L 298.5 643.5 L 282.5 643.5 Z M 1159.5 577.5 L 1175.5 577.5 L 1175.5 645.5 L 1159.5 645.5 Z M 1301.5 600.5 L 1317.5 600.5 L 1317.5 645.5 L 1301.5 645.5 Z M 1197.5 577.5 L 1213.5 577.5 L 1213.5 645.5 L 1197.5 645.5 Z M 1359.5 600.5 L 1375.5 600.5 L 1375.5 645.5 L 1359.5 645.5 Z M 976.5 600.5 L 991.5 600.5 L 991.5 645.5 L 976.5 645.5 Z M 1030.5 600.5 L 1046.5 600.5 L 1046.5 645.5 L 1030.5 645.5 Z M 1454.5 600.5 L 1470.5 600.5 L 1470.5 645.5 L 1454.5 645.5 Z M 1397.5 600.5 L 1413.5 600.5 L 1413.5 645.5 L 1397.5 645.5 Z M 1656.5 585.5 L 1672.5 585.5 L 1672.5 674.5 L 1656.5 674.5 Z M 865.5 636.5 L 880.5 636.5 L 880.5 681.5 L 865.5 681.5 Z M 781.5 636.5 L 797.5 636.5 L 797.5 681.5 L 781.5 681.5 Z M 826.5 636.5 L 842.5 636.5 L 842.5 681.5 L 826.5 681.5 Z M 641.5 641.5 L 656.5 641.5 L 656.5 686.5 L 641.5 686.5 Z M 595.5 641.5 L 611.5 641.5 L 611.5 686.5 L 595.5 686.5 Z M 595.5 641.5 "/>
 </clipPath>
-<image id="image537" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image563" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image537"/>
+  <use xlink:href="#image563"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 631.5 387.5 L 647.5 387.5 L 647.5 454.5 L 631.5 454.5 Z M 1502.5 410.5 L 1518.5 410.5 L 1518.5 454.5 L 1502.5 454.5 Z M 677.5 387.5 L 693.5 387.5 L 693.5 454.5 L 677.5 454.5 Z M 1401.5 410.5 L 1417.5 410.5 L 1417.5 454.5 L 1401.5 454.5 Z M 1355.5 410.5 L 1371.5 410.5 L 1371.5 454.5 L 1355.5 454.5 Z M 516.5 388.5 L 532.5 388.5 L 532.5 456.5 L 516.5 456.5 Z M 826.5 421.5 L 842.5 421.5 L 842.5 465.5 L 826.5 465.5 Z M 781.5 421.5 L 797.5 421.5 L 797.5 465.5 L 781.5 465.5 Z M 865.5 421.5 L 880.5 421.5 L 880.5 465.5 L 865.5 465.5 Z M 945.5 421.5 L 961.5 421.5 L 961.5 465.5 L 945.5 465.5 Z M 993.5 421.5 L 1008.5 421.5 L 1008.5 465.5 L 993.5 465.5 Z M 1193.5 421.5 L 1209.5 421.5 L 1209.5 465.5 L 1193.5 465.5 Z M 320.5 426.5 L 336.5 426.5 L 336.5 494.5 L 320.5 494.5 Z M 237.5 426.5 L 252.5 426.5 L 252.5 494.5 L 237.5 494.5 Z M 378.5 426.5 L 394.5 426.5 L 394.5 494.5 L 378.5 494.5 Z M 282.5 426.5 L 298.5 426.5 L 298.5 494.5 L 282.5 494.5 Z M 1082.5 421.5 L 1098.5 421.5 L 1098.5 510.5 L 1082.5 510.5 Z M 1251.5 421.5 L 1267.5 421.5 L 1267.5 510.5 L 1251.5 510.5 Z M 1602.5 448.5 L 1618.5 448.5 L 1618.5 516.5 L 1602.5 516.5 Z M 1665.5 382.5 L 1681.5 382.5 L 1681.5 516.5 L 1665.5 516.5 Z M 1665.5 382.5 "/>
 </clipPath>
-<image id="image538" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image564" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image538"/>
+  <use xlink:href="#image564"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 211.5 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 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="image539" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image565" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image539"/>
+  <use xlink:href="#image565"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface533">
+<g id="surface559">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -271,6 +271,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1338.769531 657.652344 L 1338.707031 658.640625 L 1338.554688 659.535156 L 1338.277344 660.367188 L 1337.90625 661.105469 L 1337.410156 661.816406 L 1336.824219 662.433594 L 1336.175781 662.957031 L 1335.5 663.359375 L 1334.726562 663.667969 L 1333.925781 663.914062 L 1333.0625 664.039062 L 1332.136719 664.070312 L 1321.984375 664.070312 L 1321.984375 641.574219 L 1331.117188 641.574219 L 1332.445312 641.667969 L 1333.617188 641.882812 L 1334.664062 642.253906 L 1335.558594 642.777344 L 1336.332031 643.457031 L 1336.949219 644.292969 L 1337.195312 644.753906 L 1337.410156 645.246094 L 1337.566406 645.710938 L 1337.6875 646.234375 L 1337.75 646.757812 L 1337.78125 647.285156 L 1337.6875 648.394531 L 1337.410156 649.351562 L 1336.980469 650.246094 L 1336.363281 650.988281 L 1335.589844 651.664062 L 1334.664062 652.191406 L 1335.558594 652.589844 L 1336.332031 653.023438 L 1337.011719 653.515625 L 1337.566406 654.070312 L 1337.996094 654.660156 L 1338.335938 655.277344 L 1338.460938 655.644531 L 1338.554688 656.015625 L 1338.644531 656.386719 L 1338.707031 656.820312 L 1338.738281 657.21875 Z M 1334.914062 647.683594 L 1334.820312 646.757812 L 1334.542969 645.988281 L 1334.109375 645.308594 L 1333.492188 644.816406 L 1332.722656 644.445312 L 1331.765625 644.199219 L 1331.550781 644.199219 L 1331.332031 644.167969 L 1331.117188 644.136719 L 1330.625 644.136719 L 1330.40625 644.105469 L 1324.851562 644.105469 L 1324.851562 651.265625 L 1330.40625 651.265625 L 1331.550781 651.203125 L 1332.535156 651.015625 L 1333.371094 650.679688 L 1333.988281 650.214844 L 1334.480469 649.597656 L 1334.789062 648.859375 L 1334.820312 648.703125 L 1334.851562 648.519531 L 1334.882812 648.332031 L 1334.882812 647.902344 Z M 1331.859375 661.539062 L 1332.722656 661.507812 L 1333.492188 661.324219 L 1334.171875 661.015625 L 1334.726562 660.613281 L 1335.191406 660.089844 L 1335.558594 659.441406 L 1335.652344 659.195312 L 1335.714844 658.917969 L 1335.808594 658.609375 L 1335.839844 658.332031 L 1335.867188 658.023438 L 1335.898438 657.683594 L 1335.839844 657.003906 L 1335.714844 656.355469 L 1335.5 655.800781 L 1335.191406 655.277344 L 1334.789062 654.84375 L 1334.324219 654.441406 L 1333.988281 654.257812 L 1333.617188 654.101562 L 1333.214844 653.980469 L 1332.785156 653.886719 L 1332.320312 653.824219 L 1331.859375 653.792969 L 1324.851562 653.792969 L 1324.851562 661.539062 Z M 1331.859375 661.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 1281 436 L 1299 436 M 1281 418 L 1299 418 M 1281 418 L 1281 436 M 1299 418 L 1299 436 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1281 436 L 1299 436 M 1281 418 L 1299 418 M 1299 436 L 1299 418 M 1281 436 L 1281 418 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/sdfstp/sky130_fd_sc_lp__sdfstp_2.svg b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.svg
index 0b5aff4..08980fa 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.svg
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 349.5 L 1743.5 349.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 349.5 "/>
 </clipPath>
-<image id="image462" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image489" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image462"/>
+  <use xlink:href="#image489"/>
 </pattern>
 <mask id="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="#image462"/>
+  <use xlink:href="#image489"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1558.5 593.5 L 1573.5 593.5 L 1573.5 635.5 L 1558.5 635.5 Z M 1177.5 574.5 L 1192.5 574.5 L 1192.5 638.5 L 1177.5 638.5 Z M 1297.5 596.5 L 1311.5 596.5 L 1311.5 638.5 L 1297.5 638.5 Z M 1365.5 596.5 L 1380.5 596.5 L 1380.5 638.5 L 1365.5 638.5 Z M 1015.5 596.5 L 1030.5 596.5 L 1030.5 638.5 L 1015.5 638.5 Z M 979.5 596.5 L 994.5 596.5 L 994.5 638.5 L 979.5 638.5 Z M 1141.5 574.5 L 1156.5 574.5 L 1156.5 638.5 L 1141.5 638.5 Z M 1419.5 596.5 L 1434.5 596.5 L 1434.5 638.5 L 1419.5 638.5 Z M 1254.5 596.5 L 1269.5 596.5 L 1269.5 638.5 L 1254.5 638.5 Z M 455.5 598.5 L 470.5 598.5 L 470.5 640.5 L 455.5 640.5 Z M 264.5 598.5 L 279.5 598.5 L 279.5 640.5 L 264.5 640.5 Z M 299.5 598.5 L 314.5 598.5 L 314.5 640.5 L 299.5 640.5 Z M 378.5 598.5 L 393.5 598.5 L 393.5 640.5 L 378.5 640.5 Z M 342.5 598.5 L 357.5 598.5 L 357.5 640.5 L 342.5 640.5 Z M 873.5 631.5 L 888.5 631.5 L 888.5 673.5 L 873.5 673.5 Z M 837.5 631.5 L 852.5 631.5 L 852.5 673.5 L 837.5 673.5 Z M 795.5 631.5 L 809.5 631.5 L 809.5 673.5 L 795.5 673.5 Z M 1652.5 593.5 L 1667.5 593.5 L 1667.5 677.5 L 1652.5 677.5 Z M 658.5 635.5 L 673.5 635.5 L 673.5 677.5 L 658.5 677.5 Z M 1609.5 593.5 L 1624.5 593.5 L 1624.5 677.5 L 1609.5 677.5 Z M 615.5 635.5 L 630.5 635.5 L 630.5 677.5 L 615.5 677.5 Z M 615.5 635.5 "/>
 </clipPath>
-<image id="image463" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image490" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image463"/>
+  <use xlink:href="#image490"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 672.5 395.5 L 687.5 395.5 L 687.5 459.5 L 672.5 459.5 Z M 629.5 395.5 L 644.5 395.5 L 644.5 459.5 L 629.5 459.5 Z M 1464.5 417.5 L 1479.5 417.5 L 1479.5 459.5 L 1464.5 459.5 Z M 371.5 396.5 L 386.5 396.5 L 386.5 460.5 L 371.5 460.5 Z M 317.5 396.5 L 332.5 396.5 L 332.5 460.5 L 317.5 460.5 Z M 281.5 396.5 L 296.5 396.5 L 296.5 460.5 L 281.5 460.5 Z M 239.5 396.5 L 254.5 396.5 L 254.5 460.5 L 239.5 460.5 Z M 1174.5 427.5 L 1189.5 427.5 L 1189.5 469.5 L 1174.5 469.5 Z M 525.5 406.5 L 540.5 406.5 L 540.5 470.5 L 525.5 470.5 Z M 1369.5 441.5 L 1384.5 441.5 L 1384.5 483.5 L 1369.5 483.5 Z M 1326.5 441.5 L 1341.5 441.5 L 1341.5 483.5 L 1326.5 483.5 Z M 953.5 451.5 L 968.5 451.5 L 968.5 493.5 L 953.5 493.5 Z M 796.5 451.5 L 811.5 451.5 L 811.5 493.5 L 796.5 493.5 Z M 839.5 451.5 L 854.5 451.5 L 854.5 493.5 L 839.5 493.5 Z M 875.5 451.5 L 890.5 451.5 L 890.5 493.5 L 875.5 493.5 Z M 1005.5 469.5 L 1020.5 469.5 L 1020.5 511.5 L 1005.5 511.5 Z M 1228.5 427.5 L 1243.5 427.5 L 1243.5 511.5 L 1228.5 511.5 Z M 1066.5 427.5 L 1081.5 427.5 L 1081.5 511.5 L 1066.5 511.5 Z M 1558.5 453.5 L 1573.5 453.5 L 1573.5 517.5 L 1558.5 517.5 Z M 1609.5 391.5 L 1624.5 391.5 L 1624.5 517.5 L 1609.5 517.5 Z M 1652.5 391.5 L 1667.5 391.5 L 1667.5 517.5 L 1652.5 517.5 Z M 1652.5 391.5 "/>
 </clipPath>
-<image id="image464" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image491" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image464"/>
+  <use xlink:href="#image491"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 208.5 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 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="image465" 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="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image465"/>
+  <use xlink:href="#image492"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface459">
+<g id="surface486">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -238,6 +238,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1221.394531 649.191406 L 1221.335938 650.132812 L 1221.1875 650.988281 L 1220.921875 651.78125 L 1220.570312 652.488281 L 1220.097656 653.167969 L 1219.539062 653.753906 L 1218.917969 654.257812 L 1218.269531 654.640625 L 1217.535156 654.933594 L 1216.769531 655.167969 L 1215.945312 655.285156 L 1215.0625 655.316406 L 1205.371094 655.316406 L 1205.371094 633.84375 L 1214.089844 633.84375 L 1215.355469 633.933594 L 1216.476562 634.140625 L 1217.476562 634.492188 L 1218.332031 634.992188 L 1219.066406 635.640625 L 1219.65625 636.4375 L 1219.890625 636.878906 L 1220.097656 637.351562 L 1220.246094 637.792969 L 1220.363281 638.292969 L 1220.421875 638.792969 L 1220.449219 639.292969 L 1220.363281 640.355469 L 1220.097656 641.265625 L 1219.683594 642.121094 L 1219.097656 642.828125 L 1218.359375 643.476562 L 1217.476562 643.976562 L 1218.332031 644.359375 L 1219.066406 644.773438 L 1219.714844 645.242188 L 1220.246094 645.773438 L 1220.65625 646.332031 L 1220.980469 646.921875 L 1221.097656 647.277344 L 1221.1875 647.628906 L 1221.277344 647.984375 L 1221.335938 648.394531 L 1221.363281 648.777344 Z M 1217.710938 639.675781 L 1217.625 638.792969 L 1217.359375 638.058594 L 1216.945312 637.410156 L 1216.355469 636.9375 L 1215.621094 636.585938 L 1214.707031 636.347656 L 1214.5 636.347656 L 1214.296875 636.320312 L 1214.089844 636.289062 L 1213.617188 636.289062 L 1213.410156 636.261719 L 1208.109375 636.261719 L 1208.109375 643.09375 L 1213.410156 643.09375 L 1214.5 643.035156 L 1215.445312 642.859375 L 1216.238281 642.535156 L 1216.828125 642.09375 L 1217.300781 641.503906 L 1217.59375 640.796875 L 1217.625 640.648438 L 1217.652344 640.472656 L 1217.683594 640.296875 L 1217.683594 639.882812 Z M 1214.796875 652.902344 L 1215.621094 652.871094 L 1216.355469 652.695312 L 1217.003906 652.402344 L 1217.535156 652.015625 L 1217.976562 651.515625 L 1218.332031 650.898438 L 1218.417969 650.664062 L 1218.476562 650.398438 L 1218.566406 650.101562 L 1218.59375 649.839844 L 1218.625 649.542969 L 1218.652344 649.21875 L 1218.59375 648.570312 L 1218.476562 647.953125 L 1218.269531 647.421875 L 1217.976562 646.921875 L 1217.59375 646.511719 L 1217.152344 646.125 L 1216.828125 645.949219 L 1216.476562 645.804688 L 1216.09375 645.683594 L 1215.679688 645.597656 L 1215.238281 645.539062 L 1214.796875 645.507812 L 1208.109375 645.507812 L 1208.109375 652.902344 Z M 1214.796875 652.902344 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1165 443 L 1182 443 M 1165 426 L 1182 426 M 1165 426 L 1165 443 M 1182 426 L 1182 443 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1165 443 L 1182 443 M 1165 426 L 1182 426 M 1182 443 L 1182 426 M 1165 443 L 1165 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 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/sdfstp/sky130_fd_sc_lp__sdfstp_4.svg b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.svg
index e643309..7a0a3a4 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_4.svg
+++ b/cells/sdfstp/sky130_fd_sc_lp__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 535.5 L 174.5 535.5 Z M 174.5 354.5 "/>
 </clipPath>
-<image id="image486" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image513" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image486"/>
+  <use xlink:href="#image513"/>
 </pattern>
 <mask 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="#image486"/>
+  <use xlink:href="#image513"/>
 </pattern>
 <mask id="mask1">
 <rect 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 573.5 L 1141.5 573.5 L 1141.5 635.5 L 1126.5 635.5 Z M 1091.5 573.5 L 1106.5 573.5 L 1106.5 635.5 L 1091.5 635.5 Z M 1265.5 594.5 L 1280.5 594.5 L 1280.5 635.5 L 1265.5 635.5 Z M 1311.5 594.5 L 1326.5 594.5 L 1326.5 635.5 L 1311.5 635.5 Z M 1364.5 594.5 L 1378.5 594.5 L 1378.5 635.5 L 1364.5 635.5 Z M 951.5 594.5 L 966.5 594.5 L 966.5 635.5 L 951.5 635.5 Z M 986.5 594.5 L 1000.5 594.5 L 1000.5 635.5 L 986.5 635.5 Z M 1224.5 594.5 L 1239.5 594.5 L 1239.5 635.5 L 1224.5 635.5 Z M 360.5 597.5 L 374.5 597.5 L 374.5 637.5 L 360.5 637.5 Z M 401.5 597.5 L 416.5 597.5 L 416.5 637.5 L 401.5 637.5 Z M 283.5 597.5 L 298.5 597.5 L 298.5 637.5 L 283.5 637.5 Z M 249.5 597.5 L 263.5 597.5 L 263.5 637.5 L 249.5 637.5 Z M 325.5 597.5 L 339.5 597.5 L 339.5 637.5 L 325.5 637.5 Z M 772.5 615.5 L 787.5 615.5 L 787.5 656.5 L 772.5 656.5 Z M 849.5 615.5 L 863.5 615.5 L 863.5 656.5 L 849.5 656.5 Z M 814.5 615.5 L 829.5 615.5 L 829.5 656.5 L 814.5 656.5 Z M 645.5 627.5 L 659.5 627.5 L 659.5 667.5 L 645.5 667.5 Z M 603.5 627.5 L 618.5 627.5 L 618.5 667.5 L 603.5 667.5 Z M 1661.5 588.5 L 1675.5 588.5 L 1675.5 669.5 L 1661.5 669.5 Z M 1619.5 588.5 L 1634.5 588.5 L 1634.5 669.5 L 1619.5 669.5 Z M 1578.5 588.5 L 1592.5 588.5 L 1592.5 669.5 L 1578.5 669.5 Z M 1536.5 588.5 L 1550.5 588.5 L 1550.5 669.5 L 1536.5 669.5 Z M 1494.5 588.5 L 1509.5 588.5 L 1509.5 669.5 L 1494.5 669.5 Z M 1494.5 588.5 "/>
 </clipPath>
-<image id="image487" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image514" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image487"/>
+  <use xlink:href="#image514"/>
 </pattern>
 <mask id="mask2">
 <rect 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 404.5 L 1328.5 404.5 L 1328.5 445.5 L 1313.5 445.5 Z M 1272.5 404.5 L 1286.5 404.5 L 1286.5 445.5 L 1272.5 445.5 Z M 601.5 396.5 L 616.5 396.5 L 616.5 457.5 L 601.5 457.5 Z M 643.5 396.5 L 657.5 396.5 L 657.5 457.5 L 643.5 457.5 Z M 1405.5 421.5 L 1420.5 421.5 L 1420.5 461.5 L 1405.5 461.5 Z M 499.5 400.5 L 514.5 400.5 L 514.5 462.5 L 499.5 462.5 Z M 231.5 401.5 L 246.5 401.5 L 246.5 463.5 L 231.5 463.5 Z M 360.5 401.5 L 374.5 401.5 L 374.5 463.5 L 360.5 463.5 Z M 273.5 401.5 L 287.5 401.5 L 287.5 463.5 L 273.5 463.5 Z M 308.5 401.5 L 322.5 401.5 L 322.5 463.5 L 308.5 463.5 Z M 908.5 430.5 L 922.5 430.5 L 922.5 471.5 L 908.5 471.5 Z M 1126.5 430.5 L 1141.5 430.5 L 1141.5 471.5 L 1126.5 471.5 Z M 953.5 430.5 L 968.5 430.5 L 968.5 471.5 L 953.5 471.5 Z M 805.5 430.5 L 820.5 430.5 L 820.5 471.5 L 805.5 471.5 Z M 840.5 430.5 L 855.5 430.5 L 855.5 471.5 L 840.5 471.5 Z M 764.5 430.5 L 778.5 430.5 L 778.5 471.5 L 764.5 471.5 Z M 1177.5 430.5 L 1191.5 430.5 L 1191.5 512.5 L 1177.5 512.5 Z M 1025.5 430.5 L 1040.5 430.5 L 1040.5 512.5 L 1025.5 512.5 Z M 1497.5 396.5 L 1512.5 396.5 L 1512.5 517.5 L 1497.5 517.5 Z M 1664.5 396.5 L 1678.5 396.5 L 1678.5 517.5 L 1664.5 517.5 Z M 1539.5 396.5 L 1553.5 396.5 L 1553.5 517.5 L 1539.5 517.5 Z M 1580.5 396.5 L 1595.5 396.5 L 1595.5 517.5 L 1580.5 517.5 Z M 1622.5 396.5 L 1637.5 396.5 L 1637.5 517.5 L 1622.5 517.5 Z M 1622.5 396.5 "/>
 </clipPath>
-<image id="image488" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image515" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image488"/>
+  <use xlink:href="#image515"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 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="image489" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image516" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image489"/>
+  <use xlink:href="#image516"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface483">
+<g id="surface510">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -250,6 +250,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1236.015625 645.730469 L 1235.960938 646.625 L 1235.820312 647.441406 L 1235.570312 648.195312 L 1235.230469 648.871094 L 1234.785156 649.515625 L 1234.25 650.078125 L 1233.660156 650.554688 L 1233.042969 650.917969 L 1232.34375 651.199219 L 1231.613281 651.421875 L 1230.828125 651.535156 L 1229.988281 651.5625 L 1220.757812 651.5625 L 1220.757812 631.113281 L 1229.0625 631.113281 L 1230.265625 631.199219 L 1231.332031 631.394531 L 1232.285156 631.730469 L 1233.101562 632.207031 L 1233.800781 632.824219 L 1234.363281 633.582031 L 1234.585938 634.003906 L 1234.785156 634.453125 L 1234.921875 634.875 L 1235.035156 635.351562 L 1235.09375 635.828125 L 1235.121094 636.304688 L 1235.035156 637.3125 L 1234.785156 638.183594 L 1234.390625 638.996094 L 1233.828125 639.667969 L 1233.128906 640.285156 L 1232.285156 640.765625 L 1233.101562 641.128906 L 1233.800781 641.519531 L 1234.417969 641.96875 L 1234.921875 642.476562 L 1235.316406 643.007812 L 1235.625 643.570312 L 1235.738281 643.90625 L 1235.820312 644.242188 L 1235.90625 644.578125 L 1235.960938 644.972656 L 1235.988281 645.335938 Z M 1232.511719 636.667969 L 1232.425781 635.828125 L 1232.175781 635.125 L 1231.78125 634.507812 L 1231.222656 634.058594 L 1230.519531 633.722656 L 1229.648438 633.5 L 1229.453125 633.5 L 1229.257812 633.46875 L 1229.0625 633.441406 L 1228.613281 633.441406 L 1228.414062 633.414062 L 1223.367188 633.414062 L 1223.367188 639.921875 L 1228.414062 639.921875 L 1229.453125 639.867188 L 1230.351562 639.699219 L 1231.109375 639.390625 L 1231.667969 638.96875 L 1232.117188 638.40625 L 1232.398438 637.734375 L 1232.425781 637.59375 L 1232.457031 637.425781 L 1232.484375 637.257812 L 1232.484375 636.863281 Z M 1229.734375 649.261719 L 1230.519531 649.234375 L 1231.222656 649.066406 L 1231.839844 648.785156 L 1232.34375 648.421875 L 1232.765625 647.945312 L 1233.101562 647.355469 L 1233.183594 647.132812 L 1233.242188 646.878906 L 1233.324219 646.597656 L 1233.351562 646.347656 L 1233.378906 646.066406 L 1233.410156 645.757812 L 1233.351562 645.140625 L 1233.242188 644.550781 L 1233.042969 644.046875 L 1232.765625 643.570312 L 1232.398438 643.175781 L 1231.976562 642.8125 L 1231.667969 642.644531 L 1231.332031 642.503906 L 1230.96875 642.390625 L 1230.574219 642.304688 L 1230.15625 642.25 L 1229.734375 642.222656 L 1223.367188 642.222656 L 1223.367188 649.261719 Z M 1229.734375 649.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 1183 446 L 1199 446 M 1183 429 L 1199 429 M 1183 429 L 1183 446 M 1199 429 L 1199 446 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1183 446 L 1199 446 M 1183 429 L 1199 429 M 1199 446 L 1199 429 M 1183 446 L 1183 429 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/sdfstp/sky130_fd_sc_lp__sdfstp_lp.svg b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.svg
index a54d32b..b93b8ed 100644
--- a/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.svg
+++ b/cells/sdfstp/sky130_fd_sc_lp__sdfstp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 354.5 L 1743.5 354.5 L 1743.5 535.5 L 174.5 535.5 Z M 1424.5 535.5 L 1554.5 535.5 L 1554.5 545.5 L 1424.5 545.5 Z M 1424.5 535.5 "/>
 </clipPath>
-<image id="image344" 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="#image344"/>
+  <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 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="#image344"/>
+  <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 1111.5 594.5 L 1125.5 594.5 L 1125.5 635.5 L 1111.5 635.5 Z M 1148.5 594.5 L 1163.5 594.5 L 1163.5 635.5 L 1148.5 635.5 Z M 1056.5 594.5 L 1070.5 594.5 L 1070.5 635.5 L 1056.5 635.5 Z M 882.5 594.5 L 896.5 594.5 L 896.5 635.5 L 882.5 635.5 Z M 1018.5 594.5 L 1032.5 594.5 L 1032.5 635.5 L 1018.5 635.5 Z M 847.5 594.5 L 862.5 594.5 L 862.5 635.5 L 847.5 635.5 Z M 793.5 594.5 L 807.5 594.5 L 807.5 635.5 L 793.5 635.5 Z M 621.5 602.5 L 635.5 602.5 L 635.5 643.5 L 621.5 643.5 Z M 662.5 602.5 L 677.5 602.5 L 677.5 643.5 L 662.5 643.5 Z M 697.5 602.5 L 712.5 602.5 L 712.5 643.5 L 697.5 643.5 Z M 583.5 602.5 L 597.5 602.5 L 597.5 643.5 L 583.5 643.5 Z M 1206.5 622.5 L 1220.5 622.5 L 1220.5 663.5 L 1206.5 663.5 Z M 1281.5 622.5 L 1295.5 622.5 L 1295.5 663.5 L 1281.5 663.5 Z M 1243.5 622.5 L 1258.5 622.5 L 1258.5 663.5 L 1243.5 663.5 Z M 1428.5 627.5 L 1443.5 627.5 L 1443.5 667.5 L 1428.5 667.5 Z M 1463.5 627.5 L 1477.5 627.5 L 1477.5 667.5 L 1463.5 667.5 Z M 1594.5 627.5 L 1608.5 627.5 L 1608.5 667.5 L 1594.5 667.5 Z M 1559.5 627.5 L 1573.5 627.5 L 1573.5 667.5 L 1559.5 667.5 Z M 1635.5 627.5 L 1650.5 627.5 L 1650.5 667.5 L 1635.5 667.5 Z M 1670.5 627.5 L 1684.5 627.5 L 1684.5 667.5 L 1670.5 667.5 Z M 282.5 632.5 L 297.5 632.5 L 297.5 672.5 L 282.5 672.5 Z M 473.5 632.5 L 488.5 632.5 L 488.5 672.5 L 473.5 672.5 Z M 394.5 632.5 L 408.5 632.5 L 408.5 672.5 L 394.5 672.5 Z M 356.5 632.5 L 370.5 632.5 L 370.5 672.5 L 356.5 672.5 Z M 435.5 632.5 L 450.5 632.5 L 450.5 672.5 L 435.5 672.5 Z M 248.5 632.5 L 262.5 632.5 L 262.5 672.5 L 248.5 672.5 Z M 248.5 632.5 "/>
 </clipPath>
-<image id="image345" 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="#image345"/>
+  <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 1288.5 396.5 L 1312.5 396.5 L 1312.5 492.5 L 1288.5 492.5 Z M 1363.5 396.5 L 1387.5 396.5 L 1387.5 492.5 L 1363.5 492.5 Z M 1235.5 396.5 L 1260.5 396.5 L 1260.5 492.5 L 1235.5 492.5 Z M 748.5 396.5 L 772.5 396.5 L 772.5 492.5 L 748.5 492.5 Z M 832.5 396.5 L 856.5 396.5 L 856.5 492.5 L 832.5 492.5 Z M 1101.5 396.5 L 1125.5 396.5 L 1125.5 492.5 L 1101.5 492.5 Z M 883.5 396.5 L 907.5 396.5 L 907.5 492.5 L 883.5 492.5 Z M 1148.5 396.5 L 1173.5 396.5 L 1173.5 492.5 L 1148.5 492.5 Z M 1021.5 396.5 L 1045.5 396.5 L 1045.5 492.5 L 1021.5 492.5 Z M 970.5 396.5 L 994.5 396.5 L 994.5 492.5 L 970.5 492.5 Z M 645.5 400.5 L 669.5 400.5 L 669.5 497.5 L 645.5 497.5 Z M 594.5 400.5 L 618.5 400.5 L 618.5 497.5 L 594.5 497.5 Z M 233.5 400.5 L 257.5 400.5 L 257.5 497.5 L 233.5 497.5 Z M 488.5 402.5 L 513.5 402.5 L 513.5 499.5 L 488.5 499.5 Z M 339.5 402.5 L 363.5 402.5 L 363.5 499.5 L 339.5 499.5 Z M 437.5 402.5 L 461.5 402.5 L 461.5 499.5 L 437.5 499.5 Z M 390.5 402.5 L 414.5 402.5 L 414.5 499.5 L 390.5 499.5 Z M 1591.5 417.5 L 1615.5 417.5 L 1615.5 514.5 L 1591.5 514.5 Z M 1642.5 417.5 L 1666.5 417.5 L 1666.5 514.5 L 1642.5 514.5 Z M 1469.5 430.5 L 1493.5 430.5 L 1493.5 527.5 L 1469.5 527.5 Z M 1469.5 430.5 "/>
 </clipPath>
-<image id="image346" 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="#image346"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 1043.5 490.5 L 1060.5 490.5 L 1060.5 506.5 L 1043.5 506.5 Z M 1369.5 490.5 L 1385.5 490.5 L 1385.5 506.5 L 1369.5 506.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="image347" 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="#image347"/>
+  <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="surface341">
+<g id="surface367">
 <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 1713.0625 436.875 L 1711.742188 438.5 L 1708.796875 436.058594 L 1707.957031 436.507812 L 1707.113281 436.84375 L 1706.246094 437.125 L 1705.320312 437.320312 L 1704.394531 437.433594 L 1703.441406 437.488281 L 1702.148438 437.40625 L 1700.941406 437.210938 L 1699.820312 436.875 L 1698.753906 436.425781 L 1697.746094 435.835938 L 1696.847656 435.078125 L 1696.035156 434.265625 L 1695.332031 433.339844 L 1694.773438 432.328125 L 1694.296875 431.234375 L 1693.929688 430.058594 L 1693.707031 428.765625 L 1693.648438 428.457031 L 1693.621094 428.121094 L 1693.59375 427.8125 L 1693.566406 427.476562 L 1693.566406 426.773438 L 1693.621094 425.371094 L 1693.820312 424.027344 L 1694.125 422.792969 L 1694.574219 421.613281 L 1695.136719 420.519531 L 1695.867188 419.511719 L 1696.59375 418.695312 L 1697.4375 417.96875 L 1698.363281 417.351562 L 1699.34375 416.875 L 1700.410156 416.480469 L 1701.589844 416.199219 L 1701.867188 416.171875 L 1702.484375 416.117188 L 1702.792969 416.085938 L 1703.101562 416.085938 L 1703.441406 416.058594 L 1704.703125 416.144531 L 1705.90625 416.339844 L 1707.03125 416.675781 L 1708.097656 417.125 L 1709.105469 417.714844 L 1710.03125 418.445312 L 1710.816406 419.285156 L 1711.519531 420.183594 L 1712.078125 421.164062 L 1712.554688 422.257812 L 1712.921875 423.4375 L 1713.171875 424.671875 L 1713.203125 425.035156 L 1713.257812 425.707031 L 1713.285156 426.046875 L 1713.285156 426.382812 L 1713.3125 426.71875 L 1713.230469 428.289062 L 1712.976562 429.777344 L 1712.585938 431.152344 L 1712.023438 432.441406 L 1711.292969 433.621094 L 1710.425781 434.714844 Z M 1705.992188 431.09375 L 1708.488281 433.140625 L 1709.160156 432.300781 L 1709.722656 431.347656 L 1710.144531 430.308594 L 1710.453125 429.214844 L 1710.621094 428.039062 L 1710.703125 426.746094 L 1710.648438 425.570312 L 1710.480469 424.445312 L 1710.199219 423.410156 L 1709.835938 422.457031 L 1709.359375 421.558594 L 1708.769531 420.742188 L 1708.097656 420.070312 L 1707.394531 419.511719 L 1706.609375 419.0625 L 1705.769531 418.722656 L 1704.84375 418.5 L 1703.886719 418.359375 L 1703.441406 418.359375 L 1702.429688 418.445312 L 1701.476562 418.613281 L 1700.578125 418.894531 L 1699.765625 419.3125 L 1699.007812 419.847656 L 1698.335938 420.492188 L 1697.6875 421.25 L 1697.183594 422.089844 L 1696.765625 423.015625 L 1696.457031 424.027344 L 1696.257812 425.121094 L 1696.175781 426.296875 L 1696.175781 426.773438 L 1696.203125 428.007812 L 1696.371094 429.132812 L 1696.652344 430.167969 L 1697.015625 431.152344 L 1697.519531 432.046875 L 1698.136719 432.832031 L 1698.785156 433.535156 L 1699.511719 434.097656 L 1700.296875 434.542969 L 1701.140625 434.851562 L 1702.066406 435.078125 L 1703.046875 435.160156 L 1703.101562 435.191406 L 1703.917969 435.191406 L 1704.449219 435.132812 L 1704.984375 435.023438 L 1705.488281 434.910156 L 1705.992188 434.742188 L 1706.523438 434.515625 L 1706.554688 434.515625 L 1706.609375 434.488281 L 1706.636719 434.460938 L 1706.695312 434.460938 L 1706.722656 434.433594 L 1706.777344 434.40625 L 1704.703125 432.664062 Z M 1705.992188 431.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 661 L 1710 661 M 1694 644 L 1710 644 M 1694 644 L 1694 661 M 1710 644 L 1710 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1694 661 L 1710 661 M 1694 644 L 1710 644 M 1710 661 L 1710 644 M 1694 661 L 1694 644 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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_lp__sdfxbp_1.svg b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.svg
index 81effe8..3971cd0 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_1.svg
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_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 174.5 337.5 "/>
 </clipPath>
-<image id="image465" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image493" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image465"/>
+  <use xlink:href="#image493"/>
 </pattern>
 <mask 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="#image465"/>
+  <use xlink:href="#image493"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1363.5 577.5 L 1378.5 577.5 L 1378.5 645.5 L 1363.5 645.5 Z M 1299.5 600.5 L 1315.5 600.5 L 1315.5 645.5 L 1299.5 645.5 Z M 1261.5 600.5 L 1277.5 600.5 L 1277.5 645.5 L 1261.5 645.5 Z M 1215.5 600.5 L 1231.5 600.5 L 1231.5 645.5 L 1215.5 645.5 Z M 810.5 602.5 L 826.5 602.5 L 826.5 647.5 L 810.5 647.5 Z M 727.5 602.5 L 742.5 602.5 L 742.5 647.5 L 727.5 647.5 Z M 632.5 579.5 L 647.5 579.5 L 647.5 647.5 L 632.5 647.5 Z M 765.5 602.5 L 781.5 602.5 L 781.5 647.5 L 765.5 647.5 Z M 1053.5 603.5 L 1068.5 603.5 L 1068.5 648.5 L 1053.5 648.5 Z M 282.5 603.5 L 298.5 603.5 L 298.5 648.5 L 282.5 648.5 Z M 423.5 603.5 L 439.5 603.5 L 439.5 648.5 L 423.5 648.5 Z M 244.5 603.5 L 260.5 603.5 L 260.5 648.5 L 244.5 648.5 Z M 378.5 603.5 L 394.5 603.5 L 394.5 648.5 L 378.5 648.5 Z M 340.5 603.5 L 355.5 603.5 L 355.5 648.5 L 340.5 648.5 Z M 1007.5 603.5 L 1023.5 603.5 L 1023.5 648.5 L 1007.5 648.5 Z M 1498.5 619.5 L 1514.5 619.5 L 1514.5 664.5 L 1498.5 664.5 Z M 1599.5 580.5 L 1615.5 580.5 L 1615.5 669.5 L 1599.5 669.5 Z M 1647.5 580.5 L 1662.5 580.5 L 1662.5 669.5 L 1647.5 669.5 Z M 1647.5 580.5 "/>
 </clipPath>
-<image id="image466" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image494" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image466"/>
+  <use xlink:href="#image494"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 824.5 400.5 L 840.5 400.5 L 840.5 445.5 L 824.5 445.5 Z M 869.5 400.5 L 885.5 400.5 L 885.5 445.5 L 869.5 445.5 Z M 1172.5 402.5 L 1188.5 402.5 L 1188.5 447.5 L 1172.5 447.5 Z M 282.5 387.5 L 298.5 387.5 L 298.5 454.5 L 282.5 454.5 Z M 237.5 387.5 L 252.5 387.5 L 252.5 454.5 L 237.5 454.5 Z M 320.5 387.5 L 336.5 387.5 L 336.5 454.5 L 320.5 454.5 Z M 366.5 387.5 L 382.5 387.5 L 382.5 454.5 L 366.5 454.5 Z M 524.5 388.5 L 540.5 388.5 L 540.5 456.5 L 524.5 456.5 Z M 1339.5 432.5 L 1355.5 432.5 L 1355.5 477.5 L 1339.5 477.5 Z M 695.5 441.5 L 711.5 441.5 L 711.5 485.5 L 695.5 485.5 Z M 639.5 396.5 L 655.5 396.5 L 655.5 485.5 L 639.5 485.5 Z M 1002.5 435.5 L 1018.5 435.5 L 1018.5 503.5 L 1002.5 503.5 Z M 1064.5 435.5 L 1080.5 435.5 L 1080.5 503.5 L 1064.5 503.5 Z M 1395.5 421.5 L 1411.5 421.5 L 1411.5 510.5 L 1395.5 510.5 Z M 1238.5 421.5 L 1254.5 421.5 L 1254.5 510.5 L 1238.5 510.5 Z M 1501.5 448.5 L 1517.5 448.5 L 1517.5 516.5 L 1501.5 516.5 Z M 1557.5 382.5 L 1573.5 382.5 L 1573.5 516.5 L 1557.5 516.5 Z M 1665.5 382.5 L 1681.5 382.5 L 1681.5 516.5 L 1665.5 516.5 Z M 1665.5 382.5 "/>
 </clipPath>
-<image id="image467" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image495" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image467"/>
+  <use xlink:href="#image495"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 211.5 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 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="image468" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image496" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image468"/>
+  <use xlink:href="#image496"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface462">
+<g id="surface490">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -245,6 +245,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1607.117188 506.710938 L 1605.667969 508.5 L 1602.425781 505.816406 L 1601.5 506.308594 L 1600.574219 506.679688 L 1599.621094 506.988281 L 1598.601562 507.203125 L 1597.582031 507.328125 L 1596.535156 507.390625 L 1595.113281 507.296875 L 1593.789062 507.082031 L 1592.554688 506.710938 L 1591.378906 506.214844 L 1590.269531 505.570312 L 1589.28125 504.734375 L 1588.386719 503.839844 L 1587.617188 502.824219 L 1587 501.710938 L 1586.476562 500.507812 L 1586.074219 499.210938 L 1585.828125 497.792969 L 1585.765625 497.453125 L 1585.734375 497.082031 L 1585.703125 496.742188 L 1585.671875 496.375 L 1585.671875 495.601562 L 1585.734375 494.058594 L 1585.949219 492.578125 L 1586.289062 491.222656 L 1586.785156 489.925781 L 1587.402344 488.722656 L 1588.203125 487.609375 L 1589.003906 486.714844 L 1589.929688 485.914062 L 1590.949219 485.234375 L 1592.027344 484.710938 L 1593.203125 484.277344 L 1594.496094 483.96875 L 1594.804688 483.9375 L 1595.144531 483.90625 L 1595.484375 483.878906 L 1595.824219 483.847656 L 1596.164062 483.847656 L 1596.535156 483.816406 L 1597.921875 483.90625 L 1599.25 484.125 L 1600.484375 484.496094 L 1601.65625 484.988281 L 1602.765625 485.636719 L 1603.785156 486.4375 L 1604.648438 487.363281 L 1605.421875 488.351562 L 1606.039062 489.429688 L 1606.5625 490.632812 L 1606.960938 491.929688 L 1607.242188 493.289062 L 1607.269531 493.6875 L 1607.363281 494.800781 L 1607.363281 495.171875 L 1607.394531 495.539062 L 1607.300781 497.269531 L 1607.023438 498.902344 L 1606.59375 500.414062 L 1605.976562 501.835938 L 1605.171875 503.132812 L 1604.214844 504.335938 Z M 1599.339844 500.355469 L 1602.085938 502.605469 L 1602.828125 501.679688 L 1603.445312 500.632812 L 1603.90625 499.488281 L 1604.246094 498.285156 L 1604.433594 496.992188 L 1604.523438 495.570312 L 1604.464844 494.277344 L 1604.277344 493.042969 L 1603.96875 491.898438 L 1603.570312 490.851562 L 1603.042969 489.863281 L 1602.394531 488.96875 L 1601.65625 488.226562 L 1600.882812 487.609375 L 1600.019531 487.117188 L 1599.09375 486.746094 L 1598.078125 486.5 L 1597.027344 486.347656 L 1596.535156 486.347656 L 1595.421875 486.4375 L 1594.375 486.625 L 1593.386719 486.933594 L 1592.492188 487.394531 L 1591.660156 487.980469 L 1590.917969 488.691406 L 1590.207031 489.523438 L 1589.652344 490.449219 L 1589.191406 491.46875 L 1588.851562 492.578125 L 1588.632812 493.78125 L 1588.542969 495.078125 L 1588.542969 495.601562 L 1588.574219 496.960938 L 1588.757812 498.195312 L 1589.066406 499.335938 L 1589.46875 500.414062 L 1590.023438 501.402344 L 1590.703125 502.265625 L 1591.410156 503.039062 L 1592.214844 503.65625 L 1593.078125 504.148438 L 1594.003906 504.488281 L 1595.023438 504.734375 L 1596.101562 504.828125 L 1596.164062 504.859375 L 1597.058594 504.859375 L 1597.644531 504.796875 L 1598.230469 504.675781 L 1598.785156 504.550781 L 1599.339844 504.367188 L 1599.929688 504.117188 L 1599.957031 504.117188 L 1600.019531 504.085938 L 1600.050781 504.058594 L 1600.113281 504.058594 L 1600.144531 504.027344 L 1600.207031 503.996094 L 1597.921875 502.082031 Z M 1599.339844 500.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 1587 593 L 1605 593 M 1587 575 L 1605 575 M 1587 575 L 1587 593 M 1605 575 L 1605 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 1587 593 L 1605 593 M 1587 575 L 1605 575 M 1605 593 L 1605 575 M 1587 593 L 1587 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/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.svg b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.svg
index be603f7..54fd739 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.svg
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 349.5 L 1743.5 349.5 L 1743.5 535.5 L 174.5 535.5 Z M 174.5 349.5 "/>
 </clipPath>
-<image id="image496" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image525" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image496"/>
+  <use xlink:href="#image525"/>
 </pattern>
 <mask 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="#image496"/>
+  <use xlink:href="#image525"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1329.5 575.5 L 1344.5 575.5 L 1344.5 639.5 L 1329.5 639.5 Z M 1179.5 597.5 L 1194.5 597.5 L 1194.5 639.5 L 1179.5 639.5 Z M 1223.5 597.5 L 1238.5 597.5 L 1238.5 639.5 L 1223.5 639.5 Z M 1259.5 597.5 L 1274.5 597.5 L 1274.5 639.5 L 1259.5 639.5 Z M 233.5 598.5 L 248.5 598.5 L 248.5 640.5 L 233.5 640.5 Z M 269.5 598.5 L 283.5 598.5 L 283.5 640.5 L 269.5 640.5 Z M 358.5 598.5 L 373.5 598.5 L 373.5 640.5 L 358.5 640.5 Z M 409.5 598.5 L 424.5 598.5 L 424.5 640.5 L 409.5 640.5 Z M 311.5 598.5 L 326.5 598.5 L 326.5 640.5 L 311.5 640.5 Z M 967.5 599.5 L 982.5 599.5 L 982.5 641.5 L 967.5 641.5 Z M 1010.5 599.5 L 1025.5 599.5 L 1025.5 641.5 L 1010.5 641.5 Z M 609.5 577.5 L 624.5 577.5 L 624.5 641.5 L 609.5 641.5 Z M 742.5 599.5 L 757.5 599.5 L 757.5 641.5 L 742.5 641.5 Z M 785.5 599.5 L 800.5 599.5 L 800.5 641.5 L 785.5 641.5 Z M 706.5 599.5 L 721.5 599.5 L 721.5 641.5 L 706.5 641.5 Z M 1434.5 588.5 L 1449.5 588.5 L 1449.5 672.5 L 1434.5 672.5 Z M 1529.5 630.5 L 1544.5 630.5 L 1544.5 672.5 L 1529.5 672.5 Z M 1477.5 588.5 L 1491.5 588.5 L 1491.5 672.5 L 1477.5 672.5 Z M 1626.5 593.5 L 1641.5 593.5 L 1641.5 677.5 L 1626.5 677.5 Z M 1668.5 593.5 L 1683.5 593.5 L 1683.5 677.5 L 1668.5 677.5 Z M 1668.5 593.5 "/>
 </clipPath>
-<image id="image497" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image526" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image497"/>
+  <use xlink:href="#image526"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 790.5 408.5 L 805.5 408.5 L 805.5 450.5 L 790.5 450.5 Z M 833.5 408.5 L 848.5 408.5 L 848.5 450.5 L 833.5 450.5 Z M 315.5 392.5 L 330.5 392.5 L 330.5 456.5 L 315.5 456.5 Z M 358.5 392.5 L 373.5 392.5 L 373.5 456.5 L 358.5 456.5 Z M 279.5 392.5 L 294.5 392.5 L 294.5 456.5 L 279.5 456.5 Z M 233.5 392.5 L 248.5 392.5 L 248.5 456.5 L 233.5 456.5 Z M 502.5 396.5 L 517.5 396.5 L 517.5 460.5 L 502.5 460.5 Z M 1269.5 427.5 L 1284.5 427.5 L 1284.5 469.5 L 1269.5 469.5 Z M 1233.5 427.5 L 1248.5 427.5 L 1248.5 469.5 L 1233.5 469.5 Z M 673.5 446.5 L 688.5 446.5 L 688.5 488.5 L 673.5 488.5 Z M 621.5 404.5 L 635.5 404.5 L 635.5 488.5 L 621.5 488.5 Z M 1010.5 439.5 L 1025.5 439.5 L 1025.5 503.5 L 1010.5 503.5 Z M 951.5 439.5 L 966.5 439.5 L 966.5 503.5 L 951.5 503.5 Z M 1326.5 427.5 L 1341.5 427.5 L 1341.5 511.5 L 1326.5 511.5 Z M 1182.5 427.5 L 1197.5 427.5 L 1197.5 511.5 L 1182.5 511.5 Z M 1531.5 453.5 L 1546.5 453.5 L 1546.5 517.5 L 1531.5 517.5 Z M 1668.5 391.5 L 1683.5 391.5 L 1683.5 517.5 L 1668.5 517.5 Z M 1436.5 391.5 L 1451.5 391.5 L 1451.5 517.5 L 1436.5 517.5 Z M 1626.5 391.5 L 1641.5 391.5 L 1641.5 517.5 L 1626.5 517.5 Z M 1479.5 391.5 L 1493.5 391.5 L 1493.5 517.5 L 1479.5 517.5 Z M 1479.5 391.5 "/>
 </clipPath>
-<image id="image498" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image527" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image498"/>
+  <use xlink:href="#image527"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 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="image499" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image528" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image499"/>
+  <use xlink:href="#image528"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface493">
+<g id="surface522">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -259,6 +259,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 354.121094 508.5 L 354.121094 487.027344 L 362.398438 487.027344 L 363.695312 487.117188 L 364.902344 487.351562 L 366.019531 487.765625 L 367.050781 488.296875 L 367.964844 489.03125 L 368.820312 489.886719 L 369.523438 490.917969 L 370.113281 492.035156 L 370.554688 493.300781 L 370.878906 494.65625 L 371.058594 496.160156 L 371.144531 497.75 L 371.058594 499.429688 L 370.851562 500.988281 L 370.496094 502.402344 L 370.027344 503.699219 L 369.40625 504.847656 L 368.640625 505.847656 L 367.816406 506.675781 L 366.902344 507.320312 L 365.902344 507.851562 L 364.8125 508.207031 L 363.632812 508.441406 L 362.398438 508.5 Z M 356.859375 506.085938 L 361.925781 506.085938 L 363.28125 505.996094 L 364.488281 505.671875 L 365.550781 505.113281 L 366.433594 504.375 L 367.140625 503.375 L 367.730469 502.167969 L 367.90625 501.550781 L 368.082031 500.902344 L 368.230469 500.195312 L 368.316406 499.429688 L 368.375 498.632812 L 368.40625 497.777344 L 368.289062 495.863281 L 367.992188 494.1875 L 367.464844 492.742188 L 366.757812 491.59375 L 365.84375 490.652344 L 364.722656 489.972656 L 364.3125 489.828125 L 363.871094 489.679688 L 363.398438 489.589844 L 362.929688 489.503906 L 362.425781 489.472656 L 361.925781 489.445312 L 356.859375 489.445312 Z M 356.859375 506.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 352 590 L 369 590 M 352 573 L 369 573 M 352 573 L 352 590 M 369 573 L 369 590 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 352 590 L 369 590 M 352 573 L 369 573 M 369 590 L 369 573 M 352 590 L 352 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 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/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.svg b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.svg
index 0d4a859..8fc9665 100644
--- a/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.svg
+++ b/cells/sdfxbp/sky130_fd_sc_lp__sdfxbp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 354.5 L 1743.5 354.5 L 1743.5 535.5 L 174.5 535.5 Z M 544.5 535.5 L 1339.5 535.5 L 1339.5 542.5 L 544.5 542.5 Z M 544.5 542.5 L 1165.5 542.5 L 1165.5 545.5 L 544.5 545.5 Z M 544.5 542.5 "/>
 </clipPath>
-<image id="image369" 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="#image369"/>
+  <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 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="#image369"/>
+  <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 1117.5 579.5 L 1132.5 579.5 L 1132.5 620.5 L 1117.5 620.5 Z M 1165.5 579.5 L 1180.5 579.5 L 1180.5 620.5 L 1165.5 620.5 Z M 839.5 579.5 L 853.5 579.5 L 853.5 620.5 L 839.5 620.5 Z M 796.5 579.5 L 811.5 579.5 L 811.5 620.5 L 796.5 620.5 Z M 1544.5 593.5 L 1558.5 593.5 L 1558.5 634.5 L 1544.5 634.5 Z M 1432.5 593.5 L 1447.5 593.5 L 1447.5 634.5 L 1432.5 634.5 Z M 1467.5 593.5 L 1482.5 593.5 L 1482.5 634.5 L 1467.5 634.5 Z M 1509.5 593.5 L 1523.5 593.5 L 1523.5 634.5 L 1509.5 634.5 Z M 431.5 594.5 L 445.5 594.5 L 445.5 635.5 L 431.5 635.5 Z M 466.5 594.5 L 480.5 594.5 L 480.5 635.5 L 466.5 635.5 Z M 379.5 594.5 L 393.5 594.5 L 393.5 635.5 L 379.5 635.5 Z M 988.5 594.5 L 1002.5 594.5 L 1002.5 635.5 L 988.5 635.5 Z M 246.5 594.5 L 261.5 594.5 L 261.5 635.5 L 246.5 635.5 Z M 284.5 594.5 L 298.5 594.5 L 298.5 635.5 L 284.5 635.5 Z M 934.5 594.5 L 948.5 594.5 L 948.5 635.5 L 934.5 635.5 Z M 1023.5 594.5 L 1037.5 594.5 L 1037.5 635.5 L 1023.5 635.5 Z M 341.5 594.5 L 355.5 594.5 L 355.5 635.5 L 341.5 635.5 Z M 636.5 622.5 L 651.5 622.5 L 651.5 663.5 L 636.5 663.5 Z M 594.5 622.5 L 609.5 622.5 L 609.5 663.5 L 594.5 663.5 Z M 671.5 622.5 L 685.5 622.5 L 685.5 663.5 L 671.5 663.5 Z M 560.5 622.5 L 574.5 622.5 L 574.5 663.5 L 560.5 663.5 Z M 1264.5 627.5 L 1279.5 627.5 L 1279.5 667.5 L 1264.5 667.5 Z M 1306.5 627.5 L 1320.5 627.5 L 1320.5 667.5 L 1306.5 667.5 Z M 1340.5 627.5 L 1355.5 627.5 L 1355.5 667.5 L 1340.5 667.5 Z M 1671.5 627.5 L 1686.5 627.5 L 1686.5 667.5 L 1671.5 667.5 Z M 1637.5 627.5 L 1651.5 627.5 L 1651.5 667.5 L 1637.5 667.5 Z M 1637.5 627.5 "/>
 </clipPath>
-<image id="image370" 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="#image370"/>
+  <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 482.5 397.5 L 506.5 397.5 L 506.5 493.5 L 482.5 493.5 Z M 334.5 397.5 L 358.5 397.5 L 358.5 493.5 L 334.5 493.5 Z M 431.5 397.5 L 455.5 397.5 L 455.5 493.5 L 431.5 493.5 Z M 385.5 397.5 L 410.5 397.5 L 410.5 493.5 L 385.5 493.5 Z M 232.5 400.5 L 256.5 400.5 L 256.5 497.5 L 232.5 497.5 Z M 1594.5 400.5 L 1619.5 400.5 L 1619.5 497.5 L 1594.5 497.5 Z M 1430.5 404.5 L 1454.5 404.5 L 1454.5 501.5 L 1430.5 501.5 Z M 1481.5 404.5 L 1505.5 404.5 L 1505.5 501.5 L 1481.5 501.5 Z M 1270.5 424.5 L 1294.5 424.5 L 1294.5 520.5 L 1270.5 520.5 Z M 1155.5 428.5 L 1179.5 428.5 L 1179.5 525.5 L 1155.5 525.5 Z M 1203.5 428.5 L 1227.5 428.5 L 1227.5 525.5 L 1203.5 525.5 Z M 640.5 430.5 L 664.5 430.5 L 664.5 527.5 L 640.5 527.5 Z M 933.5 430.5 L 957.5 430.5 L 957.5 527.5 L 933.5 527.5 Z M 834.5 430.5 L 858.5 430.5 L 858.5 527.5 L 834.5 527.5 Z M 589.5 430.5 L 613.5 430.5 L 613.5 527.5 L 589.5 527.5 Z M 1017.5 430.5 L 1041.5 430.5 L 1041.5 527.5 L 1017.5 527.5 Z M 1088.5 430.5 L 1113.5 430.5 L 1113.5 527.5 L 1088.5 527.5 Z M 885.5 430.5 L 909.5 430.5 L 909.5 527.5 L 885.5 527.5 Z M 885.5 430.5 "/>
 </clipPath>
-<image id="image371" 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="#image371"/>
+  <use xlink:href="#image399"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 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="image372" 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="#image372"/>
+  <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="surface366">
+<g id="surface394">
 <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 1729.984375 417.113281 L 1729.984375 437.5625 L 1727.039062 437.5625 L 1716.464844 420.984375 L 1716.464844 437.5625 L 1713.996094 437.5625 L 1713.996094 417.113281 L 1716.828125 417.113281 L 1727.515625 433.832031 L 1727.515625 417.113281 Z M 1729.984375 417.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 1694 661 L 1710 661 M 1694 644 L 1710 644 M 1694 644 L 1694 661 M 1710 644 L 1710 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1694 661 L 1710 661 M 1694 644 L 1710 644 M 1710 661 L 1710 644 M 1694 661 L 1694 644 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.svg b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.svg
index 0502462..3608da7 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.svg
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_1.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="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 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="#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 1063.5 624.5 L 1084.5 624.5 L 1084.5 684.5 L 1063.5 684.5 Z M 995.5 624.5 L 1017.5 624.5 L 1017.5 684.5 L 995.5 684.5 Z M 933.5 624.5 L 955.5 624.5 L 955.5 684.5 L 933.5 684.5 Z M 564.5 625.5 L 586.5 625.5 L 586.5 686.5 L 564.5 686.5 Z M 295.5 625.5 L 317.5 625.5 L 317.5 686.5 L 295.5 686.5 Z M 357.5 625.5 L 378.5 625.5 L 378.5 686.5 L 357.5 686.5 Z M 512.5 625.5 L 534.5 625.5 L 534.5 686.5 L 512.5 686.5 Z M 630.5 625.5 L 652.5 625.5 L 652.5 686.5 L 630.5 686.5 Z M 408.5 625.5 L 430.5 625.5 L 430.5 686.5 L 408.5 686.5 Z M 1175.5 624.5 L 1196.5 624.5 L 1196.5 716.5 L 1175.5 716.5 Z M 1637.5 598.5 L 1659.5 598.5 L 1659.5 719.5 L 1637.5 719.5 Z M 1264.5 667.5 L 1285.5 667.5 L 1285.5 727.5 L 1264.5 727.5 Z M 1500.5 635.5 L 1522.5 635.5 L 1522.5 727.5 L 1500.5 727.5 Z M 1373.5 667.5 L 1395.5 667.5 L 1395.5 727.5 L 1373.5 727.5 Z M 1425.5 667.5 L 1446.5 667.5 L 1446.5 727.5 L 1425.5 727.5 Z M 770.5 680.5 L 791.5 680.5 L 791.5 740.5 L 770.5 740.5 Z M 770.5 680.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 1411.5 358.5 L 1433.5 358.5 L 1433.5 419.5 L 1411.5 419.5 Z M 1338.5 358.5 L 1360.5 358.5 L 1360.5 419.5 L 1338.5 419.5 Z M 309.5 330.5 L 331.5 330.5 L 331.5 422.5 L 309.5 422.5 Z M 496.5 330.5 L 517.5 330.5 L 517.5 422.5 L 496.5 422.5 Z M 383.5 330.5 L 404.5 330.5 L 404.5 422.5 L 383.5 422.5 Z M 563.5 330.5 L 585.5 330.5 L 585.5 422.5 L 563.5 422.5 Z M 434.5 330.5 L 456.5 330.5 L 456.5 422.5 L 434.5 422.5 Z M 630.5 330.5 L 652.5 330.5 L 652.5 422.5 L 630.5 422.5 Z M 771.5 337.5 L 793.5 337.5 L 793.5 429.5 L 771.5 429.5 Z M 1165.5 331.5 L 1186.5 331.5 L 1186.5 452.5 L 1165.5 452.5 Z M 1226.5 331.5 L 1248.5 331.5 L 1248.5 452.5 L 1226.5 452.5 Z M 1010.5 391.5 L 1031.5 391.5 L 1031.5 452.5 L 1010.5 452.5 Z M 948.5 391.5 L 969.5 391.5 L 969.5 452.5 L 948.5 452.5 Z M 1063.5 391.5 L 1084.5 391.5 L 1084.5 452.5 L 1063.5 452.5 Z M 1501.5 358.5 L 1522.5 358.5 L 1522.5 479.5 L 1501.5 479.5 Z M 1637.5 330.5 L 1659.5 330.5 L 1659.5 510.5 L 1637.5 510.5 Z M 1637.5 330.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 912.5 416.5 L 936.5 416.5 L 936.5 419.5 L 912.5 419.5 Z M 912.5 419.5 L 936.5 419.5 L 936.5 441.5 L 912.5 441.5 Z M 568.5 416.5 L 592.5 416.5 L 592.5 441.5 L 568.5 441.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="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>
@@ -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 1698.339844 391.058594 L 1696.363281 393.5 L 1691.945312 389.839844 L 1690.683594 390.511719 L 1689.421875 391.015625 L 1688.117188 391.4375 L 1686.730469 391.734375 L 1685.339844 391.902344 L 1683.910156 391.984375 L 1681.972656 391.859375 L 1680.164062 391.566406 L 1678.480469 391.058594 L 1676.882812 390.386719 L 1675.367188 389.503906 L 1674.023438 388.367188 L 1672.800781 387.148438 L 1671.75 385.757812 L 1670.90625 384.242188 L 1670.191406 382.601562 L 1669.644531 380.835938 L 1669.308594 378.898438 L 1669.226562 378.4375 L 1669.183594 377.933594 L 1669.140625 377.46875 L 1669.097656 376.964844 L 1669.097656 375.914062 L 1669.183594 373.808594 L 1669.476562 371.789062 L 1669.941406 369.9375 L 1670.613281 368.171875 L 1671.457031 366.53125 L 1672.550781 365.015625 L 1673.644531 363.792969 L 1674.90625 362.699219 L 1676.292969 361.773438 L 1677.765625 361.058594 L 1679.367188 360.46875 L 1681.132812 360.050781 L 1681.554688 360.007812 L 1682.015625 359.964844 L 1682.480469 359.921875 L 1682.941406 359.882812 L 1683.40625 359.882812 L 1683.910156 359.839844 L 1685.804688 359.964844 L 1687.613281 360.261719 L 1689.296875 360.765625 L 1690.894531 361.4375 L 1692.410156 362.320312 L 1693.796875 363.414062 L 1694.976562 364.679688 L 1696.027344 366.023438 L 1696.867188 367.496094 L 1697.585938 369.136719 L 1698.132812 370.90625 L 1698.511719 372.757812 L 1698.550781 373.304688 L 1698.636719 374.3125 L 1698.679688 374.820312 L 1698.679688 375.324219 L 1698.71875 375.828125 L 1698.59375 378.183594 L 1698.214844 380.414062 L 1697.625 382.476562 L 1696.785156 384.410156 L 1695.691406 386.179688 L 1694.386719 387.820312 Z M 1687.738281 382.390625 L 1691.484375 385.464844 L 1692.492188 384.203125 L 1693.335938 382.769531 L 1693.964844 381.214844 L 1694.429688 379.574219 L 1694.679688 377.804688 L 1694.808594 375.871094 L 1694.722656 374.101562 L 1694.46875 372.421875 L 1694.050781 370.863281 L 1693.503906 369.433594 L 1692.789062 368.085938 L 1691.902344 366.867188 L 1690.894531 365.855469 L 1689.84375 365.015625 L 1688.664062 364.339844 L 1687.402344 363.835938 L 1686.011719 363.5 L 1684.582031 363.289062 L 1683.910156 363.289062 L 1682.394531 363.414062 L 1680.964844 363.667969 L 1679.617188 364.089844 L 1678.398438 364.71875 L 1677.261719 365.519531 L 1676.25 366.488281 L 1675.285156 367.625 L 1674.527344 368.886719 L 1673.894531 370.273438 L 1673.433594 371.789062 L 1673.136719 373.429688 L 1673.011719 375.195312 L 1673.011719 375.914062 L 1673.054688 377.765625 L 1673.304688 379.445312 L 1673.726562 381.003906 L 1674.273438 382.476562 L 1675.03125 383.824219 L 1675.957031 385 L 1676.925781 386.050781 L 1678.019531 386.894531 L 1679.195312 387.566406 L 1680.460938 388.03125 L 1681.847656 388.367188 L 1683.320312 388.492188 L 1683.40625 388.535156 L 1684.625 388.535156 L 1685.425781 388.449219 L 1686.222656 388.28125 L 1686.980469 388.113281 L 1687.738281 387.863281 L 1688.539062 387.523438 L 1688.578125 387.523438 L 1688.664062 387.484375 L 1688.707031 387.441406 L 1688.789062 387.441406 L 1688.832031 387.398438 L 1688.917969 387.355469 L 1685.804688 384.75 Z M 1687.738281 382.390625 "/>
 <path style="fill:none;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 716 L 1694 716 M 1670 691 L 1694 691 M 1670 691 L 1670 716 M 1694 691 L 1694 716 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 716 L 1694 716 M 1670 691 L 1694 691 M 1694 716 L 1694 691 M 1670 716 L 1670 691 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,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/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.svg b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.svg
index 199ec52..ad0b3b1 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.svg
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 536.5 L 174.5 536.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image376" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image404" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image376"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="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="#image376"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1023.5 620.5 L 1043.5 620.5 L 1043.5 678.5 L 1023.5 678.5 Z M 969.5 620.5 L 990.5 620.5 L 990.5 678.5 L 969.5 678.5 Z M 899.5 620.5 L 920.5 620.5 L 920.5 678.5 L 899.5 678.5 Z M 548.5 624.5 L 569.5 624.5 L 569.5 682.5 L 548.5 682.5 Z M 277.5 624.5 L 298.5 624.5 L 298.5 682.5 L 277.5 682.5 Z M 356.5 624.5 L 376.5 624.5 L 376.5 682.5 L 356.5 682.5 Z M 405.5 624.5 L 426.5 624.5 L 426.5 682.5 L 405.5 682.5 Z M 620.5 624.5 L 640.5 624.5 L 640.5 682.5 L 620.5 682.5 Z M 499.5 624.5 L 519.5 624.5 L 519.5 682.5 L 499.5 682.5 Z M 1581.5 594.5 L 1602.5 594.5 L 1602.5 709.5 L 1581.5 709.5 Z M 1640.5 594.5 L 1661.5 594.5 L 1661.5 709.5 L 1640.5 709.5 Z M 1222.5 663.5 L 1243.5 663.5 L 1243.5 720.5 L 1222.5 720.5 Z M 1150.5 632.5 L 1171.5 632.5 L 1171.5 720.5 L 1150.5 720.5 Z M 1377.5 663.5 L 1397.5 663.5 L 1397.5 720.5 L 1377.5 720.5 Z M 1327.5 663.5 L 1348.5 663.5 L 1348.5 720.5 L 1327.5 720.5 Z M 1449.5 643.5 L 1469.5 643.5 L 1469.5 731.5 L 1449.5 731.5 Z M 751.5 674.5 L 771.5 674.5 L 771.5 731.5 L 751.5 731.5 Z M 751.5 674.5 "/>
 </clipPath>
-<image id="image377" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image405" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image377"/>
+  <use xlink:href="#image405"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1344.5 367.5 L 1365.5 367.5 L 1365.5 425.5 L 1344.5 425.5 Z M 1295.5 367.5 L 1316.5 367.5 L 1316.5 425.5 L 1295.5 425.5 Z M 405.5 341.5 L 426.5 341.5 L 426.5 429.5 L 405.5 429.5 Z M 464.5 341.5 L 485.5 341.5 L 485.5 429.5 L 464.5 429.5 Z M 286.5 341.5 L 306.5 341.5 L 306.5 429.5 L 286.5 429.5 Z M 356.5 341.5 L 376.5 341.5 L 376.5 429.5 L 356.5 429.5 Z M 599.5 341.5 L 620.5 341.5 L 620.5 429.5 L 599.5 429.5 Z M 529.5 341.5 L 549.5 341.5 L 549.5 429.5 L 529.5 429.5 Z M 767.5 353.5 L 787.5 353.5 L 787.5 441.5 L 767.5 441.5 Z M 901.5 396.5 L 922.5 396.5 L 922.5 454.5 L 901.5 454.5 Z M 1223.5 338.5 L 1243.5 338.5 L 1243.5 454.5 L 1223.5 454.5 Z M 1127.5 338.5 L 1147.5 338.5 L 1147.5 454.5 L 1127.5 454.5 Z M 960.5 396.5 L 981.5 396.5 L 981.5 454.5 L 960.5 454.5 Z M 1010.5 396.5 L 1030.5 396.5 L 1030.5 454.5 L 1010.5 454.5 Z M 1451.5 367.5 L 1471.5 367.5 L 1471.5 483.5 L 1451.5 483.5 Z M 1640.5 338.5 L 1661.5 338.5 L 1661.5 511.5 L 1640.5 511.5 Z M 1581.5 338.5 L 1602.5 338.5 L 1602.5 511.5 L 1581.5 511.5 Z M 1581.5 338.5 "/>
 </clipPath>
-<image id="image378" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image406" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image378"/>
+  <use xlink:href="#image406"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 222.5 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 421.5 L 905.5 421.5 L 905.5 422.5 L 881.5 422.5 Z M 881.5 422.5 L 905.5 422.5 L 905.5 445.5 L 881.5 445.5 Z M 552.5 421.5 L 575.5 421.5 L 575.5 445.5 L 552.5 445.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="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image407" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image379"/>
+  <use xlink:href="#image407"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface373">
+<g id="surface401">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -213,6 +213,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1634.3125 397.140625 L 1632.402344 399.5 L 1628.132812 395.960938 L 1626.910156 396.613281 L 1625.691406 397.101562 L 1624.429688 397.507812 L 1623.085938 397.792969 L 1621.746094 397.953125 L 1620.363281 398.035156 L 1618.492188 397.914062 L 1616.742188 397.628906 L 1615.117188 397.140625 L 1613.570312 396.488281 L 1612.105469 395.636719 L 1610.804688 394.539062 L 1609.625 393.359375 L 1608.609375 392.015625 L 1607.792969 390.550781 L 1607.101562 388.964844 L 1606.574219 387.257812 L 1606.25 385.386719 L 1606.167969 384.9375 L 1606.125 384.449219 L 1606.085938 384.003906 L 1606.046875 383.515625 L 1606.046875 382.5 L 1606.125 380.464844 L 1606.410156 378.511719 L 1606.859375 376.722656 L 1607.511719 375.015625 L 1608.324219 373.429688 L 1609.378906 371.964844 L 1610.4375 370.785156 L 1611.660156 369.726562 L 1613 368.832031 L 1614.425781 368.140625 L 1615.96875 367.570312 L 1617.679688 367.164062 L 1618.085938 367.125 L 1618.53125 367.082031 L 1618.980469 367.042969 L 1619.425781 367.003906 L 1619.875 367.003906 L 1620.363281 366.960938 L 1622.191406 367.082031 L 1623.941406 367.367188 L 1625.570312 367.855469 L 1627.113281 368.507812 L 1628.578125 369.359375 L 1629.921875 370.417969 L 1631.058594 371.640625 L 1632.078125 372.941406 L 1632.890625 374.363281 L 1633.582031 375.949219 L 1634.109375 377.660156 L 1634.476562 379.449219 L 1634.515625 379.976562 L 1634.558594 380.464844 L 1634.597656 380.953125 L 1634.640625 381.441406 L 1634.640625 381.929688 L 1634.679688 382.417969 L 1634.558594 384.695312 L 1634.191406 386.851562 L 1633.621094 388.84375 L 1632.808594 390.714844 L 1631.75 392.421875 L 1630.488281 394.007812 Z M 1624.0625 388.761719 L 1627.683594 391.730469 L 1628.660156 390.511719 L 1629.472656 389.128906 L 1630.082031 387.625 L 1630.53125 386.039062 L 1630.773438 384.328125 L 1630.898438 382.457031 L 1630.816406 380.75 L 1630.570312 379.121094 L 1630.164062 377.617188 L 1629.636719 376.234375 L 1628.945312 374.933594 L 1628.089844 373.753906 L 1627.113281 372.777344 L 1626.097656 371.964844 L 1624.957031 371.3125 L 1623.738281 370.824219 L 1622.394531 370.5 L 1621.011719 370.296875 L 1620.363281 370.296875 L 1618.898438 370.417969 L 1617.515625 370.664062 L 1616.214844 371.070312 L 1615.035156 371.679688 L 1613.9375 372.453125 L 1612.960938 373.386719 L 1612.023438 374.484375 L 1611.292969 375.707031 L 1610.683594 377.046875 L 1610.234375 378.511719 L 1609.949219 380.097656 L 1609.828125 381.808594 L 1609.828125 382.5 L 1609.867188 384.289062 L 1610.113281 385.914062 L 1610.519531 387.421875 L 1611.046875 388.84375 L 1611.78125 390.144531 L 1612.675781 391.285156 L 1613.609375 392.300781 L 1614.667969 393.113281 L 1615.808594 393.765625 L 1617.027344 394.210938 L 1618.371094 394.539062 L 1619.792969 394.660156 L 1619.875 394.699219 L 1621.054688 394.699219 L 1621.828125 394.621094 L 1622.597656 394.457031 L 1623.332031 394.292969 L 1624.0625 394.050781 L 1624.835938 393.722656 L 1624.878906 393.722656 L 1624.957031 393.683594 L 1625 393.644531 L 1625.082031 393.644531 L 1625.121094 393.601562 L 1625.203125 393.5625 L 1622.191406 391.039062 Z M 1624.0625 388.761719 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 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/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.svg b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.svg
index ad8c55e..83d8fe7 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.svg
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 299.5 L 1744.5 299.5 L 1744.5 536.5 L 174.5 536.5 Z M 1306.5 536.5 L 1440.5 536.5 L 1440.5 554.5 L 1306.5 554.5 Z M 1306.5 536.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 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="#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 961.5 613.5 L 980.5 613.5 L 980.5 666.5 L 961.5 666.5 Z M 847.5 613.5 L 866.5 613.5 L 866.5 666.5 L 847.5 666.5 Z M 904.5 613.5 L 923.5 613.5 L 923.5 666.5 L 904.5 666.5 Z M 485.5 614.5 L 504.5 614.5 L 504.5 668.5 L 485.5 668.5 Z M 586.5 614.5 L 605.5 614.5 L 605.5 668.5 L 586.5 668.5 Z M 531.5 614.5 L 550.5 614.5 L 550.5 668.5 L 531.5 668.5 Z M 344.5 614.5 L 363.5 614.5 L 363.5 668.5 L 344.5 668.5 Z M 407.5 614.5 L 426.5 614.5 L 426.5 668.5 L 407.5 668.5 Z M 290.5 614.5 L 309.5 614.5 L 309.5 668.5 L 290.5 668.5 Z M 1084.5 626.5 L 1103.5 626.5 L 1103.5 707.5 L 1084.5 707.5 Z M 1153.5 654.5 L 1172.5 654.5 L 1172.5 707.5 L 1153.5 707.5 Z M 1292.5 654.5 L 1311.5 654.5 L 1311.5 707.5 L 1292.5 707.5 Z M 1238.5 654.5 L 1257.5 654.5 L 1257.5 707.5 L 1238.5 707.5 Z M 1485.5 607.5 L 1504.5 607.5 L 1504.5 713.5 L 1485.5 713.5 Z M 1649.5 607.5 L 1668.5 607.5 L 1668.5 713.5 L 1649.5 713.5 Z M 1594.5 607.5 L 1613.5 607.5 L 1613.5 713.5 L 1594.5 713.5 Z M 718.5 660.5 L 737.5 660.5 L 737.5 713.5 L 718.5 713.5 Z M 1539.5 607.5 L 1559.5 607.5 L 1559.5 713.5 L 1539.5 713.5 Z M 1358.5 609.5 L 1377.5 609.5 L 1377.5 716.5 L 1358.5 716.5 Z M 1358.5 609.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 1259.5 371.5 L 1278.5 371.5 L 1278.5 424.5 L 1259.5 424.5 Z M 1213.5 371.5 L 1232.5 371.5 L 1232.5 424.5 L 1213.5 424.5 Z M 367.5 353.5 L 386.5 353.5 L 386.5 434.5 L 367.5 434.5 Z M 467.5 353.5 L 486.5 353.5 L 486.5 434.5 L 467.5 434.5 Z M 527.5 353.5 L 546.5 353.5 L 546.5 434.5 L 527.5 434.5 Z M 312.5 353.5 L 331.5 353.5 L 331.5 434.5 L 312.5 434.5 Z M 586.5 353.5 L 605.5 353.5 L 605.5 434.5 L 586.5 434.5 Z M 413.5 353.5 L 432.5 353.5 L 432.5 434.5 L 413.5 434.5 Z M 740.5 360.5 L 759.5 360.5 L 759.5 441.5 L 740.5 441.5 Z M 861.5 399.5 L 880.5 399.5 L 880.5 452.5 L 861.5 452.5 Z M 939.5 408.5 L 958.5 408.5 L 958.5 461.5 L 939.5 461.5 Z M 985.5 408.5 L 1004.5 408.5 L 1004.5 461.5 L 985.5 461.5 Z M 1060.5 355.5 L 1079.5 355.5 L 1079.5 461.5 L 1060.5 461.5 Z M 1114.5 355.5 L 1133.5 355.5 L 1133.5 461.5 L 1114.5 461.5 Z M 1649.5 353.5 L 1668.5 353.5 L 1668.5 513.5 L 1649.5 513.5 Z M 1539.5 353.5 L 1559.5 353.5 L 1559.5 513.5 L 1539.5 513.5 Z M 1485.5 353.5 L 1504.5 353.5 L 1504.5 513.5 L 1485.5 513.5 Z M 1594.5 353.5 L 1613.5 353.5 L 1613.5 513.5 L 1594.5 513.5 Z M 1365.5 371.5 L 1384.5 371.5 L 1384.5 531.5 L 1365.5 531.5 Z M 1365.5 371.5 "/>
 </clipPath>
-<image id="image351" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image379" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image351"/>
+  <use xlink:href="#image379"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 826.5 430.5 L 848.5 430.5 L 848.5 445.5 L 826.5 445.5 Z M 826.5 445.5 L 848.5 445.5 L 848.5 452.5 L 826.5 452.5 Z M 522.5 430.5 L 544.5 430.5 L 544.5 452.5 L 522.5 452.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="image352" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image380" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image352"/>
+  <use xlink:href="#image380"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface346">
+<g id="surface374">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -190,6 +190,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 1703.230469 595.386719 L 1701.515625 597.5 L 1697.6875 594.328125 L 1696.59375 594.910156 L 1695.5 595.347656 L 1694.367188 595.714844 L 1693.164062 595.96875 L 1691.960938 596.113281 L 1690.722656 596.1875 L 1689.042969 596.078125 L 1687.476562 595.824219 L 1686.015625 595.386719 L 1684.632812 594.800781 L 1683.320312 594.035156 L 1682.152344 593.050781 L 1681.09375 591.992188 L 1680.183594 590.789062 L 1679.453125 589.476562 L 1678.832031 588.054688 L 1678.359375 586.523438 L 1678.066406 584.847656 L 1677.996094 584.445312 L 1677.957031 584.007812 L 1677.921875 583.605469 L 1677.886719 583.167969 L 1677.886719 582.257812 L 1677.957031 580.433594 L 1678.214844 578.683594 L 1678.613281 577.078125 L 1679.199219 575.546875 L 1679.929688 574.125 L 1680.875 572.8125 L 1681.824219 571.753906 L 1682.917969 570.808594 L 1684.121094 570.003906 L 1685.398438 569.386719 L 1686.785156 568.875 L 1688.316406 568.511719 L 1688.679688 568.472656 L 1689.082031 568.4375 L 1689.480469 568.402344 L 1689.882812 568.363281 L 1690.285156 568.363281 L 1690.722656 568.328125 L 1692.363281 568.4375 L 1693.929688 568.691406 L 1695.390625 569.128906 L 1696.773438 569.714844 L 1698.085938 570.480469 L 1699.292969 571.425781 L 1700.3125 572.519531 L 1701.222656 573.6875 L 1701.953125 574.964844 L 1702.574219 576.386719 L 1703.046875 577.917969 L 1703.375 579.523438 L 1703.410156 579.996094 L 1703.449219 580.433594 L 1703.519531 581.308594 L 1703.519531 581.746094 L 1703.558594 582.183594 L 1703.449219 584.226562 L 1703.121094 586.160156 L 1702.609375 587.945312 L 1701.878906 589.625 L 1700.933594 591.15625 L 1699.800781 592.578125 Z M 1694.039062 587.875 L 1697.285156 590.535156 L 1698.160156 589.441406 L 1698.890625 588.203125 L 1699.4375 586.851562 L 1699.839844 585.429688 L 1700.058594 583.898438 L 1700.167969 582.222656 L 1700.09375 580.6875 L 1699.875 579.230469 L 1699.511719 577.882812 L 1699.035156 576.640625 L 1698.414062 575.476562 L 1697.648438 574.417969 L 1696.773438 573.542969 L 1695.863281 572.8125 L 1694.84375 572.230469 L 1693.75 571.792969 L 1692.542969 571.5 L 1691.304688 571.316406 L 1690.722656 571.316406 L 1689.410156 571.425781 L 1688.167969 571.644531 L 1687.003906 572.011719 L 1685.945312 572.558594 L 1684.960938 573.25 L 1684.085938 574.089844 L 1683.246094 575.074219 L 1682.589844 576.167969 L 1682.042969 577.371094 L 1681.640625 578.683594 L 1681.386719 580.105469 L 1681.277344 581.636719 L 1681.277344 582.257812 L 1681.3125 583.863281 L 1681.53125 585.320312 L 1681.898438 586.667969 L 1682.371094 587.945312 L 1683.027344 589.113281 L 1683.828125 590.132812 L 1684.667969 591.046875 L 1685.617188 591.773438 L 1686.636719 592.359375 L 1687.730469 592.757812 L 1688.933594 593.050781 L 1690.210938 593.160156 L 1690.285156 593.195312 L 1691.339844 593.195312 L 1692.035156 593.125 L 1692.726562 592.976562 L 1693.382812 592.832031 L 1694.039062 592.613281 L 1694.734375 592.320312 L 1694.769531 592.320312 L 1694.84375 592.285156 L 1694.878906 592.25 L 1694.953125 592.25 L 1694.988281 592.210938 L 1695.0625 592.175781 L 1692.363281 589.914062 Z M 1694.039062 587.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 1678 508 L 1700 508 M 1678 487 L 1700 487 M 1678 487 L 1678 508 M 1700 487 L 1700 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 1678 508 L 1700 508 M 1678 487 L 1700 487 M 1700 508 L 1700 487 M 1678 508 L 1678 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/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.svg b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.svg
index b8d5afb..1c025cf 100644
--- a/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.svg
+++ b/cells/sdfxtp/sky130_fd_sc_lp__sdfxtp_lp.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 606.5 535.5 L 1518.5 535.5 L 1518.5 539.5 L 606.5 539.5 Z M 606.5 539.5 L 1329.5 539.5 L 1329.5 546.5 L 606.5 546.5 Z M 606.5 539.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 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="#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 1319.5 586.5 L 1336.5 586.5 L 1336.5 632.5 L 1319.5 632.5 Z M 948.5 586.5 L 965.5 586.5 L 965.5 632.5 L 948.5 632.5 Z M 1272.5 586.5 L 1289.5 586.5 L 1289.5 632.5 L 1272.5 632.5 Z M 872.5 586.5 L 888.5 586.5 L 888.5 632.5 L 872.5 632.5 Z M 414.5 602.5 L 430.5 602.5 L 430.5 648.5 L 414.5 648.5 Z M 1123.5 602.5 L 1140.5 602.5 L 1140.5 648.5 L 1123.5 648.5 Z M 1060.5 602.5 L 1076.5 602.5 L 1076.5 648.5 L 1060.5 648.5 Z M 309.5 602.5 L 325.5 602.5 L 325.5 648.5 L 309.5 648.5 Z M 266.5 602.5 L 282.5 602.5 L 282.5 648.5 L 266.5 648.5 Z M 470.5 602.5 L 486.5 602.5 L 486.5 648.5 L 470.5 648.5 Z M 1163.5 602.5 L 1179.5 602.5 L 1179.5 648.5 L 1163.5 648.5 Z M 520.5 602.5 L 537.5 602.5 L 537.5 648.5 L 520.5 648.5 Z M 371.5 602.5 L 388.5 602.5 L 388.5 648.5 L 371.5 648.5 Z M 1426.5 633.5 L 1442.5 633.5 L 1442.5 679.5 L 1426.5 679.5 Z M 1512.5 633.5 L 1529.5 633.5 L 1529.5 679.5 L 1512.5 679.5 Z M 1473.5 633.5 L 1489.5 633.5 L 1489.5 679.5 L 1473.5 679.5 Z M 1660.5 633.5 L 1676.5 633.5 L 1676.5 679.5 L 1660.5 679.5 Z M 1621.5 633.5 L 1637.5 633.5 L 1637.5 679.5 L 1621.5 679.5 Z M 715.5 635.5 L 732.5 635.5 L 732.5 681.5 L 715.5 681.5 Z M 755.5 635.5 L 771.5 635.5 L 771.5 681.5 L 755.5 681.5 Z M 668.5 635.5 L 684.5 635.5 L 684.5 681.5 L 668.5 681.5 Z M 629.5 635.5 L 645.5 635.5 L 645.5 681.5 L 629.5 681.5 Z M 629.5 635.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 528.5 378.5 L 556.5 378.5 L 556.5 488.5 L 528.5 488.5 Z M 360.5 378.5 L 388.5 378.5 L 388.5 488.5 L 360.5 488.5 Z M 470.5 378.5 L 497.5 378.5 L 497.5 488.5 L 470.5 488.5 Z M 418.5 378.5 L 446.5 378.5 L 446.5 488.5 L 418.5 488.5 Z M 241.5 383.5 L 269.5 383.5 L 269.5 492.5 L 241.5 492.5 Z M 1649.5 394.5 L 1676.5 394.5 L 1676.5 504.5 L 1649.5 504.5 Z M 1374.5 409.5 L 1401.5 409.5 L 1401.5 519.5 L 1374.5 519.5 Z M 1317.5 409.5 L 1345.5 409.5 L 1345.5 519.5 L 1317.5 519.5 Z M 1440.5 409.5 L 1467.5 409.5 L 1467.5 519.5 L 1440.5 519.5 Z M 948.5 417.5 L 975.5 417.5 L 975.5 527.5 L 948.5 527.5 Z M 1241.5 417.5 L 1269.5 417.5 L 1269.5 527.5 L 1241.5 527.5 Z M 657.5 417.5 L 684.5 417.5 L 684.5 527.5 L 657.5 527.5 Z M 715.5 417.5 L 743.5 417.5 L 743.5 527.5 L 715.5 527.5 Z M 1165.5 417.5 L 1192.5 417.5 L 1192.5 527.5 L 1165.5 527.5 Z M 1006.5 417.5 L 1033.5 417.5 L 1033.5 527.5 L 1006.5 527.5 Z M 1060.5 417.5 L 1087.5 417.5 L 1087.5 527.5 L 1060.5 527.5 Z M 1060.5 417.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 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="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>
@@ -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 659.210938 578.53125 L 659.210938 586.757812 L 656.210938 586.757812 L 656.210938 563.242188 L 659.210938 563.242188 L 659.210938 575.144531 L 670.917969 563.242188 L 674.789062 563.242188 L 665.210938 572.824219 L 674.886719 586.757812 L 671.339844 586.757812 L 663.046875 574.695312 Z M 659.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 633 514 L 652 514 M 633 495 L 652 495 M 633 495 L 633 514 M 652 495 L 652 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 633 514 L 652 514 M 633 495 L 652 495 M 652 514 L 652 495 M 633 514 L 633 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/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.svg b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.svg
index 4d4f5d6..4e73c96 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_1.svg
+++ b/cells/sdlclkp/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 989.5 538.5 L 1191.5 538.5 L 1191.5 544.5 L 989.5 544.5 Z M 989.5 538.5 "/>
 </clipPath>
-<image id="image445" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image471" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image445"/>
+  <use xlink:href="#image471"/>
 </pattern>
 <mask 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="#image445"/>
+  <use xlink:href="#image471"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 954.5 649.5 L 983.5 649.5 L 983.5 731.5 L 954.5 731.5 Z M 788.5 649.5 L 818.5 649.5 L 818.5 731.5 L 788.5 731.5 Z M 884.5 649.5 L 913.5 649.5 L 913.5 731.5 L 884.5 731.5 Z M 507.5 711.5 L 536.5 711.5 L 536.5 793.5 L 507.5 793.5 Z M 416.5 711.5 L 445.5 711.5 L 445.5 793.5 L 416.5 793.5 Z M 332.5 711.5 L 361.5 711.5 L 361.5 793.5 L 332.5 793.5 Z M 1344.5 728.5 L 1373.5 728.5 L 1373.5 809.5 L 1344.5 809.5 Z M 1414.5 728.5 L 1443.5 728.5 L 1443.5 809.5 L 1414.5 809.5 Z M 1260.5 728.5 L 1290.5 728.5 L 1290.5 809.5 L 1260.5 809.5 Z M 1069.5 649.5 L 1098.5 649.5 L 1098.5 812.5 L 1069.5 812.5 Z M 1599.5 651.5 L 1628.5 651.5 L 1628.5 814.5 L 1599.5 814.5 Z M 1599.5 651.5 "/>
 </clipPath>
-<image id="image446" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image472" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image446"/>
+  <use xlink:href="#image472"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 359.5 280.5 L 388.5 280.5 L 388.5 404.5 L 359.5 404.5 Z M 289.5 280.5 L 318.5 280.5 L 318.5 404.5 L 289.5 404.5 Z M 898.5 328.5 L 928.5 328.5 L 928.5 409.5 L 898.5 409.5 Z M 968.5 328.5 L 998.5 328.5 L 998.5 409.5 L 968.5 409.5 Z M 815.5 328.5 L 844.5 328.5 L 844.5 409.5 L 815.5 409.5 Z M 602.5 337.5 L 632.5 337.5 L 632.5 462.5 L 602.5 462.5 Z M 1380.5 378.5 L 1409.5 378.5 L 1409.5 503.5 L 1380.5 503.5 Z M 1265.5 378.5 L 1295.5 378.5 L 1295.5 503.5 L 1265.5 503.5 Z M 1464.5 378.5 L 1493.5 378.5 L 1493.5 503.5 L 1464.5 503.5 Z M 1563.5 258.5 L 1592.5 258.5 L 1592.5 503.5 L 1563.5 503.5 Z M 1076.5 263.5 L 1105.5 263.5 L 1105.5 509.5 L 1076.5 509.5 Z M 1076.5 263.5 "/>
 </clipPath>
-<image id="image447" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image473" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image447"/>
+  <use xlink:href="#image473"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image448" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image474" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image448"/>
+  <use xlink:href="#image474"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface442">
+<g id="surface468">
 <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 1712.445312 326.515625 L 1712.445312 341.175781 L 1707.097656 341.175781 L 1707.097656 299.257812 L 1712.445312 299.257812 L 1712.445312 320.476562 L 1733.320312 299.257812 L 1740.21875 299.257812 L 1723.140625 316.335938 L 1740.390625 341.175781 L 1734.066406 341.175781 L 1719.289062 319.671875 Z M 1712.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 1643 776 L 1676 776 M 1643 743 L 1676 743 M 1643 743 L 1643 776 M 1676 743 L 1676 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 1643 776 L 1676 776 M 1643 743 L 1676 743 M 1676 776 L 1676 743 M 1643 776 L 1643 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/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.svg b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.svg
index 25cdbdb..35577ec 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_2.svg
+++ b/cells/sdlclkp/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 948.5 538.5 L 1139.5 538.5 L 1139.5 539.5 L 948.5 539.5 Z M 948.5 538.5 "/>
 </clipPath>
-<image id="image386" 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="#image386"/>
+  <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 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="#image386"/>
+  <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 891.5 642.5 L 919.5 642.5 L 919.5 720.5 L 891.5 720.5 Z M 746.5 642.5 L 773.5 642.5 L 773.5 720.5 L 746.5 720.5 Z M 825.5 642.5 L 853.5 642.5 L 853.5 720.5 L 825.5 720.5 Z M 1182.5 697.5 L 1209.5 697.5 L 1209.5 774.5 L 1182.5 774.5 Z M 1261.5 697.5 L 1288.5 697.5 L 1288.5 774.5 L 1261.5 774.5 Z M 1327.5 697.5 L 1354.5 697.5 L 1354.5 774.5 L 1327.5 774.5 Z M 441.5 700.5 L 468.5 700.5 L 468.5 777.5 L 441.5 777.5 Z M 362.5 700.5 L 389.5 700.5 L 389.5 777.5 L 362.5 777.5 Z M 283.5 700.5 L 310.5 700.5 L 310.5 777.5 L 283.5 777.5 Z M 1525.5 637.5 L 1553.5 637.5 L 1553.5 791.5 L 1525.5 791.5 Z M 1604.5 637.5 L 1632.5 637.5 L 1632.5 791.5 L 1604.5 791.5 Z M 1000.5 642.5 L 1027.5 642.5 L 1027.5 797.5 L 1000.5 797.5 Z M 1000.5 642.5 "/>
 </clipPath>
-<image id="image387" 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="#image387"/>
+  <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 349.5 294.5 L 376.5 294.5 L 376.5 412.5 L 349.5 412.5 Z M 283.5 294.5 L 310.5 294.5 L 310.5 412.5 L 283.5 412.5 Z M 933.5 344.5 L 961.5 344.5 L 961.5 422.5 L 933.5 422.5 Z M 867.5 344.5 L 895.5 344.5 L 895.5 422.5 L 867.5 422.5 Z M 788.5 344.5 L 816.5 344.5 L 816.5 422.5 L 788.5 422.5 Z M 1208.5 330.5 L 1236.5 330.5 L 1236.5 447.5 L 1208.5 447.5 Z M 1317.5 330.5 L 1344.5 330.5 L 1344.5 447.5 L 1317.5 447.5 Z M 1396.5 330.5 L 1423.5 330.5 L 1423.5 447.5 L 1396.5 447.5 Z M 559.5 341.5 L 587.5 341.5 L 587.5 458.5 L 559.5 458.5 Z M 1525.5 273.5 L 1553.5 273.5 L 1553.5 504.5 L 1525.5 504.5 Z M 1604.5 273.5 L 1632.5 273.5 L 1632.5 504.5 L 1604.5 504.5 Z M 1030.5 275.5 L 1057.5 275.5 L 1057.5 506.5 L 1030.5 506.5 Z M 1030.5 275.5 "/>
 </clipPath>
-<image id="image388" 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="#image388"/>
+  <use xlink:href="#image415"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 238.5 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="image389" 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="#image389"/>
+  <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="surface383">
+<g id="surface410">
 <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 1627.203125 541.292969 L 1627.203125 555.242188 L 1622.117188 555.242188 L 1622.117188 515.367188 L 1627.203125 515.367188 L 1627.203125 535.550781 L 1647.058594 515.367188 L 1653.625 515.367188 L 1637.378906 531.613281 L 1653.789062 555.242188 L 1647.769531 555.242188 L 1633.714844 534.785156 Z M 1627.203125 541.292969 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1561 559 L 1592 559 M 1561 528 L 1592 528 M 1561 528 L 1561 559 M 1592 528 L 1592 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 1561 559 L 1592 559 M 1561 528 L 1592 528 M 1592 559 L 1592 528 M 1561 559 L 1561 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_lp__sdlclkp_4.svg b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.svg
index 335c171..e2c5611 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.svg
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_4.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 537.5 L 175.5 537.5 Z M 886.5 537.5 L 1061.5 537.5 L 1061.5 560.5 L 886.5 560.5 Z M 886.5 537.5 "/>
 </clipPath>
-<image id="image476" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image503" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image476"/>
+  <use xlink:href="#image503"/>
 </pattern>
 <mask 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="#image476"/>
+  <use xlink:href="#image503"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 835.5 631.5 L 860.5 631.5 L 860.5 700.5 L 835.5 700.5 Z M 705.5 631.5 L 730.5 631.5 L 730.5 700.5 L 705.5 700.5 Z M 776.5 631.5 L 801.5 631.5 L 801.5 700.5 L 776.5 700.5 Z M 369.5 683.5 L 394.5 683.5 L 394.5 752.5 L 369.5 752.5 Z M 458.5 683.5 L 483.5 683.5 L 483.5 752.5 L 458.5 752.5 Z M 292.5 683.5 L 317.5 683.5 L 317.5 752.5 L 292.5 752.5 Z M 938.5 631.5 L 963.5 631.5 L 963.5 770.5 L 938.5 770.5 Z M 1403.5 633.5 L 1428.5 633.5 L 1428.5 771.5 L 1403.5 771.5 Z M 1474.5 633.5 L 1499.5 633.5 L 1499.5 771.5 L 1474.5 771.5 Z M 1545.5 633.5 L 1570.5 633.5 L 1570.5 771.5 L 1545.5 771.5 Z M 1616.5 633.5 L 1641.5 633.5 L 1641.5 771.5 L 1616.5 771.5 Z M 1099.5 702.5 L 1123.5 702.5 L 1123.5 771.5 L 1099.5 771.5 Z M 1245.5 633.5 L 1270.5 633.5 L 1270.5 771.5 L 1245.5 771.5 Z M 1185.5 633.5 L 1210.5 633.5 L 1210.5 771.5 L 1185.5 771.5 Z M 1185.5 633.5 "/>
 </clipPath>
-<image id="image477" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image504" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image477"/>
+  <use xlink:href="#image504"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 332.5 318.5 L 356.5 318.5 L 356.5 424.5 L 332.5 424.5 Z M 272.5 318.5 L 297.5 318.5 L 297.5 424.5 L 272.5 424.5 Z M 835.5 359.5 L 860.5 359.5 L 860.5 428.5 L 835.5 428.5 Z M 705.5 359.5 L 730.5 359.5 L 730.5 428.5 L 705.5 428.5 Z M 776.5 359.5 L 801.5 359.5 L 801.5 428.5 L 776.5 428.5 Z M 529.5 364.5 L 554.5 364.5 L 554.5 469.5 L 529.5 469.5 Z M 1234.5 299.5 L 1259.5 299.5 L 1259.5 507.5 L 1234.5 507.5 Z M 1535.5 299.5 L 1560.5 299.5 L 1560.5 507.5 L 1535.5 507.5 Z M 1606.5 299.5 L 1631.5 299.5 L 1631.5 507.5 L 1606.5 507.5 Z M 1147.5 402.5 L 1172.5 402.5 L 1172.5 507.5 L 1147.5 507.5 Z M 1464.5 299.5 L 1489.5 299.5 L 1489.5 507.5 L 1464.5 507.5 Z M 1305.5 299.5 L 1330.5 299.5 L 1330.5 507.5 L 1305.5 507.5 Z M 1393.5 299.5 L 1418.5 299.5 L 1418.5 507.5 L 1393.5 507.5 Z M 963.5 322.5 L 988.5 322.5 L 988.5 530.5 L 963.5 530.5 Z M 963.5 322.5 "/>
 </clipPath>
-<image id="image478" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image505" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image478"/>
+  <use xlink:href="#image505"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 232.5 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="image479" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image506" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image479"/>
+  <use xlink:href="#image506"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface473">
+<g id="surface500">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -245,6 +245,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 275.570312 415.074219 L 275.570312 427.347656 L 296.675781 427.347656 L 296.675781 431.371094 L 271.003906 431.371094 L 271.003906 395.585938 L 295.792969 395.585938 L 295.792969 399.609375 L 275.570312 399.609375 L 275.570312 411.046875 L 295.058594 411.046875 L 295.058594 415.074219 Z M 275.570312 415.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 232 680 L 260 680 M 232 652 L 260 652 M 232 652 L 232 680 M 260 652 L 260 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 232 680 L 260 680 M 232 652 L 260 652 M 260 680 L 260 652 M 232 680 L 232 652 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.svg b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.svg
index de680ad..d49f057 100644
--- a/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.svg
+++ b/cells/sdlclkp/sky130_fd_sc_lp__sdlclkp_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 213.5 L 1743.5 213.5 L 1743.5 526.5 L 174.5 526.5 Z M 1595.5 526.5 L 1743.5 526.5 L 1743.5 537.5 L 1595.5 537.5 Z M 174.5 526.5 L 1146.5 526.5 L 1146.5 537.5 L 174.5 537.5 Z M 545.5 537.5 L 1146.5 537.5 L 1146.5 548.5 L 545.5 548.5 Z M 545.5 537.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask 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="#image382"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1392.5 585.5 L 1418.5 585.5 L 1418.5 658.5 L 1392.5 658.5 Z M 1317.5 585.5 L 1343.5 585.5 L 1343.5 658.5 L 1317.5 658.5 Z M 1254.5 585.5 L 1281.5 585.5 L 1281.5 658.5 L 1254.5 658.5 Z M 1460.5 585.5 L 1486.5 585.5 L 1486.5 658.5 L 1460.5 658.5 Z M 560.5 664.5 L 586.5 664.5 L 586.5 737.5 L 560.5 737.5 Z M 623.5 664.5 L 649.5 664.5 L 649.5 737.5 L 623.5 737.5 Z M 485.5 664.5 L 512.5 664.5 L 512.5 737.5 L 485.5 737.5 Z M 280.5 664.5 L 306.5 664.5 L 306.5 737.5 L 280.5 737.5 Z M 423.5 664.5 L 449.5 664.5 L 449.5 737.5 L 423.5 737.5 Z M 348.5 664.5 L 374.5 664.5 L 374.5 737.5 L 348.5 737.5 Z M 1528.5 710.5 L 1554.5 710.5 L 1554.5 783.5 L 1528.5 783.5 Z M 1590.5 710.5 L 1616.5 710.5 L 1616.5 783.5 L 1590.5 783.5 Z M 1065.5 711.5 L 1091.5 711.5 L 1091.5 784.5 L 1065.5 784.5 Z M 887.5 711.5 L 913.5 711.5 L 913.5 784.5 L 887.5 784.5 Z M 1133.5 711.5 L 1159.5 711.5 L 1159.5 784.5 L 1133.5 784.5 Z M 955.5 711.5 L 981.5 711.5 L 981.5 784.5 L 955.5 784.5 Z M 813.5 711.5 L 839.5 711.5 L 839.5 784.5 L 813.5 784.5 Z M 813.5 711.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image409"/>
 </pattern>
 <mask id="mask2">
 <rect 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 289.5 L 1411.5 289.5 L 1411.5 463.5 L 1368.5 463.5 Z M 1460.5 289.5 L 1503.5 289.5 L 1503.5 463.5 L 1460.5 463.5 Z M 1275.5 289.5 L 1319.5 289.5 L 1319.5 463.5 L 1275.5 463.5 Z M 1580.5 289.5 L 1623.5 289.5 L 1623.5 463.5 L 1580.5 463.5 Z M 771.5 299.5 L 814.5 299.5 L 814.5 473.5 L 771.5 473.5 Z M 1053.5 299.5 L 1097.5 299.5 L 1097.5 473.5 L 1053.5 473.5 Z M 863.5 299.5 L 906.5 299.5 L 906.5 473.5 L 863.5 473.5 Z M 955.5 299.5 L 999.5 299.5 L 999.5 473.5 L 955.5 473.5 Z M 423.5 324.5 L 466.5 324.5 L 466.5 498.5 L 423.5 498.5 Z M 552.5 324.5 L 596.5 324.5 L 596.5 498.5 L 552.5 498.5 Z M 338.5 324.5 L 381.5 324.5 L 381.5 498.5 L 338.5 498.5 Z M 338.5 324.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface379">
+<g id="surface405">
 <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 295.398438 601.574219 L 295.398438 614.199219 L 317.109375 614.199219 L 317.109375 618.339844 L 290.703125 618.339844 L 290.703125 581.53125 L 316.199219 581.53125 L 316.199219 585.671875 L 295.398438 585.671875 L 295.398438 597.433594 L 315.441406 597.433594 L 315.441406 601.574219 Z M 295.398438 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 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/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.svg b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.svg
index 91d4965..d34b6bf 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.svg
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_14.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 248.5 L 1743.5 248.5 L 1743.5 556.5 L 175.5 556.5 Z M 175.5 248.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 380.5 362.5 L 1536.5 362.5 L 1536.5 387.5 L 380.5 387.5 Z M 380.5 433.5 L 1536.5 433.5 L 1536.5 458.5 L 380.5 458.5 Z M 380.5 433.5 "/>
 </clipPath>
-<image id="image333" 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="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -39,9 +39,9 @@
 <clipPath id="clip8">
   <path d="M 232.5 265.5 L 260.5 265.5 L 260.5 293.5 L 232.5 293.5 Z M 1658.5 265.5 L 1686.5 265.5 L 1686.5 293.5 L 1658.5 293.5 Z M 1579.5 265.5 L 1607.5 265.5 L 1607.5 293.5 L 1579.5 293.5 Z M 1500.5 265.5 L 1528.5 265.5 L 1528.5 293.5 L 1500.5 293.5 Z M 1421.5 265.5 L 1449.5 265.5 L 1449.5 293.5 L 1421.5 293.5 Z M 1341.5 265.5 L 1369.5 265.5 L 1369.5 293.5 L 1341.5 293.5 Z M 1262.5 265.5 L 1290.5 265.5 L 1290.5 293.5 L 1262.5 293.5 Z M 1183.5 265.5 L 1211.5 265.5 L 1211.5 293.5 L 1183.5 293.5 Z M 1104.5 265.5 L 1132.5 265.5 L 1132.5 293.5 L 1104.5 293.5 Z M 1024.5 265.5 L 1052.5 265.5 L 1052.5 293.5 L 1024.5 293.5 Z M 945.5 265.5 L 973.5 265.5 L 973.5 293.5 L 945.5 293.5 Z M 866.5 265.5 L 894.5 265.5 L 894.5 293.5 L 866.5 293.5 Z M 787.5 265.5 L 815.5 265.5 L 815.5 293.5 L 787.5 293.5 Z M 707.5 265.5 L 735.5 265.5 L 735.5 293.5 L 707.5 293.5 Z M 628.5 265.5 L 656.5 265.5 L 656.5 293.5 L 628.5 293.5 Z M 549.5 265.5 L 577.5 265.5 L 577.5 293.5 L 549.5 293.5 Z M 469.5 265.5 L 498.5 265.5 L 498.5 293.5 L 469.5 293.5 Z M 390.5 265.5 L 418.5 265.5 L 418.5 293.5 L 390.5 293.5 Z M 311.5 265.5 L 339.5 265.5 L 339.5 293.5 L 311.5 293.5 Z M 519.5 325.5 L 547.5 325.5 L 547.5 353.5 L 519.5 353.5 Z M 1349.5 325.5 L 1377.5 325.5 L 1377.5 353.5 L 1349.5 353.5 Z M 1289.5 325.5 L 1317.5 325.5 L 1317.5 353.5 L 1289.5 353.5 Z M 1092.5 325.5 L 1120.5 325.5 L 1120.5 353.5 L 1092.5 353.5 Z M 1033.5 325.5 L 1061.5 325.5 L 1061.5 353.5 L 1033.5 353.5 Z M 835.5 325.5 L 863.5 325.5 L 863.5 353.5 L 835.5 353.5 Z M 776.5 325.5 L 804.5 325.5 L 804.5 353.5 L 776.5 353.5 Z M 578.5 325.5 L 607.5 325.5 L 607.5 353.5 L 578.5 353.5 Z M 390.5 396.5 L 418.5 396.5 L 418.5 424.5 L 390.5 424.5 Z M 1480.5 396.5 L 1508.5 396.5 L 1508.5 424.5 L 1480.5 424.5 Z M 1421.5 396.5 L 1449.5 396.5 L 1449.5 424.5 L 1421.5 424.5 Z M 1220.5 396.5 L 1248.5 396.5 L 1248.5 424.5 L 1220.5 424.5 Z M 1161.5 396.5 L 1189.5 396.5 L 1189.5 424.5 L 1161.5 424.5 Z M 963.5 396.5 L 991.5 396.5 L 991.5 424.5 L 963.5 424.5 Z M 904.5 396.5 L 932.5 396.5 L 932.5 424.5 L 904.5 424.5 Z M 706.5 396.5 L 734.5 396.5 L 734.5 424.5 L 706.5 424.5 Z M 647.5 396.5 L 675.5 396.5 L 675.5 424.5 L 647.5 424.5 Z M 450.5 396.5 L 478.5 396.5 L 478.5 424.5 L 450.5 424.5 Z M 519.5 467.5 L 547.5 467.5 L 547.5 495.5 L 519.5 495.5 Z M 1349.5 467.5 L 1377.5 467.5 L 1377.5 495.5 L 1349.5 495.5 Z M 1289.5 467.5 L 1317.5 467.5 L 1317.5 495.5 L 1289.5 495.5 Z M 1092.5 467.5 L 1120.5 467.5 L 1120.5 495.5 L 1092.5 495.5 Z M 1033.5 467.5 L 1061.5 467.5 L 1061.5 495.5 L 1033.5 495.5 Z M 835.5 467.5 L 863.5 467.5 L 863.5 495.5 L 835.5 495.5 Z M 776.5 467.5 L 804.5 467.5 L 804.5 495.5 L 776.5 495.5 Z M 578.5 467.5 L 607.5 467.5 L 607.5 495.5 L 578.5 495.5 Z M 578.5 467.5 "/>
 </clipPath>
-<image id="image334" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -52,15 +52,15 @@
 <clipPath id="clip10">
   <path d="M 1468.5 388.5 L 1511.5 388.5 L 1511.5 396.5 L 1468.5 396.5 Z M 1416.5 388.5 L 1459.5 388.5 L 1459.5 396.5 L 1416.5 396.5 Z M 1156.5 388.5 L 1199.5 388.5 L 1199.5 396.5 L 1156.5 396.5 Z M 642.5 388.5 L 685.5 388.5 L 685.5 396.5 L 642.5 396.5 Z M 440.5 388.5 L 483.5 388.5 L 483.5 396.5 L 440.5 396.5 Z M 952.5 388.5 L 995.5 388.5 L 995.5 396.5 L 952.5 396.5 Z M 387.5 388.5 L 430.5 388.5 L 430.5 396.5 L 387.5 396.5 Z M 1208.5 388.5 L 1251.5 388.5 L 1251.5 396.5 L 1208.5 396.5 Z M 899.5 388.5 L 942.5 388.5 L 942.5 396.5 L 899.5 396.5 Z M 695.5 388.5 L 738.5 388.5 L 738.5 396.5 L 695.5 396.5 Z M 695.5 396.5 L 738.5 396.5 L 738.5 424.5 L 695.5 424.5 Z M 387.5 396.5 L 430.5 396.5 L 430.5 424.5 L 387.5 424.5 Z M 1416.5 396.5 L 1459.5 396.5 L 1459.5 424.5 L 1416.5 424.5 Z M 1208.5 396.5 L 1251.5 396.5 L 1251.5 424.5 L 1208.5 424.5 Z M 440.5 396.5 L 483.5 396.5 L 483.5 424.5 L 440.5 424.5 Z M 899.5 396.5 L 942.5 396.5 L 942.5 424.5 L 899.5 424.5 Z M 952.5 396.5 L 995.5 396.5 L 995.5 424.5 L 952.5 424.5 Z M 1156.5 396.5 L 1199.5 396.5 L 1199.5 424.5 L 1156.5 424.5 Z M 642.5 396.5 L 685.5 396.5 L 685.5 424.5 L 642.5 424.5 Z M 1468.5 396.5 L 1511.5 396.5 L 1511.5 424.5 L 1468.5 424.5 Z M 1416.5 424.5 L 1459.5 424.5 L 1459.5 431.5 L 1416.5 431.5 Z M 1468.5 424.5 L 1511.5 424.5 L 1511.5 431.5 L 1468.5 431.5 Z M 952.5 424.5 L 995.5 424.5 L 995.5 431.5 L 952.5 431.5 Z M 642.5 424.5 L 685.5 424.5 L 685.5 431.5 L 642.5 431.5 Z M 440.5 424.5 L 483.5 424.5 L 483.5 431.5 L 440.5 431.5 Z M 387.5 424.5 L 430.5 424.5 L 430.5 431.5 L 387.5 431.5 Z M 1208.5 424.5 L 1251.5 424.5 L 1251.5 431.5 L 1208.5 431.5 Z M 1156.5 424.5 L 1199.5 424.5 L 1199.5 431.5 L 1156.5 431.5 Z M 695.5 424.5 L 738.5 424.5 L 738.5 431.5 L 695.5 431.5 Z M 899.5 424.5 L 942.5 424.5 L 942.5 431.5 L 899.5 431.5 Z M 899.5 424.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <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="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface329">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 800 L 1712 800 M 206 759 L 1712 759 M 206 759 L 206 800 M 1712 759 L 1712 800 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 800 L 1712 800 M 206 759 L 1712 759 M 1712 800 L 1712 759 M 206 800 L 206 759 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 246 L 206 251 M 203 249 L 208 249 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 245 L 206 254 M 201 250 L 210 250 M 205 251 L 207 251 M 205 249 L 207 249 M 205 249 L 205 251 M 207 249 L 207 251 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.svg b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.svg
index 188461f..1536270 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.svg
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_21.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 249.5 L 1743.5 249.5 L 1743.5 557.5 L 175.5 557.5 Z M 351.5 557.5 L 1566.5 557.5 L 1566.5 618.5 L 351.5 618.5 Z M 351.5 557.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 380.5 363.5 L 1536.5 363.5 L 1536.5 388.5 L 380.5 388.5 Z M 380.5 434.5 L 1536.5 434.5 L 1536.5 459.5 L 380.5 459.5 Z M 380.5 505.5 L 1536.5 505.5 L 1536.5 530.5 L 380.5 530.5 Z M 380.5 505.5 "/>
 </clipPath>
-<image id="image333" 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="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -39,9 +39,9 @@
 <clipPath id="clip8">
   <path d="M 232.5 266.5 L 260.5 266.5 L 260.5 294.5 L 232.5 294.5 Z M 1658.5 266.5 L 1686.5 266.5 L 1686.5 294.5 L 1658.5 294.5 Z M 1579.5 266.5 L 1607.5 266.5 L 1607.5 294.5 L 1579.5 294.5 Z M 1500.5 266.5 L 1528.5 266.5 L 1528.5 294.5 L 1500.5 294.5 Z M 1421.5 266.5 L 1449.5 266.5 L 1449.5 294.5 L 1421.5 294.5 Z M 1341.5 266.5 L 1369.5 266.5 L 1369.5 294.5 L 1341.5 294.5 Z M 1262.5 266.5 L 1290.5 266.5 L 1290.5 294.5 L 1262.5 294.5 Z M 1183.5 266.5 L 1211.5 266.5 L 1211.5 294.5 L 1183.5 294.5 Z M 1104.5 266.5 L 1132.5 266.5 L 1132.5 294.5 L 1104.5 294.5 Z M 1024.5 266.5 L 1052.5 266.5 L 1052.5 294.5 L 1024.5 294.5 Z M 945.5 266.5 L 973.5 266.5 L 973.5 294.5 L 945.5 294.5 Z M 866.5 266.5 L 894.5 266.5 L 894.5 294.5 L 866.5 294.5 Z M 787.5 266.5 L 815.5 266.5 L 815.5 294.5 L 787.5 294.5 Z M 707.5 266.5 L 735.5 266.5 L 735.5 294.5 L 707.5 294.5 Z M 628.5 266.5 L 656.5 266.5 L 656.5 294.5 L 628.5 294.5 Z M 549.5 266.5 L 577.5 266.5 L 577.5 294.5 L 549.5 294.5 Z M 469.5 266.5 L 498.5 266.5 L 498.5 294.5 L 469.5 294.5 Z M 390.5 266.5 L 418.5 266.5 L 418.5 294.5 L 390.5 294.5 Z M 311.5 266.5 L 339.5 266.5 L 339.5 294.5 L 311.5 294.5 Z M 519.5 326.5 L 547.5 326.5 L 547.5 354.5 L 519.5 354.5 Z M 1349.5 326.5 L 1377.5 326.5 L 1377.5 354.5 L 1349.5 354.5 Z M 1289.5 326.5 L 1317.5 326.5 L 1317.5 354.5 L 1289.5 354.5 Z M 1092.5 326.5 L 1120.5 326.5 L 1120.5 354.5 L 1092.5 354.5 Z M 1033.5 326.5 L 1061.5 326.5 L 1061.5 354.5 L 1033.5 354.5 Z M 835.5 326.5 L 863.5 326.5 L 863.5 354.5 L 835.5 354.5 Z M 776.5 326.5 L 804.5 326.5 L 804.5 354.5 L 776.5 354.5 Z M 578.5 326.5 L 607.5 326.5 L 607.5 354.5 L 578.5 354.5 Z M 390.5 397.5 L 418.5 397.5 L 418.5 425.5 L 390.5 425.5 Z M 1480.5 397.5 L 1508.5 397.5 L 1508.5 425.5 L 1480.5 425.5 Z M 1421.5 397.5 L 1449.5 397.5 L 1449.5 425.5 L 1421.5 425.5 Z M 1220.5 397.5 L 1248.5 397.5 L 1248.5 425.5 L 1220.5 425.5 Z M 1161.5 397.5 L 1189.5 397.5 L 1189.5 425.5 L 1161.5 425.5 Z M 963.5 397.5 L 991.5 397.5 L 991.5 425.5 L 963.5 425.5 Z M 904.5 397.5 L 932.5 397.5 L 932.5 425.5 L 904.5 425.5 Z M 706.5 397.5 L 734.5 397.5 L 734.5 425.5 L 706.5 425.5 Z M 647.5 397.5 L 675.5 397.5 L 675.5 425.5 L 647.5 425.5 Z M 450.5 397.5 L 478.5 397.5 L 478.5 425.5 L 450.5 425.5 Z M 519.5 468.5 L 547.5 468.5 L 547.5 496.5 L 519.5 496.5 Z M 1349.5 468.5 L 1377.5 468.5 L 1377.5 496.5 L 1349.5 496.5 Z M 1289.5 468.5 L 1317.5 468.5 L 1317.5 496.5 L 1289.5 496.5 Z M 1092.5 468.5 L 1120.5 468.5 L 1120.5 496.5 L 1092.5 496.5 Z M 1033.5 468.5 L 1061.5 468.5 L 1061.5 496.5 L 1033.5 496.5 Z M 835.5 468.5 L 863.5 468.5 L 863.5 496.5 L 835.5 496.5 Z M 776.5 468.5 L 804.5 468.5 L 804.5 496.5 L 776.5 496.5 Z M 578.5 468.5 L 607.5 468.5 L 607.5 496.5 L 578.5 496.5 Z M 390.5 539.5 L 418.5 539.5 L 418.5 567.5 L 390.5 567.5 Z M 1480.5 539.5 L 1508.5 539.5 L 1508.5 567.5 L 1480.5 567.5 Z M 1421.5 539.5 L 1449.5 539.5 L 1449.5 567.5 L 1421.5 567.5 Z M 1220.5 539.5 L 1248.5 539.5 L 1248.5 567.5 L 1220.5 567.5 Z M 1161.5 539.5 L 1189.5 539.5 L 1189.5 567.5 L 1161.5 567.5 Z M 963.5 539.5 L 991.5 539.5 L 991.5 567.5 L 963.5 567.5 Z M 904.5 539.5 L 932.5 539.5 L 932.5 567.5 L 904.5 567.5 Z M 706.5 539.5 L 734.5 539.5 L 734.5 567.5 L 706.5 567.5 Z M 647.5 539.5 L 675.5 539.5 L 675.5 567.5 L 647.5 567.5 Z M 450.5 539.5 L 478.5 539.5 L 478.5 567.5 L 450.5 567.5 Z M 450.5 539.5 "/>
 </clipPath>
-<image id="image334" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -52,15 +52,15 @@
 <clipPath id="clip10">
   <path d="M 387.5 389.5 L 430.5 389.5 L 430.5 397.5 L 387.5 397.5 Z M 952.5 389.5 L 995.5 389.5 L 995.5 397.5 L 952.5 397.5 Z M 1468.5 389.5 L 1511.5 389.5 L 1511.5 397.5 L 1468.5 397.5 Z M 1208.5 389.5 L 1251.5 389.5 L 1251.5 397.5 L 1208.5 397.5 Z M 642.5 389.5 L 685.5 389.5 L 685.5 397.5 L 642.5 397.5 Z M 1416.5 389.5 L 1459.5 389.5 L 1459.5 397.5 L 1416.5 397.5 Z M 899.5 389.5 L 942.5 389.5 L 942.5 397.5 L 899.5 397.5 Z M 1156.5 389.5 L 1199.5 389.5 L 1199.5 397.5 L 1156.5 397.5 Z M 440.5 389.5 L 483.5 389.5 L 483.5 397.5 L 440.5 397.5 Z M 695.5 389.5 L 738.5 389.5 L 738.5 397.5 L 695.5 397.5 Z M 899.5 397.5 L 942.5 397.5 L 942.5 425.5 L 899.5 425.5 Z M 1416.5 397.5 L 1459.5 397.5 L 1459.5 425.5 L 1416.5 425.5 Z M 1156.5 397.5 L 1199.5 397.5 L 1199.5 425.5 L 1156.5 425.5 Z M 695.5 397.5 L 738.5 397.5 L 738.5 425.5 L 695.5 425.5 Z M 440.5 397.5 L 483.5 397.5 L 483.5 425.5 L 440.5 425.5 Z M 642.5 397.5 L 685.5 397.5 L 685.5 425.5 L 642.5 425.5 Z M 1468.5 397.5 L 1511.5 397.5 L 1511.5 425.5 L 1468.5 425.5 Z M 387.5 397.5 L 430.5 397.5 L 430.5 425.5 L 387.5 425.5 Z M 1208.5 397.5 L 1251.5 397.5 L 1251.5 425.5 L 1208.5 425.5 Z M 952.5 397.5 L 995.5 397.5 L 995.5 425.5 L 952.5 425.5 Z M 952.5 425.5 L 995.5 425.5 L 995.5 432.5 L 952.5 432.5 Z M 642.5 425.5 L 685.5 425.5 L 685.5 432.5 L 642.5 432.5 Z M 899.5 425.5 L 942.5 425.5 L 942.5 432.5 L 899.5 432.5 Z M 1416.5 425.5 L 1459.5 425.5 L 1459.5 432.5 L 1416.5 432.5 Z M 440.5 425.5 L 483.5 425.5 L 483.5 432.5 L 440.5 432.5 Z M 1208.5 425.5 L 1251.5 425.5 L 1251.5 432.5 L 1208.5 432.5 Z M 387.5 425.5 L 430.5 425.5 L 430.5 432.5 L 387.5 432.5 Z M 695.5 425.5 L 738.5 425.5 L 738.5 432.5 L 695.5 432.5 Z M 1468.5 425.5 L 1511.5 425.5 L 1511.5 432.5 L 1468.5 432.5 Z M 1156.5 425.5 L 1199.5 425.5 L 1199.5 432.5 L 1156.5 432.5 Z M 642.5 531.5 L 685.5 531.5 L 685.5 539.5 L 642.5 539.5 Z M 1416.5 531.5 L 1459.5 531.5 L 1459.5 539.5 L 1416.5 539.5 Z M 387.5 531.5 L 430.5 531.5 L 430.5 539.5 L 387.5 539.5 Z M 1468.5 531.5 L 1511.5 531.5 L 1511.5 539.5 L 1468.5 539.5 Z M 899.5 531.5 L 942.5 531.5 L 942.5 539.5 L 899.5 539.5 Z M 695.5 531.5 L 738.5 531.5 L 738.5 539.5 L 695.5 539.5 Z M 1208.5 531.5 L 1251.5 531.5 L 1251.5 539.5 L 1208.5 539.5 Z M 440.5 531.5 L 483.5 531.5 L 483.5 539.5 L 440.5 539.5 Z M 952.5 531.5 L 995.5 531.5 L 995.5 539.5 L 952.5 539.5 Z M 1156.5 531.5 L 1199.5 531.5 L 1199.5 539.5 L 1156.5 539.5 Z M 695.5 539.5 L 738.5 539.5 L 738.5 567.5 L 695.5 567.5 Z M 1416.5 539.5 L 1459.5 539.5 L 1459.5 567.5 L 1416.5 567.5 Z M 1468.5 539.5 L 1511.5 539.5 L 1511.5 567.5 L 1468.5 567.5 Z M 387.5 539.5 L 430.5 539.5 L 430.5 567.5 L 387.5 567.5 Z M 1208.5 539.5 L 1251.5 539.5 L 1251.5 567.5 L 1208.5 567.5 Z M 1156.5 539.5 L 1199.5 539.5 L 1199.5 567.5 L 1156.5 567.5 Z M 952.5 539.5 L 995.5 539.5 L 995.5 567.5 L 952.5 567.5 Z M 440.5 539.5 L 483.5 539.5 L 483.5 567.5 L 440.5 567.5 Z M 899.5 539.5 L 942.5 539.5 L 942.5 567.5 L 899.5 567.5 Z M 642.5 539.5 L 685.5 539.5 L 685.5 567.5 L 642.5 567.5 Z M 1208.5 567.5 L 1251.5 567.5 L 1251.5 574.5 L 1208.5 574.5 Z M 952.5 567.5 L 995.5 567.5 L 995.5 574.5 L 952.5 574.5 Z M 1416.5 567.5 L 1459.5 567.5 L 1459.5 574.5 L 1416.5 574.5 Z M 695.5 567.5 L 738.5 567.5 L 738.5 574.5 L 695.5 574.5 Z M 899.5 567.5 L 942.5 567.5 L 942.5 574.5 L 899.5 574.5 Z M 1468.5 567.5 L 1511.5 567.5 L 1511.5 574.5 L 1468.5 574.5 Z M 642.5 567.5 L 685.5 567.5 L 685.5 574.5 L 642.5 574.5 Z M 1156.5 567.5 L 1199.5 567.5 L 1199.5 574.5 L 1156.5 574.5 Z M 387.5 567.5 L 430.5 567.5 L 430.5 574.5 L 387.5 574.5 Z M 440.5 567.5 L 483.5 567.5 L 483.5 574.5 L 440.5 574.5 Z M 440.5 567.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <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="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface329">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 799 L 1712 799 M 206 758 L 1712 758 M 206 758 L 206 799 M 1712 758 L 1712 799 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 799 L 1712 799 M 206 758 L 1712 758 M 1712 799 L 1712 758 M 206 799 L 206 758 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 246 L 206 251 M 203 249 L 208 249 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 244 L 206 253 M 201 249 L 210 249 M 205 250 L 207 250 M 205 248 L 207 248 M 205 248 L 205 250 M 207 248 L 207 250 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.svg b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.svg
index 13da591..aa5a5d3 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.svg
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_28.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 249.5 L 1743.5 249.5 L 1743.5 557.5 L 175.5 557.5 Z M 351.5 557.5 L 1566.5 557.5 L 1566.5 695.5 L 351.5 695.5 Z M 351.5 557.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 380.5 363.5 L 1536.5 363.5 L 1536.5 388.5 L 380.5 388.5 Z M 380.5 434.5 L 1536.5 434.5 L 1536.5 459.5 L 380.5 459.5 Z M 380.5 505.5 L 1536.5 505.5 L 1536.5 530.5 L 380.5 530.5 Z M 380.5 576.5 L 1536.5 576.5 L 1536.5 601.5 L 380.5 601.5 Z M 380.5 576.5 "/>
 </clipPath>
-<image id="image334" 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="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -39,9 +39,9 @@
 <clipPath id="clip8">
   <path d="M 232.5 266.5 L 260.5 266.5 L 260.5 294.5 L 232.5 294.5 Z M 1658.5 266.5 L 1686.5 266.5 L 1686.5 294.5 L 1658.5 294.5 Z M 1579.5 266.5 L 1607.5 266.5 L 1607.5 294.5 L 1579.5 294.5 Z M 1500.5 266.5 L 1528.5 266.5 L 1528.5 294.5 L 1500.5 294.5 Z M 1421.5 266.5 L 1449.5 266.5 L 1449.5 294.5 L 1421.5 294.5 Z M 1341.5 266.5 L 1369.5 266.5 L 1369.5 294.5 L 1341.5 294.5 Z M 1262.5 266.5 L 1290.5 266.5 L 1290.5 294.5 L 1262.5 294.5 Z M 1183.5 266.5 L 1211.5 266.5 L 1211.5 294.5 L 1183.5 294.5 Z M 1104.5 266.5 L 1132.5 266.5 L 1132.5 294.5 L 1104.5 294.5 Z M 1024.5 266.5 L 1052.5 266.5 L 1052.5 294.5 L 1024.5 294.5 Z M 945.5 266.5 L 973.5 266.5 L 973.5 294.5 L 945.5 294.5 Z M 866.5 266.5 L 894.5 266.5 L 894.5 294.5 L 866.5 294.5 Z M 787.5 266.5 L 815.5 266.5 L 815.5 294.5 L 787.5 294.5 Z M 707.5 266.5 L 735.5 266.5 L 735.5 294.5 L 707.5 294.5 Z M 628.5 266.5 L 656.5 266.5 L 656.5 294.5 L 628.5 294.5 Z M 549.5 266.5 L 577.5 266.5 L 577.5 294.5 L 549.5 294.5 Z M 469.5 266.5 L 498.5 266.5 L 498.5 294.5 L 469.5 294.5 Z M 390.5 266.5 L 418.5 266.5 L 418.5 294.5 L 390.5 294.5 Z M 311.5 266.5 L 339.5 266.5 L 339.5 294.5 L 311.5 294.5 Z M 519.5 326.5 L 547.5 326.5 L 547.5 354.5 L 519.5 354.5 Z M 1349.5 326.5 L 1377.5 326.5 L 1377.5 354.5 L 1349.5 354.5 Z M 1289.5 326.5 L 1317.5 326.5 L 1317.5 354.5 L 1289.5 354.5 Z M 1092.5 326.5 L 1120.5 326.5 L 1120.5 354.5 L 1092.5 354.5 Z M 1033.5 326.5 L 1061.5 326.5 L 1061.5 354.5 L 1033.5 354.5 Z M 835.5 326.5 L 863.5 326.5 L 863.5 354.5 L 835.5 354.5 Z M 776.5 326.5 L 804.5 326.5 L 804.5 354.5 L 776.5 354.5 Z M 578.5 326.5 L 607.5 326.5 L 607.5 354.5 L 578.5 354.5 Z M 390.5 397.5 L 418.5 397.5 L 418.5 425.5 L 390.5 425.5 Z M 1480.5 397.5 L 1508.5 397.5 L 1508.5 425.5 L 1480.5 425.5 Z M 1421.5 397.5 L 1449.5 397.5 L 1449.5 425.5 L 1421.5 425.5 Z M 1220.5 397.5 L 1248.5 397.5 L 1248.5 425.5 L 1220.5 425.5 Z M 1161.5 397.5 L 1189.5 397.5 L 1189.5 425.5 L 1161.5 425.5 Z M 963.5 397.5 L 991.5 397.5 L 991.5 425.5 L 963.5 425.5 Z M 904.5 397.5 L 932.5 397.5 L 932.5 425.5 L 904.5 425.5 Z M 706.5 397.5 L 734.5 397.5 L 734.5 425.5 L 706.5 425.5 Z M 647.5 397.5 L 675.5 397.5 L 675.5 425.5 L 647.5 425.5 Z M 450.5 397.5 L 478.5 397.5 L 478.5 425.5 L 450.5 425.5 Z M 519.5 468.5 L 547.5 468.5 L 547.5 496.5 L 519.5 496.5 Z M 1349.5 468.5 L 1377.5 468.5 L 1377.5 496.5 L 1349.5 496.5 Z M 1289.5 468.5 L 1317.5 468.5 L 1317.5 496.5 L 1289.5 496.5 Z M 1092.5 468.5 L 1120.5 468.5 L 1120.5 496.5 L 1092.5 496.5 Z M 1033.5 468.5 L 1061.5 468.5 L 1061.5 496.5 L 1033.5 496.5 Z M 835.5 468.5 L 863.5 468.5 L 863.5 496.5 L 835.5 496.5 Z M 776.5 468.5 L 804.5 468.5 L 804.5 496.5 L 776.5 496.5 Z M 578.5 468.5 L 607.5 468.5 L 607.5 496.5 L 578.5 496.5 Z M 390.5 539.5 L 418.5 539.5 L 418.5 567.5 L 390.5 567.5 Z M 1480.5 539.5 L 1508.5 539.5 L 1508.5 567.5 L 1480.5 567.5 Z M 1421.5 539.5 L 1449.5 539.5 L 1449.5 567.5 L 1421.5 567.5 Z M 1220.5 539.5 L 1248.5 539.5 L 1248.5 567.5 L 1220.5 567.5 Z M 1161.5 539.5 L 1189.5 539.5 L 1189.5 567.5 L 1161.5 567.5 Z M 963.5 539.5 L 991.5 539.5 L 991.5 567.5 L 963.5 567.5 Z M 904.5 539.5 L 932.5 539.5 L 932.5 567.5 L 904.5 567.5 Z M 706.5 539.5 L 734.5 539.5 L 734.5 567.5 L 706.5 567.5 Z M 647.5 539.5 L 675.5 539.5 L 675.5 567.5 L 647.5 567.5 Z M 450.5 539.5 L 478.5 539.5 L 478.5 567.5 L 450.5 567.5 Z M 519.5 610.5 L 547.5 610.5 L 547.5 638.5 L 519.5 638.5 Z M 1349.5 610.5 L 1377.5 610.5 L 1377.5 638.5 L 1349.5 638.5 Z M 1289.5 610.5 L 1317.5 610.5 L 1317.5 638.5 L 1289.5 638.5 Z M 1092.5 610.5 L 1120.5 610.5 L 1120.5 638.5 L 1092.5 638.5 Z M 1033.5 610.5 L 1061.5 610.5 L 1061.5 638.5 L 1033.5 638.5 Z M 835.5 610.5 L 863.5 610.5 L 863.5 638.5 L 835.5 638.5 Z M 776.5 610.5 L 804.5 610.5 L 804.5 638.5 L 776.5 638.5 Z M 578.5 610.5 L 607.5 610.5 L 607.5 638.5 L 578.5 638.5 Z M 578.5 610.5 "/>
 </clipPath>
-<image id="image335" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -52,15 +52,15 @@
 <clipPath id="clip10">
   <path d="M 387.5 389.5 L 430.5 389.5 L 430.5 397.5 L 387.5 397.5 Z M 952.5 389.5 L 995.5 389.5 L 995.5 397.5 L 952.5 397.5 Z M 1468.5 389.5 L 1511.5 389.5 L 1511.5 397.5 L 1468.5 397.5 Z M 1208.5 389.5 L 1251.5 389.5 L 1251.5 397.5 L 1208.5 397.5 Z M 642.5 389.5 L 685.5 389.5 L 685.5 397.5 L 642.5 397.5 Z M 1416.5 389.5 L 1459.5 389.5 L 1459.5 397.5 L 1416.5 397.5 Z M 899.5 389.5 L 942.5 389.5 L 942.5 397.5 L 899.5 397.5 Z M 1156.5 389.5 L 1199.5 389.5 L 1199.5 397.5 L 1156.5 397.5 Z M 440.5 389.5 L 483.5 389.5 L 483.5 397.5 L 440.5 397.5 Z M 695.5 389.5 L 738.5 389.5 L 738.5 397.5 L 695.5 397.5 Z M 899.5 397.5 L 942.5 397.5 L 942.5 425.5 L 899.5 425.5 Z M 1416.5 397.5 L 1459.5 397.5 L 1459.5 425.5 L 1416.5 425.5 Z M 1156.5 397.5 L 1199.5 397.5 L 1199.5 425.5 L 1156.5 425.5 Z M 695.5 397.5 L 738.5 397.5 L 738.5 425.5 L 695.5 425.5 Z M 440.5 397.5 L 483.5 397.5 L 483.5 425.5 L 440.5 425.5 Z M 642.5 397.5 L 685.5 397.5 L 685.5 425.5 L 642.5 425.5 Z M 1468.5 397.5 L 1511.5 397.5 L 1511.5 425.5 L 1468.5 425.5 Z M 387.5 397.5 L 430.5 397.5 L 430.5 425.5 L 387.5 425.5 Z M 1208.5 397.5 L 1251.5 397.5 L 1251.5 425.5 L 1208.5 425.5 Z M 952.5 397.5 L 995.5 397.5 L 995.5 425.5 L 952.5 425.5 Z M 952.5 425.5 L 995.5 425.5 L 995.5 432.5 L 952.5 432.5 Z M 642.5 425.5 L 685.5 425.5 L 685.5 432.5 L 642.5 432.5 Z M 899.5 425.5 L 942.5 425.5 L 942.5 432.5 L 899.5 432.5 Z M 1416.5 425.5 L 1459.5 425.5 L 1459.5 432.5 L 1416.5 432.5 Z M 440.5 425.5 L 483.5 425.5 L 483.5 432.5 L 440.5 432.5 Z M 1208.5 425.5 L 1251.5 425.5 L 1251.5 432.5 L 1208.5 432.5 Z M 387.5 425.5 L 430.5 425.5 L 430.5 432.5 L 387.5 432.5 Z M 695.5 425.5 L 738.5 425.5 L 738.5 432.5 L 695.5 432.5 Z M 1468.5 425.5 L 1511.5 425.5 L 1511.5 432.5 L 1468.5 432.5 Z M 1156.5 425.5 L 1199.5 425.5 L 1199.5 432.5 L 1156.5 432.5 Z M 642.5 531.5 L 685.5 531.5 L 685.5 539.5 L 642.5 539.5 Z M 1416.5 531.5 L 1459.5 531.5 L 1459.5 539.5 L 1416.5 539.5 Z M 387.5 531.5 L 430.5 531.5 L 430.5 539.5 L 387.5 539.5 Z M 1468.5 531.5 L 1511.5 531.5 L 1511.5 539.5 L 1468.5 539.5 Z M 899.5 531.5 L 942.5 531.5 L 942.5 539.5 L 899.5 539.5 Z M 695.5 531.5 L 738.5 531.5 L 738.5 539.5 L 695.5 539.5 Z M 1208.5 531.5 L 1251.5 531.5 L 1251.5 539.5 L 1208.5 539.5 Z M 440.5 531.5 L 483.5 531.5 L 483.5 539.5 L 440.5 539.5 Z M 952.5 531.5 L 995.5 531.5 L 995.5 539.5 L 952.5 539.5 Z M 1156.5 531.5 L 1199.5 531.5 L 1199.5 539.5 L 1156.5 539.5 Z M 695.5 539.5 L 738.5 539.5 L 738.5 567.5 L 695.5 567.5 Z M 1416.5 539.5 L 1459.5 539.5 L 1459.5 567.5 L 1416.5 567.5 Z M 1468.5 539.5 L 1511.5 539.5 L 1511.5 567.5 L 1468.5 567.5 Z M 387.5 539.5 L 430.5 539.5 L 430.5 567.5 L 387.5 567.5 Z M 1208.5 539.5 L 1251.5 539.5 L 1251.5 567.5 L 1208.5 567.5 Z M 1156.5 539.5 L 1199.5 539.5 L 1199.5 567.5 L 1156.5 567.5 Z M 952.5 539.5 L 995.5 539.5 L 995.5 567.5 L 952.5 567.5 Z M 440.5 539.5 L 483.5 539.5 L 483.5 567.5 L 440.5 567.5 Z M 899.5 539.5 L 942.5 539.5 L 942.5 567.5 L 899.5 567.5 Z M 642.5 539.5 L 685.5 539.5 L 685.5 567.5 L 642.5 567.5 Z M 1208.5 567.5 L 1251.5 567.5 L 1251.5 574.5 L 1208.5 574.5 Z M 952.5 567.5 L 995.5 567.5 L 995.5 574.5 L 952.5 574.5 Z M 1416.5 567.5 L 1459.5 567.5 L 1459.5 574.5 L 1416.5 574.5 Z M 695.5 567.5 L 738.5 567.5 L 738.5 574.5 L 695.5 574.5 Z M 899.5 567.5 L 942.5 567.5 L 942.5 574.5 L 899.5 574.5 Z M 1468.5 567.5 L 1511.5 567.5 L 1511.5 574.5 L 1468.5 574.5 Z M 642.5 567.5 L 685.5 567.5 L 685.5 574.5 L 642.5 574.5 Z M 1156.5 567.5 L 1199.5 567.5 L 1199.5 574.5 L 1156.5 574.5 Z M 387.5 567.5 L 430.5 567.5 L 430.5 574.5 L 387.5 574.5 Z M 440.5 567.5 L 483.5 567.5 L 483.5 574.5 L 440.5 574.5 Z M 440.5 567.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <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="#image368"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface330">
+<g id="surface362">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 799 L 1712 799 M 206 758 L 1712 758 M 206 758 L 206 799 M 1712 758 L 1712 799 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 799 L 1712 799 M 206 758 L 1712 758 M 1712 799 L 1712 758 M 206 799 L 206 758 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 246 L 206 251 M 203 249 L 208 249 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 244 L 206 253 M 201 249 L 210 249 M 205 250 L 207 250 M 205 248 L 207 248 M 205 248 L 205 250 M 207 248 L 207 250 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.svg b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.svg
index b77281b..6238575 100644
--- a/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.svg
+++ b/cells/sleep_pargate_plv/sky130_fd_sc_lp__sleep_pargate_plv_7.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 248.5 L 1743.5 248.5 L 1743.5 556.5 L 175.5 556.5 Z M 175.5 248.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 380.5 362.5 L 1536.5 362.5 L 1536.5 387.5 L 380.5 387.5 Z M 380.5 362.5 "/>
 </clipPath>
-<image id="image333" 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="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -39,9 +39,9 @@
 <clipPath id="clip8">
   <path d="M 232.5 265.5 L 260.5 265.5 L 260.5 293.5 L 232.5 293.5 Z M 1658.5 265.5 L 1686.5 265.5 L 1686.5 293.5 L 1658.5 293.5 Z M 1579.5 265.5 L 1607.5 265.5 L 1607.5 293.5 L 1579.5 293.5 Z M 1500.5 265.5 L 1528.5 265.5 L 1528.5 293.5 L 1500.5 293.5 Z M 1421.5 265.5 L 1449.5 265.5 L 1449.5 293.5 L 1421.5 293.5 Z M 1341.5 265.5 L 1369.5 265.5 L 1369.5 293.5 L 1341.5 293.5 Z M 1262.5 265.5 L 1290.5 265.5 L 1290.5 293.5 L 1262.5 293.5 Z M 1183.5 265.5 L 1211.5 265.5 L 1211.5 293.5 L 1183.5 293.5 Z M 1104.5 265.5 L 1132.5 265.5 L 1132.5 293.5 L 1104.5 293.5 Z M 1024.5 265.5 L 1052.5 265.5 L 1052.5 293.5 L 1024.5 293.5 Z M 945.5 265.5 L 973.5 265.5 L 973.5 293.5 L 945.5 293.5 Z M 866.5 265.5 L 894.5 265.5 L 894.5 293.5 L 866.5 293.5 Z M 787.5 265.5 L 815.5 265.5 L 815.5 293.5 L 787.5 293.5 Z M 707.5 265.5 L 735.5 265.5 L 735.5 293.5 L 707.5 293.5 Z M 628.5 265.5 L 656.5 265.5 L 656.5 293.5 L 628.5 293.5 Z M 549.5 265.5 L 577.5 265.5 L 577.5 293.5 L 549.5 293.5 Z M 469.5 265.5 L 498.5 265.5 L 498.5 293.5 L 469.5 293.5 Z M 390.5 265.5 L 418.5 265.5 L 418.5 293.5 L 390.5 293.5 Z M 311.5 265.5 L 339.5 265.5 L 339.5 293.5 L 311.5 293.5 Z M 519.5 325.5 L 547.5 325.5 L 547.5 353.5 L 519.5 353.5 Z M 1349.5 325.5 L 1377.5 325.5 L 1377.5 353.5 L 1349.5 353.5 Z M 1289.5 325.5 L 1317.5 325.5 L 1317.5 353.5 L 1289.5 353.5 Z M 1092.5 325.5 L 1120.5 325.5 L 1120.5 353.5 L 1092.5 353.5 Z M 1033.5 325.5 L 1061.5 325.5 L 1061.5 353.5 L 1033.5 353.5 Z M 835.5 325.5 L 863.5 325.5 L 863.5 353.5 L 835.5 353.5 Z M 776.5 325.5 L 804.5 325.5 L 804.5 353.5 L 776.5 353.5 Z M 578.5 325.5 L 607.5 325.5 L 607.5 353.5 L 578.5 353.5 Z M 390.5 396.5 L 418.5 396.5 L 418.5 424.5 L 390.5 424.5 Z M 1480.5 396.5 L 1508.5 396.5 L 1508.5 424.5 L 1480.5 424.5 Z M 1421.5 396.5 L 1449.5 396.5 L 1449.5 424.5 L 1421.5 424.5 Z M 1220.5 396.5 L 1248.5 396.5 L 1248.5 424.5 L 1220.5 424.5 Z M 1161.5 396.5 L 1189.5 396.5 L 1189.5 424.5 L 1161.5 424.5 Z M 963.5 396.5 L 991.5 396.5 L 991.5 424.5 L 963.5 424.5 Z M 904.5 396.5 L 932.5 396.5 L 932.5 424.5 L 904.5 424.5 Z M 706.5 396.5 L 734.5 396.5 L 734.5 424.5 L 706.5 424.5 Z M 647.5 396.5 L 675.5 396.5 L 675.5 424.5 L 647.5 424.5 Z M 450.5 396.5 L 478.5 396.5 L 478.5 424.5 L 450.5 424.5 Z M 450.5 396.5 "/>
 </clipPath>
-<image id="image334" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -52,15 +52,15 @@
 <clipPath id="clip10">
   <path d="M 1468.5 388.5 L 1511.5 388.5 L 1511.5 396.5 L 1468.5 396.5 Z M 1416.5 388.5 L 1459.5 388.5 L 1459.5 396.5 L 1416.5 396.5 Z M 1156.5 388.5 L 1199.5 388.5 L 1199.5 396.5 L 1156.5 396.5 Z M 642.5 388.5 L 685.5 388.5 L 685.5 396.5 L 642.5 396.5 Z M 440.5 388.5 L 483.5 388.5 L 483.5 396.5 L 440.5 396.5 Z M 952.5 388.5 L 995.5 388.5 L 995.5 396.5 L 952.5 396.5 Z M 387.5 388.5 L 430.5 388.5 L 430.5 396.5 L 387.5 396.5 Z M 1208.5 388.5 L 1251.5 388.5 L 1251.5 396.5 L 1208.5 396.5 Z M 899.5 388.5 L 942.5 388.5 L 942.5 396.5 L 899.5 396.5 Z M 695.5 388.5 L 738.5 388.5 L 738.5 396.5 L 695.5 396.5 Z M 695.5 396.5 L 738.5 396.5 L 738.5 424.5 L 695.5 424.5 Z M 387.5 396.5 L 430.5 396.5 L 430.5 424.5 L 387.5 424.5 Z M 1416.5 396.5 L 1459.5 396.5 L 1459.5 424.5 L 1416.5 424.5 Z M 1208.5 396.5 L 1251.5 396.5 L 1251.5 424.5 L 1208.5 424.5 Z M 440.5 396.5 L 483.5 396.5 L 483.5 424.5 L 440.5 424.5 Z M 899.5 396.5 L 942.5 396.5 L 942.5 424.5 L 899.5 424.5 Z M 952.5 396.5 L 995.5 396.5 L 995.5 424.5 L 952.5 424.5 Z M 1156.5 396.5 L 1199.5 396.5 L 1199.5 424.5 L 1156.5 424.5 Z M 642.5 396.5 L 685.5 396.5 L 685.5 424.5 L 642.5 424.5 Z M 1468.5 396.5 L 1511.5 396.5 L 1511.5 424.5 L 1468.5 424.5 Z M 1416.5 424.5 L 1459.5 424.5 L 1459.5 431.5 L 1416.5 431.5 Z M 1468.5 424.5 L 1511.5 424.5 L 1511.5 431.5 L 1468.5 431.5 Z M 952.5 424.5 L 995.5 424.5 L 995.5 431.5 L 952.5 431.5 Z M 642.5 424.5 L 685.5 424.5 L 685.5 431.5 L 642.5 431.5 Z M 440.5 424.5 L 483.5 424.5 L 483.5 431.5 L 440.5 431.5 Z M 387.5 424.5 L 430.5 424.5 L 430.5 431.5 L 387.5 431.5 Z M 1208.5 424.5 L 1251.5 424.5 L 1251.5 431.5 L 1208.5 431.5 Z M 1156.5 424.5 L 1199.5 424.5 L 1199.5 431.5 L 1156.5 431.5 Z M 695.5 424.5 L 738.5 424.5 L 738.5 431.5 L 695.5 431.5 Z M 899.5 424.5 L 942.5 424.5 L 942.5 431.5 L 899.5 431.5 Z M 899.5 424.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <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="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface329">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 800 L 1712 800 M 206 759 L 1712 759 M 206 759 L 206 800 M 1712 759 L 1712 800 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 800 L 1712 800 M 206 759 L 1712 759 M 1712 800 L 1712 759 M 206 800 L 206 759 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 246 L 206 251 M 203 249 L 208 249 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 245 L 206 254 M 201 250 L 210 250 M 205 251 L 207 251 M 205 249 L 207 249 M 205 249 L 205 251 M 207 249 L 207 251 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.svg b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.svg
index c44de45..fce44e2 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.svg
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_14.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 248.5 L 1743.5 248.5 L 1743.5 556.5 L 175.5 556.5 Z M 175.5 248.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 380.5 362.5 L 1536.5 362.5 L 1536.5 387.5 L 380.5 387.5 Z M 380.5 433.5 L 1536.5 433.5 L 1536.5 458.5 L 380.5 458.5 Z M 380.5 433.5 "/>
 </clipPath>
-<image id="image333" 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="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -39,9 +39,9 @@
 <clipPath id="clip8">
   <path d="M 232.5 265.5 L 260.5 265.5 L 260.5 293.5 L 232.5 293.5 Z M 1658.5 265.5 L 1686.5 265.5 L 1686.5 293.5 L 1658.5 293.5 Z M 1579.5 265.5 L 1607.5 265.5 L 1607.5 293.5 L 1579.5 293.5 Z M 1500.5 265.5 L 1528.5 265.5 L 1528.5 293.5 L 1500.5 293.5 Z M 1421.5 265.5 L 1449.5 265.5 L 1449.5 293.5 L 1421.5 293.5 Z M 1341.5 265.5 L 1369.5 265.5 L 1369.5 293.5 L 1341.5 293.5 Z M 1262.5 265.5 L 1290.5 265.5 L 1290.5 293.5 L 1262.5 293.5 Z M 1183.5 265.5 L 1211.5 265.5 L 1211.5 293.5 L 1183.5 293.5 Z M 1104.5 265.5 L 1132.5 265.5 L 1132.5 293.5 L 1104.5 293.5 Z M 1024.5 265.5 L 1052.5 265.5 L 1052.5 293.5 L 1024.5 293.5 Z M 945.5 265.5 L 973.5 265.5 L 973.5 293.5 L 945.5 293.5 Z M 866.5 265.5 L 894.5 265.5 L 894.5 293.5 L 866.5 293.5 Z M 787.5 265.5 L 815.5 265.5 L 815.5 293.5 L 787.5 293.5 Z M 707.5 265.5 L 735.5 265.5 L 735.5 293.5 L 707.5 293.5 Z M 628.5 265.5 L 656.5 265.5 L 656.5 293.5 L 628.5 293.5 Z M 549.5 265.5 L 577.5 265.5 L 577.5 293.5 L 549.5 293.5 Z M 469.5 265.5 L 498.5 265.5 L 498.5 293.5 L 469.5 293.5 Z M 390.5 265.5 L 418.5 265.5 L 418.5 293.5 L 390.5 293.5 Z M 311.5 265.5 L 339.5 265.5 L 339.5 293.5 L 311.5 293.5 Z M 519.5 325.5 L 547.5 325.5 L 547.5 353.5 L 519.5 353.5 Z M 1349.5 325.5 L 1377.5 325.5 L 1377.5 353.5 L 1349.5 353.5 Z M 1289.5 325.5 L 1317.5 325.5 L 1317.5 353.5 L 1289.5 353.5 Z M 1092.5 325.5 L 1120.5 325.5 L 1120.5 353.5 L 1092.5 353.5 Z M 1033.5 325.5 L 1061.5 325.5 L 1061.5 353.5 L 1033.5 353.5 Z M 835.5 325.5 L 863.5 325.5 L 863.5 353.5 L 835.5 353.5 Z M 776.5 325.5 L 804.5 325.5 L 804.5 353.5 L 776.5 353.5 Z M 578.5 325.5 L 607.5 325.5 L 607.5 353.5 L 578.5 353.5 Z M 390.5 396.5 L 418.5 396.5 L 418.5 424.5 L 390.5 424.5 Z M 1480.5 396.5 L 1508.5 396.5 L 1508.5 424.5 L 1480.5 424.5 Z M 1421.5 396.5 L 1449.5 396.5 L 1449.5 424.5 L 1421.5 424.5 Z M 1220.5 396.5 L 1248.5 396.5 L 1248.5 424.5 L 1220.5 424.5 Z M 1161.5 396.5 L 1189.5 396.5 L 1189.5 424.5 L 1161.5 424.5 Z M 963.5 396.5 L 991.5 396.5 L 991.5 424.5 L 963.5 424.5 Z M 904.5 396.5 L 932.5 396.5 L 932.5 424.5 L 904.5 424.5 Z M 706.5 396.5 L 734.5 396.5 L 734.5 424.5 L 706.5 424.5 Z M 647.5 396.5 L 675.5 396.5 L 675.5 424.5 L 647.5 424.5 Z M 450.5 396.5 L 478.5 396.5 L 478.5 424.5 L 450.5 424.5 Z M 519.5 467.5 L 547.5 467.5 L 547.5 495.5 L 519.5 495.5 Z M 1349.5 467.5 L 1377.5 467.5 L 1377.5 495.5 L 1349.5 495.5 Z M 1289.5 467.5 L 1317.5 467.5 L 1317.5 495.5 L 1289.5 495.5 Z M 1092.5 467.5 L 1120.5 467.5 L 1120.5 495.5 L 1092.5 495.5 Z M 1033.5 467.5 L 1061.5 467.5 L 1061.5 495.5 L 1033.5 495.5 Z M 835.5 467.5 L 863.5 467.5 L 863.5 495.5 L 835.5 495.5 Z M 776.5 467.5 L 804.5 467.5 L 804.5 495.5 L 776.5 495.5 Z M 578.5 467.5 L 607.5 467.5 L 607.5 495.5 L 578.5 495.5 Z M 578.5 467.5 "/>
 </clipPath>
-<image id="image334" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -52,15 +52,15 @@
 <clipPath id="clip10">
   <path d="M 1468.5 388.5 L 1511.5 388.5 L 1511.5 396.5 L 1468.5 396.5 Z M 1416.5 388.5 L 1459.5 388.5 L 1459.5 396.5 L 1416.5 396.5 Z M 1156.5 388.5 L 1199.5 388.5 L 1199.5 396.5 L 1156.5 396.5 Z M 642.5 388.5 L 685.5 388.5 L 685.5 396.5 L 642.5 396.5 Z M 440.5 388.5 L 483.5 388.5 L 483.5 396.5 L 440.5 396.5 Z M 952.5 388.5 L 995.5 388.5 L 995.5 396.5 L 952.5 396.5 Z M 387.5 388.5 L 430.5 388.5 L 430.5 396.5 L 387.5 396.5 Z M 1208.5 388.5 L 1251.5 388.5 L 1251.5 396.5 L 1208.5 396.5 Z M 899.5 388.5 L 942.5 388.5 L 942.5 396.5 L 899.5 396.5 Z M 695.5 388.5 L 738.5 388.5 L 738.5 396.5 L 695.5 396.5 Z M 695.5 396.5 L 738.5 396.5 L 738.5 424.5 L 695.5 424.5 Z M 387.5 396.5 L 430.5 396.5 L 430.5 424.5 L 387.5 424.5 Z M 1416.5 396.5 L 1459.5 396.5 L 1459.5 424.5 L 1416.5 424.5 Z M 1208.5 396.5 L 1251.5 396.5 L 1251.5 424.5 L 1208.5 424.5 Z M 440.5 396.5 L 483.5 396.5 L 483.5 424.5 L 440.5 424.5 Z M 899.5 396.5 L 942.5 396.5 L 942.5 424.5 L 899.5 424.5 Z M 952.5 396.5 L 995.5 396.5 L 995.5 424.5 L 952.5 424.5 Z M 1156.5 396.5 L 1199.5 396.5 L 1199.5 424.5 L 1156.5 424.5 Z M 642.5 396.5 L 685.5 396.5 L 685.5 424.5 L 642.5 424.5 Z M 1468.5 396.5 L 1511.5 396.5 L 1511.5 424.5 L 1468.5 424.5 Z M 1416.5 424.5 L 1459.5 424.5 L 1459.5 431.5 L 1416.5 431.5 Z M 1468.5 424.5 L 1511.5 424.5 L 1511.5 431.5 L 1468.5 431.5 Z M 952.5 424.5 L 995.5 424.5 L 995.5 431.5 L 952.5 431.5 Z M 642.5 424.5 L 685.5 424.5 L 685.5 431.5 L 642.5 431.5 Z M 440.5 424.5 L 483.5 424.5 L 483.5 431.5 L 440.5 431.5 Z M 387.5 424.5 L 430.5 424.5 L 430.5 431.5 L 387.5 431.5 Z M 1208.5 424.5 L 1251.5 424.5 L 1251.5 431.5 L 1208.5 431.5 Z M 1156.5 424.5 L 1199.5 424.5 L 1199.5 431.5 L 1156.5 431.5 Z M 695.5 424.5 L 738.5 424.5 L 738.5 431.5 L 695.5 431.5 Z M 899.5 424.5 L 942.5 424.5 L 942.5 431.5 L 899.5 431.5 Z M 899.5 424.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <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="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface329">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 800 L 1712 800 M 206 759 L 1712 759 M 206 759 L 206 800 M 1712 759 L 1712 800 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 800 L 1712 800 M 206 759 L 1712 759 M 1712 800 L 1712 759 M 206 800 L 206 759 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 246 L 206 251 M 203 249 L 208 249 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 245 L 206 254 M 201 250 L 210 250 M 205 251 L 207 251 M 205 249 L 207 249 M 205 249 L 205 251 M 207 249 L 207 251 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.svg b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.svg
index e70cd03..ca8d189 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.svg
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_21.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 249.5 L 1743.5 249.5 L 1743.5 557.5 L 175.5 557.5 Z M 351.5 557.5 L 1566.5 557.5 L 1566.5 618.5 L 351.5 618.5 Z M 351.5 557.5 "/>
 </clipPath>
-<image id="image332" 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="#image332"/>
+  <use xlink:href="#image363"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 380.5 363.5 L 1536.5 363.5 L 1536.5 388.5 L 380.5 388.5 Z M 380.5 434.5 L 1536.5 434.5 L 1536.5 459.5 L 380.5 459.5 Z M 380.5 505.5 L 1536.5 505.5 L 1536.5 530.5 L 380.5 530.5 Z M 380.5 505.5 "/>
 </clipPath>
-<image id="image333" 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="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image364"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -39,9 +39,9 @@
 <clipPath id="clip8">
   <path d="M 232.5 266.5 L 260.5 266.5 L 260.5 294.5 L 232.5 294.5 Z M 1658.5 266.5 L 1686.5 266.5 L 1686.5 294.5 L 1658.5 294.5 Z M 1579.5 266.5 L 1607.5 266.5 L 1607.5 294.5 L 1579.5 294.5 Z M 1500.5 266.5 L 1528.5 266.5 L 1528.5 294.5 L 1500.5 294.5 Z M 1421.5 266.5 L 1449.5 266.5 L 1449.5 294.5 L 1421.5 294.5 Z M 1341.5 266.5 L 1369.5 266.5 L 1369.5 294.5 L 1341.5 294.5 Z M 1262.5 266.5 L 1290.5 266.5 L 1290.5 294.5 L 1262.5 294.5 Z M 1183.5 266.5 L 1211.5 266.5 L 1211.5 294.5 L 1183.5 294.5 Z M 1104.5 266.5 L 1132.5 266.5 L 1132.5 294.5 L 1104.5 294.5 Z M 1024.5 266.5 L 1052.5 266.5 L 1052.5 294.5 L 1024.5 294.5 Z M 945.5 266.5 L 973.5 266.5 L 973.5 294.5 L 945.5 294.5 Z M 866.5 266.5 L 894.5 266.5 L 894.5 294.5 L 866.5 294.5 Z M 787.5 266.5 L 815.5 266.5 L 815.5 294.5 L 787.5 294.5 Z M 707.5 266.5 L 735.5 266.5 L 735.5 294.5 L 707.5 294.5 Z M 628.5 266.5 L 656.5 266.5 L 656.5 294.5 L 628.5 294.5 Z M 549.5 266.5 L 577.5 266.5 L 577.5 294.5 L 549.5 294.5 Z M 469.5 266.5 L 498.5 266.5 L 498.5 294.5 L 469.5 294.5 Z M 390.5 266.5 L 418.5 266.5 L 418.5 294.5 L 390.5 294.5 Z M 311.5 266.5 L 339.5 266.5 L 339.5 294.5 L 311.5 294.5 Z M 519.5 326.5 L 547.5 326.5 L 547.5 354.5 L 519.5 354.5 Z M 1349.5 326.5 L 1377.5 326.5 L 1377.5 354.5 L 1349.5 354.5 Z M 1289.5 326.5 L 1317.5 326.5 L 1317.5 354.5 L 1289.5 354.5 Z M 1092.5 326.5 L 1120.5 326.5 L 1120.5 354.5 L 1092.5 354.5 Z M 1033.5 326.5 L 1061.5 326.5 L 1061.5 354.5 L 1033.5 354.5 Z M 835.5 326.5 L 863.5 326.5 L 863.5 354.5 L 835.5 354.5 Z M 776.5 326.5 L 804.5 326.5 L 804.5 354.5 L 776.5 354.5 Z M 578.5 326.5 L 607.5 326.5 L 607.5 354.5 L 578.5 354.5 Z M 390.5 397.5 L 418.5 397.5 L 418.5 425.5 L 390.5 425.5 Z M 1480.5 397.5 L 1508.5 397.5 L 1508.5 425.5 L 1480.5 425.5 Z M 1421.5 397.5 L 1449.5 397.5 L 1449.5 425.5 L 1421.5 425.5 Z M 1220.5 397.5 L 1248.5 397.5 L 1248.5 425.5 L 1220.5 425.5 Z M 1161.5 397.5 L 1189.5 397.5 L 1189.5 425.5 L 1161.5 425.5 Z M 963.5 397.5 L 991.5 397.5 L 991.5 425.5 L 963.5 425.5 Z M 904.5 397.5 L 932.5 397.5 L 932.5 425.5 L 904.5 425.5 Z M 706.5 397.5 L 734.5 397.5 L 734.5 425.5 L 706.5 425.5 Z M 647.5 397.5 L 675.5 397.5 L 675.5 425.5 L 647.5 425.5 Z M 450.5 397.5 L 478.5 397.5 L 478.5 425.5 L 450.5 425.5 Z M 519.5 468.5 L 547.5 468.5 L 547.5 496.5 L 519.5 496.5 Z M 1349.5 468.5 L 1377.5 468.5 L 1377.5 496.5 L 1349.5 496.5 Z M 1289.5 468.5 L 1317.5 468.5 L 1317.5 496.5 L 1289.5 496.5 Z M 1092.5 468.5 L 1120.5 468.5 L 1120.5 496.5 L 1092.5 496.5 Z M 1033.5 468.5 L 1061.5 468.5 L 1061.5 496.5 L 1033.5 496.5 Z M 835.5 468.5 L 863.5 468.5 L 863.5 496.5 L 835.5 496.5 Z M 776.5 468.5 L 804.5 468.5 L 804.5 496.5 L 776.5 496.5 Z M 578.5 468.5 L 607.5 468.5 L 607.5 496.5 L 578.5 496.5 Z M 390.5 539.5 L 418.5 539.5 L 418.5 567.5 L 390.5 567.5 Z M 1480.5 539.5 L 1508.5 539.5 L 1508.5 567.5 L 1480.5 567.5 Z M 1421.5 539.5 L 1449.5 539.5 L 1449.5 567.5 L 1421.5 567.5 Z M 1220.5 539.5 L 1248.5 539.5 L 1248.5 567.5 L 1220.5 567.5 Z M 1161.5 539.5 L 1189.5 539.5 L 1189.5 567.5 L 1161.5 567.5 Z M 963.5 539.5 L 991.5 539.5 L 991.5 567.5 L 963.5 567.5 Z M 904.5 539.5 L 932.5 539.5 L 932.5 567.5 L 904.5 567.5 Z M 706.5 539.5 L 734.5 539.5 L 734.5 567.5 L 706.5 567.5 Z M 647.5 539.5 L 675.5 539.5 L 675.5 567.5 L 647.5 567.5 Z M 450.5 539.5 L 478.5 539.5 L 478.5 567.5 L 450.5 567.5 Z M 450.5 539.5 "/>
 </clipPath>
-<image id="image334" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -52,15 +52,15 @@
 <clipPath id="clip10">
   <path d="M 387.5 389.5 L 430.5 389.5 L 430.5 397.5 L 387.5 397.5 Z M 952.5 389.5 L 995.5 389.5 L 995.5 397.5 L 952.5 397.5 Z M 1468.5 389.5 L 1511.5 389.5 L 1511.5 397.5 L 1468.5 397.5 Z M 1208.5 389.5 L 1251.5 389.5 L 1251.5 397.5 L 1208.5 397.5 Z M 642.5 389.5 L 685.5 389.5 L 685.5 397.5 L 642.5 397.5 Z M 1416.5 389.5 L 1459.5 389.5 L 1459.5 397.5 L 1416.5 397.5 Z M 899.5 389.5 L 942.5 389.5 L 942.5 397.5 L 899.5 397.5 Z M 1156.5 389.5 L 1199.5 389.5 L 1199.5 397.5 L 1156.5 397.5 Z M 440.5 389.5 L 483.5 389.5 L 483.5 397.5 L 440.5 397.5 Z M 695.5 389.5 L 738.5 389.5 L 738.5 397.5 L 695.5 397.5 Z M 899.5 397.5 L 942.5 397.5 L 942.5 425.5 L 899.5 425.5 Z M 1416.5 397.5 L 1459.5 397.5 L 1459.5 425.5 L 1416.5 425.5 Z M 1156.5 397.5 L 1199.5 397.5 L 1199.5 425.5 L 1156.5 425.5 Z M 695.5 397.5 L 738.5 397.5 L 738.5 425.5 L 695.5 425.5 Z M 440.5 397.5 L 483.5 397.5 L 483.5 425.5 L 440.5 425.5 Z M 642.5 397.5 L 685.5 397.5 L 685.5 425.5 L 642.5 425.5 Z M 1468.5 397.5 L 1511.5 397.5 L 1511.5 425.5 L 1468.5 425.5 Z M 387.5 397.5 L 430.5 397.5 L 430.5 425.5 L 387.5 425.5 Z M 1208.5 397.5 L 1251.5 397.5 L 1251.5 425.5 L 1208.5 425.5 Z M 952.5 397.5 L 995.5 397.5 L 995.5 425.5 L 952.5 425.5 Z M 952.5 425.5 L 995.5 425.5 L 995.5 432.5 L 952.5 432.5 Z M 642.5 425.5 L 685.5 425.5 L 685.5 432.5 L 642.5 432.5 Z M 899.5 425.5 L 942.5 425.5 L 942.5 432.5 L 899.5 432.5 Z M 1416.5 425.5 L 1459.5 425.5 L 1459.5 432.5 L 1416.5 432.5 Z M 440.5 425.5 L 483.5 425.5 L 483.5 432.5 L 440.5 432.5 Z M 1208.5 425.5 L 1251.5 425.5 L 1251.5 432.5 L 1208.5 432.5 Z M 387.5 425.5 L 430.5 425.5 L 430.5 432.5 L 387.5 432.5 Z M 695.5 425.5 L 738.5 425.5 L 738.5 432.5 L 695.5 432.5 Z M 1468.5 425.5 L 1511.5 425.5 L 1511.5 432.5 L 1468.5 432.5 Z M 1156.5 425.5 L 1199.5 425.5 L 1199.5 432.5 L 1156.5 432.5 Z M 642.5 531.5 L 685.5 531.5 L 685.5 539.5 L 642.5 539.5 Z M 1416.5 531.5 L 1459.5 531.5 L 1459.5 539.5 L 1416.5 539.5 Z M 387.5 531.5 L 430.5 531.5 L 430.5 539.5 L 387.5 539.5 Z M 1468.5 531.5 L 1511.5 531.5 L 1511.5 539.5 L 1468.5 539.5 Z M 899.5 531.5 L 942.5 531.5 L 942.5 539.5 L 899.5 539.5 Z M 695.5 531.5 L 738.5 531.5 L 738.5 539.5 L 695.5 539.5 Z M 1208.5 531.5 L 1251.5 531.5 L 1251.5 539.5 L 1208.5 539.5 Z M 440.5 531.5 L 483.5 531.5 L 483.5 539.5 L 440.5 539.5 Z M 952.5 531.5 L 995.5 531.5 L 995.5 539.5 L 952.5 539.5 Z M 1156.5 531.5 L 1199.5 531.5 L 1199.5 539.5 L 1156.5 539.5 Z M 695.5 539.5 L 738.5 539.5 L 738.5 567.5 L 695.5 567.5 Z M 1416.5 539.5 L 1459.5 539.5 L 1459.5 567.5 L 1416.5 567.5 Z M 1468.5 539.5 L 1511.5 539.5 L 1511.5 567.5 L 1468.5 567.5 Z M 387.5 539.5 L 430.5 539.5 L 430.5 567.5 L 387.5 567.5 Z M 1208.5 539.5 L 1251.5 539.5 L 1251.5 567.5 L 1208.5 567.5 Z M 1156.5 539.5 L 1199.5 539.5 L 1199.5 567.5 L 1156.5 567.5 Z M 952.5 539.5 L 995.5 539.5 L 995.5 567.5 L 952.5 567.5 Z M 440.5 539.5 L 483.5 539.5 L 483.5 567.5 L 440.5 567.5 Z M 899.5 539.5 L 942.5 539.5 L 942.5 567.5 L 899.5 567.5 Z M 642.5 539.5 L 685.5 539.5 L 685.5 567.5 L 642.5 567.5 Z M 1208.5 567.5 L 1251.5 567.5 L 1251.5 574.5 L 1208.5 574.5 Z M 952.5 567.5 L 995.5 567.5 L 995.5 574.5 L 952.5 574.5 Z M 1416.5 567.5 L 1459.5 567.5 L 1459.5 574.5 L 1416.5 574.5 Z M 695.5 567.5 L 738.5 567.5 L 738.5 574.5 L 695.5 574.5 Z M 899.5 567.5 L 942.5 567.5 L 942.5 574.5 L 899.5 574.5 Z M 1468.5 567.5 L 1511.5 567.5 L 1511.5 574.5 L 1468.5 574.5 Z M 642.5 567.5 L 685.5 567.5 L 685.5 574.5 L 642.5 574.5 Z M 1156.5 567.5 L 1199.5 567.5 L 1199.5 574.5 L 1156.5 574.5 Z M 387.5 567.5 L 430.5 567.5 L 430.5 574.5 L 387.5 574.5 Z M 440.5 567.5 L 483.5 567.5 L 483.5 574.5 L 440.5 574.5 Z M 440.5 567.5 "/>
 </clipPath>
-<image id="image335" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image366" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <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="#image366"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface329">
+<g id="surface360">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 799 L 1712 799 M 206 758 L 1712 758 M 206 758 L 206 799 M 1712 758 L 1712 799 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 799 L 1712 799 M 206 758 L 1712 758 M 1712 799 L 1712 758 M 206 799 L 206 758 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 246 L 206 251 M 203 249 L 208 249 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 244 L 206 253 M 201 249 L 210 249 M 205 250 L 207 250 M 205 248 L 207 248 M 205 248 L 205 250 M 207 248 L 207 250 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.svg b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.svg
index 2fd949e..934ff3f 100644
--- a/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.svg
+++ b/cells/sleep_sergate_plv/sky130_fd_sc_lp__sleep_sergate_plv_28.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 249.5 L 1743.5 249.5 L 1743.5 557.5 L 175.5 557.5 Z M 351.5 557.5 L 1566.5 557.5 L 1566.5 695.5 L 351.5 695.5 Z M 351.5 557.5 "/>
 </clipPath>
-<image id="image333" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image333"/>
+  <use xlink:href="#image365"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -23,9 +23,9 @@
 <clipPath id="clip5">
   <path d="M 380.5 363.5 L 1536.5 363.5 L 1536.5 388.5 L 380.5 388.5 Z M 380.5 434.5 L 1536.5 434.5 L 1536.5 459.5 L 380.5 459.5 Z M 380.5 505.5 L 1536.5 505.5 L 1536.5 530.5 L 380.5 530.5 Z M 380.5 576.5 L 1536.5 576.5 L 1536.5 601.5 L 380.5 601.5 Z M 380.5 576.5 "/>
 </clipPath>
-<image id="image334" 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="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image334"/>
+  <use xlink:href="#image366"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -39,9 +39,9 @@
 <clipPath id="clip8">
   <path d="M 232.5 266.5 L 260.5 266.5 L 260.5 294.5 L 232.5 294.5 Z M 1658.5 266.5 L 1686.5 266.5 L 1686.5 294.5 L 1658.5 294.5 Z M 1579.5 266.5 L 1607.5 266.5 L 1607.5 294.5 L 1579.5 294.5 Z M 1500.5 266.5 L 1528.5 266.5 L 1528.5 294.5 L 1500.5 294.5 Z M 1421.5 266.5 L 1449.5 266.5 L 1449.5 294.5 L 1421.5 294.5 Z M 1341.5 266.5 L 1369.5 266.5 L 1369.5 294.5 L 1341.5 294.5 Z M 1262.5 266.5 L 1290.5 266.5 L 1290.5 294.5 L 1262.5 294.5 Z M 1183.5 266.5 L 1211.5 266.5 L 1211.5 294.5 L 1183.5 294.5 Z M 1104.5 266.5 L 1132.5 266.5 L 1132.5 294.5 L 1104.5 294.5 Z M 1024.5 266.5 L 1052.5 266.5 L 1052.5 294.5 L 1024.5 294.5 Z M 945.5 266.5 L 973.5 266.5 L 973.5 294.5 L 945.5 294.5 Z M 866.5 266.5 L 894.5 266.5 L 894.5 294.5 L 866.5 294.5 Z M 787.5 266.5 L 815.5 266.5 L 815.5 294.5 L 787.5 294.5 Z M 707.5 266.5 L 735.5 266.5 L 735.5 294.5 L 707.5 294.5 Z M 628.5 266.5 L 656.5 266.5 L 656.5 294.5 L 628.5 294.5 Z M 549.5 266.5 L 577.5 266.5 L 577.5 294.5 L 549.5 294.5 Z M 469.5 266.5 L 498.5 266.5 L 498.5 294.5 L 469.5 294.5 Z M 390.5 266.5 L 418.5 266.5 L 418.5 294.5 L 390.5 294.5 Z M 311.5 266.5 L 339.5 266.5 L 339.5 294.5 L 311.5 294.5 Z M 519.5 326.5 L 547.5 326.5 L 547.5 354.5 L 519.5 354.5 Z M 1349.5 326.5 L 1377.5 326.5 L 1377.5 354.5 L 1349.5 354.5 Z M 1289.5 326.5 L 1317.5 326.5 L 1317.5 354.5 L 1289.5 354.5 Z M 1092.5 326.5 L 1120.5 326.5 L 1120.5 354.5 L 1092.5 354.5 Z M 1033.5 326.5 L 1061.5 326.5 L 1061.5 354.5 L 1033.5 354.5 Z M 835.5 326.5 L 863.5 326.5 L 863.5 354.5 L 835.5 354.5 Z M 776.5 326.5 L 804.5 326.5 L 804.5 354.5 L 776.5 354.5 Z M 578.5 326.5 L 607.5 326.5 L 607.5 354.5 L 578.5 354.5 Z M 390.5 397.5 L 418.5 397.5 L 418.5 425.5 L 390.5 425.5 Z M 1480.5 397.5 L 1508.5 397.5 L 1508.5 425.5 L 1480.5 425.5 Z M 1421.5 397.5 L 1449.5 397.5 L 1449.5 425.5 L 1421.5 425.5 Z M 1220.5 397.5 L 1248.5 397.5 L 1248.5 425.5 L 1220.5 425.5 Z M 1161.5 397.5 L 1189.5 397.5 L 1189.5 425.5 L 1161.5 425.5 Z M 963.5 397.5 L 991.5 397.5 L 991.5 425.5 L 963.5 425.5 Z M 904.5 397.5 L 932.5 397.5 L 932.5 425.5 L 904.5 425.5 Z M 706.5 397.5 L 734.5 397.5 L 734.5 425.5 L 706.5 425.5 Z M 647.5 397.5 L 675.5 397.5 L 675.5 425.5 L 647.5 425.5 Z M 450.5 397.5 L 478.5 397.5 L 478.5 425.5 L 450.5 425.5 Z M 519.5 468.5 L 547.5 468.5 L 547.5 496.5 L 519.5 496.5 Z M 1349.5 468.5 L 1377.5 468.5 L 1377.5 496.5 L 1349.5 496.5 Z M 1289.5 468.5 L 1317.5 468.5 L 1317.5 496.5 L 1289.5 496.5 Z M 1092.5 468.5 L 1120.5 468.5 L 1120.5 496.5 L 1092.5 496.5 Z M 1033.5 468.5 L 1061.5 468.5 L 1061.5 496.5 L 1033.5 496.5 Z M 835.5 468.5 L 863.5 468.5 L 863.5 496.5 L 835.5 496.5 Z M 776.5 468.5 L 804.5 468.5 L 804.5 496.5 L 776.5 496.5 Z M 578.5 468.5 L 607.5 468.5 L 607.5 496.5 L 578.5 496.5 Z M 390.5 539.5 L 418.5 539.5 L 418.5 567.5 L 390.5 567.5 Z M 1480.5 539.5 L 1508.5 539.5 L 1508.5 567.5 L 1480.5 567.5 Z M 1421.5 539.5 L 1449.5 539.5 L 1449.5 567.5 L 1421.5 567.5 Z M 1220.5 539.5 L 1248.5 539.5 L 1248.5 567.5 L 1220.5 567.5 Z M 1161.5 539.5 L 1189.5 539.5 L 1189.5 567.5 L 1161.5 567.5 Z M 963.5 539.5 L 991.5 539.5 L 991.5 567.5 L 963.5 567.5 Z M 904.5 539.5 L 932.5 539.5 L 932.5 567.5 L 904.5 567.5 Z M 706.5 539.5 L 734.5 539.5 L 734.5 567.5 L 706.5 567.5 Z M 647.5 539.5 L 675.5 539.5 L 675.5 567.5 L 647.5 567.5 Z M 450.5 539.5 L 478.5 539.5 L 478.5 567.5 L 450.5 567.5 Z M 519.5 610.5 L 547.5 610.5 L 547.5 638.5 L 519.5 638.5 Z M 1349.5 610.5 L 1377.5 610.5 L 1377.5 638.5 L 1349.5 638.5 Z M 1289.5 610.5 L 1317.5 610.5 L 1317.5 638.5 L 1289.5 638.5 Z M 1092.5 610.5 L 1120.5 610.5 L 1120.5 638.5 L 1092.5 638.5 Z M 1033.5 610.5 L 1061.5 610.5 L 1061.5 638.5 L 1033.5 638.5 Z M 835.5 610.5 L 863.5 610.5 L 863.5 638.5 L 835.5 638.5 Z M 776.5 610.5 L 804.5 610.5 L 804.5 638.5 L 776.5 638.5 Z M 578.5 610.5 L 607.5 610.5 L 607.5 638.5 L 578.5 638.5 Z M 578.5 610.5 "/>
 </clipPath>
-<image id="image335" 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="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image335"/>
+  <use xlink:href="#image367"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -52,15 +52,15 @@
 <clipPath id="clip10">
   <path d="M 387.5 389.5 L 430.5 389.5 L 430.5 397.5 L 387.5 397.5 Z M 952.5 389.5 L 995.5 389.5 L 995.5 397.5 L 952.5 397.5 Z M 1468.5 389.5 L 1511.5 389.5 L 1511.5 397.5 L 1468.5 397.5 Z M 1208.5 389.5 L 1251.5 389.5 L 1251.5 397.5 L 1208.5 397.5 Z M 642.5 389.5 L 685.5 389.5 L 685.5 397.5 L 642.5 397.5 Z M 1416.5 389.5 L 1459.5 389.5 L 1459.5 397.5 L 1416.5 397.5 Z M 899.5 389.5 L 942.5 389.5 L 942.5 397.5 L 899.5 397.5 Z M 1156.5 389.5 L 1199.5 389.5 L 1199.5 397.5 L 1156.5 397.5 Z M 440.5 389.5 L 483.5 389.5 L 483.5 397.5 L 440.5 397.5 Z M 695.5 389.5 L 738.5 389.5 L 738.5 397.5 L 695.5 397.5 Z M 899.5 397.5 L 942.5 397.5 L 942.5 425.5 L 899.5 425.5 Z M 1416.5 397.5 L 1459.5 397.5 L 1459.5 425.5 L 1416.5 425.5 Z M 1156.5 397.5 L 1199.5 397.5 L 1199.5 425.5 L 1156.5 425.5 Z M 695.5 397.5 L 738.5 397.5 L 738.5 425.5 L 695.5 425.5 Z M 440.5 397.5 L 483.5 397.5 L 483.5 425.5 L 440.5 425.5 Z M 642.5 397.5 L 685.5 397.5 L 685.5 425.5 L 642.5 425.5 Z M 1468.5 397.5 L 1511.5 397.5 L 1511.5 425.5 L 1468.5 425.5 Z M 387.5 397.5 L 430.5 397.5 L 430.5 425.5 L 387.5 425.5 Z M 1208.5 397.5 L 1251.5 397.5 L 1251.5 425.5 L 1208.5 425.5 Z M 952.5 397.5 L 995.5 397.5 L 995.5 425.5 L 952.5 425.5 Z M 952.5 425.5 L 995.5 425.5 L 995.5 432.5 L 952.5 432.5 Z M 642.5 425.5 L 685.5 425.5 L 685.5 432.5 L 642.5 432.5 Z M 899.5 425.5 L 942.5 425.5 L 942.5 432.5 L 899.5 432.5 Z M 1416.5 425.5 L 1459.5 425.5 L 1459.5 432.5 L 1416.5 432.5 Z M 440.5 425.5 L 483.5 425.5 L 483.5 432.5 L 440.5 432.5 Z M 1208.5 425.5 L 1251.5 425.5 L 1251.5 432.5 L 1208.5 432.5 Z M 387.5 425.5 L 430.5 425.5 L 430.5 432.5 L 387.5 432.5 Z M 695.5 425.5 L 738.5 425.5 L 738.5 432.5 L 695.5 432.5 Z M 1468.5 425.5 L 1511.5 425.5 L 1511.5 432.5 L 1468.5 432.5 Z M 1156.5 425.5 L 1199.5 425.5 L 1199.5 432.5 L 1156.5 432.5 Z M 642.5 531.5 L 685.5 531.5 L 685.5 539.5 L 642.5 539.5 Z M 1416.5 531.5 L 1459.5 531.5 L 1459.5 539.5 L 1416.5 539.5 Z M 387.5 531.5 L 430.5 531.5 L 430.5 539.5 L 387.5 539.5 Z M 1468.5 531.5 L 1511.5 531.5 L 1511.5 539.5 L 1468.5 539.5 Z M 899.5 531.5 L 942.5 531.5 L 942.5 539.5 L 899.5 539.5 Z M 695.5 531.5 L 738.5 531.5 L 738.5 539.5 L 695.5 539.5 Z M 1208.5 531.5 L 1251.5 531.5 L 1251.5 539.5 L 1208.5 539.5 Z M 440.5 531.5 L 483.5 531.5 L 483.5 539.5 L 440.5 539.5 Z M 952.5 531.5 L 995.5 531.5 L 995.5 539.5 L 952.5 539.5 Z M 1156.5 531.5 L 1199.5 531.5 L 1199.5 539.5 L 1156.5 539.5 Z M 695.5 539.5 L 738.5 539.5 L 738.5 567.5 L 695.5 567.5 Z M 1416.5 539.5 L 1459.5 539.5 L 1459.5 567.5 L 1416.5 567.5 Z M 1468.5 539.5 L 1511.5 539.5 L 1511.5 567.5 L 1468.5 567.5 Z M 387.5 539.5 L 430.5 539.5 L 430.5 567.5 L 387.5 567.5 Z M 1208.5 539.5 L 1251.5 539.5 L 1251.5 567.5 L 1208.5 567.5 Z M 1156.5 539.5 L 1199.5 539.5 L 1199.5 567.5 L 1156.5 567.5 Z M 952.5 539.5 L 995.5 539.5 L 995.5 567.5 L 952.5 567.5 Z M 440.5 539.5 L 483.5 539.5 L 483.5 567.5 L 440.5 567.5 Z M 899.5 539.5 L 942.5 539.5 L 942.5 567.5 L 899.5 567.5 Z M 642.5 539.5 L 685.5 539.5 L 685.5 567.5 L 642.5 567.5 Z M 1208.5 567.5 L 1251.5 567.5 L 1251.5 574.5 L 1208.5 574.5 Z M 952.5 567.5 L 995.5 567.5 L 995.5 574.5 L 952.5 574.5 Z M 1416.5 567.5 L 1459.5 567.5 L 1459.5 574.5 L 1416.5 574.5 Z M 695.5 567.5 L 738.5 567.5 L 738.5 574.5 L 695.5 574.5 Z M 899.5 567.5 L 942.5 567.5 L 942.5 574.5 L 899.5 574.5 Z M 1468.5 567.5 L 1511.5 567.5 L 1511.5 574.5 L 1468.5 574.5 Z M 642.5 567.5 L 685.5 567.5 L 685.5 574.5 L 642.5 574.5 Z M 1156.5 567.5 L 1199.5 567.5 L 1199.5 574.5 L 1156.5 574.5 Z M 387.5 567.5 L 430.5 567.5 L 430.5 574.5 L 387.5 574.5 Z M 440.5 567.5 L 483.5 567.5 L 483.5 574.5 L 440.5 574.5 Z M 440.5 567.5 "/>
 </clipPath>
-<image id="image336" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
+<image id="image368" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAABASURBVDiN7dCxEQAgCATBhf57xoBUsQAluYThnwtQxIGpQJyYlN7fM6bzgXSZnPK75JBPddz85rXD9/A9POdhAZH9ZDMXFbbWAAAAAElFTkSuQmCC"/>
 <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="#image368"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface330">
+<g id="surface362">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -154,6 +154,5 @@
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 799 L 1712 799 M 206 758 L 1712 758 M 206 758 L 206 799 M 1712 758 L 1712 799 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 206 799 L 1712 799 M 206 758 L 1712 758 M 1712 799 L 1712 758 M 206 799 L 206 758 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,0%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 206 246 L 206 251 M 203 249 L 208 249 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="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 244 L 206 253 M 201 249 L 210 249 M 205 250 L 207 250 M 205 248 L 207 248 M 205 248 L 205 250 M 207 248 L 207 250 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.svg b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.svg
index 253f111..1f37ec9 100644
--- a/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.svg
+++ b/cells/srdlrtp/sky130_fd_sc_lp__srdlrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 299.5 L 1744.5 299.5 L 1744.5 536.5 L 174.5 536.5 Z M 839.5 536.5 L 1111.5 536.5 L 1111.5 568.5 L 839.5 568.5 Z M 839.5 536.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 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="#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 297.5 631.5 L 316.5 631.5 L 316.5 684.5 L 297.5 684.5 Z M 411.5 631.5 L 430.5 631.5 L 430.5 684.5 L 411.5 684.5 Z M 632.5 631.5 L 651.5 631.5 L 651.5 684.5 L 632.5 684.5 Z M 716.5 631.5 L 735.5 631.5 L 735.5 684.5 L 716.5 684.5 Z M 252.5 631.5 L 271.5 631.5 L 271.5 684.5 L 252.5 684.5 Z M 857.5 631.5 L 876.5 631.5 L 876.5 684.5 L 857.5 684.5 Z M 457.5 631.5 L 476.5 631.5 L 476.5 684.5 L 457.5 684.5 Z M 1077.5 631.5 L 1096.5 631.5 L 1096.5 684.5 L 1077.5 684.5 Z M 1031.5 631.5 L 1050.5 631.5 L 1050.5 684.5 L 1031.5 684.5 Z M 952.5 631.5 L 971.5 631.5 L 971.5 684.5 L 952.5 684.5 Z M 906.5 631.5 L 925.5 631.5 L 925.5 684.5 L 906.5 684.5 Z M 357.5 631.5 L 376.5 631.5 L 376.5 684.5 L 357.5 684.5 Z M 541.5 631.5 L 560.5 631.5 L 560.5 684.5 L 541.5 684.5 Z M 586.5 631.5 L 605.5 631.5 L 605.5 684.5 L 586.5 684.5 Z M 1647.5 604.5 L 1666.5 604.5 L 1666.5 711.5 L 1647.5 711.5 Z M 1578.5 657.5 L 1597.5 657.5 L 1597.5 711.5 L 1578.5 711.5 Z M 1264.5 663.5 L 1283.5 663.5 L 1283.5 716.5 L 1264.5 716.5 Z M 1339.5 663.5 L 1358.5 663.5 L 1358.5 716.5 L 1339.5 716.5 Z M 1394.5 663.5 L 1413.5 663.5 L 1413.5 716.5 L 1394.5 716.5 Z M 1440.5 663.5 L 1459.5 663.5 L 1459.5 716.5 L 1440.5 716.5 Z M 1440.5 663.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 493.5 356.5 L 512.5 356.5 L 512.5 437.5 L 493.5 437.5 Z M 447.5 356.5 L 466.5 356.5 L 466.5 437.5 L 447.5 437.5 Z M 315.5 356.5 L 334.5 356.5 L 334.5 437.5 L 315.5 437.5 Z M 252.5 356.5 L 271.5 356.5 L 271.5 437.5 L 252.5 437.5 Z M 393.5 356.5 L 412.5 356.5 L 412.5 437.5 L 393.5 437.5 Z M 853.5 369.5 L 872.5 369.5 L 872.5 450.5 L 853.5 450.5 Z M 937.5 369.5 L 956.5 369.5 L 956.5 450.5 L 937.5 450.5 Z M 1159.5 353.5 L 1190.5 353.5 L 1190.5 480.5 L 1159.5 480.5 Z M 1285.5 353.5 L 1317.5 353.5 L 1317.5 480.5 L 1285.5 480.5 Z M 1440.5 353.5 L 1472.5 353.5 L 1472.5 480.5 L 1440.5 480.5 Z M 1217.5 353.5 L 1249.5 353.5 L 1249.5 480.5 L 1217.5 480.5 Z M 1344.5 353.5 L 1375.5 353.5 L 1375.5 480.5 L 1344.5 480.5 Z M 1006.5 369.5 L 1037.5 369.5 L 1037.5 496.5 L 1006.5 496.5 Z M 713.5 419.5 L 732.5 419.5 L 732.5 500.5 L 713.5 500.5 Z M 1578.5 432.5 L 1597.5 432.5 L 1597.5 513.5 L 1578.5 513.5 Z M 1647.5 353.5 L 1666.5 353.5 L 1666.5 513.5 L 1647.5 513.5 Z M 1647.5 353.5 "/>
 </clipPath>
-<image id="image365" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image365"/>
+  <use xlink:href="#image392"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1496.5 377.5 L 1517.5 377.5 L 1517.5 393.5 L 1496.5 393.5 Z M 1252.5 377.5 L 1274.5 377.5 L 1274.5 393.5 L 1252.5 393.5 Z M 948.5 377.5 L 970.5 377.5 L 970.5 399.5 L 948.5 399.5 Z M 887.5 377.5 L 909.5 377.5 L 909.5 399.5 L 887.5 399.5 Z M 1496.5 393.5 L 1517.5 393.5 L 1517.5 399.5 L 1496.5 399.5 Z M 1252.5 393.5 L 1274.5 393.5 L 1274.5 399.5 L 1252.5 399.5 Z M 340.5 477.5 L 361.5 477.5 L 361.5 491.5 L 340.5 491.5 Z M 1374.5 477.5 L 1396.5 477.5 L 1396.5 498.5 L 1374.5 498.5 Z M 340.5 491.5 L 361.5 491.5 L 361.5 498.5 L 340.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="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>
@@ -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 932.039062 583.554688 L 932.039062 592.671875 L 947.71875 592.671875 L 947.71875 595.660156 L 928.644531 595.660156 L 928.644531 569.078125 L 947.0625 569.078125 L 947.0625 572.066406 L 932.039062 572.066406 L 932.039062 580.566406 L 946.515625 580.566406 L 946.515625 583.554688 Z M 932.039062 583.554688 "/>
 <path style="fill:none;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 508 L 909 508 M 887 487 L 909 487 M 887 487 L 887 508 M 909 487 L 909 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 887 508 L 909 508 M 887 487 L 909 487 M 909 508 L 909 487 M 887 508 L 887 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/srdlstp/sky130_fd_sc_lp__srdlstp_1.svg b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.svg
index 9592d4f..94c1b2d 100644
--- a/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.svg
+++ b/cells/srdlstp/sky130_fd_sc_lp__srdlstp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 316.5 L 1744.5 316.5 L 1744.5 536.5 L 174.5 536.5 Z M 809.5 536.5 L 1127.5 536.5 L 1127.5 566.5 L 809.5 566.5 Z M 809.5 536.5 "/>
 </clipPath>
-<image id="image381" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image408" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+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="#image408"/>
 </pattern>
 <mask 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="#image381"/>
+  <use xlink:href="#image408"/>
 </pattern>
 <mask id="mask1">
 <rect 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 578.5 L 1342.5 578.5 L 1342.5 628.5 L 1325.5 628.5 Z M 459.5 578.5 L 477.5 578.5 L 477.5 628.5 L 459.5 628.5 Z M 1282.5 578.5 L 1300.5 578.5 L 1300.5 628.5 L 1282.5 628.5 Z M 1237.5 578.5 L 1254.5 578.5 L 1254.5 628.5 L 1237.5 628.5 Z M 1533.5 604.5 L 1551.5 604.5 L 1551.5 653.5 L 1533.5 653.5 Z M 1482.5 604.5 L 1500.5 604.5 L 1500.5 653.5 L 1482.5 653.5 Z M 1440.5 604.5 L 1458.5 604.5 L 1458.5 653.5 L 1440.5 653.5 Z M 355.5 578.5 L 373.5 578.5 L 373.5 654.5 L 355.5 654.5 Z M 398.5 578.5 L 415.5 578.5 L 415.5 654.5 L 398.5 654.5 Z M 1095.5 606.5 L 1112.5 606.5 L 1112.5 656.5 L 1095.5 656.5 Z M 984.5 606.5 L 1002.5 606.5 L 1002.5 656.5 L 984.5 656.5 Z M 1035.5 606.5 L 1052.5 606.5 L 1052.5 656.5 L 1035.5 656.5 Z M 921.5 606.5 L 939.5 606.5 L 939.5 656.5 L 921.5 656.5 Z M 243.5 640.5 L 261.5 640.5 L 261.5 690.5 L 243.5 690.5 Z M 1653.5 598.5 L 1671.5 598.5 L 1671.5 697.5 L 1653.5 697.5 Z M 571.5 627.5 L 589.5 627.5 L 589.5 703.5 L 571.5 703.5 Z M 760.5 653.5 L 778.5 653.5 L 778.5 703.5 L 760.5 703.5 Z M 675.5 653.5 L 693.5 653.5 L 693.5 703.5 L 675.5 703.5 Z M 718.5 653.5 L 735.5 653.5 L 735.5 703.5 L 718.5 703.5 Z M 614.5 627.5 L 631.5 627.5 L 631.5 703.5 L 614.5 703.5 Z M 614.5 627.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image409" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/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="#image409"/>
 </pattern>
 <mask id="mask2">
 <rect 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 381.5 L 1252.5 381.5 L 1252.5 456.5 L 1235.5 456.5 Z M 548.5 366.5 L 566.5 366.5 L 566.5 465.5 L 548.5 465.5 Z M 591.5 366.5 L 608.5 366.5 L 608.5 465.5 L 591.5 465.5 Z M 655.5 366.5 L 685.5 366.5 L 685.5 484.5 L 655.5 484.5 Z M 713.5 366.5 L 742.5 366.5 L 742.5 484.5 L 713.5 484.5 Z M 434.5 417.5 L 452.5 417.5 L 452.5 492.5 L 434.5 492.5 Z M 245.5 420.5 L 262.5 420.5 L 262.5 495.5 L 245.5 495.5 Z M 308.5 396.5 L 325.5 396.5 L 325.5 495.5 L 308.5 495.5 Z M 1563.5 439.5 L 1581.5 439.5 L 1581.5 514.5 L 1563.5 514.5 Z M 1377.5 396.5 L 1406.5 396.5 L 1406.5 514.5 L 1377.5 514.5 Z M 1653.5 366.5 L 1671.5 366.5 L 1671.5 514.5 L 1653.5 514.5 Z M 1299.5 438.5 L 1317.5 438.5 L 1317.5 514.5 L 1299.5 514.5 Z M 900.5 412.5 L 929.5 412.5 L 929.5 530.5 L 900.5 530.5 Z M 1043.5 412.5 L 1072.5 412.5 L 1072.5 530.5 L 1043.5 530.5 Z M 958.5 412.5 L 987.5 412.5 L 987.5 530.5 L 958.5 530.5 Z M 958.5 412.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/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="#image410"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 779.5 388.5 L 799.5 388.5 L 799.5 408.5 L 779.5 408.5 Z M 1288.5 388.5 L 1308.5 388.5 L 1308.5 408.5 L 1288.5 408.5 Z M 1231.5 388.5 L 1251.5 388.5 L 1251.5 408.5 L 1231.5 408.5 Z M 1005.5 388.5 L 1025.5 388.5 L 1025.5 408.5 L 1005.5 408.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="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+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="#image411"/>
 </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="surface405">
 <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 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/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.svg b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.svg
index afeb565..b10ac19 100644
--- a/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.svg
+++ b/cells/srdlxtp/sky130_fd_sc_lp__srdlxtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 175.5 229.5 L 1743.5 229.5 L 1743.5 537.5 L 175.5 537.5 Z M 1052.5 537.5 L 1443.5 537.5 L 1443.5 563.5 L 1052.5 563.5 Z M 1052.5 537.5 "/>
 </clipPath>
-<image id="image400" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image428" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image400"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image400"/>
+  <use xlink:href="#image428"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 275.5 593.5 L 300.5 593.5 L 300.5 662.5 L 275.5 662.5 Z M 1618.5 626.5 L 1643.5 626.5 L 1643.5 765.5 L 1618.5 765.5 Z M 1528.5 695.5 L 1553.5 695.5 L 1553.5 765.5 L 1528.5 765.5 Z M 574.5 702.5 L 599.5 702.5 L 599.5 771.5 L 574.5 771.5 Z M 1364.5 702.5 L 1389.5 702.5 L 1389.5 771.5 L 1364.5 771.5 Z M 1305.5 702.5 L 1330.5 702.5 L 1330.5 771.5 L 1305.5 771.5 Z M 1246.5 702.5 L 1270.5 702.5 L 1270.5 771.5 L 1246.5 771.5 Z M 1082.5 702.5 L 1107.5 702.5 L 1107.5 771.5 L 1082.5 771.5 Z M 1023.5 702.5 L 1047.5 702.5 L 1047.5 771.5 L 1023.5 771.5 Z M 952.5 702.5 L 976.5 702.5 L 976.5 771.5 L 952.5 771.5 Z M 892.5 702.5 L 917.5 702.5 L 917.5 771.5 L 892.5 771.5 Z M 828.5 702.5 L 853.5 702.5 L 853.5 771.5 L 828.5 771.5 Z M 728.5 702.5 L 753.5 702.5 L 753.5 771.5 L 728.5 771.5 Z M 449.5 702.5 L 474.5 702.5 L 474.5 771.5 L 449.5 771.5 Z M 668.5 702.5 L 693.5 702.5 L 693.5 771.5 L 668.5 771.5 Z M 668.5 702.5 "/>
 </clipPath>
-<image id="image401" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image429" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image401"/>
+  <use xlink:href="#image429"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 440.5 299.5 L 465.5 299.5 L 465.5 405.5 L 440.5 405.5 Z M 694.5 299.5 L 719.5 299.5 L 719.5 405.5 L 694.5 405.5 Z M 776.5 299.5 L 801.5 299.5 L 801.5 405.5 L 776.5 405.5 Z M 623.5 299.5 L 648.5 299.5 L 648.5 405.5 L 623.5 405.5 Z M 275.5 306.5 L 300.5 306.5 L 300.5 411.5 L 275.5 411.5 Z M 947.5 299.5 L 988.5 299.5 L 988.5 464.5 L 947.5 464.5 Z M 866.5 299.5 L 907.5 299.5 L 907.5 464.5 L 866.5 464.5 Z M 1618.5 299.5 L 1643.5 299.5 L 1643.5 507.5 L 1618.5 507.5 Z M 1516.5 402.5 L 1541.5 402.5 L 1541.5 507.5 L 1516.5 507.5 Z M 1129.5 369.5 L 1170.5 369.5 L 1170.5 534.5 L 1129.5 534.5 Z M 1236.5 428.5 L 1260.5 428.5 L 1260.5 534.5 L 1236.5 534.5 Z M 1330.5 428.5 L 1355.5 428.5 L 1355.5 534.5 L 1330.5 534.5 Z M 1330.5 428.5 "/>
 </clipPath>
-<image id="image402" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image430" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image402"/>
+  <use xlink:href="#image430"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1024.5 331.5 L 1052.5 331.5 L 1052.5 343.5 L 1024.5 343.5 Z M 1024.5 343.5 L 1052.5 343.5 L 1052.5 359.5 L 1024.5 359.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="image403" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image431" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image403"/>
+  <use xlink:href="#image431"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface397">
+<g id="surface425">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 1244.261719 537.074219 L 1244.261719 549.347656 L 1265.371094 549.347656 L 1265.371094 553.371094 L 1239.695312 553.371094 L 1239.695312 517.585938 L 1264.484375 517.585938 L 1264.484375 521.609375 L 1244.261719 521.609375 L 1244.261719 533.046875 L 1263.75 533.046875 L 1263.75 537.074219 Z M 1244.261719 537.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 1183 558 L 1211 558 M 1183 530 L 1211 530 M 1183 530 L 1183 558 M 1211 530 L 1211 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 1183 558 L 1211 558 M 1183 530 L 1211 530 M 1211 558 L 1211 530 M 1183 558 L 1183 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/sregrbp/sky130_fd_sc_lp__sregrbp_1.svg b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.svg
index f00e1c1..170a03c 100644
--- a/cells/sregrbp/sky130_fd_sc_lp__sregrbp_1.svg
+++ b/cells/sregrbp/sky130_fd_sc_lp__sregrbp_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 579.5 535.5 L 739.5 535.5 L 739.5 540.5 L 579.5 540.5 Z M 579.5 535.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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 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="#image341"/>
+  <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 1188.5 577.5 L 1204.5 577.5 L 1204.5 645.5 L 1188.5 645.5 Z M 1147.5 577.5 L 1163.5 577.5 L 1163.5 645.5 L 1147.5 645.5 Z M 975.5 580.5 L 991.5 580.5 L 991.5 648.5 L 975.5 648.5 Z M 816.5 603.5 L 832.5 603.5 L 832.5 648.5 L 816.5 648.5 Z M 878.5 603.5 L 894.5 603.5 L 894.5 648.5 L 878.5 648.5 Z M 917.5 603.5 L 933.5 603.5 L 933.5 648.5 L 917.5 648.5 Z M 1016.5 580.5 L 1032.5 580.5 L 1032.5 648.5 L 1016.5 648.5 Z M 1258.5 618.5 L 1274.5 618.5 L 1274.5 663.5 L 1258.5 663.5 Z M 1300.5 618.5 L 1316.5 618.5 L 1316.5 663.5 L 1300.5 663.5 Z M 1501.5 636.5 L 1517.5 636.5 L 1517.5 681.5 L 1501.5 681.5 Z M 1606.5 591.5 L 1622.5 591.5 L 1622.5 681.5 L 1606.5 681.5 Z M 1660.5 591.5 L 1676.5 591.5 L 1676.5 681.5 L 1660.5 681.5 Z M 239.5 638.5 L 255.5 638.5 L 255.5 682.5 L 239.5 682.5 Z M 385.5 641.5 L 401.5 641.5 L 401.5 686.5 L 385.5 686.5 Z M 523.5 641.5 L 539.5 641.5 L 539.5 686.5 L 523.5 686.5 Z M 344.5 641.5 L 360.5 641.5 L 360.5 686.5 L 344.5 686.5 Z M 633.5 597.5 L 649.5 597.5 L 649.5 686.5 L 633.5 686.5 Z M 1396.5 618.5 L 1412.5 618.5 L 1412.5 686.5 L 1396.5 686.5 Z M 1358.5 618.5 L 1374.5 618.5 L 1374.5 686.5 L 1358.5 686.5 Z M 478.5 641.5 L 493.5 641.5 L 493.5 686.5 L 478.5 686.5 Z M 695.5 597.5 L 711.5 597.5 L 711.5 686.5 L 695.5 686.5 Z M 436.5 641.5 L 452.5 641.5 L 452.5 686.5 L 436.5 686.5 Z M 436.5 641.5 "/>
 </clipPath>
-<image id="image342" 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="#image342"/>
+  <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 264.5 384.5 L 280.5 384.5 L 280.5 429.5 L 264.5 429.5 Z M 318.5 384.5 L 334.5 384.5 L 334.5 429.5 L 318.5 429.5 Z M 462.5 384.5 L 478.5 384.5 L 478.5 429.5 L 462.5 429.5 Z M 516.5 384.5 L 532.5 384.5 L 532.5 429.5 L 516.5 429.5 Z M 405.5 384.5 L 421.5 384.5 L 421.5 429.5 L 405.5 429.5 Z M 360.5 384.5 L 376.5 384.5 L 376.5 429.5 L 360.5 429.5 Z M 870.5 421.5 L 886.5 421.5 L 886.5 465.5 L 870.5 465.5 Z M 828.5 421.5 L 844.5 421.5 L 844.5 465.5 L 828.5 465.5 Z M 783.5 421.5 L 799.5 421.5 L 799.5 465.5 L 783.5 465.5 Z M 1370.5 382.5 L 1386.5 382.5 L 1386.5 471.5 L 1370.5 471.5 Z M 1304.5 427.5 L 1320.5 427.5 L 1320.5 471.5 L 1304.5 471.5 Z M 1262.5 427.5 L 1278.5 427.5 L 1278.5 471.5 L 1262.5 471.5 Z M 1416.5 382.5 L 1432.5 382.5 L 1432.5 471.5 L 1416.5 471.5 Z M 1482.5 404.5 L 1498.5 404.5 L 1498.5 471.5 L 1482.5 471.5 Z M 1204.5 405.5 L 1220.5 405.5 L 1220.5 494.5 L 1204.5 494.5 Z M 1150.5 424.5 L 1166.5 424.5 L 1166.5 513.5 L 1150.5 513.5 Z M 975.5 424.5 L 991.5 424.5 L 991.5 513.5 L 975.5 513.5 Z M 1045.5 424.5 L 1061.5 424.5 L 1061.5 513.5 L 1045.5 513.5 Z M 1603.5 382.5 L 1619.5 382.5 L 1619.5 516.5 L 1603.5 516.5 Z M 1657.5 382.5 L 1673.5 382.5 L 1673.5 516.5 L 1657.5 516.5 Z M 628.5 388.5 L 644.5 388.5 L 644.5 521.5 L 628.5 521.5 Z M 674.5 388.5 L 690.5 388.5 L 690.5 521.5 L 674.5 521.5 Z M 674.5 388.5 "/>
 </clipPath>
-<image id="image343" 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="#image343"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 211.5 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 1689.5 486.5 L 1707.5 486.5 L 1707.5 490.5 L 1689.5 490.5 Z M 1689.5 490.5 L 1707.5 490.5 L 1707.5 504.5 L 1689.5 504.5 Z M 1026.5 486.5 L 1044.5 486.5 L 1044.5 504.5 L 1026.5 504.5 Z M 1383.5 486.5 L 1401.5 486.5 L 1401.5 504.5 L 1383.5 504.5 Z M 771.5 525.5 L 789.5 525.5 L 789.5 535.5 L 771.5 535.5 Z M 771.5 535.5 L 789.5 535.5 L 789.5 543.5 L 771.5 543.5 Z M 1179.5 525.5 L 1197.5 525.5 L 1197.5 543.5 L 1179.5 543.5 Z M 1587.5 564.5 L 1605.5 564.5 L 1605.5 582.5 L 1587.5 582.5 Z M 771.5 643.5 L 789.5 643.5 L 789.5 661.5 L 771.5 661.5 Z M 567.5 643.5 L 585.5 643.5 L 585.5 661.5 L 567.5 661.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="image344" 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="#image344"/>
+  <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="surface338">
+<g id="surface367">
 <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 540.042969 545.789062 L 540.042969 523.296875 L 548.714844 523.296875 L 550.070312 523.390625 L 551.335938 523.636719 L 552.507812 524.066406 L 553.589844 524.625 L 554.542969 525.394531 L 555.441406 526.289062 L 556.179688 527.371094 L 556.796875 528.542969 L 557.261719 529.867188 L 557.597656 531.289062 L 557.785156 532.863281 L 557.878906 534.527344 L 557.785156 536.285156 L 557.570312 537.921875 L 557.199219 539.402344 L 556.703125 540.761719 L 556.058594 541.964844 L 555.253906 543.011719 L 554.390625 543.878906 L 553.433594 544.554688 L 552.386719 545.113281 L 551.242188 545.480469 L 550.007812 545.730469 L 548.714844 545.789062 Z M 542.914062 543.261719 L 548.21875 543.261719 L 549.640625 543.167969 L 550.902344 542.828125 L 552.015625 542.242188 L 552.941406 541.46875 L 553.679688 540.421875 L 554.296875 539.15625 L 554.484375 538.507812 L 554.667969 537.828125 L 554.824219 537.089844 L 554.914062 536.285156 L 554.976562 535.453125 L 555.007812 534.558594 L 554.882812 532.554688 L 554.574219 530.792969 L 554.019531 529.28125 L 553.28125 528.078125 L 552.324219 527.09375 L 551.152344 526.382812 L 550.71875 526.226562 L 550.257812 526.074219 L 549.761719 525.980469 L 549.269531 525.886719 L 548.742188 525.859375 L 548.21875 525.828125 L 542.914062 525.828125 Z M 542.914062 543.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 516 554 L 534 554 M 516 536 L 534 536 M 516 536 L 516 554 M 534 536 L 534 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 516 554 L 534 554 M 516 536 L 534 536 M 534 554 L 534 536 M 516 554 L 516 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 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/sregsbp/sky130_fd_sc_lp__sregsbp_1.svg b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.svg
index 3fb2ba1..750a802 100644
--- a/cells/sregsbp/sky130_fd_sc_lp__sregsbp_1.svg
+++ b/cells/sregsbp/sky130_fd_sc_lp__sregsbp_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 579.5 535.5 L 739.5 535.5 L 739.5 540.5 L 579.5 540.5 Z M 579.5 535.5 "/>
 </clipPath>
-<image id="image341" 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="#image341"/>
+  <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 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="#image341"/>
+  <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 1188.5 577.5 L 1204.5 577.5 L 1204.5 645.5 L 1188.5 645.5 Z M 1147.5 577.5 L 1163.5 577.5 L 1163.5 645.5 L 1147.5 645.5 Z M 975.5 580.5 L 991.5 580.5 L 991.5 648.5 L 975.5 648.5 Z M 816.5 603.5 L 832.5 603.5 L 832.5 648.5 L 816.5 648.5 Z M 878.5 603.5 L 894.5 603.5 L 894.5 648.5 L 878.5 648.5 Z M 917.5 603.5 L 933.5 603.5 L 933.5 648.5 L 917.5 648.5 Z M 1016.5 580.5 L 1032.5 580.5 L 1032.5 648.5 L 1016.5 648.5 Z M 1258.5 618.5 L 1274.5 618.5 L 1274.5 663.5 L 1258.5 663.5 Z M 1300.5 618.5 L 1316.5 618.5 L 1316.5 663.5 L 1300.5 663.5 Z M 1501.5 636.5 L 1517.5 636.5 L 1517.5 681.5 L 1501.5 681.5 Z M 1606.5 591.5 L 1622.5 591.5 L 1622.5 681.5 L 1606.5 681.5 Z M 1660.5 591.5 L 1676.5 591.5 L 1676.5 681.5 L 1660.5 681.5 Z M 239.5 638.5 L 255.5 638.5 L 255.5 682.5 L 239.5 682.5 Z M 385.5 641.5 L 401.5 641.5 L 401.5 686.5 L 385.5 686.5 Z M 523.5 641.5 L 539.5 641.5 L 539.5 686.5 L 523.5 686.5 Z M 344.5 641.5 L 360.5 641.5 L 360.5 686.5 L 344.5 686.5 Z M 633.5 597.5 L 649.5 597.5 L 649.5 686.5 L 633.5 686.5 Z M 1396.5 618.5 L 1412.5 618.5 L 1412.5 686.5 L 1396.5 686.5 Z M 1358.5 618.5 L 1374.5 618.5 L 1374.5 686.5 L 1358.5 686.5 Z M 478.5 641.5 L 493.5 641.5 L 493.5 686.5 L 478.5 686.5 Z M 695.5 597.5 L 711.5 597.5 L 711.5 686.5 L 695.5 686.5 Z M 436.5 641.5 L 452.5 641.5 L 452.5 686.5 L 436.5 686.5 Z M 436.5 641.5 "/>
 </clipPath>
-<image id="image342" 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="#image342"/>
+  <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 264.5 384.5 L 280.5 384.5 L 280.5 429.5 L 264.5 429.5 Z M 318.5 384.5 L 334.5 384.5 L 334.5 429.5 L 318.5 429.5 Z M 462.5 384.5 L 478.5 384.5 L 478.5 429.5 L 462.5 429.5 Z M 516.5 384.5 L 532.5 384.5 L 532.5 429.5 L 516.5 429.5 Z M 405.5 384.5 L 421.5 384.5 L 421.5 429.5 L 405.5 429.5 Z M 360.5 384.5 L 376.5 384.5 L 376.5 429.5 L 360.5 429.5 Z M 870.5 421.5 L 886.5 421.5 L 886.5 465.5 L 870.5 465.5 Z M 828.5 421.5 L 844.5 421.5 L 844.5 465.5 L 828.5 465.5 Z M 783.5 421.5 L 799.5 421.5 L 799.5 465.5 L 783.5 465.5 Z M 1370.5 382.5 L 1386.5 382.5 L 1386.5 471.5 L 1370.5 471.5 Z M 1304.5 427.5 L 1320.5 427.5 L 1320.5 471.5 L 1304.5 471.5 Z M 1262.5 427.5 L 1278.5 427.5 L 1278.5 471.5 L 1262.5 471.5 Z M 1416.5 382.5 L 1432.5 382.5 L 1432.5 471.5 L 1416.5 471.5 Z M 1482.5 404.5 L 1498.5 404.5 L 1498.5 471.5 L 1482.5 471.5 Z M 1204.5 405.5 L 1220.5 405.5 L 1220.5 494.5 L 1204.5 494.5 Z M 1150.5 424.5 L 1166.5 424.5 L 1166.5 513.5 L 1150.5 513.5 Z M 975.5 424.5 L 991.5 424.5 L 991.5 513.5 L 975.5 513.5 Z M 1045.5 424.5 L 1061.5 424.5 L 1061.5 513.5 L 1045.5 513.5 Z M 1603.5 382.5 L 1619.5 382.5 L 1619.5 516.5 L 1603.5 516.5 Z M 1657.5 382.5 L 1673.5 382.5 L 1673.5 516.5 L 1657.5 516.5 Z M 628.5 388.5 L 644.5 388.5 L 644.5 521.5 L 628.5 521.5 Z M 674.5 388.5 L 690.5 388.5 L 690.5 521.5 L 674.5 521.5 Z M 674.5 388.5 "/>
 </clipPath>
-<image id="image343" 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="#image343"/>
+  <use xlink:href="#image372"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 211.5 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 1689.5 486.5 L 1707.5 486.5 L 1707.5 490.5 L 1689.5 490.5 Z M 1689.5 490.5 L 1707.5 490.5 L 1707.5 504.5 L 1689.5 504.5 Z M 1026.5 486.5 L 1044.5 486.5 L 1044.5 504.5 L 1026.5 504.5 Z M 1383.5 486.5 L 1401.5 486.5 L 1401.5 504.5 L 1383.5 504.5 Z M 771.5 525.5 L 789.5 525.5 L 789.5 535.5 L 771.5 535.5 Z M 771.5 535.5 L 789.5 535.5 L 789.5 543.5 L 771.5 543.5 Z M 1179.5 525.5 L 1197.5 525.5 L 1197.5 543.5 L 1179.5 543.5 Z M 1587.5 564.5 L 1605.5 564.5 L 1605.5 582.5 L 1587.5 582.5 Z M 414.5 643.5 L 432.5 643.5 L 432.5 652.5 L 414.5 652.5 Z M 414.5 652.5 L 432.5 652.5 L 432.5 661.5 L 414.5 661.5 Z M 771.5 643.5 L 789.5 643.5 L 789.5 661.5 L 771.5 661.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="image344" 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="#image344"/>
+  <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="surface338">
+<g id="surface367">
 <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 540.042969 545.789062 L 540.042969 523.296875 L 548.714844 523.296875 L 550.070312 523.390625 L 551.335938 523.636719 L 552.507812 524.066406 L 553.589844 524.625 L 554.542969 525.394531 L 555.441406 526.289062 L 556.179688 527.371094 L 556.796875 528.542969 L 557.261719 529.867188 L 557.597656 531.289062 L 557.785156 532.863281 L 557.878906 534.527344 L 557.785156 536.285156 L 557.570312 537.921875 L 557.199219 539.402344 L 556.703125 540.761719 L 556.058594 541.964844 L 555.253906 543.011719 L 554.390625 543.878906 L 553.433594 544.554688 L 552.386719 545.113281 L 551.242188 545.480469 L 550.007812 545.730469 L 548.714844 545.789062 Z M 542.914062 543.261719 L 548.21875 543.261719 L 549.640625 543.167969 L 550.902344 542.828125 L 552.015625 542.242188 L 552.941406 541.46875 L 553.679688 540.421875 L 554.296875 539.15625 L 554.484375 538.507812 L 554.667969 537.828125 L 554.824219 537.089844 L 554.914062 536.285156 L 554.976562 535.453125 L 555.007812 534.558594 L 554.882812 532.554688 L 554.574219 530.792969 L 554.019531 529.28125 L 553.28125 528.078125 L 552.324219 527.09375 L 551.152344 526.382812 L 550.71875 526.226562 L 550.257812 526.074219 L 549.761719 525.980469 L 549.269531 525.886719 L 548.742188 525.859375 L 548.21875 525.828125 L 542.914062 525.828125 Z M 542.914062 543.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 516 554 L 534 554 M 516 536 L 534 536 M 516 536 L 516 554 M 534 536 L 534 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 516 554 L 534 554 M 516 536 L 534 536 M 534 554 L 534 536 M 516 554 L 516 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 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/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.svg b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.svg
index c3bc42a..9d02285 100644
--- a/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.svg
+++ b/cells/srsdfrtn/sky130_fd_sc_lp__srsdfrtn_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 377.5 L 1744.5 377.5 L 1744.5 513.5 L 174.5 513.5 Z M 779.5 513.5 L 1744.5 513.5 L 1744.5 535.5 L 779.5 535.5 Z M 174.5 513.5 L 415.5 513.5 L 415.5 535.5 L 174.5 535.5 Z M 1166.5 535.5 L 1440.5 535.5 L 1440.5 543.5 L 1166.5 543.5 Z M 1329.5 543.5 L 1440.5 543.5 L 1440.5 545.5 L 1329.5 545.5 Z M 779.5 535.5 L 1042.5 535.5 L 1042.5 553.5 L 779.5 553.5 Z M 779.5 535.5 "/>
 </clipPath>
-<image id="image391" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image418" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image391"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image391"/>
+  <use xlink:href="#image418"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 684.5 548.5 L 696.5 548.5 L 696.5 583.5 L 684.5 583.5 Z M 714.5 548.5 L 727.5 548.5 L 727.5 583.5 L 714.5 583.5 Z M 647.5 548.5 L 660.5 548.5 L 660.5 583.5 L 647.5 583.5 Z M 548.5 587.5 L 561.5 587.5 L 561.5 622.5 L 548.5 622.5 Z M 1523.5 597.5 L 1536.5 597.5 L 1536.5 632.5 L 1523.5 632.5 Z M 1391.5 597.5 L 1404.5 597.5 L 1404.5 632.5 L 1391.5 632.5 Z M 1490.5 597.5 L 1503.5 597.5 L 1503.5 632.5 L 1490.5 632.5 Z M 1454.5 597.5 L 1467.5 597.5 L 1467.5 632.5 L 1454.5 632.5 Z M 1421.5 597.5 L 1434.5 597.5 L 1434.5 632.5 L 1421.5 632.5 Z M 1167.5 598.5 L 1180.5 598.5 L 1180.5 633.5 L 1167.5 633.5 Z M 342.5 598.5 L 355.5 598.5 L 355.5 633.5 L 342.5 633.5 Z M 306.5 598.5 L 319.5 598.5 L 319.5 633.5 L 306.5 633.5 Z M 411.5 598.5 L 424.5 598.5 L 424.5 633.5 L 411.5 633.5 Z M 375.5 598.5 L 388.5 598.5 L 388.5 633.5 L 375.5 633.5 Z M 1256.5 598.5 L 1268.5 598.5 L 1268.5 633.5 L 1256.5 633.5 Z M 1137.5 598.5 L 1149.5 598.5 L 1149.5 633.5 L 1137.5 633.5 Z M 1223.5 598.5 L 1235.5 598.5 L 1235.5 633.5 L 1223.5 633.5 Z M 1104.5 598.5 L 1117.5 598.5 L 1117.5 633.5 L 1104.5 633.5 Z M 503.5 601.5 L 516.5 601.5 L 516.5 637.5 L 503.5 637.5 Z M 790.5 606.5 L 803.5 606.5 L 803.5 642.5 L 790.5 642.5 Z M 756.5 606.5 L 769.5 606.5 L 769.5 642.5 L 756.5 642.5 Z M 1680.5 579.5 L 1692.5 579.5 L 1692.5 650.5 L 1680.5 650.5 Z M 1634.5 615.5 L 1646.5 615.5 L 1646.5 650.5 L 1634.5 650.5 Z M 225.5 615.5 L 237.5 615.5 L 237.5 651.5 L 225.5 651.5 Z M 1342.5 597.5 L 1355.5 597.5 L 1355.5 651.5 L 1342.5 651.5 Z M 881.5 619.5 L 893.5 619.5 L 893.5 654.5 L 881.5 654.5 Z M 983.5 619.5 L 996.5 619.5 L 996.5 654.5 L 983.5 654.5 Z M 917.5 619.5 L 929.5 619.5 L 929.5 654.5 L 917.5 654.5 Z M 953.5 619.5 L 966.5 619.5 L 966.5 654.5 L 953.5 654.5 Z M 953.5 619.5 "/>
 </clipPath>
-<image id="image392" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image419" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image392"/>
+  <use xlink:href="#image419"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 240.5 413.5 L 252.5 413.5 L 252.5 467.5 L 240.5 467.5 Z M 282.5 413.5 L 294.5 413.5 L 294.5 467.5 L 282.5 467.5 Z M 351.5 413.5 L 363.5 413.5 L 363.5 467.5 L 351.5 467.5 Z M 405.5 413.5 L 417.5 413.5 L 417.5 467.5 L 405.5 467.5 Z M 315.5 413.5 L 327.5 413.5 L 327.5 467.5 L 315.5 467.5 Z M 1635.5 413.5 L 1648.5 413.5 L 1648.5 467.5 L 1635.5 467.5 Z M 1481.5 443.5 L 1494.5 443.5 L 1494.5 479.5 L 1481.5 479.5 Z M 1554.5 443.5 L 1567.5 443.5 L 1567.5 479.5 L 1554.5 479.5 Z M 1518.5 443.5 L 1530.5 443.5 L 1530.5 479.5 L 1518.5 479.5 Z M 1292.5 459.5 L 1305.5 459.5 L 1305.5 494.5 L 1292.5 494.5 Z M 1323.5 459.5 L 1335.5 459.5 L 1335.5 494.5 L 1323.5 494.5 Z M 1123.5 443.5 L 1136.5 443.5 L 1136.5 497.5 L 1123.5 497.5 Z M 616.5 462.5 L 629.5 462.5 L 629.5 497.5 L 616.5 497.5 Z M 570.5 443.5 L 583.5 443.5 L 583.5 497.5 L 570.5 497.5 Z M 757.5 413.5 L 778.5 413.5 L 778.5 497.5 L 757.5 497.5 Z M 693.5 413.5 L 714.5 413.5 L 714.5 497.5 L 693.5 497.5 Z M 1160.5 443.5 L 1172.5 443.5 L 1172.5 497.5 L 1160.5 497.5 Z M 647.5 462.5 L 659.5 462.5 L 659.5 497.5 L 647.5 497.5 Z M 503.5 443.5 L 516.5 443.5 L 516.5 497.5 L 503.5 497.5 Z M 1680.5 413.5 L 1693.5 413.5 L 1693.5 519.5 L 1680.5 519.5 Z M 1204.5 443.5 L 1225.5 443.5 L 1225.5 528.5 L 1204.5 528.5 Z M 1367.5 459.5 L 1380.5 459.5 L 1380.5 529.5 L 1367.5 529.5 Z M 878.5 446.5 L 899.5 446.5 L 899.5 530.5 L 878.5 530.5 Z M 917.5 446.5 L 938.5 446.5 L 938.5 530.5 L 917.5 530.5 Z M 975.5 446.5 L 996.5 446.5 L 996.5 530.5 L 975.5 530.5 Z M 975.5 446.5 "/>
 </clipPath>
-<image id="image393" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image420" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image393"/>
+  <use xlink:href="#image420"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1174.5 433.5 L 1189.5 433.5 L 1189.5 447.5 L 1174.5 447.5 Z M 891.5 433.5 L 905.5 433.5 L 905.5 447.5 L 891.5 447.5 Z M 851.5 433.5 L 865.5 433.5 L 865.5 447.5 L 851.5 447.5 Z M 729.5 495.5 L 744.5 495.5 L 744.5 510.5 L 729.5 510.5 Z M 1377.5 495.5 L 1391.5 495.5 L 1391.5 510.5 L 1377.5 510.5 Z M 486.5 495.5 L 501.5 495.5 L 501.5 510.5 L 486.5 510.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="image394" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image421" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image394"/>
+  <use xlink:href="#image421"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface388">
+<g id="surface415">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 264.933594 535.035156 L 264.933594 540.996094 L 275.1875 540.996094 L 275.1875 542.953125 L 262.714844 542.953125 L 262.714844 525.570312 L 274.757812 525.570312 L 274.757812 527.523438 L 264.933594 527.523438 L 264.933594 533.082031 L 274.398438 533.082031 L 274.398438 535.035156 Z M 264.933594 535.035156 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 244 552 L 258 552 M 244 538 L 258 538 M 244 538 L 244 552 M 258 538 L 258 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 244 552 L 258 552 M 244 538 L 258 538 M 258 552 L 258 538 M 244 552 L 244 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/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.svg b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.svg
index 15d15f8..c8288c2 100644
--- a/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.svg
+++ b/cells/srsdfrtp/sky130_fd_sc_lp__srsdfrtp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 395.5 L 1743.5 395.5 L 1743.5 510.5 L 174.5 510.5 Z M 906.5 510.5 L 1743.5 510.5 L 1743.5 534.5 L 906.5 534.5 Z M 174.5 510.5 L 811.5 510.5 L 811.5 534.5 L 174.5 534.5 Z M 174.5 510.5 "/>
 </clipPath>
-<image id="image375" 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="#image375"/>
+  <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 188.5 640.5 L 1729.5 640.5 L 1729.5 658.5 L 188.5 658.5 Z M 188.5 640.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image375"/>
+  <use xlink:href="#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 569.5 565.5 L 580.5 565.5 L 580.5 596.5 L 569.5 596.5 Z M 606.5 565.5 L 617.5 565.5 L 617.5 596.5 L 606.5 596.5 Z M 818.5 566.5 L 829.5 566.5 L 829.5 597.5 L 818.5 597.5 Z M 301.5 576.5 L 312.5 576.5 L 312.5 607.5 L 301.5 607.5 Z M 376.5 576.5 L 388.5 576.5 L 388.5 607.5 L 376.5 607.5 Z M 408.5 576.5 L 420.5 576.5 L 420.5 607.5 L 408.5 607.5 Z M 349.5 576.5 L 361.5 576.5 L 361.5 607.5 L 349.5 607.5 Z M 925.5 563.5 L 936.5 563.5 L 936.5 611.5 L 925.5 611.5 Z M 898.5 563.5 L 909.5 563.5 L 909.5 611.5 L 898.5 611.5 Z M 1000.5 580.5 L 1012.5 580.5 L 1012.5 611.5 L 1000.5 611.5 Z M 1027.5 580.5 L 1039.5 580.5 L 1039.5 611.5 L 1027.5 611.5 Z M 974.5 580.5 L 985.5 580.5 L 985.5 611.5 L 974.5 611.5 Z M 705.5 582.5 L 716.5 582.5 L 716.5 613.5 L 705.5 613.5 Z M 678.5 582.5 L 690.5 582.5 L 690.5 613.5 L 678.5 613.5 Z M 481.5 582.5 L 492.5 582.5 L 492.5 613.5 L 481.5 613.5 Z M 1100.5 582.5 L 1111.5 582.5 L 1111.5 613.5 L 1100.5 613.5 Z M 1159.5 582.5 L 1170.5 582.5 L 1170.5 613.5 L 1159.5 613.5 Z M 1194.5 582.5 L 1205.5 582.5 L 1205.5 613.5 L 1194.5 613.5 Z M 778.5 566.5 L 789.5 566.5 L 789.5 613.5 L 778.5 613.5 Z M 1127.5 582.5 L 1138.5 582.5 L 1138.5 613.5 L 1127.5 613.5 Z M 219.5 585.5 L 230.5 585.5 L 230.5 617.5 L 219.5 617.5 Z M 1449.5 590.5 L 1460.5 590.5 L 1460.5 622.5 L 1449.5 622.5 Z M 1422.5 590.5 L 1433.5 590.5 L 1433.5 622.5 L 1422.5 622.5 Z M 1476.5 590.5 L 1487.5 590.5 L 1487.5 622.5 L 1476.5 622.5 Z M 1556.5 599.5 L 1567.5 599.5 L 1567.5 631.5 L 1556.5 631.5 Z M 1583.5 599.5 L 1594.5 599.5 L 1594.5 631.5 L 1583.5 631.5 Z M 1615.5 599.5 L 1626.5 599.5 L 1626.5 631.5 L 1615.5 631.5 Z M 1687.5 574.5 L 1699.5 574.5 L 1699.5 637.5 L 1687.5 637.5 Z M 1687.5 574.5 "/>
 </clipPath>
-<image id="image376" 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="#image376"/>
+  <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 225.5 436.5 L 236.5 436.5 L 236.5 484.5 L 225.5 484.5 Z M 383.5 436.5 L 394.5 436.5 L 394.5 484.5 L 383.5 484.5 Z M 421.5 436.5 L 432.5 436.5 L 432.5 484.5 L 421.5 484.5 Z M 323.5 436.5 L 334.5 436.5 L 334.5 484.5 L 323.5 484.5 Z M 294.5 436.5 L 305.5 436.5 L 305.5 484.5 L 294.5 484.5 Z M 509.5 436.5 L 520.5 436.5 L 520.5 484.5 L 509.5 484.5 Z M 806.5 448.5 L 817.5 448.5 L 817.5 496.5 L 806.5 496.5 Z M 676.5 468.5 L 688.5 468.5 L 688.5 500.5 L 676.5 500.5 Z M 550.5 468.5 L 561.5 468.5 L 561.5 500.5 L 550.5 500.5 Z M 598.5 468.5 L 609.5 468.5 L 609.5 500.5 L 598.5 500.5 Z M 627.5 468.5 L 638.5 468.5 L 638.5 500.5 L 627.5 500.5 Z M 976.5 447.5 L 987.5 447.5 L 987.5 510.5 L 976.5 510.5 Z M 949.5 447.5 L 961.5 447.5 L 961.5 510.5 L 949.5 510.5 Z M 1228.5 438.5 L 1247.5 438.5 L 1247.5 512.5 L 1228.5 512.5 Z M 1265.5 438.5 L 1283.5 438.5 L 1283.5 512.5 L 1265.5 512.5 Z M 1469.5 464.5 L 1481.5 464.5 L 1481.5 512.5 L 1469.5 512.5 Z M 1387.5 438.5 L 1405.5 438.5 L 1405.5 512.5 L 1387.5 512.5 Z M 1519.5 438.5 L 1537.5 438.5 L 1537.5 512.5 L 1519.5 512.5 Z M 1435.5 464.5 L 1446.5 464.5 L 1446.5 512.5 L 1435.5 512.5 Z M 1347.5 438.5 L 1366.5 438.5 L 1366.5 512.5 L 1347.5 512.5 Z M 1313.5 438.5 L 1332.5 438.5 L 1332.5 512.5 L 1313.5 512.5 Z M 759.5 456.5 L 770.5 456.5 L 770.5 519.5 L 759.5 519.5 Z M 1672.5 427.5 L 1683.5 427.5 L 1683.5 521.5 L 1672.5 521.5 Z M 1610.5 473.5 L 1621.5 473.5 L 1621.5 521.5 L 1610.5 521.5 Z M 1610.5 473.5 "/>
 </clipPath>
-<image id="image377" 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="#image377"/>
+  <use xlink:href="#image404"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 200.5 403.5 L 212.5 403.5 L 212.5 416.5 L 200.5 416.5 Z M 1705.5 403.5 L 1718.5 403.5 L 1718.5 416.5 L 1705.5 416.5 Z M 1669.5 403.5 L 1682.5 403.5 L 1682.5 416.5 L 1669.5 416.5 Z M 1633.5 403.5 L 1646.5 403.5 L 1646.5 416.5 L 1633.5 416.5 Z M 1597.5 403.5 L 1610.5 403.5 L 1610.5 416.5 L 1597.5 416.5 Z M 1562.5 403.5 L 1574.5 403.5 L 1574.5 416.5 L 1562.5 416.5 Z M 1526.5 403.5 L 1538.5 403.5 L 1538.5 416.5 L 1526.5 416.5 Z M 1490.5 403.5 L 1503.5 403.5 L 1503.5 416.5 L 1490.5 416.5 Z M 1454.5 403.5 L 1467.5 403.5 L 1467.5 416.5 L 1454.5 416.5 Z M 1418.5 403.5 L 1431.5 403.5 L 1431.5 416.5 L 1418.5 416.5 Z M 1382.5 403.5 L 1395.5 403.5 L 1395.5 416.5 L 1382.5 416.5 Z M 1347.5 403.5 L 1359.5 403.5 L 1359.5 416.5 L 1347.5 416.5 Z M 1311.5 403.5 L 1323.5 403.5 L 1323.5 416.5 L 1311.5 416.5 Z M 1275.5 403.5 L 1288.5 403.5 L 1288.5 416.5 L 1275.5 416.5 Z M 1239.5 403.5 L 1252.5 403.5 L 1252.5 416.5 L 1239.5 416.5 Z M 1203.5 403.5 L 1216.5 403.5 L 1216.5 416.5 L 1203.5 416.5 Z M 1167.5 403.5 L 1180.5 403.5 L 1180.5 416.5 L 1167.5 416.5 Z M 1131.5 403.5 L 1144.5 403.5 L 1144.5 416.5 L 1131.5 416.5 Z M 1096.5 403.5 L 1108.5 403.5 L 1108.5 416.5 L 1096.5 416.5 Z M 1060.5 403.5 L 1073.5 403.5 L 1073.5 416.5 L 1060.5 416.5 Z M 1024.5 403.5 L 1037.5 403.5 L 1037.5 416.5 L 1024.5 416.5 Z M 988.5 403.5 L 1001.5 403.5 L 1001.5 416.5 L 988.5 416.5 Z M 952.5 403.5 L 965.5 403.5 L 965.5 416.5 L 952.5 416.5 Z M 916.5 403.5 L 929.5 403.5 L 929.5 416.5 L 916.5 416.5 Z M 881.5 403.5 L 893.5 403.5 L 893.5 416.5 L 881.5 416.5 Z M 845.5 403.5 L 857.5 403.5 L 857.5 416.5 L 845.5 416.5 Z M 809.5 403.5 L 822.5 403.5 L 822.5 416.5 L 809.5 416.5 Z M 773.5 403.5 L 786.5 403.5 L 786.5 416.5 L 773.5 416.5 Z M 737.5 403.5 L 750.5 403.5 L 750.5 416.5 L 737.5 416.5 Z M 701.5 403.5 L 714.5 403.5 L 714.5 416.5 L 701.5 416.5 Z M 666.5 403.5 L 678.5 403.5 L 678.5 416.5 L 666.5 416.5 Z M 630.5 403.5 L 642.5 403.5 L 642.5 416.5 L 630.5 416.5 Z M 594.5 403.5 L 607.5 403.5 L 607.5 416.5 L 594.5 416.5 Z M 558.5 403.5 L 571.5 403.5 L 571.5 416.5 L 558.5 416.5 Z M 522.5 403.5 L 535.5 403.5 L 535.5 416.5 L 522.5 416.5 Z M 486.5 403.5 L 499.5 403.5 L 499.5 416.5 L 486.5 416.5 Z M 451.5 403.5 L 463.5 403.5 L 463.5 416.5 L 451.5 416.5 Z M 415.5 403.5 L 427.5 403.5 L 427.5 416.5 L 415.5 416.5 Z M 379.5 403.5 L 392.5 403.5 L 392.5 416.5 L 379.5 416.5 Z M 343.5 403.5 L 356.5 403.5 L 356.5 416.5 L 343.5 416.5 Z M 307.5 403.5 L 320.5 403.5 L 320.5 416.5 L 307.5 416.5 Z M 271.5 403.5 L 284.5 403.5 L 284.5 416.5 L 271.5 416.5 Z M 236.5 403.5 L 248.5 403.5 L 248.5 416.5 L 236.5 416.5 Z M 1418.5 441.5 L 1431.5 441.5 L 1431.5 443.5 L 1418.5 443.5 Z M 1418.5 443.5 L 1431.5 443.5 L 1431.5 454.5 L 1418.5 454.5 Z M 1454.5 441.5 L 1467.5 441.5 L 1467.5 454.5 L 1454.5 454.5 Z M 1275.5 441.5 L 1288.5 441.5 L 1288.5 454.5 L 1275.5 454.5 Z M 200.5 651.5 L 212.5 651.5 L 212.5 664.5 L 200.5 664.5 Z M 1705.5 651.5 L 1718.5 651.5 L 1718.5 664.5 L 1705.5 664.5 Z M 1669.5 651.5 L 1682.5 651.5 L 1682.5 664.5 L 1669.5 664.5 Z M 1633.5 651.5 L 1646.5 651.5 L 1646.5 664.5 L 1633.5 664.5 Z M 1597.5 651.5 L 1610.5 651.5 L 1610.5 664.5 L 1597.5 664.5 Z M 1562.5 651.5 L 1574.5 651.5 L 1574.5 664.5 L 1562.5 664.5 Z M 1526.5 651.5 L 1538.5 651.5 L 1538.5 664.5 L 1526.5 664.5 Z M 1490.5 651.5 L 1503.5 651.5 L 1503.5 664.5 L 1490.5 664.5 Z M 1454.5 651.5 L 1467.5 651.5 L 1467.5 664.5 L 1454.5 664.5 Z M 1418.5 651.5 L 1431.5 651.5 L 1431.5 664.5 L 1418.5 664.5 Z M 1382.5 651.5 L 1395.5 651.5 L 1395.5 664.5 L 1382.5 664.5 Z M 1347.5 651.5 L 1359.5 651.5 L 1359.5 664.5 L 1347.5 664.5 Z M 1311.5 651.5 L 1323.5 651.5 L 1323.5 664.5 L 1311.5 664.5 Z M 1275.5 651.5 L 1288.5 651.5 L 1288.5 664.5 L 1275.5 664.5 Z M 1239.5 651.5 L 1252.5 651.5 L 1252.5 664.5 L 1239.5 664.5 Z M 1203.5 651.5 L 1216.5 651.5 L 1216.5 664.5 L 1203.5 664.5 Z M 1167.5 651.5 L 1180.5 651.5 L 1180.5 664.5 L 1167.5 664.5 Z M 1131.5 651.5 L 1144.5 651.5 L 1144.5 664.5 L 1131.5 664.5 Z M 1096.5 651.5 L 1108.5 651.5 L 1108.5 664.5 L 1096.5 664.5 Z M 1060.5 651.5 L 1073.5 651.5 L 1073.5 664.5 L 1060.5 664.5 Z M 1024.5 651.5 L 1037.5 651.5 L 1037.5 664.5 L 1024.5 664.5 Z M 988.5 651.5 L 1001.5 651.5 L 1001.5 664.5 L 988.5 664.5 Z M 952.5 651.5 L 965.5 651.5 L 965.5 664.5 L 952.5 664.5 Z M 916.5 651.5 L 929.5 651.5 L 929.5 664.5 L 916.5 664.5 Z M 881.5 651.5 L 893.5 651.5 L 893.5 664.5 L 881.5 664.5 Z M 845.5 651.5 L 857.5 651.5 L 857.5 664.5 L 845.5 664.5 Z M 809.5 651.5 L 822.5 651.5 L 822.5 664.5 L 809.5 664.5 Z M 773.5 651.5 L 786.5 651.5 L 786.5 664.5 L 773.5 664.5 Z M 737.5 651.5 L 750.5 651.5 L 750.5 664.5 L 737.5 664.5 Z M 701.5 651.5 L 714.5 651.5 L 714.5 664.5 L 701.5 664.5 Z M 666.5 651.5 L 678.5 651.5 L 678.5 664.5 L 666.5 664.5 Z M 630.5 651.5 L 642.5 651.5 L 642.5 664.5 L 630.5 664.5 Z M 594.5 651.5 L 607.5 651.5 L 607.5 664.5 L 594.5 664.5 Z M 558.5 651.5 L 571.5 651.5 L 571.5 664.5 L 558.5 664.5 Z M 522.5 651.5 L 535.5 651.5 L 535.5 664.5 L 522.5 664.5 Z M 486.5 651.5 L 499.5 651.5 L 499.5 664.5 L 486.5 664.5 Z M 451.5 651.5 L 463.5 651.5 L 463.5 664.5 L 451.5 664.5 Z M 415.5 651.5 L 427.5 651.5 L 427.5 664.5 L 415.5 664.5 Z M 379.5 651.5 L 392.5 651.5 L 392.5 664.5 L 379.5 664.5 Z M 343.5 651.5 L 356.5 651.5 L 356.5 664.5 L 343.5 664.5 Z M 307.5 651.5 L 320.5 651.5 L 320.5 664.5 L 307.5 664.5 Z M 271.5 651.5 L 284.5 651.5 L 284.5 664.5 L 271.5 664.5 Z M 236.5 651.5 L 248.5 651.5 L 248.5 664.5 L 236.5 664.5 Z M 236.5 651.5 "/>
 </clipPath>
-<image id="image378" 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="#image378"/>
+  <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="surface372">
+<g id="surface399">
 <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 1718.921875 514.28125 L 1717.933594 515.5 L 1715.722656 513.667969 L 1715.09375 514.007812 L 1714.460938 514.257812 L 1713.808594 514.46875 L 1713.113281 514.617188 L 1712.421875 514.699219 L 1711.703125 514.742188 L 1710.738281 514.679688 L 1709.832031 514.53125 L 1708.992188 514.28125 L 1708.191406 513.941406 L 1707.433594 513.5 L 1706.761719 512.933594 L 1706.152344 512.324219 L 1705.625 511.628906 L 1705.203125 510.871094 L 1704.847656 510.050781 L 1704.574219 509.167969 L 1704.40625 508.199219 L 1704.363281 507.96875 L 1704.339844 507.714844 L 1704.320312 507.484375 L 1704.300781 507.230469 L 1704.300781 506.707031 L 1704.339844 505.652344 L 1704.488281 504.644531 L 1704.71875 503.71875 L 1705.058594 502.835938 L 1705.476562 502.015625 L 1706.023438 501.257812 L 1706.570312 500.648438 L 1707.203125 500.101562 L 1707.898438 499.636719 L 1708.632812 499.28125 L 1709.433594 498.984375 L 1710.316406 498.773438 L 1710.527344 498.753906 L 1710.757812 498.734375 L 1710.988281 498.710938 L 1711.222656 498.691406 L 1711.453125 498.691406 L 1711.703125 498.667969 L 1712.652344 498.734375 L 1713.554688 498.878906 L 1714.398438 499.132812 L 1715.195312 499.46875 L 1715.953125 499.910156 L 1716.648438 500.457031 L 1717.238281 501.089844 L 1717.765625 501.761719 L 1718.183594 502.5 L 1718.542969 503.320312 L 1718.816406 504.203125 L 1719.003906 505.128906 L 1719.027344 505.402344 L 1719.046875 505.652344 L 1719.066406 505.90625 L 1719.089844 506.160156 L 1719.089844 506.410156 L 1719.109375 506.664062 L 1719.046875 507.84375 L 1718.859375 508.957031 L 1718.5625 509.988281 L 1718.140625 510.957031 L 1717.59375 511.839844 L 1716.941406 512.660156 Z M 1713.621094 509.945312 L 1715.492188 511.480469 L 1715.996094 510.851562 L 1716.417969 510.136719 L 1716.734375 509.355469 L 1716.964844 508.535156 L 1717.089844 507.652344 L 1717.152344 506.683594 L 1717.113281 505.800781 L 1716.984375 504.960938 L 1716.773438 504.179688 L 1716.5 503.464844 L 1716.144531 502.792969 L 1715.703125 502.183594 L 1715.195312 501.679688 L 1714.671875 501.257812 L 1714.082031 500.921875 L 1713.449219 500.667969 L 1712.757812 500.5 L 1712.042969 500.394531 L 1711.703125 500.394531 L 1710.949219 500.457031 L 1710.230469 500.585938 L 1709.558594 500.792969 L 1708.949219 501.109375 L 1708.378906 501.511719 L 1707.875 501.992188 L 1707.390625 502.5625 L 1707.011719 503.191406 L 1706.699219 503.886719 L 1706.464844 504.644531 L 1706.320312 505.464844 L 1706.257812 506.347656 L 1706.257812 506.707031 L 1706.277344 507.632812 L 1706.402344 508.472656 L 1706.613281 509.25 L 1706.886719 509.988281 L 1707.265625 510.660156 L 1707.730469 511.25 L 1708.210938 511.777344 L 1708.757812 512.195312 L 1709.347656 512.535156 L 1709.980469 512.765625 L 1710.675781 512.933594 L 1711.410156 512.996094 L 1711.453125 513.015625 L 1712.0625 513.015625 L 1712.460938 512.976562 L 1712.863281 512.890625 L 1713.242188 512.808594 L 1713.621094 512.679688 L 1714.019531 512.511719 L 1714.039062 512.511719 L 1714.082031 512.492188 L 1714.101562 512.46875 L 1714.144531 512.46875 L 1714.167969 512.449219 L 1714.207031 512.429688 L 1712.652344 511.125 Z M 1713.621094 509.945312 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1705 579 L 1718 579 M 1705 567 L 1718 567 M 1705 567 L 1705 579 M 1718 567 L 1718 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(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 1705 579 L 1718 579 M 1705 567 L 1718 567 M 1718 579 L 1718 567 M 1705 579 L 1705 567 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 188 416 L 188 425 M 183 421 L 192 421 M 187 422 L 189 422 M 187 420 L 189 420 M 187 420 L 187 422 M 189 420 L 189 422 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.svg b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.svg
index 6de2c14..9e922d6 100644
--- a/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.svg
+++ b/cells/srsdfstp/sky130_fd_sc_lp__srsdfstp_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 381.5 L 1743.5 381.5 L 1743.5 534.5 L 174.5 534.5 Z M 374.5 534.5 L 520.5 534.5 L 520.5 542.5 L 374.5 542.5 Z M 374.5 534.5 "/>
 </clipPath>
-<image id="image459" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image486" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image459"/>
+  <use xlink:href="#image486"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 190.5 650.5 L 1728.5 650.5 L 1728.5 670.5 L 190.5 670.5 Z M 190.5 650.5 "/>
 </clipPath>
 <pattern id="pattern1" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image459"/>
+  <use xlink:href="#image486"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 542.5 579.5 L 554.5 579.5 L 554.5 613.5 L 542.5 613.5 Z M 419.5 579.5 L 432.5 579.5 L 432.5 613.5 L 419.5 613.5 Z M 460.5 579.5 L 473.5 579.5 L 473.5 613.5 L 460.5 613.5 Z M 887.5 567.5 L 900.5 567.5 L 900.5 619.5 L 887.5 619.5 Z M 1100.5 585.5 L 1112.5 585.5 L 1112.5 619.5 L 1100.5 619.5 Z M 970.5 585.5 L 983.5 585.5 L 983.5 619.5 L 970.5 619.5 Z M 858.5 567.5 L 870.5 567.5 L 870.5 619.5 L 858.5 619.5 Z M 1065.5 585.5 L 1077.5 585.5 L 1077.5 619.5 L 1065.5 619.5 Z M 1029.5 585.5 L 1042.5 585.5 L 1042.5 619.5 L 1029.5 619.5 Z M 810.5 567.5 L 823.5 567.5 L 823.5 619.5 L 810.5 619.5 Z M 1000.5 585.5 L 1012.5 585.5 L 1012.5 619.5 L 1000.5 619.5 Z M 1189.5 587.5 L 1201.5 587.5 L 1201.5 622.5 L 1189.5 622.5 Z M 223.5 587.5 L 235.5 587.5 L 235.5 622.5 L 223.5 622.5 Z M 329.5 587.5 L 341.5 587.5 L 341.5 622.5 L 329.5 622.5 Z M 1219.5 587.5 L 1231.5 587.5 L 1231.5 622.5 L 1219.5 622.5 Z M 290.5 587.5 L 303.5 587.5 L 303.5 622.5 L 290.5 622.5 Z M 255.5 587.5 L 267.5 587.5 L 267.5 622.5 L 255.5 622.5 Z M 726.5 596.5 L 739.5 596.5 L 739.5 631.5 L 726.5 631.5 Z M 759.5 596.5 L 771.5 596.5 L 771.5 631.5 L 759.5 631.5 Z M 587.5 606.5 L 599.5 606.5 L 599.5 640.5 L 587.5 640.5 Z M 1494.5 606.5 L 1507.5 606.5 L 1507.5 641.5 L 1494.5 641.5 Z M 1530.5 606.5 L 1542.5 606.5 L 1542.5 641.5 L 1530.5 641.5 Z M 1559.5 606.5 L 1572.5 606.5 L 1572.5 641.5 L 1559.5 641.5 Z M 1433.5 606.5 L 1445.5 606.5 L 1445.5 641.5 L 1433.5 641.5 Z M 1465.5 606.5 L 1477.5 606.5 L 1477.5 641.5 L 1465.5 641.5 Z M 1638.5 617.5 L 1650.5 617.5 L 1650.5 651.5 L 1638.5 651.5 Z M 1682.5 582.5 L 1694.5 582.5 L 1694.5 651.5 L 1682.5 651.5 Z M 628.5 617.5 L 641.5 617.5 L 641.5 651.5 L 628.5 651.5 Z M 628.5 617.5 "/>
 </clipPath>
-<image id="image460" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image487" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image460"/>
+  <use xlink:href="#image487"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 607.5 416.5 L 619.5 416.5 L 619.5 451.5 L 607.5 451.5 Z M 719.5 416.5 L 731.5 416.5 L 731.5 451.5 L 719.5 451.5 Z M 642.5 416.5 L 655.5 416.5 L 655.5 451.5 L 642.5 451.5 Z M 674.5 416.5 L 687.5 416.5 L 687.5 451.5 L 674.5 451.5 Z M 297.5 420.5 L 309.5 420.5 L 309.5 473.5 L 297.5 473.5 Z M 265.5 420.5 L 277.5 420.5 L 277.5 473.5 L 265.5 473.5 Z M 332.5 420.5 L 345.5 420.5 L 345.5 473.5 L 332.5 473.5 Z M 223.5 420.5 L 235.5 420.5 L 235.5 473.5 L 223.5 473.5 Z M 910.5 416.5 L 923.5 416.5 L 923.5 485.5 L 910.5 485.5 Z M 810.5 416.5 L 823.5 416.5 L 823.5 485.5 L 810.5 485.5 Z M 764.5 451.5 L 776.5 451.5 L 776.5 485.5 L 764.5 485.5 Z M 881.5 416.5 L 893.5 416.5 L 893.5 485.5 L 881.5 485.5 Z M 1301.5 418.5 L 1322.5 418.5 L 1322.5 500.5 L 1301.5 500.5 Z M 1345.5 418.5 L 1365.5 418.5 L 1365.5 500.5 L 1345.5 500.5 Z M 1261.5 418.5 L 1282.5 418.5 L 1282.5 500.5 L 1261.5 500.5 Z M 1388.5 418.5 L 1408.5 418.5 L 1408.5 500.5 L 1388.5 500.5 Z M 1637.5 452.5 L 1649.5 452.5 L 1649.5 505.5 L 1637.5 505.5 Z M 1204.5 424.5 L 1225.5 424.5 L 1225.5 506.5 L 1204.5 506.5 Z M 1483.5 460.5 L 1495.5 460.5 L 1495.5 513.5 L 1483.5 513.5 Z M 1448.5 460.5 L 1460.5 460.5 L 1460.5 513.5 L 1448.5 513.5 Z M 1527.5 431.5 L 1548.5 431.5 L 1548.5 513.5 L 1527.5 513.5 Z M 1682.5 416.5 L 1694.5 416.5 L 1694.5 520.5 L 1682.5 520.5 Z M 471.5 470.5 L 483.5 470.5 L 483.5 523.5 L 471.5 523.5 Z M 411.5 470.5 L 423.5 470.5 L 423.5 523.5 L 411.5 523.5 Z M 411.5 470.5 "/>
 </clipPath>
-<image id="image461" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image488" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image461"/>
+  <use xlink:href="#image488"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 202.5 390.5 L 216.5 390.5 L 216.5 404.5 L 202.5 404.5 Z M 1701.5 390.5 L 1715.5 390.5 L 1715.5 404.5 L 1701.5 404.5 Z M 1662.5 390.5 L 1675.5 390.5 L 1675.5 404.5 L 1662.5 404.5 Z M 1622.5 390.5 L 1636.5 390.5 L 1636.5 404.5 L 1622.5 404.5 Z M 1583.5 390.5 L 1597.5 390.5 L 1597.5 404.5 L 1583.5 404.5 Z M 1543.5 390.5 L 1557.5 390.5 L 1557.5 404.5 L 1543.5 404.5 Z M 1504.5 390.5 L 1518.5 390.5 L 1518.5 404.5 L 1504.5 404.5 Z M 1464.5 390.5 L 1478.5 390.5 L 1478.5 404.5 L 1464.5 404.5 Z M 1425.5 390.5 L 1439.5 390.5 L 1439.5 404.5 L 1425.5 404.5 Z M 1385.5 390.5 L 1399.5 390.5 L 1399.5 404.5 L 1385.5 404.5 Z M 1346.5 390.5 L 1360.5 390.5 L 1360.5 404.5 L 1346.5 404.5 Z M 1307.5 390.5 L 1321.5 390.5 L 1321.5 404.5 L 1307.5 404.5 Z M 1267.5 390.5 L 1281.5 390.5 L 1281.5 404.5 L 1267.5 404.5 Z M 1228.5 390.5 L 1242.5 390.5 L 1242.5 404.5 L 1228.5 404.5 Z M 1188.5 390.5 L 1202.5 390.5 L 1202.5 404.5 L 1188.5 404.5 Z M 1149.5 390.5 L 1163.5 390.5 L 1163.5 404.5 L 1149.5 404.5 Z M 1109.5 390.5 L 1123.5 390.5 L 1123.5 404.5 L 1109.5 404.5 Z M 1070.5 390.5 L 1084.5 390.5 L 1084.5 404.5 L 1070.5 404.5 Z M 1031.5 390.5 L 1045.5 390.5 L 1045.5 404.5 L 1031.5 404.5 Z M 991.5 390.5 L 1005.5 390.5 L 1005.5 404.5 L 991.5 404.5 Z M 952.5 390.5 L 966.5 390.5 L 966.5 404.5 L 952.5 404.5 Z M 912.5 390.5 L 926.5 390.5 L 926.5 404.5 L 912.5 404.5 Z M 873.5 390.5 L 887.5 390.5 L 887.5 404.5 L 873.5 404.5 Z M 833.5 390.5 L 847.5 390.5 L 847.5 404.5 L 833.5 404.5 Z M 794.5 390.5 L 808.5 390.5 L 808.5 404.5 L 794.5 404.5 Z M 755.5 390.5 L 769.5 390.5 L 769.5 404.5 L 755.5 404.5 Z M 715.5 390.5 L 729.5 390.5 L 729.5 404.5 L 715.5 404.5 Z M 676.5 390.5 L 690.5 390.5 L 690.5 404.5 L 676.5 404.5 Z M 636.5 390.5 L 650.5 390.5 L 650.5 404.5 L 636.5 404.5 Z M 597.5 390.5 L 611.5 390.5 L 611.5 404.5 L 597.5 404.5 Z M 557.5 390.5 L 571.5 390.5 L 571.5 404.5 L 557.5 404.5 Z M 518.5 390.5 L 532.5 390.5 L 532.5 404.5 L 518.5 404.5 Z M 479.5 390.5 L 492.5 390.5 L 492.5 404.5 L 479.5 404.5 Z M 439.5 390.5 L 453.5 390.5 L 453.5 404.5 L 439.5 404.5 Z M 400.5 390.5 L 414.5 390.5 L 414.5 404.5 L 400.5 404.5 Z M 360.5 390.5 L 374.5 390.5 L 374.5 404.5 L 360.5 404.5 Z M 321.5 390.5 L 335.5 390.5 L 335.5 404.5 L 321.5 404.5 Z M 281.5 390.5 L 295.5 390.5 L 295.5 404.5 L 281.5 404.5 Z M 242.5 390.5 L 256.5 390.5 L 256.5 404.5 L 242.5 404.5 Z M 1504.5 432.5 L 1518.5 432.5 L 1518.5 437.5 L 1504.5 437.5 Z M 1425.5 432.5 L 1439.5 432.5 L 1439.5 442.5 L 1425.5 442.5 Z M 1425.5 442.5 L 1439.5 442.5 L 1439.5 446.5 L 1425.5 446.5 Z M 1504.5 437.5 L 1518.5 437.5 L 1518.5 446.5 L 1504.5 446.5 Z M 202.5 663.5 L 216.5 663.5 L 216.5 677.5 L 202.5 677.5 Z M 1701.5 663.5 L 1715.5 663.5 L 1715.5 677.5 L 1701.5 677.5 Z M 1662.5 663.5 L 1675.5 663.5 L 1675.5 677.5 L 1662.5 677.5 Z M 1622.5 663.5 L 1636.5 663.5 L 1636.5 677.5 L 1622.5 677.5 Z M 1583.5 663.5 L 1597.5 663.5 L 1597.5 677.5 L 1583.5 677.5 Z M 1543.5 663.5 L 1557.5 663.5 L 1557.5 677.5 L 1543.5 677.5 Z M 1504.5 663.5 L 1518.5 663.5 L 1518.5 677.5 L 1504.5 677.5 Z M 1464.5 663.5 L 1478.5 663.5 L 1478.5 677.5 L 1464.5 677.5 Z M 1425.5 663.5 L 1439.5 663.5 L 1439.5 677.5 L 1425.5 677.5 Z M 1385.5 663.5 L 1399.5 663.5 L 1399.5 677.5 L 1385.5 677.5 Z M 1346.5 663.5 L 1360.5 663.5 L 1360.5 677.5 L 1346.5 677.5 Z M 1307.5 663.5 L 1321.5 663.5 L 1321.5 677.5 L 1307.5 677.5 Z M 1267.5 663.5 L 1281.5 663.5 L 1281.5 677.5 L 1267.5 677.5 Z M 1228.5 663.5 L 1242.5 663.5 L 1242.5 677.5 L 1228.5 677.5 Z M 1188.5 663.5 L 1202.5 663.5 L 1202.5 677.5 L 1188.5 677.5 Z M 1149.5 663.5 L 1163.5 663.5 L 1163.5 677.5 L 1149.5 677.5 Z M 1109.5 663.5 L 1123.5 663.5 L 1123.5 677.5 L 1109.5 677.5 Z M 1070.5 663.5 L 1084.5 663.5 L 1084.5 677.5 L 1070.5 677.5 Z M 1031.5 663.5 L 1045.5 663.5 L 1045.5 677.5 L 1031.5 677.5 Z M 991.5 663.5 L 1005.5 663.5 L 1005.5 677.5 L 991.5 677.5 Z M 952.5 663.5 L 966.5 663.5 L 966.5 677.5 L 952.5 677.5 Z M 912.5 663.5 L 926.5 663.5 L 926.5 677.5 L 912.5 677.5 Z M 873.5 663.5 L 887.5 663.5 L 887.5 677.5 L 873.5 677.5 Z M 833.5 663.5 L 847.5 663.5 L 847.5 677.5 L 833.5 677.5 Z M 794.5 663.5 L 808.5 663.5 L 808.5 677.5 L 794.5 677.5 Z M 755.5 663.5 L 769.5 663.5 L 769.5 677.5 L 755.5 677.5 Z M 715.5 663.5 L 729.5 663.5 L 729.5 677.5 L 715.5 677.5 Z M 676.5 663.5 L 690.5 663.5 L 690.5 677.5 L 676.5 677.5 Z M 636.5 663.5 L 650.5 663.5 L 650.5 677.5 L 636.5 677.5 Z M 597.5 663.5 L 611.5 663.5 L 611.5 677.5 L 597.5 677.5 Z M 557.5 663.5 L 571.5 663.5 L 571.5 677.5 L 557.5 677.5 Z M 518.5 663.5 L 532.5 663.5 L 532.5 677.5 L 518.5 677.5 Z M 479.5 663.5 L 492.5 663.5 L 492.5 677.5 L 479.5 677.5 Z M 439.5 663.5 L 453.5 663.5 L 453.5 677.5 L 439.5 677.5 Z M 400.5 663.5 L 414.5 663.5 L 414.5 677.5 L 400.5 677.5 Z M 360.5 663.5 L 374.5 663.5 L 374.5 677.5 L 360.5 677.5 Z M 321.5 663.5 L 335.5 663.5 L 335.5 677.5 L 321.5 677.5 Z M 281.5 663.5 L 295.5 663.5 L 295.5 677.5 L 281.5 677.5 Z M 242.5 663.5 L 256.5 663.5 L 256.5 677.5 L 242.5 677.5 Z M 242.5 663.5 "/>
 </clipPath>
-<image id="image462" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image489" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image462"/>
+  <use xlink:href="#image489"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface456">
+<g id="surface483">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -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 971.097656 672.175781 L 971.097656 661.953125 L 975.039062 661.953125 L 975.65625 661.996094 L 976.230469 662.105469 L 976.765625 662.304688 L 977.257812 662.554688 L 977.691406 662.90625 L 978.097656 663.3125 L 978.433594 663.804688 L 978.714844 664.335938 L 978.925781 664.941406 L 979.078125 665.585938 L 979.164062 666.300781 L 979.207031 667.058594 L 979.164062 667.859375 L 979.066406 668.601562 L 978.898438 669.273438 L 978.671875 669.890625 L 978.378906 670.4375 L 978.011719 670.914062 L 977.621094 671.308594 L 977.1875 671.617188 L 976.707031 671.867188 L 976.191406 672.039062 L 975.628906 672.148438 L 975.039062 672.175781 Z M 972.402344 671.027344 L 974.816406 671.027344 L 975.460938 670.984375 L 976.035156 670.832031 L 976.539062 670.566406 L 976.960938 670.214844 L 977.296875 669.738281 L 977.578125 669.160156 L 977.664062 668.867188 L 977.746094 668.558594 L 977.816406 668.222656 L 977.859375 667.859375 L 977.886719 667.480469 L 977.902344 667.070312 L 977.84375 666.160156 L 977.703125 665.359375 L 977.453125 664.675781 L 977.117188 664.125 L 976.679688 663.679688 L 976.148438 663.355469 L 975.953125 663.285156 L 975.742188 663.214844 L 975.515625 663.171875 L 975.292969 663.132812 L 974.816406 663.101562 L 972.402344 663.101562 Z M 972.402344 671.027344 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 190 416 L 1728 416 M 190 409 L 1728 409 M 190 409 L 190 416 M 1728 409 L 1728 416 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 190 416 L 1728 416 M 190 409 L 1728 409 M 1728 416 L 1728 409 M 190 416 L 190 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(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 190 404 L 190 413 M 185 409 L 194 409 M 189 410 L 191 410 M 189 408 L 191 408 M 189 408 L 189 410 M 191 408 L 191 410 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 </g>
 </svg>
diff --git a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.svg b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.svg
index 99afad0..1cd4f8d 100644
--- a/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_1.svg
+++ b/cells/srsdfxtp/sky130_fd_sc_lp__srsdfxtp_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 174.5 331.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 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="#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 1492.5 573.5 L 1508.5 573.5 L 1508.5 619.5 L 1492.5 619.5 Z M 1409.5 573.5 L 1426.5 573.5 L 1426.5 619.5 L 1409.5 619.5 Z M 1452.5 573.5 L 1469.5 573.5 L 1469.5 619.5 L 1452.5 619.5 Z M 700.5 595.5 L 716.5 595.5 L 716.5 641.5 L 700.5 641.5 Z M 610.5 595.5 L 626.5 595.5 L 626.5 641.5 L 610.5 641.5 Z M 657.5 595.5 L 674.5 595.5 L 674.5 641.5 L 657.5 641.5 Z M 1153.5 602.5 L 1170.5 602.5 L 1170.5 648.5 L 1153.5 648.5 Z M 1114.5 602.5 L 1130.5 602.5 L 1130.5 648.5 L 1114.5 648.5 Z M 975.5 609.5 L 991.5 609.5 L 991.5 655.5 L 975.5 655.5 Z M 1054.5 609.5 L 1070.5 609.5 L 1070.5 655.5 L 1054.5 655.5 Z M 1014.5 609.5 L 1031.5 609.5 L 1031.5 655.5 L 1014.5 655.5 Z M 863.5 609.5 L 879.5 609.5 L 879.5 679.5 L 863.5 679.5 Z M 788.5 609.5 L 805.5 609.5 L 805.5 679.5 L 788.5 679.5 Z M 902.5 609.5 L 919.5 609.5 L 919.5 679.5 L 902.5 679.5 Z M 1660.5 593.5 L 1676.5 593.5 L 1676.5 686.5 L 1660.5 686.5 Z M 1600.5 640.5 L 1617.5 640.5 L 1617.5 686.5 L 1600.5 686.5 Z M 294.5 645.5 L 310.5 645.5 L 310.5 691.5 L 294.5 691.5 Z M 396.5 645.5 L 412.5 645.5 L 412.5 691.5 L 396.5 691.5 Z M 439.5 645.5 L 455.5 645.5 L 455.5 691.5 L 439.5 691.5 Z M 491.5 645.5 L 508.5 645.5 L 508.5 691.5 L 491.5 691.5 Z M 247.5 645.5 L 263.5 645.5 L 263.5 691.5 L 247.5 691.5 Z M 337.5 645.5 L 353.5 645.5 L 353.5 691.5 L 337.5 691.5 Z M 337.5 645.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 776.5 380.5 L 792.5 380.5 L 792.5 426.5 L 776.5 426.5 Z M 733.5 380.5 L 749.5 380.5 L 749.5 426.5 L 733.5 426.5 Z M 686.5 380.5 L 702.5 380.5 L 702.5 426.5 L 686.5 426.5 Z M 381.5 385.5 L 397.5 385.5 L 397.5 455.5 L 381.5 455.5 Z M 243.5 385.5 L 260.5 385.5 L 260.5 455.5 L 243.5 455.5 Z M 524.5 385.5 L 541.5 385.5 L 541.5 455.5 L 524.5 455.5 Z M 432.5 385.5 L 449.5 385.5 L 449.5 455.5 L 432.5 455.5 Z M 333.5 385.5 L 350.5 385.5 L 350.5 455.5 L 333.5 455.5 Z M 291.5 385.5 L 307.5 385.5 L 307.5 455.5 L 291.5 455.5 Z M 875.5 392.5 L 892.5 392.5 L 892.5 484.5 L 875.5 484.5 Z M 1388.5 417.5 L 1405.5 417.5 L 1405.5 487.5 L 1388.5 487.5 Z M 1187.5 377.5 L 1215.5 377.5 L 1215.5 487.5 L 1187.5 487.5 Z M 1241.5 377.5 L 1268.5 377.5 L 1268.5 487.5 L 1241.5 487.5 Z M 1448.5 377.5 L 1476.5 377.5 L 1476.5 487.5 L 1448.5 487.5 Z M 1312.5 417.5 L 1328.5 417.5 L 1328.5 487.5 L 1312.5 487.5 Z M 931.5 417.5 L 948.5 417.5 L 948.5 509.5 L 931.5 509.5 Z M 971.5 417.5 L 987.5 417.5 L 987.5 509.5 L 971.5 509.5 Z M 1600.5 445.5 L 1617.5 445.5 L 1617.5 516.5 L 1600.5 516.5 Z M 1660.5 377.5 L 1676.5 377.5 L 1676.5 516.5 L 1660.5 516.5 Z M 1660.5 377.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 1266.5 398.5 L 1284.5 398.5 L 1284.5 411.5 L 1266.5 411.5 Z M 1424.5 398.5 L 1442.5 398.5 L 1442.5 411.5 L 1424.5 411.5 Z M 1266.5 411.5 L 1284.5 411.5 L 1284.5 417.5 L 1266.5 417.5 Z M 1424.5 411.5 L 1442.5 411.5 L 1442.5 417.5 L 1424.5 417.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="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>
@@ -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 452.144531 576.046875 L 452.144531 584.113281 L 466.015625 584.113281 L 466.015625 586.757812 L 449.144531 586.757812 L 449.144531 563.242188 L 465.433594 563.242188 L 465.433594 565.886719 L 452.144531 565.886719 L 452.144531 573.402344 L 464.953125 573.402344 L 464.953125 576.046875 Z M 452.144531 576.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 423 514 L 441 514 M 423 495 L 441 495 M 423 495 L 423 514 M 441 495 L 441 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 423 514 L 441 514 M 423 495 L 441 495 M 441 514 L 441 495 M 423 514 L 423 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/tap/sky130_fd_sc_lp__tap_1.svg b/cells/tap/sky130_fd_sc_lp__tap_1.svg
index 798f01a..b0e1e4f 100644
--- a/cells/tap/sky130_fd_sc_lp__tap_1.svg
+++ b/cells/tap/sky130_fd_sc_lp__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 539.5 L 867.5 539.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 356.5 L 946.5 356.5 Z M 946.5 356.5 L 985.5 356.5 L 985.5 394.5 L 946.5 394.5 Z M 946.5 394.5 L 985.5 394.5 L 985.5 422.5 L 946.5 422.5 Z M 946.5 394.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_lp__tap_2.svg b/cells/tap/sky130_fd_sc_lp__tap_2.svg
index 41556df..42770ae 100644
--- a/cells/tap/sky130_fd_sc_lp__tap_2.svg
+++ b/cells/tap/sky130_fd_sc_lp__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 539.5 L 812.5 539.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 356.5 L 891.5 356.5 Z M 891.5 356.5 L 1040.5 356.5 L 1040.5 394.5 L 891.5 394.5 Z M 891.5 394.5 L 1040.5 394.5 L 1040.5 422.5 L 891.5 422.5 Z M 891.5 394.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/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.svg b/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.svg
index 782d03f..ebdb90a 100644
--- a/cells/tapvgnd/sky130_fd_sc_lp__tapvgnd_1.svg
+++ b/cells/tapvgnd/sky130_fd_sc_lp__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 539.5 L 867.5 539.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 356.5 L 946.5 356.5 Z M 946.5 356.5 L 985.5 356.5 L 985.5 394.5 L 946.5 394.5 Z M 946.5 394.5 L 985.5 394.5 L 985.5 422.5 L 946.5 422.5 Z M 946.5 394.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_lp__tapvgnd2_1.svg b/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.svg
index 9853b9e..37f224d 100644
--- a/cells/tapvgnd2/sky130_fd_sc_lp__tapvgnd2_1.svg
+++ b/cells/tapvgnd2/sky130_fd_sc_lp__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 539.5 L 867.5 539.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 356.5 L 946.5 356.5 Z M 946.5 356.5 L 985.5 356.5 L 985.5 394.5 L 946.5 394.5 Z M 946.5 394.5 L 985.5 394.5 L 985.5 422.5 L 946.5 422.5 Z M 946.5 394.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 356.5 L 946.5 356.5 Z M 946.5 356.5 L 985.5 356.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_lp__tapvpwrvgnd_1.svg b/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.svg
index 9633c2a..4346be3 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_lp__tapvpwrvgnd_1.svg
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_lp__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 539.5 L 867.5 539.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 356.5 L 946.5 356.5 Z M 946.5 356.5 L 985.5 356.5 L 985.5 394.5 L 946.5 394.5 Z M 946.5 394.5 L 985.5 394.5 L 985.5 422.5 L 946.5 422.5 Z M 946.5 394.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_lp__xnor2_0.svg b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.svg
index 7c34e16..0ebb4e2 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_0.svg
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="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="#image288"/>
+  <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 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="#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 669.5 619.5 L 703.5 619.5 L 703.5 715.5 L 669.5 715.5 Z M 751.5 619.5 L 785.5 619.5 L 785.5 715.5 L 751.5 715.5 Z M 981.5 753.5 L 1016.5 753.5 L 1016.5 849.5 L 981.5 849.5 Z M 1178.5 753.5 L 1213.5 753.5 L 1213.5 849.5 L 1178.5 849.5 Z M 1080.5 753.5 L 1114.5 753.5 L 1114.5 849.5 L 1080.5 849.5 Z M 1080.5 753.5 "/>
 </clipPath>
-<image id="image289" 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="#image289"/>
+  <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 1167.5 213.5 L 1201.5 213.5 L 1201.5 360.5 L 1167.5 360.5 Z M 706.5 213.5 L 741.5 213.5 L 741.5 360.5 L 706.5 360.5 Z M 805.5 213.5 L 839.5 213.5 L 839.5 360.5 L 805.5 360.5 Z M 981.5 213.5 L 1016.5 213.5 L 1016.5 360.5 L 981.5 360.5 Z M 1064.5 213.5 L 1098.5 213.5 L 1098.5 360.5 L 1064.5 360.5 Z M 1064.5 213.5 "/>
 </clipPath>
-<image id="image290" 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="#image290"/>
+  <use xlink:href="#image319"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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="#image291"/>
+  <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="surface285">
+<g id="surface314">
 <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 642.410156 461.757812 L 623.492188 461.757812 L 618.308594 476.5 L 611.644531 476.5 L 629.148438 427.421875 L 637.226562 427.421875 L 654.460938 476.5 L 647.460938 476.5 Z M 640.660156 456.503906 L 633.121094 434.15625 L 625.042969 456.503906 Z M 640.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 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 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_lp__xnor2_1.svg b/cells/xnor2/sky130_fd_sc_lp__xnor2_1.svg
index 2e2eed5..3fa27f1 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_1.svg
+++ b/cells/xnor2/sky130_fd_sc_lp__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 539.5 L 533.5 539.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="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="#image291"/>
+  <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="#image291"/>
+  <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 1221.5 672.5 L 1255.5 672.5 L 1255.5 864.5 L 1221.5 864.5 Z M 675.5 672.5 L 710.5 672.5 L 710.5 864.5 L 675.5 864.5 Z M 766.5 672.5 L 800.5 672.5 L 800.5 864.5 L 766.5 864.5 Z M 984.5 672.5 L 1018.5 672.5 L 1018.5 864.5 L 984.5 864.5 Z M 1107.5 672.5 L 1142.5 672.5 L 1142.5 864.5 L 1107.5 864.5 Z M 1107.5 672.5 "/>
 </clipPath>
-<image id="image292" 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="#image292"/>
+  <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 1221.5 209.5 L 1255.5 209.5 L 1255.5 498.5 L 1221.5 498.5 Z M 675.5 209.5 L 710.5 209.5 L 710.5 498.5 L 675.5 498.5 Z M 774.5 209.5 L 808.5 209.5 L 808.5 498.5 L 774.5 498.5 Z M 984.5 209.5 L 1018.5 209.5 L 1018.5 498.5 L 984.5 498.5 Z M 1107.5 209.5 L 1142.5 209.5 L 1142.5 498.5 L 1107.5 498.5 Z M 1107.5 209.5 "/>
 </clipPath>
-<image id="image293" 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="#image293"/>
+  <use xlink:href="#image322"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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="#image294"/>
+  <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="surface288">
+<g id="surface317">
 <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 644.964844 543.332031 L 644.886719 544.589844 L 644.691406 545.726562 L 644.335938 546.789062 L 643.867188 547.730469 L 643.238281 548.632812 L 642.492188 549.417969 L 641.667969 550.085938 L 640.804688 550.597656 L 639.820312 550.988281 L 638.800781 551.304688 L 637.699219 551.460938 L 636.523438 551.5 L 623.601562 551.5 L 623.601562 522.871094 L 635.226562 522.871094 L 636.914062 522.988281 L 638.40625 523.265625 L 639.742188 523.734375 L 640.882812 524.402344 L 641.863281 525.265625 L 642.648438 526.328125 L 642.960938 526.917969 L 643.238281 527.542969 L 643.433594 528.132812 L 643.589844 528.800781 L 643.667969 529.46875 L 643.707031 530.136719 L 643.589844 531.550781 L 643.238281 532.769531 L 642.6875 533.90625 L 641.902344 534.847656 L 640.921875 535.714844 L 639.742188 536.378906 L 640.882812 536.890625 L 641.863281 537.441406 L 642.726562 538.070312 L 643.433594 538.777344 L 643.984375 539.523438 L 644.414062 540.308594 L 644.574219 540.777344 L 644.808594 541.722656 L 644.886719 542.269531 L 644.925781 542.78125 Z M 640.058594 530.648438 L 639.9375 529.46875 L 639.585938 528.488281 L 639.035156 527.625 L 638.25 526.996094 L 637.269531 526.523438 L 636.050781 526.210938 L 635.777344 526.210938 L 635.5 526.171875 L 635.226562 526.132812 L 634.597656 526.132812 L 634.324219 526.09375 L 627.253906 526.09375 L 627.253906 535.203125 L 634.324219 535.203125 L 635.777344 535.125 L 637.03125 534.886719 L 638.09375 534.457031 L 638.878906 533.867188 L 639.507812 533.082031 L 639.898438 532.140625 L 639.9375 531.941406 L 640.015625 531.472656 L 640.015625 530.921875 Z M 636.167969 548.28125 L 637.269531 548.242188 L 638.25 548.003906 L 639.113281 547.613281 L 639.820312 547.101562 L 640.410156 546.433594 L 640.882812 545.609375 L 641 545.296875 L 641.078125 544.941406 L 641.195312 544.550781 L 641.234375 544.195312 L 641.273438 543.804688 L 641.3125 543.371094 L 641.234375 542.507812 L 641.078125 541.683594 L 640.804688 540.976562 L 640.410156 540.308594 L 639.898438 539.757812 L 639.3125 539.246094 L 638.878906 539.011719 L 638.40625 538.816406 L 637.898438 538.660156 L 637.347656 538.539062 L 636.757812 538.460938 L 636.167969 538.421875 L 627.253906 538.421875 L 627.253906 548.28125 Z M 636.167969 548.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 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/xnor2/sky130_fd_sc_lp__xnor2_2.svg b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.svg
index b5c1a7a..1afd27e 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_2.svg
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 539.5 L 201.5 539.5 Z M 201.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="image326" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -18,7 +18,7 @@
   <path d="M 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="#image297"/>
+  <use xlink:href="#image326"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1335.5 651.5 L 1370.5 651.5 L 1370.5 844.5 L 1335.5 844.5 Z M 1434.5 651.5 L 1468.5 651.5 L 1468.5 844.5 L 1434.5 844.5 Z M 1138.5 651.5 L 1173.5 651.5 L 1173.5 844.5 L 1138.5 844.5 Z M 941.5 651.5 L 976.5 651.5 L 976.5 844.5 L 941.5 844.5 Z M 1533.5 651.5 L 1567.5 651.5 L 1567.5 844.5 L 1533.5 844.5 Z M 1040.5 651.5 L 1074.5 651.5 L 1074.5 844.5 L 1040.5 844.5 Z M 504.5 672.5 L 538.5 672.5 L 538.5 864.5 L 504.5 864.5 Z M 602.5 672.5 L 636.5 672.5 L 636.5 864.5 L 602.5 864.5 Z M 701.5 672.5 L 735.5 672.5 L 735.5 864.5 L 701.5 864.5 Z M 336.5 672.5 L 371.5 672.5 L 371.5 864.5 L 336.5 864.5 Z M 336.5 672.5 "/>
 </clipPath>
-<image id="image298" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image327" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image298"/>
+  <use xlink:href="#image327"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 1549.5 209.5 L 1583.5 209.5 L 1583.5 498.5 L 1549.5 498.5 Z M 396.5 209.5 L 430.5 209.5 L 430.5 498.5 L 396.5 498.5 Z M 494.5 209.5 L 529.5 209.5 L 529.5 498.5 L 494.5 498.5 Z M 602.5 209.5 L 636.5 209.5 L 636.5 498.5 L 602.5 498.5 Z M 701.5 209.5 L 735.5 209.5 L 735.5 498.5 L 701.5 498.5 Z M 835.5 209.5 L 869.5 209.5 L 869.5 498.5 L 835.5 498.5 Z M 933.5 209.5 L 968.5 209.5 L 968.5 498.5 L 933.5 498.5 Z M 1253.5 209.5 L 1287.5 209.5 L 1287.5 498.5 L 1253.5 498.5 Z M 1352.5 209.5 L 1386.5 209.5 L 1386.5 498.5 L 1352.5 498.5 Z M 1450.5 209.5 L 1484.5 209.5 L 1484.5 498.5 L 1450.5 498.5 Z M 1450.5 209.5 "/>
 </clipPath>
-<image id="image299" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image328" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image299"/>
+  <use xlink:href="#image328"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image300" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image329" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image300"/>
+  <use xlink:href="#image329"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface294">
+<g id="surface323">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -164,6 +164,5 @@
 <path style=" 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 542.246094 L 1624.554688 561.5 L 1618.292969 561.5 L 1618.292969 542.246094 L 1599.375 512.421875 L 1607.117188 512.421875 L 1621.523438 536.320312 L 1635.527344 512.421875 L 1643 512.421875 Z M 1624.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 1600 562 L 1639 562 M 1600 523 L 1639 523 M 1600 523 L 1600 562 M 1639 523 L 1639 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 1600 562 L 1639 562 M 1600 523 L 1639 523 M 1639 562 L 1639 523 M 1600 562 L 1600 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/xnor2/sky130_fd_sc_lp__xnor2_4.svg b/cells/xnor2/sky130_fd_sc_lp__xnor2_4.svg
index e1deb29..11ee325 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_4.svg
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_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="image283" 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="#image283"/>
+  <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 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="#image283"/>
+  <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 1633.5 610.5 L 1655.5 610.5 L 1655.5 736.5 L 1633.5 736.5 Z M 269.5 610.5 L 292.5 610.5 L 292.5 736.5 L 269.5 736.5 Z M 346.5 610.5 L 368.5 610.5 L 368.5 736.5 L 346.5 736.5 Z M 410.5 610.5 L 433.5 610.5 L 433.5 736.5 L 410.5 736.5 Z M 475.5 610.5 L 497.5 610.5 L 497.5 736.5 L 475.5 736.5 Z M 539.5 610.5 L 562.5 610.5 L 562.5 736.5 L 539.5 736.5 Z M 604.5 610.5 L 626.5 610.5 L 626.5 736.5 L 604.5 736.5 Z M 668.5 610.5 L 691.5 610.5 L 691.5 736.5 L 668.5 736.5 Z M 745.5 610.5 L 767.5 610.5 L 767.5 736.5 L 745.5 736.5 Z M 809.5 610.5 L 832.5 610.5 L 832.5 736.5 L 809.5 736.5 Z M 874.5 610.5 L 896.5 610.5 L 896.5 736.5 L 874.5 736.5 Z M 940.5 610.5 L 962.5 610.5 L 962.5 736.5 L 940.5 736.5 Z M 1015.5 610.5 L 1037.5 610.5 L 1037.5 736.5 L 1015.5 736.5 Z M 1169.5 610.5 L 1192.5 610.5 L 1192.5 736.5 L 1169.5 736.5 Z M 1246.5 610.5 L 1268.5 610.5 L 1268.5 736.5 L 1246.5 736.5 Z M 1310.5 610.5 L 1333.5 610.5 L 1333.5 736.5 L 1310.5 736.5 Z M 1375.5 610.5 L 1397.5 610.5 L 1397.5 736.5 L 1375.5 736.5 Z M 1439.5 610.5 L 1462.5 610.5 L 1462.5 736.5 L 1439.5 736.5 Z M 1504.5 610.5 L 1526.5 610.5 L 1526.5 736.5 L 1504.5 736.5 Z M 1568.5 610.5 L 1591.5 610.5 L 1591.5 736.5 L 1568.5 736.5 Z M 1568.5 610.5 "/>
 </clipPath>
-<image id="image284" 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="#image284"/>
+  <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 1627.5 320.5 L 1650.5 320.5 L 1650.5 509.5 L 1627.5 509.5 Z M 263.5 320.5 L 286.5 320.5 L 286.5 509.5 L 263.5 509.5 Z M 328.5 320.5 L 350.5 320.5 L 350.5 509.5 L 328.5 509.5 Z M 416.5 320.5 L 439.5 320.5 L 439.5 509.5 L 416.5 509.5 Z M 481.5 320.5 L 503.5 320.5 L 503.5 509.5 L 481.5 509.5 Z M 545.5 320.5 L 568.5 320.5 L 568.5 509.5 L 545.5 509.5 Z M 610.5 320.5 L 632.5 320.5 L 632.5 509.5 L 610.5 509.5 Z M 674.5 320.5 L 697.5 320.5 L 697.5 509.5 L 674.5 509.5 Z M 739.5 320.5 L 761.5 320.5 L 761.5 509.5 L 739.5 509.5 Z M 809.5 320.5 L 832.5 320.5 L 832.5 509.5 L 809.5 509.5 Z M 874.5 320.5 L 896.5 320.5 L 896.5 509.5 L 874.5 509.5 Z M 1047.5 320.5 L 1069.5 320.5 L 1069.5 509.5 L 1047.5 509.5 Z M 1111.5 320.5 L 1134.5 320.5 L 1134.5 509.5 L 1111.5 509.5 Z M 1176.5 320.5 L 1198.5 320.5 L 1198.5 509.5 L 1176.5 509.5 Z M 1240.5 320.5 L 1263.5 320.5 L 1263.5 509.5 L 1240.5 509.5 Z M 1305.5 320.5 L 1327.5 320.5 L 1327.5 509.5 L 1305.5 509.5 Z M 1369.5 320.5 L 1392.5 320.5 L 1392.5 509.5 L 1369.5 509.5 Z M 1434.5 320.5 L 1456.5 320.5 L 1456.5 509.5 L 1434.5 509.5 Z M 1498.5 320.5 L 1521.5 320.5 L 1521.5 509.5 L 1498.5 509.5 Z M 1563.5 320.5 L 1585.5 320.5 L 1585.5 509.5 L 1563.5 509.5 Z M 1563.5 320.5 "/>
 </clipPath>
-<image id="image285" 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="#image285"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 514.5 522.5 L 540.5 522.5 L 540.5 545.5 L 514.5 545.5 Z M 1450.5 522.5 L 1476.5 522.5 L 1476.5 545.5 L 1450.5 545.5 Z M 1450.5 545.5 L 1476.5 545.5 L 1476.5 548.5 L 1450.5 548.5 Z M 514.5 545.5 L 540.5 545.5 L 540.5 548.5 L 514.5 548.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="image286" 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="#image286"/>
+  <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="surface280">
+<g id="surface310">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 890.324219 372.066406 L 890.324219 384.5 L 886.28125 384.5 L 886.28125 372.066406 L 874.066406 352.804688 L 879.066406 352.804688 L 888.371094 368.238281 L 897.414062 352.804688 L 902.238281 352.804688 Z M 890.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 874 723 L 900 723 M 874 698 L 900 698 M 874 698 L 874 723 M 900 698 L 900 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 874 723 L 900 723 M 874 698 L 900 698 M 900 723 L 900 698 M 874 723 L 874 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/xnor2/sky130_fd_sc_lp__xnor2_lp.svg b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.svg
index 68e9d48..47b1cfd 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.svg
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="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="#image285"/>
+  <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="#image285"/>
+  <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 1127.5 679.5 L 1161.5 679.5 L 1161.5 775.5 L 1127.5 775.5 Z M 893.5 679.5 L 928.5 679.5 L 928.5 775.5 L 893.5 775.5 Z M 1216.5 679.5 L 1251.5 679.5 L 1251.5 775.5 L 1216.5 775.5 Z M 1028.5 679.5 L 1063.5 679.5 L 1063.5 775.5 L 1028.5 775.5 Z M 671.5 716.5 L 705.5 716.5 L 705.5 813.5 L 671.5 813.5 Z M 671.5 716.5 "/>
 </clipPath>
-<image id="image286" 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="#image286"/>
+  <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 1196.5 209.5 L 1253.5 209.5 L 1253.5 438.5 L 1196.5 438.5 Z M 719.5 209.5 L 776.5 209.5 L 776.5 438.5 L 719.5 438.5 Z M 840.5 209.5 L 898.5 209.5 L 898.5 438.5 L 840.5 438.5 Z M 953.5 209.5 L 1010.5 209.5 L 1010.5 438.5 L 953.5 438.5 Z M 1074.5 209.5 L 1132.5 209.5 L 1132.5 438.5 L 1074.5 438.5 Z M 1074.5 209.5 "/>
 </clipPath>
-<image id="image287" 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="#image287"/>
+  <use xlink:href="#image316"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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="#image288"/>
+  <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="surface282">
+<g id="surface311">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -152,6 +152,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 636.554688 542.246094 L 636.554688 561.5 L 630.292969 561.5 L 630.292969 542.246094 L 611.375 512.421875 L 619.117188 512.421875 L 633.523438 536.320312 L 647.527344 512.421875 L 655 512.421875 Z M 636.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 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/xnor2/sky130_fd_sc_lp__xnor2_m.svg b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.svg
index 25ba51e..177a87d 100644
--- a/cells/xnor2/sky130_fd_sc_lp__xnor2_m.svg
+++ b/cells/xnor2/sky130_fd_sc_lp__xnor2_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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="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 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="#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 1217.5 719.5 L 1252.5 719.5 L 1252.5 815.5 L 1217.5 815.5 Z M 702.5 719.5 L 736.5 719.5 L 736.5 815.5 L 702.5 815.5 Z M 784.5 719.5 L 819.5 719.5 L 819.5 815.5 L 784.5 815.5 Z M 883.5 719.5 L 917.5 719.5 L 917.5 815.5 L 883.5 815.5 Z M 981.5 719.5 L 1016.5 719.5 L 1016.5 815.5 L 981.5 815.5 Z M 981.5 719.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 1188.5 338.5 L 1222.5 338.5 L 1222.5 435.5 L 1188.5 435.5 Z M 702.5 338.5 L 736.5 338.5 L 736.5 435.5 L 702.5 435.5 Z M 800.5 338.5 L 835.5 338.5 L 835.5 435.5 L 800.5 435.5 Z M 899.5 338.5 L 933.5 338.5 L 933.5 435.5 L 899.5 435.5 Z M 981.5 338.5 L 1016.5 338.5 L 1016.5 435.5 L 981.5 435.5 Z M 981.5 338.5 "/>
 </clipPath>
-<image id="image312" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 1186.554688 372.246094 L 1186.554688 391.5 L 1180.292969 391.5 L 1180.292969 372.246094 L 1161.375 342.421875 L 1169.117188 342.421875 L 1183.523438 366.320312 L 1197.527344 342.421875 L 1205 342.421875 Z M 1186.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 1162 731 L 1201 731 M 1162 693 L 1201 693 M 1162 693 L 1162 731 M 1201 693 L 1201 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 1162 731 L 1201 731 M 1162 693 L 1201 693 M 1201 731 L 1201 693 M 1162 731 L 1162 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 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/xnor3/sky130_fd_sc_lp__xnor3_1.svg b/cells/xnor3/sky130_fd_sc_lp__xnor3_1.svg
index 22659b8..498da58 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_1.svg
+++ b/cells/xnor3/sky130_fd_sc_lp__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 538.5 L 174.5 538.5 Z M 174.5 195.5 "/>
 </clipPath>
-<image id="image281" 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="#image281"/>
+  <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="#image281"/>
+  <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 406.5 639.5 L 433.5 639.5 L 433.5 716.5 L 406.5 716.5 Z M 1097.5 609.5 L 1125.5 609.5 L 1125.5 727.5 L 1097.5 727.5 Z M 1189.5 609.5 L 1217.5 609.5 L 1217.5 727.5 L 1189.5 727.5 Z M 1289.5 658.5 L 1317.5 658.5 L 1317.5 735.5 L 1289.5 735.5 Z M 678.5 624.5 L 705.5 624.5 L 705.5 742.5 L 678.5 742.5 Z M 586.5 624.5 L 614.5 624.5 L 614.5 742.5 L 586.5 742.5 Z M 1601.5 658.5 L 1628.5 658.5 L 1628.5 776.5 L 1601.5 776.5 Z M 1481.5 658.5 L 1509.5 658.5 L 1509.5 776.5 L 1481.5 776.5 Z M 1398.5 658.5 L 1425.5 658.5 L 1425.5 776.5 L 1398.5 776.5 Z M 894.5 624.5 L 921.5 624.5 L 921.5 778.5 L 894.5 778.5 Z M 285.5 639.5 L 313.5 639.5 L 313.5 793.5 L 285.5 793.5 Z M 285.5 639.5 "/>
 </clipPath>
-<image id="image282" 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="#image282"/>
+  <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 586.5 273.5 L 614.5 273.5 L 614.5 427.5 L 586.5 427.5 Z M 686.5 311.5 L 714.5 311.5 L 714.5 466.5 L 686.5 466.5 Z M 1601.5 306.5 L 1628.5 306.5 L 1628.5 490.5 L 1601.5 490.5 Z M 1502.5 306.5 L 1530.5 306.5 L 1530.5 490.5 L 1502.5 490.5 Z M 1262.5 381.5 L 1290.5 381.5 L 1290.5 499.5 L 1262.5 499.5 Z M 1381.5 344.5 L 1409.5 344.5 L 1409.5 499.5 L 1381.5 499.5 Z M 1183.5 381.5 L 1211.5 381.5 L 1211.5 499.5 L 1183.5 499.5 Z M 1083.5 344.5 L 1111.5 344.5 L 1111.5 499.5 L 1083.5 499.5 Z M 875.5 273.5 L 902.5 273.5 L 902.5 504.5 L 875.5 504.5 Z M 409.5 387.5 L 436.5 387.5 L 436.5 504.5 L 409.5 504.5 Z M 284.5 273.5 L 311.5 273.5 L 311.5 504.5 L 284.5 504.5 Z M 284.5 273.5 "/>
 </clipPath>
-<image id="image283" 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="#image283"/>
+  <use xlink:href="#image311"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 1208.5 384.5 L 1239.5 384.5 L 1239.5 392.5 L 1208.5 392.5 Z M 1649.5 384.5 L 1681.5 384.5 L 1681.5 413.5 L 1649.5 413.5 Z M 1649.5 413.5 L 1681.5 413.5 L 1681.5 415.5 L 1649.5 415.5 Z M 1208.5 392.5 L 1239.5 392.5 L 1239.5 415.5 L 1208.5 415.5 Z M 679.5 588.5 L 710.5 588.5 L 710.5 619.5 L 679.5 619.5 Z M 1120.5 588.5 L 1151.5 588.5 L 1151.5 619.5 L 1120.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="image284" 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="#image284"/>
+  <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="surface278">
+<g id="surface306">
 <g clip-path="url(#clip1)" clip-rule="nonzero">
 
 </g>
@@ -149,6 +149,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 257.886719 671.042969 L 272 691.5 L 265.707031 691.5 L 254.824219 674.871094 L 243.882812 691.5 L 237.703125 691.5 L 251.816406 671.042969 L 238.578125 651.625 L 244.757812 651.625 L 254.988281 667.269531 L 265.269531 651.625 L 271.34375 651.625 Z M 257.886719 671.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 238 423 L 269 423 M 238 392 L 269 392 M 238 392 L 238 423 M 269 392 L 269 423 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-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 423 L 269 423 M 238 392 L 269 392 M 269 423 L 269 392 M 238 423 L 238 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(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_lp__xnor3_lp.svg b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.svg
index c4c2d71..6f8c6ed 100644
--- a/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.svg
+++ b/cells/xnor3/sky130_fd_sc_lp__xnor3_lp.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 748.5 536.5 L 1396.5 536.5 L 1396.5 551.5 L 748.5 551.5 Z M 1145.5 551.5 L 1396.5 551.5 L 1396.5 562.5 L 1145.5 562.5 Z M 1145.5 551.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 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="#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 901.5 605.5 L 923.5 605.5 L 923.5 668.5 L 901.5 668.5 Z M 977.5 605.5 L 1000.5 605.5 L 1000.5 668.5 L 977.5 668.5 Z M 1630.5 623.5 L 1652.5 623.5 L 1652.5 686.5 L 1630.5 686.5 Z M 1477.5 623.5 L 1500.5 623.5 L 1500.5 686.5 L 1477.5 686.5 Z M 1576.5 623.5 L 1598.5 623.5 L 1598.5 686.5 L 1576.5 686.5 Z M 1192.5 638.5 L 1214.5 638.5 L 1214.5 701.5 L 1192.5 701.5 Z M 1054.5 638.5 L 1076.5 638.5 L 1076.5 701.5 L 1054.5 701.5 Z M 1118.5 638.5 L 1141.5 638.5 L 1141.5 701.5 L 1118.5 701.5 Z M 1256.5 638.5 L 1279.5 638.5 L 1279.5 701.5 L 1256.5 701.5 Z M 439.5 640.5 L 461.5 640.5 L 461.5 703.5 L 439.5 703.5 Z M 266.5 640.5 L 289.5 640.5 L 289.5 703.5 L 266.5 703.5 Z M 320.5 640.5 L 343.5 640.5 L 343.5 703.5 L 320.5 703.5 Z M 385.5 640.5 L 407.5 640.5 L 407.5 703.5 L 385.5 703.5 Z M 667.5 646.5 L 689.5 646.5 L 689.5 709.5 L 667.5 709.5 Z M 608.5 646.5 L 631.5 646.5 L 631.5 709.5 L 608.5 709.5 Z M 1406.5 655.5 L 1429.5 655.5 L 1429.5 718.5 L 1406.5 718.5 Z M 1406.5 655.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 285.5 328.5 L 322.5 328.5 L 322.5 478.5 L 285.5 478.5 Z M 364.5 328.5 L 402.5 328.5 L 402.5 478.5 L 364.5 478.5 Z M 1496.5 334.5 L 1534.5 334.5 L 1534.5 484.5 L 1496.5 484.5 Z M 1576.5 334.5 L 1613.5 334.5 L 1613.5 484.5 L 1576.5 484.5 Z M 651.5 359.5 L 688.5 359.5 L 688.5 509.5 L 651.5 509.5 Z M 1118.5 374.5 L 1156.5 374.5 L 1156.5 524.5 L 1118.5 524.5 Z M 1039.5 374.5 L 1076.5 374.5 L 1076.5 524.5 L 1039.5 524.5 Z M 959.5 374.5 L 997.5 374.5 L 997.5 524.5 L 959.5 524.5 Z M 830.5 374.5 L 868.5 374.5 L 868.5 524.5 L 830.5 524.5 Z M 1210.5 385.5 L 1247.5 385.5 L 1247.5 535.5 L 1210.5 535.5 Z M 1289.5 385.5 L 1327.5 385.5 L 1327.5 535.5 L 1289.5 535.5 Z M 1289.5 385.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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="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>
@@ -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 1682.5 368.238281 L 1693.71875 384.5 L 1688.71875 384.5 L 1680.066406 371.28125 L 1671.371094 384.5 L 1666.457031 384.5 L 1677.675781 368.238281 L 1667.152344 352.804688 L 1672.066406 352.804688 L 1680.195312 365.238281 L 1688.371094 352.804688 L 1693.195312 352.804688 Z M 1682.5 368.238281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1666 723 L 1692 723 M 1666 698 L 1692 698 M 1666 698 L 1666 723 M 1692 698 L 1692 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 1666 723 L 1692 723 M 1666 698 L 1692 698 M 1692 723 L 1692 698 M 1666 723 L 1666 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/xor2/sky130_fd_sc_lp__xor2_0.svg b/cells/xor2/sky130_fd_sc_lp__xor2_0.svg
index 09dc938..8f6ba39 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_0.svg
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_0.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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 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="#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 1219.5 725.5 L 1253.5 725.5 L 1253.5 821.5 L 1219.5 821.5 Z M 709.5 725.5 L 743.5 725.5 L 743.5 821.5 L 709.5 821.5 Z M 807.5 725.5 L 842.5 725.5 L 842.5 821.5 L 807.5 821.5 Z M 906.5 725.5 L 940.5 725.5 L 940.5 821.5 L 906.5 821.5 Z M 995.5 725.5 L 1030.5 725.5 L 1030.5 821.5 L 995.5 821.5 Z M 995.5 725.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 669.5 220.5 L 703.5 220.5 L 703.5 367.5 L 669.5 367.5 Z M 758.5 220.5 L 792.5 220.5 L 792.5 367.5 L 758.5 367.5 Z M 955.5 220.5 L 989.5 220.5 L 989.5 367.5 L 955.5 367.5 Z M 856.5 220.5 L 891.5 220.5 L 891.5 367.5 L 856.5 367.5 Z M 1219.5 351.5 L 1253.5 351.5 L 1253.5 498.5 L 1219.5 498.5 Z M 1219.5 351.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="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>
@@ -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 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/xor2/sky130_fd_sc_lp__xor2_1.svg b/cells/xor2/sky130_fd_sc_lp__xor2_1.svg
index 76d309f..996f9b4 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_1.svg
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.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 1140.5 647.5 L 1174.5 647.5 L 1174.5 839.5 L 1140.5 839.5 Z M 686.5 647.5 L 720.5 647.5 L 720.5 839.5 L 686.5 839.5 Z M 784.5 647.5 L 819.5 647.5 L 819.5 839.5 L 784.5 839.5 Z M 883.5 647.5 L 917.5 647.5 L 917.5 839.5 L 883.5 839.5 Z M 972.5 647.5 L 1007.5 647.5 L 1007.5 839.5 L 972.5 839.5 Z M 972.5 647.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 1221.5 209.5 L 1255.5 209.5 L 1255.5 498.5 L 1221.5 498.5 Z M 686.5 209.5 L 720.5 209.5 L 720.5 498.5 L 686.5 498.5 Z M 775.5 209.5 L 810.5 209.5 L 810.5 498.5 L 775.5 498.5 Z M 878.5 209.5 L 913.5 209.5 L 913.5 498.5 L 878.5 498.5 Z M 977.5 209.5 L 1011.5 209.5 L 1011.5 498.5 L 977.5 498.5 Z M 977.5 209.5 "/>
 </clipPath>
-<image id="image286" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image315" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image286"/>
+  <use xlink:href="#image315"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -152,6 +152,5 @@
 <path style=" 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.824219 536.320312 L 1204.191406 561.5 L 1196.449219 561.5 L 1183.050781 541.035156 L 1169.589844 561.5 L 1161.980469 561.5 L 1179.351562 536.320312 L 1163.058594 512.421875 L 1170.664062 512.421875 L 1183.253906 531.675781 L 1195.910156 512.421875 L 1203.382812 512.421875 Z M 1186.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 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/xor2/sky130_fd_sc_lp__xor2_2.svg b/cells/xor2/sky130_fd_sc_lp__xor2_2.svg
index af7fdab..8a92906 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_2.svg
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_2.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 201.5 111.5 L 1718.5 111.5 L 1718.5 539.5 L 201.5 539.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="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 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="#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 1528.5 651.5 L 1562.5 651.5 L 1562.5 844.5 L 1528.5 844.5 Z M 381.5 651.5 L 415.5 651.5 L 415.5 844.5 L 381.5 844.5 Z M 479.5 651.5 L 514.5 651.5 L 514.5 844.5 L 479.5 844.5 Z M 615.5 651.5 L 649.5 651.5 L 649.5 844.5 L 615.5 844.5 Z M 766.5 651.5 L 800.5 651.5 L 800.5 844.5 L 766.5 844.5 Z M 909.5 651.5 L 944.5 651.5 L 944.5 844.5 L 909.5 844.5 Z M 1008.5 651.5 L 1042.5 651.5 L 1042.5 844.5 L 1008.5 844.5 Z M 1143.5 651.5 L 1177.5 651.5 L 1177.5 844.5 L 1143.5 844.5 Z M 1242.5 651.5 L 1276.5 651.5 L 1276.5 844.5 L 1242.5 844.5 Z M 1346.5 651.5 L 1380.5 651.5 L 1380.5 844.5 L 1346.5 844.5 Z M 1346.5 651.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 1481.5 209.5 L 1515.5 209.5 L 1515.5 498.5 L 1481.5 498.5 Z M 381.5 209.5 L 415.5 209.5 L 415.5 498.5 L 381.5 498.5 Z M 479.5 209.5 L 514.5 209.5 L 514.5 498.5 L 479.5 498.5 Z M 578.5 209.5 L 612.5 209.5 L 612.5 498.5 L 578.5 498.5 Z M 697.5 209.5 L 732.5 209.5 L 732.5 498.5 L 697.5 498.5 Z M 915.5 209.5 L 949.5 209.5 L 949.5 498.5 L 915.5 498.5 Z M 1013.5 209.5 L 1048.5 209.5 L 1048.5 498.5 L 1013.5 498.5 Z M 1112.5 209.5 L 1146.5 209.5 L 1146.5 498.5 L 1112.5 498.5 Z M 1247.5 209.5 L 1282.5 209.5 L 1282.5 498.5 L 1247.5 498.5 Z M 1346.5 209.5 L 1380.5 209.5 L 1380.5 498.5 L 1346.5 498.5 Z M 1346.5 209.5 "/>
 </clipPath>
-<image id="image292" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image321" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image292"/>
+  <use xlink:href="#image321"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 500.5 517.5 L 539.5 517.5 L 539.5 553.5 L 500.5 553.5 Z M 1270.5 517.5 L 1309.5 517.5 L 1309.5 553.5 L 1270.5 553.5 Z M 1270.5 553.5 L 1309.5 553.5 L 1309.5 556.5 L 1270.5 556.5 Z M 500.5 553.5 L 539.5 553.5 L 539.5 556.5 L 500.5 556.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="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>
@@ -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 1624.824219 621.320312 L 1642.191406 646.5 L 1634.449219 646.5 L 1621.050781 626.035156 L 1607.589844 646.5 L 1599.980469 646.5 L 1617.351562 621.320312 L 1601.058594 597.421875 L 1608.664062 597.421875 L 1621.253906 616.675781 L 1633.910156 597.421875 L 1641.382812 597.421875 Z M 1624.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 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/xor2/sky130_fd_sc_lp__xor2_4.svg b/cells/xor2/sky130_fd_sc_lp__xor2_4.svg
index 92dbfac..1280cfd 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_4.svg
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_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="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 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="#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 1583.5 623.5 L 1606.5 623.5 L 1606.5 749.5 L 1583.5 749.5 Z M 263.5 623.5 L 286.5 623.5 L 286.5 749.5 L 263.5 749.5 Z M 328.5 623.5 L 350.5 623.5 L 350.5 749.5 L 328.5 749.5 Z M 392.5 623.5 L 415.5 623.5 L 415.5 749.5 L 392.5 749.5 Z M 457.5 623.5 L 479.5 623.5 L 479.5 749.5 L 457.5 749.5 Z M 521.5 623.5 L 544.5 623.5 L 544.5 749.5 L 521.5 749.5 Z M 586.5 623.5 L 608.5 623.5 L 608.5 749.5 L 586.5 749.5 Z M 650.5 623.5 L 673.5 623.5 L 673.5 749.5 L 650.5 749.5 Z M 715.5 623.5 L 737.5 623.5 L 737.5 749.5 L 715.5 749.5 Z M 790.5 623.5 L 812.5 623.5 L 812.5 749.5 L 790.5 749.5 Z M 854.5 623.5 L 877.5 623.5 L 877.5 749.5 L 854.5 749.5 Z M 919.5 623.5 L 941.5 623.5 L 941.5 749.5 L 919.5 749.5 Z M 983.5 623.5 L 1006.5 623.5 L 1006.5 749.5 L 983.5 749.5 Z M 1132.5 623.5 L 1154.5 623.5 L 1154.5 749.5 L 1132.5 749.5 Z M 1196.5 623.5 L 1219.5 623.5 L 1219.5 749.5 L 1196.5 749.5 Z M 1261.5 623.5 L 1283.5 623.5 L 1283.5 749.5 L 1261.5 749.5 Z M 1325.5 623.5 L 1348.5 623.5 L 1348.5 749.5 L 1325.5 749.5 Z M 1390.5 623.5 L 1412.5 623.5 L 1412.5 749.5 L 1390.5 749.5 Z M 1454.5 623.5 L 1477.5 623.5 L 1477.5 749.5 L 1454.5 749.5 Z M 1519.5 623.5 L 1541.5 623.5 L 1541.5 749.5 L 1519.5 749.5 Z M 1519.5 623.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 1594.5 320.5 L 1616.5 320.5 L 1616.5 509.5 L 1594.5 509.5 Z M 263.5 320.5 L 286.5 320.5 L 286.5 509.5 L 263.5 509.5 Z M 328.5 320.5 L 350.5 320.5 L 350.5 509.5 L 328.5 509.5 Z M 392.5 320.5 L 415.5 320.5 L 415.5 509.5 L 392.5 509.5 Z M 457.5 320.5 L 479.5 320.5 L 479.5 509.5 L 457.5 509.5 Z M 521.5 320.5 L 544.5 320.5 L 544.5 509.5 L 521.5 509.5 Z M 586.5 320.5 L 608.5 320.5 L 608.5 509.5 L 586.5 509.5 Z M 650.5 320.5 L 673.5 320.5 L 673.5 509.5 L 650.5 509.5 Z M 719.5 320.5 L 742.5 320.5 L 742.5 509.5 L 719.5 509.5 Z M 785.5 320.5 L 808.5 320.5 L 808.5 509.5 L 785.5 509.5 Z M 850.5 320.5 L 872.5 320.5 L 872.5 509.5 L 850.5 509.5 Z M 914.5 320.5 L 937.5 320.5 L 937.5 509.5 L 914.5 509.5 Z M 979.5 320.5 L 1001.5 320.5 L 1001.5 509.5 L 979.5 509.5 Z M 1142.5 320.5 L 1165.5 320.5 L 1165.5 509.5 L 1142.5 509.5 Z M 1207.5 320.5 L 1229.5 320.5 L 1229.5 509.5 L 1207.5 509.5 Z M 1271.5 320.5 L 1294.5 320.5 L 1294.5 509.5 L 1271.5 509.5 Z M 1336.5 320.5 L 1358.5 320.5 L 1358.5 509.5 L 1336.5 509.5 Z M 1400.5 320.5 L 1423.5 320.5 L 1423.5 509.5 L 1400.5 509.5 Z M 1465.5 320.5 L 1487.5 320.5 L 1487.5 509.5 L 1465.5 509.5 Z M 1529.5 320.5 L 1552.5 320.5 L 1552.5 509.5 L 1529.5 509.5 Z M 1529.5 320.5 "/>
 </clipPath>
-<image id="image284" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image314" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image284"/>
+  <use xlink:href="#image314"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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 586.5 522.5 L 612.5 522.5 L 612.5 545.5 L 586.5 545.5 Z M 586.5 545.5 L 612.5 545.5 L 612.5 548.5 L 586.5 548.5 Z M 1378.5 522.5 L 1404.5 522.5 L 1404.5 548.5 L 1378.5 548.5 Z M 1162.5 578.5 L 1188.5 578.5 L 1188.5 581.5 L 1162.5 581.5 Z M 401.5 578.5 L 427.5 578.5 L 427.5 581.5 L 401.5 581.5 Z M 730.5 578.5 L 756.5 578.5 L 756.5 595.5 L 730.5 595.5 Z M 1162.5 581.5 L 1188.5 581.5 L 1188.5 603.5 L 1162.5 603.5 Z M 730.5 595.5 L 756.5 595.5 L 756.5 603.5 L 730.5 603.5 Z M 401.5 581.5 L 427.5 581.5 L 427.5 603.5 L 401.5 603.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="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>
@@ -149,6 +149,5 @@
 <path style=" stroke:none;fill-rule:nonzero;comp-op:src;clip-to-self:true;fill:rgb(0%,0%,60.392159%);fill-opacity:0.724409;" d="M 962.5 424.238281 L 973.71875 440.5 L 968.71875 440.5 L 960.066406 427.28125 L 951.371094 440.5 L 946.457031 440.5 L 957.675781 424.238281 L 947.152344 408.804688 L 952.066406 408.804688 L 960.195312 421.238281 L 968.371094 408.804688 L 973.195312 408.804688 Z M 962.5 424.238281 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 946 668 L 972 668 M 946 642 L 972 642 M 946 642 L 946 668 M 972 642 L 972 668 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(19.607843%,89.411765%,88.235295%);stroke-opacity:1;stroke-miterlimit:10;" d="M 946 668 L 972 668 M 946 642 L 972 642 M 972 668 L 972 642 M 946 668 L 946 642 " transform="matrix(1,0,0,-1,0.5,1079.5)"/>
-<path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(100%,100%,100%);stroke-opacity:1;stroke-miterlimit:10;" d="M 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_lp__xor2_lp.svg b/cells/xor2/sky130_fd_sc_lp__xor2_lp.svg
index cb62909..1832cd2 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_lp.svg
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 478.5 111.5 L 1446.5 111.5 L 1446.5 539.5 L 478.5 539.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 618.5 686.5 L 653.5 686.5 L 653.5 782.5 L 618.5 782.5 Z M 701.5 686.5 L 735.5 686.5 L 735.5 782.5 L 701.5 782.5 Z M 882.5 686.5 L 916.5 686.5 L 916.5 782.5 L 882.5 782.5 Z M 799.5 686.5 L 834.5 686.5 L 834.5 782.5 L 799.5 782.5 Z M 999.5 744.5 L 1033.5 744.5 L 1033.5 840.5 L 999.5 840.5 Z M 1269.5 744.5 L 1303.5 744.5 L 1303.5 840.5 L 1269.5 840.5 Z M 1088.5 744.5 L 1122.5 744.5 L 1122.5 840.5 L 1088.5 840.5 Z M 1187.5 744.5 L 1221.5 744.5 L 1221.5 840.5 L 1187.5 840.5 Z M 1187.5 744.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 647.5 209.5 L 704.5 209.5 L 704.5 438.5 L 647.5 438.5 Z M 768.5 209.5 L 826.5 209.5 L 826.5 438.5 L 768.5 438.5 Z M 890.5 209.5 L 947.5 209.5 L 947.5 438.5 L 890.5 438.5 Z M 1141.5 217.5 L 1198.5 217.5 L 1198.5 446.5 L 1141.5 446.5 Z M 1246.5 217.5 L 1303.5 217.5 L 1303.5 446.5 L 1246.5 446.5 Z M 1246.5 217.5 "/>
 </clipPath>
-<image id="image289" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image318" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image289"/>
+  <use xlink:href="#image318"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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>
@@ -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 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/xor2/sky130_fd_sc_lp__xor2_m.svg b/cells/xor2/sky130_fd_sc_lp__xor2_m.svg
index d61b2ab..b402ed8 100644
--- a/cells/xor2/sky130_fd_sc_lp__xor2_m.svg
+++ b/cells/xor2/sky130_fd_sc_lp__xor2_m.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 533.5 111.5 L 1390.5 111.5 L 1390.5 539.5 L 533.5 539.5 Z M 533.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="image341" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image312"/>
+  <use xlink:href="#image341"/>
 </pattern>
 <mask id="mask0">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern0);stroke:none;"/>
@@ -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="#image312"/>
+  <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 1184.5 643.5 L 1219.5 643.5 L 1219.5 739.5 L 1184.5 739.5 Z M 685.5 643.5 L 719.5 643.5 L 719.5 739.5 L 685.5 739.5 Z M 783.5 643.5 L 818.5 643.5 L 818.5 739.5 L 783.5 739.5 Z M 952.5 643.5 L 986.5 643.5 L 986.5 739.5 L 952.5 739.5 Z M 1034.5 643.5 L 1068.5 643.5 L 1068.5 739.5 L 1034.5 739.5 Z M 1034.5 643.5 "/>
 </clipPath>
-<image id="image313" 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="#image313"/>
+  <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 685.5 209.5 L 719.5 209.5 L 719.5 305.5 L 685.5 305.5 Z M 767.5 209.5 L 801.5 209.5 L 801.5 305.5 L 767.5 305.5 Z M 964.5 209.5 L 999.5 209.5 L 999.5 305.5 L 964.5 305.5 Z M 866.5 209.5 L 900.5 209.5 L 900.5 305.5 L 866.5 305.5 Z M 1182.5 259.5 L 1216.5 259.5 L 1216.5 356.5 L 1182.5 356.5 Z M 1182.5 259.5 "/>
 </clipPath>
-<image id="image314" 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="#image314"/>
+  <use xlink:href="#image343"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 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="image315" 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="#image315"/>
+  <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="surface309">
+<g id="surface338">
 <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 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/xor3/sky130_fd_sc_lp__xor3_1.svg b/cells/xor3/sky130_fd_sc_lp__xor3_1.svg
index 88b5d3a..57fa7d5 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_1.svg
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_1.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 243.5 L 1743.5 243.5 L 1743.5 537.5 L 174.5 537.5 Z M 938.5 537.5 L 1108.5 537.5 L 1108.5 545.5 L 938.5 545.5 Z M 938.5 537.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 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="#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 600.5 604.5 L 624.5 604.5 L 624.5 670.5 L 600.5 670.5 Z M 1507.5 623.5 L 1531.5 623.5 L 1531.5 689.5 L 1507.5 689.5 Z M 1252.5 596.5 L 1276.5 596.5 L 1276.5 697.5 L 1252.5 697.5 Z M 1320.5 596.5 L 1343.5 596.5 L 1343.5 697.5 L 1320.5 697.5 Z M 814.5 598.5 L 838.5 598.5 L 838.5 699.5 L 814.5 699.5 Z M 295.5 604.5 L 319.5 604.5 L 319.5 705.5 L 295.5 705.5 Z M 404.5 604.5 L 428.5 604.5 L 428.5 705.5 L 404.5 705.5 Z M 710.5 604.5 L 734.5 604.5 L 734.5 705.5 L 710.5 705.5 Z M 514.5 604.5 L 538.5 604.5 L 538.5 705.5 L 514.5 705.5 Z M 1606.5 623.5 L 1629.5 623.5 L 1629.5 755.5 L 1606.5 755.5 Z M 1011.5 628.5 L 1035.5 628.5 L 1035.5 760.5 L 1011.5 760.5 Z M 1011.5 628.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 411.5 317.5 L 434.5 317.5 L 434.5 474.5 L 411.5 474.5 Z M 496.5 342.5 L 520.5 342.5 L 520.5 474.5 L 496.5 474.5 Z M 576.5 373.5 L 600.5 373.5 L 600.5 474.5 L 576.5 474.5 Z M 644.5 373.5 L 668.5 373.5 L 668.5 474.5 L 644.5 474.5 Z M 282.5 317.5 L 305.5 317.5 L 305.5 474.5 L 282.5 474.5 Z M 1257.5 356.5 L 1281.5 356.5 L 1281.5 488.5 L 1257.5 488.5 Z M 1325.5 356.5 L 1349.5 356.5 L 1349.5 488.5 L 1325.5 488.5 Z M 1481.5 395.5 L 1504.5 395.5 L 1504.5 496.5 L 1481.5 496.5 Z M 730.5 368.5 L 753.5 368.5 L 753.5 501.5 L 730.5 501.5 Z M 1617.5 310.5 L 1640.5 310.5 L 1640.5 508.5 L 1617.5 508.5 Z M 1011.5 318.5 L 1035.5 318.5 L 1035.5 516.5 L 1011.5 516.5 Z M 1011.5 318.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;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <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 478.5 L 681.5 478.5 Z M 1134.5 464.5 L 1161.5 464.5 L 1161.5 479.5 L 1134.5 479.5 Z M 1285.5 464.5 L 1312.5 464.5 L 1312.5 479.5 L 1285.5 479.5 Z M 1134.5 479.5 L 1161.5 479.5 L 1161.5 490.5 L 1134.5 490.5 Z M 681.5 478.5 L 708.5 478.5 L 708.5 490.5 L 681.5 490.5 Z M 1587.5 464.5 L 1614.5 464.5 L 1614.5 490.5 L 1587.5 490.5 Z M 1285.5 479.5 L 1312.5 479.5 L 1312.5 490.5 L 1285.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="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>
@@ -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 1087.335938 600.875 L 1087.242188 602.355469 L 1087.011719 603.695312 L 1086.59375 604.945312 L 1086.039062 606.058594 L 1085.296875 607.121094 L 1084.417969 608.046875 L 1083.445312 608.832031 L 1082.429688 609.433594 L 1081.269531 609.898438 L 1080.066406 610.269531 L 1078.773438 610.453125 L 1077.382812 610.5 L 1062.15625 610.5 L 1062.15625 576.757812 L 1075.855469 576.757812 L 1077.847656 576.898438 L 1079.605469 577.222656 L 1081.179688 577.777344 L 1082.519531 578.566406 L 1083.679688 579.582031 L 1084.605469 580.832031 L 1084.972656 581.527344 L 1085.296875 582.265625 L 1085.53125 582.960938 L 1085.714844 583.75 L 1085.808594 584.535156 L 1085.851562 585.320312 L 1085.714844 586.988281 L 1085.296875 588.421875 L 1084.648438 589.765625 L 1083.722656 590.875 L 1082.566406 591.894531 L 1081.179688 592.679688 L 1082.519531 593.28125 L 1083.679688 593.929688 L 1084.695312 594.671875 L 1085.53125 595.503906 L 1086.175781 596.382812 L 1086.6875 597.308594 L 1086.871094 597.863281 L 1087.011719 598.421875 L 1087.148438 598.976562 L 1087.242188 599.625 L 1087.289062 600.226562 Z M 1081.550781 585.921875 L 1081.410156 584.535156 L 1080.992188 583.378906 L 1080.347656 582.359375 L 1079.421875 581.621094 L 1078.261719 581.0625 L 1076.828125 580.695312 L 1076.503906 580.695312 L 1075.855469 580.601562 L 1075.117188 580.601562 L 1074.792969 580.554688 L 1066.460938 580.554688 L 1066.460938 591.292969 L 1074.792969 591.292969 L 1076.503906 591.199219 L 1077.984375 590.921875 L 1079.234375 590.414062 L 1080.160156 589.71875 L 1080.902344 588.792969 L 1081.363281 587.683594 L 1081.410156 587.449219 L 1081.503906 586.894531 L 1081.503906 586.246094 Z M 1076.96875 606.703125 L 1078.261719 606.660156 L 1079.421875 606.378906 L 1080.4375 605.917969 L 1081.269531 605.316406 L 1081.964844 604.53125 L 1082.519531 603.558594 L 1082.660156 603.1875 L 1082.753906 602.769531 L 1082.890625 602.308594 L 1082.9375 601.890625 L 1082.984375 601.429688 L 1083.03125 600.917969 L 1082.9375 599.902344 L 1082.753906 598.929688 L 1082.429688 598.097656 L 1081.964844 597.308594 L 1081.363281 596.660156 L 1080.667969 596.058594 L 1080.160156 595.78125 L 1079.605469 595.550781 L 1079.003906 595.367188 L 1078.355469 595.226562 L 1077.660156 595.132812 L 1076.96875 595.085938 L 1066.460938 595.085938 L 1066.460938 606.703125 Z M 1076.96875 606.703125 "/>
 <path style="fill:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,60.392159%);stroke-opacity:0.724409;stroke-miterlimit:10;" d="M 1059 499 L 1085 499 M 1059 472 L 1085 472 M 1059 472 L 1059 499 M 1085 472 L 1085 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 1059 499 L 1085 499 M 1059 472 L 1085 472 M 1085 499 L 1085 472 M 1059 499 L 1059 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/xor3/sky130_fd_sc_lp__xor3_lp.svg b/cells/xor3/sky130_fd_sc_lp__xor3_lp.svg
index 21833a1..55bc7ca 100644
--- a/cells/xor3/sky130_fd_sc_lp__xor3_lp.svg
+++ b/cells/xor3/sky130_fd_sc_lp__xor3_lp.svg
@@ -7,9 +7,9 @@
 <clipPath id="clip2">
   <path d="M 174.5 280.5 L 1744.5 280.5 L 1744.5 536.5 L 174.5 536.5 Z M 174.5 280.5 "/>
 </clipPath>
-<image id="image382" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
+<image id="image410" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAApSURBVDiNY2Rg+M/AiAczMdAe/P+PH9PBDYyj4cDAwDAaDjAwGg4QAAAzhF/RgilCzQAAAABJRU5ErkJggg=="/>
 <pattern id="pattern0" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image382"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask 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="#image382"/>
+  <use xlink:href="#image410"/>
 </pattern>
 <mask id="mask1">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern1);stroke:none;"/>
@@ -35,9 +35,9 @@
 <clipPath id="clip7">
   <path d="M 1458.5 609.5 L 1478.5 609.5 L 1478.5 667.5 L 1458.5 667.5 Z M 1507.5 609.5 L 1528.5 609.5 L 1528.5 667.5 L 1507.5 667.5 Z M 1639.5 609.5 L 1660.5 609.5 L 1660.5 667.5 L 1639.5 667.5 Z M 1586.5 609.5 L 1606.5 609.5 L 1606.5 667.5 L 1586.5 667.5 Z M 697.5 620.5 L 718.5 620.5 L 718.5 678.5 L 697.5 678.5 Z M 1228.5 621.5 L 1248.5 621.5 L 1248.5 679.5 L 1228.5 679.5 Z M 1291.5 621.5 L 1311.5 621.5 L 1311.5 679.5 L 1291.5 679.5 Z M 848.5 624.5 L 869.5 624.5 L 869.5 682.5 L 848.5 682.5 Z M 328.5 628.5 L 349.5 628.5 L 349.5 686.5 L 328.5 686.5 Z M 475.5 628.5 L 496.5 628.5 L 496.5 686.5 L 475.5 686.5 Z M 529.5 628.5 L 549.5 628.5 L 549.5 686.5 L 529.5 686.5 Z M 279.5 628.5 L 299.5 628.5 L 299.5 686.5 L 279.5 686.5 Z M 599.5 628.5 L 620.5 628.5 L 620.5 686.5 L 599.5 686.5 Z M 1085.5 645.5 L 1105.5 645.5 L 1105.5 702.5 L 1085.5 702.5 Z M 1035.5 645.5 L 1056.5 645.5 L 1056.5 702.5 L 1035.5 702.5 Z M 767.5 660.5 L 788.5 660.5 L 788.5 718.5 L 767.5 718.5 Z M 767.5 660.5 "/>
 </clipPath>
-<image id="image383" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
+<image id="image411" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxeNWwZK49E7eFQwwnzDiINmGA0HhtFwGA0HdBoAtQDvIRl1O+YAAAAASUVORK5CYII="/>
 <pattern id="pattern2" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image383"/>
+  <use xlink:href="#image411"/>
 </pattern>
 <mask id="mask2">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern2);stroke:none;"/>
@@ -45,9 +45,9 @@
 <clipPath id="clip8">
   <path d="M 287.5 338.5 L 321.5 338.5 L 321.5 476.5 L 287.5 476.5 Z M 433.5 338.5 L 467.5 338.5 L 467.5 476.5 L 433.5 476.5 Z M 652.5 338.5 L 686.5 338.5 L 686.5 476.5 L 652.5 476.5 Z M 771.5 338.5 L 806.5 338.5 L 806.5 476.5 L 771.5 476.5 Z M 505.5 338.5 L 540.5 338.5 L 540.5 476.5 L 505.5 476.5 Z M 846.5 338.5 L 880.5 338.5 L 880.5 476.5 L 846.5 476.5 Z M 1443.5 342.5 L 1477.5 342.5 L 1477.5 480.5 L 1443.5 480.5 Z M 1561.5 342.5 L 1595.5 342.5 L 1595.5 480.5 L 1561.5 480.5 Z M 1241.5 347.5 L 1276.5 347.5 L 1276.5 485.5 L 1241.5 485.5 Z M 1168.5 347.5 L 1203.5 347.5 L 1203.5 485.5 L 1168.5 485.5 Z M 1008.5 354.5 L 1042.5 354.5 L 1042.5 491.5 L 1008.5 491.5 Z M 1008.5 354.5 "/>
 </clipPath>
-<image id="image384" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
+<image id="image412" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAAtSURBVDiNY/jPwMDAwMDwHxfNCKUZGHHQBPQPEZphNBxgHsSvbjQcIPQICQcAbQzvIWHO67YAAAAASUVORK5CYII="/>
 <pattern id="pattern3" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image384"/>
+  <use xlink:href="#image412"/>
 </pattern>
 <mask id="mask3">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern3);stroke:none;"/>
@@ -61,15 +61,15 @@
 <clipPath id="clip11">
   <path d="M 222.5 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 1277.5 421.5 L 1300.5 421.5 L 1300.5 425.5 L 1277.5 425.5 Z M 815.5 421.5 L 839.5 421.5 L 839.5 430.5 L 815.5 430.5 Z M 815.5 430.5 L 839.5 430.5 L 839.5 445.5 L 815.5 445.5 Z M 1277.5 425.5 L 1300.5 425.5 L 1300.5 445.5 L 1277.5 445.5 Z M 881.5 625.5 L 905.5 625.5 L 905.5 641.5 L 881.5 641.5 Z M 881.5 641.5 L 905.5 641.5 L 905.5 648.5 L 881.5 648.5 Z M 486.5 625.5 L 509.5 625.5 L 509.5 648.5 L 486.5 648.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="image385" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
+<image id="image413" width="32" height="32" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAAAAABWESUoAAAAAmJLR0QA/4ePzL8AAAA9SURBVDiN7ZAhEgAgDMNS/v/nIsAgtnpuMzG7axsIJ9xTYEDUBJ/nkqGDQ48FulEFQ36uMR7o94+Hl3942JrBc/FcUmODAAAAAElFTkSuQmCC"/>
 <pattern id="pattern4" patternUnits="userSpaceOnUse" width="32" height="32"  patternTransform="matrix(1,0,0,1,0.5,1079.5)">
-  <use xlink:href="#image385"/>
+  <use xlink:href="#image413"/>
 </pattern>
 <mask id="mask4">
 <rect x="0" y="0" width="1898" height="1059" style="fill:url(#pattern4);stroke:none;"/>
 </mask>
 </defs>
-<g id="surface379">
+<g id="surface407">
 <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 1687.402344 382.289062 L 1697.898438 397.5 L 1693.21875 397.5 L 1685.125 385.136719 L 1676.992188 397.5 L 1672.394531 397.5 L 1682.886719 382.289062 L 1673.046875 367.847656 L 1677.640625 367.847656 L 1685.246094 379.480469 L 1692.894531 367.847656 L 1697.410156 367.847656 Z M 1687.402344 382.289062 "/>
 <path style="fill:none;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 708 L 1696 708 M 1673 685 L 1696 685 M 1673 685 L 1673 708 M 1696 685 L 1696 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 1673 708 L 1696 708 M 1673 685 L 1696 685 M 1696 708 L 1696 685 M 1673 708 L 1673 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>