diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
index 8fcb25f..f14fc40 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
@@ -84,19 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.655000  0.085000 1.400000 0.455000 ;
-        RECT 2.700000  0.085000 3.080000 0.455000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -105,34 +92,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.525000 1.915000 0.905000 2.635000 ;
-        RECT 1.525000 2.265000 2.085000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.605000 0.625000 3.535000 0.815000 ;
-      RECT 0.605000 0.815000 0.845000 1.505000 ;
-      RECT 0.605000 1.505000 3.545000 1.685000 ;
-      RECT 1.095000 1.865000 2.565000 2.095000 ;
-      RECT 1.095000 2.095000 1.355000 2.455000 ;
-      RECT 2.195000 0.265000 2.520000 0.625000 ;
-      RECT 2.305000 2.095000 2.565000 2.455000 ;
-      RECT 3.205000 1.685000 3.545000 2.455000 ;
-      RECT 3.310000 0.265000 3.535000 0.625000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.525000  1.915000 0.905000 2.635000 ;
+      RECT 0.605000  0.625000 3.535000 0.815000 ;
+      RECT 0.605000  0.815000 0.845000 1.505000 ;
+      RECT 0.605000  1.505000 3.545000 1.685000 ;
+      RECT 0.655000  0.085000 1.400000 0.455000 ;
+      RECT 1.095000  1.865000 2.565000 2.095000 ;
+      RECT 1.095000  2.095000 1.355000 2.455000 ;
+      RECT 1.525000  2.265000 2.085000 2.635000 ;
+      RECT 2.195000  0.265000 2.520000 0.625000 ;
+      RECT 2.305000  2.095000 2.565000 2.455000 ;
+      RECT 2.700000  0.085000 3.080000 0.455000 ;
+      RECT 3.205000  1.685000 3.545000 2.455000 ;
+      RECT 3.310000  0.265000 3.535000 0.625000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
index 0fdbba3..8290d10 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
@@ -83,21 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.090000  0.085000 0.385000 0.905000 ;
-        RECT 1.005000  0.085000 1.770000 0.445000 ;
-        RECT 3.110000  0.085000 3.385000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -106,36 +91,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.090000 1.490000 0.385000 2.635000 ;
-        RECT 1.100000 1.830000 1.355000 2.635000 ;
-        RECT 2.155000 2.190000 2.430000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.100000 0.695000 3.935000 0.875000 ;
-      RECT 1.100000 0.875000 1.355000 1.490000 ;
-      RECT 1.100000 1.490000 3.935000 1.660000 ;
-      RECT 1.555000 1.840000 3.045000 2.020000 ;
-      RECT 1.555000 2.020000 1.935000 2.465000 ;
-      RECT 2.475000 0.275000 2.855000 0.695000 ;
-      RECT 2.715000 2.020000 3.045000 2.465000 ;
-      RECT 3.555000 0.275000 3.935000 0.695000 ;
-      RECT 3.555000 1.660000 3.935000 2.325000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.090000  0.085000 0.385000 0.905000 ;
+      RECT 0.090000  1.490000 0.385000 2.635000 ;
+      RECT 1.005000  0.085000 1.770000 0.445000 ;
+      RECT 1.100000  0.695000 3.935000 0.875000 ;
+      RECT 1.100000  0.875000 1.355000 1.490000 ;
+      RECT 1.100000  1.490000 3.935000 1.660000 ;
+      RECT 1.100000  1.830000 1.355000 2.635000 ;
+      RECT 1.555000  1.840000 3.045000 2.020000 ;
+      RECT 1.555000  2.020000 1.935000 2.465000 ;
+      RECT 2.155000  2.190000 2.430000 2.635000 ;
+      RECT 2.475000  0.275000 2.855000 0.695000 ;
+      RECT 2.715000  2.020000 3.045000 2.465000 ;
+      RECT 3.110000  0.085000 3.385000 0.525000 ;
+      RECT 3.555000  0.275000 3.935000 0.695000 ;
+      RECT 3.555000  1.660000 3.935000 2.325000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
index 43f6d38..41ff750 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
@@ -96,31 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.485000  0.085000 0.865000 0.465000 ;
-        RECT 1.445000  0.085000 1.825000 0.445000 ;
-        RECT 2.420000  0.085000 2.805000 0.445000 ;
-        RECT 3.440000  0.085000 3.820000 0.445000 ;
-        RECT 4.640000  0.085000 5.010000 0.445000 ;
-        RECT 6.615000  0.085000 6.995000 0.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -129,52 +104,74 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.090000 1.875000 0.425000 2.635000 ;
-        RECT 1.050000 1.875000 1.380000 2.635000 ;
-        RECT 2.010000 1.835000 2.260000 2.635000 ;
-        RECT 5.070000 2.275000 5.450000 2.635000 ;
-        RECT 6.140000 2.275000 6.520000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.045000 2.620000 1.325000 ;
-      RECT 2.385000 1.325000 2.620000 1.505000 ;
-      RECT 2.385000 1.505000 2.705000 1.675000 ;
-      RECT 2.395000 0.615000 6.040000 0.805000 ;
-      RECT 2.395000 0.805000 2.620000 1.045000 ;
-      RECT 2.530000 1.675000 2.705000 1.870000 ;
-      RECT 2.530000 1.870000 3.860000 2.040000 ;
-      RECT 2.570000 2.210000 4.900000 2.465000 ;
-      RECT 3.025000 0.255000 3.270000 0.615000 ;
-      RECT 4.040000 0.255000 4.420000 0.615000 ;
-      RECT 4.570000 1.880000 6.995000 2.105000 ;
-      RECT 4.570000 2.105000 4.900000 2.210000 ;
-      RECT 5.660000 0.275000 6.040000 0.615000 ;
-      RECT 5.660000 2.105000 5.970000 2.465000 ;
-      RECT 6.615000 1.535000 6.995000 1.880000 ;
-      RECT 6.740000 2.105000 6.995000 2.465000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.090000  1.875000 0.425000 2.635000 ;
+      RECT 0.485000  0.085000 0.865000 0.465000 ;
+      RECT 0.525000  1.045000 2.620000 1.325000 ;
+      RECT 1.050000  1.875000 1.380000 2.635000 ;
+      RECT 1.445000  0.085000 1.825000 0.445000 ;
+      RECT 2.010000  1.835000 2.260000 2.635000 ;
+      RECT 2.385000  1.325000 2.620000 1.505000 ;
+      RECT 2.385000  1.505000 2.705000 1.675000 ;
+      RECT 2.395000  0.615000 6.040000 0.805000 ;
+      RECT 2.395000  0.805000 2.620000 1.045000 ;
+      RECT 2.420000  0.085000 2.805000 0.445000 ;
+      RECT 2.530000  1.675000 2.705000 1.870000 ;
+      RECT 2.530000  1.870000 3.860000 2.040000 ;
+      RECT 2.570000  2.210000 4.900000 2.465000 ;
+      RECT 3.025000  0.255000 3.270000 0.615000 ;
+      RECT 3.440000  0.085000 3.820000 0.445000 ;
+      RECT 4.040000  0.255000 4.420000 0.615000 ;
+      RECT 4.570000  1.880000 6.995000 2.105000 ;
+      RECT 4.570000  2.105000 4.900000 2.210000 ;
+      RECT 4.640000  0.085000 5.010000 0.445000 ;
+      RECT 5.070000  2.275000 5.450000 2.635000 ;
+      RECT 5.660000  0.275000 6.040000 0.615000 ;
+      RECT 5.660000  2.105000 5.970000 2.465000 ;
+      RECT 6.140000  2.275000 6.520000 2.635000 ;
+      RECT 6.615000  0.085000 6.995000 0.805000 ;
+      RECT 6.615000  1.535000 6.995000 1.880000 ;
+      RECT 6.740000  2.105000 6.995000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
index 283b2f8..fbc69d5 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
@@ -88,17 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.085000  0.085000 0.425000 0.595000 ;
-        RECT 1.550000  0.085000 1.930000 0.455000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -107,25 +96,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.545000 1.905000 0.925000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.125000 1.525000 1.330000 1.725000 ;
-      RECT 0.125000 1.725000 0.375000 2.455000 ;
-      RECT 1.145000 1.725000 1.330000 2.455000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.085000 0.425000 0.595000 ;
+      RECT 0.125000  1.525000 1.330000 1.725000 ;
+      RECT 0.125000  1.725000 0.375000 2.455000 ;
+      RECT 0.545000  1.905000 0.925000 2.635000 ;
+      RECT 1.145000  1.725000 1.330000 2.455000 ;
+      RECT 1.550000  0.085000 1.930000 0.455000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
index 7b5eddf..707c25e 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
@@ -87,24 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.145000  0.085000 0.395000 0.815000 ;
-        RECT 1.055000  0.085000 1.435000 0.475000 ;
-        RECT 2.015000  0.085000 2.395000 0.475000 ;
-        RECT 3.975000  0.085000 4.355000 0.455000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -113,42 +95,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 2.635000 1.835000 2.865000 2.635000 ;
-        RECT 3.595000 1.835000 3.825000 2.635000 ;
-        RECT 4.555000 1.835000 4.785000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.145000 1.785000 0.405000 2.285000 ;
-      RECT 0.145000 2.285000 2.415000 2.455000 ;
-      RECT 1.175000 1.785000 1.365000 2.255000 ;
-      RECT 1.175000 2.255000 2.415000 2.285000 ;
-      RECT 1.535000 1.455000 4.325000 1.655000 ;
-      RECT 1.535000 1.655000 1.915000 2.075000 ;
-      RECT 2.135000 1.835000 2.415000 2.255000 ;
-      RECT 2.585000 0.265000 3.795000 0.475000 ;
-      RECT 3.095000 1.655000 3.365000 2.465000 ;
-      RECT 3.625000 0.475000 3.795000 0.635000 ;
-      RECT 3.625000 0.635000 4.835000 0.855000 ;
-      RECT 4.055000 1.655000 4.325000 2.465000 ;
-      RECT 4.585000 0.265000 4.835000 0.635000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.145000  0.085000 0.395000 0.815000 ;
+      RECT 0.145000  1.785000 0.405000 2.285000 ;
+      RECT 0.145000  2.285000 2.415000 2.455000 ;
+      RECT 1.055000  0.085000 1.435000 0.475000 ;
+      RECT 1.175000  1.785000 1.365000 2.255000 ;
+      RECT 1.175000  2.255000 2.415000 2.285000 ;
+      RECT 1.535000  1.455000 4.325000 1.655000 ;
+      RECT 1.535000  1.655000 1.915000 2.075000 ;
+      RECT 2.015000  0.085000 2.395000 0.475000 ;
+      RECT 2.135000  1.835000 2.415000 2.255000 ;
+      RECT 2.585000  0.265000 3.795000 0.475000 ;
+      RECT 2.635000  1.835000 2.865000 2.635000 ;
+      RECT 3.095000  1.655000 3.365000 2.465000 ;
+      RECT 3.595000  1.835000 3.825000 2.635000 ;
+      RECT 3.625000  0.475000 3.795000 0.635000 ;
+      RECT 3.625000  0.635000 4.835000 0.855000 ;
+      RECT 3.975000  0.085000 4.355000 0.455000 ;
+      RECT 4.055000  1.655000 4.325000 2.465000 ;
+      RECT 4.555000  1.835000 4.785000 2.635000 ;
+      RECT 4.585000  0.265000 4.835000 0.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
index 2864013..78c2a7c 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_4.magic.lef
@@ -59,14 +59,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 4.145000 1.035000 5.305000 1.275000 ;
-        RECT 4.145000 1.275000 4.960000 1.615000 ;
-        RECT 7.300000 0.995000 7.735000 1.325000 ;
-        RECT 7.300000 1.325000 7.510000 1.655000 ;
-      LAYER mcon ;
-        RECT 4.285000 1.445000 4.455000 1.615000 ;
-        RECT 7.340000 1.445000 7.510000 1.615000 ;
       LAYER met1 ;
         RECT 4.225000 1.415000 4.515000 1.460000 ;
         RECT 4.225000 1.460000 7.570000 1.600000 ;
@@ -109,34 +101,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.095000  0.085000 0.395000 0.585000 ;
-        RECT 1.000000  0.085000 1.285000 0.525000 ;
-        RECT 3.935000  0.085000 4.105000 0.525000 ;
-        RECT 4.865000  0.085000 5.195000 0.445000 ;
-        RECT 5.815000  0.085000 6.145000 0.445000 ;
-        RECT 6.755000  0.085000 7.085000 0.445000 ;
-        RECT 7.665000  0.085000 8.070000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -145,52 +109,83 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.515000 2.255000 0.895000 2.635000 ;
-        RECT 1.455000 2.275000 1.835000 2.635000 ;
-        RECT 2.395000 2.275000 2.775000 2.635000 ;
-        RECT 3.335000 2.275000 3.715000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.795000 4.105000 2.085000 ;
-      RECT 0.095000 2.085000 0.345000 2.465000 ;
-      RECT 0.615000 0.530000 0.825000 0.695000 ;
-      RECT 0.615000 0.695000 1.755000 0.865000 ;
-      RECT 1.115000 2.085000 4.105000 2.105000 ;
-      RECT 1.115000 2.105000 1.285000 2.465000 ;
-      RECT 1.455000 0.255000 3.715000 0.505000 ;
-      RECT 1.455000 0.505000 1.755000 0.695000 ;
-      RECT 2.055000 2.105000 2.225000 2.465000 ;
-      RECT 2.995000 2.105000 3.165000 2.465000 ;
-      RECT 3.935000 2.105000 4.105000 2.255000 ;
-      RECT 3.935000 2.255000 8.070000 2.465000 ;
-      RECT 4.275000 1.785000 5.460000 2.085000 ;
-      RECT 5.130000 1.445000 6.610000 1.695000 ;
-      RECT 5.130000 1.695000 5.460000 1.785000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.095000  0.085000 0.395000 0.585000 ;
+      RECT 0.095000  1.795000 4.105000 2.085000 ;
+      RECT 0.095000  2.085000 0.345000 2.465000 ;
+      RECT 0.515000  2.255000 0.895000 2.635000 ;
+      RECT 0.615000  0.530000 0.825000 0.695000 ;
+      RECT 0.615000  0.695000 1.755000 0.865000 ;
+      RECT 1.000000  0.085000 1.285000 0.525000 ;
+      RECT 1.115000  2.085000 4.105000 2.105000 ;
+      RECT 1.115000  2.105000 1.285000 2.465000 ;
+      RECT 1.455000  0.255000 3.715000 0.505000 ;
+      RECT 1.455000  0.505000 1.755000 0.695000 ;
+      RECT 1.455000  2.275000 1.835000 2.635000 ;
+      RECT 2.055000  2.105000 2.225000 2.465000 ;
+      RECT 2.395000  2.275000 2.775000 2.635000 ;
+      RECT 2.995000  2.105000 3.165000 2.465000 ;
+      RECT 3.335000  2.275000 3.715000 2.635000 ;
+      RECT 3.935000  0.085000 4.105000 0.525000 ;
+      RECT 3.935000  2.105000 4.105000 2.255000 ;
+      RECT 3.935000  2.255000 8.070000 2.465000 ;
+      RECT 4.145000  1.035000 5.305000 1.275000 ;
+      RECT 4.145000  1.275000 4.960000 1.615000 ;
+      RECT 4.275000  1.785000 5.460000 2.085000 ;
+      RECT 4.865000  0.085000 5.195000 0.445000 ;
+      RECT 5.130000  1.445000 6.610000 1.695000 ;
+      RECT 5.130000  1.695000 5.460000 1.785000 ;
+      RECT 5.815000  0.085000 6.145000 0.445000 ;
+      RECT 6.755000  0.085000 7.085000 0.445000 ;
+      RECT 7.300000  0.995000 7.735000 1.325000 ;
+      RECT 7.300000  1.325000 7.510000 1.655000 ;
+      RECT 7.665000  0.085000 8.070000 0.445000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  1.445000 4.455000 1.615000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.340000  1.445000 7.510000 1.615000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
index 11b8109..22641ac 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
@@ -74,20 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 1.045000  0.085000 1.290000 0.865000 ;
-        RECT 2.620000  0.085000 3.350000 0.455000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -96,40 +82,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.515000 2.225000 0.915000 2.635000 ;
-        RECT 2.035000 2.155000 2.415000 2.635000 ;
-        RECT 3.075000 1.495000 3.360000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 1.845000 0.965000 2.045000 ;
-      RECT 0.105000 2.045000 0.345000 2.435000 ;
-      RECT 0.515000 0.265000 0.795000 1.165000 ;
-      RECT 0.515000 1.165000 0.965000 1.845000 ;
-      RECT 1.135000 1.045000 1.730000 1.345000 ;
-      RECT 1.135000 1.345000 1.465000 2.455000 ;
-      RECT 1.460000 0.265000 1.940000 0.625000 ;
-      RECT 1.460000 0.625000 3.545000 0.815000 ;
-      RECT 1.460000 0.815000 1.730000 1.045000 ;
-      RECT 1.685000 1.785000 2.810000 1.985000 ;
-      RECT 1.685000 1.985000 1.865000 2.455000 ;
-      RECT 2.640000 1.985000 2.810000 2.455000 ;
-      RECT 3.285000 0.815000 3.545000 1.325000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.105000  1.845000 0.965000 2.045000 ;
+      RECT 0.105000  2.045000 0.345000 2.435000 ;
+      RECT 0.515000  0.265000 0.795000 1.165000 ;
+      RECT 0.515000  1.165000 0.965000 1.845000 ;
+      RECT 0.515000  2.225000 0.915000 2.635000 ;
+      RECT 1.045000  0.085000 1.290000 0.865000 ;
+      RECT 1.135000  1.045000 1.730000 1.345000 ;
+      RECT 1.135000  1.345000 1.465000 2.455000 ;
+      RECT 1.460000  0.265000 1.940000 0.625000 ;
+      RECT 1.460000  0.625000 3.545000 0.815000 ;
+      RECT 1.460000  0.815000 1.730000 1.045000 ;
+      RECT 1.685000  1.785000 2.810000 1.985000 ;
+      RECT 1.685000  1.985000 1.865000 2.455000 ;
+      RECT 2.035000  2.155000 2.415000 2.635000 ;
+      RECT 2.620000  0.085000 3.350000 0.455000 ;
+      RECT 2.640000  1.985000 2.810000 2.455000 ;
+      RECT 3.075000  1.495000 3.360000 2.635000 ;
+      RECT 3.285000  0.815000 3.545000 1.325000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
index 00d647c..a3cc5b3 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
@@ -78,22 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.090000  0.085000 0.345000 0.545000 ;
-        RECT 1.070000  0.085000 1.400000 0.785000 ;
-        RECT 2.125000  0.085000 2.455000 0.465000 ;
-        RECT 3.495000  0.085000 3.875000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -102,44 +86,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.090000 2.255000 0.425000 2.635000 ;
-        RECT 1.140000 2.275000 1.470000 2.635000 ;
-        RECT 3.155000 2.185000 3.325000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.620000 1.075000 0.950000 1.495000 ;
-      RECT 0.620000 1.495000 1.385000 1.665000 ;
-      RECT 1.215000 1.665000 1.385000 1.895000 ;
-      RECT 1.215000 1.895000 2.375000 2.105000 ;
-      RECT 1.555000 1.555000 2.035000 1.725000 ;
-      RECT 1.605000 0.655000 2.035000 0.825000 ;
-      RECT 1.865000 0.825000 2.035000 0.995000 ;
-      RECT 1.865000 0.995000 2.325000 1.325000 ;
-      RECT 1.865000 1.325000 2.035000 1.555000 ;
-      RECT 2.125000 2.105000 2.375000 2.465000 ;
-      RECT 2.205000 1.505000 2.715000 1.675000 ;
-      RECT 2.205000 1.675000 2.375000 1.895000 ;
-      RECT 2.495000 0.635000 2.940000 0.825000 ;
-      RECT 2.495000 0.825000 2.715000 1.505000 ;
-      RECT 2.545000 1.845000 3.875000 2.015000 ;
-      RECT 2.545000 2.015000 2.925000 2.465000 ;
-      RECT 3.495000 2.015000 3.875000 2.465000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.090000  0.085000 0.345000 0.545000 ;
+      RECT 0.090000  2.255000 0.425000 2.635000 ;
+      RECT 0.620000  1.075000 0.950000 1.495000 ;
+      RECT 0.620000  1.495000 1.385000 1.665000 ;
+      RECT 1.070000  0.085000 1.400000 0.785000 ;
+      RECT 1.140000  2.275000 1.470000 2.635000 ;
+      RECT 1.215000  1.665000 1.385000 1.895000 ;
+      RECT 1.215000  1.895000 2.375000 2.105000 ;
+      RECT 1.555000  1.555000 2.035000 1.725000 ;
+      RECT 1.605000  0.655000 2.035000 0.825000 ;
+      RECT 1.865000  0.825000 2.035000 0.995000 ;
+      RECT 1.865000  0.995000 2.325000 1.325000 ;
+      RECT 1.865000  1.325000 2.035000 1.555000 ;
+      RECT 2.125000  0.085000 2.455000 0.465000 ;
+      RECT 2.125000  2.105000 2.375000 2.465000 ;
+      RECT 2.205000  1.505000 2.715000 1.675000 ;
+      RECT 2.205000  1.675000 2.375000 1.895000 ;
+      RECT 2.495000  0.635000 2.940000 0.825000 ;
+      RECT 2.495000  0.825000 2.715000 1.505000 ;
+      RECT 2.545000  1.845000 3.875000 2.015000 ;
+      RECT 2.545000  2.015000 2.925000 2.465000 ;
+      RECT 3.155000  2.185000 3.325000 2.635000 ;
+      RECT 3.495000  0.085000 3.875000 0.825000 ;
+      RECT 3.495000  2.015000 3.875000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
index 1b6313a..3e8b784 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
@@ -80,28 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.680000  0.085000 1.070000 0.445000 ;
-        RECT 1.650000  0.085000 2.030000 0.445000 ;
-        RECT 2.735000  0.085000 3.505000 0.445000 ;
-        RECT 4.175000  0.085000 4.505000 0.445000 ;
-        RECT 6.065000  0.085000 6.345000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -110,57 +88,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.690000 2.275000 1.070000 2.635000 ;
-        RECT 1.650000 2.275000 2.030000 2.635000 ;
-        RECT 2.605000 2.275000 2.990000 2.635000 ;
-        RECT 4.555000 2.275000 4.935000 2.635000 ;
-        RECT 5.495000 2.275000 5.875000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.255000 0.510000 0.840000 ;
-      RECT 0.105000 0.840000 0.300000 1.795000 ;
-      RECT 0.105000 1.795000 0.535000 1.935000 ;
-      RECT 0.105000 1.935000 3.090000 2.105000 ;
-      RECT 0.105000 2.105000 0.520000 2.465000 ;
-      RECT 1.710000 0.995000 3.030000 1.185000 ;
-      RECT 1.710000 1.185000 2.750000 1.325000 ;
-      RECT 2.860000 0.615000 3.915000 0.670000 ;
-      RECT 2.860000 0.670000 5.385000 0.785000 ;
-      RECT 2.860000 0.785000 3.030000 0.995000 ;
-      RECT 2.920000 1.355000 3.525000 1.525000 ;
-      RECT 2.920000 1.525000 3.090000 1.935000 ;
-      RECT 3.215000 0.995000 3.525000 1.355000 ;
-      RECT 3.275000 1.695000 3.445000 2.210000 ;
-      RECT 3.275000 2.210000 4.385000 2.380000 ;
-      RECT 3.745000 0.255000 3.915000 0.615000 ;
-      RECT 3.745000 0.785000 5.385000 0.840000 ;
-      RECT 3.745000 0.840000 3.915000 1.805000 ;
-      RECT 4.205000 1.445000 4.385000 1.935000 ;
-      RECT 4.205000 1.935000 6.345000 2.105000 ;
-      RECT 4.205000 2.105000 4.385000 2.210000 ;
-      RECT 5.105000 0.405000 5.385000 0.670000 ;
-      RECT 6.090000 1.460000 6.345000 1.935000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.105000  0.255000 0.510000 0.840000 ;
+      RECT 0.105000  0.840000 0.300000 1.795000 ;
+      RECT 0.105000  1.795000 0.535000 1.935000 ;
+      RECT 0.105000  1.935000 3.090000 2.105000 ;
+      RECT 0.105000  2.105000 0.520000 2.465000 ;
+      RECT 0.680000  0.085000 1.070000 0.445000 ;
+      RECT 0.690000  2.275000 1.070000 2.635000 ;
+      RECT 1.650000  0.085000 2.030000 0.445000 ;
+      RECT 1.650000  2.275000 2.030000 2.635000 ;
+      RECT 1.710000  0.995000 3.030000 1.185000 ;
+      RECT 1.710000  1.185000 2.750000 1.325000 ;
+      RECT 2.605000  2.275000 2.990000 2.635000 ;
+      RECT 2.735000  0.085000 3.505000 0.445000 ;
+      RECT 2.860000  0.615000 3.915000 0.670000 ;
+      RECT 2.860000  0.670000 5.385000 0.785000 ;
+      RECT 2.860000  0.785000 3.030000 0.995000 ;
+      RECT 2.920000  1.355000 3.525000 1.525000 ;
+      RECT 2.920000  1.525000 3.090000 1.935000 ;
+      RECT 3.215000  0.995000 3.525000 1.355000 ;
+      RECT 3.275000  1.695000 3.445000 2.210000 ;
+      RECT 3.275000  2.210000 4.385000 2.380000 ;
+      RECT 3.745000  0.255000 3.915000 0.615000 ;
+      RECT 3.745000  0.785000 5.385000 0.840000 ;
+      RECT 3.745000  0.840000 3.915000 1.805000 ;
+      RECT 4.175000  0.085000 4.505000 0.445000 ;
+      RECT 4.205000  1.445000 4.385000 1.935000 ;
+      RECT 4.205000  1.935000 6.345000 2.105000 ;
+      RECT 4.205000  2.105000 4.385000 2.210000 ;
+      RECT 4.555000  2.275000 4.935000 2.635000 ;
+      RECT 5.105000  0.405000 5.385000 0.670000 ;
+      RECT 5.495000  2.275000 5.875000 2.635000 ;
+      RECT 6.065000  0.085000 6.345000 0.885000 ;
+      RECT 6.090000  1.460000 6.345000 1.935000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
index cffc1df..180d092 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
@@ -76,18 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 1.025000  0.085000 1.255000 0.865000 ;
-        RECT 2.715000  0.085000 3.075000 0.815000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -96,31 +84,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.525000 2.175000 0.895000 2.635000 ;
-        RECT 2.105000 1.905000 2.485000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.835000 0.855000 2.005000 ;
-      RECT 0.095000 2.005000 0.355000 2.435000 ;
-      RECT 0.365000 0.265000 0.855000 0.715000 ;
-      RECT 0.515000 0.715000 0.855000 1.835000 ;
-      RECT 1.745000 1.525000 3.005000 1.725000 ;
-      RECT 1.745000 1.725000 1.935000 2.455000 ;
-      RECT 2.835000 1.725000 3.005000 2.455000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.095000  1.835000 0.855000 2.005000 ;
+      RECT 0.095000  2.005000 0.355000 2.435000 ;
+      RECT 0.365000  0.265000 0.855000 0.715000 ;
+      RECT 0.515000  0.715000 0.855000 1.835000 ;
+      RECT 0.525000  2.175000 0.895000 2.635000 ;
+      RECT 1.025000  0.085000 1.255000 0.865000 ;
+      RECT 1.745000  1.525000 3.005000 1.725000 ;
+      RECT 1.745000  1.725000 1.935000 2.455000 ;
+      RECT 2.105000  1.905000 2.485000 2.635000 ;
+      RECT 2.715000  0.085000 3.075000 0.815000 ;
+      RECT 2.835000  1.725000 3.005000 2.455000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
index 83142e9..3d7326e 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
@@ -80,22 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 1.085000  0.085000 1.325000 0.885000 ;
-        RECT 2.140000  0.085000 2.470000 0.445000 ;
-        RECT 3.990000  0.085000 4.330000 0.785000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -104,39 +88,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.095000 2.080000 0.425000 2.635000 ;
-        RECT 2.635000 2.195000 2.805000 2.635000 ;
-        RECT 3.460000 2.275000 3.840000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.265000 0.360000 0.825000 0.530000 ;
-      RECT 0.645000 0.530000 0.825000 1.070000 ;
-      RECT 0.645000 1.070000 1.355000 1.285000 ;
-      RECT 0.645000 1.285000 0.825000 2.265000 ;
-      RECT 1.100000 1.795000 1.350000 2.285000 ;
-      RECT 1.100000 2.285000 2.415000 2.465000 ;
-      RECT 2.035000 1.855000 4.320000 2.025000 ;
-      RECT 2.035000 2.025000 2.415000 2.285000 ;
-      RECT 3.110000 2.025000 4.320000 2.105000 ;
-      RECT 3.110000 2.105000 3.280000 2.465000 ;
-      RECT 4.060000 2.105000 4.320000 2.465000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.095000  2.080000 0.425000 2.635000 ;
+      RECT 0.265000  0.360000 0.825000 0.530000 ;
+      RECT 0.645000  0.530000 0.825000 1.070000 ;
+      RECT 0.645000  1.070000 1.355000 1.285000 ;
+      RECT 0.645000  1.285000 0.825000 2.265000 ;
+      RECT 1.085000  0.085000 1.325000 0.885000 ;
+      RECT 1.100000  1.795000 1.350000 2.285000 ;
+      RECT 1.100000  2.285000 2.415000 2.465000 ;
+      RECT 2.035000  1.855000 4.320000 2.025000 ;
+      RECT 2.035000  2.025000 2.415000 2.285000 ;
+      RECT 2.140000  0.085000 2.470000 0.445000 ;
+      RECT 2.635000  2.195000 2.805000 2.635000 ;
+      RECT 3.110000  2.025000 4.320000 2.105000 ;
+      RECT 3.110000  2.105000 3.280000 2.465000 ;
+      RECT 3.460000  2.275000 3.840000 2.635000 ;
+      RECT 3.990000  0.085000 4.330000 0.785000 ;
+      RECT 4.060000  2.105000 4.320000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
index a5ee51d..620038b 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
@@ -85,30 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.770000  0.085000 1.155000 0.445000 ;
-        RECT 1.785000  0.085000 2.165000 0.445000 ;
-        RECT 2.745000  0.085000 3.385000 0.525000 ;
-        RECT 6.085000  0.085000 6.275000 0.565000 ;
-        RECT 7.000000  0.085000 7.240000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -117,55 +93,76 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.645000 2.175000 0.905000 2.635000 ;
-        RECT 3.535000 2.275000 3.915000 2.635000 ;
-        RECT 4.495000 2.275000 4.875000 2.635000 ;
-        RECT 5.455000 2.275000 5.835000 2.635000 ;
-        RECT 6.415000 2.275000 6.795000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.445000 0.615000 ;
-      RECT 0.090000 0.615000 1.155000 0.795000 ;
-      RECT 0.095000 1.785000 1.010000 2.005000 ;
-      RECT 0.095000 2.005000 0.425000 2.465000 ;
-      RECT 0.840000 0.795000 1.155000 1.035000 ;
-      RECT 0.840000 1.035000 2.620000 1.345000 ;
-      RECT 0.840000 1.345000 1.010000 1.785000 ;
-      RECT 1.180000 1.795000 1.425000 2.215000 ;
-      RECT 1.180000 2.215000 3.365000 2.465000 ;
-      RECT 2.055000 2.205000 3.365000 2.215000 ;
-      RECT 3.165000 1.875000 7.240000 2.105000 ;
-      RECT 3.165000 2.105000 3.365000 2.205000 ;
-      RECT 3.565000 0.255000 5.865000 0.505000 ;
-      RECT 5.095000 2.105000 5.285000 2.465000 ;
-      RECT 5.605000 0.505000 5.865000 0.735000 ;
-      RECT 5.605000 0.735000 6.825000 0.905000 ;
-      RECT 6.050000 2.105000 6.235000 2.465000 ;
-      RECT 6.445000 0.255000 6.825000 0.735000 ;
-      RECT 6.990000 2.105000 7.240000 2.465000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.090000  0.255000 0.445000 0.615000 ;
+      RECT 0.090000  0.615000 1.155000 0.795000 ;
+      RECT 0.095000  1.785000 1.010000 2.005000 ;
+      RECT 0.095000  2.005000 0.425000 2.465000 ;
+      RECT 0.645000  2.175000 0.905000 2.635000 ;
+      RECT 0.770000  0.085000 1.155000 0.445000 ;
+      RECT 0.840000  0.795000 1.155000 1.035000 ;
+      RECT 0.840000  1.035000 2.620000 1.345000 ;
+      RECT 0.840000  1.345000 1.010000 1.785000 ;
+      RECT 1.180000  1.795000 1.425000 2.215000 ;
+      RECT 1.180000  2.215000 3.365000 2.465000 ;
+      RECT 1.785000  0.085000 2.165000 0.445000 ;
+      RECT 2.055000  2.205000 3.365000 2.215000 ;
+      RECT 2.745000  0.085000 3.385000 0.525000 ;
+      RECT 3.165000  1.875000 7.240000 2.105000 ;
+      RECT 3.165000  2.105000 3.365000 2.205000 ;
+      RECT 3.535000  2.275000 3.915000 2.635000 ;
+      RECT 3.565000  0.255000 5.865000 0.505000 ;
+      RECT 4.495000  2.275000 4.875000 2.635000 ;
+      RECT 5.095000  2.105000 5.285000 2.465000 ;
+      RECT 5.455000  2.275000 5.835000 2.635000 ;
+      RECT 5.605000  0.505000 5.865000 0.735000 ;
+      RECT 5.605000  0.735000 6.825000 0.905000 ;
+      RECT 6.050000  2.105000 6.235000 2.465000 ;
+      RECT 6.085000  0.085000 6.275000 0.565000 ;
+      RECT 6.415000  2.275000 6.795000 2.635000 ;
+      RECT 6.445000  0.255000 6.825000 0.735000 ;
+      RECT 6.990000  2.105000 7.240000 2.465000 ;
+      RECT 7.000000  0.085000 7.240000 0.885000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
index 4dcf84f..f27b8ee 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
@@ -75,18 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.665000  0.085000 1.335000 0.455000 ;
-        RECT 2.575000  0.085000 2.865000 0.815000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -95,32 +83,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.525000 1.905000 0.915000 2.635000 ;
-        RECT 2.005000 1.925000 2.385000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.545000 0.635000 1.815000 0.835000 ;
-      RECT 0.545000 0.835000 0.885000 1.505000 ;
-      RECT 0.545000 1.505000 1.365000 1.725000 ;
-      RECT 1.095000 1.725000 1.365000 2.455000 ;
-      RECT 1.515000 0.265000 1.815000 0.635000 ;
-      RECT 1.595000 1.505000 2.865000 1.745000 ;
-      RECT 1.595000 1.745000 1.825000 2.455000 ;
-      RECT 2.605000 1.745000 2.865000 2.455000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.525000  1.905000 0.915000 2.635000 ;
+      RECT 0.545000  0.635000 1.815000 0.835000 ;
+      RECT 0.545000  0.835000 0.885000 1.505000 ;
+      RECT 0.545000  1.505000 1.365000 1.725000 ;
+      RECT 0.665000  0.085000 1.335000 0.455000 ;
+      RECT 1.095000  1.725000 1.365000 2.455000 ;
+      RECT 1.515000  0.265000 1.815000 0.635000 ;
+      RECT 1.595000  1.505000 2.865000 1.745000 ;
+      RECT 1.595000  1.745000 1.825000 2.455000 ;
+      RECT 2.005000  1.925000 2.385000 2.635000 ;
+      RECT 2.575000  0.085000 2.865000 0.815000 ;
+      RECT 2.605000  1.745000 2.865000 2.455000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
index 6ad9ad8..5d1ecc1 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
@@ -74,20 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.555000 ;
-        RECT 1.275000  0.085000 1.655000 0.445000 ;
-        RECT 3.155000  0.085000 3.535000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -96,34 +82,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.095000 1.665000 0.375000 2.635000 ;
-        RECT 1.055000 2.220000 1.485000 2.635000 ;
-        RECT 2.705000 2.125000 3.035000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.995000 0.655000 2.240000 0.825000 ;
-      RECT 0.995000 0.825000 1.430000 1.690000 ;
-      RECT 0.995000 1.690000 2.040000 1.920000 ;
-      RECT 1.675000 1.920000 2.040000 2.465000 ;
-      RECT 2.050000 0.255000 2.240000 0.655000 ;
-      RECT 2.260000 1.670000 3.475000 1.935000 ;
-      RECT 2.260000 1.935000 2.485000 2.465000 ;
-      RECT 3.255000 1.935000 3.475000 2.465000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.095000  1.665000 0.375000 2.635000 ;
+      RECT 0.175000  0.085000 0.345000 0.555000 ;
+      RECT 0.995000  0.655000 2.240000 0.825000 ;
+      RECT 0.995000  0.825000 1.430000 1.690000 ;
+      RECT 0.995000  1.690000 2.040000 1.920000 ;
+      RECT 1.055000  2.220000 1.485000 2.635000 ;
+      RECT 1.275000  0.085000 1.655000 0.445000 ;
+      RECT 1.675000  1.920000 2.040000 2.465000 ;
+      RECT 2.050000  0.255000 2.240000 0.655000 ;
+      RECT 2.260000  1.670000 3.475000 1.935000 ;
+      RECT 2.260000  1.935000 2.485000 2.465000 ;
+      RECT 2.705000  2.125000 3.035000 2.635000 ;
+      RECT 3.155000  0.085000 3.535000 0.565000 ;
+      RECT 3.255000  1.935000 3.475000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
index 548503e..0bb54e7 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
@@ -82,27 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.105000  0.085000 0.445000 0.445000 ;
-        RECT 1.025000  0.085000 1.405000 0.445000 ;
-        RECT 2.110000  0.085000 2.885000 0.445000 ;
-        RECT 3.555000  0.085000 3.885000 0.445000 ;
-        RECT 5.445000  0.085000 5.725000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -111,49 +90,67 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.115000 1.935000 0.445000 2.635000 ;
-        RECT 1.025000 1.935000 1.405000 2.635000 ;
-        RECT 2.065000 1.515000 2.315000 2.635000 ;
-        RECT 3.935000 2.275000 4.315000 2.635000 ;
-        RECT 4.875000 2.275000 5.255000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.850000 0.995000 2.300000 1.325000 ;
-      RECT 2.130000 0.615000 3.295000 0.670000 ;
-      RECT 2.130000 0.670000 4.765000 0.785000 ;
-      RECT 2.130000 0.785000 2.300000 0.995000 ;
-      RECT 2.655000 1.695000 2.825000 2.295000 ;
-      RECT 2.655000 2.295000 3.765000 2.465000 ;
-      RECT 3.125000 0.255000 3.295000 0.615000 ;
-      RECT 3.125000 0.785000 4.765000 0.840000 ;
-      RECT 3.125000 0.840000 3.295000 2.125000 ;
-      RECT 3.585000 1.445000 3.765000 1.850000 ;
-      RECT 3.585000 1.850000 5.860000 2.020000 ;
-      RECT 3.585000 2.020000 3.765000 2.295000 ;
-      RECT 4.485000 0.405000 4.765000 0.670000 ;
-      RECT 4.535000 2.020000 4.705000 2.465000 ;
-      RECT 5.530000 2.020000 5.860000 2.395000 ;
-      RECT 5.605000 1.460000 5.860000 1.850000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.105000  0.085000 0.445000 0.445000 ;
+      RECT 0.115000  1.935000 0.445000 2.635000 ;
+      RECT 0.850000  0.995000 2.300000 1.325000 ;
+      RECT 1.025000  0.085000 1.405000 0.445000 ;
+      RECT 1.025000  1.935000 1.405000 2.635000 ;
+      RECT 2.065000  1.515000 2.315000 2.635000 ;
+      RECT 2.110000  0.085000 2.885000 0.445000 ;
+      RECT 2.130000  0.615000 3.295000 0.670000 ;
+      RECT 2.130000  0.670000 4.765000 0.785000 ;
+      RECT 2.130000  0.785000 2.300000 0.995000 ;
+      RECT 2.655000  1.695000 2.825000 2.295000 ;
+      RECT 2.655000  2.295000 3.765000 2.465000 ;
+      RECT 3.125000  0.255000 3.295000 0.615000 ;
+      RECT 3.125000  0.785000 4.765000 0.840000 ;
+      RECT 3.125000  0.840000 3.295000 2.125000 ;
+      RECT 3.555000  0.085000 3.885000 0.445000 ;
+      RECT 3.585000  1.445000 3.765000 1.850000 ;
+      RECT 3.585000  1.850000 5.860000 2.020000 ;
+      RECT 3.585000  2.020000 3.765000 2.295000 ;
+      RECT 3.935000  2.275000 4.315000 2.635000 ;
+      RECT 4.485000  0.405000 4.765000 0.670000 ;
+      RECT 4.535000  2.020000 4.705000 2.465000 ;
+      RECT 4.875000  2.275000 5.255000 2.635000 ;
+      RECT 5.445000  0.085000 5.725000 0.885000 ;
+      RECT 5.530000  2.020000 5.860000 2.395000 ;
+      RECT 5.605000  1.460000 5.860000 1.850000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
index 000dae2..671124f 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
@@ -86,30 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.205000  0.085000 0.535000 0.885000 ;
-        RECT 1.945000  0.085000 2.275000 0.505000 ;
-        RECT 2.915000  0.085000 3.735000 0.505000 ;
-        RECT 4.405000  0.085000 4.675000 0.525000 ;
-        RECT 5.345000  0.085000 5.615000 0.525000 ;
-        RECT 6.285000  0.085000 6.535000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -118,51 +94,72 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.595000 2.140000 0.865000 2.635000 ;
-        RECT 1.535000 2.140000 1.805000 2.635000 ;
-        RECT 3.485000 1.495000 3.735000 2.635000 ;
-        RECT 4.375000 1.785000 4.705000 2.635000 ;
-        RECT 5.315000 1.785000 5.645000 2.635000 ;
-        RECT 6.265000 1.445000 6.595000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.460000 0.355000 1.800000 ;
-      RECT 0.095000 1.800000 2.275000 1.970000 ;
-      RECT 0.095000 1.970000 0.425000 2.465000 ;
-      RECT 1.035000 0.275000 1.365000 0.675000 ;
-      RECT 1.035000 0.675000 3.735000 0.885000 ;
-      RECT 1.035000 1.970000 1.365000 2.465000 ;
-      RECT 1.975000 1.970000 2.275000 2.295000 ;
-      RECT 1.975000 2.295000 3.245000 2.465000 ;
-      RECT 2.045000 1.460000 2.275000 1.800000 ;
-      RECT 2.445000 0.255000 2.745000 0.675000 ;
-      RECT 2.445000 0.885000 2.695000 1.790000 ;
-      RECT 2.445000 1.790000 2.745000 2.125000 ;
-      RECT 2.915000 1.785000 3.245000 2.295000 ;
-      RECT 3.565000 0.885000 3.735000 1.035000 ;
-      RECT 3.565000 1.035000 5.455000 1.275000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.095000  1.460000 0.355000 1.800000 ;
+      RECT 0.095000  1.800000 2.275000 1.970000 ;
+      RECT 0.095000  1.970000 0.425000 2.465000 ;
+      RECT 0.205000  0.085000 0.535000 0.885000 ;
+      RECT 0.595000  2.140000 0.865000 2.635000 ;
+      RECT 1.035000  0.275000 1.365000 0.675000 ;
+      RECT 1.035000  0.675000 3.735000 0.885000 ;
+      RECT 1.035000  1.970000 1.365000 2.465000 ;
+      RECT 1.535000  2.140000 1.805000 2.635000 ;
+      RECT 1.945000  0.085000 2.275000 0.505000 ;
+      RECT 1.975000  1.970000 2.275000 2.295000 ;
+      RECT 1.975000  2.295000 3.245000 2.465000 ;
+      RECT 2.045000  1.460000 2.275000 1.800000 ;
+      RECT 2.445000  0.255000 2.745000 0.675000 ;
+      RECT 2.445000  0.885000 2.695000 1.790000 ;
+      RECT 2.445000  1.790000 2.745000 2.125000 ;
+      RECT 2.915000  0.085000 3.735000 0.505000 ;
+      RECT 2.915000  1.785000 3.245000 2.295000 ;
+      RECT 3.485000  1.495000 3.735000 2.635000 ;
+      RECT 3.565000  0.885000 3.735000 1.035000 ;
+      RECT 3.565000  1.035000 5.455000 1.275000 ;
+      RECT 4.375000  1.785000 4.705000 2.635000 ;
+      RECT 4.405000  0.085000 4.675000 0.525000 ;
+      RECT 5.315000  1.785000 5.645000 2.635000 ;
+      RECT 5.345000  0.085000 5.615000 0.525000 ;
+      RECT 6.265000  1.445000 6.595000 2.635000 ;
+      RECT 6.285000  0.085000 6.535000 0.905000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
index 65c6334..bcb6b13 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
@@ -88,33 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.205000  0.085000 0.535000 0.885000 ;
-        RECT 1.945000  0.085000 2.275000 0.505000 ;
-        RECT 2.915000  0.085000 3.735000 0.505000 ;
-        RECT 4.405000  0.085000 4.675000 0.525000 ;
-        RECT 5.345000  0.085000 5.615000 0.525000 ;
-        RECT 6.285000  0.085000 6.555000 0.525000 ;
-        RECT 7.225000  0.085000 7.475000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -123,54 +96,78 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.595000 2.140000 0.865000 2.635000 ;
-        RECT 1.535000 2.140000 1.805000 2.635000 ;
-        RECT 3.485000 1.495000 3.735000 2.635000 ;
-        RECT 4.375000 1.785000 4.705000 2.635000 ;
-        RECT 5.315000 1.785000 5.645000 2.635000 ;
-        RECT 6.255000 1.785000 6.585000 2.635000 ;
-        RECT 7.215000 1.445000 7.525000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.460000 0.355000 1.800000 ;
-      RECT 0.095000 1.800000 2.275000 1.970000 ;
-      RECT 0.095000 1.970000 0.425000 2.465000 ;
-      RECT 1.035000 0.275000 1.365000 0.675000 ;
-      RECT 1.035000 0.675000 3.735000 0.885000 ;
-      RECT 1.035000 1.970000 1.365000 2.465000 ;
-      RECT 1.975000 1.970000 2.275000 2.295000 ;
-      RECT 1.975000 2.295000 3.245000 2.465000 ;
-      RECT 2.045000 1.460000 2.275000 1.800000 ;
-      RECT 2.445000 0.255000 2.745000 0.675000 ;
-      RECT 2.445000 0.885000 2.695000 1.790000 ;
-      RECT 2.445000 1.790000 2.745000 2.125000 ;
-      RECT 2.915000 1.785000 3.245000 2.295000 ;
-      RECT 3.565000 0.885000 3.735000 1.035000 ;
-      RECT 3.565000 1.035000 6.135000 1.275000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.095000  1.460000 0.355000 1.800000 ;
+      RECT 0.095000  1.800000 2.275000 1.970000 ;
+      RECT 0.095000  1.970000 0.425000 2.465000 ;
+      RECT 0.205000  0.085000 0.535000 0.885000 ;
+      RECT 0.595000  2.140000 0.865000 2.635000 ;
+      RECT 1.035000  0.275000 1.365000 0.675000 ;
+      RECT 1.035000  0.675000 3.735000 0.885000 ;
+      RECT 1.035000  1.970000 1.365000 2.465000 ;
+      RECT 1.535000  2.140000 1.805000 2.635000 ;
+      RECT 1.945000  0.085000 2.275000 0.505000 ;
+      RECT 1.975000  1.970000 2.275000 2.295000 ;
+      RECT 1.975000  2.295000 3.245000 2.465000 ;
+      RECT 2.045000  1.460000 2.275000 1.800000 ;
+      RECT 2.445000  0.255000 2.745000 0.675000 ;
+      RECT 2.445000  0.885000 2.695000 1.790000 ;
+      RECT 2.445000  1.790000 2.745000 2.125000 ;
+      RECT 2.915000  0.085000 3.735000 0.505000 ;
+      RECT 2.915000  1.785000 3.245000 2.295000 ;
+      RECT 3.485000  1.495000 3.735000 2.635000 ;
+      RECT 3.565000  0.885000 3.735000 1.035000 ;
+      RECT 3.565000  1.035000 6.135000 1.275000 ;
+      RECT 4.375000  1.785000 4.705000 2.635000 ;
+      RECT 4.405000  0.085000 4.675000 0.525000 ;
+      RECT 5.315000  1.785000 5.645000 2.635000 ;
+      RECT 5.345000  0.085000 5.615000 0.525000 ;
+      RECT 6.255000  1.785000 6.585000 2.635000 ;
+      RECT 6.285000  0.085000 6.555000 0.525000 ;
+      RECT 7.215000  1.445000 7.525000 2.635000 ;
+      RECT 7.225000  0.085000 7.475000 0.905000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
index e5e5496..854424d 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
@@ -79,16 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.110000  0.085000 0.440000 0.475000 ;
-        RECT 1.595000  0.085000 1.895000 0.815000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -97,25 +87,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 1.140000 2.195000 1.335000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.540000 1.855000 1.895000 2.025000 ;
-      RECT 0.540000 2.025000 0.920000 2.455000 ;
-      RECT 0.900000 1.525000 1.895000 1.855000 ;
-      RECT 1.515000 2.025000 1.895000 2.455000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.110000  0.085000 0.440000 0.475000 ;
+      RECT 0.540000  1.855000 1.895000 2.025000 ;
+      RECT 0.540000  2.025000 0.920000 2.455000 ;
+      RECT 0.900000  1.525000 1.895000 1.855000 ;
+      RECT 1.140000  2.195000 1.335000 2.635000 ;
+      RECT 1.515000  2.025000 1.895000 2.455000 ;
+      RECT 1.595000  0.085000 1.895000 0.815000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
index b3b33e2..6a46a1a 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
@@ -80,20 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.100000  0.085000 0.395000 0.865000 ;
-        RECT 1.910000  0.085000 2.290000 0.445000 ;
-        RECT 3.095000  0.085000 3.425000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -102,32 +88,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.540000 2.275000 0.920000 2.635000 ;
-        RECT 1.625000 2.195000 1.795000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 1.855000 2.345000 2.025000 ;
-      RECT 0.110000 2.025000 1.320000 2.105000 ;
-      RECT 0.110000 2.105000 0.370000 2.465000 ;
-      RECT 1.150000 2.105000 1.320000 2.465000 ;
-      RECT 2.015000 2.025000 2.345000 2.285000 ;
-      RECT 2.015000 2.285000 3.390000 2.465000 ;
-      RECT 3.085000 1.795000 3.390000 2.285000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.100000  0.085000 0.395000 0.865000 ;
+      RECT 0.110000  1.855000 2.345000 2.025000 ;
+      RECT 0.110000  2.025000 1.320000 2.105000 ;
+      RECT 0.110000  2.105000 0.370000 2.465000 ;
+      RECT 0.540000  2.275000 0.920000 2.635000 ;
+      RECT 1.150000  2.105000 1.320000 2.465000 ;
+      RECT 1.625000  2.195000 1.795000 2.635000 ;
+      RECT 1.910000  0.085000 2.290000 0.445000 ;
+      RECT 2.015000  2.025000 2.345000 2.285000 ;
+      RECT 2.015000  2.285000 3.390000 2.465000 ;
+      RECT 3.085000  1.795000 3.390000 2.285000 ;
+      RECT 3.095000  0.085000 3.425000 0.825000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
index bd3800d..cdcce90 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
@@ -85,28 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.805000 ;
-        RECT 1.005000  0.085000 1.385000 0.445000 ;
-        RECT 1.985000  0.085000 2.315000 0.525000 ;
-        RECT 5.005000  0.085000 5.195000 0.565000 ;
-        RECT 5.965000  0.085000 6.225000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -115,46 +93,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 2.485000 2.275000 2.865000 2.635000 ;
-        RECT 3.445000 2.275000 3.825000 2.635000 ;
-        RECT 4.405000 2.275000 4.785000 2.635000 ;
-        RECT 5.365000 2.275000 5.745000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.180000 1.795000 0.375000 2.215000 ;
-      RECT 0.180000 2.215000 2.315000 2.465000 ;
-      RECT 1.005000 2.205000 2.315000 2.215000 ;
-      RECT 2.115000 1.875000 6.225000 2.105000 ;
-      RECT 2.115000 2.105000 2.315000 2.205000 ;
-      RECT 2.485000 0.255000 4.785000 0.505000 ;
-      RECT 3.085000 2.105000 3.275000 2.465000 ;
-      RECT 4.045000 2.105000 4.235000 2.465000 ;
-      RECT 4.525000 0.505000 4.785000 0.735000 ;
-      RECT 4.525000 0.735000 5.745000 0.905000 ;
-      RECT 5.005000 2.105000 5.185000 2.465000 ;
-      RECT 5.365000 0.255000 5.745000 0.735000 ;
-      RECT 5.965000 2.105000 6.225000 2.465000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.090000  0.085000 0.425000 0.805000 ;
+      RECT 0.180000  1.795000 0.375000 2.215000 ;
+      RECT 0.180000  2.215000 2.315000 2.465000 ;
+      RECT 1.005000  0.085000 1.385000 0.445000 ;
+      RECT 1.005000  2.205000 2.315000 2.215000 ;
+      RECT 1.985000  0.085000 2.315000 0.525000 ;
+      RECT 2.115000  1.875000 6.225000 2.105000 ;
+      RECT 2.115000  2.105000 2.315000 2.205000 ;
+      RECT 2.485000  0.255000 4.785000 0.505000 ;
+      RECT 2.485000  2.275000 2.865000 2.635000 ;
+      RECT 3.085000  2.105000 3.275000 2.465000 ;
+      RECT 3.445000  2.275000 3.825000 2.635000 ;
+      RECT 4.045000  2.105000 4.235000 2.465000 ;
+      RECT 4.405000  2.275000 4.785000 2.635000 ;
+      RECT 4.525000  0.505000 4.785000 0.735000 ;
+      RECT 4.525000  0.735000 5.745000 0.905000 ;
+      RECT 5.005000  0.085000 5.195000 0.565000 ;
+      RECT 5.005000  2.105000 5.185000 2.465000 ;
+      RECT 5.365000  0.255000 5.745000 0.735000 ;
+      RECT 5.365000  2.275000 5.745000 2.635000 ;
+      RECT 5.965000  0.085000 6.225000 0.885000 ;
+      RECT 5.965000  2.105000 6.225000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
index ac21e68..b1843a1 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
@@ -104,19 +104,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.565000 ;
-        RECT 3.030000  0.085000 3.360000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -125,32 +112,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 2.025000 2.215000 2.355000 2.635000 ;
-        RECT 3.045000 1.875000 3.375000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 1.795000 0.815000 2.295000 ;
-      RECT 0.515000 2.295000 1.835000 2.465000 ;
-      RECT 1.115000 1.795000 2.175000 1.835000 ;
-      RECT 1.115000 1.835000 2.825000 2.045000 ;
-      RECT 1.115000 2.045000 1.340000 2.125000 ;
-      RECT 1.455000 2.255000 1.835000 2.295000 ;
-      RECT 2.575000 2.045000 2.825000 2.465000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.515000  0.085000 0.895000 0.565000 ;
+      RECT 0.515000  1.795000 0.815000 2.295000 ;
+      RECT 0.515000  2.295000 1.835000 2.465000 ;
+      RECT 1.115000  1.795000 2.175000 1.835000 ;
+      RECT 1.115000  1.835000 2.825000 2.045000 ;
+      RECT 1.115000  2.045000 1.340000 2.125000 ;
+      RECT 1.455000  2.255000 1.835000 2.295000 ;
+      RECT 2.025000  2.215000 2.355000 2.635000 ;
+      RECT 2.575000  2.045000 2.825000 2.465000 ;
+      RECT 3.030000  0.085000 3.360000 0.485000 ;
+      RECT 3.045000  1.875000 3.375000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
index 34329e4..52ff796 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
@@ -102,26 +102,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.105000  0.085000 0.355000 0.895000 ;
-        RECT 1.125000  0.085000 1.815000 0.555000 ;
-        RECT 3.570000  0.085000 3.740000 0.555000 ;
-        RECT 5.485000  0.085000 5.655000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -130,48 +110,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 4.035000 2.125000 4.285000 2.635000 ;
-        RECT 4.975000 2.125000 5.225000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.795000 0.435000 2.295000 ;
-      RECT 0.090000 2.295000 1.375000 2.465000 ;
-      RECT 1.125000 1.495000 1.375000 1.785000 ;
-      RECT 1.125000 1.785000 3.265000 1.955000 ;
-      RECT 1.125000 1.955000 1.375000 2.295000 ;
-      RECT 1.605000 2.125000 1.855000 2.295000 ;
-      RECT 1.605000 2.295000 3.775000 2.465000 ;
-      RECT 1.985000 0.255000 3.305000 0.475000 ;
-      RECT 2.075000 1.955000 2.325000 2.125000 ;
-      RECT 2.545000 2.125000 2.795000 2.295000 ;
-      RECT 3.015000 1.955000 3.265000 2.125000 ;
-      RECT 3.525000 1.785000 5.695000 1.955000 ;
-      RECT 3.525000 1.955000 3.775000 2.295000 ;
-      RECT 3.945000 0.255000 5.265000 0.475000 ;
-      RECT 4.505000 1.955000 4.755000 2.465000 ;
-      RECT 5.015000 0.475000 5.265000 0.905000 ;
-      RECT 5.490000 1.455000 5.695000 1.785000 ;
-      RECT 5.490000 1.955000 5.695000 2.465000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.090000  1.795000 0.435000 2.295000 ;
+      RECT 0.090000  2.295000 1.375000 2.465000 ;
+      RECT 0.105000  0.085000 0.355000 0.895000 ;
+      RECT 1.125000  0.085000 1.815000 0.555000 ;
+      RECT 1.125000  1.495000 1.375000 1.785000 ;
+      RECT 1.125000  1.785000 3.265000 1.955000 ;
+      RECT 1.125000  1.955000 1.375000 2.295000 ;
+      RECT 1.605000  2.125000 1.855000 2.295000 ;
+      RECT 1.605000  2.295000 3.775000 2.465000 ;
+      RECT 1.985000  0.255000 3.305000 0.475000 ;
+      RECT 2.075000  1.955000 2.325000 2.125000 ;
+      RECT 2.545000  2.125000 2.795000 2.295000 ;
+      RECT 3.015000  1.955000 3.265000 2.125000 ;
+      RECT 3.525000  1.785000 5.695000 1.955000 ;
+      RECT 3.525000  1.955000 3.775000 2.295000 ;
+      RECT 3.570000  0.085000 3.740000 0.555000 ;
+      RECT 3.945000  0.255000 5.265000 0.475000 ;
+      RECT 4.035000  2.125000 4.285000 2.635000 ;
+      RECT 4.505000  1.955000 4.755000 2.465000 ;
+      RECT 4.975000  2.125000 5.225000 2.635000 ;
+      RECT 5.015000  0.475000 5.265000 0.905000 ;
+      RECT 5.485000  0.085000 5.655000 0.905000 ;
+      RECT 5.490000  1.455000 5.695000 1.785000 ;
+      RECT 5.490000  1.955000 5.695000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
index 49ce6c2..67ee789 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
@@ -111,40 +111,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 10.580000 0.085000 ;
-        RECT  0.115000  0.085000  0.365000 0.895000 ;
-        RECT  1.135000  0.085000  1.305000 0.555000 ;
-        RECT  2.075000  0.085000  2.245000 0.645000 ;
-        RECT  2.075000  0.645000  3.205000 0.925000 ;
-        RECT  3.035000  0.595000  3.205000 0.645000 ;
-        RECT  6.455000  0.085000  6.625000 0.555000 ;
-        RECT  9.275000  0.085000  9.445000 0.555000 ;
-        RECT 10.165000  0.085000 10.335000 0.905000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
@@ -153,62 +119,93 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.580000 2.805000 ;
-        RECT 6.825000 2.215000  9.085000 2.635000 ;
-        RECT 9.745000 1.795000  9.915000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.445000  0.405000 2.295000 ;
-      RECT  0.090000 2.295000  2.325000 2.465000 ;
-      RECT  1.095000 1.785000  1.345000 2.295000 ;
-      RECT  2.075000 1.445000  3.330000 1.615000 ;
-      RECT  2.075000 1.615000  2.325000 2.295000 ;
-      RECT  2.435000 0.255000  6.185000 0.425000 ;
-      RECT  2.435000 0.425000  2.860000 0.475000 ;
-      RECT  2.565000 1.795000  2.815000 2.215000 ;
-      RECT  2.565000 2.215000  6.655000 2.465000 ;
-      RECT  3.035000 1.615000  3.330000 1.835000 ;
-      RECT  3.035000 1.835000  6.185000 2.045000 ;
-      RECT  3.335000 0.425000  6.185000 0.475000 ;
-      RECT  6.405000 1.785000  9.525000 2.045000 ;
-      RECT  6.405000 2.045000  6.655000 2.215000 ;
-      RECT  6.795000 0.255000  9.055000 0.475000 ;
-      RECT  8.805000 0.475000  9.055000 0.725000 ;
-      RECT  8.805000 0.725000  9.995000 0.905000 ;
-      RECT  9.275000 2.045000  9.445000 2.465000 ;
-      RECT  9.355000 1.445000 10.425000 1.615000 ;
-      RECT  9.355000 1.615000  9.525000 1.785000 ;
-      RECT  9.615000 0.255000  9.995000 0.725000 ;
-      RECT 10.175000 1.615000 10.425000 2.465000 ;
+      RECT  0.000000 -0.085000 10.580000 0.085000 ;
+      RECT  0.000000  2.635000 10.580000 2.805000 ;
+      RECT  0.090000  1.445000  0.405000 2.295000 ;
+      RECT  0.090000  2.295000  2.325000 2.465000 ;
+      RECT  0.115000  0.085000  0.365000 0.895000 ;
+      RECT  1.095000  1.785000  1.345000 2.295000 ;
+      RECT  1.135000  0.085000  1.305000 0.555000 ;
+      RECT  2.075000  0.085000  2.245000 0.645000 ;
+      RECT  2.075000  0.645000  3.205000 0.925000 ;
+      RECT  2.075000  1.445000  3.330000 1.615000 ;
+      RECT  2.075000  1.615000  2.325000 2.295000 ;
+      RECT  2.435000  0.255000  6.185000 0.425000 ;
+      RECT  2.435000  0.425000  2.860000 0.475000 ;
+      RECT  2.565000  1.795000  2.815000 2.215000 ;
+      RECT  2.565000  2.215000  6.655000 2.465000 ;
+      RECT  3.035000  0.595000  3.205000 0.645000 ;
+      RECT  3.035000  1.615000  3.330000 1.835000 ;
+      RECT  3.035000  1.835000  6.185000 2.045000 ;
+      RECT  3.335000  0.425000  6.185000 0.475000 ;
+      RECT  6.405000  1.785000  9.525000 2.045000 ;
+      RECT  6.405000  2.045000  6.655000 2.215000 ;
+      RECT  6.455000  0.085000  6.625000 0.555000 ;
+      RECT  6.795000  0.255000  9.055000 0.475000 ;
+      RECT  6.825000  2.215000  9.085000 2.635000 ;
+      RECT  8.805000  0.475000  9.055000 0.725000 ;
+      RECT  8.805000  0.725000  9.995000 0.905000 ;
+      RECT  9.275000  0.085000  9.445000 0.555000 ;
+      RECT  9.275000  2.045000  9.445000 2.465000 ;
+      RECT  9.355000  1.445000 10.425000 1.615000 ;
+      RECT  9.355000  1.615000  9.525000 1.785000 ;
+      RECT  9.615000  0.255000  9.995000 0.725000 ;
+      RECT  9.745000  1.795000  9.915000 2.635000 ;
+      RECT 10.165000  0.085000 10.335000 0.905000 ;
+      RECT 10.175000  1.615000 10.425000 2.465000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
index 7ab945b..012a722 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
@@ -106,20 +106,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.925000  0.085000 1.705000 0.465000 ;
-        RECT 3.555000  0.085000 3.965000 0.815000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -128,32 +114,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 3.155000 1.905000 3.485000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.565000 2.055000 0.895000 2.295000 ;
-      RECT 0.565000 2.295000 2.465000 2.465000 ;
-      RECT 1.825000 1.500000 4.025000 1.735000 ;
-      RECT 1.825000 1.735000 2.935000 1.830000 ;
-      RECT 2.170000 2.135000 2.465000 2.295000 ;
-      RECT 2.685000 1.830000 2.935000 2.250000 ;
-      RECT 3.765000 1.735000 4.025000 2.250000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.565000  2.055000 0.895000 2.295000 ;
+      RECT 0.565000  2.295000 2.465000 2.465000 ;
+      RECT 0.925000  0.085000 1.705000 0.465000 ;
+      RECT 1.825000  1.500000 4.025000 1.735000 ;
+      RECT 1.825000  1.735000 2.935000 1.830000 ;
+      RECT 2.170000  2.135000 2.465000 2.295000 ;
+      RECT 2.685000  1.830000 2.935000 2.250000 ;
+      RECT 3.155000  1.905000 3.485000 2.635000 ;
+      RECT 3.555000  0.085000 3.965000 0.815000 ;
+      RECT 3.765000  1.735000 4.025000 2.250000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
index 3271c85..ab12341 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
@@ -87,19 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.090000  0.085000 0.595000 0.850000 ;
-        RECT 2.585000  0.085000 2.915000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -108,34 +95,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 1.540000 2.255000 1.895000 2.635000 ;
-        RECT 2.585000 1.935000 2.915000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.495000 3.035000 1.715000 ;
-      RECT 0.090000 1.715000 0.345000 2.245000 ;
-      RECT 0.090000 2.245000 0.425000 2.465000 ;
-      RECT 0.565000 1.885000 2.395000 2.085000 ;
-      RECT 0.870000 0.255000 2.280000 0.465000 ;
-      RECT 2.065000 2.085000 2.395000 2.465000 ;
-      RECT 2.110000 0.465000 2.280000 0.615000 ;
-      RECT 2.110000 0.615000 3.035000 0.785000 ;
-      RECT 2.865000 0.785000 3.035000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.090000  0.085000 0.595000 0.850000 ;
+      RECT 0.090000  1.495000 3.035000 1.715000 ;
+      RECT 0.090000  1.715000 0.345000 2.245000 ;
+      RECT 0.090000  2.245000 0.425000 2.465000 ;
+      RECT 0.565000  1.885000 2.395000 2.085000 ;
+      RECT 0.870000  0.255000 2.280000 0.465000 ;
+      RECT 1.540000  2.255000 1.895000 2.635000 ;
+      RECT 2.065000  2.085000 2.395000 2.465000 ;
+      RECT 2.110000  0.465000 2.280000 0.615000 ;
+      RECT 2.110000  0.615000 3.035000 0.785000 ;
+      RECT 2.585000  0.085000 2.915000 0.445000 ;
+      RECT 2.585000  1.935000 2.915000 2.635000 ;
+      RECT 2.865000  0.785000 3.035000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
index 3650012..5262aa7 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
@@ -87,21 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.095000  0.085000 0.595000 0.850000 ;
-        RECT 2.505000  0.085000 2.885000 0.565000 ;
-        RECT 3.755000  0.085000 3.925000 0.985000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -110,38 +95,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 1.555000 2.215000 1.910000 2.635000 ;
-        RECT 2.600000 1.875000 2.930000 2.635000 ;
-        RECT 3.755000 1.445000 3.925000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.455000 3.015000 1.625000 ;
-      RECT 0.095000 1.625000 0.425000 2.295000 ;
-      RECT 0.095000 2.295000 1.365000 2.465000 ;
-      RECT 0.645000 1.795000 2.380000 2.035000 ;
-      RECT 0.645000 2.035000 0.875000 2.125000 ;
-      RECT 0.870000 0.255000 2.295000 0.505000 ;
-      RECT 1.035000 2.255000 1.365000 2.295000 ;
-      RECT 2.125000 0.505000 2.295000 0.735000 ;
-      RECT 2.125000 0.735000 3.015000 0.905000 ;
-      RECT 2.130000 2.035000 2.380000 2.465000 ;
-      RECT 2.845000 0.905000 3.015000 1.455000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.095000  0.085000 0.595000 0.850000 ;
+      RECT 0.095000  1.455000 3.015000 1.625000 ;
+      RECT 0.095000  1.625000 0.425000 2.295000 ;
+      RECT 0.095000  2.295000 1.365000 2.465000 ;
+      RECT 0.645000  1.795000 2.380000 2.035000 ;
+      RECT 0.645000  2.035000 0.875000 2.125000 ;
+      RECT 0.870000  0.255000 2.295000 0.505000 ;
+      RECT 1.035000  2.255000 1.365000 2.295000 ;
+      RECT 1.555000  2.215000 1.910000 2.635000 ;
+      RECT 2.125000  0.505000 2.295000 0.735000 ;
+      RECT 2.125000  0.735000 3.015000 0.905000 ;
+      RECT 2.130000  2.035000 2.380000 2.465000 ;
+      RECT 2.505000  0.085000 2.885000 0.565000 ;
+      RECT 2.600000  1.875000 2.930000 2.635000 ;
+      RECT 2.845000  0.905000 3.015000 1.455000 ;
+      RECT 3.755000  0.085000 3.925000 0.985000 ;
+      RECT 3.755000  1.445000 3.925000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
index f6db0e4..b0e822a 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
@@ -94,29 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.260000  0.085000 0.430000 0.555000 ;
-        RECT 1.200000  0.085000 1.370000 0.555000 ;
-        RECT 2.140000  0.085000 2.830000 0.555000 ;
-        RECT 4.585000  0.085000 4.755000 0.555000 ;
-        RECT 6.500000  0.085000 6.670000 0.895000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -125,55 +102,75 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.220000 1.825000 0.470000 2.635000 ;
-        RECT 1.160000 1.795000 1.410000 2.635000 ;
-        RECT 2.100000 2.125000 2.350000 2.635000 ;
-        RECT 5.050000 2.125000 5.300000 2.635000 ;
-        RECT 5.990000 2.125000 6.240000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.540000 1.075000 2.430000 1.275000 ;
-      RECT 2.100000 1.275000 2.430000 1.785000 ;
-      RECT 2.100000 1.785000 4.280000 1.955000 ;
-      RECT 2.140000 0.735000 5.810000 0.905000 ;
-      RECT 2.140000 0.905000 2.430000 1.075000 ;
-      RECT 2.620000 2.125000 2.870000 2.295000 ;
-      RECT 2.620000 2.295000 4.830000 2.465000 ;
-      RECT 3.000000 0.255000 4.320000 0.475000 ;
-      RECT 3.090000 1.955000 3.340000 2.125000 ;
-      RECT 3.420000 0.645000 3.905000 0.735000 ;
-      RECT 3.560000 2.125000 3.810000 2.295000 ;
-      RECT 4.030000 1.955000 4.280000 2.125000 ;
-      RECT 4.500000 1.785000 6.710000 1.955000 ;
-      RECT 4.500000 1.955000 4.830000 2.295000 ;
-      RECT 4.960000 0.255000 6.280000 0.475000 ;
-      RECT 5.385000 0.645000 5.810000 0.735000 ;
-      RECT 5.520000 1.955000 5.770000 2.465000 ;
-      RECT 6.030000 0.475000 6.280000 0.895000 ;
-      RECT 6.505000 1.455000 6.710000 1.785000 ;
-      RECT 6.505000 1.955000 6.710000 2.465000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.220000  1.825000 0.470000 2.635000 ;
+      RECT 0.260000  0.085000 0.430000 0.555000 ;
+      RECT 0.540000  1.075000 2.430000 1.275000 ;
+      RECT 1.160000  1.795000 1.410000 2.635000 ;
+      RECT 1.200000  0.085000 1.370000 0.555000 ;
+      RECT 2.100000  1.275000 2.430000 1.785000 ;
+      RECT 2.100000  1.785000 4.280000 1.955000 ;
+      RECT 2.100000  2.125000 2.350000 2.635000 ;
+      RECT 2.140000  0.085000 2.830000 0.555000 ;
+      RECT 2.140000  0.735000 5.810000 0.905000 ;
+      RECT 2.140000  0.905000 2.430000 1.075000 ;
+      RECT 2.620000  2.125000 2.870000 2.295000 ;
+      RECT 2.620000  2.295000 4.830000 2.465000 ;
+      RECT 3.000000  0.255000 4.320000 0.475000 ;
+      RECT 3.090000  1.955000 3.340000 2.125000 ;
+      RECT 3.420000  0.645000 3.905000 0.735000 ;
+      RECT 3.560000  2.125000 3.810000 2.295000 ;
+      RECT 4.030000  1.955000 4.280000 2.125000 ;
+      RECT 4.500000  1.785000 6.710000 1.955000 ;
+      RECT 4.500000  1.955000 4.830000 2.295000 ;
+      RECT 4.585000  0.085000 4.755000 0.555000 ;
+      RECT 4.960000  0.255000 6.280000 0.475000 ;
+      RECT 5.050000  2.125000 5.300000 2.635000 ;
+      RECT 5.385000  0.645000 5.810000 0.735000 ;
+      RECT 5.520000  1.955000 5.770000 2.465000 ;
+      RECT 5.990000  2.125000 6.240000 2.635000 ;
+      RECT 6.030000  0.475000 6.280000 0.895000 ;
+      RECT 6.500000  0.085000 6.670000 0.895000 ;
+      RECT 6.505000  1.455000 6.710000 1.785000 ;
+      RECT 6.505000  1.955000 6.710000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
index fe0448b..cee9276 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
@@ -92,18 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.095000  0.085000 0.595000 0.595000 ;
-        RECT 2.505000  0.085000 2.835000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -112,27 +100,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.555000 2.255000 1.910000 2.635000 ;
-        RECT 2.560000 1.855000 2.825000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.645000 1.785000 2.275000 1.980000 ;
-      RECT 0.645000 1.980000 0.815000 2.115000 ;
-      RECT 2.105000 1.980000 2.275000 2.165000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.095000  0.085000 0.595000 0.595000 ;
+      RECT 0.645000  1.785000 2.275000 1.980000 ;
+      RECT 0.645000  1.980000 0.815000 2.115000 ;
+      RECT 1.555000  2.255000 1.910000 2.635000 ;
+      RECT 2.105000  1.980000 2.275000 2.165000 ;
+      RECT 2.505000  0.085000 2.835000 0.485000 ;
+      RECT 2.560000  1.855000 2.825000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
index b049d77..d6400ec 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
@@ -104,6 +104,8 @@
         RECT 3.825000 -0.085000 3.995000 0.085000 ;
         RECT 4.285000 -0.085000 4.455000 0.085000 ;
         RECT 4.745000 -0.085000 4.915000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -128,6 +130,8 @@
         RECT 3.825000 2.635000 3.995000 2.805000 ;
         RECT 4.285000 2.635000 4.455000 2.805000 ;
         RECT 4.745000 2.635000 4.915000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
diff --git a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
index 9e24aca..e09a1ae 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
@@ -89,32 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.555000 ;
-        RECT 1.585000  0.085000 1.755000 0.555000 ;
-        RECT 6.805000  0.085000 6.975000 0.555000 ;
-        RECT 7.745000  0.085000 7.915000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -123,59 +97,82 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 4.885000 1.795000 5.135000 2.635000 ;
-        RECT 5.825000 1.795000 6.075000 2.635000 ;
-        RECT 6.765000 1.795000 7.015000 2.635000 ;
-        RECT 7.705000 1.795000 7.955000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 0.425000 2.295000 ;
-      RECT 0.090000 2.295000 4.665000 2.465000 ;
-      RECT 0.095000 0.255000 0.425000 0.725000 ;
-      RECT 0.095000 0.725000 2.225000 0.905000 ;
-      RECT 0.985000 0.255000 1.365000 0.725000 ;
-      RECT 1.075000 1.795000 1.325000 2.295000 ;
-      RECT 1.925000 0.255000 4.185000 0.475000 ;
-      RECT 1.925000 0.475000 2.225000 0.725000 ;
-      RECT 2.015000 1.795000 2.265000 2.295000 ;
-      RECT 2.955000 1.795000 3.205000 2.295000 ;
-      RECT 3.895000 1.455000 8.425000 1.625000 ;
-      RECT 3.895000 1.625000 4.665000 2.295000 ;
-      RECT 4.375000 0.255000 6.585000 0.475000 ;
-      RECT 5.355000 1.625000 5.605000 2.465000 ;
-      RECT 6.295000 1.625000 6.545000 2.465000 ;
-      RECT 6.335000 0.475000 6.585000 0.725000 ;
-      RECT 6.335000 0.725000 8.465000 0.905000 ;
-      RECT 7.145000 0.255000 7.525000 0.725000 ;
-      RECT 7.235000 1.625000 7.485000 2.465000 ;
-      RECT 8.085000 0.255000 8.465000 0.725000 ;
-      RECT 8.175000 1.625000 8.425000 2.465000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.090000  1.455000 0.425000 2.295000 ;
+      RECT 0.090000  2.295000 4.665000 2.465000 ;
+      RECT 0.095000  0.255000 0.425000 0.725000 ;
+      RECT 0.095000  0.725000 2.225000 0.905000 ;
+      RECT 0.645000  0.085000 0.815000 0.555000 ;
+      RECT 0.985000  0.255000 1.365000 0.725000 ;
+      RECT 1.075000  1.795000 1.325000 2.295000 ;
+      RECT 1.585000  0.085000 1.755000 0.555000 ;
+      RECT 1.925000  0.255000 4.185000 0.475000 ;
+      RECT 1.925000  0.475000 2.225000 0.725000 ;
+      RECT 2.015000  1.795000 2.265000 2.295000 ;
+      RECT 2.955000  1.795000 3.205000 2.295000 ;
+      RECT 3.895000  1.455000 8.425000 1.625000 ;
+      RECT 3.895000  1.625000 4.665000 2.295000 ;
+      RECT 4.375000  0.255000 6.585000 0.475000 ;
+      RECT 4.885000  1.795000 5.135000 2.635000 ;
+      RECT 5.355000  1.625000 5.605000 2.465000 ;
+      RECT 5.825000  1.795000 6.075000 2.635000 ;
+      RECT 6.295000  1.625000 6.545000 2.465000 ;
+      RECT 6.335000  0.475000 6.585000 0.725000 ;
+      RECT 6.335000  0.725000 8.465000 0.905000 ;
+      RECT 6.765000  1.795000 7.015000 2.635000 ;
+      RECT 6.805000  0.085000 6.975000 0.555000 ;
+      RECT 7.145000  0.255000 7.525000 0.725000 ;
+      RECT 7.235000  1.625000 7.485000 2.465000 ;
+      RECT 7.705000  1.795000 7.955000 2.635000 ;
+      RECT 7.745000  0.085000 7.915000 0.555000 ;
+      RECT 8.085000  0.255000 8.465000 0.725000 ;
+      RECT 8.175000  1.625000 8.425000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
index 50d88fe..8a8d6fc 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
@@ -98,6 +98,8 @@
         RECT 2.905000 -0.085000 3.075000 0.085000 ;
         RECT 3.365000 -0.085000 3.535000 0.085000 ;
         RECT 3.825000 -0.085000 3.995000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -120,6 +122,8 @@
         RECT 2.905000 2.635000 3.075000 2.805000 ;
         RECT 3.365000 2.635000 3.535000 2.805000 ;
         RECT 3.825000 2.635000 3.995000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
index e3fdb9c..27b808e 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
@@ -102,6 +102,8 @@
         RECT 3.365000 -0.085000 3.535000 0.085000 ;
         RECT 3.825000 -0.085000 3.995000 0.085000 ;
         RECT 4.285000 -0.085000 4.455000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -126,6 +128,8 @@
         RECT 3.365000 2.635000 3.535000 2.805000 ;
         RECT 3.825000 2.635000 3.995000 2.805000 ;
         RECT 4.285000 2.635000 4.455000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
diff --git a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
index fc11c65..1bd3aa4 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
@@ -97,33 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.895000 ;
-        RECT 2.055000  0.085000 2.225000 0.555000 ;
-        RECT 2.995000  0.085000 3.685000 0.555000 ;
-        RECT 4.455000  0.085000 4.625000 0.555000 ;
-        RECT 5.395000  0.085000 5.565000 0.895000 ;
-        RECT 6.335000  0.085000 6.505000 0.555000 ;
-        RECT 7.275000  0.085000 7.445000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -132,71 +105,94 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.605000 2.125000 0.855000 2.635000 ;
-        RECT 1.545000 2.125000 1.795000 2.635000 ;
-        RECT 3.475000 2.135000 3.725000 2.635000 ;
-        RECT 5.355000 1.795000 5.605000 2.635000 ;
-        RECT 6.295000 2.165000 6.545000 2.635000 ;
-        RECT 7.235000 1.825000 7.485000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 1.785000 2.265000 1.955000 ;
-      RECT 0.135000 1.955000 0.385000 2.465000 ;
-      RECT 0.515000 0.255000 1.835000 0.475000 ;
-      RECT 0.515000 0.475000 0.815000 0.905000 ;
-      RECT 0.985000 0.645000 1.370000 0.735000 ;
-      RECT 0.985000 0.735000 2.775000 0.905000 ;
-      RECT 1.075000 1.955000 1.325000 2.465000 ;
-      RECT 2.015000 1.955000 2.265000 2.295000 ;
-      RECT 2.015000 2.295000 3.205000 2.465000 ;
-      RECT 2.055000 1.455000 2.265000 1.785000 ;
-      RECT 2.395000 0.255000 2.775000 0.735000 ;
-      RECT 2.485000 0.905000 2.695000 1.415000 ;
-      RECT 2.485000 1.415000 2.870000 1.965000 ;
-      RECT 2.485000 1.965000 2.735000 2.125000 ;
-      RECT 2.865000 1.075000 3.445000 1.245000 ;
-      RECT 2.955000 2.135000 3.205000 2.295000 ;
-      RECT 3.255000 0.725000 5.175000 0.905000 ;
-      RECT 3.255000 0.905000 3.445000 1.075000 ;
-      RECT 3.255000 1.245000 3.445000 1.495000 ;
-      RECT 3.255000 1.495000 3.605000 1.665000 ;
-      RECT 3.435000 1.665000 3.605000 1.785000 ;
-      RECT 3.435000 1.785000 4.665000 1.965000 ;
-      RECT 3.855000 0.255000 4.235000 0.725000 ;
-      RECT 3.945000 2.135000 4.195000 2.295000 ;
-      RECT 3.945000 2.295000 5.135000 2.465000 ;
-      RECT 4.415000 1.965000 4.665000 2.125000 ;
-      RECT 4.795000 0.255000 5.175000 0.725000 ;
-      RECT 4.885000 1.785000 5.135000 2.295000 ;
-      RECT 5.635000 1.075000 7.090000 1.245000 ;
-      RECT 5.635000 1.245000 6.010000 1.615000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.135000  1.785000 2.265000 1.955000 ;
+      RECT 0.135000  1.955000 0.385000 2.465000 ;
+      RECT 0.175000  0.085000 0.345000 0.895000 ;
+      RECT 0.515000  0.255000 1.835000 0.475000 ;
+      RECT 0.515000  0.475000 0.815000 0.905000 ;
+      RECT 0.605000  2.125000 0.855000 2.635000 ;
+      RECT 0.985000  0.645000 1.370000 0.735000 ;
+      RECT 0.985000  0.735000 2.775000 0.905000 ;
+      RECT 1.075000  1.955000 1.325000 2.465000 ;
+      RECT 1.545000  2.125000 1.795000 2.635000 ;
+      RECT 2.015000  1.955000 2.265000 2.295000 ;
+      RECT 2.015000  2.295000 3.205000 2.465000 ;
+      RECT 2.055000  0.085000 2.225000 0.555000 ;
+      RECT 2.055000  1.455000 2.265000 1.785000 ;
+      RECT 2.395000  0.255000 2.775000 0.735000 ;
+      RECT 2.485000  0.905000 2.695000 1.415000 ;
+      RECT 2.485000  1.415000 2.870000 1.965000 ;
+      RECT 2.485000  1.965000 2.735000 2.125000 ;
+      RECT 2.865000  1.075000 3.445000 1.245000 ;
+      RECT 2.955000  2.135000 3.205000 2.295000 ;
+      RECT 2.995000  0.085000 3.685000 0.555000 ;
+      RECT 3.255000  0.725000 5.175000 0.905000 ;
+      RECT 3.255000  0.905000 3.445000 1.075000 ;
+      RECT 3.255000  1.245000 3.445000 1.495000 ;
+      RECT 3.255000  1.495000 3.605000 1.665000 ;
+      RECT 3.435000  1.665000 3.605000 1.785000 ;
+      RECT 3.435000  1.785000 4.665000 1.965000 ;
+      RECT 3.475000  2.135000 3.725000 2.635000 ;
+      RECT 3.855000  0.255000 4.235000 0.725000 ;
+      RECT 3.945000  2.135000 4.195000 2.295000 ;
+      RECT 3.945000  2.295000 5.135000 2.465000 ;
+      RECT 4.415000  1.965000 4.665000 2.125000 ;
+      RECT 4.455000  0.085000 4.625000 0.555000 ;
+      RECT 4.795000  0.255000 5.175000 0.725000 ;
+      RECT 4.885000  1.785000 5.135000 2.295000 ;
+      RECT 5.355000  1.795000 5.605000 2.635000 ;
+      RECT 5.395000  0.085000 5.565000 0.895000 ;
+      RECT 5.635000  1.075000 7.090000 1.245000 ;
+      RECT 5.635000  1.245000 6.010000 1.615000 ;
+      RECT 6.295000  2.165000 6.545000 2.635000 ;
+      RECT 6.335000  0.085000 6.505000 0.555000 ;
+      RECT 7.235000  1.825000 7.485000 2.635000 ;
+      RECT 7.275000  0.085000 7.445000 0.555000 ;
     LAYER mcon ;
-      RECT 2.700000 1.445000 2.870000 1.615000 ;
-      RECT 5.730000 1.445000 5.900000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.700000  1.445000 2.870000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 5.730000  1.445000 5.900000 1.615000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
     LAYER met1 ;
       RECT 2.640000 1.415000 2.980000 1.460000 ;
       RECT 2.640000 1.460000 5.960000 1.600000 ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
index 2cbab16..96a764e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
@@ -101,6 +101,8 @@
         RECT 2.445000 -0.085000 2.615000 0.085000 ;
         RECT 2.905000 -0.085000 3.075000 0.085000 ;
         RECT 3.365000 -0.085000 3.535000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -122,6 +124,8 @@
         RECT 2.445000 2.635000 2.615000 2.805000 ;
         RECT 2.905000 2.635000 3.075000 2.805000 ;
         RECT 3.365000 2.635000 3.535000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
index 248cd2b..9b932c0 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
@@ -88,27 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.895000 ;
-        RECT 2.055000  0.085000 2.225000 0.555000 ;
-        RECT 2.995000  0.085000 3.685000 0.555000 ;
-        RECT 4.455000  0.085000 4.625000 0.555000 ;
-        RECT 5.395000  0.085000 5.565000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -117,52 +96,70 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.605000 2.135000 0.855000 2.635000 ;
-        RECT 1.545000 2.135000 1.795000 2.635000 ;
-        RECT 3.945000 2.135000 4.195000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.135000 1.785000 2.265000 1.955000 ;
-      RECT 0.135000 1.955000 0.385000 2.465000 ;
-      RECT 0.515000 0.255000 1.835000 0.475000 ;
-      RECT 0.515000 0.475000 0.815000 0.895000 ;
-      RECT 1.075000 1.955000 1.325000 2.465000 ;
-      RECT 2.015000 1.955000 2.265000 2.295000 ;
-      RECT 2.015000 2.295000 3.205000 2.465000 ;
-      RECT 2.955000 1.795000 3.205000 2.295000 ;
-      RECT 2.995000 0.995000 3.285000 1.325000 ;
-      RECT 3.115000 0.725000 5.175000 0.905000 ;
-      RECT 3.115000 0.905000 3.285000 0.995000 ;
-      RECT 3.115000 1.325000 3.285000 1.445000 ;
-      RECT 3.115000 1.445000 5.135000 1.615000 ;
-      RECT 3.475000 1.785000 4.665000 1.965000 ;
-      RECT 3.475000 1.965000 3.725000 2.465000 ;
-      RECT 3.855000 0.255000 4.235000 0.725000 ;
-      RECT 4.415000 1.965000 4.665000 2.295000 ;
-      RECT 4.415000 2.295000 5.605000 2.465000 ;
-      RECT 4.795000 0.255000 5.175000 0.725000 ;
-      RECT 4.885000 1.615000 5.135000 2.125000 ;
-      RECT 5.355000 1.455000 5.605000 2.295000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.135000  1.785000 2.265000 1.955000 ;
+      RECT 0.135000  1.955000 0.385000 2.465000 ;
+      RECT 0.175000  0.085000 0.345000 0.895000 ;
+      RECT 0.515000  0.255000 1.835000 0.475000 ;
+      RECT 0.515000  0.475000 0.815000 0.895000 ;
+      RECT 0.605000  2.135000 0.855000 2.635000 ;
+      RECT 1.075000  1.955000 1.325000 2.465000 ;
+      RECT 1.545000  2.135000 1.795000 2.635000 ;
+      RECT 2.015000  1.955000 2.265000 2.295000 ;
+      RECT 2.015000  2.295000 3.205000 2.465000 ;
+      RECT 2.055000  0.085000 2.225000 0.555000 ;
+      RECT 2.955000  1.795000 3.205000 2.295000 ;
+      RECT 2.995000  0.085000 3.685000 0.555000 ;
+      RECT 2.995000  0.995000 3.285000 1.325000 ;
+      RECT 3.115000  0.725000 5.175000 0.905000 ;
+      RECT 3.115000  0.905000 3.285000 0.995000 ;
+      RECT 3.115000  1.325000 3.285000 1.445000 ;
+      RECT 3.115000  1.445000 5.135000 1.615000 ;
+      RECT 3.475000  1.785000 4.665000 1.965000 ;
+      RECT 3.475000  1.965000 3.725000 2.465000 ;
+      RECT 3.855000  0.255000 4.235000 0.725000 ;
+      RECT 3.945000  2.135000 4.195000 2.635000 ;
+      RECT 4.415000  1.965000 4.665000 2.295000 ;
+      RECT 4.415000  2.295000 5.605000 2.465000 ;
+      RECT 4.455000  0.085000 4.625000 0.555000 ;
+      RECT 4.795000  0.255000 5.175000 0.725000 ;
+      RECT 4.885000  1.615000 5.135000 2.125000 ;
+      RECT 5.355000  1.455000 5.605000 2.295000 ;
+      RECT 5.395000  0.085000 5.565000 0.905000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
index 79533a0..a9f2a29 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
@@ -93,41 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 10.580000 0.085000 ;
-        RECT  0.175000  0.085000  0.345000 0.895000 ;
-        RECT  1.115000  0.085000  1.285000 0.555000 ;
-        RECT  3.935000  0.085000  4.105000 0.555000 ;
-        RECT  4.875000  0.085000  5.045000 0.555000 ;
-        RECT  5.815000  0.085000  6.505000 0.555000 ;
-        RECT  7.275000  0.085000  7.445000 0.555000 ;
-        RECT  8.215000  0.085000  8.385000 0.555000 ;
-        RECT  9.155000  0.085000  9.325000 0.555000 ;
-        RECT 10.095000  0.085000 10.265000 0.555000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
@@ -136,78 +101,110 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.580000 2.805000 ;
-        RECT 0.645000 1.795000  0.855000 2.635000 ;
-        RECT 1.545000 2.135000  1.795000 2.635000 ;
-        RECT 2.485000 2.135000  2.735000 2.635000 ;
-        RECT 3.425000 2.135000  3.675000 2.635000 ;
-        RECT 6.805000 1.795000  7.015000 2.635000 ;
-        RECT 7.705000 1.795000  7.955000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.455000  1.315000 1.625000 ;
-      RECT  0.085000 1.625000  0.425000 2.465000 ;
-      RECT  0.515000 0.255000  0.895000 0.725000 ;
-      RECT  0.515000 0.725000  1.755000 0.905000 ;
-      RECT  1.075000 1.625000  1.315000 1.795000 ;
-      RECT  1.075000 1.795000  4.145000 1.965000 ;
-      RECT  1.075000 1.965000  1.315000 2.465000 ;
-      RECT  1.455000 0.255000  3.715000 0.475000 ;
-      RECT  1.455000 0.475000  1.755000 0.725000 ;
-      RECT  2.015000 1.965000  2.265000 2.465000 ;
-      RECT  2.955000 1.965000  3.205000 2.465000 ;
-      RECT  3.895000 1.965000  4.145000 2.295000 ;
-      RECT  3.895000 2.295000  6.065000 2.465000 ;
-      RECT  4.535000 1.075000  6.325000 1.245000 ;
-      RECT  4.835000 1.795000  5.075000 2.295000 ;
-      RECT  5.685000 1.455000  6.065000 2.295000 ;
-      RECT  6.155000 0.735000 10.460000 0.905000 ;
-      RECT  6.155000 0.905000  6.325000 1.075000 ;
-      RECT  6.255000 1.455000  8.425000 1.625000 ;
-      RECT  6.255000 1.625000  6.585000 2.465000 ;
-      RECT  6.675000 0.255000  7.055000 0.725000 ;
-      RECT  6.675000 0.725000  9.875000 0.735000 ;
-      RECT  7.240000 1.625000  7.480000 2.465000 ;
-      RECT  7.615000 0.255000  7.995000 0.725000 ;
-      RECT  8.175000 1.625000  8.425000 2.295000 ;
-      RECT  8.175000 2.295000 10.310000 2.465000 ;
-      RECT  8.555000 0.255000  8.935000 0.725000 ;
-      RECT  8.645000 1.455000 10.460000 1.625000 ;
-      RECT  8.645000 1.625000  8.895000 2.125000 ;
-      RECT  9.115000 1.795000  9.365000 2.295000 ;
-      RECT  9.495000 0.255000  9.875000 0.725000 ;
-      RECT  9.585000 1.625000  9.835000 2.125000 ;
-      RECT 10.060000 1.795000 10.310000 2.295000 ;
-      RECT 10.135000 0.905000 10.460000 1.455000 ;
+      RECT  0.000000 -0.085000 10.580000 0.085000 ;
+      RECT  0.000000  2.635000 10.580000 2.805000 ;
+      RECT  0.085000  1.455000  1.315000 1.625000 ;
+      RECT  0.085000  1.625000  0.425000 2.465000 ;
+      RECT  0.175000  0.085000  0.345000 0.895000 ;
+      RECT  0.515000  0.255000  0.895000 0.725000 ;
+      RECT  0.515000  0.725000  1.755000 0.905000 ;
+      RECT  0.645000  1.795000  0.855000 2.635000 ;
+      RECT  1.075000  1.625000  1.315000 1.795000 ;
+      RECT  1.075000  1.795000  4.145000 1.965000 ;
+      RECT  1.075000  1.965000  1.315000 2.465000 ;
+      RECT  1.115000  0.085000  1.285000 0.555000 ;
+      RECT  1.455000  0.255000  3.715000 0.475000 ;
+      RECT  1.455000  0.475000  1.755000 0.725000 ;
+      RECT  1.545000  2.135000  1.795000 2.635000 ;
+      RECT  2.015000  1.965000  2.265000 2.465000 ;
+      RECT  2.485000  2.135000  2.735000 2.635000 ;
+      RECT  2.955000  1.965000  3.205000 2.465000 ;
+      RECT  3.425000  2.135000  3.675000 2.635000 ;
+      RECT  3.895000  1.965000  4.145000 2.295000 ;
+      RECT  3.895000  2.295000  6.065000 2.465000 ;
+      RECT  3.935000  0.085000  4.105000 0.555000 ;
+      RECT  4.535000  1.075000  6.325000 1.245000 ;
+      RECT  4.835000  1.795000  5.075000 2.295000 ;
+      RECT  4.875000  0.085000  5.045000 0.555000 ;
+      RECT  5.685000  1.455000  6.065000 2.295000 ;
+      RECT  5.815000  0.085000  6.505000 0.555000 ;
+      RECT  6.155000  0.735000 10.460000 0.905000 ;
+      RECT  6.155000  0.905000  6.325000 1.075000 ;
+      RECT  6.255000  1.455000  8.425000 1.625000 ;
+      RECT  6.255000  1.625000  6.585000 2.465000 ;
+      RECT  6.675000  0.255000  7.055000 0.725000 ;
+      RECT  6.675000  0.725000  9.875000 0.735000 ;
+      RECT  6.805000  1.795000  7.015000 2.635000 ;
+      RECT  7.240000  1.625000  7.480000 2.465000 ;
+      RECT  7.275000  0.085000  7.445000 0.555000 ;
+      RECT  7.615000  0.255000  7.995000 0.725000 ;
+      RECT  7.705000  1.795000  7.955000 2.635000 ;
+      RECT  8.175000  1.625000  8.425000 2.295000 ;
+      RECT  8.175000  2.295000 10.310000 2.465000 ;
+      RECT  8.215000  0.085000  8.385000 0.555000 ;
+      RECT  8.555000  0.255000  8.935000 0.725000 ;
+      RECT  8.645000  1.455000 10.460000 1.625000 ;
+      RECT  8.645000  1.625000  8.895000 2.125000 ;
+      RECT  9.115000  1.795000  9.365000 2.295000 ;
+      RECT  9.155000  0.085000  9.325000 0.555000 ;
+      RECT  9.495000  0.255000  9.875000 0.725000 ;
+      RECT  9.585000  1.625000  9.835000 2.125000 ;
+      RECT 10.060000  1.795000 10.310000 2.295000 ;
+      RECT 10.095000  0.085000 10.265000 0.555000 ;
+      RECT 10.135000  0.905000 10.460000 1.455000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
index 4f503dd..effda79 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
@@ -86,18 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.605000  0.085000 0.935000 0.485000 ;
-        RECT 2.725000  0.085000 3.055000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -106,33 +94,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.645000 1.495000 0.895000 2.635000 ;
-        RECT 1.665000 2.165000 1.995000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.455000 0.995000 0.815000 1.325000 ;
-      RECT 0.645000 0.655000 3.085000 0.825000 ;
-      RECT 0.645000 0.825000 0.815000 0.995000 ;
-      RECT 1.085000 1.825000 2.525000 1.995000 ;
-      RECT 1.085000 1.995000 1.385000 2.415000 ;
-      RECT 2.125000 0.315000 2.505000 0.655000 ;
-      RECT 2.275000 1.995000 2.525000 2.415000 ;
-      RECT 2.755000 1.825000 3.085000 2.425000 ;
-      RECT 2.915000 0.825000 3.085000 1.825000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.455000  0.995000 0.815000 1.325000 ;
+      RECT 0.605000  0.085000 0.935000 0.485000 ;
+      RECT 0.645000  0.655000 3.085000 0.825000 ;
+      RECT 0.645000  0.825000 0.815000 0.995000 ;
+      RECT 0.645000  1.495000 0.895000 2.635000 ;
+      RECT 1.085000  1.825000 2.525000 1.995000 ;
+      RECT 1.085000  1.995000 1.385000 2.415000 ;
+      RECT 1.665000  2.165000 1.995000 2.635000 ;
+      RECT 2.125000  0.315000 2.505000 0.655000 ;
+      RECT 2.275000  1.995000 2.525000 2.415000 ;
+      RECT 2.725000  0.085000 3.055000 0.485000 ;
+      RECT 2.755000  1.825000 3.085000 2.425000 ;
+      RECT 2.915000  0.825000 3.085000 1.825000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
index f955834..08603fc 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
@@ -88,20 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.465000 ;
-        RECT 1.005000  0.085000 1.385000 0.465000 ;
-        RECT 3.175000  0.085000 3.465000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -110,34 +96,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.135000 2.175000 0.385000 2.635000 ;
-        RECT 0.985000 1.835000 1.285000 2.635000 ;
-        RECT 2.015000 2.175000 2.345000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 1.075000 0.845000 1.245000 ;
-      RECT 0.515000 1.245000 0.685000 1.495000 ;
-      RECT 0.515000 1.495000 3.345000 1.665000 ;
-      RECT 1.455000 1.835000 2.895000 2.005000 ;
-      RECT 1.455000 2.005000 1.755000 2.425000 ;
-      RECT 2.585000 2.005000 2.895000 2.425000 ;
-      RECT 2.785000 0.255000 2.955000 1.495000 ;
-      RECT 3.175000 1.665000 3.345000 2.465000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.090000  0.085000 0.425000 0.465000 ;
+      RECT 0.135000  2.175000 0.385000 2.635000 ;
+      RECT 0.515000  1.075000 0.845000 1.245000 ;
+      RECT 0.515000  1.245000 0.685000 1.495000 ;
+      RECT 0.515000  1.495000 3.345000 1.665000 ;
+      RECT 0.985000  1.835000 1.285000 2.635000 ;
+      RECT 1.005000  0.085000 1.385000 0.465000 ;
+      RECT 1.455000  1.835000 2.895000 2.005000 ;
+      RECT 1.455000  2.005000 1.755000 2.425000 ;
+      RECT 2.015000  2.175000 2.345000 2.635000 ;
+      RECT 2.585000  2.005000 2.895000 2.425000 ;
+      RECT 2.785000  0.255000 2.955000 1.495000 ;
+      RECT 3.175000  0.085000 3.465000 0.565000 ;
+      RECT 3.175000  1.665000 3.345000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
index 7dab22e..92d2ad8 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
@@ -93,29 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.905000 ;
-        RECT 2.950000  0.085000 3.285000 0.530000 ;
-        RECT 4.135000  0.085000 4.665000 0.565000 ;
-        RECT 5.385000  0.085000 5.765000 0.485000 ;
-        RECT 6.325000  0.085000 6.705000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -124,53 +101,73 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.515000 2.125000 0.895000 2.635000 ;
-        RECT 1.455000 2.125000 1.835000 2.635000 ;
-        RECT 2.395000 2.125000 2.775000 2.635000 ;
-        RECT 4.495000 2.125000 4.825000 2.635000 ;
-        RECT 5.385000 2.125000 5.765000 2.635000 ;
-        RECT 6.325000 2.125000 6.705000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 1.785000 3.285000 1.955000 ;
-      RECT 0.175000 1.955000 0.345000 2.465000 ;
-      RECT 1.115000 1.955000 1.285000 2.465000 ;
-      RECT 1.455000 0.395000 2.770000 0.565000 ;
-      RECT 2.055000 1.955000 2.225000 2.465000 ;
-      RECT 2.600000 0.565000 2.770000 0.700000 ;
-      RECT 2.600000 0.700000 3.835000 0.805000 ;
-      RECT 2.600000 0.805000 3.695000 0.870000 ;
-      RECT 3.115000 1.955000 3.285000 2.295000 ;
-      RECT 3.115000 2.295000 4.225000 2.465000 ;
-      RECT 3.455000 0.295000 3.835000 0.700000 ;
-      RECT 3.455000 0.870000 3.695000 1.455000 ;
-      RECT 3.455000 1.455000 4.820000 1.625000 ;
-      RECT 3.455000 1.625000 3.835000 2.115000 ;
-      RECT 4.055000 1.795000 4.225000 2.295000 ;
-      RECT 4.650000 0.995000 6.355000 1.325000 ;
-      RECT 4.650000 1.325000 4.820000 1.455000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.175000  0.085000 0.345000 0.905000 ;
+      RECT 0.175000  1.785000 3.285000 1.955000 ;
+      RECT 0.175000  1.955000 0.345000 2.465000 ;
+      RECT 0.515000  2.125000 0.895000 2.635000 ;
+      RECT 1.115000  1.955000 1.285000 2.465000 ;
+      RECT 1.455000  0.395000 2.770000 0.565000 ;
+      RECT 1.455000  2.125000 1.835000 2.635000 ;
+      RECT 2.055000  1.955000 2.225000 2.465000 ;
+      RECT 2.395000  2.125000 2.775000 2.635000 ;
+      RECT 2.600000  0.565000 2.770000 0.700000 ;
+      RECT 2.600000  0.700000 3.835000 0.805000 ;
+      RECT 2.600000  0.805000 3.695000 0.870000 ;
+      RECT 2.950000  0.085000 3.285000 0.530000 ;
+      RECT 3.115000  1.955000 3.285000 2.295000 ;
+      RECT 3.115000  2.295000 4.225000 2.465000 ;
+      RECT 3.455000  0.295000 3.835000 0.700000 ;
+      RECT 3.455000  0.870000 3.695000 1.455000 ;
+      RECT 3.455000  1.455000 4.820000 1.625000 ;
+      RECT 3.455000  1.625000 3.835000 2.115000 ;
+      RECT 4.055000  1.795000 4.225000 2.295000 ;
+      RECT 4.135000  0.085000 4.665000 0.565000 ;
+      RECT 4.495000  2.125000 4.825000 2.635000 ;
+      RECT 4.650000  0.995000 6.355000 1.325000 ;
+      RECT 4.650000  1.325000 4.820000 1.455000 ;
+      RECT 5.385000  0.085000 5.765000 0.485000 ;
+      RECT 5.385000  2.125000 5.765000 2.635000 ;
+      RECT 6.325000  0.085000 6.705000 0.485000 ;
+      RECT 6.325000  2.125000 6.705000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
index 041b940..99589a0 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
@@ -86,17 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.090000  0.085000 0.430000 0.815000 ;
-        RECT 2.325000  0.085000 2.585000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -105,26 +94,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.090000 1.495000 0.420000 2.635000 ;
-        RECT 1.035000 2.175000 1.365000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.640000 1.835000 1.815000 2.005000 ;
-      RECT 0.640000 2.005000 0.815000 2.415000 ;
-      RECT 1.620000 2.005000 1.815000 2.415000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.090000  0.085000 0.430000 0.815000 ;
+      RECT 0.090000  1.495000 0.420000 2.635000 ;
+      RECT 0.640000  1.835000 1.815000 2.005000 ;
+      RECT 0.640000  2.005000 0.815000 2.415000 ;
+      RECT 1.035000  2.175000 1.365000 2.635000 ;
+      RECT 1.620000  2.005000 1.815000 2.415000 ;
+      RECT 2.325000  0.085000 2.585000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
index b2723ee..4e5097d 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
@@ -90,22 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.465000 ;
-        RECT 4.025000  0.085000 4.405000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -114,38 +98,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.515000 2.125000 0.895000 2.635000 ;
-        RECT 1.455000 2.125000 1.835000 2.635000 ;
-        RECT 2.560000 2.125000 3.280000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.655000 2.305000 0.825000 ;
-      RECT 0.175000 1.785000 3.855000 1.955000 ;
-      RECT 0.175000 1.955000 0.345000 2.465000 ;
-      RECT 1.115000 1.955000 1.285000 2.465000 ;
-      RECT 1.455000 0.295000 3.375000 0.465000 ;
-      RECT 2.055000 1.955000 2.225000 2.465000 ;
-      RECT 3.685000 1.955000 3.855000 2.295000 ;
-      RECT 3.685000 2.295000 4.875000 2.465000 ;
-      RECT 4.705000 1.795000 4.875000 2.295000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.095000  0.655000 2.305000 0.825000 ;
+      RECT 0.175000  1.785000 3.855000 1.955000 ;
+      RECT 0.175000  1.955000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.895000 0.465000 ;
+      RECT 0.515000  2.125000 0.895000 2.635000 ;
+      RECT 1.115000  1.955000 1.285000 2.465000 ;
+      RECT 1.455000  0.295000 3.375000 0.465000 ;
+      RECT 1.455000  2.125000 1.835000 2.635000 ;
+      RECT 2.055000  1.955000 2.225000 2.465000 ;
+      RECT 2.560000  2.125000 3.280000 2.635000 ;
+      RECT 3.685000  1.955000 3.855000 2.295000 ;
+      RECT 3.685000  2.295000 4.875000 2.465000 ;
+      RECT 4.025000  0.085000 4.405000 0.465000 ;
+      RECT 4.705000  1.795000 4.875000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
index d3245ae..1bae32a 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
@@ -87,32 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.465000 ;
-        RECT 1.455000  0.085000 1.835000 0.465000 ;
-        RECT 6.725000  0.085000 7.105000 0.465000 ;
-        RECT 7.665000  0.085000 8.045000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -121,56 +95,79 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.515000 1.915000 0.895000 2.635000 ;
-        RECT 1.455000 1.915000 1.835000 2.635000 ;
-        RECT 2.395000 1.915000 2.775000 2.635000 ;
-        RECT 3.335000 1.915000 3.715000 2.635000 ;
-        RECT 4.295000 1.915000 4.675000 2.635000 ;
-        RECT 5.235000 2.255000 5.615000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 4.185000 0.805000 ;
-      RECT 0.175000 1.495000 6.005000 1.665000 ;
-      RECT 0.175000 1.665000 0.345000 2.465000 ;
-      RECT 1.115000 0.255000 1.285000 0.635000 ;
-      RECT 1.115000 1.665000 1.285000 2.465000 ;
-      RECT 2.055000 0.255000 2.225000 0.635000 ;
-      RECT 2.055000 1.665000 2.225000 2.465000 ;
-      RECT 2.395000 0.295000 6.165000 0.465000 ;
-      RECT 2.995000 1.665000 3.165000 2.465000 ;
-      RECT 3.935000 1.665000 4.105000 2.465000 ;
-      RECT 4.895000 1.665000 5.065000 2.465000 ;
-      RECT 5.835000 1.665000 6.005000 2.255000 ;
-      RECT 5.835000 2.255000 8.515000 2.425000 ;
-      RECT 5.835000 2.425000 6.005000 2.465000 ;
-      RECT 8.265000 1.495000 8.515000 2.255000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.175000  0.255000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 4.185000 0.805000 ;
+      RECT 0.175000  1.495000 6.005000 1.665000 ;
+      RECT 0.175000  1.665000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.895000 0.465000 ;
+      RECT 0.515000  1.915000 0.895000 2.635000 ;
+      RECT 1.115000  0.255000 1.285000 0.635000 ;
+      RECT 1.115000  1.665000 1.285000 2.465000 ;
+      RECT 1.455000  0.085000 1.835000 0.465000 ;
+      RECT 1.455000  1.915000 1.835000 2.635000 ;
+      RECT 2.055000  0.255000 2.225000 0.635000 ;
+      RECT 2.055000  1.665000 2.225000 2.465000 ;
+      RECT 2.395000  0.295000 6.165000 0.465000 ;
+      RECT 2.395000  1.915000 2.775000 2.635000 ;
+      RECT 2.995000  1.665000 3.165000 2.465000 ;
+      RECT 3.335000  1.915000 3.715000 2.635000 ;
+      RECT 3.935000  1.665000 4.105000 2.465000 ;
+      RECT 4.295000  1.915000 4.675000 2.635000 ;
+      RECT 4.895000  1.665000 5.065000 2.465000 ;
+      RECT 5.235000  2.255000 5.615000 2.635000 ;
+      RECT 5.835000  1.665000 6.005000 2.255000 ;
+      RECT 5.835000  2.255000 8.515000 2.425000 ;
+      RECT 5.835000  2.425000 6.005000 2.465000 ;
+      RECT 6.725000  0.085000 7.105000 0.465000 ;
+      RECT 7.665000  0.085000 8.045000 0.465000 ;
+      RECT 8.265000  1.495000 8.515000 2.255000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
index d195dd2..4074f75 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
@@ -96,20 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.595000  0.085000 0.975000 0.485000 ;
-        RECT 3.505000  0.085000 3.885000 0.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -118,39 +104,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.725000 1.835000 1.055000 2.635000 ;
-        RECT 1.940000 2.215000 2.270000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.570000 0.995000 0.845000 1.325000 ;
-      RECT 0.675000 0.655000 1.315000 0.825000 ;
-      RECT 0.675000 0.825000 0.845000 0.995000 ;
-      RECT 0.675000 1.325000 0.845000 1.495000 ;
-      RECT 0.675000 1.495000 3.325000 1.665000 ;
-      RECT 1.145000 0.315000 2.910000 0.485000 ;
-      RECT 1.145000 0.485000 1.315000 0.655000 ;
-      RECT 1.350000 1.875000 2.875000 2.045000 ;
-      RECT 1.350000 2.045000 1.635000 2.465000 ;
-      RECT 2.545000 2.045000 2.875000 2.295000 ;
-      RECT 2.545000 2.295000 3.895000 2.465000 ;
-      RECT 3.155000 1.665000 3.325000 2.125000 ;
-      RECT 3.635000 1.795000 3.895000 2.295000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.570000  0.995000 0.845000 1.325000 ;
+      RECT 0.595000  0.085000 0.975000 0.485000 ;
+      RECT 0.675000  0.655000 1.315000 0.825000 ;
+      RECT 0.675000  0.825000 0.845000 0.995000 ;
+      RECT 0.675000  1.325000 0.845000 1.495000 ;
+      RECT 0.675000  1.495000 3.325000 1.665000 ;
+      RECT 0.725000  1.835000 1.055000 2.635000 ;
+      RECT 1.145000  0.315000 2.910000 0.485000 ;
+      RECT 1.145000  0.485000 1.315000 0.655000 ;
+      RECT 1.350000  1.875000 2.875000 2.045000 ;
+      RECT 1.350000  2.045000 1.635000 2.465000 ;
+      RECT 1.940000  2.215000 2.270000 2.635000 ;
+      RECT 2.545000  2.045000 2.875000 2.295000 ;
+      RECT 2.545000  2.295000 3.895000 2.465000 ;
+      RECT 3.155000  1.665000 3.325000 2.125000 ;
+      RECT 3.505000  0.085000 3.885000 0.805000 ;
+      RECT 3.635000  1.795000 3.895000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
index 8ce6558..9a30ee4 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
@@ -97,22 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.465000 ;
-        RECT 0.985000  0.085000 1.740000 0.445000 ;
-        RECT 4.015000  0.085000 4.400000 0.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -121,40 +105,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.515000 2.125000 0.895000 2.635000 ;
-        RECT 2.915000 2.140000 3.295000 2.635000 ;
-        RECT 4.015000 1.915000 4.400000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 0.995000 0.755000 1.445000 ;
-      RECT 0.535000 1.445000 2.275000 1.615000 ;
-      RECT 1.635000 1.785000 1.805000 2.295000 ;
-      RECT 1.635000 2.295000 2.745000 2.465000 ;
-      RECT 1.800000 0.675000 2.705000 0.845000 ;
-      RECT 1.800000 0.845000 2.040000 1.445000 ;
-      RECT 2.025000 1.615000 2.275000 1.945000 ;
-      RECT 2.025000 1.945000 2.355000 2.115000 ;
-      RECT 2.405000 0.295000 2.705000 0.675000 ;
-      RECT 2.575000 1.795000 3.845000 1.965000 ;
-      RECT 2.575000 1.965000 2.745000 2.295000 ;
-      RECT 3.675000 1.965000 3.845000 2.465000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  0.085000 0.425000 0.465000 ;
+      RECT 0.515000  2.125000 0.895000 2.635000 ;
+      RECT 0.535000  0.995000 0.755000 1.445000 ;
+      RECT 0.535000  1.445000 2.275000 1.615000 ;
+      RECT 0.985000  0.085000 1.740000 0.445000 ;
+      RECT 1.635000  1.785000 1.805000 2.295000 ;
+      RECT 1.635000  2.295000 2.745000 2.465000 ;
+      RECT 1.800000  0.675000 2.705000 0.845000 ;
+      RECT 1.800000  0.845000 2.040000 1.445000 ;
+      RECT 2.025000  1.615000 2.275000 1.945000 ;
+      RECT 2.025000  1.945000 2.355000 2.115000 ;
+      RECT 2.405000  0.295000 2.705000 0.675000 ;
+      RECT 2.575000  1.795000 3.845000 1.965000 ;
+      RECT 2.575000  1.965000 2.745000 2.295000 ;
+      RECT 2.915000  2.140000 3.295000 2.635000 ;
+      RECT 3.675000  1.965000 3.845000 2.465000 ;
+      RECT 4.015000  0.085000 4.400000 0.805000 ;
+      RECT 4.015000  1.915000 4.400000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
index 5766650..abc45af 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
@@ -99,32 +99,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.465000 ;
-        RECT 0.985000  0.085000 1.365000 0.465000 ;
-        RECT 1.925000  0.085000 2.305000 0.465000 ;
-        RECT 2.865000  0.085000 3.245000 0.465000 ;
-        RECT 7.335000  0.085000 7.715000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -133,63 +107,86 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.095000 1.915000 0.425000 2.635000 ;
-        RECT 0.985000 1.915000 1.365000 2.635000 ;
-        RECT 1.925000 1.915000 2.305000 2.635000 ;
-        RECT 2.865000 2.255000 3.245000 2.635000 ;
-        RECT 3.855000 2.255000 4.235000 2.635000 ;
-        RECT 4.795000 2.255000 5.175000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.620000 0.995000 2.170000 1.325000 ;
-      RECT 1.950000 1.325000 2.170000 1.495000 ;
-      RECT 1.950000 1.495000 5.950000 1.665000 ;
-      RECT 2.525000 0.255000 2.695000 0.655000 ;
-      RECT 2.525000 0.655000 4.235000 0.825000 ;
-      RECT 2.525000 1.915000 5.565000 2.085000 ;
-      RECT 2.525000 2.085000 2.695000 2.465000 ;
-      RECT 3.435000 0.295000 5.645000 0.465000 ;
-      RECT 3.515000 2.085000 3.685000 2.465000 ;
-      RECT 4.455000 2.085000 4.625000 2.465000 ;
-      RECT 4.795000 0.635000 6.735000 0.805000 ;
-      RECT 5.395000 2.085000 5.565000 2.255000 ;
-      RECT 5.395000 2.255000 8.185000 2.425000 ;
-      RECT 5.780000 0.805000 5.950000 1.495000 ;
-      RECT 5.780000 1.665000 5.950000 1.905000 ;
-      RECT 5.780000 1.905000 6.510000 1.915000 ;
-      RECT 5.780000 1.915000 7.715000 2.075000 ;
-      RECT 5.930000 0.295000 7.165000 0.465000 ;
-      RECT 6.445000 2.075000 7.715000 2.085000 ;
-      RECT 6.995000 0.255000 7.165000 0.295000 ;
-      RECT 6.995000 0.465000 7.165000 0.645000 ;
-      RECT 6.995000 0.645000 8.105000 0.815000 ;
-      RECT 7.935000 0.255000 8.105000 0.645000 ;
-      RECT 7.935000 1.755000 8.185000 2.255000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.465000 ;
+      RECT 0.095000  1.915000 0.425000 2.635000 ;
+      RECT 0.620000  0.995000 2.170000 1.325000 ;
+      RECT 0.985000  0.085000 1.365000 0.465000 ;
+      RECT 0.985000  1.915000 1.365000 2.635000 ;
+      RECT 1.925000  0.085000 2.305000 0.465000 ;
+      RECT 1.925000  1.915000 2.305000 2.635000 ;
+      RECT 1.950000  1.325000 2.170000 1.495000 ;
+      RECT 1.950000  1.495000 5.950000 1.665000 ;
+      RECT 2.525000  0.255000 2.695000 0.655000 ;
+      RECT 2.525000  0.655000 4.235000 0.825000 ;
+      RECT 2.525000  1.915000 5.565000 2.085000 ;
+      RECT 2.525000  2.085000 2.695000 2.465000 ;
+      RECT 2.865000  0.085000 3.245000 0.465000 ;
+      RECT 2.865000  2.255000 3.245000 2.635000 ;
+      RECT 3.435000  0.295000 5.645000 0.465000 ;
+      RECT 3.515000  2.085000 3.685000 2.465000 ;
+      RECT 3.855000  2.255000 4.235000 2.635000 ;
+      RECT 4.455000  2.085000 4.625000 2.465000 ;
+      RECT 4.795000  0.635000 6.735000 0.805000 ;
+      RECT 4.795000  2.255000 5.175000 2.635000 ;
+      RECT 5.395000  2.085000 5.565000 2.255000 ;
+      RECT 5.395000  2.255000 8.185000 2.425000 ;
+      RECT 5.780000  0.805000 5.950000 1.495000 ;
+      RECT 5.780000  1.665000 5.950000 1.905000 ;
+      RECT 5.780000  1.905000 6.510000 1.915000 ;
+      RECT 5.780000  1.915000 7.715000 2.075000 ;
+      RECT 5.930000  0.295000 7.165000 0.465000 ;
+      RECT 6.445000  2.075000 7.715000 2.085000 ;
+      RECT 6.995000  0.255000 7.165000 0.295000 ;
+      RECT 6.995000  0.465000 7.165000 0.645000 ;
+      RECT 6.995000  0.645000 8.105000 0.815000 ;
+      RECT 7.335000  0.085000 7.715000 0.465000 ;
+      RECT 7.935000  0.255000 8.105000 0.645000 ;
+      RECT 7.935000  1.755000 8.185000 2.255000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
index 80760e1..ef61848 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
@@ -95,18 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.235000 0.085000 ;
-        RECT 0.110000  0.085000 0.440000 0.465000 ;
-        RECT 2.570000  0.085000 2.960000 0.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -115,30 +103,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.705000 2.135000 1.955000 2.635000 ;
-        RECT 2.555000 1.495000 2.945000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.835000 0.345000 2.255000 ;
-      RECT 0.085000 2.255000 1.445000 2.465000 ;
-      RECT 1.195000 1.785000 2.385000 1.955000 ;
-      RECT 1.195000 1.955000 1.445000 2.255000 ;
-      RECT 2.215000 1.745000 2.385000 1.785000 ;
-      RECT 2.215000 1.955000 2.385000 2.465000 ;
+      RECT 0.000000 -0.085000 3.235000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  1.835000 0.345000 2.255000 ;
+      RECT 0.085000  2.255000 1.445000 2.465000 ;
+      RECT 0.110000  0.085000 0.440000 0.465000 ;
+      RECT 1.195000  1.785000 2.385000 1.955000 ;
+      RECT 1.195000  1.955000 1.445000 2.255000 ;
+      RECT 1.705000  2.135000 1.955000 2.635000 ;
+      RECT 2.215000  1.745000 2.385000 1.785000 ;
+      RECT 2.215000  1.955000 2.385000 2.465000 ;
+      RECT 2.555000  1.495000 2.945000 2.635000 ;
+      RECT 2.570000  0.085000 2.960000 0.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
index 5b29a7b..fc49cbd 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
@@ -97,26 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.545000 ;
-        RECT 4.865000  0.085000 5.250000 0.465000 ;
-        RECT 6.095000  0.085000 6.265000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -125,47 +105,64 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 2.445000 2.255000 3.165000 2.635000 ;
-        RECT 3.770000 2.255000 4.525000 2.635000 ;
-        RECT 5.125000 2.255000 5.845000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.295000 0.425000 0.715000 ;
-      RECT 0.095000 0.715000 1.285000 0.885000 ;
-      RECT 0.175000 1.795000 0.345000 2.295000 ;
-      RECT 0.175000 2.295000 2.225000 2.465000 ;
-      RECT 1.035000 0.295000 2.305000 0.465000 ;
-      RECT 1.035000 0.465000 1.285000 0.715000 ;
-      RECT 1.115000 1.795000 1.285000 2.295000 ;
-      RECT 2.055000 1.795000 6.265000 1.965000 ;
-      RECT 2.055000 1.965000 2.225000 2.295000 ;
-      RECT 2.495000 0.295000 4.605000 0.465000 ;
-      RECT 3.415000 1.965000 3.585000 2.465000 ;
-      RECT 3.755000 0.635000 5.800000 0.805000 ;
-      RECT 4.695000 1.965000 4.865000 2.465000 ;
-      RECT 5.420000 0.275000 5.800000 0.635000 ;
-      RECT 6.095000 1.965000 6.265000 2.465000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.095000  0.295000 0.425000 0.715000 ;
+      RECT 0.095000  0.715000 1.285000 0.885000 ;
+      RECT 0.175000  1.795000 0.345000 2.295000 ;
+      RECT 0.175000  2.295000 2.225000 2.465000 ;
+      RECT 0.645000  0.085000 0.815000 0.545000 ;
+      RECT 1.035000  0.295000 2.305000 0.465000 ;
+      RECT 1.035000  0.465000 1.285000 0.715000 ;
+      RECT 1.115000  1.795000 1.285000 2.295000 ;
+      RECT 2.055000  1.795000 6.265000 1.965000 ;
+      RECT 2.055000  1.965000 2.225000 2.295000 ;
+      RECT 2.445000  2.255000 3.165000 2.635000 ;
+      RECT 2.495000  0.295000 4.605000 0.465000 ;
+      RECT 3.415000  1.965000 3.585000 2.465000 ;
+      RECT 3.755000  0.635000 5.800000 0.805000 ;
+      RECT 3.770000  2.255000 4.525000 2.635000 ;
+      RECT 4.695000  1.965000 4.865000 2.465000 ;
+      RECT 4.865000  0.085000 5.250000 0.465000 ;
+      RECT 5.125000  2.255000 5.845000 2.635000 ;
+      RECT 5.420000  0.275000 5.800000 0.635000 ;
+      RECT 6.095000  0.085000 6.265000 0.885000 ;
+      RECT 6.095000  1.965000 6.265000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
index 12659ef..84217da 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
@@ -133,6 +133,8 @@
         RECT  9.805000 -0.085000  9.975000 0.085000 ;
         RECT 10.265000 -0.085000 10.435000 0.085000 ;
         RECT 10.725000 -0.085000 10.895000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
@@ -174,6 +176,8 @@
         RECT  9.805000 2.635000  9.975000 2.805000 ;
         RECT 10.265000 2.635000 10.435000 2.805000 ;
         RECT 10.725000 2.635000 10.895000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.500000 2.960000 ;
     END
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
index 1f55007..bc4d265 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
@@ -68,15 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 1.105000  0.085000 1.355000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -85,29 +76,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.125000 1.965000 0.405000 2.635000 ;
-        RECT 1.095000 1.915000 1.425000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.125000 0.355000 0.455000 0.715000 ;
-      RECT 0.125000 0.715000 1.575000 0.905000 ;
-      RECT 0.625000 1.575000 1.575000 1.745000 ;
-      RECT 0.625000 1.745000 0.925000 2.295000 ;
-      RECT 1.405000 0.905000 1.575000 0.995000 ;
-      RECT 1.405000 0.995000 1.660000 1.325000 ;
-      RECT 1.405000 1.325000 1.575000 1.575000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.125000  0.355000 0.455000 0.715000 ;
+      RECT 0.125000  0.715000 1.575000 0.905000 ;
+      RECT 0.125000  1.965000 0.405000 2.635000 ;
+      RECT 0.625000  1.575000 1.575000 1.745000 ;
+      RECT 0.625000  1.745000 0.925000 2.295000 ;
+      RECT 1.095000  1.915000 1.425000 2.635000 ;
+      RECT 1.105000  0.085000 1.355000 0.545000 ;
+      RECT 1.405000  0.905000 1.575000 0.995000 ;
+      RECT 1.405000  0.995000 1.660000 1.325000 ;
+      RECT 1.405000  1.325000 1.575000 1.575000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
index 53dbad9..14b1ef1 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
@@ -68,17 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 1.175000  0.085000 1.425000 0.545000 ;
-        RECT 2.375000  0.085000 2.665000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -87,31 +76,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.115000 1.965000 0.395000 2.635000 ;
-        RECT 1.165000 1.915000 1.505000 2.635000 ;
-        RECT 2.375000 1.495000 2.665000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 0.355000 0.445000 0.715000 ;
-      RECT 0.115000 0.715000 1.605000 0.905000 ;
-      RECT 0.615000 1.575000 1.605000 1.745000 ;
-      RECT 0.615000 1.745000 0.915000 2.295000 ;
-      RECT 1.435000 0.905000 1.605000 0.995000 ;
-      RECT 1.435000 0.995000 1.765000 1.325000 ;
-      RECT 1.435000 1.325000 1.605000 1.575000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.115000  0.355000 0.445000 0.715000 ;
+      RECT 0.115000  0.715000 1.605000 0.905000 ;
+      RECT 0.115000  1.965000 0.395000 2.635000 ;
+      RECT 0.615000  1.575000 1.605000 1.745000 ;
+      RECT 0.615000  1.745000 0.915000 2.295000 ;
+      RECT 1.165000  1.915000 1.505000 2.635000 ;
+      RECT 1.175000  0.085000 1.425000 0.545000 ;
+      RECT 1.435000  0.905000 1.605000 0.995000 ;
+      RECT 1.435000  0.995000 1.765000 1.325000 ;
+      RECT 1.435000  1.325000 1.605000 1.575000 ;
+      RECT 2.375000  0.085000 2.665000 0.885000 ;
+      RECT 2.375000  1.495000 2.665000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
index e2b5581..081cf6a 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
@@ -72,20 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 1.055000  0.085000 1.385000 0.445000 ;
-        RECT 2.040000  0.085000 2.420000 0.445000 ;
-        RECT 3.000000  0.085000 3.380000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -94,34 +80,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.095000 1.880000 0.425000 2.635000 ;
-        RECT 1.090000 1.935000 1.420000 2.635000 ;
-        RECT 2.040000 1.935000 2.420000 2.635000 ;
-        RECT 3.000000 1.935000 3.380000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.425000 0.615000 ;
-      RECT 0.095000 0.615000 1.460000 0.805000 ;
-      RECT 0.655000 1.580000 1.460000 1.750000 ;
-      RECT 0.655000 1.750000 0.835000 2.465000 ;
-      RECT 1.250000 0.805000 1.460000 1.020000 ;
-      RECT 1.250000 1.020000 2.935000 1.355000 ;
-      RECT 1.250000 1.355000 1.460000 1.580000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.095000  0.255000 0.425000 0.615000 ;
+      RECT 0.095000  0.615000 1.460000 0.805000 ;
+      RECT 0.095000  1.880000 0.425000 2.635000 ;
+      RECT 0.655000  1.580000 1.460000 1.750000 ;
+      RECT 0.655000  1.750000 0.835000 2.465000 ;
+      RECT 1.055000  0.085000 1.385000 0.445000 ;
+      RECT 1.090000  1.935000 1.420000 2.635000 ;
+      RECT 1.250000  0.805000 1.460000 1.020000 ;
+      RECT 1.250000  1.020000 2.935000 1.355000 ;
+      RECT 1.250000  1.355000 1.460000 1.580000 ;
+      RECT 2.040000  0.085000 2.420000 0.445000 ;
+      RECT 2.040000  1.935000 2.420000 2.635000 ;
+      RECT 3.000000  0.085000 3.380000 0.445000 ;
+      RECT 3.000000  1.935000 3.380000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
index 503c9c2..a8222eb 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
@@ -77,26 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.825000 ;
-        RECT 1.940000  0.085000 2.270000 0.485000 ;
-        RECT 2.915000  0.085000 3.245000 0.545000 ;
-        RECT 3.855000  0.085000 4.185000 0.545000 ;
-        RECT 4.795000  0.085000 5.125000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -105,41 +85,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.095000 1.805000 0.395000 2.635000 ;
-        RECT 1.035000 2.145000 1.365000 2.635000 ;
-        RECT 1.975000 2.160000 2.305000 2.635000 ;
-        RECT 2.915000 1.785000 3.245000 2.635000 ;
-        RECT 3.855000 1.785000 4.185000 2.635000 ;
-        RECT 4.795000 1.785000 5.125000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.565000 1.805000 2.305000 1.975000 ;
-      RECT 0.565000 1.975000 0.865000 2.465000 ;
-      RECT 1.015000 0.255000 1.345000 0.655000 ;
-      RECT 1.015000 0.655000 2.305000 0.825000 ;
-      RECT 1.535000 1.975000 1.805000 2.465000 ;
-      RECT 2.135000 0.825000 2.305000 1.055000 ;
-      RECT 2.135000 1.055000 4.305000 1.265000 ;
-      RECT 2.135000 1.265000 2.305000 1.805000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.825000 ;
+      RECT 0.095000  1.805000 0.395000 2.635000 ;
+      RECT 0.565000  1.805000 2.305000 1.975000 ;
+      RECT 0.565000  1.975000 0.865000 2.465000 ;
+      RECT 1.015000  0.255000 1.345000 0.655000 ;
+      RECT 1.015000  0.655000 2.305000 0.825000 ;
+      RECT 1.035000  2.145000 1.365000 2.635000 ;
+      RECT 1.535000  1.975000 1.805000 2.465000 ;
+      RECT 1.940000  0.085000 2.270000 0.485000 ;
+      RECT 1.975000  2.160000 2.305000 2.635000 ;
+      RECT 2.135000  0.825000 2.305000 1.055000 ;
+      RECT 2.135000  1.055000 4.305000 1.265000 ;
+      RECT 2.135000  1.265000 2.305000 1.805000 ;
+      RECT 2.915000  0.085000 3.245000 0.545000 ;
+      RECT 2.915000  1.785000 3.245000 2.635000 ;
+      RECT 3.855000  0.085000 4.185000 0.545000 ;
+      RECT 3.855000  1.785000 4.185000 2.635000 ;
+      RECT 4.795000  0.085000 5.125000 0.545000 ;
+      RECT 4.795000  1.785000 5.125000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
index f407bd2..25ed8b1 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
@@ -79,29 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.825000 ;
-        RECT 1.940000  0.085000 2.270000 0.485000 ;
-        RECT 2.915000  0.085000 3.245000 0.545000 ;
-        RECT 3.855000  0.085000 4.185000 0.545000 ;
-        RECT 4.795000  0.085000 5.125000 0.545000 ;
-        RECT 5.735000  0.085000 6.065000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -110,44 +87,64 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.095000 1.805000 0.395000 2.635000 ;
-        RECT 1.035000 2.145000 1.365000 2.635000 ;
-        RECT 1.975000 2.160000 2.305000 2.635000 ;
-        RECT 2.915000 1.785000 3.245000 2.635000 ;
-        RECT 3.855000 1.785000 4.185000 2.635000 ;
-        RECT 4.795000 1.785000 5.125000 2.635000 ;
-        RECT 5.735000 1.785000 6.065000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.565000 1.805000 2.305000 1.975000 ;
-      RECT 0.565000 1.975000 0.865000 2.465000 ;
-      RECT 1.015000 0.255000 1.345000 0.655000 ;
-      RECT 1.015000 0.655000 2.305000 0.825000 ;
-      RECT 1.535000 1.975000 1.805000 2.465000 ;
-      RECT 2.135000 0.825000 2.305000 1.055000 ;
-      RECT 2.135000 1.055000 5.325000 1.265000 ;
-      RECT 2.135000 1.265000 2.305000 1.805000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.825000 ;
+      RECT 0.095000  1.805000 0.395000 2.635000 ;
+      RECT 0.565000  1.805000 2.305000 1.975000 ;
+      RECT 0.565000  1.975000 0.865000 2.465000 ;
+      RECT 1.015000  0.255000 1.345000 0.655000 ;
+      RECT 1.015000  0.655000 2.305000 0.825000 ;
+      RECT 1.035000  2.145000 1.365000 2.635000 ;
+      RECT 1.535000  1.975000 1.805000 2.465000 ;
+      RECT 1.940000  0.085000 2.270000 0.485000 ;
+      RECT 1.975000  2.160000 2.305000 2.635000 ;
+      RECT 2.135000  0.825000 2.305000 1.055000 ;
+      RECT 2.135000  1.055000 5.325000 1.265000 ;
+      RECT 2.135000  1.265000 2.305000 1.805000 ;
+      RECT 2.915000  0.085000 3.245000 0.545000 ;
+      RECT 2.915000  1.785000 3.245000 2.635000 ;
+      RECT 3.855000  0.085000 4.185000 0.545000 ;
+      RECT 3.855000  1.785000 4.185000 2.635000 ;
+      RECT 4.795000  0.085000 5.125000 0.545000 ;
+      RECT 4.795000  1.785000 5.125000 2.635000 ;
+      RECT 5.735000  0.085000 6.065000 0.545000 ;
+      RECT 5.735000  1.785000 6.065000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
index 4ed0b35..ddc0c9b 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
@@ -67,18 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.590000 ;
-        RECT 2.000000  0.085000 2.445000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -87,37 +75,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.515000 2.185000 0.895000 2.635000 ;
-        RECT 1.635000 2.165000 2.275000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 1.785000 0.900000 2.015000 ;
-      RECT 0.175000 2.015000 0.345000 2.445000 ;
-      RECT 0.645000 0.280000 0.885000 0.655000 ;
-      RECT 0.665000 0.655000 0.885000 0.805000 ;
-      RECT 0.665000 0.805000 1.250000 1.135000 ;
-      RECT 0.665000 1.135000 0.900000 1.785000 ;
-      RECT 1.070000 1.305000 2.505000 1.325000 ;
-      RECT 1.070000 1.325000 2.080000 1.475000 ;
-      RECT 1.070000 1.475000 1.405000 2.420000 ;
-      RECT 1.215000 0.270000 1.385000 0.415000 ;
-      RECT 1.215000 0.415000 1.640000 0.610000 ;
-      RECT 1.420000 0.610000 1.640000 0.945000 ;
-      RECT 1.420000 0.945000 2.505000 1.305000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.090000  0.085000 0.425000 0.590000 ;
+      RECT 0.175000  1.785000 0.900000 2.015000 ;
+      RECT 0.175000  2.015000 0.345000 2.445000 ;
+      RECT 0.515000  2.185000 0.895000 2.635000 ;
+      RECT 0.645000  0.280000 0.885000 0.655000 ;
+      RECT 0.665000  0.655000 0.885000 0.805000 ;
+      RECT 0.665000  0.805000 1.250000 1.135000 ;
+      RECT 0.665000  1.135000 0.900000 1.785000 ;
+      RECT 1.070000  1.305000 2.505000 1.325000 ;
+      RECT 1.070000  1.325000 2.080000 1.475000 ;
+      RECT 1.070000  1.475000 1.405000 2.420000 ;
+      RECT 1.215000  0.270000 1.385000 0.415000 ;
+      RECT 1.215000  0.415000 1.640000 0.610000 ;
+      RECT 1.420000  0.610000 1.640000 0.945000 ;
+      RECT 1.420000  0.945000 2.505000 1.305000 ;
+      RECT 1.635000  2.165000 2.275000 2.635000 ;
+      RECT 2.000000  0.085000 2.445000 0.580000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
index 524a8c6..19f8a67 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
@@ -67,20 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.590000 ;
-        RECT 2.105000  0.085000 2.475000 0.580000 ;
-        RECT 3.325000  0.085000 3.595000 0.720000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -89,39 +75,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.515000 2.185000 0.895000 2.635000 ;
-        RECT 1.660000 2.165000 2.395000 2.635000 ;
-        RECT 3.325000 1.680000 3.595000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 1.785000 0.905000 2.015000 ;
-      RECT 0.175000 2.015000 0.345000 2.445000 ;
-      RECT 0.645000 0.280000 0.885000 0.655000 ;
-      RECT 0.670000 0.655000 0.885000 0.805000 ;
-      RECT 0.670000 0.805000 1.275000 1.135000 ;
-      RECT 0.670000 1.135000 0.905000 1.785000 ;
-      RECT 1.095000 1.305000 2.535000 1.325000 ;
-      RECT 1.095000 1.325000 2.105000 1.475000 ;
-      RECT 1.095000 1.475000 1.430000 2.420000 ;
-      RECT 1.215000 0.270000 1.385000 0.415000 ;
-      RECT 1.215000 0.415000 1.665000 0.610000 ;
-      RECT 1.445000 0.610000 1.665000 0.945000 ;
-      RECT 1.445000 0.945000 2.535000 1.305000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.590000 ;
+      RECT 0.175000  1.785000 0.905000 2.015000 ;
+      RECT 0.175000  2.015000 0.345000 2.445000 ;
+      RECT 0.515000  2.185000 0.895000 2.635000 ;
+      RECT 0.645000  0.280000 0.885000 0.655000 ;
+      RECT 0.670000  0.655000 0.885000 0.805000 ;
+      RECT 0.670000  0.805000 1.275000 1.135000 ;
+      RECT 0.670000  1.135000 0.905000 1.785000 ;
+      RECT 1.095000  1.305000 2.535000 1.325000 ;
+      RECT 1.095000  1.325000 2.105000 1.475000 ;
+      RECT 1.095000  1.475000 1.430000 2.420000 ;
+      RECT 1.215000  0.270000 1.385000 0.415000 ;
+      RECT 1.215000  0.415000 1.665000 0.610000 ;
+      RECT 1.445000  0.610000 1.665000 0.945000 ;
+      RECT 1.445000  0.945000 2.535000 1.305000 ;
+      RECT 1.660000  2.165000 2.395000 2.635000 ;
+      RECT 2.105000  0.085000 2.475000 0.580000 ;
+      RECT 3.325000  0.085000 3.595000 0.720000 ;
+      RECT 3.325000  1.680000 3.595000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
index 4bbe61e..497c198 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
@@ -68,21 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 1.055000  0.085000 1.385000 0.445000 ;
-        RECT 2.035000  0.085000 2.415000 0.445000 ;
-        RECT 2.995000  0.085000 3.375000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -91,39 +76,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.090000 2.255000 0.425000 2.635000 ;
-        RECT 1.090000 2.275000 1.420000 2.635000 ;
-        RECT 2.055000 2.275000 2.435000 2.635000 ;
-        RECT 2.995000 2.275000 3.375000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.615000 ;
-      RECT 0.090000 0.615000 1.455000 0.805000 ;
-      RECT 0.165000 0.995000 0.425000 1.325000 ;
-      RECT 0.165000 1.325000 0.335000 1.915000 ;
-      RECT 0.165000 1.915000 3.940000 2.085000 ;
-      RECT 0.515000 1.500000 1.415000 1.745000 ;
-      RECT 1.245000 0.805000 1.455000 0.995000 ;
-      RECT 1.245000 0.995000 2.175000 1.355000 ;
-      RECT 1.245000 1.355000 1.420000 1.485000 ;
-      RECT 1.245000 1.485000 1.415000 1.500000 ;
-      RECT 3.725000 0.495000 3.940000 1.915000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.615000 ;
+      RECT 0.090000  0.615000 1.455000 0.805000 ;
+      RECT 0.090000  2.255000 0.425000 2.635000 ;
+      RECT 0.165000  0.995000 0.425000 1.325000 ;
+      RECT 0.165000  1.325000 0.335000 1.915000 ;
+      RECT 0.165000  1.915000 3.940000 2.085000 ;
+      RECT 0.515000  1.500000 1.415000 1.745000 ;
+      RECT 1.055000  0.085000 1.385000 0.445000 ;
+      RECT 1.090000  2.275000 1.420000 2.635000 ;
+      RECT 1.245000  0.805000 1.455000 0.995000 ;
+      RECT 1.245000  0.995000 2.175000 1.355000 ;
+      RECT 1.245000  1.355000 1.420000 1.485000 ;
+      RECT 1.245000  1.485000 1.415000 1.500000 ;
+      RECT 2.035000  0.085000 2.415000 0.445000 ;
+      RECT 2.055000  2.275000 2.435000 2.635000 ;
+      RECT 2.995000  0.085000 3.375000 0.445000 ;
+      RECT 2.995000  2.275000 3.375000 2.635000 ;
+      RECT 3.725000  0.495000 3.940000 1.915000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
index 6a9e257..ec52997 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
@@ -76,16 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 1.930000  0.085000 2.100000 0.625000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -94,35 +84,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.085000 1.980000 0.750000 2.080000 ;
-        RECT 0.085000 2.080000 0.740000 2.635000 ;
-        RECT 0.515000 1.710000 0.895000 1.955000 ;
-        RECT 0.515000 1.955000 0.750000 1.980000 ;
-        RECT 1.910000 2.090000 2.165000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.295000 1.075000 0.465000 ;
-      RECT 0.085000 1.190000 1.075000 1.360000 ;
-      RECT 0.085000 1.360000 0.345000 1.810000 ;
-      RECT 0.855000 0.465000 1.075000 1.190000 ;
-      RECT 0.895000 1.360000 1.075000 1.370000 ;
-      RECT 0.895000 1.370000 2.270000 1.540000 ;
-      RECT 1.160000 1.540000 2.270000 1.590000 ;
-      RECT 1.160000 1.590000 2.165000 1.885000 ;
-      RECT 2.040000 0.990000 2.270000 1.370000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.295000 1.075000 0.465000 ;
+      RECT 0.085000  1.190000 1.075000 1.360000 ;
+      RECT 0.085000  1.360000 0.345000 1.810000 ;
+      RECT 0.085000  1.980000 0.750000 2.080000 ;
+      RECT 0.085000  2.080000 0.740000 2.635000 ;
+      RECT 0.515000  1.710000 0.895000 1.955000 ;
+      RECT 0.515000  1.955000 0.750000 1.980000 ;
+      RECT 0.855000  0.465000 1.075000 1.190000 ;
+      RECT 0.895000  1.360000 1.075000 1.370000 ;
+      RECT 0.895000  1.370000 2.270000 1.540000 ;
+      RECT 1.160000  1.540000 2.270000 1.590000 ;
+      RECT 1.160000  1.590000 2.165000 1.885000 ;
+      RECT 1.910000  2.090000 2.165000 2.635000 ;
+      RECT 1.930000  0.085000 2.100000 0.625000 ;
+      RECT 2.040000  0.990000 2.270000 1.370000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
index 6270192..e1ba2e5 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
@@ -91,6 +91,8 @@
         RECT 1.985000 -0.085000 2.155000 0.085000 ;
         RECT 2.445000 -0.085000 2.615000 0.085000 ;
         RECT 2.905000 -0.085000 3.075000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -114,6 +116,8 @@
         RECT 1.985000 2.635000 2.155000 2.805000 ;
         RECT 2.445000 2.635000 2.615000 2.805000 ;
         RECT 2.905000 2.635000 3.075000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
diff --git a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
index 5d8e59a..ad666c1 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
@@ -82,22 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 2.055000  0.085000 2.385000 0.445000 ;
-        RECT 3.010000  0.085000 3.390000 0.445000 ;
-        RECT 3.970000  0.085000 4.350000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -106,39 +90,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.895000 1.935000 1.395000 2.635000 ;
-        RECT 2.060000 1.935000 2.390000 2.635000 ;
-        RECT 3.010000 1.935000 3.390000 2.635000 ;
-        RECT 3.970000 1.935000 4.350000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.465000 0.255000 1.825000 0.445000 ;
-      RECT 0.465000 0.445000 0.800000 0.805000 ;
-      RECT 0.500000 1.580000 2.430000 1.750000 ;
-      RECT 0.500000 1.750000 0.680000 2.465000 ;
-      RECT 1.620000 1.750000 1.800000 2.465000 ;
-      RECT 1.635000 0.445000 1.825000 0.615000 ;
-      RECT 1.635000 0.615000 2.430000 0.805000 ;
-      RECT 2.220000 0.805000 2.430000 1.020000 ;
-      RECT 2.220000 1.020000 3.905000 1.355000 ;
-      RECT 2.220000 1.355000 2.430000 1.580000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.465000  0.255000 1.825000 0.445000 ;
+      RECT 0.465000  0.445000 0.800000 0.805000 ;
+      RECT 0.500000  1.580000 2.430000 1.750000 ;
+      RECT 0.500000  1.750000 0.680000 2.465000 ;
+      RECT 0.895000  1.935000 1.395000 2.635000 ;
+      RECT 1.620000  1.750000 1.800000 2.465000 ;
+      RECT 1.635000  0.445000 1.825000 0.615000 ;
+      RECT 1.635000  0.615000 2.430000 0.805000 ;
+      RECT 2.055000  0.085000 2.385000 0.445000 ;
+      RECT 2.060000  1.935000 2.390000 2.635000 ;
+      RECT 2.220000  0.805000 2.430000 1.020000 ;
+      RECT 2.220000  1.020000 3.905000 1.355000 ;
+      RECT 2.220000  1.355000 2.430000 1.580000 ;
+      RECT 3.010000  0.085000 3.390000 0.445000 ;
+      RECT 3.010000  1.935000 3.390000 2.635000 ;
+      RECT 3.970000  0.085000 4.350000 0.445000 ;
+      RECT 3.970000  1.935000 4.350000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
index 0df4fdf..212ea55 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
@@ -76,19 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.905000 ;
-        RECT 2.815000  0.085000 3.105000 0.625000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -97,39 +84,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.085000 2.125000 0.345000 2.635000 ;
-        RECT 1.085000 2.130000 1.750000 2.635000 ;
-        RECT 1.505000 1.765000 1.885000 1.955000 ;
-        RECT 1.505000 1.955000 1.750000 2.130000 ;
-        RECT 2.795000 2.090000 3.010000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.485000 0.895000 0.905000 ;
-      RECT 0.645000 0.905000 0.895000 0.995000 ;
-      RECT 0.645000 0.995000 1.520000 1.245000 ;
-      RECT 0.645000 1.245000 0.815000 2.465000 ;
-      RECT 1.085000 1.425000 3.185000 1.575000 ;
-      RECT 1.085000 1.575000 3.050000 1.595000 ;
-      RECT 1.085000 1.595000 1.335000 1.940000 ;
-      RECT 1.105000 0.285000 1.945000 0.550000 ;
-      RECT 1.690000 0.550000 1.945000 1.425000 ;
-      RECT 2.155000 1.595000 3.050000 1.890000 ;
-      RECT 2.965000 0.975000 3.185000 1.425000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.905000 ;
+      RECT 0.085000  2.125000 0.345000 2.635000 ;
+      RECT 0.515000  0.485000 0.895000 0.905000 ;
+      RECT 0.645000  0.905000 0.895000 0.995000 ;
+      RECT 0.645000  0.995000 1.520000 1.245000 ;
+      RECT 0.645000  1.245000 0.815000 2.465000 ;
+      RECT 1.085000  1.425000 3.185000 1.575000 ;
+      RECT 1.085000  1.575000 3.050000 1.595000 ;
+      RECT 1.085000  1.595000 1.335000 1.940000 ;
+      RECT 1.085000  2.130000 1.750000 2.635000 ;
+      RECT 1.105000  0.285000 1.945000 0.550000 ;
+      RECT 1.505000  1.765000 1.885000 1.955000 ;
+      RECT 1.505000  1.955000 1.750000 2.130000 ;
+      RECT 1.690000  0.550000 1.945000 1.425000 ;
+      RECT 2.155000  1.595000 3.050000 1.890000 ;
+      RECT 2.795000  2.090000 3.010000 2.635000 ;
+      RECT 2.815000  0.085000 3.105000 0.625000 ;
+      RECT 2.965000  0.975000 3.185000 1.425000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
index 634d1f2..835366c 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
@@ -79,21 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.085000  0.085000 0.355000 0.575000 ;
-        RECT 2.610000  0.085000 2.940000 0.580000 ;
-        RECT 3.760000  0.085000 4.025000 0.745000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -102,39 +87,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.085000 1.575000 0.400000 2.635000 ;
-        RECT 1.080000 2.130000 1.745000 2.635000 ;
-        RECT 1.505000 1.765000 1.885000 1.955000 ;
-        RECT 1.505000 1.955000 1.745000 2.130000 ;
-        RECT 2.660000 1.790000 2.875000 2.635000 ;
-        RECT 3.760000 1.625000 4.025000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.630000 0.305000 0.905000 1.015000 ;
-      RECT 0.630000 1.015000 1.465000 1.245000 ;
-      RECT 0.630000 1.245000 0.905000 1.905000 ;
-      RECT 1.100000 1.425000 3.020000 1.595000 ;
-      RECT 1.100000 1.595000 1.335000 1.960000 ;
-      RECT 1.105000 0.305000 1.815000 0.570000 ;
-      RECT 1.645000 0.570000 1.815000 1.425000 ;
-      RECT 2.160000 1.595000 2.350000 1.890000 ;
-      RECT 2.790000 0.995000 3.020000 1.425000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.085000 0.355000 0.575000 ;
+      RECT 0.085000  1.575000 0.400000 2.635000 ;
+      RECT 0.630000  0.305000 0.905000 1.015000 ;
+      RECT 0.630000  1.015000 1.465000 1.245000 ;
+      RECT 0.630000  1.245000 0.905000 1.905000 ;
+      RECT 1.080000  2.130000 1.745000 2.635000 ;
+      RECT 1.100000  1.425000 3.020000 1.595000 ;
+      RECT 1.100000  1.595000 1.335000 1.960000 ;
+      RECT 1.105000  0.305000 1.815000 0.570000 ;
+      RECT 1.505000  1.765000 1.885000 1.955000 ;
+      RECT 1.505000  1.955000 1.745000 2.130000 ;
+      RECT 1.645000  0.570000 1.815000 1.425000 ;
+      RECT 2.160000  1.595000 2.350000 1.890000 ;
+      RECT 2.610000  0.085000 2.940000 0.580000 ;
+      RECT 2.660000  1.790000 2.875000 2.635000 ;
+      RECT 2.790000  0.995000 3.020000 1.425000 ;
+      RECT 3.760000  0.085000 4.025000 0.745000 ;
+      RECT 3.760000  1.625000 4.025000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
index 4db04dd..8e58f40 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
@@ -78,23 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 1.930000  0.085000 2.260000 0.445000 ;
-        RECT 2.845000  0.085000 3.195000 0.445000 ;
-        RECT 3.805000  0.085000 4.185000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -103,45 +86,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.730000 2.275000 1.230000 2.635000 ;
-        RECT 1.895000 2.275000 2.225000 2.635000 ;
-        RECT 2.845000 2.275000 3.230000 2.635000 ;
-        RECT 3.805000 2.275000 4.185000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 0.255000 0.635000 0.355000 ;
-      RECT 0.150000 0.355000 1.700000 0.545000 ;
-      RECT 0.150000 0.545000 0.635000 0.805000 ;
-      RECT 0.150000 0.805000 0.370000 1.495000 ;
-      RECT 0.150000 1.495000 0.510000 2.165000 ;
-      RECT 0.540000 0.995000 0.865000 1.325000 ;
-      RECT 0.680000 1.325000 0.865000 1.875000 ;
-      RECT 0.680000 1.875000 4.905000 2.105000 ;
-      RECT 1.330000 1.525000 2.205000 1.695000 ;
-      RECT 1.520000 0.545000 1.700000 0.615000 ;
-      RECT 1.520000 0.615000 2.265000 0.805000 ;
-      RECT 2.035000 0.805000 2.265000 1.020000 ;
-      RECT 2.035000 1.020000 3.400000 1.355000 ;
-      RECT 2.035000 1.355000 2.205000 1.525000 ;
-      RECT 4.625000 0.425000 4.905000 1.875000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.150000  0.255000 0.635000 0.355000 ;
+      RECT 0.150000  0.355000 1.700000 0.545000 ;
+      RECT 0.150000  0.545000 0.635000 0.805000 ;
+      RECT 0.150000  0.805000 0.370000 1.495000 ;
+      RECT 0.150000  1.495000 0.510000 2.165000 ;
+      RECT 0.540000  0.995000 0.865000 1.325000 ;
+      RECT 0.680000  1.325000 0.865000 1.875000 ;
+      RECT 0.680000  1.875000 4.905000 2.105000 ;
+      RECT 0.730000  2.275000 1.230000 2.635000 ;
+      RECT 1.330000  1.525000 2.205000 1.695000 ;
+      RECT 1.520000  0.545000 1.700000 0.615000 ;
+      RECT 1.520000  0.615000 2.265000 0.805000 ;
+      RECT 1.895000  2.275000 2.225000 2.635000 ;
+      RECT 1.930000  0.085000 2.260000 0.445000 ;
+      RECT 2.035000  0.805000 2.265000 1.020000 ;
+      RECT 2.035000  1.020000 3.400000 1.355000 ;
+      RECT 2.035000  1.355000 2.205000 1.525000 ;
+      RECT 2.845000  0.085000 3.195000 0.445000 ;
+      RECT 2.845000  2.275000 3.230000 2.635000 ;
+      RECT 3.805000  0.085000 4.185000 0.445000 ;
+      RECT 3.805000  2.275000 4.185000 2.635000 ;
+      RECT 4.625000  0.425000 4.905000 1.875000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
index bab4f7f..d3e5b17 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
@@ -85,17 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 2.065000  0.085000 2.335000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -104,31 +93,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.090000 2.255000 0.425000 2.635000 ;
-        RECT 1.035000 1.915000 1.365000 2.635000 ;
-        RECT 2.005000 1.835000 2.375000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.170000 0.255000 0.685000 0.585000 ;
-      RECT 0.495000 0.585000 0.685000 1.495000 ;
-      RECT 0.495000 1.495000 2.535000 1.665000 ;
-      RECT 0.605000 1.665000 0.855000 2.465000 ;
-      RECT 1.560000 1.665000 1.810000 2.465000 ;
-      RECT 2.335000 0.995000 2.535000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.090000  2.255000 0.425000 2.635000 ;
+      RECT 0.170000  0.255000 0.685000 0.585000 ;
+      RECT 0.495000  0.585000 0.685000 1.495000 ;
+      RECT 0.495000  1.495000 2.535000 1.665000 ;
+      RECT 0.605000  1.665000 0.855000 2.465000 ;
+      RECT 1.035000  1.915000 1.365000 2.635000 ;
+      RECT 1.560000  1.665000 1.810000 2.465000 ;
+      RECT 2.005000  1.835000 2.375000 2.635000 ;
+      RECT 2.065000  0.085000 2.335000 0.545000 ;
+      RECT 2.335000  0.995000 2.535000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
index 34f8ec0..37d086f 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
@@ -85,19 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 2.285000  0.085000 2.455000 0.550000 ;
-        RECT 3.245000  0.085000 3.575000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -106,33 +93,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.095000 2.255000 0.425000 2.635000 ;
-        RECT 1.035000 1.915000 1.365000 2.635000 ;
-        RECT 2.165000 1.835000 2.415000 2.635000 ;
-        RECT 3.245000 1.835000 3.565000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.670000 0.585000 ;
-      RECT 0.500000 0.585000 0.670000 1.495000 ;
-      RECT 0.500000 1.495000 2.665000 1.665000 ;
-      RECT 0.645000 1.665000 0.815000 2.465000 ;
-      RECT 1.570000 1.665000 1.820000 2.465000 ;
-      RECT 2.495000 0.995000 2.665000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.095000  2.255000 0.425000 2.635000 ;
+      RECT 0.175000  0.255000 0.670000 0.585000 ;
+      RECT 0.500000  0.585000 0.670000 1.495000 ;
+      RECT 0.500000  1.495000 2.665000 1.665000 ;
+      RECT 0.645000  1.665000 0.815000 2.465000 ;
+      RECT 1.035000  1.915000 1.365000 2.635000 ;
+      RECT 1.570000  1.665000 1.820000 2.465000 ;
+      RECT 2.165000  1.835000 2.415000 2.635000 ;
+      RECT 2.285000  0.085000 2.455000 0.550000 ;
+      RECT 2.495000  0.995000 2.665000 1.495000 ;
+      RECT 3.245000  0.085000 3.575000 0.810000 ;
+      RECT 3.245000  1.835000 3.565000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
index a7e3aa5..f5700e9 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
@@ -90,22 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 2.225000  0.085000 2.535000 0.550000 ;
-        RECT 3.125000  0.085000 3.505000 0.470000 ;
-        RECT 4.065000  0.085000 4.445000 0.470000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -114,37 +98,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.105000 1.835000 0.385000 2.635000 ;
-        RECT 1.055000 1.935000 1.385000 2.635000 ;
-        RECT 2.225000 1.855000 2.555000 2.635000 ;
-        RECT 3.255000 1.835000 3.505000 2.635000 ;
-        RECT 4.065000 1.915000 4.445000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.720000 0.585000 ;
-      RECT 0.500000 0.585000 0.720000 1.495000 ;
-      RECT 0.500000 1.495000 2.615000 1.665000 ;
-      RECT 0.605000 1.665000 0.815000 2.465000 ;
-      RECT 1.605000 1.665000 1.795000 2.465000 ;
-      RECT 2.445000 1.075000 3.935000 1.305000 ;
-      RECT 2.445000 1.305000 2.615000 1.495000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.105000  1.835000 0.385000 2.635000 ;
+      RECT 0.175000  0.255000 0.720000 0.585000 ;
+      RECT 0.500000  0.585000 0.720000 1.495000 ;
+      RECT 0.500000  1.495000 2.615000 1.665000 ;
+      RECT 0.605000  1.665000 0.815000 2.465000 ;
+      RECT 1.055000  1.935000 1.385000 2.635000 ;
+      RECT 1.605000  1.665000 1.795000 2.465000 ;
+      RECT 2.225000  0.085000 2.535000 0.550000 ;
+      RECT 2.225000  1.855000 2.555000 2.635000 ;
+      RECT 2.445000  1.075000 3.935000 1.305000 ;
+      RECT 2.445000  1.305000 2.615000 1.495000 ;
+      RECT 3.125000  0.085000 3.505000 0.470000 ;
+      RECT 3.255000  1.835000 3.505000 2.635000 ;
+      RECT 4.065000  0.085000 4.445000 0.470000 ;
+      RECT 4.065000  1.915000 4.445000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
index 5a75617..9e28d74 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
@@ -85,20 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.465000 ;
-        RECT 2.955000  0.085000 3.350000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -107,41 +93,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.515000 2.195000 0.895000 2.635000 ;
-        RECT 1.655000 2.225000 2.375000 2.635000 ;
-        RECT 3.060000 2.225000 3.390000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.170000 0.255000 0.345000 0.655000 ;
-      RECT 0.170000 0.655000 0.850000 0.825000 ;
-      RECT 0.170000 1.845000 0.850000 2.015000 ;
-      RECT 0.170000 2.015000 0.345000 2.465000 ;
-      RECT 0.680000 0.825000 0.850000 0.995000 ;
-      RECT 0.680000 0.995000 1.025000 1.325000 ;
-      RECT 0.680000 1.325000 0.850000 1.845000 ;
-      RECT 1.140000 0.255000 1.370000 0.585000 ;
-      RECT 1.200000 0.585000 1.370000 1.875000 ;
-      RECT 1.200000 1.875000 3.415000 2.045000 ;
-      RECT 1.200000 2.045000 1.370000 2.465000 ;
-      RECT 2.630000 2.045000 2.800000 2.465000 ;
-      RECT 3.245000 0.995000 3.535000 1.325000 ;
-      RECT 3.245000 1.325000 3.415000 1.875000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.170000  0.255000 0.345000 0.655000 ;
+      RECT 0.170000  0.655000 0.850000 0.825000 ;
+      RECT 0.170000  1.845000 0.850000 2.015000 ;
+      RECT 0.170000  2.015000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.895000 0.465000 ;
+      RECT 0.515000  2.195000 0.895000 2.635000 ;
+      RECT 0.680000  0.825000 0.850000 0.995000 ;
+      RECT 0.680000  0.995000 1.025000 1.325000 ;
+      RECT 0.680000  1.325000 0.850000 1.845000 ;
+      RECT 1.140000  0.255000 1.370000 0.585000 ;
+      RECT 1.200000  0.585000 1.370000 1.875000 ;
+      RECT 1.200000  1.875000 3.415000 2.045000 ;
+      RECT 1.200000  2.045000 1.370000 2.465000 ;
+      RECT 1.655000  2.225000 2.375000 2.635000 ;
+      RECT 2.630000  2.045000 2.800000 2.465000 ;
+      RECT 2.955000  0.085000 3.350000 0.465000 ;
+      RECT 3.060000  2.225000 3.390000 2.635000 ;
+      RECT 3.245000  0.995000 3.535000 1.325000 ;
+      RECT 3.245000  1.325000 3.415000 1.875000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
index 6559132..e9260dd 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
@@ -87,22 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.465000 ;
-        RECT 3.010000  0.085000 3.390000 0.465000 ;
-        RECT 4.065000  0.085000 4.450000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -111,45 +95,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.515000 2.195000 0.895000 2.635000 ;
-        RECT 1.705000 2.255000 2.425000 2.635000 ;
-        RECT 3.140000 2.195000 3.470000 2.635000 ;
-        RECT 4.195000 1.835000 4.450000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 1.830000 0.855000 2.000000 ;
-      RECT 0.175000 2.000000 0.345000 2.465000 ;
-      RECT 0.645000 0.255000 0.855000 0.585000 ;
-      RECT 0.685000 0.585000 0.855000 0.995000 ;
-      RECT 0.685000 0.995000 1.075000 1.325000 ;
-      RECT 0.685000 1.325000 0.855000 1.830000 ;
-      RECT 1.115000 1.660000 1.415000 1.915000 ;
-      RECT 1.115000 1.915000 3.465000 1.965000 ;
-      RECT 1.115000 1.965000 2.860000 2.085000 ;
-      RECT 1.115000 2.085000 1.285000 2.465000 ;
-      RECT 1.195000 0.255000 1.415000 0.585000 ;
-      RECT 1.245000 0.585000 1.415000 1.660000 ;
-      RECT 2.670000 2.085000 2.860000 2.465000 ;
-      RECT 2.690000 1.795000 3.465000 1.915000 ;
-      RECT 3.295000 0.995000 3.555000 1.325000 ;
-      RECT 3.295000 1.325000 3.465000 1.795000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.465000 ;
+      RECT 0.175000  1.830000 0.855000 2.000000 ;
+      RECT 0.175000  2.000000 0.345000 2.465000 ;
+      RECT 0.515000  2.195000 0.895000 2.635000 ;
+      RECT 0.645000  0.255000 0.855000 0.585000 ;
+      RECT 0.685000  0.585000 0.855000 0.995000 ;
+      RECT 0.685000  0.995000 1.075000 1.325000 ;
+      RECT 0.685000  1.325000 0.855000 1.830000 ;
+      RECT 1.115000  1.660000 1.415000 1.915000 ;
+      RECT 1.115000  1.915000 3.465000 1.965000 ;
+      RECT 1.115000  1.965000 2.860000 2.085000 ;
+      RECT 1.115000  2.085000 1.285000 2.465000 ;
+      RECT 1.195000  0.255000 1.415000 0.585000 ;
+      RECT 1.245000  0.585000 1.415000 1.660000 ;
+      RECT 1.705000  2.255000 2.425000 2.635000 ;
+      RECT 2.670000  2.085000 2.860000 2.465000 ;
+      RECT 2.690000  1.795000 3.465000 1.915000 ;
+      RECT 3.010000  0.085000 3.390000 0.465000 ;
+      RECT 3.140000  2.195000 3.470000 2.635000 ;
+      RECT 3.295000  0.995000 3.555000 1.325000 ;
+      RECT 3.295000  1.325000 3.465000 1.795000 ;
+      RECT 4.065000  0.085000 4.450000 0.465000 ;
+      RECT 4.195000  1.835000 4.450000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
index d1e89ff..0a2e9ff 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
@@ -87,23 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.565000  0.085000 0.815000 0.545000 ;
-        RECT 1.510000  0.085000 1.890000 0.470000 ;
-        RECT 2.535000  0.085000 2.865000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -112,41 +95,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.515000 2.255000 0.895000 2.635000 ;
-        RECT 1.510000 2.255000 1.890000 2.635000 ;
-        RECT 2.450000 2.255000 2.830000 2.635000 ;
-        RECT 3.510000 2.255000 3.890000 2.635000 ;
-        RECT 4.570000 2.255000 4.950000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.585000 ;
-      RECT 0.085000 0.585000 0.260000 1.915000 ;
-      RECT 0.085000 1.915000 4.885000 2.085000 ;
-      RECT 0.085000 2.085000 0.345000 2.465000 ;
-      RECT 1.530000 0.995000 2.700000 1.325000 ;
-      RECT 2.530000 1.325000 2.700000 1.545000 ;
-      RECT 2.530000 1.545000 4.530000 1.715000 ;
-      RECT 4.360000 0.640000 4.900000 0.810000 ;
-      RECT 4.360000 0.810000 4.530000 1.545000 ;
-      RECT 4.715000 0.995000 4.885000 1.915000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.585000 ;
+      RECT 0.085000  0.585000 0.260000 1.915000 ;
+      RECT 0.085000  1.915000 4.885000 2.085000 ;
+      RECT 0.085000  2.085000 0.345000 2.465000 ;
+      RECT 0.515000  2.255000 0.895000 2.635000 ;
+      RECT 0.565000  0.085000 0.815000 0.545000 ;
+      RECT 1.510000  0.085000 1.890000 0.470000 ;
+      RECT 1.510000  2.255000 1.890000 2.635000 ;
+      RECT 1.530000  0.995000 2.700000 1.325000 ;
+      RECT 2.450000  2.255000 2.830000 2.635000 ;
+      RECT 2.530000  1.325000 2.700000 1.545000 ;
+      RECT 2.530000  1.545000 4.530000 1.715000 ;
+      RECT 2.535000  0.085000 2.865000 0.445000 ;
+      RECT 3.510000  2.255000 3.890000 2.635000 ;
+      RECT 4.360000  0.640000 4.900000 0.810000 ;
+      RECT 4.360000  0.810000 4.530000 1.545000 ;
+      RECT 4.570000  2.255000 4.950000 2.635000 ;
+      RECT 4.715000  0.995000 4.885000 1.915000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
index 7b996af..3ae781c 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
@@ -86,21 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.575000  0.085000 0.955000 0.465000 ;
-        RECT 3.810000  0.085000 3.980000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -109,51 +94,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.575000 2.255000 0.955000 2.635000 ;
-        RECT 1.625000 2.255000 1.955000 2.635000 ;
-        RECT 2.550000 2.255000 2.930000 2.635000 ;
-        RECT 3.700000 2.255000 4.030000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.585000 ;
-      RECT 0.085000 0.585000 0.255000 1.285000 ;
-      RECT 0.085000 1.285000 1.235000 1.455000 ;
-      RECT 0.085000 1.455000 0.255000 2.135000 ;
-      RECT 0.085000 2.135000 0.345000 2.465000 ;
-      RECT 1.015000 1.455000 1.235000 1.575000 ;
-      RECT 1.015000 1.575000 1.645000 1.745000 ;
-      RECT 1.165000 1.915000 1.985000 2.085000 ;
-      RECT 1.165000 2.085000 1.375000 2.465000 ;
-      RECT 1.185000 0.255000 2.665000 0.425000 ;
-      RECT 1.185000 0.425000 1.585000 0.755000 ;
-      RECT 1.415000 0.755000 1.585000 1.235000 ;
-      RECT 1.415000 1.235000 1.985000 1.405000 ;
-      RECT 1.755000 0.595000 2.325000 0.925000 ;
-      RECT 1.815000 1.405000 1.985000 1.915000 ;
-      RECT 2.155000 0.925000 2.325000 1.915000 ;
-      RECT 2.155000 1.915000 3.980000 2.085000 ;
-      RECT 2.185000 2.085000 2.355000 2.465000 ;
-      RECT 2.495000 0.425000 2.665000 1.325000 ;
-      RECT 3.210000 2.085000 3.380000 2.465000 ;
-      RECT 3.810000 0.995000 4.115000 1.325000 ;
-      RECT 3.810000 1.325000 3.980000 1.915000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.585000 ;
+      RECT 0.085000  0.585000 0.255000 1.285000 ;
+      RECT 0.085000  1.285000 1.235000 1.455000 ;
+      RECT 0.085000  1.455000 0.255000 2.135000 ;
+      RECT 0.085000  2.135000 0.345000 2.465000 ;
+      RECT 0.575000  0.085000 0.955000 0.465000 ;
+      RECT 0.575000  2.255000 0.955000 2.635000 ;
+      RECT 1.015000  1.455000 1.235000 1.575000 ;
+      RECT 1.015000  1.575000 1.645000 1.745000 ;
+      RECT 1.165000  1.915000 1.985000 2.085000 ;
+      RECT 1.165000  2.085000 1.375000 2.465000 ;
+      RECT 1.185000  0.255000 2.665000 0.425000 ;
+      RECT 1.185000  0.425000 1.585000 0.755000 ;
+      RECT 1.415000  0.755000 1.585000 1.235000 ;
+      RECT 1.415000  1.235000 1.985000 1.405000 ;
+      RECT 1.625000  2.255000 1.955000 2.635000 ;
+      RECT 1.755000  0.595000 2.325000 0.925000 ;
+      RECT 1.815000  1.405000 1.985000 1.915000 ;
+      RECT 2.155000  0.925000 2.325000 1.915000 ;
+      RECT 2.155000  1.915000 3.980000 2.085000 ;
+      RECT 2.185000  2.085000 2.355000 2.465000 ;
+      RECT 2.495000  0.425000 2.665000 1.325000 ;
+      RECT 2.550000  2.255000 2.930000 2.635000 ;
+      RECT 3.210000  2.085000 3.380000 2.465000 ;
+      RECT 3.700000  2.255000 4.030000 2.635000 ;
+      RECT 3.810000  0.085000 3.980000 0.545000 ;
+      RECT 3.810000  0.995000 4.115000 1.325000 ;
+      RECT 3.810000  1.325000 3.980000 1.915000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
index d508d8e..20801b2 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
@@ -84,23 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.465000 ;
-        RECT 1.510000  0.085000 1.890000 0.465000 ;
-        RECT 4.185000  0.085000 4.435000 0.585000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -109,51 +92,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.515000 2.255000 0.895000 2.635000 ;
-        RECT 1.640000 2.255000 2.310000 2.635000 ;
-        RECT 2.935000 2.255000 3.325000 2.635000 ;
-        RECT 4.105000 2.255000 4.435000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.255000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.720000 0.805000 ;
-      RECT 0.175000 1.885000 2.075000 2.055000 ;
-      RECT 0.175000 2.055000 0.345000 2.465000 ;
-      RECT 0.500000 0.805000 0.720000 1.885000 ;
-      RECT 1.515000 0.635000 2.605000 0.805000 ;
-      RECT 1.515000 0.805000 1.735000 1.325000 ;
-      RECT 1.905000 0.995000 2.215000 1.325000 ;
-      RECT 1.905000 1.325000 2.075000 1.885000 ;
-      RECT 2.145000 0.255000 2.315000 0.635000 ;
-      RECT 2.385000 0.805000 2.605000 1.915000 ;
-      RECT 2.385000 1.915000 3.715000 2.085000 ;
-      RECT 2.595000 2.085000 2.765000 2.465000 ;
-      RECT 2.795000 1.400000 3.015000 1.575000 ;
-      RECT 2.795000 1.575000 4.105000 1.745000 ;
-      RECT 3.545000 2.085000 3.715000 2.465000 ;
-      RECT 3.885000 1.745000 4.105000 1.915000 ;
-      RECT 3.885000 1.915000 4.915000 2.085000 ;
-      RECT 4.655000 0.255000 4.915000 0.585000 ;
-      RECT 4.655000 2.085000 4.915000 2.465000 ;
-      RECT 4.745000 0.585000 4.915000 1.915000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.175000  0.255000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.720000 0.805000 ;
+      RECT 0.175000  1.885000 2.075000 2.055000 ;
+      RECT 0.175000  2.055000 0.345000 2.465000 ;
+      RECT 0.500000  0.805000 0.720000 1.885000 ;
+      RECT 0.515000  0.085000 0.895000 0.465000 ;
+      RECT 0.515000  2.255000 0.895000 2.635000 ;
+      RECT 1.510000  0.085000 1.890000 0.465000 ;
+      RECT 1.515000  0.635000 2.605000 0.805000 ;
+      RECT 1.515000  0.805000 1.735000 1.325000 ;
+      RECT 1.640000  2.255000 2.310000 2.635000 ;
+      RECT 1.905000  0.995000 2.215000 1.325000 ;
+      RECT 1.905000  1.325000 2.075000 1.885000 ;
+      RECT 2.145000  0.255000 2.315000 0.635000 ;
+      RECT 2.385000  0.805000 2.605000 1.915000 ;
+      RECT 2.385000  1.915000 3.715000 2.085000 ;
+      RECT 2.595000  2.085000 2.765000 2.465000 ;
+      RECT 2.795000  1.400000 3.015000 1.575000 ;
+      RECT 2.795000  1.575000 4.105000 1.745000 ;
+      RECT 2.935000  2.255000 3.325000 2.635000 ;
+      RECT 3.545000  2.085000 3.715000 2.465000 ;
+      RECT 3.885000  1.745000 4.105000 1.915000 ;
+      RECT 3.885000  1.915000 4.915000 2.085000 ;
+      RECT 4.105000  2.255000 4.435000 2.635000 ;
+      RECT 4.185000  0.085000 4.435000 0.585000 ;
+      RECT 4.655000  0.255000 4.915000 0.585000 ;
+      RECT 4.655000  2.085000 4.915000 2.465000 ;
+      RECT 4.745000  0.585000 4.915000 1.915000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
index 2a6c796..d71dc95 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
@@ -87,27 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.620000  0.085000 0.950000 0.470000 ;
-        RECT 1.510000  0.085000 1.890000 0.470000 ;
-        RECT 2.470000  0.085000 2.800000 0.445000 ;
-        RECT 5.385000  0.085000 5.715000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -116,54 +95,72 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.515000 2.255000 0.895000 2.635000 ;
-        RECT 1.510000 2.255000 1.890000 2.635000 ;
-        RECT 2.450000 2.255000 2.830000 2.635000 ;
-        RECT 3.680000 2.255000 4.010000 2.635000 ;
-        RECT 4.810000 2.255000 5.820000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.585000 ;
-      RECT 0.085000 0.585000 0.260000 1.915000 ;
-      RECT 0.085000 1.915000 4.940000 2.085000 ;
-      RECT 0.085000 2.085000 0.345000 2.465000 ;
-      RECT 1.510000 1.075000 2.700000 1.245000 ;
-      RECT 2.530000 0.615000 3.195000 0.785000 ;
-      RECT 2.530000 0.785000 2.700000 1.075000 ;
-      RECT 2.530000 1.245000 2.700000 1.545000 ;
-      RECT 2.530000 1.545000 4.550000 1.715000 ;
-      RECT 2.975000 0.300000 5.060000 0.470000 ;
-      RECT 2.975000 0.470000 3.195000 0.615000 ;
-      RECT 4.080000 0.995000 4.300000 1.205000 ;
-      RECT 4.080000 1.205000 4.940000 1.375000 ;
-      RECT 4.710000 0.470000 5.060000 0.810000 ;
-      RECT 4.770000 1.375000 4.940000 1.915000 ;
-      RECT 5.360000 0.655000 6.265000 0.825000 ;
-      RECT 5.360000 0.825000 5.530000 1.915000 ;
-      RECT 5.360000 1.915000 6.265000 2.085000 ;
-      RECT 6.095000 0.255000 6.265000 0.655000 ;
-      RECT 6.095000 2.085000 6.265000 2.465000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.585000 ;
+      RECT 0.085000  0.585000 0.260000 1.915000 ;
+      RECT 0.085000  1.915000 4.940000 2.085000 ;
+      RECT 0.085000  2.085000 0.345000 2.465000 ;
+      RECT 0.515000  2.255000 0.895000 2.635000 ;
+      RECT 0.620000  0.085000 0.950000 0.470000 ;
+      RECT 1.510000  0.085000 1.890000 0.470000 ;
+      RECT 1.510000  1.075000 2.700000 1.245000 ;
+      RECT 1.510000  2.255000 1.890000 2.635000 ;
+      RECT 2.450000  2.255000 2.830000 2.635000 ;
+      RECT 2.470000  0.085000 2.800000 0.445000 ;
+      RECT 2.530000  0.615000 3.195000 0.785000 ;
+      RECT 2.530000  0.785000 2.700000 1.075000 ;
+      RECT 2.530000  1.245000 2.700000 1.545000 ;
+      RECT 2.530000  1.545000 4.550000 1.715000 ;
+      RECT 2.975000  0.300000 5.060000 0.470000 ;
+      RECT 2.975000  0.470000 3.195000 0.615000 ;
+      RECT 3.680000  2.255000 4.010000 2.635000 ;
+      RECT 4.080000  0.995000 4.300000 1.205000 ;
+      RECT 4.080000  1.205000 4.940000 1.375000 ;
+      RECT 4.710000  0.470000 5.060000 0.810000 ;
+      RECT 4.770000  1.375000 4.940000 1.915000 ;
+      RECT 4.810000  2.255000 5.820000 2.635000 ;
+      RECT 5.360000  0.655000 6.265000 0.825000 ;
+      RECT 5.360000  0.825000 5.530000 1.915000 ;
+      RECT 5.360000  1.915000 6.265000 2.085000 ;
+      RECT 5.385000  0.085000 5.715000 0.465000 ;
+      RECT 6.095000  0.255000 6.265000 0.655000 ;
+      RECT 6.095000  2.085000 6.265000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
index 87a9538..7192340 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
@@ -66,6 +66,8 @@
         RECT 0.605000 -0.085000 0.775000 0.085000 ;
         RECT 1.065000 -0.085000 1.235000 0.085000 ;
         RECT 1.525000 -0.085000 1.695000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -82,6 +84,8 @@
         RECT 0.605000 2.635000 0.775000 2.805000 ;
         RECT 1.065000 2.635000 1.235000 2.805000 ;
         RECT 1.525000 2.635000 1.695000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
index d478a5d..007d5ab 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
@@ -100,6 +100,8 @@
         RECT 7.045000 -0.085000 7.215000 0.085000 ;
         RECT 7.505000 -0.085000 7.675000 0.085000 ;
         RECT 7.965000 -0.085000 8.135000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -138,6 +140,8 @@
         RECT 7.045000 2.635000 7.215000 2.805000 ;
         RECT 7.505000 2.635000 7.675000 2.805000 ;
         RECT 7.965000 2.635000 8.135000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
index adad659..91c3e28 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
@@ -79,46 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.500000 0.085000 ;
-        RECT  0.175000  0.085000  0.345000 0.905000 ;
-        RECT  1.115000  0.085000  1.285000 0.565000 ;
-        RECT  2.055000  0.085000  2.225000 0.565000 ;
-        RECT  2.995000  0.085000  3.165000 0.565000 ;
-        RECT  3.935000  0.085000  4.105000 0.565000 ;
-        RECT  4.875000  0.085000  5.045000 0.565000 ;
-        RECT  5.815000  0.085000  5.985000 0.565000 ;
-        RECT  6.755000  0.085000  6.925000 0.565000 ;
-        RECT  7.695000  0.085000  7.865000 0.565000 ;
-        RECT  8.635000  0.085000  8.805000 0.565000 ;
-        RECT  9.575000  0.085000  9.745000 0.565000 ;
-        RECT 10.515000  0.085000 10.685000 0.565000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
@@ -127,63 +87,100 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.500000 2.805000 ;
-        RECT  0.175000 1.445000  0.345000 2.635000 ;
-        RECT  1.115000 1.835000  1.285000 2.635000 ;
-        RECT  2.055000 1.835000  2.225000 2.635000 ;
-        RECT  2.995000 1.835000  3.165000 2.635000 ;
-        RECT  3.935000 1.835000  4.105000 2.635000 ;
-        RECT  4.875000 1.835000  5.045000 2.635000 ;
-        RECT  5.815000 1.835000  5.985000 2.635000 ;
-        RECT  6.755000 1.835000  6.925000 2.635000 ;
-        RECT  7.695000 1.835000  7.865000 2.635000 ;
-        RECT  8.635000 1.835000  8.805000 2.635000 ;
-        RECT  9.575000 1.835000  9.745000 2.635000 ;
-        RECT 10.515000 1.835000 10.685000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.500000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.260000  0.895000 0.735000 ;
-      RECT 0.515000 0.735000  3.165000 0.905000 ;
-      RECT 0.515000 1.445000  3.165000 1.615000 ;
-      RECT 0.515000 1.615000  0.895000 2.465000 ;
-      RECT 1.455000 0.260000  1.835000 0.735000 ;
-      RECT 1.455000 1.615000  1.835000 2.465000 ;
-      RECT 2.395000 0.260000  2.775000 0.735000 ;
-      RECT 2.395000 1.615000  2.775000 2.465000 ;
-      RECT 2.990000 0.905000  3.165000 1.075000 ;
-      RECT 2.990000 1.075000 10.175000 1.275000 ;
-      RECT 2.990000 1.275000  3.165000 1.445000 ;
+      RECT  0.000000 -0.085000 11.500000 0.085000 ;
+      RECT  0.000000  2.635000 11.500000 2.805000 ;
+      RECT  0.175000  0.085000  0.345000 0.905000 ;
+      RECT  0.175000  1.445000  0.345000 2.635000 ;
+      RECT  0.515000  0.260000  0.895000 0.735000 ;
+      RECT  0.515000  0.735000  3.165000 0.905000 ;
+      RECT  0.515000  1.445000  3.165000 1.615000 ;
+      RECT  0.515000  1.615000  0.895000 2.465000 ;
+      RECT  1.115000  0.085000  1.285000 0.565000 ;
+      RECT  1.115000  1.835000  1.285000 2.635000 ;
+      RECT  1.455000  0.260000  1.835000 0.735000 ;
+      RECT  1.455000  1.615000  1.835000 2.465000 ;
+      RECT  2.055000  0.085000  2.225000 0.565000 ;
+      RECT  2.055000  1.835000  2.225000 2.635000 ;
+      RECT  2.395000  0.260000  2.775000 0.735000 ;
+      RECT  2.395000  1.615000  2.775000 2.465000 ;
+      RECT  2.990000  0.905000  3.165000 1.075000 ;
+      RECT  2.990000  1.075000 10.175000 1.275000 ;
+      RECT  2.990000  1.275000  3.165000 1.445000 ;
+      RECT  2.995000  0.085000  3.165000 0.565000 ;
+      RECT  2.995000  1.835000  3.165000 2.635000 ;
+      RECT  3.935000  0.085000  4.105000 0.565000 ;
+      RECT  3.935000  1.835000  4.105000 2.635000 ;
+      RECT  4.875000  0.085000  5.045000 0.565000 ;
+      RECT  4.875000  1.835000  5.045000 2.635000 ;
+      RECT  5.815000  0.085000  5.985000 0.565000 ;
+      RECT  5.815000  1.835000  5.985000 2.635000 ;
+      RECT  6.755000  0.085000  6.925000 0.565000 ;
+      RECT  6.755000  1.835000  6.925000 2.635000 ;
+      RECT  7.695000  0.085000  7.865000 0.565000 ;
+      RECT  7.695000  1.835000  7.865000 2.635000 ;
+      RECT  8.635000  0.085000  8.805000 0.565000 ;
+      RECT  8.635000  1.835000  8.805000 2.635000 ;
+      RECT  9.575000  0.085000  9.745000 0.565000 ;
+      RECT  9.575000  1.835000  9.745000 2.635000 ;
+      RECT 10.515000  0.085000 10.685000 0.565000 ;
+      RECT 10.515000  1.835000 10.685000 2.635000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
index d30cac6..d87f6ce 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
@@ -66,6 +66,8 @@
         RECT 1.065000 -0.085000 1.235000 0.085000 ;
         RECT 1.525000 -0.085000 1.695000 0.085000 ;
         RECT 1.985000 -0.085000 2.155000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -84,6 +86,8 @@
         RECT 1.065000 2.635000 1.235000 2.805000 ;
         RECT 1.525000 2.635000 1.695000 2.805000 ;
         RECT 1.985000 2.635000 2.155000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
index d2e2665..caf0609 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
@@ -75,6 +75,8 @@
         RECT 1.985000 -0.085000 2.155000 0.085000 ;
         RECT 2.445000 -0.085000 2.615000 0.085000 ;
         RECT 2.905000 -0.085000 3.075000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -96,6 +98,8 @@
         RECT 1.985000 2.635000 2.155000 2.805000 ;
         RECT 2.445000 2.635000 2.615000 2.805000 ;
         RECT 2.905000 2.635000 3.075000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
index baf384f..dd2a02b 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
@@ -82,6 +82,8 @@
         RECT 3.365000 -0.085000 3.535000 0.085000 ;
         RECT 3.825000 -0.085000 3.995000 0.085000 ;
         RECT 4.285000 -0.085000 4.455000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -108,6 +110,8 @@
         RECT 3.365000 2.635000 3.535000 2.805000 ;
         RECT 3.825000 2.635000 3.995000 2.805000 ;
         RECT 4.285000 2.635000 4.455000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
diff --git a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
index 08d7b6f..fb91f7f 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
@@ -88,6 +88,8 @@
         RECT 4.745000 -0.085000 4.915000 0.085000 ;
         RECT 5.205000 -0.085000 5.375000 0.085000 ;
         RECT 5.665000 -0.085000 5.835000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -118,6 +120,8 @@
         RECT 4.745000 2.635000 4.915000 2.805000 ;
         RECT 5.205000 2.635000 5.375000 2.805000 ;
         RECT 5.665000 2.635000 5.835000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
index 77bf859..20bc37e 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
@@ -77,52 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.340000 0.085000 ;
-        RECT  0.175000  0.085000  0.345000 0.905000 ;
-        RECT  1.635000  0.085000  1.805000 0.565000 ;
-        RECT  2.575000  0.085000  2.745000 0.565000 ;
-        RECT  3.515000  0.085000  3.685000 0.565000 ;
-        RECT  4.455000  0.085000  4.625000 0.565000 ;
-        RECT  5.395000  0.085000  5.565000 0.565000 ;
-        RECT  6.335000  0.085000  6.505000 0.565000 ;
-        RECT  7.275000  0.085000  7.445000 0.565000 ;
-        RECT  8.215000  0.085000  8.385000 0.565000 ;
-        RECT  9.155000  0.085000  9.325000 0.565000 ;
-        RECT 10.095000  0.085000 10.265000 0.565000 ;
-        RECT 11.035000  0.085000 11.205000 0.565000 ;
-        RECT 11.975000  0.085000 12.145000 0.565000 ;
-        RECT 12.915000  0.085000 13.085000 0.565000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
@@ -131,83 +85,126 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 13.340000 2.805000 ;
-        RECT  0.175000 1.445000  0.345000 2.635000 ;
-        RECT  1.635000 1.785000  1.805000 2.635000 ;
-        RECT  2.575000 1.785000  2.745000 2.635000 ;
-        RECT  3.515000 1.835000  3.685000 2.635000 ;
-        RECT  4.455000 1.835000  4.625000 2.635000 ;
-        RECT  5.395000 1.835000  5.565000 2.635000 ;
-        RECT  6.335000 1.835000  6.505000 2.635000 ;
-        RECT  7.275000 1.835000  7.445000 2.635000 ;
-        RECT  8.215000 1.835000  8.385000 2.635000 ;
-        RECT  9.155000 1.835000  9.325000 2.635000 ;
-        RECT 10.095000 1.835000 10.265000 2.635000 ;
-        RECT 11.035000 1.835000 11.205000 2.635000 ;
-        RECT 11.975000 1.835000 12.145000 2.635000 ;
-        RECT 12.915000 1.835000 13.085000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.260000  0.895000 0.905000 ;
-      RECT 0.515000 1.445000  0.895000 2.465000 ;
-      RECT 0.660000 0.905000  0.895000 1.075000 ;
-      RECT 0.660000 1.075000  2.355000 1.275000 ;
-      RECT 0.660000 1.275000  0.895000 1.445000 ;
-      RECT 1.085000 0.260000  1.415000 0.735000 ;
-      RECT 1.085000 0.735000  2.745000 0.905000 ;
-      RECT 1.085000 1.445000  2.745000 1.615000 ;
-      RECT 1.085000 1.615000  1.415000 2.465000 ;
-      RECT 1.975000 0.260000  2.355000 0.735000 ;
-      RECT 1.975000 1.615000  2.355000 2.465000 ;
-      RECT 2.575000 0.905000  2.745000 1.075000 ;
-      RECT 2.575000 1.075000  5.135000 1.275000 ;
-      RECT 2.575000 1.275000  2.745000 1.445000 ;
-      RECT 2.915000 0.260000  3.295000 0.735000 ;
-      RECT 2.915000 0.735000  5.565000 0.905000 ;
-      RECT 2.915000 1.445000  5.565000 1.615000 ;
-      RECT 2.915000 1.615000  3.295000 2.465000 ;
-      RECT 3.855000 0.260000  4.235000 0.735000 ;
-      RECT 3.855000 1.615000  4.235000 2.465000 ;
-      RECT 4.795000 0.260000  5.175000 0.735000 ;
-      RECT 4.795000 1.615000  5.175000 2.465000 ;
-      RECT 5.390000 0.905000  5.565000 1.075000 ;
-      RECT 5.390000 1.075000 12.700000 1.275000 ;
-      RECT 5.390000 1.275000  5.565000 1.445000 ;
+      RECT  0.000000 -0.085000 13.340000 0.085000 ;
+      RECT  0.000000  2.635000 13.340000 2.805000 ;
+      RECT  0.175000  0.085000  0.345000 0.905000 ;
+      RECT  0.175000  1.445000  0.345000 2.635000 ;
+      RECT  0.515000  0.260000  0.895000 0.905000 ;
+      RECT  0.515000  1.445000  0.895000 2.465000 ;
+      RECT  0.660000  0.905000  0.895000 1.075000 ;
+      RECT  0.660000  1.075000  2.355000 1.275000 ;
+      RECT  0.660000  1.275000  0.895000 1.445000 ;
+      RECT  1.085000  0.260000  1.415000 0.735000 ;
+      RECT  1.085000  0.735000  2.745000 0.905000 ;
+      RECT  1.085000  1.445000  2.745000 1.615000 ;
+      RECT  1.085000  1.615000  1.415000 2.465000 ;
+      RECT  1.635000  0.085000  1.805000 0.565000 ;
+      RECT  1.635000  1.785000  1.805000 2.635000 ;
+      RECT  1.975000  0.260000  2.355000 0.735000 ;
+      RECT  1.975000  1.615000  2.355000 2.465000 ;
+      RECT  2.575000  0.085000  2.745000 0.565000 ;
+      RECT  2.575000  0.905000  2.745000 1.075000 ;
+      RECT  2.575000  1.075000  5.135000 1.275000 ;
+      RECT  2.575000  1.275000  2.745000 1.445000 ;
+      RECT  2.575000  1.785000  2.745000 2.635000 ;
+      RECT  2.915000  0.260000  3.295000 0.735000 ;
+      RECT  2.915000  0.735000  5.565000 0.905000 ;
+      RECT  2.915000  1.445000  5.565000 1.615000 ;
+      RECT  2.915000  1.615000  3.295000 2.465000 ;
+      RECT  3.515000  0.085000  3.685000 0.565000 ;
+      RECT  3.515000  1.835000  3.685000 2.635000 ;
+      RECT  3.855000  0.260000  4.235000 0.735000 ;
+      RECT  3.855000  1.615000  4.235000 2.465000 ;
+      RECT  4.455000  0.085000  4.625000 0.565000 ;
+      RECT  4.455000  1.835000  4.625000 2.635000 ;
+      RECT  4.795000  0.260000  5.175000 0.735000 ;
+      RECT  4.795000  1.615000  5.175000 2.465000 ;
+      RECT  5.390000  0.905000  5.565000 1.075000 ;
+      RECT  5.390000  1.075000 12.700000 1.275000 ;
+      RECT  5.390000  1.275000  5.565000 1.445000 ;
+      RECT  5.395000  0.085000  5.565000 0.565000 ;
+      RECT  5.395000  1.835000  5.565000 2.635000 ;
+      RECT  6.335000  0.085000  6.505000 0.565000 ;
+      RECT  6.335000  1.835000  6.505000 2.635000 ;
+      RECT  7.275000  0.085000  7.445000 0.565000 ;
+      RECT  7.275000  1.835000  7.445000 2.635000 ;
+      RECT  8.215000  0.085000  8.385000 0.565000 ;
+      RECT  8.215000  1.835000  8.385000 2.635000 ;
+      RECT  9.155000  0.085000  9.325000 0.565000 ;
+      RECT  9.155000  1.835000  9.325000 2.635000 ;
+      RECT 10.095000  0.085000 10.265000 0.565000 ;
+      RECT 10.095000  1.835000 10.265000 2.635000 ;
+      RECT 11.035000  0.085000 11.205000 0.565000 ;
+      RECT 11.035000  1.835000 11.205000 2.635000 ;
+      RECT 11.975000  0.085000 12.145000 0.565000 ;
+      RECT 11.975000  1.835000 12.145000 2.635000 ;
+      RECT 12.915000  0.085000 13.085000 0.565000 ;
+      RECT 12.915000  1.835000 13.085000 2.635000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
index 4ddd341..542248e 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
@@ -66,32 +66,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.565000 ;
-        RECT 2.200000  0.085000 2.370000 0.565000 ;
-        RECT 3.140000  0.085000 3.310000 0.565000 ;
-        RECT 4.080000  0.085000 4.250000 0.565000 ;
-        RECT 5.020000  0.085000 5.190000 0.565000 ;
-        RECT 5.960000  0.085000 6.130000 0.565000 ;
-        RECT 6.900000  0.085000 7.070000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -100,59 +74,82 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.645000 1.785000 0.815000 2.635000 ;
-        RECT 2.200000 1.785000 2.370000 2.635000 ;
-        RECT 3.140000 1.785000 3.310000 2.635000 ;
-        RECT 4.080000 1.835000 4.250000 2.635000 ;
-        RECT 5.020000 1.835000 5.190000 2.635000 ;
-        RECT 5.960000 1.835000 6.130000 2.635000 ;
-        RECT 6.900000 1.835000 7.070000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.260000 0.425000 0.735000 ;
-      RECT 0.095000 0.735000 0.830000 0.905000 ;
-      RECT 0.095000 1.445000 0.830000 1.615000 ;
-      RECT 0.095000 1.615000 0.425000 2.160000 ;
-      RECT 0.660000 0.905000 0.830000 0.995000 ;
-      RECT 0.660000 0.995000 1.140000 1.325000 ;
-      RECT 0.660000 1.325000 0.830000 1.445000 ;
-      RECT 1.050000 0.260000 1.480000 0.825000 ;
-      RECT 1.050000 1.545000 1.480000 2.465000 ;
-      RECT 1.310000 0.825000 1.480000 1.075000 ;
-      RECT 1.310000 1.075000 2.920000 1.275000 ;
-      RECT 1.310000 1.275000 1.480000 1.545000 ;
-      RECT 1.650000 0.260000 1.980000 0.735000 ;
-      RECT 1.650000 0.735000 3.310000 0.905000 ;
-      RECT 1.650000 1.445000 3.310000 1.615000 ;
-      RECT 1.650000 1.615000 1.980000 2.465000 ;
-      RECT 2.540000 0.260000 2.920000 0.735000 ;
-      RECT 2.540000 1.615000 2.920000 2.465000 ;
-      RECT 3.140000 0.905000 3.310000 1.075000 ;
-      RECT 3.140000 1.075000 5.910000 1.275000 ;
-      RECT 3.140000 1.275000 3.310000 1.445000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.095000  0.260000 0.425000 0.735000 ;
+      RECT 0.095000  0.735000 0.830000 0.905000 ;
+      RECT 0.095000  1.445000 0.830000 1.615000 ;
+      RECT 0.095000  1.615000 0.425000 2.160000 ;
+      RECT 0.645000  0.085000 0.815000 0.565000 ;
+      RECT 0.645000  1.785000 0.815000 2.635000 ;
+      RECT 0.660000  0.905000 0.830000 0.995000 ;
+      RECT 0.660000  0.995000 1.140000 1.325000 ;
+      RECT 0.660000  1.325000 0.830000 1.445000 ;
+      RECT 1.050000  0.260000 1.480000 0.825000 ;
+      RECT 1.050000  1.545000 1.480000 2.465000 ;
+      RECT 1.310000  0.825000 1.480000 1.075000 ;
+      RECT 1.310000  1.075000 2.920000 1.275000 ;
+      RECT 1.310000  1.275000 1.480000 1.545000 ;
+      RECT 1.650000  0.260000 1.980000 0.735000 ;
+      RECT 1.650000  0.735000 3.310000 0.905000 ;
+      RECT 1.650000  1.445000 3.310000 1.615000 ;
+      RECT 1.650000  1.615000 1.980000 2.465000 ;
+      RECT 2.200000  0.085000 2.370000 0.565000 ;
+      RECT 2.200000  1.785000 2.370000 2.635000 ;
+      RECT 2.540000  0.260000 2.920000 0.735000 ;
+      RECT 2.540000  1.615000 2.920000 2.465000 ;
+      RECT 3.140000  0.085000 3.310000 0.565000 ;
+      RECT 3.140000  0.905000 3.310000 1.075000 ;
+      RECT 3.140000  1.075000 5.910000 1.275000 ;
+      RECT 3.140000  1.275000 3.310000 1.445000 ;
+      RECT 3.140000  1.785000 3.310000 2.635000 ;
+      RECT 4.080000  0.085000 4.250000 0.565000 ;
+      RECT 4.080000  1.835000 4.250000 2.635000 ;
+      RECT 5.020000  0.085000 5.190000 0.565000 ;
+      RECT 5.020000  1.835000 5.190000 2.635000 ;
+      RECT 5.960000  0.085000 6.130000 0.565000 ;
+      RECT 5.960000  1.835000 6.130000 2.635000 ;
+      RECT 6.900000  0.085000 7.070000 0.565000 ;
+      RECT 6.900000  1.835000 7.070000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
index 5273d58..e3777af 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
@@ -77,49 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.420000 0.085000 ;
-        RECT  0.645000  0.085000  0.815000 0.565000 ;
-        RECT  1.585000  0.085000  1.755000 0.565000 ;
-        RECT  2.525000  0.085000  2.695000 0.565000 ;
-        RECT  3.465000  0.085000  3.635000 0.565000 ;
-        RECT  4.405000  0.085000  4.575000 0.565000 ;
-        RECT  5.345000  0.085000  5.515000 0.565000 ;
-        RECT  6.285000  0.085000  6.455000 0.565000 ;
-        RECT  7.225000  0.085000  7.395000 0.565000 ;
-        RECT  8.165000  0.085000  8.335000 0.565000 ;
-        RECT  9.105000  0.085000  9.275000 0.565000 ;
-        RECT 10.045000  0.085000 10.215000 0.565000 ;
-        RECT 10.985000  0.085000 11.155000 0.565000 ;
-        RECT 11.925000  0.085000 12.095000 0.565000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
@@ -128,75 +85,115 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.420000 2.805000 ;
-        RECT  0.645000 1.785000  0.815000 2.635000 ;
-        RECT  1.585000 1.785000  1.755000 2.635000 ;
-        RECT  2.525000 1.835000  2.695000 2.635000 ;
-        RECT  3.465000 1.835000  3.635000 2.635000 ;
-        RECT  4.405000 1.835000  4.575000 2.635000 ;
-        RECT  5.345000 1.835000  5.515000 2.635000 ;
-        RECT  6.285000 1.835000  6.455000 2.635000 ;
-        RECT  7.225000 1.835000  7.395000 2.635000 ;
-        RECT  8.165000 1.835000  8.335000 2.635000 ;
-        RECT  9.105000 1.835000  9.275000 2.635000 ;
-        RECT 10.045000 1.835000 10.215000 2.635000 ;
-        RECT 10.985000 1.835000 11.155000 2.635000 ;
-        RECT 11.925000 1.835000 12.095000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.420000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.260000  0.425000 0.735000 ;
-      RECT 0.095000 0.735000  1.755000 0.905000 ;
-      RECT 0.095000 1.445000  1.755000 1.615000 ;
-      RECT 0.095000 1.615000  0.425000 2.465000 ;
-      RECT 0.985000 0.260000  1.365000 0.735000 ;
-      RECT 0.985000 1.615000  1.365000 2.465000 ;
-      RECT 1.585000 0.905000  1.755000 1.075000 ;
-      RECT 1.585000 1.075000  4.145000 1.275000 ;
-      RECT 1.585000 1.275000  1.755000 1.445000 ;
-      RECT 1.925000 0.260000  2.305000 0.735000 ;
-      RECT 1.925000 0.735000  4.575000 0.905000 ;
-      RECT 1.925000 1.445000  4.575000 1.615000 ;
-      RECT 1.925000 1.615000  2.305000 2.465000 ;
-      RECT 2.865000 0.260000  3.245000 0.735000 ;
-      RECT 2.865000 1.615000  3.245000 2.465000 ;
-      RECT 3.805000 0.260000  4.185000 0.735000 ;
-      RECT 3.805000 1.615000  4.185000 2.465000 ;
-      RECT 4.400000 0.905000  4.575000 1.075000 ;
-      RECT 4.400000 1.075000 11.710000 1.275000 ;
-      RECT 4.400000 1.275000  4.575000 1.445000 ;
+      RECT  0.000000 -0.085000 12.420000 0.085000 ;
+      RECT  0.000000  2.635000 12.420000 2.805000 ;
+      RECT  0.095000  0.260000  0.425000 0.735000 ;
+      RECT  0.095000  0.735000  1.755000 0.905000 ;
+      RECT  0.095000  1.445000  1.755000 1.615000 ;
+      RECT  0.095000  1.615000  0.425000 2.465000 ;
+      RECT  0.645000  0.085000  0.815000 0.565000 ;
+      RECT  0.645000  1.785000  0.815000 2.635000 ;
+      RECT  0.985000  0.260000  1.365000 0.735000 ;
+      RECT  0.985000  1.615000  1.365000 2.465000 ;
+      RECT  1.585000  0.085000  1.755000 0.565000 ;
+      RECT  1.585000  0.905000  1.755000 1.075000 ;
+      RECT  1.585000  1.075000  4.145000 1.275000 ;
+      RECT  1.585000  1.275000  1.755000 1.445000 ;
+      RECT  1.585000  1.785000  1.755000 2.635000 ;
+      RECT  1.925000  0.260000  2.305000 0.735000 ;
+      RECT  1.925000  0.735000  4.575000 0.905000 ;
+      RECT  1.925000  1.445000  4.575000 1.615000 ;
+      RECT  1.925000  1.615000  2.305000 2.465000 ;
+      RECT  2.525000  0.085000  2.695000 0.565000 ;
+      RECT  2.525000  1.835000  2.695000 2.635000 ;
+      RECT  2.865000  0.260000  3.245000 0.735000 ;
+      RECT  2.865000  1.615000  3.245000 2.465000 ;
+      RECT  3.465000  0.085000  3.635000 0.565000 ;
+      RECT  3.465000  1.835000  3.635000 2.635000 ;
+      RECT  3.805000  0.260000  4.185000 0.735000 ;
+      RECT  3.805000  1.615000  4.185000 2.465000 ;
+      RECT  4.400000  0.905000  4.575000 1.075000 ;
+      RECT  4.400000  1.075000 11.710000 1.275000 ;
+      RECT  4.400000  1.275000  4.575000 1.445000 ;
+      RECT  4.405000  0.085000  4.575000 0.565000 ;
+      RECT  4.405000  1.835000  4.575000 2.635000 ;
+      RECT  5.345000  0.085000  5.515000 0.565000 ;
+      RECT  5.345000  1.835000  5.515000 2.635000 ;
+      RECT  6.285000  0.085000  6.455000 0.565000 ;
+      RECT  6.285000  1.835000  6.455000 2.635000 ;
+      RECT  7.225000  0.085000  7.395000 0.565000 ;
+      RECT  7.225000  1.835000  7.395000 2.635000 ;
+      RECT  8.165000  0.085000  8.335000 0.565000 ;
+      RECT  8.165000  1.835000  8.335000 2.635000 ;
+      RECT  9.105000  0.085000  9.275000 0.565000 ;
+      RECT  9.105000  1.835000  9.275000 2.635000 ;
+      RECT 10.045000  0.085000 10.215000 0.565000 ;
+      RECT 10.045000  1.835000 10.215000 2.635000 ;
+      RECT 10.985000  0.085000 11.155000 0.565000 ;
+      RECT 10.985000  1.835000 11.155000 2.635000 ;
+      RECT 11.925000  0.085000 12.095000 0.565000 ;
+      RECT 11.925000  1.835000 12.095000 2.635000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
index 78947eb..76006d3 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
@@ -66,31 +66,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.905000 ;
-        RECT 1.635000  0.085000 1.805000 0.565000 ;
-        RECT 2.575000  0.085000 2.745000 0.565000 ;
-        RECT 3.515000  0.085000 3.685000 0.565000 ;
-        RECT 4.455000  0.085000 4.625000 0.565000 ;
-        RECT 5.395000  0.085000 5.565000 0.565000 ;
-        RECT 6.335000  0.085000 6.505000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -99,51 +74,73 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.175000 1.445000 0.345000 2.635000 ;
-        RECT 1.635000 1.785000 1.805000 2.635000 ;
-        RECT 2.575000 1.785000 2.745000 2.635000 ;
-        RECT 3.515000 1.835000 3.685000 2.635000 ;
-        RECT 4.455000 1.835000 4.625000 2.635000 ;
-        RECT 5.395000 1.835000 5.565000 2.635000 ;
-        RECT 6.335000 1.835000 6.505000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.260000 0.895000 0.905000 ;
-      RECT 0.515000 1.545000 0.895000 2.465000 ;
-      RECT 0.725000 0.905000 0.895000 1.075000 ;
-      RECT 0.725000 1.075000 2.355000 1.275000 ;
-      RECT 0.725000 1.275000 0.895000 1.545000 ;
-      RECT 1.085000 0.260000 1.415000 0.735000 ;
-      RECT 1.085000 0.735000 2.745000 0.905000 ;
-      RECT 1.085000 1.445000 2.745000 1.615000 ;
-      RECT 1.085000 1.615000 1.415000 2.465000 ;
-      RECT 1.975000 0.260000 2.355000 0.735000 ;
-      RECT 1.975000 1.615000 2.355000 2.465000 ;
-      RECT 2.575000 0.905000 2.745000 1.075000 ;
-      RECT 2.575000 1.075000 6.245000 1.275000 ;
-      RECT 2.575000 1.275000 2.745000 1.445000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.175000  0.085000 0.345000 0.905000 ;
+      RECT 0.175000  1.445000 0.345000 2.635000 ;
+      RECT 0.515000  0.260000 0.895000 0.905000 ;
+      RECT 0.515000  1.545000 0.895000 2.465000 ;
+      RECT 0.725000  0.905000 0.895000 1.075000 ;
+      RECT 0.725000  1.075000 2.355000 1.275000 ;
+      RECT 0.725000  1.275000 0.895000 1.545000 ;
+      RECT 1.085000  0.260000 1.415000 0.735000 ;
+      RECT 1.085000  0.735000 2.745000 0.905000 ;
+      RECT 1.085000  1.445000 2.745000 1.615000 ;
+      RECT 1.085000  1.615000 1.415000 2.465000 ;
+      RECT 1.635000  0.085000 1.805000 0.565000 ;
+      RECT 1.635000  1.785000 1.805000 2.635000 ;
+      RECT 1.975000  0.260000 2.355000 0.735000 ;
+      RECT 1.975000  1.615000 2.355000 2.465000 ;
+      RECT 2.575000  0.085000 2.745000 0.565000 ;
+      RECT 2.575000  0.905000 2.745000 1.075000 ;
+      RECT 2.575000  1.075000 6.245000 1.275000 ;
+      RECT 2.575000  1.275000 2.745000 1.445000 ;
+      RECT 2.575000  1.785000 2.745000 2.635000 ;
+      RECT 3.515000  0.085000 3.685000 0.565000 ;
+      RECT 3.515000  1.835000 3.685000 2.635000 ;
+      RECT 4.455000  0.085000 4.625000 0.565000 ;
+      RECT 4.455000  1.835000 4.625000 2.635000 ;
+      RECT 5.395000  0.085000 5.565000 0.565000 ;
+      RECT 5.395000  1.835000 5.565000 2.635000 ;
+      RECT 6.335000  0.085000 6.505000 0.565000 ;
+      RECT 6.335000  1.835000 6.505000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
index ab6b082..822e806 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
@@ -58,14 +58,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.525000  0.085000 1.275000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -74,27 +66,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.525000 1.875000 1.275000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.060000 0.760000 1.390000 ;
-      RECT 0.540000 0.635000 1.625000 0.805000 ;
-      RECT 0.540000 0.805000 0.760000 1.060000 ;
-      RECT 0.540000 1.390000 0.760000 1.535000 ;
-      RECT 0.540000 1.535000 1.665000 1.705000 ;
-      RECT 1.455000 0.255000 1.625000 0.635000 ;
-      RECT 1.495000 1.705000 1.665000 2.465000 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.425000  1.060000 0.760000 1.390000 ;
+      RECT 0.525000  0.085000 1.275000 0.465000 ;
+      RECT 0.525000  1.875000 1.275000 2.635000 ;
+      RECT 0.540000  0.635000 1.625000 0.805000 ;
+      RECT 0.540000  0.805000 0.760000 1.060000 ;
+      RECT 0.540000  1.390000 0.760000 1.535000 ;
+      RECT 0.540000  1.535000 1.665000 1.705000 ;
+      RECT 1.455000  0.255000 1.625000 0.635000 ;
+      RECT 1.495000  1.705000 1.665000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
index 54bc3e2..eb4bd35 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
@@ -70,36 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.610000 ;
-        RECT 1.035000  0.085000 1.365000 0.545000 ;
-        RECT 1.975000  0.085000 2.305000 0.545000 ;
-        RECT 2.915000  0.085000 3.245000 0.545000 ;
-        RECT 3.855000  0.085000 4.185000 0.545000 ;
-        RECT 4.795000  0.085000 5.125000 0.545000 ;
-        RECT 5.735000  0.085000 6.065000 0.545000 ;
-        RECT 6.675000  0.085000 7.005000 0.545000 ;
-        RECT 7.615000  0.085000 7.945000 0.610000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -108,52 +78,79 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.095000 1.495000 0.395000 2.635000 ;
-        RECT 1.065000 1.835000 1.335000 2.635000 ;
-        RECT 1.975000 1.475000 2.275000 2.635000 ;
-        RECT 2.915000 1.835000 3.245000 2.635000 ;
-        RECT 3.855000 1.835000 4.185000 2.635000 ;
-        RECT 4.795000 1.835000 5.125000 2.635000 ;
-        RECT 5.735000 1.835000 6.065000 2.635000 ;
-        RECT 6.675000 1.835000 7.005000 2.635000 ;
-        RECT 7.615000 1.465000 7.945000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.565000 1.495000 1.805000 1.665000 ;
-      RECT 0.565000 1.665000 0.895000 2.465000 ;
-      RECT 0.570000 1.475000 1.805000 1.495000 ;
-      RECT 0.595000 0.280000 0.865000 0.715000 ;
-      RECT 0.595000 0.715000 1.805000 0.905000 ;
-      RECT 1.535000 0.280000 1.805000 0.715000 ;
-      RECT 1.535000 0.905000 1.805000 1.075000 ;
-      RECT 1.535000 1.075000 6.685000 1.305000 ;
-      RECT 1.535000 1.305000 1.805000 1.475000 ;
-      RECT 1.535000 1.665000 1.805000 2.465000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.610000 ;
+      RECT 0.095000  1.495000 0.395000 2.635000 ;
+      RECT 0.565000  1.495000 1.805000 1.665000 ;
+      RECT 0.565000  1.665000 0.895000 2.465000 ;
+      RECT 0.570000  1.475000 1.805000 1.495000 ;
+      RECT 0.595000  0.280000 0.865000 0.715000 ;
+      RECT 0.595000  0.715000 1.805000 0.905000 ;
+      RECT 1.035000  0.085000 1.365000 0.545000 ;
+      RECT 1.065000  1.835000 1.335000 2.635000 ;
+      RECT 1.535000  0.280000 1.805000 0.715000 ;
+      RECT 1.535000  0.905000 1.805000 1.075000 ;
+      RECT 1.535000  1.075000 6.685000 1.305000 ;
+      RECT 1.535000  1.305000 1.805000 1.475000 ;
+      RECT 1.535000  1.665000 1.805000 2.465000 ;
+      RECT 1.975000  0.085000 2.305000 0.545000 ;
+      RECT 1.975000  1.475000 2.275000 2.635000 ;
+      RECT 2.915000  0.085000 3.245000 0.545000 ;
+      RECT 2.915000  1.835000 3.245000 2.635000 ;
+      RECT 3.855000  0.085000 4.185000 0.545000 ;
+      RECT 3.855000  1.835000 4.185000 2.635000 ;
+      RECT 4.795000  0.085000 5.125000 0.545000 ;
+      RECT 4.795000  1.835000 5.125000 2.635000 ;
+      RECT 5.735000  0.085000 6.065000 0.545000 ;
+      RECT 5.735000  1.835000 6.065000 2.635000 ;
+      RECT 6.675000  0.085000 7.005000 0.545000 ;
+      RECT 6.675000  1.835000 7.005000 2.635000 ;
+      RECT 7.615000  0.085000 7.945000 0.610000 ;
+      RECT 7.615000  1.465000 7.945000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
index b620a2c..2bbacb3 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
@@ -75,42 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.085000  0.085000  0.390000 0.595000 ;
-        RECT 1.090000  0.085000  1.350000 0.610000 ;
-        RECT 2.050000  0.085000  2.310000 0.645000 ;
-        RECT 3.010000  0.085000  3.270000 0.565000 ;
-        RECT 3.970000  0.085000  4.230000 0.565000 ;
-        RECT 4.930000  0.085000  5.175000 0.565000 ;
-        RECT 5.890000  0.085000  6.135000 0.565000 ;
-        RECT 6.845000  0.085000  7.095000 0.565000 ;
-        RECT 7.805000  0.085000  8.055000 0.565000 ;
-        RECT 8.765000  0.085000  9.025000 0.565000 ;
-        RECT 9.725000  0.085000 10.025000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
-        RECT 9.805000 -0.085000 9.975000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -119,54 +83,87 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.095000 1.825000  0.390000 2.635000 ;
-        RECT 1.090000 1.825000  1.350000 2.635000 ;
-        RECT 2.050000 1.835000  2.310000 2.630000 ;
-        RECT 2.050000 2.630000  9.025000 2.635000 ;
-        RECT 3.010000 1.905000  3.270000 2.630000 ;
-        RECT 3.970000 1.905000  4.230000 2.630000 ;
-        RECT 4.930000 1.905000  5.190000 2.630000 ;
-        RECT 5.890000 1.905000  6.135000 2.630000 ;
-        RECT 6.850000 1.905000  7.095000 2.630000 ;
-        RECT 7.810000 1.905000  8.055000 2.630000 ;
-        RECT 8.770000 1.905000  9.025000 2.630000 ;
-        RECT 9.755000 1.890000 10.025000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        RECT 9.805000 2.635000 9.975000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.620000 0.265000 0.870000 1.075000 ;
-      RECT 0.620000 1.075000 8.540000 1.325000 ;
-      RECT 0.620000 1.325000 0.865000 2.465000 ;
-      RECT 1.580000 0.265000 1.830000 1.075000 ;
-      RECT 1.580000 1.325000 1.830000 2.460000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.085000  0.085000  0.390000 0.595000 ;
+      RECT 0.095000  1.825000  0.390000 2.635000 ;
+      RECT 0.620000  0.265000  0.870000 1.075000 ;
+      RECT 0.620000  1.075000  8.540000 1.325000 ;
+      RECT 0.620000  1.325000  0.865000 2.465000 ;
+      RECT 1.090000  0.085000  1.350000 0.610000 ;
+      RECT 1.090000  1.825000  1.350000 2.635000 ;
+      RECT 1.580000  0.265000  1.830000 1.075000 ;
+      RECT 1.580000  1.325000  1.830000 2.460000 ;
+      RECT 2.050000  0.085000  2.310000 0.645000 ;
+      RECT 2.050000  1.835000  2.310000 2.630000 ;
+      RECT 2.050000  2.630000  9.025000 2.635000 ;
+      RECT 3.010000  0.085000  3.270000 0.565000 ;
+      RECT 3.010000  1.905000  3.270000 2.630000 ;
+      RECT 3.970000  0.085000  4.230000 0.565000 ;
+      RECT 3.970000  1.905000  4.230000 2.630000 ;
+      RECT 4.930000  0.085000  5.175000 0.565000 ;
+      RECT 4.930000  1.905000  5.190000 2.630000 ;
+      RECT 5.890000  0.085000  6.135000 0.565000 ;
+      RECT 5.890000  1.905000  6.135000 2.630000 ;
+      RECT 6.845000  0.085000  7.095000 0.565000 ;
+      RECT 6.850000  1.905000  7.095000 2.630000 ;
+      RECT 7.805000  0.085000  8.055000 0.565000 ;
+      RECT 7.810000  1.905000  8.055000 2.630000 ;
+      RECT 8.765000  0.085000  9.025000 0.565000 ;
+      RECT 8.770000  1.905000  9.025000 2.630000 ;
+      RECT 9.725000  0.085000 10.025000 0.565000 ;
+      RECT 9.755000  1.890000 10.025000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
+      RECT 9.805000 -0.085000 9.975000 0.085000 ;
+      RECT 9.805000  2.635000 9.975000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
index 96ad305..aaae29a 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
@@ -60,16 +60,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.605000  0.085000 0.880000 0.565000 ;
-        RECT 1.515000  0.085000 1.900000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -78,27 +68,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.525000 1.855000 0.905000 2.635000 ;
-        RECT 1.515000 2.210000 1.900000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.585000 ;
-      RECT 0.085000 0.585000 0.255000 1.495000 ;
-      RECT 0.085000 1.495000 1.315000 1.665000 ;
-      RECT 0.085000 1.665000 0.355000 2.435000 ;
-      RECT 1.015000 0.995000 1.315000 1.495000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.585000 ;
+      RECT 0.085000  0.585000 0.255000 1.495000 ;
+      RECT 0.085000  1.495000 1.315000 1.665000 ;
+      RECT 0.085000  1.665000 0.355000 2.435000 ;
+      RECT 0.525000  1.855000 0.905000 2.635000 ;
+      RECT 0.605000  0.085000 0.880000 0.565000 ;
+      RECT 1.015000  0.995000 1.315000 1.495000 ;
+      RECT 1.515000  0.085000 1.900000 0.485000 ;
+      RECT 1.515000  2.210000 1.900000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
index ba439b9..26533cf 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
@@ -64,19 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.605000  0.085000 0.880000 0.565000 ;
-        RECT 1.625000  0.085000 1.880000 0.565000 ;
-        RECT 2.585000  0.085000 2.865000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -85,31 +72,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.615000 1.835000 0.925000 2.635000 ;
-        RECT 1.625000 2.175000 1.880000 2.635000 ;
-        RECT 2.545000 1.845000 2.875000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.385000 0.585000 ;
-      RECT 0.085000 0.585000 0.255000 1.495000 ;
-      RECT 0.085000 1.495000 1.215000 1.665000 ;
-      RECT 0.085000 1.665000 0.395000 2.465000 ;
-      RECT 0.995000 1.075000 2.240000 1.245000 ;
-      RECT 0.995000 1.245000 1.215000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.255000 0.385000 0.585000 ;
+      RECT 0.085000  0.585000 0.255000 1.495000 ;
+      RECT 0.085000  1.495000 1.215000 1.665000 ;
+      RECT 0.085000  1.665000 0.395000 2.465000 ;
+      RECT 0.605000  0.085000 0.880000 0.565000 ;
+      RECT 0.615000  1.835000 0.925000 2.635000 ;
+      RECT 0.995000  1.075000 2.240000 1.245000 ;
+      RECT 0.995000  1.245000 1.215000 1.495000 ;
+      RECT 1.625000  0.085000 1.880000 0.565000 ;
+      RECT 1.625000  2.175000 1.880000 2.635000 ;
+      RECT 2.545000  1.845000 2.875000 2.635000 ;
+      RECT 2.585000  0.085000 2.865000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
index 4fb5ae8..784b272 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
@@ -64,24 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.145000  0.085000 0.395000 0.545000 ;
-        RECT 1.065000  0.085000 1.335000 0.610000 ;
-        RECT 2.005000  0.085000 2.275000 0.565000 ;
-        RECT 2.945000  0.085000 3.215000 0.565000 ;
-        RECT 3.885000  0.085000 4.155000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -90,33 +72,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.095000 1.495000 0.395000 2.635000 ;
-        RECT 1.065000 1.495000 1.335000 2.635000 ;
-        RECT 2.005000 1.835000 2.275000 2.635000 ;
-        RECT 2.945000 1.835000 3.215000 2.635000 ;
-        RECT 3.885000 1.835000 4.155000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.565000 0.265000 0.895000 1.075000 ;
-      RECT 0.565000 1.075000 3.390000 1.325000 ;
-      RECT 0.565000 1.325000 0.895000 2.465000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.095000  1.495000 0.395000 2.635000 ;
+      RECT 0.145000  0.085000 0.395000 0.545000 ;
+      RECT 0.565000  0.265000 0.895000 1.075000 ;
+      RECT 0.565000  1.075000 3.390000 1.325000 ;
+      RECT 0.565000  1.325000 0.895000 2.465000 ;
+      RECT 1.065000  0.085000 1.335000 0.610000 ;
+      RECT 1.065000  1.495000 1.335000 2.635000 ;
+      RECT 2.005000  0.085000 2.275000 0.565000 ;
+      RECT 2.005000  1.835000 2.275000 2.635000 ;
+      RECT 2.945000  0.085000 3.215000 0.565000 ;
+      RECT 2.945000  1.835000 3.215000 2.635000 ;
+      RECT 3.885000  0.085000 4.155000 0.565000 ;
+      RECT 3.885000  1.835000 4.155000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
index f9c549e..3078061 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
@@ -66,27 +66,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.145000  0.085000 0.390000 0.545000 ;
-        RECT 1.090000  0.085000 1.350000 0.610000 ;
-        RECT 2.050000  0.085000 2.310000 0.565000 ;
-        RECT 3.010000  0.085000 3.270000 0.565000 ;
-        RECT 3.970000  0.085000 4.230000 0.565000 ;
-        RECT 4.930000  0.085000 5.230000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -95,36 +74,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.095000 1.525000 0.390000 2.635000 ;
-        RECT 1.090000 1.525000 1.350000 2.635000 ;
-        RECT 2.050000 1.905000 2.310000 2.635000 ;
-        RECT 3.010000 1.905000 3.270000 2.635000 ;
-        RECT 3.970000 1.905000 4.230000 2.635000 ;
-        RECT 4.930000 1.905000 5.225000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.620000 0.265000 0.870000 1.075000 ;
-      RECT 0.620000 1.075000 3.990000 1.325000 ;
-      RECT 0.620000 1.325000 0.870000 2.460000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.095000  1.525000 0.390000 2.635000 ;
+      RECT 0.145000  0.085000 0.390000 0.545000 ;
+      RECT 0.620000  0.265000 0.870000 1.075000 ;
+      RECT 0.620000  1.075000 3.990000 1.325000 ;
+      RECT 0.620000  1.325000 0.870000 2.460000 ;
+      RECT 1.090000  0.085000 1.350000 0.610000 ;
+      RECT 1.090000  1.525000 1.350000 2.635000 ;
+      RECT 2.050000  0.085000 2.310000 0.565000 ;
+      RECT 2.050000  1.905000 2.310000 2.635000 ;
+      RECT 3.010000  0.085000 3.270000 0.565000 ;
+      RECT 3.010000  1.905000 3.270000 2.635000 ;
+      RECT 3.970000  0.085000 4.230000 0.565000 ;
+      RECT 3.970000  1.905000 4.230000 2.635000 ;
+      RECT 4.930000  0.085000 5.230000 0.565000 ;
+      RECT 4.930000  1.905000 5.225000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
index eafdd40..47b535c 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
@@ -58,14 +58,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 1.115000  0.085000 1.395000 0.590000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -74,19 +66,27 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.085000 1.665000 0.345000 2.635000 ;
-        RECT 1.115000 1.665000 1.395000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.085000  1.665000 0.345000 2.635000 ;
+      RECT 1.115000  0.085000 1.395000 0.590000 ;
+      RECT 1.115000  1.665000 1.395000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
index fe490fc..0cbb02b 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
@@ -74,36 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 1.165000  0.085000 1.835000 0.525000 ;
-        RECT 2.445000  0.085000 2.775000 0.525000 ;
-        RECT 3.385000  0.085000 3.715000 0.525000 ;
-        RECT 4.325000  0.085000 4.655000 0.525000 ;
-        RECT 5.265000  0.085000 5.595000 0.525000 ;
-        RECT 6.205000  0.085000 6.535000 0.525000 ;
-        RECT 7.145000  0.085000 7.815000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -112,43 +82,73 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.095000 1.800000 0.425000 2.635000 ;
-        RECT 1.035000 1.800000 1.365000 2.635000 ;
-        RECT 1.975000 1.800000 2.305000 2.635000 ;
-        RECT 2.915000 1.800000 3.245000 2.635000 ;
-        RECT 3.855000 1.800000 4.185000 2.635000 ;
-        RECT 4.795000 1.800000 5.125000 2.635000 ;
-        RECT 5.735000 1.800000 6.065000 2.635000 ;
-        RECT 6.675000 1.800000 7.005000 2.635000 ;
-        RECT 7.615000 1.800000 7.945000 2.635000 ;
-        RECT 8.555000 1.800000 8.885000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.095000  1.800000 0.425000 2.635000 ;
+      RECT 1.035000  1.800000 1.365000 2.635000 ;
+      RECT 1.165000  0.085000 1.835000 0.525000 ;
+      RECT 1.975000  1.800000 2.305000 2.635000 ;
+      RECT 2.445000  0.085000 2.775000 0.525000 ;
+      RECT 2.915000  1.800000 3.245000 2.635000 ;
+      RECT 3.385000  0.085000 3.715000 0.525000 ;
+      RECT 3.855000  1.800000 4.185000 2.635000 ;
+      RECT 4.325000  0.085000 4.655000 0.525000 ;
+      RECT 4.795000  1.800000 5.125000 2.635000 ;
+      RECT 5.265000  0.085000 5.595000 0.525000 ;
+      RECT 5.735000  1.800000 6.065000 2.635000 ;
+      RECT 6.205000  0.085000 6.535000 0.525000 ;
+      RECT 6.675000  1.800000 7.005000 2.635000 ;
+      RECT 7.145000  0.085000 7.815000 0.525000 ;
+      RECT 7.615000  1.800000 7.945000 2.635000 ;
+      RECT 8.555000  1.800000 8.885000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
index c90ffc3..6ebb614 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_16.magic.lef
@@ -39,14 +39,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.345000 0.895000  2.355000 1.275000 ;
-        RECT 9.930000 0.895000 11.910000 1.275000 ;
-      LAYER mcon ;
-        RECT  1.675000 1.105000  1.845000 1.275000 ;
-        RECT  2.185000 1.105000  2.355000 1.275000 ;
-        RECT 10.395000 1.105000 10.565000 1.275000 ;
-        RECT 10.905000 1.105000 11.075000 1.275000 ;
       LAYER met1 ;
         RECT  1.615000 1.075000  2.415000 1.120000 ;
         RECT  1.615000 1.120000 11.135000 1.260000 ;
@@ -89,45 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 12.420000 0.085000 ;
-        RECT 2.055000  0.085000  2.325000 0.610000 ;
-        RECT 3.020000  0.085000  3.285000 0.610000 ;
-        RECT 3.980000  0.085000  4.245000 0.610000 ;
-        RECT 4.965000  0.085000  5.230000 0.610000 ;
-        RECT 6.090000  0.085000  6.355000 0.610000 ;
-        RECT 7.050000  0.085000  7.275000 0.610000 ;
-        RECT 8.010000  0.085000  8.275000 0.610000 ;
-        RECT 8.970000  0.085000  9.235000 0.610000 ;
-        RECT 9.930000  0.085000 10.195000 0.610000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
@@ -136,54 +89,99 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.420000 2.805000 ;
-        RECT  0.140000 1.495000  0.405000 2.635000 ;
-        RECT  1.100000 1.835000  1.360000 2.635000 ;
-        RECT  2.065000 1.835000  2.320000 2.635000 ;
-        RECT  3.020000 1.835000  3.280000 2.635000 ;
-        RECT  3.985000 1.835000  4.240000 2.635000 ;
-        RECT  4.965000 1.835000  5.220000 2.635000 ;
-        RECT  6.090000 1.835000  6.345000 2.120000 ;
-        RECT  6.090000 2.120000  6.350000 2.635000 ;
-        RECT  7.055000 1.835000  7.310000 2.635000 ;
-        RECT  8.015000 1.835000  8.270000 2.635000 ;
-        RECT  8.975000 1.835000  9.230000 2.635000 ;
-        RECT  9.935000 1.835000 10.190000 2.635000 ;
-        RECT 10.895000 1.835000 11.150000 2.635000 ;
-        RECT 11.850000 1.835000 12.110000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.420000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT  0.000000 -0.085000 12.420000 0.085000 ;
+      RECT  0.000000  2.635000 12.420000 2.805000 ;
+      RECT  0.140000  1.495000  0.405000 2.635000 ;
+      RECT  0.345000  0.895000  2.355000 1.275000 ;
+      RECT  1.100000  1.835000  1.360000 2.635000 ;
+      RECT  2.055000  0.085000  2.325000 0.610000 ;
+      RECT  2.065000  1.835000  2.320000 2.635000 ;
+      RECT  3.020000  0.085000  3.285000 0.610000 ;
+      RECT  3.020000  1.835000  3.280000 2.635000 ;
+      RECT  3.980000  0.085000  4.245000 0.610000 ;
+      RECT  3.985000  1.835000  4.240000 2.635000 ;
+      RECT  4.965000  0.085000  5.230000 0.610000 ;
+      RECT  4.965000  1.835000  5.220000 2.635000 ;
+      RECT  6.090000  0.085000  6.355000 0.610000 ;
+      RECT  6.090000  1.835000  6.345000 2.120000 ;
+      RECT  6.090000  2.120000  6.350000 2.635000 ;
+      RECT  7.050000  0.085000  7.275000 0.610000 ;
+      RECT  7.055000  1.835000  7.310000 2.635000 ;
+      RECT  8.010000  0.085000  8.275000 0.610000 ;
+      RECT  8.015000  1.835000  8.270000 2.635000 ;
+      RECT  8.970000  0.085000  9.235000 0.610000 ;
+      RECT  8.975000  1.835000  9.230000 2.635000 ;
+      RECT  9.930000  0.085000 10.195000 0.610000 ;
+      RECT  9.930000  0.895000 11.910000 1.275000 ;
+      RECT  9.935000  1.835000 10.190000 2.635000 ;
+      RECT 10.895000  1.835000 11.150000 2.635000 ;
+      RECT 11.850000  1.835000 12.110000 2.635000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.675000  1.105000  1.845000 1.275000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.185000  1.105000  2.355000 1.275000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.395000  1.105000 10.565000 1.275000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 10.905000  1.105000 11.075000 1.275000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
index c0a8869..6b3c92d 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
@@ -61,16 +61,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.560000  0.085000 0.905000 0.610000 ;
-        RECT 1.520000  0.085000 1.900000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -79,20 +69,30 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.630000 1.800000 0.890000 2.635000 ;
-        RECT 1.605000 1.800000 1.860000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.560000  0.085000 0.905000 0.610000 ;
+      RECT 0.630000  1.800000 0.890000 2.635000 ;
+      RECT 1.520000  0.085000 1.900000 0.555000 ;
+      RECT 1.605000  1.800000 1.860000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
index 6219e0c..1f1f41c 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
@@ -64,20 +64,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.565000  0.085000 0.910000 0.555000 ;
-        RECT 1.610000  0.085000 1.870000 0.555000 ;
-        RECT 2.565000  0.085000 2.865000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -86,25 +72,39 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.085000 1.800000 0.430000 2.635000 ;
-        RECT 1.130000 1.800000 1.390000 2.635000 ;
-        RECT 2.090000 1.800000 2.350000 2.635000 ;
-        RECT 3.050000 1.800000 3.435000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  1.800000 0.430000 2.635000 ;
+      RECT 0.565000  0.085000 0.910000 0.555000 ;
+      RECT 1.130000  1.800000 1.390000 2.635000 ;
+      RECT 1.610000  0.085000 1.870000 0.555000 ;
+      RECT 2.090000  1.800000 2.350000 2.635000 ;
+      RECT 2.565000  0.085000 2.865000 0.555000 ;
+      RECT 3.050000  1.800000 3.435000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
index 72d3b36..47b767a 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
@@ -69,28 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 1.135000  0.085000 1.465000 0.525000 ;
-        RECT 2.095000  0.085000 2.425000 0.525000 ;
-        RECT 3.055000  0.085000 3.435000 0.525000 ;
-        RECT 4.015000  0.085000 4.445000 0.525000 ;
-        RECT 5.075000  0.085000 5.505000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -99,34 +77,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.135000 1.800000 0.395000 2.635000 ;
-        RECT 1.075000 1.800000 1.335000 2.635000 ;
-        RECT 2.015000 1.800000 2.275000 2.635000 ;
-        RECT 2.965000 1.800000 3.210000 2.635000 ;
-        RECT 3.895000 1.800000 4.200000 2.635000 ;
-        RECT 4.945000 1.800000 5.245000 2.635000 ;
-        RECT 5.925000 1.800000 6.180000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.135000  1.800000 0.395000 2.635000 ;
+      RECT 1.075000  1.800000 1.335000 2.635000 ;
+      RECT 1.135000  0.085000 1.465000 0.525000 ;
+      RECT 2.015000  1.800000 2.275000 2.635000 ;
+      RECT 2.095000  0.085000 2.425000 0.525000 ;
+      RECT 2.965000  1.800000 3.210000 2.635000 ;
+      RECT 3.055000  0.085000 3.435000 0.525000 ;
+      RECT 3.895000  1.800000 4.200000 2.635000 ;
+      RECT 4.015000  0.085000 4.445000 0.525000 ;
+      RECT 4.945000  1.800000 5.245000 2.635000 ;
+      RECT 5.075000  0.085000 5.505000 0.525000 ;
+      RECT 5.925000  1.800000 6.180000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
index ad2b8ed..628bfa1 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
@@ -57,14 +57,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.295000  0.085000 0.615000 0.745000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -73,20 +65,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.225000 1.835000 0.555000 2.625000 ;
-        RECT 0.225000 2.625000 1.665000 2.635000 ;
-        RECT 1.405000 1.455000 1.665000 2.625000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.225000  1.835000 0.555000 2.625000 ;
+      RECT 0.225000  2.625000 1.665000 2.635000 ;
+      RECT 0.295000  0.085000 0.615000 0.745000 ;
+      RECT 1.405000  1.455000 1.665000 2.625000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
index 4429f7a..a031dd3 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
@@ -60,17 +60,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.575000 ;
-        RECT 1.675000  0.085000 2.000000 0.775000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -79,22 +68,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.095000 1.495000 0.420000 2.635000 ;
-        RECT 1.185000 1.465000 1.460000 2.635000 ;
-        RECT 2.225000 1.465000 2.505000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.575000 ;
+      RECT 0.095000  1.495000 0.420000 2.635000 ;
+      RECT 1.185000  1.465000 1.460000 2.635000 ;
+      RECT 1.675000  0.085000 2.000000 0.775000 ;
+      RECT 2.225000  1.465000 2.505000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
index fe2db71..b08c663 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
@@ -82,21 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.485000 ;
-        RECT 3.250000  0.085000 3.765000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -105,38 +90,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.645000 1.495000 0.815000 2.635000 ;
-        RECT 3.585000 1.835000 3.815000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.655000 1.610000 0.825000 ;
-      RECT 0.515000 0.825000 0.685000 1.325000 ;
-      RECT 1.435000 0.255000 1.955000 0.620000 ;
-      RECT 1.435000 0.620000 1.610000 0.655000 ;
-      RECT 1.440000 0.825000 1.610000 1.955000 ;
-      RECT 1.440000 1.955000 2.885000 2.125000 ;
-      RECT 3.325000 0.695000 4.385000 0.865000 ;
-      RECT 3.325000 0.865000 3.495000 1.185000 ;
-      RECT 3.985000 1.835000 4.385000 2.465000 ;
-      RECT 4.035000 0.255000 4.280000 0.695000 ;
-      RECT 4.215000 0.865000 4.385000 1.835000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.515000  0.085000 0.895000 0.485000 ;
+      RECT 0.515000  0.655000 1.610000 0.825000 ;
+      RECT 0.515000  0.825000 0.685000 1.325000 ;
+      RECT 0.645000  1.495000 0.815000 2.635000 ;
+      RECT 1.435000  0.255000 1.955000 0.620000 ;
+      RECT 1.435000  0.620000 1.610000 0.655000 ;
+      RECT 1.440000  0.825000 1.610000 1.955000 ;
+      RECT 1.440000  1.955000 2.885000 2.125000 ;
+      RECT 3.250000  0.085000 3.765000 0.525000 ;
+      RECT 3.325000  0.695000 4.385000 0.865000 ;
+      RECT 3.325000  0.865000 3.495000 1.185000 ;
+      RECT 3.585000  1.835000 3.815000 2.635000 ;
+      RECT 3.985000  1.835000 4.385000 2.465000 ;
+      RECT 4.035000  0.255000 4.280000 0.695000 ;
+      RECT 4.215000  0.865000 4.385000 1.835000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
index b9f72eb..5f8679e 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
@@ -82,23 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.135000  0.085000 0.385000 0.655000 ;
-        RECT 0.975000  0.085000 1.355000 0.485000 ;
-        RECT 3.710000  0.085000 4.225000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -107,40 +90,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.135000 1.495000 0.380000 2.635000 ;
-        RECT 1.075000 1.495000 1.325000 2.635000 ;
-        RECT 4.045000 1.835000 4.275000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.975000 0.655000 2.070000 0.825000 ;
-      RECT 0.975000 0.825000 1.145000 1.325000 ;
-      RECT 1.895000 0.255000 2.580000 0.620000 ;
-      RECT 1.895000 0.620000 2.070000 0.655000 ;
-      RECT 1.900000 0.825000 2.070000 1.955000 ;
-      RECT 1.900000 1.955000 3.345000 2.125000 ;
-      RECT 3.785000 0.695000 4.845000 0.865000 ;
-      RECT 3.785000 0.865000 3.955000 1.185000 ;
-      RECT 4.445000 1.835000 4.845000 2.465000 ;
-      RECT 4.495000 0.255000 4.740000 0.695000 ;
-      RECT 4.675000 0.865000 4.845000 1.835000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.135000  0.085000 0.385000 0.655000 ;
+      RECT 0.135000  1.495000 0.380000 2.635000 ;
+      RECT 0.975000  0.085000 1.355000 0.485000 ;
+      RECT 0.975000  0.655000 2.070000 0.825000 ;
+      RECT 0.975000  0.825000 1.145000 1.325000 ;
+      RECT 1.075000  1.495000 1.325000 2.635000 ;
+      RECT 1.895000  0.255000 2.580000 0.620000 ;
+      RECT 1.895000  0.620000 2.070000 0.655000 ;
+      RECT 1.900000  0.825000 2.070000 1.955000 ;
+      RECT 1.900000  1.955000 3.345000 2.125000 ;
+      RECT 3.710000  0.085000 4.225000 0.525000 ;
+      RECT 3.785000  0.695000 4.845000 0.865000 ;
+      RECT 3.785000  0.865000 3.955000 1.185000 ;
+      RECT 4.045000  1.835000 4.275000 2.635000 ;
+      RECT 4.445000  1.835000 4.845000 2.465000 ;
+      RECT 4.495000  0.255000 4.740000 0.695000 ;
+      RECT 4.675000  0.865000 4.845000 1.835000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
index a2f0279..ed92007 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
@@ -87,26 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.175000  0.085000 0.420000 0.655000 ;
-        RECT 1.055000  0.085000 1.305000 0.655000 ;
-        RECT 1.915000  0.085000 2.275000 0.485000 ;
-        RECT 4.630000  0.085000 5.145000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -115,43 +95,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.135000 1.495000 0.395000 2.635000 ;
-        RECT 1.065000 1.495000 1.305000 2.635000 ;
-        RECT 2.005000 1.495000 2.280000 2.635000 ;
-        RECT 4.965000 1.835000 5.195000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.915000 0.655000 2.990000 0.825000 ;
-      RECT 1.915000 0.825000 2.085000 1.325000 ;
-      RECT 2.815000 0.255000 3.500000 0.620000 ;
-      RECT 2.815000 0.620000 2.990000 0.655000 ;
-      RECT 2.820000 0.825000 2.990000 1.955000 ;
-      RECT 2.820000 1.955000 4.265000 2.125000 ;
-      RECT 4.705000 0.695000 5.765000 0.865000 ;
-      RECT 4.705000 0.865000 4.875000 1.185000 ;
-      RECT 5.365000 1.835000 5.765000 2.465000 ;
-      RECT 5.415000 0.255000 5.660000 0.695000 ;
-      RECT 5.595000 0.865000 5.765000 1.835000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.135000  1.495000 0.395000 2.635000 ;
+      RECT 0.175000  0.085000 0.420000 0.655000 ;
+      RECT 1.055000  0.085000 1.305000 0.655000 ;
+      RECT 1.065000  1.495000 1.305000 2.635000 ;
+      RECT 1.915000  0.085000 2.275000 0.485000 ;
+      RECT 1.915000  0.655000 2.990000 0.825000 ;
+      RECT 1.915000  0.825000 2.085000 1.325000 ;
+      RECT 2.005000  1.495000 2.280000 2.635000 ;
+      RECT 2.815000  0.255000 3.500000 0.620000 ;
+      RECT 2.815000  0.620000 2.990000 0.655000 ;
+      RECT 2.820000  0.825000 2.990000 1.955000 ;
+      RECT 2.820000  1.955000 4.265000 2.125000 ;
+      RECT 4.630000  0.085000 5.145000 0.525000 ;
+      RECT 4.705000  0.695000 5.765000 0.865000 ;
+      RECT 4.705000  0.865000 4.875000 1.185000 ;
+      RECT 4.965000  1.835000 5.195000 2.635000 ;
+      RECT 5.365000  1.835000 5.765000 2.465000 ;
+      RECT 5.415000  0.255000 5.660000 0.695000 ;
+      RECT 5.595000  0.865000 5.765000 1.835000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
index 92c2dc6..7642b22 100644
--- a/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
+++ b/cells/conb/sky130_fd_sc_hdll__conb_1.magic.lef
@@ -54,13 +54,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.775000  0.085000 1.115000 0.745000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -69,17 +62,24 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.275000 1.910000 0.605000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.380000 0.085000 ;
+      RECT 0.000000  2.635000 1.380000 2.805000 ;
+      RECT 0.275000  1.910000 0.605000 2.635000 ;
+      RECT 0.775000  0.085000 1.115000 0.745000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
index 82df14e..1ae855d 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
@@ -38,23 +38,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.085000  0.085000 5.430000 0.855000 ;
-        RECT 0.085000  0.855000 2.665000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -63,27 +46,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.085000 1.545000 5.430000 2.635000 ;
-        RECT 2.835000 1.025000 5.430000 1.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.085000  0.085000 5.430000 0.855000 ;
+      RECT 0.085000  0.855000 2.665000 1.375000 ;
+      RECT 0.085000  1.545000 5.430000 2.635000 ;
+      RECT 2.835000  1.025000 5.430000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
index 1af50de..a40a6f4 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
@@ -38,14 +38,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.085000  0.085000 1.295000 0.835000 ;
-        RECT 0.085000  0.835000 0.605000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -54,18 +46,26 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.085000 1.545000 1.295000 2.635000 ;
-        RECT 0.775000 1.005000 1.295000 1.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.380000 0.085000 ;
+      RECT 0.000000  2.635000 1.380000 2.805000 ;
+      RECT 0.085000  0.085000 1.295000 0.835000 ;
+      RECT 0.085000  0.835000 0.605000 1.375000 ;
+      RECT 0.085000  1.545000 1.295000 2.635000 ;
+      RECT 0.775000  1.005000 1.295000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
index 7bdc9c6..c05623e 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
@@ -38,15 +38,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.085000  0.085000 1.755000 0.855000 ;
-        RECT 0.085000  0.855000 0.835000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -55,19 +46,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.085000 1.545000 1.755000 2.635000 ;
-        RECT 1.005000 1.025000 1.755000 1.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.085000  0.085000 1.755000 0.855000 ;
+      RECT 0.085000  0.855000 0.835000 1.375000 ;
+      RECT 0.085000  1.545000 1.755000 2.635000 ;
+      RECT 1.005000  1.025000 1.755000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
index 4ab6b76..fafe54a 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
@@ -38,17 +38,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.085000  0.085000 2.675000 0.855000 ;
-        RECT 0.085000  0.855000 1.295000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -57,21 +46,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.085000 1.545000 2.675000 2.635000 ;
-        RECT 1.465000 1.025000 2.675000 1.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.085000 2.675000 0.855000 ;
+      RECT 0.085000  0.855000 1.295000 1.375000 ;
+      RECT 0.085000  1.545000 2.675000 2.635000 ;
+      RECT 1.465000  1.025000 2.675000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
index fa5cbd0..3dcb213 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
@@ -38,19 +38,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.085000  0.085000 3.595000 0.855000 ;
-        RECT 0.085000  0.855000 1.735000 1.375000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -59,23 +46,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.085000 1.545000 3.595000 2.635000 ;
-        RECT 1.905000 1.025000 3.595000 1.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.085000 3.595000 0.855000 ;
+      RECT 0.085000  0.855000 1.735000 1.375000 ;
+      RECT 0.085000  1.545000 3.595000 2.635000 ;
+      RECT 1.905000  1.025000 3.595000 1.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
index b9e01d5..330e9ba 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_1.magic.lef
@@ -67,13 +67,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 3.805000 0.765000 4.645000 1.015000 ;
-        RECT 7.505000 0.635000 7.905000 1.405000 ;
-      LAYER mcon ;
-        RECT 4.105000 0.765000 4.275000 0.935000 ;
-        RECT 4.465000 0.765000 4.635000 0.935000 ;
-        RECT 7.635000 0.765000 7.805000 0.935000 ;
       LAYER met1 ;
         RECT 3.995000 0.735000 4.745000 0.780000 ;
         RECT 3.995000 0.780000 7.865000 0.920000 ;
@@ -86,35 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.465000 ;
-        RECT 1.575000  0.085000 1.905000 0.445000 ;
-        RECT 4.525000  0.085000 4.855000 0.545000 ;
-        RECT 6.825000  0.085000 6.995000 0.525000 ;
-        RECT 8.810000  0.085000 8.980000 0.895000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -123,103 +87,133 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.515000 2.135000 0.895000 2.635000 ;
-        RECT 1.770000 2.175000 1.940000 2.635000 ;
-        RECT 3.990000 2.205000 4.320000 2.635000 ;
-        RECT 5.005000 2.175000 5.425000 2.635000 ;
-        RECT 7.340000 2.175000 7.590000 2.635000 ;
-        RECT 8.160000 2.255000 8.540000 2.635000 ;
-        RECT 8.810000 1.575000 8.980000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.345000 0.345000 0.635000 ;
-      RECT 0.090000 0.635000 0.890000 0.805000 ;
-      RECT 0.090000 1.795000 0.890000 1.965000 ;
-      RECT 0.090000 1.965000 0.345000 2.465000 ;
-      RECT 0.660000 0.805000 0.890000 1.795000 ;
-      RECT 1.115000 0.345000 1.285000 2.465000 ;
-      RECT 2.075000 0.305000 2.495000 0.475000 ;
-      RECT 2.075000 0.475000 2.245000 1.835000 ;
-      RECT 2.075000 1.835000 2.340000 2.005000 ;
-      RECT 2.170000 2.005000 2.340000 2.135000 ;
-      RECT 2.170000 2.135000 2.420000 2.465000 ;
-      RECT 2.425000 0.765000 2.685000 1.385000 ;
-      RECT 2.510000 1.575000 3.025000 1.965000 ;
-      RECT 2.685000 2.135000 3.365000 2.465000 ;
-      RECT 2.695000 0.305000 3.600000 0.475000 ;
-      RECT 2.855000 0.765000 3.210000 0.985000 ;
-      RECT 2.855000 0.985000 3.025000 1.575000 ;
-      RECT 3.195000 1.185000 4.985000 1.355000 ;
-      RECT 3.195000 1.355000 3.365000 2.135000 ;
-      RECT 3.430000 0.475000 3.600000 1.185000 ;
-      RECT 3.535000 1.865000 4.710000 2.035000 ;
-      RECT 3.535000 2.035000 3.705000 2.375000 ;
-      RECT 3.725000 1.525000 5.325000 1.695000 ;
-      RECT 4.540000 2.035000 4.710000 2.375000 ;
-      RECT 4.815000 1.005000 4.985000 1.185000 ;
-      RECT 5.065000 0.275000 5.465000 0.445000 ;
-      RECT 5.065000 0.445000 5.325000 0.835000 ;
-      RECT 5.155000 0.835000 5.325000 1.525000 ;
-      RECT 5.155000 1.695000 5.325000 1.835000 ;
-      RECT 5.155000 1.835000 5.815000 2.005000 ;
-      RECT 5.605000 0.705000 5.775000 1.495000 ;
-      RECT 5.605000 1.495000 6.315000 1.655000 ;
-      RECT 5.605000 1.655000 6.660000 1.665000 ;
-      RECT 5.645000 2.005000 5.815000 2.465000 ;
-      RECT 5.735000 0.255000 6.655000 0.535000 ;
-      RECT 5.945000 0.705000 6.315000 1.325000 ;
-      RECT 6.050000 2.125000 7.005000 2.465000 ;
-      RECT 6.145000 1.665000 6.660000 1.955000 ;
-      RECT 6.485000 0.535000 6.655000 1.315000 ;
-      RECT 6.485000 1.315000 7.055000 1.485000 ;
-      RECT 6.835000 1.485000 7.055000 1.575000 ;
-      RECT 6.835000 1.575000 8.270000 1.745000 ;
-      RECT 6.835000 1.745000 7.005000 2.125000 ;
-      RECT 6.955000 0.695000 7.335000 0.865000 ;
-      RECT 6.955000 0.865000 7.225000 1.145000 ;
-      RECT 7.165000 0.295000 8.635000 0.465000 ;
-      RECT 7.165000 0.465000 7.335000 0.695000 ;
-      RECT 7.810000 1.915000 8.610000 2.085000 ;
-      RECT 7.810000 2.085000 7.980000 2.375000 ;
-      RECT 8.290000 0.465000 8.635000 1.075000 ;
-      RECT 8.290000 1.075000 9.070000 1.285000 ;
-      RECT 8.290000 1.285000 8.610000 1.295000 ;
-      RECT 8.440000 1.295000 8.610000 1.915000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.090000  0.345000 0.345000 0.635000 ;
+      RECT 0.090000  0.635000 0.890000 0.805000 ;
+      RECT 0.090000  1.795000 0.890000 1.965000 ;
+      RECT 0.090000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.895000 0.465000 ;
+      RECT 0.515000  2.135000 0.895000 2.635000 ;
+      RECT 0.660000  0.805000 0.890000 1.795000 ;
+      RECT 1.115000  0.345000 1.285000 2.465000 ;
+      RECT 1.575000  0.085000 1.905000 0.445000 ;
+      RECT 1.770000  2.175000 1.940000 2.635000 ;
+      RECT 2.075000  0.305000 2.495000 0.475000 ;
+      RECT 2.075000  0.475000 2.245000 1.835000 ;
+      RECT 2.075000  1.835000 2.340000 2.005000 ;
+      RECT 2.170000  2.005000 2.340000 2.135000 ;
+      RECT 2.170000  2.135000 2.420000 2.465000 ;
+      RECT 2.425000  0.765000 2.685000 1.385000 ;
+      RECT 2.510000  1.575000 3.025000 1.965000 ;
+      RECT 2.685000  2.135000 3.365000 2.465000 ;
+      RECT 2.695000  0.305000 3.600000 0.475000 ;
+      RECT 2.855000  0.765000 3.210000 0.985000 ;
+      RECT 2.855000  0.985000 3.025000 1.575000 ;
+      RECT 3.195000  1.185000 4.985000 1.355000 ;
+      RECT 3.195000  1.355000 3.365000 2.135000 ;
+      RECT 3.430000  0.475000 3.600000 1.185000 ;
+      RECT 3.535000  1.865000 4.710000 2.035000 ;
+      RECT 3.535000  2.035000 3.705000 2.375000 ;
+      RECT 3.725000  1.525000 5.325000 1.695000 ;
+      RECT 3.805000  0.765000 4.645000 1.015000 ;
+      RECT 3.990000  2.205000 4.320000 2.635000 ;
+      RECT 4.525000  0.085000 4.855000 0.545000 ;
+      RECT 4.540000  2.035000 4.710000 2.375000 ;
+      RECT 4.815000  1.005000 4.985000 1.185000 ;
+      RECT 5.005000  2.175000 5.425000 2.635000 ;
+      RECT 5.065000  0.275000 5.465000 0.445000 ;
+      RECT 5.065000  0.445000 5.325000 0.835000 ;
+      RECT 5.155000  0.835000 5.325000 1.525000 ;
+      RECT 5.155000  1.695000 5.325000 1.835000 ;
+      RECT 5.155000  1.835000 5.815000 2.005000 ;
+      RECT 5.605000  0.705000 5.775000 1.495000 ;
+      RECT 5.605000  1.495000 6.315000 1.655000 ;
+      RECT 5.605000  1.655000 6.660000 1.665000 ;
+      RECT 5.645000  2.005000 5.815000 2.465000 ;
+      RECT 5.735000  0.255000 6.655000 0.535000 ;
+      RECT 5.945000  0.705000 6.315000 1.325000 ;
+      RECT 6.050000  2.125000 7.005000 2.465000 ;
+      RECT 6.145000  1.665000 6.660000 1.955000 ;
+      RECT 6.485000  0.535000 6.655000 1.315000 ;
+      RECT 6.485000  1.315000 7.055000 1.485000 ;
+      RECT 6.825000  0.085000 6.995000 0.525000 ;
+      RECT 6.835000  1.485000 7.055000 1.575000 ;
+      RECT 6.835000  1.575000 8.270000 1.745000 ;
+      RECT 6.835000  1.745000 7.005000 2.125000 ;
+      RECT 6.955000  0.695000 7.335000 0.865000 ;
+      RECT 6.955000  0.865000 7.225000 1.145000 ;
+      RECT 7.165000  0.295000 8.635000 0.465000 ;
+      RECT 7.165000  0.465000 7.335000 0.695000 ;
+      RECT 7.340000  2.175000 7.590000 2.635000 ;
+      RECT 7.505000  0.635000 7.905000 1.405000 ;
+      RECT 7.810000  1.915000 8.610000 2.085000 ;
+      RECT 7.810000  2.085000 7.980000 2.375000 ;
+      RECT 8.160000  2.255000 8.540000 2.635000 ;
+      RECT 8.290000  0.465000 8.635000 1.075000 ;
+      RECT 8.290000  1.075000 9.070000 1.285000 ;
+      RECT 8.290000  1.285000 8.610000 1.295000 ;
+      RECT 8.440000  1.295000 8.610000 1.915000 ;
+      RECT 8.810000  0.085000 8.980000 0.895000 ;
+      RECT 8.810000  1.575000 8.980000 2.635000 ;
     LAYER mcon ;
-      RECT 0.660000 1.105000 0.830000 1.275000 ;
-      RECT 1.115000 1.785000 1.285000 1.955000 ;
-      RECT 2.480000 1.105000 2.650000 1.275000 ;
-      RECT 2.725000 1.785000 2.895000 1.955000 ;
-      RECT 6.020000 1.105000 6.190000 1.275000 ;
-      RECT 6.470000 1.785000 6.640000 1.955000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.660000  1.105000 0.830000 1.275000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.115000  1.785000 1.285000 1.955000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.480000  1.105000 2.650000 1.275000 ;
+      RECT 2.725000  1.785000 2.895000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.105000  0.765000 4.275000 0.935000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.465000  0.765000 4.635000 0.935000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.020000  1.105000 6.190000 1.275000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.470000  1.785000 6.640000 1.955000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.635000  0.765000 7.805000 0.935000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
     LAYER met1 ;
       RECT 0.600000 1.075000 0.890000 1.120000 ;
       RECT 0.600000 1.120000 6.250000 1.260000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
index 87c03e8..65d6996 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_2.magic.lef
@@ -71,13 +71,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 3.805000 0.765000 4.645000 1.015000 ;
-        RECT 7.505000 0.635000 7.905000 1.405000 ;
-      LAYER mcon ;
-        RECT 4.105000 0.765000 4.275000 0.935000 ;
-        RECT 4.465000 0.765000 4.635000 0.935000 ;
-        RECT 7.635000 0.765000 7.805000 0.935000 ;
       LAYER met1 ;
         RECT 3.995000 0.735000 4.745000 0.780000 ;
         RECT 3.995000 0.780000 7.865000 0.920000 ;
@@ -90,37 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.515000  0.085000  0.895000 0.465000 ;
-        RECT 1.575000  0.085000  1.905000 0.445000 ;
-        RECT 4.525000  0.085000  4.855000 0.545000 ;
-        RECT 6.825000  0.085000  6.995000 0.525000 ;
-        RECT 8.810000  0.085000  8.980000 0.895000 ;
-        RECT 9.750000  0.085000  9.920000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
-        RECT 9.805000 -0.085000 9.975000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -129,105 +91,137 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.515000 2.135000  0.895000 2.635000 ;
-        RECT 1.770000 2.175000  1.940000 2.635000 ;
-        RECT 3.990000 2.205000  4.320000 2.635000 ;
-        RECT 5.005000 2.175000  5.425000 2.635000 ;
-        RECT 7.340000 2.175000  7.590000 2.635000 ;
-        RECT 8.160000 2.255000  8.540000 2.635000 ;
-        RECT 8.810000 1.575000  8.980000 2.635000 ;
-        RECT 9.750000 1.795000  9.920000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        RECT 9.805000 2.635000 9.975000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.345000 0.345000 0.635000 ;
-      RECT 0.090000 0.635000 0.890000 0.805000 ;
-      RECT 0.090000 1.795000 0.890000 1.965000 ;
-      RECT 0.090000 1.965000 0.345000 2.465000 ;
-      RECT 0.660000 0.805000 0.890000 1.795000 ;
-      RECT 1.115000 0.345000 1.285000 2.465000 ;
-      RECT 2.075000 0.305000 2.495000 0.475000 ;
-      RECT 2.075000 0.475000 2.245000 1.835000 ;
-      RECT 2.075000 1.835000 2.340000 2.005000 ;
-      RECT 2.170000 2.005000 2.340000 2.135000 ;
-      RECT 2.170000 2.135000 2.420000 2.465000 ;
-      RECT 2.425000 0.765000 2.685000 1.385000 ;
-      RECT 2.510000 1.575000 3.025000 1.965000 ;
-      RECT 2.685000 2.135000 3.365000 2.465000 ;
-      RECT 2.695000 0.305000 3.600000 0.475000 ;
-      RECT 2.855000 0.765000 3.210000 0.985000 ;
-      RECT 2.855000 0.985000 3.025000 1.575000 ;
-      RECT 3.195000 1.185000 4.985000 1.355000 ;
-      RECT 3.195000 1.355000 3.365000 2.135000 ;
-      RECT 3.430000 0.475000 3.600000 1.185000 ;
-      RECT 3.535000 1.865000 4.710000 2.035000 ;
-      RECT 3.535000 2.035000 3.705000 2.375000 ;
-      RECT 3.725000 1.525000 5.325000 1.695000 ;
-      RECT 4.540000 2.035000 4.710000 2.375000 ;
-      RECT 4.815000 1.005000 4.985000 1.185000 ;
-      RECT 5.065000 0.275000 5.465000 0.445000 ;
-      RECT 5.065000 0.445000 5.325000 0.835000 ;
-      RECT 5.155000 0.835000 5.325000 1.525000 ;
-      RECT 5.155000 1.695000 5.325000 1.835000 ;
-      RECT 5.155000 1.835000 5.815000 2.005000 ;
-      RECT 5.605000 0.705000 5.775000 1.495000 ;
-      RECT 5.605000 1.495000 6.315000 1.655000 ;
-      RECT 5.605000 1.655000 6.660000 1.665000 ;
-      RECT 5.645000 2.005000 5.815000 2.465000 ;
-      RECT 5.735000 0.255000 6.655000 0.535000 ;
-      RECT 5.945000 0.705000 6.315000 1.325000 ;
-      RECT 6.050000 2.125000 7.005000 2.465000 ;
-      RECT 6.145000 1.665000 6.660000 1.955000 ;
-      RECT 6.485000 0.535000 6.655000 1.315000 ;
-      RECT 6.485000 1.315000 7.055000 1.485000 ;
-      RECT 6.835000 1.485000 7.055000 1.575000 ;
-      RECT 6.835000 1.575000 8.270000 1.745000 ;
-      RECT 6.835000 1.745000 7.005000 2.125000 ;
-      RECT 6.955000 0.695000 7.335000 0.865000 ;
-      RECT 6.955000 0.865000 7.225000 1.145000 ;
-      RECT 7.165000 0.295000 8.635000 0.465000 ;
-      RECT 7.165000 0.465000 7.335000 0.695000 ;
-      RECT 7.810000 1.915000 8.610000 2.085000 ;
-      RECT 7.810000 2.085000 7.980000 2.375000 ;
-      RECT 8.290000 0.465000 8.635000 1.075000 ;
-      RECT 8.290000 1.075000 9.335000 1.285000 ;
-      RECT 8.290000 1.285000 8.610000 1.295000 ;
-      RECT 8.440000 1.295000 8.610000 1.915000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.090000  0.345000  0.345000 0.635000 ;
+      RECT 0.090000  0.635000  0.890000 0.805000 ;
+      RECT 0.090000  1.795000  0.890000 1.965000 ;
+      RECT 0.090000  1.965000  0.345000 2.465000 ;
+      RECT 0.515000  0.085000  0.895000 0.465000 ;
+      RECT 0.515000  2.135000  0.895000 2.635000 ;
+      RECT 0.660000  0.805000  0.890000 1.795000 ;
+      RECT 1.115000  0.345000  1.285000 2.465000 ;
+      RECT 1.575000  0.085000  1.905000 0.445000 ;
+      RECT 1.770000  2.175000  1.940000 2.635000 ;
+      RECT 2.075000  0.305000  2.495000 0.475000 ;
+      RECT 2.075000  0.475000  2.245000 1.835000 ;
+      RECT 2.075000  1.835000  2.340000 2.005000 ;
+      RECT 2.170000  2.005000  2.340000 2.135000 ;
+      RECT 2.170000  2.135000  2.420000 2.465000 ;
+      RECT 2.425000  0.765000  2.685000 1.385000 ;
+      RECT 2.510000  1.575000  3.025000 1.965000 ;
+      RECT 2.685000  2.135000  3.365000 2.465000 ;
+      RECT 2.695000  0.305000  3.600000 0.475000 ;
+      RECT 2.855000  0.765000  3.210000 0.985000 ;
+      RECT 2.855000  0.985000  3.025000 1.575000 ;
+      RECT 3.195000  1.185000  4.985000 1.355000 ;
+      RECT 3.195000  1.355000  3.365000 2.135000 ;
+      RECT 3.430000  0.475000  3.600000 1.185000 ;
+      RECT 3.535000  1.865000  4.710000 2.035000 ;
+      RECT 3.535000  2.035000  3.705000 2.375000 ;
+      RECT 3.725000  1.525000  5.325000 1.695000 ;
+      RECT 3.805000  0.765000  4.645000 1.015000 ;
+      RECT 3.990000  2.205000  4.320000 2.635000 ;
+      RECT 4.525000  0.085000  4.855000 0.545000 ;
+      RECT 4.540000  2.035000  4.710000 2.375000 ;
+      RECT 4.815000  1.005000  4.985000 1.185000 ;
+      RECT 5.005000  2.175000  5.425000 2.635000 ;
+      RECT 5.065000  0.275000  5.465000 0.445000 ;
+      RECT 5.065000  0.445000  5.325000 0.835000 ;
+      RECT 5.155000  0.835000  5.325000 1.525000 ;
+      RECT 5.155000  1.695000  5.325000 1.835000 ;
+      RECT 5.155000  1.835000  5.815000 2.005000 ;
+      RECT 5.605000  0.705000  5.775000 1.495000 ;
+      RECT 5.605000  1.495000  6.315000 1.655000 ;
+      RECT 5.605000  1.655000  6.660000 1.665000 ;
+      RECT 5.645000  2.005000  5.815000 2.465000 ;
+      RECT 5.735000  0.255000  6.655000 0.535000 ;
+      RECT 5.945000  0.705000  6.315000 1.325000 ;
+      RECT 6.050000  2.125000  7.005000 2.465000 ;
+      RECT 6.145000  1.665000  6.660000 1.955000 ;
+      RECT 6.485000  0.535000  6.655000 1.315000 ;
+      RECT 6.485000  1.315000  7.055000 1.485000 ;
+      RECT 6.825000  0.085000  6.995000 0.525000 ;
+      RECT 6.835000  1.485000  7.055000 1.575000 ;
+      RECT 6.835000  1.575000  8.270000 1.745000 ;
+      RECT 6.835000  1.745000  7.005000 2.125000 ;
+      RECT 6.955000  0.695000  7.335000 0.865000 ;
+      RECT 6.955000  0.865000  7.225000 1.145000 ;
+      RECT 7.165000  0.295000  8.635000 0.465000 ;
+      RECT 7.165000  0.465000  7.335000 0.695000 ;
+      RECT 7.340000  2.175000  7.590000 2.635000 ;
+      RECT 7.505000  0.635000  7.905000 1.405000 ;
+      RECT 7.810000  1.915000  8.610000 2.085000 ;
+      RECT 7.810000  2.085000  7.980000 2.375000 ;
+      RECT 8.160000  2.255000  8.540000 2.635000 ;
+      RECT 8.290000  0.465000  8.635000 1.075000 ;
+      RECT 8.290000  1.075000  9.335000 1.285000 ;
+      RECT 8.290000  1.285000  8.610000 1.295000 ;
+      RECT 8.440000  1.295000  8.610000 1.915000 ;
+      RECT 8.810000  0.085000  8.980000 0.895000 ;
+      RECT 8.810000  1.575000  8.980000 2.635000 ;
+      RECT 9.750000  0.085000  9.920000 0.555000 ;
+      RECT 9.750000  1.795000  9.920000 2.635000 ;
     LAYER mcon ;
-      RECT 0.660000 1.105000 0.830000 1.275000 ;
-      RECT 1.115000 1.785000 1.285000 1.955000 ;
-      RECT 2.480000 1.105000 2.650000 1.275000 ;
-      RECT 2.725000 1.785000 2.895000 1.955000 ;
-      RECT 6.020000 1.105000 6.190000 1.275000 ;
-      RECT 6.470000 1.785000 6.640000 1.955000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.660000  1.105000 0.830000 1.275000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.115000  1.785000 1.285000 1.955000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.480000  1.105000 2.650000 1.275000 ;
+      RECT 2.725000  1.785000 2.895000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.105000  0.765000 4.275000 0.935000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.465000  0.765000 4.635000 0.935000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.020000  1.105000 6.190000 1.275000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.470000  1.785000 6.640000 1.955000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.635000  0.765000 7.805000 0.935000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
+      RECT 9.805000 -0.085000 9.975000 0.085000 ;
+      RECT 9.805000  2.635000 9.975000 2.805000 ;
     LAYER met1 ;
       RECT 0.600000 1.075000 0.890000 1.120000 ;
       RECT 0.600000 1.120000 6.250000 1.260000 ;
diff --git a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
index ea6b8ee..0d1e07e 100644
--- a/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
+++ b/cells/dfrtp/sky130_fd_sc_hdll__dfrtp_4.magic.lef
@@ -73,15 +73,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 4.175000 0.765000 4.945000 1.015000 ;
-        RECT 7.805000 1.035000 8.395000 1.405000 ;
-        RECT 8.155000 0.635000 8.395000 1.035000 ;
-      LAYER mcon ;
-        RECT 4.285000 0.765000 4.455000 0.935000 ;
-        RECT 4.645000 0.765000 4.815000 0.935000 ;
-        RECT 7.870000 1.080000 8.040000 1.250000 ;
-        RECT 8.165000 0.765000 8.335000 0.935000 ;
       LAYER met1 ;
         RECT 4.175000 0.735000 4.925000 0.780000 ;
         RECT 4.175000 0.780000 8.395000 0.920000 ;
@@ -94,41 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.500000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  1.645000  0.085000  1.975000 0.445000 ;
-        RECT  4.825000  0.085000  5.155000 0.545000 ;
-        RECT  7.355000  0.085000  7.595000 0.525000 ;
-        RECT  9.135000  0.085000  9.305000 0.895000 ;
-        RECT 10.075000  0.085000 10.245000 0.555000 ;
-        RECT 11.015000  0.085000 11.185000 0.555000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.500000 0.240000 ;
     END
@@ -137,110 +93,148 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.500000 2.805000 ;
-        RECT  0.515000 2.135000  0.895000 2.635000 ;
-        RECT  1.950000 2.175000  2.200000 2.635000 ;
-        RECT  4.290000 2.205000  4.620000 2.635000 ;
-        RECT  5.305000 2.175000  5.725000 2.635000 ;
-        RECT  7.640000 2.175000  7.890000 2.635000 ;
-        RECT  8.460000 2.255000  8.840000 2.635000 ;
-        RECT  9.135000 1.575000  9.305000 2.635000 ;
-        RECT 10.075000 1.795000 10.245000 2.635000 ;
-        RECT 11.015000 1.795000 11.185000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.500000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.345000  0.345000 0.635000 ;
-      RECT 0.090000 0.635000  0.890000 0.805000 ;
-      RECT 0.090000 1.795000  0.890000 1.965000 ;
-      RECT 0.090000 1.965000  0.345000 2.465000 ;
-      RECT 0.660000 0.805000  0.890000 1.795000 ;
-      RECT 1.115000 0.345000  1.285000 2.465000 ;
-      RECT 2.145000 0.305000  2.690000 0.475000 ;
-      RECT 2.145000 0.475000  2.315000 1.835000 ;
-      RECT 2.145000 1.835000  2.590000 2.005000 ;
-      RECT 2.420000 2.005000  2.590000 2.135000 ;
-      RECT 2.420000 2.135000  2.670000 2.465000 ;
-      RECT 2.535000 0.765000  2.935000 1.385000 ;
-      RECT 2.760000 1.575000  3.275000 1.965000 ;
-      RECT 2.935000 2.135000  3.665000 2.465000 ;
-      RECT 2.945000 0.305000  3.850000 0.475000 ;
-      RECT 3.105000 0.765000  3.510000 0.985000 ;
-      RECT 3.105000 0.985000  3.275000 1.575000 ;
-      RECT 3.495000 1.185000  5.285000 1.355000 ;
-      RECT 3.495000 1.355000  3.665000 2.135000 ;
-      RECT 3.680000 0.475000  3.850000 1.185000 ;
-      RECT 3.835000 1.865000  5.010000 2.035000 ;
-      RECT 3.835000 2.035000  4.005000 2.375000 ;
-      RECT 4.025000 1.525000  5.675000 1.695000 ;
-      RECT 4.840000 2.035000  5.010000 2.375000 ;
-      RECT 5.115000 1.005000  5.285000 1.185000 ;
-      RECT 5.365000 0.275000  5.765000 0.445000 ;
-      RECT 5.365000 0.445000  5.675000 0.835000 ;
-      RECT 5.505000 0.835000  5.675000 1.525000 ;
-      RECT 5.505000 1.695000  5.675000 1.835000 ;
-      RECT 5.505000 1.835000  6.115000 2.005000 ;
-      RECT 5.915000 0.705000  6.125000 1.495000 ;
-      RECT 5.915000 1.495000  6.690000 1.655000 ;
-      RECT 5.915000 1.655000  7.030000 1.665000 ;
-      RECT 5.945000 2.005000  6.115000 2.465000 ;
-      RECT 6.035000 0.255000  7.135000 0.535000 ;
-      RECT 6.295000 0.705000  6.745000 1.325000 ;
-      RECT 6.350000 2.125000  7.470000 2.465000 ;
-      RECT 6.470000 1.665000  7.030000 1.955000 ;
-      RECT 6.965000 0.535000  7.135000 1.315000 ;
-      RECT 6.965000 1.315000  7.470000 1.485000 ;
-      RECT 7.250000 1.485000  7.470000 1.575000 ;
-      RECT 7.250000 1.575000  8.620000 1.745000 ;
-      RECT 7.250000 1.745000  7.470000 2.125000 ;
-      RECT 7.355000 0.695000  7.935000 0.865000 ;
-      RECT 7.355000 0.865000  7.625000 1.145000 ;
-      RECT 7.765000 0.295000  8.935000 0.465000 ;
-      RECT 7.765000 0.465000  7.935000 0.695000 ;
-      RECT 8.110000 1.915000  8.960000 2.085000 ;
-      RECT 8.110000 2.085000  8.280000 2.375000 ;
-      RECT 8.615000 0.465000  8.935000 0.820000 ;
-      RECT 8.615000 0.820000  8.940000 1.075000 ;
-      RECT 8.615000 1.075000 10.795000 1.285000 ;
-      RECT 8.615000 1.285000  8.960000 1.295000 ;
-      RECT 8.790000 1.295000  8.960000 1.915000 ;
+      RECT  0.000000 -0.085000 11.500000 0.085000 ;
+      RECT  0.000000  2.635000 11.500000 2.805000 ;
+      RECT  0.090000  0.345000  0.345000 0.635000 ;
+      RECT  0.090000  0.635000  0.890000 0.805000 ;
+      RECT  0.090000  1.795000  0.890000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.515000  2.135000  0.895000 2.635000 ;
+      RECT  0.660000  0.805000  0.890000 1.795000 ;
+      RECT  1.115000  0.345000  1.285000 2.465000 ;
+      RECT  1.645000  0.085000  1.975000 0.445000 ;
+      RECT  1.950000  2.175000  2.200000 2.635000 ;
+      RECT  2.145000  0.305000  2.690000 0.475000 ;
+      RECT  2.145000  0.475000  2.315000 1.835000 ;
+      RECT  2.145000  1.835000  2.590000 2.005000 ;
+      RECT  2.420000  2.005000  2.590000 2.135000 ;
+      RECT  2.420000  2.135000  2.670000 2.465000 ;
+      RECT  2.535000  0.765000  2.935000 1.385000 ;
+      RECT  2.760000  1.575000  3.275000 1.965000 ;
+      RECT  2.935000  2.135000  3.665000 2.465000 ;
+      RECT  2.945000  0.305000  3.850000 0.475000 ;
+      RECT  3.105000  0.765000  3.510000 0.985000 ;
+      RECT  3.105000  0.985000  3.275000 1.575000 ;
+      RECT  3.495000  1.185000  5.285000 1.355000 ;
+      RECT  3.495000  1.355000  3.665000 2.135000 ;
+      RECT  3.680000  0.475000  3.850000 1.185000 ;
+      RECT  3.835000  1.865000  5.010000 2.035000 ;
+      RECT  3.835000  2.035000  4.005000 2.375000 ;
+      RECT  4.025000  1.525000  5.675000 1.695000 ;
+      RECT  4.175000  0.765000  4.945000 1.015000 ;
+      RECT  4.290000  2.205000  4.620000 2.635000 ;
+      RECT  4.825000  0.085000  5.155000 0.545000 ;
+      RECT  4.840000  2.035000  5.010000 2.375000 ;
+      RECT  5.115000  1.005000  5.285000 1.185000 ;
+      RECT  5.305000  2.175000  5.725000 2.635000 ;
+      RECT  5.365000  0.275000  5.765000 0.445000 ;
+      RECT  5.365000  0.445000  5.675000 0.835000 ;
+      RECT  5.505000  0.835000  5.675000 1.525000 ;
+      RECT  5.505000  1.695000  5.675000 1.835000 ;
+      RECT  5.505000  1.835000  6.115000 2.005000 ;
+      RECT  5.915000  0.705000  6.125000 1.495000 ;
+      RECT  5.915000  1.495000  6.690000 1.655000 ;
+      RECT  5.915000  1.655000  7.030000 1.665000 ;
+      RECT  5.945000  2.005000  6.115000 2.465000 ;
+      RECT  6.035000  0.255000  7.135000 0.535000 ;
+      RECT  6.295000  0.705000  6.745000 1.325000 ;
+      RECT  6.350000  2.125000  7.470000 2.465000 ;
+      RECT  6.470000  1.665000  7.030000 1.955000 ;
+      RECT  6.965000  0.535000  7.135000 1.315000 ;
+      RECT  6.965000  1.315000  7.470000 1.485000 ;
+      RECT  7.250000  1.485000  7.470000 1.575000 ;
+      RECT  7.250000  1.575000  8.620000 1.745000 ;
+      RECT  7.250000  1.745000  7.470000 2.125000 ;
+      RECT  7.355000  0.085000  7.595000 0.525000 ;
+      RECT  7.355000  0.695000  7.935000 0.865000 ;
+      RECT  7.355000  0.865000  7.625000 1.145000 ;
+      RECT  7.640000  2.175000  7.890000 2.635000 ;
+      RECT  7.765000  0.295000  8.935000 0.465000 ;
+      RECT  7.765000  0.465000  7.935000 0.695000 ;
+      RECT  7.805000  1.035000  8.395000 1.405000 ;
+      RECT  8.110000  1.915000  8.960000 2.085000 ;
+      RECT  8.110000  2.085000  8.280000 2.375000 ;
+      RECT  8.155000  0.635000  8.395000 1.035000 ;
+      RECT  8.460000  2.255000  8.840000 2.635000 ;
+      RECT  8.615000  0.465000  8.935000 0.820000 ;
+      RECT  8.615000  0.820000  8.940000 1.075000 ;
+      RECT  8.615000  1.075000 10.795000 1.285000 ;
+      RECT  8.615000  1.285000  8.960000 1.295000 ;
+      RECT  8.790000  1.295000  8.960000 1.915000 ;
+      RECT  9.135000  0.085000  9.305000 0.895000 ;
+      RECT  9.135000  1.575000  9.305000 2.635000 ;
+      RECT 10.075000  0.085000 10.245000 0.555000 ;
+      RECT 10.075000  1.795000 10.245000 2.635000 ;
+      RECT 11.015000  0.085000 11.185000 0.555000 ;
+      RECT 11.015000  1.795000 11.185000 2.635000 ;
     LAYER mcon ;
-      RECT 0.660000 1.105000 0.830000 1.275000 ;
-      RECT 1.115000 1.785000 1.285000 1.955000 ;
-      RECT 2.595000 1.105000 2.765000 1.275000 ;
-      RECT 3.105000 1.785000 3.275000 1.955000 ;
-      RECT 6.525000 1.105000 6.695000 1.275000 ;
-      RECT 6.525000 1.785000 6.695000 1.955000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.660000  1.105000  0.830000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.115000  1.785000  1.285000 1.955000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.595000  1.105000  2.765000 1.275000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.105000  1.785000  3.275000 1.955000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  0.765000  4.455000 0.935000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.645000  0.765000  4.815000 0.935000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.525000  1.105000  6.695000 1.275000 ;
+      RECT  6.525000  1.785000  6.695000 1.955000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.870000  1.080000  8.040000 1.250000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.165000  0.765000  8.335000 0.935000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
     LAYER met1 ;
       RECT 0.600000 1.075000 0.890000 1.120000 ;
       RECT 0.600000 1.120000 6.805000 1.260000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
index 0d5cf79..e2b9e28 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_1.magic.lef
@@ -68,13 +68,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 3.910000 0.735000 4.510000 1.065000 ;
-        RECT 7.260000 0.735000 7.780000 1.005000 ;
-        RECT 7.260000 1.005000 7.640000 1.065000 ;
-      LAYER mcon ;
-        RECT 4.280000 0.765000 4.450000 0.935000 ;
-        RECT 7.505000 0.765000 7.675000 0.935000 ;
       LAYER met1 ;
         RECT 4.220000 0.735000 4.510000 0.780000 ;
         RECT 4.220000 0.780000 7.735000 0.920000 ;
@@ -118,6 +111,8 @@
         RECT 8.885000 -0.085000 9.055000 0.085000 ;
         RECT 9.345000 -0.085000 9.515000 0.085000 ;
         RECT 9.805000 -0.085000 9.975000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -158,6 +153,8 @@
         RECT 8.885000 2.635000 9.055000 2.805000 ;
         RECT 9.345000 2.635000 9.515000 2.805000 ;
         RECT 9.805000 2.635000 9.975000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
@@ -186,6 +183,7 @@
       RECT 3.520000 0.465000 3.740000 1.230000 ;
       RECT 3.610000 1.575000 3.910000 1.835000 ;
       RECT 3.610000 1.835000 5.110000 2.085000 ;
+      RECT 3.910000 0.735000 4.510000 1.065000 ;
       RECT 4.340000 2.085000 4.510000 2.375000 ;
       RECT 4.470000 1.405000 4.770000 1.565000 ;
       RECT 4.790000 0.295000 4.960000 0.725000 ;
@@ -205,6 +203,8 @@
       RECT 6.460000 1.575000 8.550000 1.745000 ;
       RECT 6.920000 0.475000 7.090000 1.235000 ;
       RECT 7.140000 2.085000 7.380000 2.375000 ;
+      RECT 7.260000 0.735000 7.780000 1.005000 ;
+      RECT 7.260000 1.005000 7.640000 1.065000 ;
       RECT 7.790000 1.175000 8.170000 1.235000 ;
       RECT 8.210000 0.350000 8.550000 0.680000 ;
       RECT 8.210000 1.745000 8.550000 1.765000 ;
@@ -219,8 +219,10 @@
       RECT 1.165000 0.720000 1.335000 0.890000 ;
       RECT 2.645000 1.740000 2.815000 1.910000 ;
       RECT 3.155000 0.720000 3.325000 0.890000 ;
+      RECT 4.280000 0.765000 4.450000 0.935000 ;
       RECT 5.705000 1.740000 5.875000 1.910000 ;
       RECT 5.725000 1.110000 5.895000 1.280000 ;
+      RECT 7.505000 0.765000 7.675000 0.935000 ;
     LAYER met1 ;
       RECT 0.605000 1.710000 0.895000 1.800000 ;
       RECT 0.605000 1.800000 5.935000 1.940000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
index 712c2cc..3500c45 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_2.magic.lef
@@ -70,13 +70,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 3.910000 0.735000 4.510000 1.065000 ;
-        RECT 7.260000 0.735000 7.780000 1.005000 ;
-        RECT 7.260000 1.005000 7.640000 1.065000 ;
-      LAYER mcon ;
-        RECT 4.280000 0.765000 4.450000 0.935000 ;
-        RECT 7.505000 0.765000 7.675000 0.935000 ;
       LAYER met1 ;
         RECT 4.220000 0.735000 4.510000 0.780000 ;
         RECT 4.220000 0.780000 7.735000 0.920000 ;
@@ -122,6 +115,8 @@
         RECT  9.345000 -0.085000  9.515000 0.085000 ;
         RECT  9.805000 -0.085000  9.975000 0.085000 ;
         RECT 10.265000 -0.085000 10.435000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
@@ -164,6 +159,8 @@
         RECT  9.345000 2.635000  9.515000 2.805000 ;
         RECT  9.805000 2.635000  9.975000 2.805000 ;
         RECT 10.265000 2.635000 10.435000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
@@ -192,6 +189,7 @@
       RECT 3.520000 0.465000 3.740000 1.230000 ;
       RECT 3.610000 1.575000 3.910000 1.835000 ;
       RECT 3.610000 1.835000 5.110000 2.085000 ;
+      RECT 3.910000 0.735000 4.510000 1.065000 ;
       RECT 4.340000 2.085000 4.510000 2.375000 ;
       RECT 4.470000 1.405000 4.770000 1.565000 ;
       RECT 4.790000 0.295000 4.960000 0.725000 ;
@@ -211,6 +209,8 @@
       RECT 6.460000 1.575000 8.550000 1.745000 ;
       RECT 6.920000 0.475000 7.090000 1.235000 ;
       RECT 7.140000 2.085000 7.380000 2.375000 ;
+      RECT 7.260000 0.735000 7.780000 1.005000 ;
+      RECT 7.260000 1.005000 7.640000 1.065000 ;
       RECT 7.790000 1.175000 8.170000 1.235000 ;
       RECT 8.210000 0.350000 8.550000 0.680000 ;
       RECT 8.210000 1.745000 8.550000 1.765000 ;
@@ -225,8 +225,10 @@
       RECT 1.165000 0.720000 1.335000 0.890000 ;
       RECT 2.645000 1.740000 2.815000 1.910000 ;
       RECT 3.155000 0.720000 3.325000 0.890000 ;
+      RECT 4.280000 0.765000 4.450000 0.935000 ;
       RECT 5.705000 1.740000 5.875000 1.910000 ;
       RECT 5.725000 1.110000 5.895000 1.280000 ;
+      RECT 7.505000 0.765000 7.675000 0.935000 ;
     LAYER met1 ;
       RECT 0.605000 1.710000 0.895000 1.800000 ;
       RECT 0.605000 1.800000 5.935000 1.940000 ;
diff --git a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
index 7f8a2d9..8415f73 100644
--- a/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
+++ b/cells/dfstp/sky130_fd_sc_hdll__dfstp_4.magic.lef
@@ -74,13 +74,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 3.910000 0.735000 4.510000 1.065000 ;
-        RECT 7.260000 0.735000 7.780000 1.005000 ;
-        RECT 7.260000 1.005000 7.640000 1.065000 ;
-      LAYER mcon ;
-        RECT 4.280000 0.765000 4.450000 0.935000 ;
-        RECT 7.505000 0.765000 7.675000 0.935000 ;
       LAYER met1 ;
         RECT 4.220000 0.735000 4.510000 0.780000 ;
         RECT 4.220000 0.780000 7.735000 0.920000 ;
@@ -130,6 +123,8 @@
         RECT 10.725000 -0.085000 10.895000 0.085000 ;
         RECT 11.185000 -0.085000 11.355000 0.085000 ;
         RECT 11.645000 -0.085000 11.815000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
@@ -176,6 +171,8 @@
         RECT 10.725000 2.635000 10.895000 2.805000 ;
         RECT 11.185000 2.635000 11.355000 2.805000 ;
         RECT 11.645000 2.635000 11.815000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
@@ -204,6 +201,7 @@
       RECT 3.520000 0.465000  3.740000 1.230000 ;
       RECT 3.610000 1.575000  3.910000 1.835000 ;
       RECT 3.610000 1.835000  5.110000 2.085000 ;
+      RECT 3.910000 0.735000  4.510000 1.065000 ;
       RECT 4.340000 2.085000  4.510000 2.375000 ;
       RECT 4.470000 1.405000  4.770000 1.565000 ;
       RECT 4.790000 0.295000  4.960000 0.725000 ;
@@ -223,6 +221,8 @@
       RECT 6.460000 1.575000  8.550000 1.745000 ;
       RECT 6.920000 0.475000  7.090000 1.235000 ;
       RECT 7.140000 2.085000  7.380000 2.375000 ;
+      RECT 7.260000 0.735000  7.780000 1.005000 ;
+      RECT 7.260000 1.005000  7.640000 1.065000 ;
       RECT 7.790000 1.175000  8.170000 1.235000 ;
       RECT 8.210000 0.350000  8.550000 0.680000 ;
       RECT 8.210000 1.745000  8.550000 1.765000 ;
@@ -237,8 +237,10 @@
       RECT 1.165000 0.720000 1.335000 0.890000 ;
       RECT 2.645000 1.740000 2.815000 1.910000 ;
       RECT 3.155000 0.720000 3.325000 0.890000 ;
+      RECT 4.280000 0.765000 4.450000 0.935000 ;
       RECT 5.705000 1.740000 5.875000 1.910000 ;
       RECT 5.725000 1.110000 5.895000 1.280000 ;
+      RECT 7.505000 0.765000 7.675000 0.935000 ;
     LAYER met1 ;
       RECT 0.605000 1.710000 0.895000 1.800000 ;
       RECT 0.605000 1.800000 5.935000 1.940000 ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
index 86cfb3c..e0f09c1 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_2.magic.lef
@@ -46,11 +46,6 @@
   PIN VGND
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.920000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.920000 0.240000 ;
     END
@@ -58,15 +53,20 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.920000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.920000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.920000 0.085000 ;
+      RECT 0.000000  2.635000 0.920000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
index 8ded1fe..596df44 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_4.magic.lef
@@ -46,13 +46,6 @@
   PIN VGND
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -60,17 +53,24 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
index aeba1a8..a365bfe 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_6.magic.lef
@@ -46,15 +46,6 @@
   PIN VGND
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -62,19 +53,28 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef b/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
index 580cc64..4c6fb25 100644
--- a/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
+++ b/cells/diode/sky130_fd_sc_hdll__diode_8.magic.lef
@@ -46,17 +46,6 @@
   PIN VGND
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -64,21 +53,32 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
index 3e0067a..ca20288 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
@@ -78,28 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.565000  0.085000 0.895000 0.465000 ;
-        RECT 2.025000  0.085000 2.355000 0.445000 ;
-        RECT 3.870000  0.085000 4.200000 0.610000 ;
-        RECT 5.320000  0.085000 5.595000 0.625000 ;
-        RECT 5.320000  0.625000 5.650000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -108,71 +86,89 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.565000 2.135000 0.895000 2.635000 ;
-        RECT 2.055000 1.835000 2.325000 2.635000 ;
-        RECT 4.050000 2.135000 4.635000 2.635000 ;
-        RECT 5.345000 1.885000 5.675000 2.150000 ;
-        RECT 5.345000 2.150000 5.645000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.795000 0.895000 1.965000 ;
-      RECT 0.085000 1.965000 0.395000 2.465000 ;
-      RECT 0.225000 0.280000 0.395000 0.635000 ;
-      RECT 0.225000 0.635000 0.775000 0.805000 ;
-      RECT 0.605000 0.805000 0.775000 1.070000 ;
-      RECT 0.605000 1.070000 0.895000 1.795000 ;
-      RECT 1.065000 0.280000 1.235000 1.445000 ;
-      RECT 1.065000 1.445000 1.335000 2.465000 ;
-      RECT 1.555000 1.495000 2.115000 1.665000 ;
-      RECT 1.555000 1.665000 1.885000 2.465000 ;
-      RECT 1.660000 0.345000 1.855000 0.615000 ;
-      RECT 1.660000 0.615000 2.115000 0.765000 ;
-      RECT 1.660000 0.765000 2.535000 0.785000 ;
-      RECT 1.945000 0.785000 2.535000 1.095000 ;
-      RECT 1.945000 1.095000 2.115000 1.495000 ;
-      RECT 2.445000 1.265000 2.955000 1.685000 ;
-      RECT 2.780000 0.735000 3.295000 1.095000 ;
-      RECT 3.020000 2.165000 3.850000 2.385000 ;
-      RECT 3.040000 0.280000 3.660000 0.565000 ;
-      RECT 3.125000 1.095000 3.295000 1.575000 ;
-      RECT 3.125000 1.575000 3.510000 1.995000 ;
-      RECT 3.490000 0.565000 3.660000 0.995000 ;
-      RECT 3.490000 0.995000 4.380000 1.165000 ;
-      RECT 3.680000 1.165000 4.380000 1.325000 ;
-      RECT 3.680000 1.325000 3.850000 2.165000 ;
-      RECT 4.020000 1.535000 5.725000 1.705000 ;
-      RECT 4.020000 1.705000 5.170000 1.865000 ;
-      RECT 4.455000 0.255000 4.785000 0.825000 ;
-      RECT 4.550000 0.825000 4.720000 1.535000 ;
-      RECT 4.885000 1.865000 5.170000 2.465000 ;
-      RECT 5.555000 1.055000 5.895000 1.325000 ;
-      RECT 5.555000 1.325000 5.725000 1.535000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.085000  1.795000 0.895000 1.965000 ;
+      RECT 0.085000  1.965000 0.395000 2.465000 ;
+      RECT 0.225000  0.280000 0.395000 0.635000 ;
+      RECT 0.225000  0.635000 0.775000 0.805000 ;
+      RECT 0.565000  0.085000 0.895000 0.465000 ;
+      RECT 0.565000  2.135000 0.895000 2.635000 ;
+      RECT 0.605000  0.805000 0.775000 1.070000 ;
+      RECT 0.605000  1.070000 0.895000 1.795000 ;
+      RECT 1.065000  0.280000 1.235000 1.445000 ;
+      RECT 1.065000  1.445000 1.335000 2.465000 ;
+      RECT 1.555000  1.495000 2.115000 1.665000 ;
+      RECT 1.555000  1.665000 1.885000 2.465000 ;
+      RECT 1.660000  0.345000 1.855000 0.615000 ;
+      RECT 1.660000  0.615000 2.115000 0.765000 ;
+      RECT 1.660000  0.765000 2.535000 0.785000 ;
+      RECT 1.945000  0.785000 2.535000 1.095000 ;
+      RECT 1.945000  1.095000 2.115000 1.495000 ;
+      RECT 2.025000  0.085000 2.355000 0.445000 ;
+      RECT 2.055000  1.835000 2.325000 2.635000 ;
+      RECT 2.445000  1.265000 2.955000 1.685000 ;
+      RECT 2.780000  0.735000 3.295000 1.095000 ;
+      RECT 3.020000  2.165000 3.850000 2.385000 ;
+      RECT 3.040000  0.280000 3.660000 0.565000 ;
+      RECT 3.125000  1.095000 3.295000 1.575000 ;
+      RECT 3.125000  1.575000 3.510000 1.995000 ;
+      RECT 3.490000  0.565000 3.660000 0.995000 ;
+      RECT 3.490000  0.995000 4.380000 1.165000 ;
+      RECT 3.680000  1.165000 4.380000 1.325000 ;
+      RECT 3.680000  1.325000 3.850000 2.165000 ;
+      RECT 3.870000  0.085000 4.200000 0.610000 ;
+      RECT 4.020000  1.535000 5.725000 1.705000 ;
+      RECT 4.020000  1.705000 5.170000 1.865000 ;
+      RECT 4.050000  2.135000 4.635000 2.635000 ;
+      RECT 4.455000  0.255000 4.785000 0.825000 ;
+      RECT 4.550000  0.825000 4.720000 1.535000 ;
+      RECT 4.885000  1.865000 5.170000 2.465000 ;
+      RECT 5.320000  0.085000 5.595000 0.625000 ;
+      RECT 5.320000  0.625000 5.650000 0.825000 ;
+      RECT 5.345000  1.885000 5.675000 2.150000 ;
+      RECT 5.345000  2.150000 5.645000 2.635000 ;
+      RECT 5.555000  1.055000 5.895000 1.325000 ;
+      RECT 5.555000  1.325000 5.725000 1.535000 ;
     LAYER mcon ;
-      RECT 0.635000 1.785000 0.805000 1.955000 ;
-      RECT 1.095000 1.445000 1.265000 1.615000 ;
-      RECT 2.725000 1.445000 2.895000 1.615000 ;
-      RECT 3.280000 1.785000 3.450000 1.955000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.635000  1.785000 0.805000 1.955000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.095000  1.445000 1.265000 1.615000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.725000  1.445000 2.895000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.280000  1.785000 3.450000 1.955000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 0.575000 1.755000 0.865000 1.800000 ;
       RECT 0.575000 1.800000 3.510000 1.940000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
index e653013..dc3364d 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
@@ -79,29 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.565000  0.085000 0.895000 0.465000 ;
-        RECT 2.025000  0.085000 2.355000 0.445000 ;
-        RECT 3.870000  0.085000 4.200000 0.610000 ;
-        RECT 5.315000  0.085000 5.645000 0.825000 ;
-        RECT 6.375000  0.085000 6.585000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -110,73 +87,92 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.565000 2.135000 0.895000 2.635000 ;
-        RECT 2.055000 1.835000 2.325000 2.635000 ;
-        RECT 4.050000 2.135000 4.635000 2.635000 ;
-        RECT 5.345000 1.885000 5.675000 2.150000 ;
-        RECT 5.345000 2.150000 5.645000 2.635000 ;
-        RECT 6.375000 1.495000 6.580000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.795000 0.895000 1.965000 ;
-      RECT 0.085000 1.965000 0.395000 2.465000 ;
-      RECT 0.225000 0.280000 0.395000 0.635000 ;
-      RECT 0.225000 0.635000 0.775000 0.805000 ;
-      RECT 0.605000 0.805000 0.775000 1.070000 ;
-      RECT 0.605000 1.070000 0.895000 1.795000 ;
-      RECT 1.065000 0.280000 1.235000 1.445000 ;
-      RECT 1.065000 1.445000 1.335000 2.465000 ;
-      RECT 1.555000 1.495000 2.115000 1.665000 ;
-      RECT 1.555000 1.665000 1.885000 2.465000 ;
-      RECT 1.660000 0.345000 1.855000 0.615000 ;
-      RECT 1.660000 0.615000 2.115000 0.765000 ;
-      RECT 1.660000 0.765000 2.535000 0.785000 ;
-      RECT 1.945000 0.785000 2.535000 1.095000 ;
-      RECT 1.945000 1.095000 2.115000 1.495000 ;
-      RECT 2.445000 1.265000 2.955000 1.685000 ;
-      RECT 2.780000 0.735000 3.295000 1.095000 ;
-      RECT 3.020000 2.165000 3.850000 2.385000 ;
-      RECT 3.040000 0.280000 3.660000 0.565000 ;
-      RECT 3.125000 1.095000 3.295000 1.575000 ;
-      RECT 3.125000 1.575000 3.510000 1.995000 ;
-      RECT 3.490000 0.565000 3.660000 0.995000 ;
-      RECT 3.490000 0.995000 4.380000 1.165000 ;
-      RECT 3.680000 1.165000 4.380000 1.325000 ;
-      RECT 3.680000 1.325000 3.850000 2.165000 ;
-      RECT 4.020000 1.535000 5.725000 1.705000 ;
-      RECT 4.020000 1.705000 5.170000 1.865000 ;
-      RECT 4.455000 0.255000 4.785000 0.825000 ;
-      RECT 4.550000 0.825000 4.720000 1.535000 ;
-      RECT 4.885000 1.865000 5.170000 2.465000 ;
-      RECT 5.555000 0.995000 5.865000 1.325000 ;
-      RECT 5.555000 1.325000 5.725000 1.535000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.085000  1.795000 0.895000 1.965000 ;
+      RECT 0.085000  1.965000 0.395000 2.465000 ;
+      RECT 0.225000  0.280000 0.395000 0.635000 ;
+      RECT 0.225000  0.635000 0.775000 0.805000 ;
+      RECT 0.565000  0.085000 0.895000 0.465000 ;
+      RECT 0.565000  2.135000 0.895000 2.635000 ;
+      RECT 0.605000  0.805000 0.775000 1.070000 ;
+      RECT 0.605000  1.070000 0.895000 1.795000 ;
+      RECT 1.065000  0.280000 1.235000 1.445000 ;
+      RECT 1.065000  1.445000 1.335000 2.465000 ;
+      RECT 1.555000  1.495000 2.115000 1.665000 ;
+      RECT 1.555000  1.665000 1.885000 2.465000 ;
+      RECT 1.660000  0.345000 1.855000 0.615000 ;
+      RECT 1.660000  0.615000 2.115000 0.765000 ;
+      RECT 1.660000  0.765000 2.535000 0.785000 ;
+      RECT 1.945000  0.785000 2.535000 1.095000 ;
+      RECT 1.945000  1.095000 2.115000 1.495000 ;
+      RECT 2.025000  0.085000 2.355000 0.445000 ;
+      RECT 2.055000  1.835000 2.325000 2.635000 ;
+      RECT 2.445000  1.265000 2.955000 1.685000 ;
+      RECT 2.780000  0.735000 3.295000 1.095000 ;
+      RECT 3.020000  2.165000 3.850000 2.385000 ;
+      RECT 3.040000  0.280000 3.660000 0.565000 ;
+      RECT 3.125000  1.095000 3.295000 1.575000 ;
+      RECT 3.125000  1.575000 3.510000 1.995000 ;
+      RECT 3.490000  0.565000 3.660000 0.995000 ;
+      RECT 3.490000  0.995000 4.380000 1.165000 ;
+      RECT 3.680000  1.165000 4.380000 1.325000 ;
+      RECT 3.680000  1.325000 3.850000 2.165000 ;
+      RECT 3.870000  0.085000 4.200000 0.610000 ;
+      RECT 4.020000  1.535000 5.725000 1.705000 ;
+      RECT 4.020000  1.705000 5.170000 1.865000 ;
+      RECT 4.050000  2.135000 4.635000 2.635000 ;
+      RECT 4.455000  0.255000 4.785000 0.825000 ;
+      RECT 4.550000  0.825000 4.720000 1.535000 ;
+      RECT 4.885000  1.865000 5.170000 2.465000 ;
+      RECT 5.315000  0.085000 5.645000 0.825000 ;
+      RECT 5.345000  1.885000 5.675000 2.150000 ;
+      RECT 5.345000  2.150000 5.645000 2.635000 ;
+      RECT 5.555000  0.995000 5.865000 1.325000 ;
+      RECT 5.555000  1.325000 5.725000 1.535000 ;
+      RECT 6.375000  0.085000 6.585000 0.885000 ;
+      RECT 6.375000  1.495000 6.580000 2.635000 ;
     LAYER mcon ;
-      RECT 0.635000 1.785000 0.805000 1.955000 ;
-      RECT 1.095000 1.445000 1.265000 1.615000 ;
-      RECT 2.725000 1.445000 2.895000 1.615000 ;
-      RECT 3.280000 1.785000 3.450000 1.955000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.635000  1.785000 0.805000 1.955000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.095000  1.445000 1.265000 1.615000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.725000  1.445000 2.895000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.280000  1.785000 3.450000 1.955000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
     LAYER met1 ;
       RECT 0.575000 1.755000 0.865000 1.800000 ;
       RECT 0.575000 1.800000 3.510000 1.940000 ;
diff --git a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
index bb3dd1d..a857876 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
@@ -84,32 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.565000  0.085000 0.895000 0.465000 ;
-        RECT 2.025000  0.085000 2.355000 0.445000 ;
-        RECT 3.870000  0.085000 4.200000 0.610000 ;
-        RECT 5.315000  0.085000 5.645000 0.825000 ;
-        RECT 6.375000  0.085000 6.585000 0.565000 ;
-        RECT 7.255000  0.085000 7.465000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -118,76 +92,98 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.565000 2.135000 0.895000 2.635000 ;
-        RECT 2.055000 1.835000 2.325000 2.635000 ;
-        RECT 4.020000 2.135000 4.705000 2.635000 ;
-        RECT 5.345000 1.875000 5.675000 2.150000 ;
-        RECT 5.345000 2.150000 5.645000 2.635000 ;
-        RECT 6.315000 1.835000 6.585000 2.635000 ;
-        RECT 7.255000 1.495000 7.510000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.795000 0.895000 1.965000 ;
-      RECT 0.085000 1.965000 0.395000 2.465000 ;
-      RECT 0.225000 0.280000 0.395000 0.635000 ;
-      RECT 0.225000 0.635000 0.775000 0.805000 ;
-      RECT 0.605000 0.805000 0.775000 1.070000 ;
-      RECT 0.605000 1.070000 0.895000 1.795000 ;
-      RECT 1.065000 0.280000 1.235000 1.445000 ;
-      RECT 1.065000 1.445000 1.335000 2.465000 ;
-      RECT 1.555000 1.495000 2.115000 1.665000 ;
-      RECT 1.555000 1.665000 1.885000 2.465000 ;
-      RECT 1.660000 0.345000 1.855000 0.615000 ;
-      RECT 1.660000 0.615000 2.115000 0.765000 ;
-      RECT 1.660000 0.765000 2.535000 0.785000 ;
-      RECT 1.945000 0.785000 2.535000 1.095000 ;
-      RECT 1.945000 1.095000 2.115000 1.495000 ;
-      RECT 2.445000 1.265000 2.955000 1.685000 ;
-      RECT 2.780000 0.735000 3.295000 1.095000 ;
-      RECT 3.020000 2.165000 3.850000 2.385000 ;
-      RECT 3.040000 0.280000 3.660000 0.565000 ;
-      RECT 3.125000 1.095000 3.295000 1.575000 ;
-      RECT 3.125000 1.575000 3.510000 1.995000 ;
-      RECT 3.490000 0.565000 3.660000 0.995000 ;
-      RECT 3.490000 0.995000 4.380000 1.165000 ;
-      RECT 3.680000 1.165000 4.380000 1.325000 ;
-      RECT 3.680000 1.325000 3.850000 2.165000 ;
-      RECT 4.020000 1.535000 5.725000 1.705000 ;
-      RECT 4.020000 1.705000 5.175000 1.865000 ;
-      RECT 4.455000 0.255000 4.785000 0.825000 ;
-      RECT 4.550000 0.825000 4.720000 1.535000 ;
-      RECT 4.875000 1.865000 5.175000 2.435000 ;
-      RECT 5.555000 1.075000 6.235000 1.325000 ;
-      RECT 5.555000 1.325000 5.725000 1.535000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.085000  1.795000 0.895000 1.965000 ;
+      RECT 0.085000  1.965000 0.395000 2.465000 ;
+      RECT 0.225000  0.280000 0.395000 0.635000 ;
+      RECT 0.225000  0.635000 0.775000 0.805000 ;
+      RECT 0.565000  0.085000 0.895000 0.465000 ;
+      RECT 0.565000  2.135000 0.895000 2.635000 ;
+      RECT 0.605000  0.805000 0.775000 1.070000 ;
+      RECT 0.605000  1.070000 0.895000 1.795000 ;
+      RECT 1.065000  0.280000 1.235000 1.445000 ;
+      RECT 1.065000  1.445000 1.335000 2.465000 ;
+      RECT 1.555000  1.495000 2.115000 1.665000 ;
+      RECT 1.555000  1.665000 1.885000 2.465000 ;
+      RECT 1.660000  0.345000 1.855000 0.615000 ;
+      RECT 1.660000  0.615000 2.115000 0.765000 ;
+      RECT 1.660000  0.765000 2.535000 0.785000 ;
+      RECT 1.945000  0.785000 2.535000 1.095000 ;
+      RECT 1.945000  1.095000 2.115000 1.495000 ;
+      RECT 2.025000  0.085000 2.355000 0.445000 ;
+      RECT 2.055000  1.835000 2.325000 2.635000 ;
+      RECT 2.445000  1.265000 2.955000 1.685000 ;
+      RECT 2.780000  0.735000 3.295000 1.095000 ;
+      RECT 3.020000  2.165000 3.850000 2.385000 ;
+      RECT 3.040000  0.280000 3.660000 0.565000 ;
+      RECT 3.125000  1.095000 3.295000 1.575000 ;
+      RECT 3.125000  1.575000 3.510000 1.995000 ;
+      RECT 3.490000  0.565000 3.660000 0.995000 ;
+      RECT 3.490000  0.995000 4.380000 1.165000 ;
+      RECT 3.680000  1.165000 4.380000 1.325000 ;
+      RECT 3.680000  1.325000 3.850000 2.165000 ;
+      RECT 3.870000  0.085000 4.200000 0.610000 ;
+      RECT 4.020000  1.535000 5.725000 1.705000 ;
+      RECT 4.020000  1.705000 5.175000 1.865000 ;
+      RECT 4.020000  2.135000 4.705000 2.635000 ;
+      RECT 4.455000  0.255000 4.785000 0.825000 ;
+      RECT 4.550000  0.825000 4.720000 1.535000 ;
+      RECT 4.875000  1.865000 5.175000 2.435000 ;
+      RECT 5.315000  0.085000 5.645000 0.825000 ;
+      RECT 5.345000  1.875000 5.675000 2.150000 ;
+      RECT 5.345000  2.150000 5.645000 2.635000 ;
+      RECT 5.555000  1.075000 6.235000 1.325000 ;
+      RECT 5.555000  1.325000 5.725000 1.535000 ;
+      RECT 6.315000  1.835000 6.585000 2.635000 ;
+      RECT 6.375000  0.085000 6.585000 0.565000 ;
+      RECT 7.255000  0.085000 7.465000 0.885000 ;
+      RECT 7.255000  1.495000 7.510000 2.635000 ;
     LAYER mcon ;
-      RECT 0.635000 1.785000 0.805000 1.955000 ;
-      RECT 1.095000 1.445000 1.265000 1.615000 ;
-      RECT 2.725000 1.445000 2.895000 1.615000 ;
-      RECT 3.280000 1.785000 3.450000 1.955000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.635000  1.785000 0.805000 1.955000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.095000  1.445000 1.265000 1.615000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.725000  1.445000 2.895000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.280000  1.785000 3.450000 1.955000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
     LAYER met1 ;
       RECT 0.575000 1.755000 0.865000 1.800000 ;
       RECT 0.575000 1.800000 3.510000 1.940000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
index 75531ab..07f8c92 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_1.magic.lef
@@ -78,28 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.565000  0.085000 0.895000 0.465000 ;
-        RECT 2.025000  0.085000 2.355000 0.445000 ;
-        RECT 3.870000  0.085000 4.200000 0.610000 ;
-        RECT 5.320000  0.085000 5.595000 0.625000 ;
-        RECT 5.320000  0.625000 5.650000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -108,72 +86,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.565000 2.135000 0.895000 2.635000 ;
-        RECT 2.055000 1.835000 2.325000 2.635000 ;
-        RECT 4.050000 2.135000 4.635000 2.635000 ;
-        RECT 5.345000 1.885000 5.675000 2.150000 ;
-        RECT 5.345000 2.150000 5.645000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.795000 0.775000 1.965000 ;
-      RECT 0.085000 1.965000 0.395000 2.465000 ;
-      RECT 0.225000 0.280000 0.395000 0.635000 ;
-      RECT 0.225000 0.635000 0.775000 0.805000 ;
-      RECT 0.605000 0.805000 0.775000 1.070000 ;
-      RECT 0.605000 1.070000 0.895000 1.400000 ;
-      RECT 0.605000 1.400000 0.775000 1.795000 ;
-      RECT 1.065000 0.280000 1.235000 1.685000 ;
-      RECT 1.065000 1.685000 1.335000 2.465000 ;
-      RECT 1.555000 1.495000 2.115000 1.665000 ;
-      RECT 1.555000 1.665000 1.885000 2.465000 ;
-      RECT 1.660000 0.345000 1.855000 0.615000 ;
-      RECT 1.660000 0.615000 2.115000 0.765000 ;
-      RECT 1.660000 0.765000 2.535000 0.785000 ;
-      RECT 1.945000 0.785000 2.535000 1.095000 ;
-      RECT 1.945000 1.095000 2.115000 1.495000 ;
-      RECT 2.445000 1.265000 2.955000 1.685000 ;
-      RECT 2.780000 0.735000 3.295000 1.095000 ;
-      RECT 3.020000 2.165000 3.850000 2.385000 ;
-      RECT 3.040000 0.280000 3.660000 0.565000 ;
-      RECT 3.125000 1.095000 3.295000 1.575000 ;
-      RECT 3.125000 1.575000 3.510000 1.995000 ;
-      RECT 3.490000 0.565000 3.660000 0.995000 ;
-      RECT 3.490000 0.995000 4.380000 1.165000 ;
-      RECT 3.680000 1.165000 4.380000 1.325000 ;
-      RECT 3.680000 1.325000 3.850000 2.165000 ;
-      RECT 4.020000 1.535000 5.725000 1.705000 ;
-      RECT 4.020000 1.705000 5.170000 1.865000 ;
-      RECT 4.455000 0.255000 4.785000 0.825000 ;
-      RECT 4.550000 0.825000 4.720000 1.535000 ;
-      RECT 4.885000 1.865000 5.170000 2.465000 ;
-      RECT 5.555000 1.055000 5.895000 1.325000 ;
-      RECT 5.555000 1.325000 5.725000 1.535000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.085000  1.795000 0.775000 1.965000 ;
+      RECT 0.085000  1.965000 0.395000 2.465000 ;
+      RECT 0.225000  0.280000 0.395000 0.635000 ;
+      RECT 0.225000  0.635000 0.775000 0.805000 ;
+      RECT 0.565000  0.085000 0.895000 0.465000 ;
+      RECT 0.565000  2.135000 0.895000 2.635000 ;
+      RECT 0.605000  0.805000 0.775000 1.070000 ;
+      RECT 0.605000  1.070000 0.895000 1.400000 ;
+      RECT 0.605000  1.400000 0.775000 1.795000 ;
+      RECT 1.065000  0.280000 1.235000 1.685000 ;
+      RECT 1.065000  1.685000 1.335000 2.465000 ;
+      RECT 1.555000  1.495000 2.115000 1.665000 ;
+      RECT 1.555000  1.665000 1.885000 2.465000 ;
+      RECT 1.660000  0.345000 1.855000 0.615000 ;
+      RECT 1.660000  0.615000 2.115000 0.765000 ;
+      RECT 1.660000  0.765000 2.535000 0.785000 ;
+      RECT 1.945000  0.785000 2.535000 1.095000 ;
+      RECT 1.945000  1.095000 2.115000 1.495000 ;
+      RECT 2.025000  0.085000 2.355000 0.445000 ;
+      RECT 2.055000  1.835000 2.325000 2.635000 ;
+      RECT 2.445000  1.265000 2.955000 1.685000 ;
+      RECT 2.780000  0.735000 3.295000 1.095000 ;
+      RECT 3.020000  2.165000 3.850000 2.385000 ;
+      RECT 3.040000  0.280000 3.660000 0.565000 ;
+      RECT 3.125000  1.095000 3.295000 1.575000 ;
+      RECT 3.125000  1.575000 3.510000 1.995000 ;
+      RECT 3.490000  0.565000 3.660000 0.995000 ;
+      RECT 3.490000  0.995000 4.380000 1.165000 ;
+      RECT 3.680000  1.165000 4.380000 1.325000 ;
+      RECT 3.680000  1.325000 3.850000 2.165000 ;
+      RECT 3.870000  0.085000 4.200000 0.610000 ;
+      RECT 4.020000  1.535000 5.725000 1.705000 ;
+      RECT 4.020000  1.705000 5.170000 1.865000 ;
+      RECT 4.050000  2.135000 4.635000 2.635000 ;
+      RECT 4.455000  0.255000 4.785000 0.825000 ;
+      RECT 4.550000  0.825000 4.720000 1.535000 ;
+      RECT 4.885000  1.865000 5.170000 2.465000 ;
+      RECT 5.320000  0.085000 5.595000 0.625000 ;
+      RECT 5.320000  0.625000 5.650000 0.825000 ;
+      RECT 5.345000  1.885000 5.675000 2.150000 ;
+      RECT 5.345000  2.150000 5.645000 2.635000 ;
+      RECT 5.555000  1.055000 5.895000 1.325000 ;
+      RECT 5.555000  1.325000 5.725000 1.535000 ;
     LAYER mcon ;
-      RECT 0.605000 1.445000 0.775000 1.615000 ;
-      RECT 1.115000 1.785000 1.285000 1.955000 ;
-      RECT 2.725000 1.445000 2.895000 1.615000 ;
-      RECT 3.280000 1.785000 3.450000 1.955000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  1.445000 0.775000 1.615000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.115000  1.785000 1.285000 1.955000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.725000  1.445000 2.895000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.280000  1.785000 3.450000 1.955000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 0.545000 1.415000 0.835000 1.460000 ;
       RECT 0.545000 1.460000 2.955000 1.600000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
index eabc060..f3f45c5 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_2.magic.lef
@@ -79,29 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.565000  0.085000 0.895000 0.465000 ;
-        RECT 2.025000  0.085000 2.355000 0.445000 ;
-        RECT 3.870000  0.085000 4.200000 0.610000 ;
-        RECT 5.315000  0.085000 5.645000 0.825000 ;
-        RECT 6.375000  0.085000 6.585000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -110,74 +87,93 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.565000 2.135000 0.895000 2.635000 ;
-        RECT 2.055000 1.835000 2.325000 2.635000 ;
-        RECT 4.050000 2.135000 4.635000 2.635000 ;
-        RECT 5.345000 1.885000 5.675000 2.150000 ;
-        RECT 5.345000 2.150000 5.645000 2.635000 ;
-        RECT 6.375000 1.495000 6.580000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.795000 0.775000 1.965000 ;
-      RECT 0.085000 1.965000 0.395000 2.465000 ;
-      RECT 0.225000 0.280000 0.395000 0.635000 ;
-      RECT 0.225000 0.635000 0.775000 0.805000 ;
-      RECT 0.605000 0.805000 0.775000 1.070000 ;
-      RECT 0.605000 1.070000 0.895000 1.400000 ;
-      RECT 0.605000 1.400000 0.775000 1.795000 ;
-      RECT 1.065000 0.280000 1.235000 1.685000 ;
-      RECT 1.065000 1.685000 1.335000 2.465000 ;
-      RECT 1.555000 1.495000 2.115000 1.665000 ;
-      RECT 1.555000 1.665000 1.885000 2.465000 ;
-      RECT 1.660000 0.345000 1.855000 0.615000 ;
-      RECT 1.660000 0.615000 2.115000 0.765000 ;
-      RECT 1.660000 0.765000 2.535000 0.785000 ;
-      RECT 1.945000 0.785000 2.535000 1.095000 ;
-      RECT 1.945000 1.095000 2.115000 1.495000 ;
-      RECT 2.445000 1.265000 2.955000 1.685000 ;
-      RECT 2.780000 0.735000 3.295000 1.095000 ;
-      RECT 3.020000 2.165000 3.850000 2.385000 ;
-      RECT 3.040000 0.280000 3.660000 0.565000 ;
-      RECT 3.125000 1.095000 3.295000 1.575000 ;
-      RECT 3.125000 1.575000 3.510000 1.995000 ;
-      RECT 3.490000 0.565000 3.660000 0.995000 ;
-      RECT 3.490000 0.995000 4.380000 1.165000 ;
-      RECT 3.680000 1.165000 4.380000 1.325000 ;
-      RECT 3.680000 1.325000 3.850000 2.165000 ;
-      RECT 4.020000 1.535000 5.725000 1.705000 ;
-      RECT 4.020000 1.705000 5.170000 1.865000 ;
-      RECT 4.455000 0.255000 4.785000 0.825000 ;
-      RECT 4.550000 0.825000 4.720000 1.535000 ;
-      RECT 4.885000 1.865000 5.170000 2.465000 ;
-      RECT 5.555000 0.995000 5.865000 1.325000 ;
-      RECT 5.555000 1.325000 5.725000 1.535000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.085000  1.795000 0.775000 1.965000 ;
+      RECT 0.085000  1.965000 0.395000 2.465000 ;
+      RECT 0.225000  0.280000 0.395000 0.635000 ;
+      RECT 0.225000  0.635000 0.775000 0.805000 ;
+      RECT 0.565000  0.085000 0.895000 0.465000 ;
+      RECT 0.565000  2.135000 0.895000 2.635000 ;
+      RECT 0.605000  0.805000 0.775000 1.070000 ;
+      RECT 0.605000  1.070000 0.895000 1.400000 ;
+      RECT 0.605000  1.400000 0.775000 1.795000 ;
+      RECT 1.065000  0.280000 1.235000 1.685000 ;
+      RECT 1.065000  1.685000 1.335000 2.465000 ;
+      RECT 1.555000  1.495000 2.115000 1.665000 ;
+      RECT 1.555000  1.665000 1.885000 2.465000 ;
+      RECT 1.660000  0.345000 1.855000 0.615000 ;
+      RECT 1.660000  0.615000 2.115000 0.765000 ;
+      RECT 1.660000  0.765000 2.535000 0.785000 ;
+      RECT 1.945000  0.785000 2.535000 1.095000 ;
+      RECT 1.945000  1.095000 2.115000 1.495000 ;
+      RECT 2.025000  0.085000 2.355000 0.445000 ;
+      RECT 2.055000  1.835000 2.325000 2.635000 ;
+      RECT 2.445000  1.265000 2.955000 1.685000 ;
+      RECT 2.780000  0.735000 3.295000 1.095000 ;
+      RECT 3.020000  2.165000 3.850000 2.385000 ;
+      RECT 3.040000  0.280000 3.660000 0.565000 ;
+      RECT 3.125000  1.095000 3.295000 1.575000 ;
+      RECT 3.125000  1.575000 3.510000 1.995000 ;
+      RECT 3.490000  0.565000 3.660000 0.995000 ;
+      RECT 3.490000  0.995000 4.380000 1.165000 ;
+      RECT 3.680000  1.165000 4.380000 1.325000 ;
+      RECT 3.680000  1.325000 3.850000 2.165000 ;
+      RECT 3.870000  0.085000 4.200000 0.610000 ;
+      RECT 4.020000  1.535000 5.725000 1.705000 ;
+      RECT 4.020000  1.705000 5.170000 1.865000 ;
+      RECT 4.050000  2.135000 4.635000 2.635000 ;
+      RECT 4.455000  0.255000 4.785000 0.825000 ;
+      RECT 4.550000  0.825000 4.720000 1.535000 ;
+      RECT 4.885000  1.865000 5.170000 2.465000 ;
+      RECT 5.315000  0.085000 5.645000 0.825000 ;
+      RECT 5.345000  1.885000 5.675000 2.150000 ;
+      RECT 5.345000  2.150000 5.645000 2.635000 ;
+      RECT 5.555000  0.995000 5.865000 1.325000 ;
+      RECT 5.555000  1.325000 5.725000 1.535000 ;
+      RECT 6.375000  0.085000 6.585000 0.885000 ;
+      RECT 6.375000  1.495000 6.580000 2.635000 ;
     LAYER mcon ;
-      RECT 0.605000 1.445000 0.775000 1.615000 ;
-      RECT 1.115000 1.785000 1.285000 1.955000 ;
-      RECT 2.725000 1.445000 2.895000 1.615000 ;
-      RECT 3.280000 1.785000 3.450000 1.955000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  1.445000 0.775000 1.615000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.115000  1.785000 1.285000 1.955000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.725000  1.445000 2.895000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.280000  1.785000 3.450000 1.955000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
     LAYER met1 ;
       RECT 0.545000 1.415000 0.835000 1.460000 ;
       RECT 0.545000 1.460000 2.955000 1.600000 ;
diff --git a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
index 30cab14..c36d5a7 100644
--- a/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
+++ b/cells/dlrtp/sky130_fd_sc_hdll__dlrtp_4.magic.lef
@@ -84,32 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.565000  0.085000 0.895000 0.465000 ;
-        RECT 2.025000  0.085000 2.355000 0.445000 ;
-        RECT 3.870000  0.085000 4.200000 0.610000 ;
-        RECT 5.315000  0.085000 5.645000 0.825000 ;
-        RECT 6.375000  0.085000 6.585000 0.565000 ;
-        RECT 7.255000  0.085000 7.465000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -118,77 +92,99 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.565000 2.135000 0.895000 2.635000 ;
-        RECT 2.055000 1.835000 2.325000 2.635000 ;
-        RECT 4.020000 2.135000 4.705000 2.635000 ;
-        RECT 5.345000 1.875000 5.675000 2.150000 ;
-        RECT 5.345000 2.150000 5.645000 2.635000 ;
-        RECT 6.315000 1.835000 6.585000 2.635000 ;
-        RECT 7.255000 1.495000 7.510000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.795000 0.775000 1.965000 ;
-      RECT 0.085000 1.965000 0.395000 2.465000 ;
-      RECT 0.225000 0.280000 0.395000 0.635000 ;
-      RECT 0.225000 0.635000 0.775000 0.805000 ;
-      RECT 0.605000 0.805000 0.775000 1.070000 ;
-      RECT 0.605000 1.070000 0.895000 1.400000 ;
-      RECT 0.605000 1.400000 0.775000 1.795000 ;
-      RECT 1.065000 0.280000 1.235000 1.685000 ;
-      RECT 1.065000 1.685000 1.335000 2.465000 ;
-      RECT 1.555000 1.495000 2.115000 1.665000 ;
-      RECT 1.555000 1.665000 1.885000 2.465000 ;
-      RECT 1.660000 0.345000 1.855000 0.615000 ;
-      RECT 1.660000 0.615000 2.115000 0.765000 ;
-      RECT 1.660000 0.765000 2.535000 0.785000 ;
-      RECT 1.945000 0.785000 2.535000 1.095000 ;
-      RECT 1.945000 1.095000 2.115000 1.495000 ;
-      RECT 2.445000 1.265000 2.955000 1.685000 ;
-      RECT 2.780000 0.735000 3.295000 1.095000 ;
-      RECT 3.020000 2.165000 3.850000 2.385000 ;
-      RECT 3.040000 0.280000 3.660000 0.565000 ;
-      RECT 3.125000 1.095000 3.295000 1.575000 ;
-      RECT 3.125000 1.575000 3.510000 1.995000 ;
-      RECT 3.490000 0.565000 3.660000 0.995000 ;
-      RECT 3.490000 0.995000 4.380000 1.165000 ;
-      RECT 3.680000 1.165000 4.380000 1.325000 ;
-      RECT 3.680000 1.325000 3.850000 2.165000 ;
-      RECT 4.020000 1.535000 5.725000 1.705000 ;
-      RECT 4.020000 1.705000 5.175000 1.865000 ;
-      RECT 4.455000 0.255000 4.785000 0.825000 ;
-      RECT 4.550000 0.825000 4.720000 1.535000 ;
-      RECT 4.875000 1.865000 5.175000 2.435000 ;
-      RECT 5.555000 1.075000 6.235000 1.325000 ;
-      RECT 5.555000 1.325000 5.725000 1.535000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.085000  1.795000 0.775000 1.965000 ;
+      RECT 0.085000  1.965000 0.395000 2.465000 ;
+      RECT 0.225000  0.280000 0.395000 0.635000 ;
+      RECT 0.225000  0.635000 0.775000 0.805000 ;
+      RECT 0.565000  0.085000 0.895000 0.465000 ;
+      RECT 0.565000  2.135000 0.895000 2.635000 ;
+      RECT 0.605000  0.805000 0.775000 1.070000 ;
+      RECT 0.605000  1.070000 0.895000 1.400000 ;
+      RECT 0.605000  1.400000 0.775000 1.795000 ;
+      RECT 1.065000  0.280000 1.235000 1.685000 ;
+      RECT 1.065000  1.685000 1.335000 2.465000 ;
+      RECT 1.555000  1.495000 2.115000 1.665000 ;
+      RECT 1.555000  1.665000 1.885000 2.465000 ;
+      RECT 1.660000  0.345000 1.855000 0.615000 ;
+      RECT 1.660000  0.615000 2.115000 0.765000 ;
+      RECT 1.660000  0.765000 2.535000 0.785000 ;
+      RECT 1.945000  0.785000 2.535000 1.095000 ;
+      RECT 1.945000  1.095000 2.115000 1.495000 ;
+      RECT 2.025000  0.085000 2.355000 0.445000 ;
+      RECT 2.055000  1.835000 2.325000 2.635000 ;
+      RECT 2.445000  1.265000 2.955000 1.685000 ;
+      RECT 2.780000  0.735000 3.295000 1.095000 ;
+      RECT 3.020000  2.165000 3.850000 2.385000 ;
+      RECT 3.040000  0.280000 3.660000 0.565000 ;
+      RECT 3.125000  1.095000 3.295000 1.575000 ;
+      RECT 3.125000  1.575000 3.510000 1.995000 ;
+      RECT 3.490000  0.565000 3.660000 0.995000 ;
+      RECT 3.490000  0.995000 4.380000 1.165000 ;
+      RECT 3.680000  1.165000 4.380000 1.325000 ;
+      RECT 3.680000  1.325000 3.850000 2.165000 ;
+      RECT 3.870000  0.085000 4.200000 0.610000 ;
+      RECT 4.020000  1.535000 5.725000 1.705000 ;
+      RECT 4.020000  1.705000 5.175000 1.865000 ;
+      RECT 4.020000  2.135000 4.705000 2.635000 ;
+      RECT 4.455000  0.255000 4.785000 0.825000 ;
+      RECT 4.550000  0.825000 4.720000 1.535000 ;
+      RECT 4.875000  1.865000 5.175000 2.435000 ;
+      RECT 5.315000  0.085000 5.645000 0.825000 ;
+      RECT 5.345000  1.875000 5.675000 2.150000 ;
+      RECT 5.345000  2.150000 5.645000 2.635000 ;
+      RECT 5.555000  1.075000 6.235000 1.325000 ;
+      RECT 5.555000  1.325000 5.725000 1.535000 ;
+      RECT 6.315000  1.835000 6.585000 2.635000 ;
+      RECT 6.375000  0.085000 6.585000 0.565000 ;
+      RECT 7.255000  0.085000 7.465000 0.885000 ;
+      RECT 7.255000  1.495000 7.510000 2.635000 ;
     LAYER mcon ;
-      RECT 0.605000 1.445000 0.775000 1.615000 ;
-      RECT 1.115000 1.785000 1.285000 1.955000 ;
-      RECT 2.725000 1.445000 2.895000 1.615000 ;
-      RECT 3.280000 1.785000 3.450000 1.955000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  1.445000 0.775000 1.615000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.115000  1.785000 1.285000 1.955000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.725000  1.445000 2.895000 1.615000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.280000  1.785000 3.450000 1.955000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
     LAYER met1 ;
       RECT 0.545000 1.415000 0.835000 1.460000 ;
       RECT 0.545000 1.460000 2.955000 1.600000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
index d08f527..1aff638 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_1.magic.lef
@@ -65,26 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.465000 ;
-        RECT 1.975000  0.085000 2.355000 0.445000 ;
-        RECT 4.020000  0.085000 4.300000 0.825000 ;
-        RECT 5.020000  0.085000 5.290000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -93,68 +73,84 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.515000 2.135000 0.895000 2.635000 ;
-        RECT 2.105000 1.835000 2.420000 2.635000 ;
-        RECT 4.050000 2.135000 4.350000 2.635000 ;
-        RECT 5.020000 1.495000 5.290000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.830000 0.805000 ;
-      RECT 0.175000 1.795000 0.830000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.660000 0.805000 0.830000 1.070000 ;
-      RECT 0.660000 1.070000 0.890000 1.400000 ;
-      RECT 0.660000 1.400000 0.830000 1.795000 ;
-      RECT 1.115000 0.345000 1.285000 1.685000 ;
-      RECT 1.115000 1.685000 1.340000 2.465000 ;
-      RECT 1.555000 1.495000 2.290000 1.665000 ;
-      RECT 1.555000 1.665000 1.885000 2.415000 ;
-      RECT 1.635000 0.345000 1.805000 0.615000 ;
-      RECT 1.635000 0.615000 2.290000 0.765000 ;
-      RECT 1.635000 0.765000 2.540000 0.785000 ;
-      RECT 2.120000 0.785000 2.540000 1.095000 ;
-      RECT 2.120000 1.095000 2.290000 1.495000 ;
-      RECT 2.670000 1.355000 2.955000 2.005000 ;
-      RECT 2.885000 0.705000 3.340000 1.035000 ;
-      RECT 3.005000 0.365000 3.850000 0.535000 ;
-      RECT 3.020000 2.255000 3.850000 2.425000 ;
-      RECT 3.170000 1.035000 3.340000 1.415000 ;
-      RECT 3.170000 1.415000 3.510000 1.995000 ;
-      RECT 3.680000 0.535000 3.850000 0.995000 ;
-      RECT 3.680000 0.995000 4.430000 1.325000 ;
-      RECT 3.680000 1.325000 3.850000 2.255000 ;
-      RECT 4.070000 1.535000 4.790000 1.865000 ;
-      RECT 4.570000 0.415000 4.790000 0.825000 ;
-      RECT 4.570000 1.865000 4.790000 2.435000 ;
-      RECT 4.620000 0.825000 4.790000 0.995000 ;
-      RECT 4.620000 0.995000 5.420000 1.325000 ;
-      RECT 4.620000 1.325000 4.790000 1.535000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.830000 0.805000 ;
+      RECT 0.175000  1.795000 0.830000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.895000 0.465000 ;
+      RECT 0.515000  2.135000 0.895000 2.635000 ;
+      RECT 0.660000  0.805000 0.830000 1.070000 ;
+      RECT 0.660000  1.070000 0.890000 1.400000 ;
+      RECT 0.660000  1.400000 0.830000 1.795000 ;
+      RECT 1.115000  0.345000 1.285000 1.685000 ;
+      RECT 1.115000  1.685000 1.340000 2.465000 ;
+      RECT 1.555000  1.495000 2.290000 1.665000 ;
+      RECT 1.555000  1.665000 1.885000 2.415000 ;
+      RECT 1.635000  0.345000 1.805000 0.615000 ;
+      RECT 1.635000  0.615000 2.290000 0.765000 ;
+      RECT 1.635000  0.765000 2.540000 0.785000 ;
+      RECT 1.975000  0.085000 2.355000 0.445000 ;
+      RECT 2.105000  1.835000 2.420000 2.635000 ;
+      RECT 2.120000  0.785000 2.540000 1.095000 ;
+      RECT 2.120000  1.095000 2.290000 1.495000 ;
+      RECT 2.670000  1.355000 2.955000 2.005000 ;
+      RECT 2.885000  0.705000 3.340000 1.035000 ;
+      RECT 3.005000  0.365000 3.850000 0.535000 ;
+      RECT 3.020000  2.255000 3.850000 2.425000 ;
+      RECT 3.170000  1.035000 3.340000 1.415000 ;
+      RECT 3.170000  1.415000 3.510000 1.995000 ;
+      RECT 3.680000  0.535000 3.850000 0.995000 ;
+      RECT 3.680000  0.995000 4.430000 1.325000 ;
+      RECT 3.680000  1.325000 3.850000 2.255000 ;
+      RECT 4.020000  0.085000 4.300000 0.825000 ;
+      RECT 4.050000  2.135000 4.350000 2.635000 ;
+      RECT 4.070000  1.535000 4.790000 1.865000 ;
+      RECT 4.570000  0.415000 4.790000 0.825000 ;
+      RECT 4.570000  1.865000 4.790000 2.435000 ;
+      RECT 4.620000  0.825000 4.790000 0.995000 ;
+      RECT 4.620000  0.995000 5.420000 1.325000 ;
+      RECT 4.620000  1.325000 4.790000 1.535000 ;
+      RECT 5.020000  0.085000 5.290000 0.825000 ;
+      RECT 5.020000  1.495000 5.290000 2.635000 ;
     LAYER mcon ;
-      RECT 0.660000 1.445000 0.830000 1.615000 ;
-      RECT 1.170000 1.785000 1.340000 1.955000 ;
-      RECT 2.670000 1.785000 2.840000 1.955000 ;
-      RECT 3.175000 1.445000 3.345000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.660000  1.445000 0.830000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.170000  1.785000 1.340000 1.955000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.670000  1.785000 2.840000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.175000  1.445000 3.345000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
     LAYER met1 ;
       RECT 0.600000 1.415000 0.890000 1.460000 ;
       RECT 0.600000 1.460000 3.405000 1.600000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
index e637bc7..16512f7 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_2.magic.lef
@@ -69,28 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.465000 ;
-        RECT 1.975000  0.085000 2.355000 0.445000 ;
-        RECT 4.035000  0.085000 4.415000 0.825000 ;
-        RECT 5.135000  0.085000 5.405000 0.825000 ;
-        RECT 6.095000  0.085000 6.355000 0.550000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -99,71 +77,89 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.515000 2.135000 0.895000 2.635000 ;
-        RECT 2.105000 1.835000 2.420000 2.635000 ;
-        RECT 4.165000 2.135000 4.465000 2.635000 ;
-        RECT 5.135000 1.495000 5.405000 2.635000 ;
-        RECT 6.095000 1.755000 6.345000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.830000 0.805000 ;
-      RECT 0.175000 1.795000 0.830000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.660000 0.805000 0.830000 1.070000 ;
-      RECT 0.660000 1.070000 0.890000 1.400000 ;
-      RECT 0.660000 1.400000 0.830000 1.795000 ;
-      RECT 1.115000 0.345000 1.285000 1.685000 ;
-      RECT 1.115000 1.685000 1.340000 2.465000 ;
-      RECT 1.555000 1.495000 2.290000 1.665000 ;
-      RECT 1.555000 1.665000 1.885000 2.415000 ;
-      RECT 1.635000 0.345000 1.805000 0.615000 ;
-      RECT 1.635000 0.615000 2.290000 0.765000 ;
-      RECT 1.635000 0.765000 2.540000 0.785000 ;
-      RECT 2.120000 0.785000 2.540000 1.095000 ;
-      RECT 2.120000 1.095000 2.290000 1.495000 ;
-      RECT 2.670000 1.355000 2.955000 2.005000 ;
-      RECT 2.915000 0.705000 3.340000 1.035000 ;
-      RECT 3.085000 0.365000 3.795000 0.535000 ;
-      RECT 3.145000 2.255000 3.945000 2.425000 ;
-      RECT 3.170000 1.035000 3.340000 1.415000 ;
-      RECT 3.170000 1.415000 3.510000 1.995000 ;
-      RECT 3.625000 0.535000 3.795000 0.995000 ;
-      RECT 3.625000 0.995000 4.545000 1.165000 ;
-      RECT 3.775000 1.165000 4.545000 1.325000 ;
-      RECT 3.775000 1.325000 3.945000 2.255000 ;
-      RECT 4.185000 1.535000 4.905000 1.865000 ;
-      RECT 4.685000 0.415000 4.905000 0.825000 ;
-      RECT 4.685000 1.865000 4.905000 2.435000 ;
-      RECT 4.735000 0.825000 4.905000 0.995000 ;
-      RECT 4.735000 0.995000 5.535000 1.325000 ;
-      RECT 4.735000 1.325000 4.905000 1.535000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.830000 0.805000 ;
+      RECT 0.175000  1.795000 0.830000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.895000 0.465000 ;
+      RECT 0.515000  2.135000 0.895000 2.635000 ;
+      RECT 0.660000  0.805000 0.830000 1.070000 ;
+      RECT 0.660000  1.070000 0.890000 1.400000 ;
+      RECT 0.660000  1.400000 0.830000 1.795000 ;
+      RECT 1.115000  0.345000 1.285000 1.685000 ;
+      RECT 1.115000  1.685000 1.340000 2.465000 ;
+      RECT 1.555000  1.495000 2.290000 1.665000 ;
+      RECT 1.555000  1.665000 1.885000 2.415000 ;
+      RECT 1.635000  0.345000 1.805000 0.615000 ;
+      RECT 1.635000  0.615000 2.290000 0.765000 ;
+      RECT 1.635000  0.765000 2.540000 0.785000 ;
+      RECT 1.975000  0.085000 2.355000 0.445000 ;
+      RECT 2.105000  1.835000 2.420000 2.635000 ;
+      RECT 2.120000  0.785000 2.540000 1.095000 ;
+      RECT 2.120000  1.095000 2.290000 1.495000 ;
+      RECT 2.670000  1.355000 2.955000 2.005000 ;
+      RECT 2.915000  0.705000 3.340000 1.035000 ;
+      RECT 3.085000  0.365000 3.795000 0.535000 ;
+      RECT 3.145000  2.255000 3.945000 2.425000 ;
+      RECT 3.170000  1.035000 3.340000 1.415000 ;
+      RECT 3.170000  1.415000 3.510000 1.995000 ;
+      RECT 3.625000  0.535000 3.795000 0.995000 ;
+      RECT 3.625000  0.995000 4.545000 1.165000 ;
+      RECT 3.775000  1.165000 4.545000 1.325000 ;
+      RECT 3.775000  1.325000 3.945000 2.255000 ;
+      RECT 4.035000  0.085000 4.415000 0.825000 ;
+      RECT 4.165000  2.135000 4.465000 2.635000 ;
+      RECT 4.185000  1.535000 4.905000 1.865000 ;
+      RECT 4.685000  0.415000 4.905000 0.825000 ;
+      RECT 4.685000  1.865000 4.905000 2.435000 ;
+      RECT 4.735000  0.825000 4.905000 0.995000 ;
+      RECT 4.735000  0.995000 5.535000 1.325000 ;
+      RECT 4.735000  1.325000 4.905000 1.535000 ;
+      RECT 5.135000  0.085000 5.405000 0.825000 ;
+      RECT 5.135000  1.495000 5.405000 2.635000 ;
+      RECT 6.095000  0.085000 6.355000 0.550000 ;
+      RECT 6.095000  1.755000 6.345000 2.635000 ;
     LAYER mcon ;
-      RECT 0.660000 1.445000 0.830000 1.615000 ;
-      RECT 1.170000 1.785000 1.340000 1.955000 ;
-      RECT 2.670000 1.785000 2.840000 1.955000 ;
-      RECT 3.175000 1.445000 3.345000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.660000  1.445000 0.830000 1.615000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.170000  1.785000 1.340000 1.955000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.670000  1.785000 2.840000 1.955000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.175000  1.445000 3.345000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 0.600000 1.415000 0.890000 1.460000 ;
       RECT 0.600000 1.460000 3.405000 1.600000 ;
diff --git a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
index 0fdd426..3b1d776 100644
--- a/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
+++ b/cells/dlxtn/sky130_fd_sc_hdll__dlxtn_4.magic.lef
@@ -71,31 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.465000 ;
-        RECT 1.975000  0.085000 2.355000 0.445000 ;
-        RECT 4.120000  0.085000 4.290000 0.610000 ;
-        RECT 5.090000  0.085000 5.375000 0.715000 ;
-        RECT 6.065000  0.085000 6.315000 0.825000 ;
-        RECT 7.005000  0.085000 7.175000 0.715000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -104,69 +79,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.515000 2.135000 0.895000 2.635000 ;
-        RECT 2.105000 1.835000 2.420000 2.635000 ;
-        RECT 4.120000 2.135000 4.290000 2.635000 ;
-        RECT 5.090000 1.495000 5.375000 2.635000 ;
-        RECT 6.065000 1.495000 6.315000 2.635000 ;
-        RECT 7.005000 1.495000 7.175000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000 0.345000 0.635000 ;
-      RECT 0.175000 0.635000 0.890000 0.805000 ;
-      RECT 0.175000 1.795000 0.890000 1.965000 ;
-      RECT 0.175000 1.965000 0.345000 2.465000 ;
-      RECT 0.660000 0.805000 0.890000 1.795000 ;
-      RECT 1.115000 0.345000 1.285000 2.465000 ;
-      RECT 1.555000 1.495000 2.290000 1.665000 ;
-      RECT 1.555000 1.665000 1.885000 2.415000 ;
-      RECT 1.635000 0.345000 1.805000 0.615000 ;
-      RECT 1.635000 0.615000 2.290000 0.765000 ;
-      RECT 1.635000 0.765000 2.540000 0.785000 ;
-      RECT 2.120000 0.785000 2.540000 1.095000 ;
-      RECT 2.120000 1.095000 2.290000 1.495000 ;
-      RECT 2.670000 1.355000 2.955000 2.005000 ;
-      RECT 2.915000 0.705000 3.345000 1.035000 ;
-      RECT 3.025000 2.255000 3.950000 2.425000 ;
-      RECT 3.090000 0.365000 3.950000 0.535000 ;
-      RECT 3.175000 1.035000 3.345000 1.415000 ;
-      RECT 3.175000 1.415000 3.565000 1.995000 ;
-      RECT 3.780000 0.535000 3.950000 0.995000 ;
-      RECT 3.780000 0.995000 4.500000 1.325000 ;
-      RECT 3.780000 1.325000 3.950000 2.255000 ;
-      RECT 4.140000 1.535000 4.860000 1.865000 ;
-      RECT 4.640000 1.865000 4.860000 2.435000 ;
-      RECT 4.670000 0.415000 4.860000 0.995000 ;
-      RECT 4.670000 0.995000 5.490000 1.325000 ;
-      RECT 4.670000 1.325000 4.860000 1.535000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.175000  0.345000 0.345000 0.635000 ;
+      RECT 0.175000  0.635000 0.890000 0.805000 ;
+      RECT 0.175000  1.795000 0.890000 1.965000 ;
+      RECT 0.175000  1.965000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.895000 0.465000 ;
+      RECT 0.515000  2.135000 0.895000 2.635000 ;
+      RECT 0.660000  0.805000 0.890000 1.795000 ;
+      RECT 1.115000  0.345000 1.285000 2.465000 ;
+      RECT 1.555000  1.495000 2.290000 1.665000 ;
+      RECT 1.555000  1.665000 1.885000 2.415000 ;
+      RECT 1.635000  0.345000 1.805000 0.615000 ;
+      RECT 1.635000  0.615000 2.290000 0.765000 ;
+      RECT 1.635000  0.765000 2.540000 0.785000 ;
+      RECT 1.975000  0.085000 2.355000 0.445000 ;
+      RECT 2.105000  1.835000 2.420000 2.635000 ;
+      RECT 2.120000  0.785000 2.540000 1.095000 ;
+      RECT 2.120000  1.095000 2.290000 1.495000 ;
+      RECT 2.670000  1.355000 2.955000 2.005000 ;
+      RECT 2.915000  0.705000 3.345000 1.035000 ;
+      RECT 3.025000  2.255000 3.950000 2.425000 ;
+      RECT 3.090000  0.365000 3.950000 0.535000 ;
+      RECT 3.175000  1.035000 3.345000 1.415000 ;
+      RECT 3.175000  1.415000 3.565000 1.995000 ;
+      RECT 3.780000  0.535000 3.950000 0.995000 ;
+      RECT 3.780000  0.995000 4.500000 1.325000 ;
+      RECT 3.780000  1.325000 3.950000 2.255000 ;
+      RECT 4.120000  0.085000 4.290000 0.610000 ;
+      RECT 4.120000  2.135000 4.290000 2.635000 ;
+      RECT 4.140000  1.535000 4.860000 1.865000 ;
+      RECT 4.640000  1.865000 4.860000 2.435000 ;
+      RECT 4.670000  0.415000 4.860000 0.995000 ;
+      RECT 4.670000  0.995000 5.490000 1.325000 ;
+      RECT 4.670000  1.325000 4.860000 1.535000 ;
+      RECT 5.090000  0.085000 5.375000 0.715000 ;
+      RECT 5.090000  1.495000 5.375000 2.635000 ;
+      RECT 6.065000  0.085000 6.315000 0.825000 ;
+      RECT 6.065000  1.495000 6.315000 2.635000 ;
+      RECT 7.005000  0.085000 7.175000 0.715000 ;
+      RECT 7.005000  1.495000 7.175000 2.635000 ;
     LAYER mcon ;
-      RECT 0.660000 1.400000 0.830000 1.570000 ;
-      RECT 1.115000 1.770000 1.285000 1.940000 ;
-      RECT 2.670000 1.770000 2.840000 1.940000 ;
-      RECT 3.175000 1.400000 3.345000 1.570000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 0.660000  1.400000 0.830000 1.570000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.115000  1.770000 1.285000 1.940000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.670000  1.770000 2.840000 1.940000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.175000  1.400000 3.345000 1.570000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
     LAYER met1 ;
       RECT 0.600000 1.370000 0.890000 1.460000 ;
       RECT 0.600000 1.460000 3.410000 1.600000 ;
diff --git a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
index f7fe502..03655b3 100644
--- a/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
+++ b/cells/dlygate4sd1/sky130_fd_sc_hdll__dlygate4sd1_1.magic.lef
@@ -58,18 +58,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.600000  0.085000 0.815000 0.545000 ;
-        RECT 2.145000  0.085000 2.555000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -78,43 +66,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.600000 2.175000 0.815000 2.635000 ;
-        RECT 2.145000 1.915000 2.515000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.785000 0.945000 2.005000 ;
-      RECT 0.085000 2.005000 0.380000 2.465000 ;
-      RECT 0.095000 0.255000 0.380000 0.715000 ;
-      RECT 0.095000 0.715000 0.945000 0.885000 ;
-      RECT 0.775000 0.885000 0.945000 0.995000 ;
-      RECT 0.775000 0.995000 1.080000 1.325000 ;
-      RECT 0.775000 1.325000 0.945000 1.785000 ;
-      RECT 0.985000 0.255000 1.420000 0.545000 ;
-      RECT 0.985000 2.175000 1.420000 2.465000 ;
-      RECT 1.250000 0.545000 1.420000 1.075000 ;
-      RECT 1.250000 1.075000 2.000000 1.275000 ;
-      RECT 1.250000 1.275000 1.420000 2.175000 ;
-      RECT 1.615000 0.255000 1.840000 0.735000 ;
-      RECT 1.615000 0.735000 2.610000 0.905000 ;
-      RECT 1.615000 1.575000 2.610000 1.745000 ;
-      RECT 1.615000 1.745000 1.840000 2.430000 ;
-      RECT 2.400000 0.905000 2.610000 0.995000 ;
-      RECT 2.400000 0.995000 2.730000 1.325000 ;
-      RECT 2.400000 1.325000 2.610000 1.575000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  1.785000 0.945000 2.005000 ;
+      RECT 0.085000  2.005000 0.380000 2.465000 ;
+      RECT 0.095000  0.255000 0.380000 0.715000 ;
+      RECT 0.095000  0.715000 0.945000 0.885000 ;
+      RECT 0.600000  0.085000 0.815000 0.545000 ;
+      RECT 0.600000  2.175000 0.815000 2.635000 ;
+      RECT 0.775000  0.885000 0.945000 0.995000 ;
+      RECT 0.775000  0.995000 1.080000 1.325000 ;
+      RECT 0.775000  1.325000 0.945000 1.785000 ;
+      RECT 0.985000  0.255000 1.420000 0.545000 ;
+      RECT 0.985000  2.175000 1.420000 2.465000 ;
+      RECT 1.250000  0.545000 1.420000 1.075000 ;
+      RECT 1.250000  1.075000 2.000000 1.275000 ;
+      RECT 1.250000  1.275000 1.420000 2.175000 ;
+      RECT 1.615000  0.255000 1.840000 0.735000 ;
+      RECT 1.615000  0.735000 2.610000 0.905000 ;
+      RECT 1.615000  1.575000 2.610000 1.745000 ;
+      RECT 1.615000  1.745000 1.840000 2.430000 ;
+      RECT 2.145000  0.085000 2.555000 0.565000 ;
+      RECT 2.145000  1.915000 2.515000 2.635000 ;
+      RECT 2.400000  0.905000 2.610000 0.995000 ;
+      RECT 2.400000  0.995000 2.730000 1.325000 ;
+      RECT 2.400000  1.325000 2.610000 1.575000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
index dc89826..eb2ba5c 100644
--- a/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
+++ b/cells/dlygate4sd2/sky130_fd_sc_hdll__dlygate4sd2_1.magic.lef
@@ -58,18 +58,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.600000  0.085000 0.815000 0.545000 ;
-        RECT 2.145000  0.085000 2.555000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -78,43 +66,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.600000 2.175000 0.815000 2.635000 ;
-        RECT 2.145000 1.915000 2.515000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.785000 0.945000 2.005000 ;
-      RECT 0.085000 2.005000 0.380000 2.465000 ;
-      RECT 0.095000 0.255000 0.380000 0.715000 ;
-      RECT 0.095000 0.715000 0.945000 0.885000 ;
-      RECT 0.775000 0.885000 0.945000 0.995000 ;
-      RECT 0.775000 0.995000 1.080000 1.325000 ;
-      RECT 0.775000 1.325000 0.945000 1.785000 ;
-      RECT 0.985000 0.255000 1.420000 0.545000 ;
-      RECT 0.985000 2.175000 1.420000 2.465000 ;
-      RECT 1.250000 0.545000 1.420000 1.075000 ;
-      RECT 1.250000 1.075000 2.095000 1.275000 ;
-      RECT 1.250000 1.275000 1.420000 2.175000 ;
-      RECT 1.615000 0.510000 1.840000 0.735000 ;
-      RECT 1.615000 0.735000 2.610000 0.905000 ;
-      RECT 1.615000 1.575000 2.610000 1.745000 ;
-      RECT 1.615000 1.745000 1.840000 2.080000 ;
-      RECT 2.400000 0.905000 2.610000 0.995000 ;
-      RECT 2.400000 0.995000 2.690000 1.325000 ;
-      RECT 2.400000 1.325000 2.610000 1.575000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  1.785000 0.945000 2.005000 ;
+      RECT 0.085000  2.005000 0.380000 2.465000 ;
+      RECT 0.095000  0.255000 0.380000 0.715000 ;
+      RECT 0.095000  0.715000 0.945000 0.885000 ;
+      RECT 0.600000  0.085000 0.815000 0.545000 ;
+      RECT 0.600000  2.175000 0.815000 2.635000 ;
+      RECT 0.775000  0.885000 0.945000 0.995000 ;
+      RECT 0.775000  0.995000 1.080000 1.325000 ;
+      RECT 0.775000  1.325000 0.945000 1.785000 ;
+      RECT 0.985000  0.255000 1.420000 0.545000 ;
+      RECT 0.985000  2.175000 1.420000 2.465000 ;
+      RECT 1.250000  0.545000 1.420000 1.075000 ;
+      RECT 1.250000  1.075000 2.095000 1.275000 ;
+      RECT 1.250000  1.275000 1.420000 2.175000 ;
+      RECT 1.615000  0.510000 1.840000 0.735000 ;
+      RECT 1.615000  0.735000 2.610000 0.905000 ;
+      RECT 1.615000  1.575000 2.610000 1.745000 ;
+      RECT 1.615000  1.745000 1.840000 2.080000 ;
+      RECT 2.145000  0.085000 2.555000 0.565000 ;
+      RECT 2.145000  1.915000 2.515000 2.635000 ;
+      RECT 2.400000  0.905000 2.610000 0.995000 ;
+      RECT 2.400000  0.995000 2.690000 1.325000 ;
+      RECT 2.400000  1.325000 2.610000 1.575000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
index fcc045d..7a6d3b8 100644
--- a/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
+++ b/cells/dlygate4sd3/sky130_fd_sc_hdll__dlygate4sd3_1.magic.lef
@@ -58,19 +58,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.600000  0.085000 0.815000 0.545000 ;
-        RECT 2.690000  0.085000 3.020000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -79,44 +66,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.605000 2.175000 0.855000 2.635000 ;
-        RECT 2.690000 1.915000 3.020000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.785000 0.945000 2.005000 ;
-      RECT 0.085000 2.005000 0.380000 2.465000 ;
-      RECT 0.095000 0.255000 0.380000 0.715000 ;
-      RECT 0.095000 0.715000 0.945000 0.885000 ;
-      RECT 0.775000 0.885000 0.945000 0.995000 ;
-      RECT 0.775000 0.995000 1.400000 1.325000 ;
-      RECT 0.775000 1.325000 0.945000 1.785000 ;
-      RECT 1.305000 0.255000 1.740000 0.545000 ;
-      RECT 1.305000 2.175000 1.740000 2.465000 ;
-      RECT 1.570000 0.545000 1.740000 1.075000 ;
-      RECT 1.570000 1.075000 2.475000 1.275000 ;
-      RECT 1.570000 1.275000 1.740000 2.175000 ;
-      RECT 1.910000 0.510000 2.140000 0.735000 ;
-      RECT 1.910000 0.735000 3.020000 0.905000 ;
-      RECT 1.910000 1.575000 3.020000 1.745000 ;
-      RECT 1.910000 1.745000 2.130000 2.080000 ;
-      RECT 2.810000 0.905000 3.020000 0.995000 ;
-      RECT 2.810000 0.995000 3.155000 1.325000 ;
-      RECT 2.810000 1.325000 3.020000 1.575000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  1.785000 0.945000 2.005000 ;
+      RECT 0.085000  2.005000 0.380000 2.465000 ;
+      RECT 0.095000  0.255000 0.380000 0.715000 ;
+      RECT 0.095000  0.715000 0.945000 0.885000 ;
+      RECT 0.600000  0.085000 0.815000 0.545000 ;
+      RECT 0.605000  2.175000 0.855000 2.635000 ;
+      RECT 0.775000  0.885000 0.945000 0.995000 ;
+      RECT 0.775000  0.995000 1.400000 1.325000 ;
+      RECT 0.775000  1.325000 0.945000 1.785000 ;
+      RECT 1.305000  0.255000 1.740000 0.545000 ;
+      RECT 1.305000  2.175000 1.740000 2.465000 ;
+      RECT 1.570000  0.545000 1.740000 1.075000 ;
+      RECT 1.570000  1.075000 2.475000 1.275000 ;
+      RECT 1.570000  1.275000 1.740000 2.175000 ;
+      RECT 1.910000  0.510000 2.140000 0.735000 ;
+      RECT 1.910000  0.735000 3.020000 0.905000 ;
+      RECT 1.910000  1.575000 3.020000 1.745000 ;
+      RECT 1.910000  1.745000 2.130000 2.080000 ;
+      RECT 2.690000  0.085000 3.020000 0.565000 ;
+      RECT 2.690000  1.915000 3.020000 2.635000 ;
+      RECT 2.810000  0.905000 3.020000 0.995000 ;
+      RECT 2.810000  0.995000 3.155000 1.325000 ;
+      RECT 2.810000  1.325000 3.020000 1.575000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
index 8e30fbd..b0446e4 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_1.magic.lef
@@ -67,19 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.445000 ;
-        RECT 2.345000  0.085000 3.085000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -88,41 +75,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT -0.005000 2.635000 3.680000 2.805000 ;
-        RECT  0.515000 2.175000 0.890000 2.635000 ;
-        RECT  1.540000 2.175000 1.900000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.280000 0.345000 0.615000 ;
-      RECT 0.085000 0.615000 1.235000 0.825000 ;
-      RECT 0.085000 1.785000 0.790000 2.005000 ;
-      RECT 0.085000 2.005000 0.345000 2.465000 ;
-      RECT 0.525000 0.825000 0.790000 1.785000 ;
-      RECT 1.065000 0.255000 2.175000 0.465000 ;
-      RECT 1.065000 0.465000 1.235000 0.615000 ;
-      RECT 1.115000 1.800000 1.905000 2.005000 ;
-      RECT 1.115000 2.005000 1.370000 2.460000 ;
-      RECT 1.460000 0.635000 1.790000 1.075000 ;
-      RECT 1.460000 1.075000 2.745000 1.325000 ;
-      RECT 1.460000 1.325000 1.905000 1.800000 ;
-      RECT 1.960000 0.465000 2.175000 0.735000 ;
-      RECT 1.960000 0.735000 3.085000 0.905000 ;
-      RECT 2.915000 0.905000 3.085000 0.995000 ;
-      RECT 2.915000 0.995000 3.145000 1.325000 ;
+      RECT -0.005000  2.635000 3.680000 2.805000 ;
+      RECT  0.000000 -0.085000 3.680000 0.085000 ;
+      RECT  0.085000  0.280000 0.345000 0.615000 ;
+      RECT  0.085000  0.615000 1.235000 0.825000 ;
+      RECT  0.085000  1.785000 0.790000 2.005000 ;
+      RECT  0.085000  2.005000 0.345000 2.465000 ;
+      RECT  0.515000  0.085000 0.895000 0.445000 ;
+      RECT  0.515000  2.175000 0.890000 2.635000 ;
+      RECT  0.525000  0.825000 0.790000 1.785000 ;
+      RECT  1.065000  0.255000 2.175000 0.465000 ;
+      RECT  1.065000  0.465000 1.235000 0.615000 ;
+      RECT  1.115000  1.800000 1.905000 2.005000 ;
+      RECT  1.115000  2.005000 1.370000 2.460000 ;
+      RECT  1.460000  0.635000 1.790000 1.075000 ;
+      RECT  1.460000  1.075000 2.745000 1.325000 ;
+      RECT  1.460000  1.325000 1.905000 1.800000 ;
+      RECT  1.540000  2.175000 1.900000 2.635000 ;
+      RECT  1.960000  0.465000 2.175000 0.735000 ;
+      RECT  1.960000  0.735000 3.085000 0.905000 ;
+      RECT  2.345000  0.085000 3.085000 0.565000 ;
+      RECT  2.915000  0.905000 3.085000 0.995000 ;
+      RECT  2.915000  0.995000 3.145000 1.325000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
index f77aff8..59ccb71 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_2.magic.lef
@@ -69,21 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.515000  0.085000 0.900000 0.595000 ;
-        RECT 2.490000  0.085000 2.870000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -92,47 +77,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.515000 1.845000 1.000000 2.635000 ;
-        RECT 2.080000 2.275000 2.460000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.280000 0.345000 2.465000 ;
-      RECT 1.070000 0.255000 1.830000 0.595000 ;
-      RECT 1.220000 1.445000 1.815000 1.765000 ;
-      RECT 1.220000 1.765000 1.510000 2.465000 ;
-      RECT 1.550000 0.595000 1.830000 1.025000 ;
-      RECT 1.550000 1.025000 3.215000 1.275000 ;
-      RECT 1.550000 1.275000 1.815000 1.445000 ;
-      RECT 1.700000 1.935000 3.375000 2.105000 ;
-      RECT 1.700000 2.105000 1.910000 2.465000 ;
-      RECT 2.000000 0.255000 2.320000 0.655000 ;
-      RECT 2.000000 0.655000 3.375000 0.855000 ;
-      RECT 2.680000 2.105000 3.375000 2.295000 ;
-      RECT 2.680000 2.295000 4.425000 2.465000 ;
-      RECT 3.090000 0.275000 4.400000 0.465000 ;
-      RECT 3.090000 0.465000 3.375000 0.655000 ;
-      RECT 3.495000 1.025000 3.955000 1.275000 ;
-      RECT 4.165000 1.795000 4.425000 2.295000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.280000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.900000 0.595000 ;
+      RECT 0.515000  1.845000 1.000000 2.635000 ;
+      RECT 1.070000  0.255000 1.830000 0.595000 ;
+      RECT 1.220000  1.445000 1.815000 1.765000 ;
+      RECT 1.220000  1.765000 1.510000 2.465000 ;
+      RECT 1.550000  0.595000 1.830000 1.025000 ;
+      RECT 1.550000  1.025000 3.215000 1.275000 ;
+      RECT 1.550000  1.275000 1.815000 1.445000 ;
+      RECT 1.700000  1.935000 3.375000 2.105000 ;
+      RECT 1.700000  2.105000 1.910000 2.465000 ;
+      RECT 2.000000  0.255000 2.320000 0.655000 ;
+      RECT 2.000000  0.655000 3.375000 0.855000 ;
+      RECT 2.080000  2.275000 2.460000 2.635000 ;
+      RECT 2.490000  0.085000 2.870000 0.485000 ;
+      RECT 2.680000  2.105000 3.375000 2.295000 ;
+      RECT 2.680000  2.295000 4.425000 2.465000 ;
+      RECT 3.090000  0.275000 4.400000 0.465000 ;
+      RECT 3.090000  0.465000 3.375000 0.655000 ;
+      RECT 3.495000  1.025000 3.955000 1.275000 ;
+      RECT 4.165000  1.795000 4.425000 2.295000 ;
     LAYER mcon ;
-      RECT 0.150000 1.060000 0.320000 1.230000 ;
-      RECT 3.680000 1.060000 3.850000 1.230000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.150000  1.060000 0.320000 1.230000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.680000  1.060000 3.850000 1.230000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
     LAYER met1 ;
       RECT 0.085000 1.030000 0.380000 1.120000 ;
       RECT 0.085000 1.120000 3.910000 1.260000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
index 24ecb30..8000b87 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_4.magic.lef
@@ -67,26 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.515000  0.085000 0.980000 0.595000 ;
-        RECT 2.495000  0.085000 2.875000 0.485000 ;
-        RECT 3.435000  0.085000 3.815000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -95,55 +75,71 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.515000 1.845000 0.980000 2.635000 ;
-        RECT 2.080000 2.275000 2.460000 2.635000 ;
-        RECT 3.070000 2.275000 3.400000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.280000 0.345000 0.665000 ;
-      RECT 0.085000 0.665000 0.320000 1.765000 ;
-      RECT 0.085000 1.765000 0.345000 2.465000 ;
-      RECT 1.200000 0.255000 1.825000 0.595000 ;
-      RECT 1.200000 1.595000 1.825000 1.765000 ;
-      RECT 1.200000 1.765000 1.455000 2.465000 ;
-      RECT 1.550000 0.595000 1.825000 1.025000 ;
-      RECT 1.550000 1.025000 4.160000 1.275000 ;
-      RECT 1.550000 1.275000 1.825000 1.595000 ;
-      RECT 1.665000 1.935000 6.285000 2.105000 ;
-      RECT 1.665000 2.105000 1.910000 2.465000 ;
-      RECT 1.995000 0.255000 2.325000 0.655000 ;
-      RECT 1.995000 0.655000 4.325000 0.855000 ;
-      RECT 1.995000 1.895000 6.285000 1.935000 ;
-      RECT 2.680000 2.105000 2.850000 2.465000 ;
-      RECT 3.095000 0.275000 3.265000 0.655000 ;
-      RECT 3.620000 2.105000 6.285000 2.465000 ;
-      RECT 4.035000 0.255000 6.285000 0.445000 ;
-      RECT 4.035000 0.445000 4.325000 0.655000 ;
-      RECT 4.330000 1.025000 5.935000 1.275000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.085000  0.280000 0.345000 0.665000 ;
+      RECT 0.085000  0.665000 0.320000 1.765000 ;
+      RECT 0.085000  1.765000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.980000 0.595000 ;
+      RECT 0.515000  1.845000 0.980000 2.635000 ;
+      RECT 1.200000  0.255000 1.825000 0.595000 ;
+      RECT 1.200000  1.595000 1.825000 1.765000 ;
+      RECT 1.200000  1.765000 1.455000 2.465000 ;
+      RECT 1.550000  0.595000 1.825000 1.025000 ;
+      RECT 1.550000  1.025000 4.160000 1.275000 ;
+      RECT 1.550000  1.275000 1.825000 1.595000 ;
+      RECT 1.665000  1.935000 6.285000 2.105000 ;
+      RECT 1.665000  2.105000 1.910000 2.465000 ;
+      RECT 1.995000  0.255000 2.325000 0.655000 ;
+      RECT 1.995000  0.655000 4.325000 0.855000 ;
+      RECT 1.995000  1.895000 6.285000 1.935000 ;
+      RECT 2.080000  2.275000 2.460000 2.635000 ;
+      RECT 2.495000  0.085000 2.875000 0.485000 ;
+      RECT 2.680000  2.105000 2.850000 2.465000 ;
+      RECT 3.070000  2.275000 3.400000 2.635000 ;
+      RECT 3.095000  0.275000 3.265000 0.655000 ;
+      RECT 3.435000  0.085000 3.815000 0.485000 ;
+      RECT 3.620000  2.105000 6.285000 2.465000 ;
+      RECT 4.035000  0.255000 6.285000 0.445000 ;
+      RECT 4.035000  0.445000 4.325000 0.655000 ;
+      RECT 4.330000  1.025000 5.935000 1.275000 ;
     LAYER mcon ;
-      RECT 0.150000 1.105000 0.320000 1.275000 ;
-      RECT 4.710000 1.105000 4.880000 1.275000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.150000  1.105000 0.320000 1.275000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.710000  1.105000 4.880000 1.275000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 0.085000 1.075000 0.380000 1.165000 ;
       RECT 0.085000 1.165000 4.940000 1.305000 ;
diff --git a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
index ff402d2..2180cc7 100644
--- a/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
+++ b/cells/ebufn/sky130_fd_sc_hdll__ebufn_8.magic.lef
@@ -69,39 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 11.040000 0.085000 ;
-        RECT 0.085000  0.085000  0.445000 0.825000 ;
-        RECT 1.020000  0.085000  1.405000 0.445000 ;
-        RECT 2.855000  0.085000  3.285000 0.485000 ;
-        RECT 3.895000  0.085000  4.325000 0.485000 ;
-        RECT 4.935000  0.085000  5.365000 0.485000 ;
-        RECT 5.975000  0.085000  6.405000 0.485000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -110,69 +77,98 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 11.040000 2.805000 ;
-        RECT 0.085000 1.785000  0.445000 2.635000 ;
-        RECT 1.020000 1.865000  1.405000 2.635000 ;
-        RECT 2.565000 2.235000  2.995000 2.635000 ;
-        RECT 3.605000 2.235000  4.035000 2.635000 ;
-        RECT 4.645000 2.235000  5.075000 2.635000 ;
-        RECT 5.685000 2.235000  6.115000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.650000 0.280000  0.850000 1.615000 ;
-      RECT 0.665000 1.615000  0.850000 2.465000 ;
-      RECT 1.575000 0.255000  2.135000 0.825000 ;
-      RECT 1.575000 1.495000  1.975000 2.465000 ;
-      RECT 1.750000 0.825000  2.135000 1.025000 ;
-      RECT 1.750000 1.025000  6.875000 1.275000 ;
-      RECT 1.750000 1.275000  1.975000 1.495000 ;
-      RECT 2.145000 1.895000 10.925000 2.065000 ;
-      RECT 2.145000 2.065000  2.395000 2.465000 ;
-      RECT 2.305000 0.255000  2.685000 0.655000 ;
-      RECT 2.305000 0.655000  7.055000 0.855000 ;
-      RECT 3.215000 2.065000  3.385000 2.465000 ;
-      RECT 3.505000 0.275000  3.725000 0.655000 ;
-      RECT 4.255000 2.065000  4.425000 2.465000 ;
-      RECT 4.545000 0.255000  4.765000 0.655000 ;
-      RECT 5.295000 2.065000  5.465000 2.465000 ;
-      RECT 5.585000 0.275000  5.805000 0.655000 ;
-      RECT 6.335000 2.065000 10.925000 2.465000 ;
-      RECT 6.625000 0.255000 10.925000 0.445000 ;
-      RECT 6.625000 0.445000  7.055000 0.655000 ;
-      RECT 7.125000 1.025000 10.455000 1.275000 ;
+      RECT 0.000000 -0.085000 11.040000 0.085000 ;
+      RECT 0.000000  2.635000 11.040000 2.805000 ;
+      RECT 0.085000  0.085000  0.445000 0.825000 ;
+      RECT 0.085000  1.785000  0.445000 2.635000 ;
+      RECT 0.650000  0.280000  0.850000 1.615000 ;
+      RECT 0.665000  1.615000  0.850000 2.465000 ;
+      RECT 1.020000  0.085000  1.405000 0.445000 ;
+      RECT 1.020000  1.865000  1.405000 2.635000 ;
+      RECT 1.575000  0.255000  2.135000 0.825000 ;
+      RECT 1.575000  1.495000  1.975000 2.465000 ;
+      RECT 1.750000  0.825000  2.135000 1.025000 ;
+      RECT 1.750000  1.025000  6.875000 1.275000 ;
+      RECT 1.750000  1.275000  1.975000 1.495000 ;
+      RECT 2.145000  1.895000 10.925000 2.065000 ;
+      RECT 2.145000  2.065000  2.395000 2.465000 ;
+      RECT 2.305000  0.255000  2.685000 0.655000 ;
+      RECT 2.305000  0.655000  7.055000 0.855000 ;
+      RECT 2.565000  2.235000  2.995000 2.635000 ;
+      RECT 2.855000  0.085000  3.285000 0.485000 ;
+      RECT 3.215000  2.065000  3.385000 2.465000 ;
+      RECT 3.505000  0.275000  3.725000 0.655000 ;
+      RECT 3.605000  2.235000  4.035000 2.635000 ;
+      RECT 3.895000  0.085000  4.325000 0.485000 ;
+      RECT 4.255000  2.065000  4.425000 2.465000 ;
+      RECT 4.545000  0.255000  4.765000 0.655000 ;
+      RECT 4.645000  2.235000  5.075000 2.635000 ;
+      RECT 4.935000  0.085000  5.365000 0.485000 ;
+      RECT 5.295000  2.065000  5.465000 2.465000 ;
+      RECT 5.585000  0.275000  5.805000 0.655000 ;
+      RECT 5.685000  2.235000  6.115000 2.635000 ;
+      RECT 5.975000  0.085000  6.405000 0.485000 ;
+      RECT 6.335000  2.065000 10.925000 2.465000 ;
+      RECT 6.625000  0.255000 10.925000 0.445000 ;
+      RECT 6.625000  0.445000  7.055000 0.655000 ;
+      RECT 7.125000  1.025000 10.455000 1.275000 ;
     LAYER mcon ;
-      RECT 0.655000 1.060000 0.825000 1.230000 ;
-      RECT 7.630000 1.060000 7.800000 1.230000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.655000  1.060000  0.825000 1.230000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.630000  1.060000  7.800000 1.230000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
     LAYER met1 ;
       RECT 0.545000 1.030000 0.885000 1.120000 ;
       RECT 0.545000 1.120000 7.860000 1.260000 ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
index 86abd92..e063f25 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_1.magic.lef
@@ -67,16 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.540000  0.085000 1.590000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -85,30 +75,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.540000 2.235000 0.920000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.370000 0.615000 ;
-      RECT 0.085000 0.615000 1.600000 0.785000 ;
-      RECT 0.085000 1.895000 0.920000 2.065000 ;
-      RECT 0.085000 2.065000 0.370000 2.465000 ;
-      RECT 0.735000 0.785000 1.600000 0.805000 ;
-      RECT 0.735000 1.440000 1.600000 1.615000 ;
-      RECT 0.735000 1.615000 0.920000 1.895000 ;
-      RECT 1.120000 0.805000 1.600000 1.440000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.255000 0.370000 0.615000 ;
+      RECT 0.085000  0.615000 1.600000 0.785000 ;
+      RECT 0.085000  1.895000 0.920000 2.065000 ;
+      RECT 0.085000  2.065000 0.370000 2.465000 ;
+      RECT 0.540000  0.085000 1.590000 0.445000 ;
+      RECT 0.540000  2.235000 0.920000 2.635000 ;
+      RECT 0.735000  0.785000 1.600000 0.805000 ;
+      RECT 0.735000  1.440000 1.600000 1.615000 ;
+      RECT 0.735000  1.615000 0.920000 1.895000 ;
+      RECT 1.120000  0.805000 1.600000 1.440000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
index d16a1d6..c635949 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_2.magic.lef
@@ -67,19 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.485000 ;
-        RECT 1.600000  0.085000 1.930000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -88,41 +75,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.515000 1.895000 0.945000 2.635000 ;
-        RECT 1.510000 2.255000 2.475000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 0.890000 0.825000 ;
-      RECT 0.085000 1.555000 0.945000 1.725000 ;
-      RECT 0.085000 1.725000 0.345000 2.465000 ;
-      RECT 0.495000 0.825000 0.890000 0.995000 ;
-      RECT 0.495000 0.995000 2.180000 1.275000 ;
-      RECT 0.495000 1.275000 0.945000 1.555000 ;
-      RECT 1.065000 0.255000 1.380000 0.655000 ;
-      RECT 1.065000 0.655000 2.270000 0.825000 ;
-      RECT 1.170000 1.445000 1.925000 1.865000 ;
-      RECT 1.170000 1.865000 2.865000 2.085000 ;
-      RECT 1.170000 2.085000 1.340000 2.465000 ;
-      RECT 2.100000 0.255000 3.435000 0.425000 ;
-      RECT 2.100000 0.425000 2.270000 0.655000 ;
-      RECT 2.695000 2.085000 2.865000 2.465000 ;
-      RECT 3.165000 0.425000 3.435000 0.775000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.655000 ;
+      RECT 0.085000  0.655000 0.890000 0.825000 ;
+      RECT 0.085000  1.555000 0.945000 1.725000 ;
+      RECT 0.085000  1.725000 0.345000 2.465000 ;
+      RECT 0.495000  0.825000 0.890000 0.995000 ;
+      RECT 0.495000  0.995000 2.180000 1.275000 ;
+      RECT 0.495000  1.275000 0.945000 1.555000 ;
+      RECT 0.515000  0.085000 0.895000 0.485000 ;
+      RECT 0.515000  1.895000 0.945000 2.635000 ;
+      RECT 1.065000  0.255000 1.380000 0.655000 ;
+      RECT 1.065000  0.655000 2.270000 0.825000 ;
+      RECT 1.170000  1.445000 1.925000 1.865000 ;
+      RECT 1.170000  1.865000 2.865000 2.085000 ;
+      RECT 1.170000  2.085000 1.340000 2.465000 ;
+      RECT 1.510000  2.255000 2.475000 2.635000 ;
+      RECT 1.600000  0.085000 1.930000 0.485000 ;
+      RECT 2.100000  0.255000 3.435000 0.425000 ;
+      RECT 2.100000  0.425000 2.270000 0.655000 ;
+      RECT 2.695000  2.085000 2.865000 2.465000 ;
+      RECT 3.165000  0.425000 3.435000 0.775000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
index 2dca144..1bbe5ac 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_4.magic.lef
@@ -67,24 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.485000 ;
-        RECT 1.605000  0.085000 1.935000 0.485000 ;
-        RECT 2.545000  0.085000 2.875000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -93,49 +75,64 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.515000 1.835000 0.895000 2.635000 ;
-        RECT 1.510000 1.835000 1.890000 2.635000 ;
-        RECT 2.450000 1.835000 2.890000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 0.895000 0.825000 ;
-      RECT 0.085000 1.495000 0.895000 1.665000 ;
-      RECT 0.085000 1.665000 0.345000 2.465000 ;
-      RECT 0.515000 0.825000 0.895000 0.995000 ;
-      RECT 0.515000 0.995000 3.320000 1.325000 ;
-      RECT 0.515000 1.325000 0.895000 1.495000 ;
-      RECT 1.065000 0.255000 1.385000 0.655000 ;
-      RECT 1.065000 0.655000 3.295000 0.825000 ;
-      RECT 1.065000 1.495000 3.320000 1.665000 ;
-      RECT 1.065000 1.665000 1.340000 2.465000 ;
-      RECT 2.110000 1.665000 2.280000 2.465000 ;
-      RECT 2.155000 0.255000 2.325000 0.655000 ;
-      RECT 3.110000 1.665000 3.320000 2.295000 ;
-      RECT 3.110000 2.295000 5.200000 2.465000 ;
-      RECT 3.125000 0.255000 5.435000 0.450000 ;
-      RECT 3.125000 0.450000 3.295000 0.655000 ;
-      RECT 4.090000 1.650000 4.260000 2.295000 ;
-      RECT 5.030000 1.650000 5.200000 2.295000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.655000 ;
+      RECT 0.085000  0.655000 0.895000 0.825000 ;
+      RECT 0.085000  1.495000 0.895000 1.665000 ;
+      RECT 0.085000  1.665000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.895000 0.485000 ;
+      RECT 0.515000  0.825000 0.895000 0.995000 ;
+      RECT 0.515000  0.995000 3.320000 1.325000 ;
+      RECT 0.515000  1.325000 0.895000 1.495000 ;
+      RECT 0.515000  1.835000 0.895000 2.635000 ;
+      RECT 1.065000  0.255000 1.385000 0.655000 ;
+      RECT 1.065000  0.655000 3.295000 0.825000 ;
+      RECT 1.065000  1.495000 3.320000 1.665000 ;
+      RECT 1.065000  1.665000 1.340000 2.465000 ;
+      RECT 1.510000  1.835000 1.890000 2.635000 ;
+      RECT 1.605000  0.085000 1.935000 0.485000 ;
+      RECT 2.110000  1.665000 2.280000 2.465000 ;
+      RECT 2.155000  0.255000 2.325000 0.655000 ;
+      RECT 2.450000  1.835000 2.890000 2.635000 ;
+      RECT 2.545000  0.085000 2.875000 0.485000 ;
+      RECT 3.110000  1.665000 3.320000 2.295000 ;
+      RECT 3.110000  2.295000 5.200000 2.465000 ;
+      RECT 3.125000  0.255000 5.435000 0.450000 ;
+      RECT 3.125000  0.450000 3.295000 0.655000 ;
+      RECT 4.090000  1.650000 4.260000 2.295000 ;
+      RECT 5.030000  1.650000 5.200000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
index f69fe03..26f36de 100644
--- a/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
+++ b/cells/einvn/sky130_fd_sc_hdll__einvn_8.magic.lef
@@ -71,34 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.485000 ;
-        RECT 1.605000  0.085000 1.935000 0.485000 ;
-        RECT 2.545000  0.085000 2.875000 0.485000 ;
-        RECT 3.485000  0.085000 3.815000 0.485000 ;
-        RECT 4.425000  0.085000 4.765000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -107,65 +79,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.515000 1.835000 0.895000 2.635000 ;
-        RECT 1.510000 1.835000 1.890000 2.635000 ;
-        RECT 2.450000 1.835000 2.830000 2.635000 ;
-        RECT 3.390000 1.835000 3.770000 2.635000 ;
-        RECT 4.330000 1.835000 4.730000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.345000 0.655000 ;
-      RECT 0.090000 0.655000 0.895000 0.825000 ;
-      RECT 0.090000 1.495000 0.895000 1.665000 ;
-      RECT 0.090000 1.665000 0.345000 2.465000 ;
-      RECT 0.515000 0.825000 0.895000 0.995000 ;
-      RECT 0.515000 0.995000 4.975000 1.325000 ;
-      RECT 0.515000 1.325000 0.895000 1.495000 ;
-      RECT 1.065000 0.255000 1.385000 0.655000 ;
-      RECT 1.065000 0.655000 5.200000 0.825000 ;
-      RECT 1.065000 1.495000 5.200000 1.665000 ;
-      RECT 1.065000 1.665000 1.340000 2.465000 ;
-      RECT 2.110000 1.665000 2.280000 2.465000 ;
-      RECT 2.155000 0.255000 2.325000 0.655000 ;
-      RECT 3.050000 1.665000 3.220000 2.465000 ;
-      RECT 3.095000 0.255000 3.265000 0.655000 ;
-      RECT 3.990000 1.665000 4.160000 2.465000 ;
-      RECT 4.035000 0.255000 4.205000 0.655000 ;
-      RECT 4.950000 1.665000 5.200000 2.295000 ;
-      RECT 4.950000 2.295000 9.095000 2.465000 ;
-      RECT 4.985000 0.255000 9.095000 0.450000 ;
-      RECT 4.985000 0.450000 5.200000 0.655000 ;
-      RECT 5.970000 1.795000 6.140000 2.295000 ;
-      RECT 6.910000 1.795000 7.080000 2.295000 ;
-      RECT 7.850000 1.795000 8.020000 2.295000 ;
-      RECT 8.790000 1.795000 9.095000 2.295000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.090000  0.255000 0.345000 0.655000 ;
+      RECT 0.090000  0.655000 0.895000 0.825000 ;
+      RECT 0.090000  1.495000 0.895000 1.665000 ;
+      RECT 0.090000  1.665000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.895000 0.485000 ;
+      RECT 0.515000  0.825000 0.895000 0.995000 ;
+      RECT 0.515000  0.995000 4.975000 1.325000 ;
+      RECT 0.515000  1.325000 0.895000 1.495000 ;
+      RECT 0.515000  1.835000 0.895000 2.635000 ;
+      RECT 1.065000  0.255000 1.385000 0.655000 ;
+      RECT 1.065000  0.655000 5.200000 0.825000 ;
+      RECT 1.065000  1.495000 5.200000 1.665000 ;
+      RECT 1.065000  1.665000 1.340000 2.465000 ;
+      RECT 1.510000  1.835000 1.890000 2.635000 ;
+      RECT 1.605000  0.085000 1.935000 0.485000 ;
+      RECT 2.110000  1.665000 2.280000 2.465000 ;
+      RECT 2.155000  0.255000 2.325000 0.655000 ;
+      RECT 2.450000  1.835000 2.830000 2.635000 ;
+      RECT 2.545000  0.085000 2.875000 0.485000 ;
+      RECT 3.050000  1.665000 3.220000 2.465000 ;
+      RECT 3.095000  0.255000 3.265000 0.655000 ;
+      RECT 3.390000  1.835000 3.770000 2.635000 ;
+      RECT 3.485000  0.085000 3.815000 0.485000 ;
+      RECT 3.990000  1.665000 4.160000 2.465000 ;
+      RECT 4.035000  0.255000 4.205000 0.655000 ;
+      RECT 4.330000  1.835000 4.730000 2.635000 ;
+      RECT 4.425000  0.085000 4.765000 0.485000 ;
+      RECT 4.950000  1.665000 5.200000 2.295000 ;
+      RECT 4.950000  2.295000 9.095000 2.465000 ;
+      RECT 4.985000  0.255000 9.095000 0.450000 ;
+      RECT 4.985000  0.450000 5.200000 0.655000 ;
+      RECT 5.970000  1.795000 6.140000 2.295000 ;
+      RECT 6.910000  1.795000 7.080000 2.295000 ;
+      RECT 7.850000  1.795000 8.020000 2.295000 ;
+      RECT 8.790000  1.795000 9.095000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
index 9743988..190cffd 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_1.magic.lef
@@ -67,16 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.515000  0.085000 1.500000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -85,27 +75,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.515000 2.235000 1.740000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 1.690000 0.825000 ;
-      RECT 0.085000 1.895000 1.690000 2.065000 ;
-      RECT 0.085000 2.065000 0.345000 2.465000 ;
-      RECT 0.765000 0.825000 1.690000 1.895000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.655000 ;
+      RECT 0.085000  0.655000 1.690000 0.825000 ;
+      RECT 0.085000  1.895000 1.690000 2.065000 ;
+      RECT 0.085000  2.065000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 1.500000 0.485000 ;
+      RECT 0.515000  2.235000 1.740000 2.635000 ;
+      RECT 0.765000  0.825000 1.690000 1.895000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
index f7aabcf..9218a51 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_2.magic.lef
@@ -65,19 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.515000  0.085000 0.925000 0.485000 ;
-        RECT 1.510000  0.085000 1.880000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -86,42 +73,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.515000 2.125000 0.925000 2.635000 ;
-        RECT 1.605000 1.895000 1.935000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 0.925000 0.825000 ;
-      RECT 0.085000 1.785000 0.925000 1.955000 ;
-      RECT 0.085000 1.955000 0.345000 2.465000 ;
-      RECT 0.500000 0.825000 0.925000 0.995000 ;
-      RECT 0.500000 0.995000 2.105000 1.325000 ;
-      RECT 0.500000 1.325000 0.925000 1.785000 ;
-      RECT 1.145000 0.255000 1.340000 0.655000 ;
-      RECT 1.145000 0.655000 2.475000 0.825000 ;
-      RECT 1.145000 1.555000 2.355000 1.725000 ;
-      RECT 1.145000 1.725000 1.385000 2.465000 ;
-      RECT 2.140000 0.255000 3.530000 0.425000 ;
-      RECT 2.140000 0.425000 2.475000 0.655000 ;
-      RECT 2.185000 1.725000 2.355000 2.295000 ;
-      RECT 2.185000 2.295000 3.530000 2.465000 ;
-      RECT 3.245000 0.425000 3.530000 0.595000 ;
-      RECT 3.245000 1.785000 3.530000 2.295000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.655000 ;
+      RECT 0.085000  0.655000 0.925000 0.825000 ;
+      RECT 0.085000  1.785000 0.925000 1.955000 ;
+      RECT 0.085000  1.955000 0.345000 2.465000 ;
+      RECT 0.500000  0.825000 0.925000 0.995000 ;
+      RECT 0.500000  0.995000 2.105000 1.325000 ;
+      RECT 0.500000  1.325000 0.925000 1.785000 ;
+      RECT 0.515000  0.085000 0.925000 0.485000 ;
+      RECT 0.515000  2.125000 0.925000 2.635000 ;
+      RECT 1.145000  0.255000 1.340000 0.655000 ;
+      RECT 1.145000  0.655000 2.475000 0.825000 ;
+      RECT 1.145000  1.555000 2.355000 1.725000 ;
+      RECT 1.145000  1.725000 1.385000 2.465000 ;
+      RECT 1.510000  0.085000 1.880000 0.485000 ;
+      RECT 1.605000  1.895000 1.935000 2.635000 ;
+      RECT 2.140000  0.255000 3.530000 0.425000 ;
+      RECT 2.140000  0.425000 2.475000 0.655000 ;
+      RECT 2.185000  1.725000 2.355000 2.295000 ;
+      RECT 2.185000  2.295000 3.530000 2.465000 ;
+      RECT 3.245000  0.425000 3.530000 0.595000 ;
+      RECT 3.245000  1.785000 3.530000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
index 2916f40..cb5dd5a 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_4.magic.lef
@@ -69,24 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.485000 ;
-        RECT 1.475000  0.085000 1.855000 0.485000 ;
-        RECT 2.415000  0.085000 2.805000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -95,49 +77,64 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.515000 2.125000 0.925000 2.635000 ;
-        RECT 1.605000 1.895000 1.935000 2.635000 ;
-        RECT 2.545000 1.895000 2.905000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 0.745000 0.825000 ;
-      RECT 0.085000 1.785000 0.925000 1.955000 ;
-      RECT 0.085000 1.955000 0.345000 2.465000 ;
-      RECT 0.500000 0.825000 0.745000 0.995000 ;
-      RECT 0.500000 0.995000 3.320000 1.325000 ;
-      RECT 0.500000 1.325000 0.925000 1.785000 ;
-      RECT 1.135000 0.255000 1.305000 0.655000 ;
-      RECT 1.135000 0.655000 3.320000 0.825000 ;
-      RECT 1.175000 1.555000 3.295000 1.725000 ;
-      RECT 1.175000 1.725000 1.385000 2.465000 ;
-      RECT 2.075000 0.255000 2.245000 0.655000 ;
-      RECT 2.155000 1.725000 2.325000 2.465000 ;
-      RECT 2.985000 0.255000 5.410000 0.465000 ;
-      RECT 2.985000 0.465000 3.320000 0.655000 ;
-      RECT 3.125000 1.725000 3.295000 2.295000 ;
-      RECT 3.125000 2.295000 5.410000 2.465000 ;
-      RECT 4.090000 1.785000 4.260000 2.295000 ;
-      RECT 5.030000 1.445000 5.410000 2.295000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.655000 ;
+      RECT 0.085000  0.655000 0.745000 0.825000 ;
+      RECT 0.085000  1.785000 0.925000 1.955000 ;
+      RECT 0.085000  1.955000 0.345000 2.465000 ;
+      RECT 0.500000  0.825000 0.745000 0.995000 ;
+      RECT 0.500000  0.995000 3.320000 1.325000 ;
+      RECT 0.500000  1.325000 0.925000 1.785000 ;
+      RECT 0.515000  0.085000 0.895000 0.485000 ;
+      RECT 0.515000  2.125000 0.925000 2.635000 ;
+      RECT 1.135000  0.255000 1.305000 0.655000 ;
+      RECT 1.135000  0.655000 3.320000 0.825000 ;
+      RECT 1.175000  1.555000 3.295000 1.725000 ;
+      RECT 1.175000  1.725000 1.385000 2.465000 ;
+      RECT 1.475000  0.085000 1.855000 0.485000 ;
+      RECT 1.605000  1.895000 1.935000 2.635000 ;
+      RECT 2.075000  0.255000 2.245000 0.655000 ;
+      RECT 2.155000  1.725000 2.325000 2.465000 ;
+      RECT 2.415000  0.085000 2.805000 0.485000 ;
+      RECT 2.545000  1.895000 2.905000 2.635000 ;
+      RECT 2.985000  0.255000 5.410000 0.465000 ;
+      RECT 2.985000  0.465000 3.320000 0.655000 ;
+      RECT 3.125000  1.725000 3.295000 2.295000 ;
+      RECT 3.125000  2.295000 5.410000 2.465000 ;
+      RECT 4.090000  1.785000 4.260000 2.295000 ;
+      RECT 5.030000  1.445000 5.410000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
index a1ec39b..9cfb058 100644
--- a/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
+++ b/cells/einvp/sky130_fd_sc_hdll__einvp_8.magic.lef
@@ -71,34 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.485000 ;
-        RECT 1.475000  0.085000 1.855000 0.485000 ;
-        RECT 2.415000  0.085000 2.795000 0.485000 ;
-        RECT 3.355000  0.085000 3.735000 0.485000 ;
-        RECT 4.295000  0.085000 4.685000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -107,65 +79,90 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.515000 2.125000 0.925000 2.635000 ;
-        RECT 1.605000 1.895000 1.935000 2.635000 ;
-        RECT 2.545000 1.895000 2.875000 2.635000 ;
-        RECT 3.485000 1.895000 3.815000 2.635000 ;
-        RECT 4.425000 1.895000 4.755000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.655000 ;
-      RECT 0.085000 0.655000 0.745000 0.825000 ;
-      RECT 0.085000 1.785000 0.925000 1.955000 ;
-      RECT 0.085000 1.955000 0.345000 2.465000 ;
-      RECT 0.500000 0.825000 0.745000 0.995000 ;
-      RECT 0.500000 0.995000 5.200000 1.325000 ;
-      RECT 0.500000 1.325000 0.925000 1.785000 ;
-      RECT 1.135000 0.255000 1.305000 0.655000 ;
-      RECT 1.135000 0.655000 5.200000 0.825000 ;
-      RECT 1.175000 1.555000 5.200000 1.725000 ;
-      RECT 1.175000 1.725000 1.385000 2.465000 ;
-      RECT 2.075000 0.255000 2.245000 0.655000 ;
-      RECT 2.155000 1.725000 2.325000 2.465000 ;
-      RECT 3.015000 0.255000 3.185000 0.655000 ;
-      RECT 3.095000 1.725000 3.265000 2.465000 ;
-      RECT 3.955000 0.255000 4.125000 0.655000 ;
-      RECT 4.035000 1.725000 4.205000 2.465000 ;
-      RECT 4.855000 0.255000 9.095000 0.465000 ;
-      RECT 4.855000 0.465000 5.200000 0.655000 ;
-      RECT 4.975000 1.725000 5.200000 2.295000 ;
-      RECT 4.975000 2.295000 9.095000 2.465000 ;
-      RECT 5.970000 1.785000 6.140000 2.295000 ;
-      RECT 6.910000 1.785000 7.080000 2.295000 ;
-      RECT 7.850000 1.785000 8.020000 2.295000 ;
-      RECT 8.790000 1.445000 9.095000 2.295000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.655000 ;
+      RECT 0.085000  0.655000 0.745000 0.825000 ;
+      RECT 0.085000  1.785000 0.925000 1.955000 ;
+      RECT 0.085000  1.955000 0.345000 2.465000 ;
+      RECT 0.500000  0.825000 0.745000 0.995000 ;
+      RECT 0.500000  0.995000 5.200000 1.325000 ;
+      RECT 0.500000  1.325000 0.925000 1.785000 ;
+      RECT 0.515000  0.085000 0.895000 0.485000 ;
+      RECT 0.515000  2.125000 0.925000 2.635000 ;
+      RECT 1.135000  0.255000 1.305000 0.655000 ;
+      RECT 1.135000  0.655000 5.200000 0.825000 ;
+      RECT 1.175000  1.555000 5.200000 1.725000 ;
+      RECT 1.175000  1.725000 1.385000 2.465000 ;
+      RECT 1.475000  0.085000 1.855000 0.485000 ;
+      RECT 1.605000  1.895000 1.935000 2.635000 ;
+      RECT 2.075000  0.255000 2.245000 0.655000 ;
+      RECT 2.155000  1.725000 2.325000 2.465000 ;
+      RECT 2.415000  0.085000 2.795000 0.485000 ;
+      RECT 2.545000  1.895000 2.875000 2.635000 ;
+      RECT 3.015000  0.255000 3.185000 0.655000 ;
+      RECT 3.095000  1.725000 3.265000 2.465000 ;
+      RECT 3.355000  0.085000 3.735000 0.485000 ;
+      RECT 3.485000  1.895000 3.815000 2.635000 ;
+      RECT 3.955000  0.255000 4.125000 0.655000 ;
+      RECT 4.035000  1.725000 4.205000 2.465000 ;
+      RECT 4.295000  0.085000 4.685000 0.485000 ;
+      RECT 4.425000  1.895000 4.755000 2.635000 ;
+      RECT 4.855000  0.255000 9.095000 0.465000 ;
+      RECT 4.855000  0.465000 5.200000 0.655000 ;
+      RECT 4.975000  1.725000 5.200000 2.295000 ;
+      RECT 4.975000  2.295000 9.095000 2.465000 ;
+      RECT 5.970000  1.785000 6.140000 2.295000 ;
+      RECT 6.910000  1.785000 7.080000 2.295000 ;
+      RECT 7.850000  1.785000 8.020000 2.295000 ;
+      RECT 8.790000  1.445000 9.095000 2.295000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
index 239ddf6..6e9c5dc 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_1.magic.lef
@@ -38,10 +38,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.460000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
@@ -50,14 +46,18 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.460000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      RECT 0.000000  2.635000 0.460000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
index 0f9fc55..ac22697 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_2.magic.lef
@@ -38,11 +38,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.920000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.920000 0.240000 ;
     END
@@ -51,15 +46,20 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.920000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.920000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.920000 0.085000 ;
+      RECT 0.000000  2.635000 0.920000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
index 73a6408..600b1d0 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_4.magic.lef
@@ -38,13 +38,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -53,17 +46,24 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
index 0ee7cba..2b7ead9 100644
--- a/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
+++ b/cells/fill/sky130_fd_sc_hdll__fill_8.magic.lef
@@ -38,17 +38,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -57,21 +46,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
index b7e3feb..9492577 100644
--- a/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
+++ b/cells/inputiso0n/sky130_fd_sc_hdll__inputiso0n_1.magic.lef
@@ -68,15 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 1.175000  0.085000 1.425000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -85,27 +76,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.125000 1.965000 0.405000 2.635000 ;
-        RECT 1.175000 1.915000 1.505000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.125000 0.355000 0.455000 0.715000 ;
-      RECT 0.125000 0.715000 1.695000 0.905000 ;
-      RECT 0.625000 1.575000 1.695000 1.745000 ;
-      RECT 0.625000 1.745000 0.925000 2.295000 ;
-      RECT 1.525000 0.905000 1.695000 1.575000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.125000  0.355000 0.455000 0.715000 ;
+      RECT 0.125000  0.715000 1.695000 0.905000 ;
+      RECT 0.125000  1.965000 0.405000 2.635000 ;
+      RECT 0.625000  1.575000 1.695000 1.745000 ;
+      RECT 0.625000  1.745000 0.925000 2.295000 ;
+      RECT 1.175000  0.085000 1.425000 0.545000 ;
+      RECT 1.175000  1.915000 1.505000 2.635000 ;
+      RECT 1.525000  0.905000 1.695000 1.575000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
index 24b46e3..9742dc0 100644
--- a/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
+++ b/cells/inputiso0p/sky130_fd_sc_hdll__inputiso0p_1.magic.lef
@@ -67,18 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.590000 ;
-        RECT 2.070000  0.085000 2.400000 0.580000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -87,36 +75,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.515000 2.185000 0.895000 2.635000 ;
-        RECT 1.565000 2.165000 2.325000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 1.785000 0.895000 2.015000 ;
-      RECT 0.175000 2.015000 0.345000 2.445000 ;
-      RECT 0.645000 0.280000 0.885000 0.805000 ;
-      RECT 0.645000 0.805000 1.180000 1.135000 ;
-      RECT 0.645000 1.135000 0.895000 1.785000 ;
-      RECT 1.065000 1.305000 2.475000 1.325000 ;
-      RECT 1.065000 1.325000 1.885000 1.475000 ;
-      RECT 1.065000 1.475000 1.335000 2.420000 ;
-      RECT 1.165000 0.270000 1.335000 0.415000 ;
-      RECT 1.165000 0.415000 1.590000 0.610000 ;
-      RECT 1.350000 0.610000 1.590000 0.945000 ;
-      RECT 1.350000 0.945000 2.475000 1.305000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.090000  0.085000 0.425000 0.590000 ;
+      RECT 0.175000  1.785000 0.895000 2.015000 ;
+      RECT 0.175000  2.015000 0.345000 2.445000 ;
+      RECT 0.515000  2.185000 0.895000 2.635000 ;
+      RECT 0.645000  0.280000 0.885000 0.805000 ;
+      RECT 0.645000  0.805000 1.180000 1.135000 ;
+      RECT 0.645000  1.135000 0.895000 1.785000 ;
+      RECT 1.065000  1.305000 2.475000 1.325000 ;
+      RECT 1.065000  1.325000 1.885000 1.475000 ;
+      RECT 1.065000  1.475000 1.335000 2.420000 ;
+      RECT 1.165000  0.270000 1.335000 0.415000 ;
+      RECT 1.165000  0.415000 1.590000 0.610000 ;
+      RECT 1.350000  0.610000 1.590000 0.945000 ;
+      RECT 1.350000  0.945000 2.475000 1.305000 ;
+      RECT 1.565000  2.165000 2.325000 2.635000 ;
+      RECT 2.070000  0.085000 2.400000 0.580000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
index f55958e..82ad41c 100644
--- a/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
+++ b/cells/inputiso1n/sky130_fd_sc_hdll__inputiso1n_1.magic.lef
@@ -67,18 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.640000  0.085000 1.375000 0.565000 ;
-        RECT 1.995000  0.085000 2.425000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -87,34 +75,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 2.125000 1.835000 2.405000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.265000 0.420000 0.735000 ;
-      RECT 0.110000 0.735000 0.895000 0.905000 ;
-      RECT 0.645000 0.905000 0.895000 0.995000 ;
-      RECT 0.645000 0.995000 1.385000 1.325000 ;
-      RECT 0.645000 1.325000 0.815000 1.885000 ;
-      RECT 1.040000 1.495000 2.505000 1.665000 ;
-      RECT 1.040000 1.665000 1.460000 1.915000 ;
-      RECT 1.655000 0.305000 1.825000 0.655000 ;
-      RECT 1.655000 0.655000 2.505000 0.825000 ;
-      RECT 2.335000 0.825000 2.505000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.110000  0.265000 0.420000 0.735000 ;
+      RECT 0.110000  0.735000 0.895000 0.905000 ;
+      RECT 0.640000  0.085000 1.375000 0.565000 ;
+      RECT 0.645000  0.905000 0.895000 0.995000 ;
+      RECT 0.645000  0.995000 1.385000 1.325000 ;
+      RECT 0.645000  1.325000 0.815000 1.885000 ;
+      RECT 1.040000  1.495000 2.505000 1.665000 ;
+      RECT 1.040000  1.665000 1.460000 1.915000 ;
+      RECT 1.655000  0.305000 1.825000 0.655000 ;
+      RECT 1.655000  0.655000 2.505000 0.825000 ;
+      RECT 1.995000  0.085000 2.425000 0.485000 ;
+      RECT 2.125000  1.835000 2.405000 2.635000 ;
+      RECT 2.335000  0.825000 2.505000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
index c8da7ce..0eddae4 100644
--- a/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
+++ b/cells/inputiso1p/sky130_fd_sc_hdll__inputiso1p_1.magic.lef
@@ -67,16 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.190000  0.085000 0.430000 0.595000 ;
-        RECT 1.220000  0.085000 1.435000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -85,26 +75,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 1.185000 1.835000 1.515000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 1.495000 1.705000 1.665000 ;
-      RECT 0.150000 1.665000 0.540000 1.840000 ;
-      RECT 0.610000 0.265000 0.940000 0.595000 ;
-      RECT 0.610000 0.595000 0.830000 1.495000 ;
-      RECT 1.535000 0.995000 1.705000 1.495000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.150000  1.495000 1.705000 1.665000 ;
+      RECT 0.150000  1.665000 0.540000 1.840000 ;
+      RECT 0.190000  0.085000 0.430000 0.595000 ;
+      RECT 0.610000  0.265000 0.940000 0.595000 ;
+      RECT 0.610000  0.595000 0.830000 1.495000 ;
+      RECT 1.185000  1.835000 1.515000 2.635000 ;
+      RECT 1.220000  0.085000 1.435000 0.595000 ;
+      RECT 1.535000  0.995000 1.705000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
index fbf6de0..5a803d5 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_1.magic.lef
@@ -58,13 +58,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.380000 0.085000 ;
-        RECT 0.320000  0.085000 0.550000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.380000 0.240000 ;
     END
@@ -73,17 +66,24 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.380000 2.805000 ;
-        RECT 0.340000 1.495000 0.550000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.380000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.380000 0.085000 ;
+      RECT 0.000000  2.635000 1.380000 2.805000 ;
+      RECT 0.320000  0.085000 0.550000 0.905000 ;
+      RECT 0.340000  1.495000 0.550000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
index 2164fe1..d5cb0cb 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_12.magic.lef
@@ -71,30 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.255000  0.085000 0.510000 0.545000 ;
-        RECT 1.280000  0.085000 1.450000 0.545000 ;
-        RECT 2.220000  0.085000 2.390000 0.545000 ;
-        RECT 3.160000  0.085000 3.330000 0.545000 ;
-        RECT 4.100000  0.085000 4.270000 0.545000 ;
-        RECT 5.040000  0.085000 5.210000 0.545000 ;
-        RECT 5.960000  0.085000 6.230000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -103,34 +79,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.255000 1.835000 0.510000 2.635000 ;
-        RECT 1.280000 1.835000 1.450000 2.635000 ;
-        RECT 2.220000 1.835000 2.390000 2.635000 ;
-        RECT 3.160000 1.835000 3.330000 2.635000 ;
-        RECT 4.100000 1.835000 4.270000 2.635000 ;
-        RECT 5.040000 1.835000 5.210000 2.635000 ;
-        RECT 5.975000 1.835000 6.230000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.255000  0.085000 0.510000 0.545000 ;
+      RECT 0.255000  1.835000 0.510000 2.635000 ;
+      RECT 1.280000  0.085000 1.450000 0.545000 ;
+      RECT 1.280000  1.835000 1.450000 2.635000 ;
+      RECT 2.220000  0.085000 2.390000 0.545000 ;
+      RECT 2.220000  1.835000 2.390000 2.635000 ;
+      RECT 3.160000  0.085000 3.330000 0.545000 ;
+      RECT 3.160000  1.835000 3.330000 2.635000 ;
+      RECT 4.100000  0.085000 4.270000 0.545000 ;
+      RECT 4.100000  1.835000 4.270000 2.635000 ;
+      RECT 5.040000  0.085000 5.210000 0.545000 ;
+      RECT 5.040000  1.835000 5.210000 2.635000 ;
+      RECT 5.960000  0.085000 6.230000 0.545000 ;
+      RECT 5.975000  1.835000 6.230000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
index f770078..94def85 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_16.magic.lef
@@ -74,36 +74,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.180000  0.085000 0.410000 0.885000 ;
-        RECT 1.180000  0.085000 1.350000 0.545000 ;
-        RECT 2.120000  0.085000 2.290000 0.545000 ;
-        RECT 3.060000  0.085000 3.230000 0.545000 ;
-        RECT 4.000000  0.085000 4.170000 0.545000 ;
-        RECT 4.940000  0.085000 5.110000 0.545000 ;
-        RECT 5.880000  0.085000 6.050000 0.545000 ;
-        RECT 6.820000  0.085000 6.990000 0.545000 ;
-        RECT 7.760000  0.085000 7.970000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -112,40 +82,70 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.200000 1.485000 0.410000 2.635000 ;
-        RECT 1.180000 1.835000 1.350000 2.635000 ;
-        RECT 2.120000 1.835000 2.290000 2.635000 ;
-        RECT 3.060000 1.835000 3.230000 2.635000 ;
-        RECT 4.000000 1.835000 4.170000 2.635000 ;
-        RECT 4.940000 1.835000 5.110000 2.635000 ;
-        RECT 5.880000 1.835000 6.050000 2.635000 ;
-        RECT 6.820000 1.835000 6.990000 2.635000 ;
-        RECT 7.760000 1.835000 7.970000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.180000  0.085000 0.410000 0.885000 ;
+      RECT 0.200000  1.485000 0.410000 2.635000 ;
+      RECT 1.180000  0.085000 1.350000 0.545000 ;
+      RECT 1.180000  1.835000 1.350000 2.635000 ;
+      RECT 2.120000  0.085000 2.290000 0.545000 ;
+      RECT 2.120000  1.835000 2.290000 2.635000 ;
+      RECT 3.060000  0.085000 3.230000 0.545000 ;
+      RECT 3.060000  1.835000 3.230000 2.635000 ;
+      RECT 4.000000  0.085000 4.170000 0.545000 ;
+      RECT 4.000000  1.835000 4.170000 2.635000 ;
+      RECT 4.940000  0.085000 5.110000 0.545000 ;
+      RECT 4.940000  1.835000 5.110000 2.635000 ;
+      RECT 5.880000  0.085000 6.050000 0.545000 ;
+      RECT 5.880000  1.835000 6.050000 2.635000 ;
+      RECT 6.820000  0.085000 6.990000 0.545000 ;
+      RECT 6.820000  1.835000 6.990000 2.635000 ;
+      RECT 7.760000  0.085000 7.970000 0.885000 ;
+      RECT 7.760000  1.835000 7.970000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
index b5960a8..db06123 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_2.magic.lef
@@ -58,15 +58,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.125000  0.085000 0.355000 0.905000 ;
-        RECT 1.125000  0.085000 1.335000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -75,19 +66,28 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.125000 1.495000 0.355000 2.635000 ;
-        RECT 1.125000 1.495000 1.335000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.125000  0.085000 0.355000 0.905000 ;
+      RECT 0.125000  1.495000 0.355000 2.635000 ;
+      RECT 1.125000  0.085000 1.335000 0.905000 ;
+      RECT 1.125000  1.495000 1.335000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
index bb48646..3ea6f3c 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_4.magic.lef
@@ -63,18 +63,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.130000  0.085000 0.395000 0.545000 ;
-        RECT 1.165000  0.085000 1.335000 0.545000 ;
-        RECT 2.105000  0.085000 2.355000 0.550000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -83,22 +71,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.130000 1.495000 0.395000 2.635000 ;
-        RECT 1.165000 1.835000 1.335000 2.635000 ;
-        RECT 2.105000 2.175000 2.315000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.130000  0.085000 0.395000 0.545000 ;
+      RECT 0.130000  1.495000 0.395000 2.635000 ;
+      RECT 1.165000  0.085000 1.335000 0.545000 ;
+      RECT 1.165000  1.835000 1.335000 2.635000 ;
+      RECT 2.105000  0.085000 2.355000 0.550000 ;
+      RECT 2.105000  2.175000 2.315000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
index c342df9..0214ac9 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_6.magic.lef
@@ -65,21 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.130000  0.085000 0.395000 0.545000 ;
-        RECT 1.115000  0.085000 1.285000 0.545000 ;
-        RECT 2.055000  0.085000 2.225000 0.545000 ;
-        RECT 2.865000  0.085000 3.165000 0.550000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -88,25 +73,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.175000 1.495000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.285000 2.635000 ;
-        RECT 2.055000 1.835000 2.225000 2.635000 ;
-        RECT 2.995000 2.175000 3.165000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.130000  0.085000 0.395000 0.545000 ;
+      RECT 0.175000  1.495000 0.345000 2.635000 ;
+      RECT 1.115000  0.085000 1.285000 0.545000 ;
+      RECT 1.115000  1.835000 1.285000 2.635000 ;
+      RECT 2.055000  0.085000 2.225000 0.545000 ;
+      RECT 2.055000  1.835000 2.225000 2.635000 ;
+      RECT 2.865000  0.085000 3.165000 0.550000 ;
+      RECT 2.995000  2.175000 3.165000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
index 4946adf..dcc8551 100644
--- a/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
+++ b/cells/inv/sky130_fd_sc_hdll__inv_8.magic.lef
@@ -67,24 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.255000  0.085000 0.510000 0.545000 ;
-        RECT 1.280000  0.085000 1.450000 0.545000 ;
-        RECT 2.220000  0.085000 2.390000 0.545000 ;
-        RECT 3.160000  0.085000 3.330000 0.545000 ;
-        RECT 4.100000  0.085000 4.405000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -93,28 +75,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.255000 1.835000 0.510000 2.635000 ;
-        RECT 1.280000 1.835000 1.450000 2.635000 ;
-        RECT 2.220000 1.835000 2.390000 2.635000 ;
-        RECT 3.160000 1.835000 3.330000 2.635000 ;
-        RECT 4.100000 1.835000 4.400000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.255000  0.085000 0.510000 0.545000 ;
+      RECT 0.255000  1.835000 0.510000 2.635000 ;
+      RECT 1.280000  0.085000 1.450000 0.545000 ;
+      RECT 1.280000  1.835000 1.450000 2.635000 ;
+      RECT 2.220000  0.085000 2.390000 0.545000 ;
+      RECT 2.220000  1.835000 2.390000 2.635000 ;
+      RECT 3.160000  0.085000 3.330000 0.545000 ;
+      RECT 3.160000  1.835000 3.330000 2.635000 ;
+      RECT 4.100000  0.085000 4.405000 0.545000 ;
+      RECT 4.100000  1.835000 4.400000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
index 7cfaaa0..a5a9409 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_1.magic.lef
@@ -68,16 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.905000  0.085000 1.115000 0.895000 ;
-        RECT 1.805000  0.085000 2.135000 0.475000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -86,26 +76,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.925000 1.855000 1.255000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.330000 0.370000 0.675000 0.545000 ;
-      RECT 0.415000 1.510000 1.855000 1.680000 ;
-      RECT 0.415000 1.680000 0.675000 1.905000 ;
-      RECT 0.495000 0.545000 0.675000 1.510000 ;
-      RECT 1.635000 0.985000 1.855000 1.510000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.330000  0.370000 0.675000 0.545000 ;
+      RECT 0.415000  1.510000 1.855000 1.680000 ;
+      RECT 0.415000  1.680000 0.675000 1.905000 ;
+      RECT 0.495000  0.545000 0.675000 1.510000 ;
+      RECT 0.905000  0.085000 1.115000 0.895000 ;
+      RECT 0.925000  1.855000 1.255000 2.635000 ;
+      RECT 1.635000  0.985000 1.855000 1.510000 ;
+      RECT 1.805000  0.085000 2.135000 0.475000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
index 59e5337..25e6c36 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_16.magic.lef
@@ -92,68 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 18.400000 0.085000 ;
-        RECT  0.485000  0.085000  0.865000 0.825000 ;
-        RECT  1.565000  0.085000  1.865000 0.895000 ;
-        RECT  2.605000  0.085000  3.155000 0.905000 ;
-        RECT  3.925000  0.085000  4.095000 0.555000 ;
-        RECT  4.865000  0.085000  5.035000 0.555000 ;
-        RECT  5.805000  0.085000  5.975000 0.555000 ;
-        RECT  6.745000  0.085000  6.915000 0.555000 ;
-        RECT  7.685000  0.085000  7.855000 0.555000 ;
-        RECT  8.625000  0.085000  8.795000 0.555000 ;
-        RECT  9.565000  0.085000  9.735000 0.555000 ;
-        RECT 10.505000  0.085000 10.675000 0.555000 ;
-        RECT 11.445000  0.085000 11.615000 0.555000 ;
-        RECT 12.385000  0.085000 12.555000 0.555000 ;
-        RECT 13.325000  0.085000 13.495000 0.555000 ;
-        RECT 14.265000  0.085000 14.435000 0.555000 ;
-        RECT 15.205000  0.085000 15.375000 0.555000 ;
-        RECT 16.145000  0.085000 16.315000 0.555000 ;
-        RECT 17.085000  0.085000 17.255000 0.555000 ;
-        RECT 18.025000  0.085000 18.295000 0.555000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
-        RECT 15.785000 -0.085000 15.955000 0.085000 ;
-        RECT 16.245000 -0.085000 16.415000 0.085000 ;
-        RECT 16.705000 -0.085000 16.875000 0.085000 ;
-        RECT 17.165000 -0.085000 17.335000 0.085000 ;
-        RECT 17.625000 -0.085000 17.795000 0.085000 ;
-        RECT 18.085000 -0.085000 18.255000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 18.400000 0.240000 ;
     END
@@ -162,92 +100,151 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 18.400000 2.805000 ;
-        RECT 0.300000 1.495000  0.515000 2.635000 ;
-        RECT 1.335000 1.455000  1.555000 2.635000 ;
-        RECT 2.375000 1.455000  2.670000 2.635000 ;
-        RECT 3.415000 1.835000  3.665000 2.635000 ;
-        RECT 4.355000 1.835000  4.605000 2.635000 ;
-        RECT 5.295000 1.835000  5.545000 2.635000 ;
-        RECT 6.235000 1.835000  6.485000 2.635000 ;
-        RECT 7.175000 1.835000  7.425000 2.635000 ;
-        RECT 8.115000 1.835000  8.365000 2.635000 ;
-        RECT 9.055000 1.835000  9.305000 2.635000 ;
-        RECT 9.995000 1.835000 10.245000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 15.785000 2.635000 15.955000 2.805000 ;
-        RECT 16.245000 2.635000 16.415000 2.805000 ;
-        RECT 16.705000 2.635000 16.875000 2.805000 ;
-        RECT 17.165000 2.635000 17.335000 2.805000 ;
-        RECT 17.625000 2.635000 17.795000 2.805000 ;
-        RECT 18.085000 2.635000 18.255000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 18.400000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.685000 1.495000  1.115000 2.465000 ;
-      RECT  0.885000 1.065000  2.385000 1.075000 ;
-      RECT  0.885000 1.075000 10.480000 1.285000 ;
-      RECT  0.885000 1.285000  1.115000 1.495000 ;
-      RECT  1.085000 0.255000  1.345000 1.065000 ;
-      RECT  1.725000 1.285000  2.155000 2.465000 ;
-      RECT  2.085000 0.255000  2.385000 1.065000 ;
-      RECT  2.875000 1.455000 10.715000 1.665000 ;
-      RECT  2.875000 1.665000  3.195000 2.465000 ;
-      RECT  3.885000 1.665000  4.135000 2.465000 ;
-      RECT  4.825000 1.665000  5.075000 2.465000 ;
-      RECT  5.765000 1.665000  6.015000 2.465000 ;
-      RECT  6.705000 1.665000  6.955000 2.465000 ;
-      RECT  7.645000 1.665000  7.895000 2.465000 ;
-      RECT  8.585000 1.665000  8.835000 2.465000 ;
-      RECT  9.525000 1.665000  9.775000 2.465000 ;
-      RECT 10.465000 1.665000 10.715000 2.295000 ;
-      RECT 10.465000 2.295000 18.235000 2.465000 ;
-      RECT 11.405000 1.795000 11.655000 2.295000 ;
-      RECT 12.345000 1.795000 12.595000 2.295000 ;
-      RECT 13.285000 1.795000 13.535000 2.295000 ;
-      RECT 14.225000 1.795000 14.475000 2.295000 ;
-      RECT 15.165000 1.795000 15.415000 2.295000 ;
-      RECT 16.105000 1.795000 16.355000 2.295000 ;
-      RECT 17.045000 1.795000 17.295000 2.295000 ;
-      RECT 17.985000 1.795000 18.235000 2.295000 ;
+      RECT  0.000000 -0.085000 18.400000 0.085000 ;
+      RECT  0.000000  2.635000 18.400000 2.805000 ;
+      RECT  0.300000  1.495000  0.515000 2.635000 ;
+      RECT  0.485000  0.085000  0.865000 0.825000 ;
+      RECT  0.685000  1.495000  1.115000 2.465000 ;
+      RECT  0.885000  1.065000  2.385000 1.075000 ;
+      RECT  0.885000  1.075000 10.480000 1.285000 ;
+      RECT  0.885000  1.285000  1.115000 1.495000 ;
+      RECT  1.085000  0.255000  1.345000 1.065000 ;
+      RECT  1.335000  1.455000  1.555000 2.635000 ;
+      RECT  1.565000  0.085000  1.865000 0.895000 ;
+      RECT  1.725000  1.285000  2.155000 2.465000 ;
+      RECT  2.085000  0.255000  2.385000 1.065000 ;
+      RECT  2.375000  1.455000  2.670000 2.635000 ;
+      RECT  2.605000  0.085000  3.155000 0.905000 ;
+      RECT  2.875000  1.455000 10.715000 1.665000 ;
+      RECT  2.875000  1.665000  3.195000 2.465000 ;
+      RECT  3.415000  1.835000  3.665000 2.635000 ;
+      RECT  3.885000  1.665000  4.135000 2.465000 ;
+      RECT  3.925000  0.085000  4.095000 0.555000 ;
+      RECT  4.355000  1.835000  4.605000 2.635000 ;
+      RECT  4.825000  1.665000  5.075000 2.465000 ;
+      RECT  4.865000  0.085000  5.035000 0.555000 ;
+      RECT  5.295000  1.835000  5.545000 2.635000 ;
+      RECT  5.765000  1.665000  6.015000 2.465000 ;
+      RECT  5.805000  0.085000  5.975000 0.555000 ;
+      RECT  6.235000  1.835000  6.485000 2.635000 ;
+      RECT  6.705000  1.665000  6.955000 2.465000 ;
+      RECT  6.745000  0.085000  6.915000 0.555000 ;
+      RECT  7.175000  1.835000  7.425000 2.635000 ;
+      RECT  7.645000  1.665000  7.895000 2.465000 ;
+      RECT  7.685000  0.085000  7.855000 0.555000 ;
+      RECT  8.115000  1.835000  8.365000 2.635000 ;
+      RECT  8.585000  1.665000  8.835000 2.465000 ;
+      RECT  8.625000  0.085000  8.795000 0.555000 ;
+      RECT  9.055000  1.835000  9.305000 2.635000 ;
+      RECT  9.525000  1.665000  9.775000 2.465000 ;
+      RECT  9.565000  0.085000  9.735000 0.555000 ;
+      RECT  9.995000  1.835000 10.245000 2.635000 ;
+      RECT 10.465000  1.665000 10.715000 2.295000 ;
+      RECT 10.465000  2.295000 18.235000 2.465000 ;
+      RECT 10.505000  0.085000 10.675000 0.555000 ;
+      RECT 11.405000  1.795000 11.655000 2.295000 ;
+      RECT 11.445000  0.085000 11.615000 0.555000 ;
+      RECT 12.345000  1.795000 12.595000 2.295000 ;
+      RECT 12.385000  0.085000 12.555000 0.555000 ;
+      RECT 13.285000  1.795000 13.535000 2.295000 ;
+      RECT 13.325000  0.085000 13.495000 0.555000 ;
+      RECT 14.225000  1.795000 14.475000 2.295000 ;
+      RECT 14.265000  0.085000 14.435000 0.555000 ;
+      RECT 15.165000  1.795000 15.415000 2.295000 ;
+      RECT 15.205000  0.085000 15.375000 0.555000 ;
+      RECT 16.105000  1.795000 16.355000 2.295000 ;
+      RECT 16.145000  0.085000 16.315000 0.555000 ;
+      RECT 17.045000  1.795000 17.295000 2.295000 ;
+      RECT 17.085000  0.085000 17.255000 0.555000 ;
+      RECT 17.985000  1.795000 18.235000 2.295000 ;
+      RECT 18.025000  0.085000 18.295000 0.555000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
+      RECT 15.325000 -0.085000 15.495000 0.085000 ;
+      RECT 15.325000  2.635000 15.495000 2.805000 ;
+      RECT 15.785000 -0.085000 15.955000 0.085000 ;
+      RECT 15.785000  2.635000 15.955000 2.805000 ;
+      RECT 16.245000 -0.085000 16.415000 0.085000 ;
+      RECT 16.245000  2.635000 16.415000 2.805000 ;
+      RECT 16.705000 -0.085000 16.875000 0.085000 ;
+      RECT 16.705000  2.635000 16.875000 2.805000 ;
+      RECT 17.165000 -0.085000 17.335000 0.085000 ;
+      RECT 17.165000  2.635000 17.335000 2.805000 ;
+      RECT 17.625000 -0.085000 17.795000 0.085000 ;
+      RECT 17.625000  2.635000 17.795000 2.805000 ;
+      RECT 18.085000 -0.085000 18.255000 0.085000 ;
+      RECT 18.085000  2.635000 18.255000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
index 340e3e2..dfb58b5 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_2.magic.lef
@@ -69,21 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.085000  0.085000 0.365000 0.895000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.245000 0.895000 ;
-        RECT 3.025000  0.085000 3.280000 0.845000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -92,38 +77,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.625000 1.825000 0.875000 2.635000 ;
-        RECT 3.025000 2.145000 3.275000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.445000 1.345000 1.655000 ;
-      RECT 0.085000 1.655000 0.405000 2.465000 ;
-      RECT 1.095000 1.655000 1.345000 2.295000 ;
-      RECT 1.095000 2.295000 2.325000 2.465000 ;
-      RECT 2.035000 1.445000 2.290000 1.890000 ;
-      RECT 2.035000 1.890000 2.325000 2.295000 ;
-      RECT 2.075000 1.075000 2.630000 1.245000 ;
-      RECT 2.415000 0.725000 2.765000 0.895000 ;
-      RECT 2.415000 0.895000 2.630000 1.075000 ;
-      RECT 2.460000 1.245000 2.630000 1.445000 ;
-      RECT 2.460000 1.445000 2.765000 1.615000 ;
-      RECT 2.595000 0.445000 2.765000 0.725000 ;
-      RECT 2.595000 1.615000 2.765000 2.460000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.085000 0.365000 0.895000 ;
+      RECT 0.085000  1.445000 1.345000 1.655000 ;
+      RECT 0.085000  1.655000 0.405000 2.465000 ;
+      RECT 0.625000  1.825000 0.875000 2.635000 ;
+      RECT 1.095000  1.655000 1.345000 2.295000 ;
+      RECT 1.095000  2.295000 2.325000 2.465000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 2.035000  1.445000 2.290000 1.890000 ;
+      RECT 2.035000  1.890000 2.325000 2.295000 ;
+      RECT 2.075000  0.085000 2.245000 0.895000 ;
+      RECT 2.075000  1.075000 2.630000 1.245000 ;
+      RECT 2.415000  0.725000 2.765000 0.895000 ;
+      RECT 2.415000  0.895000 2.630000 1.075000 ;
+      RECT 2.460000  1.245000 2.630000 1.445000 ;
+      RECT 2.460000  1.445000 2.765000 1.615000 ;
+      RECT 2.595000  0.445000 2.765000 0.725000 ;
+      RECT 2.595000  1.615000 2.765000 2.460000 ;
+      RECT 3.025000  0.085000 3.280000 0.845000 ;
+      RECT 3.025000  2.145000 3.275000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
index 634bcef..8dfb599 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_4.magic.lef
@@ -73,27 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.085000  0.085000 0.365000 0.905000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.245000 0.555000 ;
-        RECT 3.015000  0.085000 3.185000 0.555000 ;
-        RECT 3.955000  0.085000 4.245000 0.905000 ;
-        RECT 4.975000  0.085000 5.265000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -102,42 +81,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.535000 1.835000 0.915000 2.635000 ;
-        RECT 1.475000 1.835000 1.775000 2.635000 ;
-        RECT 4.975000 1.495000 5.380000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.455000 2.325000 1.665000 ;
-      RECT 0.085000 1.665000 0.365000 2.465000 ;
-      RECT 1.135000 1.665000 1.305000 2.465000 ;
-      RECT 1.945000 1.665000 2.325000 2.295000 ;
-      RECT 1.945000 2.295000 4.255000 2.465000 ;
-      RECT 2.885000 1.935000 3.265000 2.295000 ;
-      RECT 3.095000 1.075000 4.675000 1.275000 ;
-      RECT 3.825000 1.575000 4.255000 2.295000 ;
-      RECT 4.425000 0.255000 4.755000 0.815000 ;
-      RECT 4.425000 0.815000 4.675000 1.075000 ;
-      RECT 4.425000 1.275000 4.675000 1.575000 ;
-      RECT 4.425000 1.575000 4.755000 2.465000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.085000  0.085000 0.365000 0.905000 ;
+      RECT 0.085000  1.455000 2.325000 1.665000 ;
+      RECT 0.085000  1.665000 0.365000 2.465000 ;
+      RECT 0.535000  1.835000 0.915000 2.635000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 1.135000  1.665000 1.305000 2.465000 ;
+      RECT 1.475000  1.835000 1.775000 2.635000 ;
+      RECT 1.945000  1.665000 2.325000 2.295000 ;
+      RECT 1.945000  2.295000 4.255000 2.465000 ;
+      RECT 2.075000  0.085000 2.245000 0.555000 ;
+      RECT 2.885000  1.935000 3.265000 2.295000 ;
+      RECT 3.015000  0.085000 3.185000 0.555000 ;
+      RECT 3.095000  1.075000 4.675000 1.275000 ;
+      RECT 3.825000  1.575000 4.255000 2.295000 ;
+      RECT 3.955000  0.085000 4.245000 0.905000 ;
+      RECT 4.425000  0.255000 4.755000 0.815000 ;
+      RECT 4.425000  0.815000 4.675000 1.075000 ;
+      RECT 4.425000  1.275000 4.675000 1.575000 ;
+      RECT 4.425000  1.575000 4.755000 2.465000 ;
+      RECT 4.975000  0.085000 5.265000 0.905000 ;
+      RECT 4.975000  1.495000 5.380000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
index ec2aed2..73f9c89 100644
--- a/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
+++ b/cells/isobufsrc/sky130_fd_sc_hdll__isobufsrc_8.magic.lef
@@ -80,40 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.485000  0.085000 0.705000 0.895000 ;
-        RECT 1.445000  0.085000 1.955000 0.905000 ;
-        RECT 2.725000  0.085000 2.895000 0.555000 ;
-        RECT 3.665000  0.085000 3.835000 0.555000 ;
-        RECT 4.605000  0.085000 4.775000 0.555000 ;
-        RECT 5.545000  0.085000 5.715000 0.555000 ;
-        RECT 6.485000  0.085000 6.655000 0.555000 ;
-        RECT 7.425000  0.085000 7.595000 0.555000 ;
-        RECT 8.365000  0.085000 8.535000 0.555000 ;
-        RECT 9.305000  0.085000 9.575000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -122,58 +88,89 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.125000 1.455000 0.345000 2.635000 ;
-        RECT 1.165000 1.455000 1.460000 2.635000 ;
-        RECT 2.215000 1.835000 2.465000 2.635000 ;
-        RECT 3.155000 1.835000 3.405000 2.635000 ;
-        RECT 4.095000 1.835000 4.345000 2.635000 ;
-        RECT 5.035000 1.835000 5.285000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 1.455000 0.945000 2.465000 ;
-      RECT 0.725000 1.065000 1.235000 1.075000 ;
-      RECT 0.725000 1.075000 5.520000 1.285000 ;
-      RECT 0.725000 1.285000 0.945000 1.455000 ;
-      RECT 0.875000 0.255000 1.235000 1.065000 ;
-      RECT 1.675000 1.455000 5.755000 1.665000 ;
-      RECT 1.675000 1.665000 1.995000 2.465000 ;
-      RECT 2.685000 1.665000 2.935000 2.465000 ;
-      RECT 3.625000 1.665000 3.875000 2.465000 ;
-      RECT 4.565000 1.665000 4.815000 2.465000 ;
-      RECT 5.505000 1.665000 5.755000 2.295000 ;
-      RECT 5.505000 2.295000 9.515000 2.465000 ;
-      RECT 6.445000 1.785000 6.695000 2.295000 ;
-      RECT 7.385000 1.785000 7.635000 2.295000 ;
-      RECT 8.325000 1.785000 8.575000 2.295000 ;
-      RECT 9.265000 1.785000 9.515000 2.295000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.125000  1.455000 0.345000 2.635000 ;
+      RECT 0.485000  0.085000 0.705000 0.895000 ;
+      RECT 0.515000  1.455000 0.945000 2.465000 ;
+      RECT 0.725000  1.065000 1.235000 1.075000 ;
+      RECT 0.725000  1.075000 5.520000 1.285000 ;
+      RECT 0.725000  1.285000 0.945000 1.455000 ;
+      RECT 0.875000  0.255000 1.235000 1.065000 ;
+      RECT 1.165000  1.455000 1.460000 2.635000 ;
+      RECT 1.445000  0.085000 1.955000 0.905000 ;
+      RECT 1.675000  1.455000 5.755000 1.665000 ;
+      RECT 1.675000  1.665000 1.995000 2.465000 ;
+      RECT 2.215000  1.835000 2.465000 2.635000 ;
+      RECT 2.685000  1.665000 2.935000 2.465000 ;
+      RECT 2.725000  0.085000 2.895000 0.555000 ;
+      RECT 3.155000  1.835000 3.405000 2.635000 ;
+      RECT 3.625000  1.665000 3.875000 2.465000 ;
+      RECT 3.665000  0.085000 3.835000 0.555000 ;
+      RECT 4.095000  1.835000 4.345000 2.635000 ;
+      RECT 4.565000  1.665000 4.815000 2.465000 ;
+      RECT 4.605000  0.085000 4.775000 0.555000 ;
+      RECT 5.035000  1.835000 5.285000 2.635000 ;
+      RECT 5.505000  1.665000 5.755000 2.295000 ;
+      RECT 5.505000  2.295000 9.515000 2.465000 ;
+      RECT 5.545000  0.085000 5.715000 0.555000 ;
+      RECT 6.445000  1.785000 6.695000 2.295000 ;
+      RECT 6.485000  0.085000 6.655000 0.555000 ;
+      RECT 7.385000  1.785000 7.635000 2.295000 ;
+      RECT 7.425000  0.085000 7.595000 0.555000 ;
+      RECT 8.325000  1.785000 8.575000 2.295000 ;
+      RECT 8.365000  0.085000 8.535000 0.555000 ;
+      RECT 9.265000  1.785000 9.515000 2.295000 ;
+      RECT 9.305000  0.085000 9.575000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
index 627ce3c..db01a7d 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_1.magic.lef
@@ -81,21 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.485000 ;
-        RECT 3.250000  0.085000 3.765000 0.620000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -104,37 +89,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.645000 1.495000 0.815000 2.635000 ;
-        RECT 3.585000 1.875000 3.755000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.655000 1.610000 0.825000 ;
-      RECT 0.515000 0.825000 0.685000 1.325000 ;
-      RECT 1.435000 0.255000 1.955000 0.620000 ;
-      RECT 1.435000 0.620000 1.610000 0.655000 ;
-      RECT 1.440000 0.825000 1.610000 1.955000 ;
-      RECT 1.440000 1.955000 2.750000 2.125000 ;
-      RECT 3.285000 0.895000 4.500000 1.065000 ;
-      RECT 4.035000 0.290000 4.280000 0.895000 ;
-      RECT 4.040000 1.875000 4.500000 2.285000 ;
-      RECT 4.215000 1.065000 4.500000 1.875000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.515000  0.085000 0.895000 0.485000 ;
+      RECT 0.515000  0.655000 1.610000 0.825000 ;
+      RECT 0.515000  0.825000 0.685000 1.325000 ;
+      RECT 0.645000  1.495000 0.815000 2.635000 ;
+      RECT 1.435000  0.255000 1.955000 0.620000 ;
+      RECT 1.435000  0.620000 1.610000 0.655000 ;
+      RECT 1.440000  0.825000 1.610000 1.955000 ;
+      RECT 1.440000  1.955000 2.750000 2.125000 ;
+      RECT 3.250000  0.085000 3.765000 0.620000 ;
+      RECT 3.285000  0.895000 4.500000 1.065000 ;
+      RECT 3.585000  1.875000 3.755000 2.635000 ;
+      RECT 4.035000  0.290000 4.280000 0.895000 ;
+      RECT 4.040000  1.875000 4.500000 2.285000 ;
+      RECT 4.215000  1.065000 4.500000 1.875000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
index 3fea01a..b278f91 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_12.magic.lef
@@ -88,58 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 16.560000 0.085000 ;
-        RECT  2.525000  0.085000  2.795000 0.550000 ;
-        RECT  3.465000  0.085000  3.735000 0.545000 ;
-        RECT  4.405000  0.085000  4.675000 0.905000 ;
-        RECT  5.345000  0.085000  5.615000 0.905000 ;
-        RECT  6.285000  0.085000  6.555000 0.545000 ;
-        RECT  7.225000  0.085000  7.495000 0.550000 ;
-        RECT 10.145000  0.085000 10.415000 0.905000 ;
-        RECT 11.085000  0.085000 11.355000 0.545000 ;
-        RECT 12.025000  0.085000 12.295000 0.545000 ;
-        RECT 12.965000  0.085000 13.235000 0.545000 ;
-        RECT 13.905000  0.085000 14.175000 0.550000 ;
-        RECT 14.845000  0.085000 15.115000 0.545000 ;
-        RECT 15.785000  0.085000 16.055000 0.905000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
-        RECT 15.785000 -0.085000 15.955000 0.085000 ;
-        RECT 16.245000 -0.085000 16.415000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
     END
@@ -148,116 +96,164 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 16.560000 2.805000 ;
-        RECT  2.525000 1.495000  2.795000 2.635000 ;
-        RECT  3.465000 1.835000  3.735000 2.635000 ;
-        RECT  4.405000 1.495000  4.675000 2.635000 ;
-        RECT  5.345000 1.495000  5.615000 2.635000 ;
-        RECT  6.285000 1.835000  6.555000 2.635000 ;
-        RECT  7.225000 1.495000  7.495000 2.635000 ;
-        RECT 10.145000 1.495000 10.415000 2.635000 ;
-        RECT 11.085000 1.835000 11.355000 2.635000 ;
-        RECT 12.025000 1.835000 12.295000 2.635000 ;
-        RECT 12.965000 1.835000 13.235000 2.635000 ;
-        RECT 13.905000 1.835000 14.175000 2.635000 ;
-        RECT 14.845000 1.835000 15.115000 2.635000 ;
-        RECT 15.785000 1.495000 16.055000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 15.785000 2.635000 15.955000 2.805000 ;
-        RECT 16.245000 2.635000 16.415000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 16.560000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000  2.305000 0.425000 ;
-      RECT 0.095000 0.425000  0.395000 2.295000 ;
-      RECT 0.095000 2.295000  2.305000 2.465000 ;
-      RECT 0.565000 0.595000  0.895000 0.725000 ;
-      RECT 0.565000 0.725000  4.235000 0.905000 ;
-      RECT 0.565000 1.495000  1.835000 1.665000 ;
-      RECT 0.565000 1.665000  0.895000 2.125000 ;
-      RECT 1.065000 0.425000  1.335000 0.545000 ;
-      RECT 1.065000 1.835000  1.335000 2.295000 ;
-      RECT 1.505000 0.595000  1.835000 0.725000 ;
-      RECT 1.505000 1.665000  1.835000 2.125000 ;
-      RECT 2.005000 0.425000  2.305000 0.550000 ;
-      RECT 2.005000 1.495000  2.305000 2.295000 ;
-      RECT 2.965000 0.255000  3.295000 0.725000 ;
-      RECT 2.965000 1.495000  4.235000 1.665000 ;
-      RECT 2.965000 1.665000  3.295000 2.465000 ;
-      RECT 3.905000 0.255000  4.235000 0.725000 ;
-      RECT 3.905000 1.665000  4.235000 2.465000 ;
-      RECT 4.845000 0.255000  5.175000 1.075000 ;
-      RECT 4.845000 1.075000  7.095000 1.325000 ;
-      RECT 4.845000 1.325000  5.175000 2.465000 ;
-      RECT 5.785000 0.255000  6.115000 0.725000 ;
-      RECT 5.785000 0.725000  9.455000 0.905000 ;
-      RECT 5.785000 1.495000  7.055000 1.665000 ;
-      RECT 5.785000 1.665000  6.115000 2.465000 ;
-      RECT 6.725000 0.255000  7.055000 0.725000 ;
-      RECT 6.725000 1.665000  7.055000 2.465000 ;
-      RECT 7.715000 0.255000  9.925000 0.425000 ;
-      RECT 7.715000 0.425000  8.015000 0.550000 ;
-      RECT 7.715000 1.495000  8.015000 2.295000 ;
-      RECT 7.715000 2.295000  9.925000 2.465000 ;
-      RECT 8.185000 0.595000  8.515000 0.725000 ;
-      RECT 8.185000 1.495000  9.455000 1.665000 ;
-      RECT 8.185000 1.665000  8.515000 2.125000 ;
-      RECT 8.685000 0.425000  8.955000 0.545000 ;
-      RECT 8.685000 1.835000  8.955000 2.295000 ;
-      RECT 9.125000 0.595000  9.455000 0.725000 ;
-      RECT 9.125000 1.665000  9.455000 2.125000 ;
-      RECT 9.625000 0.425000  9.925000 1.075000 ;
-      RECT 9.625000 1.075000 14.825000 1.325000 ;
-      RECT 9.625000 1.325000  9.925000 2.295000 ;
+      RECT  0.000000 -0.085000 16.560000 0.085000 ;
+      RECT  0.000000  2.635000 16.560000 2.805000 ;
+      RECT  0.095000  0.255000  2.305000 0.425000 ;
+      RECT  0.095000  0.425000  0.395000 2.295000 ;
+      RECT  0.095000  2.295000  2.305000 2.465000 ;
+      RECT  0.565000  0.595000  0.895000 0.725000 ;
+      RECT  0.565000  0.725000  4.235000 0.905000 ;
+      RECT  0.565000  1.495000  1.835000 1.665000 ;
+      RECT  0.565000  1.665000  0.895000 2.125000 ;
+      RECT  1.065000  0.425000  1.335000 0.545000 ;
+      RECT  1.065000  1.835000  1.335000 2.295000 ;
+      RECT  1.505000  0.595000  1.835000 0.725000 ;
+      RECT  1.505000  1.665000  1.835000 2.125000 ;
+      RECT  2.005000  0.425000  2.305000 0.550000 ;
+      RECT  2.005000  1.495000  2.305000 2.295000 ;
+      RECT  2.525000  0.085000  2.795000 0.550000 ;
+      RECT  2.525000  1.495000  2.795000 2.635000 ;
+      RECT  2.965000  0.255000  3.295000 0.725000 ;
+      RECT  2.965000  1.495000  4.235000 1.665000 ;
+      RECT  2.965000  1.665000  3.295000 2.465000 ;
+      RECT  3.465000  0.085000  3.735000 0.545000 ;
+      RECT  3.465000  1.835000  3.735000 2.635000 ;
+      RECT  3.905000  0.255000  4.235000 0.725000 ;
+      RECT  3.905000  1.665000  4.235000 2.465000 ;
+      RECT  4.405000  0.085000  4.675000 0.905000 ;
+      RECT  4.405000  1.495000  4.675000 2.635000 ;
+      RECT  4.845000  0.255000  5.175000 1.075000 ;
+      RECT  4.845000  1.075000  7.095000 1.325000 ;
+      RECT  4.845000  1.325000  5.175000 2.465000 ;
+      RECT  5.345000  0.085000  5.615000 0.905000 ;
+      RECT  5.345000  1.495000  5.615000 2.635000 ;
+      RECT  5.785000  0.255000  6.115000 0.725000 ;
+      RECT  5.785000  0.725000  9.455000 0.905000 ;
+      RECT  5.785000  1.495000  7.055000 1.665000 ;
+      RECT  5.785000  1.665000  6.115000 2.465000 ;
+      RECT  6.285000  0.085000  6.555000 0.545000 ;
+      RECT  6.285000  1.835000  6.555000 2.635000 ;
+      RECT  6.725000  0.255000  7.055000 0.725000 ;
+      RECT  6.725000  1.665000  7.055000 2.465000 ;
+      RECT  7.225000  0.085000  7.495000 0.550000 ;
+      RECT  7.225000  1.495000  7.495000 2.635000 ;
+      RECT  7.715000  0.255000  9.925000 0.425000 ;
+      RECT  7.715000  0.425000  8.015000 0.550000 ;
+      RECT  7.715000  1.495000  8.015000 2.295000 ;
+      RECT  7.715000  2.295000  9.925000 2.465000 ;
+      RECT  8.185000  0.595000  8.515000 0.725000 ;
+      RECT  8.185000  1.495000  9.455000 1.665000 ;
+      RECT  8.185000  1.665000  8.515000 2.125000 ;
+      RECT  8.685000  0.425000  8.955000 0.545000 ;
+      RECT  8.685000  1.835000  8.955000 2.295000 ;
+      RECT  9.125000  0.595000  9.455000 0.725000 ;
+      RECT  9.125000  1.665000  9.455000 2.125000 ;
+      RECT  9.625000  0.425000  9.925000 1.075000 ;
+      RECT  9.625000  1.075000 14.825000 1.325000 ;
+      RECT  9.625000  1.325000  9.925000 2.295000 ;
+      RECT 10.145000  0.085000 10.415000 0.905000 ;
+      RECT 10.145000  1.495000 10.415000 2.635000 ;
+      RECT 11.085000  0.085000 11.355000 0.545000 ;
+      RECT 11.085000  1.835000 11.355000 2.635000 ;
+      RECT 12.025000  0.085000 12.295000 0.545000 ;
+      RECT 12.025000  1.835000 12.295000 2.635000 ;
+      RECT 12.965000  0.085000 13.235000 0.545000 ;
+      RECT 12.965000  1.835000 13.235000 2.635000 ;
+      RECT 13.905000  0.085000 14.175000 0.550000 ;
+      RECT 13.905000  1.835000 14.175000 2.635000 ;
+      RECT 14.845000  0.085000 15.115000 0.545000 ;
+      RECT 14.845000  1.835000 15.115000 2.635000 ;
+      RECT 15.785000  0.085000 16.055000 0.905000 ;
+      RECT 15.785000  1.495000 16.055000 2.635000 ;
     LAYER mcon ;
-      RECT 0.175000 0.425000 0.345000 0.595000 ;
-      RECT 0.645000 1.785000 0.815000 1.955000 ;
-      RECT 1.585000 1.785000 1.755000 1.955000 ;
-      RECT 3.045000 2.125000 3.215000 2.295000 ;
-      RECT 3.985000 2.125000 4.155000 2.295000 ;
-      RECT 5.865000 1.785000 6.035000 1.955000 ;
-      RECT 6.805000 1.785000 6.975000 1.955000 ;
-      RECT 8.265000 1.785000 8.435000 1.955000 ;
-      RECT 9.205000 1.785000 9.375000 1.955000 ;
-      RECT 9.675000 0.425000 9.845000 0.595000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.175000  0.425000  0.345000 0.595000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.645000  1.785000  0.815000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.585000  1.785000  1.755000 1.955000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.045000  2.125000  3.215000 2.295000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  3.985000  2.125000  4.155000 2.295000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  5.865000  1.785000  6.035000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  6.805000  1.785000  6.975000 1.955000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.265000  1.785000  8.435000 1.955000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.205000  1.785000  9.375000 1.955000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.675000  0.425000  9.845000 0.595000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
+      RECT 15.325000 -0.085000 15.495000 0.085000 ;
+      RECT 15.325000  2.635000 15.495000 2.805000 ;
+      RECT 15.785000 -0.085000 15.955000 0.085000 ;
+      RECT 15.785000  2.635000 15.955000 2.805000 ;
+      RECT 16.245000 -0.085000 16.415000 0.085000 ;
+      RECT 16.245000  2.635000 16.415000 2.805000 ;
     LAYER met1 ;
       RECT 0.115000 0.395000 0.405000 0.440000 ;
       RECT 0.115000 0.440000 9.905000 0.580000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
index 7388b38..7a80735 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_16.magic.lef
@@ -92,64 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 18.400000 0.085000 ;
-        RECT  2.525000  0.085000  2.795000 0.550000 ;
-        RECT  3.465000  0.085000  3.735000 0.545000 ;
-        RECT  4.405000  0.085000  4.675000 0.905000 ;
-        RECT  5.345000  0.085000  5.615000 0.905000 ;
-        RECT  6.285000  0.085000  6.555000 0.545000 ;
-        RECT  7.225000  0.085000  7.495000 0.550000 ;
-        RECT 10.145000  0.085000 10.415000 0.905000 ;
-        RECT 11.085000  0.085000 11.355000 0.545000 ;
-        RECT 12.025000  0.085000 12.295000 0.545000 ;
-        RECT 12.965000  0.085000 13.235000 0.545000 ;
-        RECT 13.905000  0.085000 14.175000 0.550000 ;
-        RECT 14.845000  0.085000 15.115000 0.545000 ;
-        RECT 15.785000  0.085000 16.055000 0.545000 ;
-        RECT 16.725000  0.085000 16.995000 0.545000 ;
-        RECT 17.665000  0.085000 17.935000 0.905000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
-        RECT 15.785000 -0.085000 15.955000 0.085000 ;
-        RECT 16.245000 -0.085000 16.415000 0.085000 ;
-        RECT 16.705000 -0.085000 16.875000 0.085000 ;
-        RECT 17.165000 -0.085000 17.335000 0.085000 ;
-        RECT 17.625000 -0.085000 17.795000 0.085000 ;
-        RECT 18.085000 -0.085000 18.255000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 18.400000 0.240000 ;
     END
@@ -158,122 +100,176 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 18.400000 2.805000 ;
-        RECT  2.525000 1.495000  2.795000 2.635000 ;
-        RECT  3.465000 1.835000  3.735000 2.635000 ;
-        RECT  4.405000 1.495000  4.675000 2.635000 ;
-        RECT  5.345000 1.495000  5.615000 2.635000 ;
-        RECT  6.285000 1.835000  6.555000 2.635000 ;
-        RECT  7.225000 1.495000  7.495000 2.635000 ;
-        RECT 10.145000 1.495000 10.415000 2.635000 ;
-        RECT 11.085000 1.835000 11.355000 2.635000 ;
-        RECT 12.025000 1.835000 12.295000 2.635000 ;
-        RECT 12.965000 1.835000 13.235000 2.635000 ;
-        RECT 13.905000 1.835000 14.175000 2.635000 ;
-        RECT 14.845000 1.835000 15.115000 2.635000 ;
-        RECT 15.785000 1.835000 16.055000 2.635000 ;
-        RECT 16.725000 1.835000 16.995000 2.635000 ;
-        RECT 17.665000 1.495000 17.935000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 15.785000 2.635000 15.955000 2.805000 ;
-        RECT 16.245000 2.635000 16.415000 2.805000 ;
-        RECT 16.705000 2.635000 16.875000 2.805000 ;
-        RECT 17.165000 2.635000 17.335000 2.805000 ;
-        RECT 17.625000 2.635000 17.795000 2.805000 ;
-        RECT 18.085000 2.635000 18.255000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 18.400000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000  2.305000 0.425000 ;
-      RECT 0.095000 0.425000  0.395000 2.295000 ;
-      RECT 0.095000 2.295000  2.305000 2.465000 ;
-      RECT 0.565000 0.595000  0.895000 0.725000 ;
-      RECT 0.565000 0.725000  4.235000 0.905000 ;
-      RECT 0.565000 1.495000  1.835000 1.665000 ;
-      RECT 0.565000 1.665000  0.895000 2.125000 ;
-      RECT 1.065000 0.425000  1.335000 0.545000 ;
-      RECT 1.065000 1.835000  1.335000 2.295000 ;
-      RECT 1.505000 0.595000  1.835000 0.725000 ;
-      RECT 1.505000 1.665000  1.835000 2.125000 ;
-      RECT 2.005000 0.425000  2.305000 0.550000 ;
-      RECT 2.005000 1.495000  2.305000 2.295000 ;
-      RECT 2.965000 0.255000  3.295000 0.725000 ;
-      RECT 2.965000 1.495000  4.235000 1.665000 ;
-      RECT 2.965000 1.665000  3.295000 2.465000 ;
-      RECT 3.905000 0.255000  4.235000 0.725000 ;
-      RECT 3.905000 1.665000  4.235000 2.465000 ;
-      RECT 4.845000 0.255000  5.175000 1.075000 ;
-      RECT 4.845000 1.075000  7.095000 1.325000 ;
-      RECT 4.845000 1.325000  5.175000 2.465000 ;
-      RECT 5.785000 0.255000  6.115000 0.725000 ;
-      RECT 5.785000 0.725000  9.455000 0.905000 ;
-      RECT 5.785000 1.495000  7.055000 1.665000 ;
-      RECT 5.785000 1.665000  6.115000 2.465000 ;
-      RECT 6.725000 0.255000  7.055000 0.725000 ;
-      RECT 6.725000 1.665000  7.055000 2.465000 ;
-      RECT 7.715000 0.255000  9.925000 0.425000 ;
-      RECT 7.715000 0.425000  8.015000 0.550000 ;
-      RECT 7.715000 1.495000  8.015000 2.295000 ;
-      RECT 7.715000 2.295000  9.925000 2.465000 ;
-      RECT 8.185000 0.595000  8.515000 0.725000 ;
-      RECT 8.185000 1.495000  9.455000 1.665000 ;
-      RECT 8.185000 1.665000  8.515000 2.125000 ;
-      RECT 8.685000 0.425000  8.955000 0.545000 ;
-      RECT 8.685000 1.835000  8.955000 2.295000 ;
-      RECT 9.125000 0.595000  9.455000 0.725000 ;
-      RECT 9.125000 1.665000  9.455000 2.125000 ;
-      RECT 9.625000 0.425000  9.925000 1.075000 ;
-      RECT 9.625000 1.075000 16.865000 1.325000 ;
-      RECT 9.625000 1.325000  9.925000 2.295000 ;
+      RECT  0.000000 -0.085000 18.400000 0.085000 ;
+      RECT  0.000000  2.635000 18.400000 2.805000 ;
+      RECT  0.095000  0.255000  2.305000 0.425000 ;
+      RECT  0.095000  0.425000  0.395000 2.295000 ;
+      RECT  0.095000  2.295000  2.305000 2.465000 ;
+      RECT  0.565000  0.595000  0.895000 0.725000 ;
+      RECT  0.565000  0.725000  4.235000 0.905000 ;
+      RECT  0.565000  1.495000  1.835000 1.665000 ;
+      RECT  0.565000  1.665000  0.895000 2.125000 ;
+      RECT  1.065000  0.425000  1.335000 0.545000 ;
+      RECT  1.065000  1.835000  1.335000 2.295000 ;
+      RECT  1.505000  0.595000  1.835000 0.725000 ;
+      RECT  1.505000  1.665000  1.835000 2.125000 ;
+      RECT  2.005000  0.425000  2.305000 0.550000 ;
+      RECT  2.005000  1.495000  2.305000 2.295000 ;
+      RECT  2.525000  0.085000  2.795000 0.550000 ;
+      RECT  2.525000  1.495000  2.795000 2.635000 ;
+      RECT  2.965000  0.255000  3.295000 0.725000 ;
+      RECT  2.965000  1.495000  4.235000 1.665000 ;
+      RECT  2.965000  1.665000  3.295000 2.465000 ;
+      RECT  3.465000  0.085000  3.735000 0.545000 ;
+      RECT  3.465000  1.835000  3.735000 2.635000 ;
+      RECT  3.905000  0.255000  4.235000 0.725000 ;
+      RECT  3.905000  1.665000  4.235000 2.465000 ;
+      RECT  4.405000  0.085000  4.675000 0.905000 ;
+      RECT  4.405000  1.495000  4.675000 2.635000 ;
+      RECT  4.845000  0.255000  5.175000 1.075000 ;
+      RECT  4.845000  1.075000  7.095000 1.325000 ;
+      RECT  4.845000  1.325000  5.175000 2.465000 ;
+      RECT  5.345000  0.085000  5.615000 0.905000 ;
+      RECT  5.345000  1.495000  5.615000 2.635000 ;
+      RECT  5.785000  0.255000  6.115000 0.725000 ;
+      RECT  5.785000  0.725000  9.455000 0.905000 ;
+      RECT  5.785000  1.495000  7.055000 1.665000 ;
+      RECT  5.785000  1.665000  6.115000 2.465000 ;
+      RECT  6.285000  0.085000  6.555000 0.545000 ;
+      RECT  6.285000  1.835000  6.555000 2.635000 ;
+      RECT  6.725000  0.255000  7.055000 0.725000 ;
+      RECT  6.725000  1.665000  7.055000 2.465000 ;
+      RECT  7.225000  0.085000  7.495000 0.550000 ;
+      RECT  7.225000  1.495000  7.495000 2.635000 ;
+      RECT  7.715000  0.255000  9.925000 0.425000 ;
+      RECT  7.715000  0.425000  8.015000 0.550000 ;
+      RECT  7.715000  1.495000  8.015000 2.295000 ;
+      RECT  7.715000  2.295000  9.925000 2.465000 ;
+      RECT  8.185000  0.595000  8.515000 0.725000 ;
+      RECT  8.185000  1.495000  9.455000 1.665000 ;
+      RECT  8.185000  1.665000  8.515000 2.125000 ;
+      RECT  8.685000  0.425000  8.955000 0.545000 ;
+      RECT  8.685000  1.835000  8.955000 2.295000 ;
+      RECT  9.125000  0.595000  9.455000 0.725000 ;
+      RECT  9.125000  1.665000  9.455000 2.125000 ;
+      RECT  9.625000  0.425000  9.925000 1.075000 ;
+      RECT  9.625000  1.075000 16.865000 1.325000 ;
+      RECT  9.625000  1.325000  9.925000 2.295000 ;
+      RECT 10.145000  0.085000 10.415000 0.905000 ;
+      RECT 10.145000  1.495000 10.415000 2.635000 ;
+      RECT 11.085000  0.085000 11.355000 0.545000 ;
+      RECT 11.085000  1.835000 11.355000 2.635000 ;
+      RECT 12.025000  0.085000 12.295000 0.545000 ;
+      RECT 12.025000  1.835000 12.295000 2.635000 ;
+      RECT 12.965000  0.085000 13.235000 0.545000 ;
+      RECT 12.965000  1.835000 13.235000 2.635000 ;
+      RECT 13.905000  0.085000 14.175000 0.550000 ;
+      RECT 13.905000  1.835000 14.175000 2.635000 ;
+      RECT 14.845000  0.085000 15.115000 0.545000 ;
+      RECT 14.845000  1.835000 15.115000 2.635000 ;
+      RECT 15.785000  0.085000 16.055000 0.545000 ;
+      RECT 15.785000  1.835000 16.055000 2.635000 ;
+      RECT 16.725000  0.085000 16.995000 0.545000 ;
+      RECT 16.725000  1.835000 16.995000 2.635000 ;
+      RECT 17.665000  0.085000 17.935000 0.905000 ;
+      RECT 17.665000  1.495000 17.935000 2.635000 ;
     LAYER mcon ;
-      RECT 0.175000 0.425000 0.345000 0.595000 ;
-      RECT 0.645000 1.785000 0.815000 1.955000 ;
-      RECT 1.585000 1.785000 1.755000 1.955000 ;
-      RECT 3.045000 2.125000 3.215000 2.295000 ;
-      RECT 3.985000 2.125000 4.155000 2.295000 ;
-      RECT 5.865000 1.785000 6.035000 1.955000 ;
-      RECT 6.805000 1.785000 6.975000 1.955000 ;
-      RECT 8.265000 1.785000 8.435000 1.955000 ;
-      RECT 9.205000 1.785000 9.375000 1.955000 ;
-      RECT 9.675000 0.425000 9.845000 0.595000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.175000  0.425000  0.345000 0.595000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.645000  1.785000  0.815000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.585000  1.785000  1.755000 1.955000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.045000  2.125000  3.215000 2.295000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  3.985000  2.125000  4.155000 2.295000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  5.865000  1.785000  6.035000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  6.805000  1.785000  6.975000 1.955000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.265000  1.785000  8.435000 1.955000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.205000  1.785000  9.375000 1.955000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.675000  0.425000  9.845000 0.595000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
+      RECT 15.325000 -0.085000 15.495000 0.085000 ;
+      RECT 15.325000  2.635000 15.495000 2.805000 ;
+      RECT 15.785000 -0.085000 15.955000 0.085000 ;
+      RECT 15.785000  2.635000 15.955000 2.805000 ;
+      RECT 16.245000 -0.085000 16.415000 0.085000 ;
+      RECT 16.245000  2.635000 16.415000 2.805000 ;
+      RECT 16.705000 -0.085000 16.875000 0.085000 ;
+      RECT 16.705000  2.635000 16.875000 2.805000 ;
+      RECT 17.165000 -0.085000 17.335000 0.085000 ;
+      RECT 17.165000  2.635000 17.335000 2.805000 ;
+      RECT 17.625000 -0.085000 17.795000 0.085000 ;
+      RECT 17.625000  2.635000 17.795000 2.805000 ;
+      RECT 18.085000 -0.085000 18.255000 0.085000 ;
+      RECT 18.085000  2.635000 18.255000 2.805000 ;
     LAYER met1 ;
       RECT 0.115000 0.395000 0.405000 0.440000 ;
       RECT 0.115000 0.440000 9.905000 0.580000 ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
index 4a0718d..7270ebc 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_2.magic.lef
@@ -79,22 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.090000  0.085000 0.345000 0.885000 ;
-        RECT 0.985000  0.085000 1.365000 0.465000 ;
-        RECT 3.485000  0.085000 3.685000 0.585000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -103,43 +87,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.115000 2.175000 1.285000 2.635000 ;
-        RECT 3.460000 2.175000 3.680000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.970000 0.995000 1.265000 1.325000 ;
-      RECT 1.095000 0.635000 1.705000 0.805000 ;
-      RECT 1.095000 0.805000 1.265000 0.995000 ;
-      RECT 1.095000 1.325000 1.265000 1.835000 ;
-      RECT 1.095000 1.835000 1.625000 2.005000 ;
-      RECT 1.435000 0.995000 1.655000 1.495000 ;
-      RECT 1.435000 1.495000 1.965000 1.665000 ;
-      RECT 1.455000 2.005000 1.625000 2.255000 ;
-      RECT 1.455000 2.255000 2.860000 2.425000 ;
-      RECT 1.535000 0.265000 2.250000 0.595000 ;
-      RECT 1.535000 0.595000 1.705000 0.635000 ;
-      RECT 1.795000 1.665000 1.965000 1.835000 ;
-      RECT 1.795000 1.835000 4.235000 2.005000 ;
-      RECT 3.850000 2.005000 4.235000 2.465000 ;
-      RECT 3.985000 0.255000 4.235000 1.835000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  0.085000 0.345000 0.885000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.970000  0.995000 1.265000 1.325000 ;
+      RECT 0.985000  0.085000 1.365000 0.465000 ;
+      RECT 1.095000  0.635000 1.705000 0.805000 ;
+      RECT 1.095000  0.805000 1.265000 0.995000 ;
+      RECT 1.095000  1.325000 1.265000 1.835000 ;
+      RECT 1.095000  1.835000 1.625000 2.005000 ;
+      RECT 1.115000  2.175000 1.285000 2.635000 ;
+      RECT 1.435000  0.995000 1.655000 1.495000 ;
+      RECT 1.435000  1.495000 1.965000 1.665000 ;
+      RECT 1.455000  2.005000 1.625000 2.255000 ;
+      RECT 1.455000  2.255000 2.860000 2.425000 ;
+      RECT 1.535000  0.265000 2.250000 0.595000 ;
+      RECT 1.535000  0.595000 1.705000 0.635000 ;
+      RECT 1.795000  1.665000 1.965000 1.835000 ;
+      RECT 1.795000  1.835000 4.235000 2.005000 ;
+      RECT 3.460000  2.175000 3.680000 2.635000 ;
+      RECT 3.485000  0.085000 3.685000 0.585000 ;
+      RECT 3.850000  2.005000 4.235000 2.465000 ;
+      RECT 3.985000  0.255000 4.235000 1.835000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
index d33d37a..4c34b59 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_4.magic.lef
@@ -84,26 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.465000 ;
-        RECT 3.615000  0.085000 3.995000 0.465000 ;
-        RECT 4.555000  0.085000 4.935000 0.465000 ;
-        RECT 5.495000  0.085000 5.875000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -112,48 +92,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.515000 1.835000 0.870000 2.635000 ;
-        RECT 3.615000 2.255000 3.995000 2.635000 ;
-        RECT 4.555000 1.915000 4.935000 2.635000 ;
-        RECT 5.495000 1.915000 5.875000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.295000 0.345000 0.625000 ;
-      RECT 0.090000 0.625000 0.260000 1.495000 ;
-      RECT 0.090000 1.495000 1.180000 1.665000 ;
-      RECT 0.090000 1.665000 0.345000 2.465000 ;
-      RECT 0.960000 0.995000 1.180000 1.495000 ;
-      RECT 1.040000 1.935000 1.440000 2.275000 ;
-      RECT 1.040000 2.275000 2.970000 2.445000 ;
-      RECT 1.630000 1.935000 3.445000 2.105000 ;
-      RECT 2.075000 0.295000 3.430000 0.465000 ;
-      RECT 2.130000 1.595000 3.985000 1.765000 ;
-      RECT 3.260000 0.465000 3.430000 0.655000 ;
-      RECT 3.260000 0.655000 3.985000 0.825000 ;
-      RECT 3.275000 2.105000 3.445000 2.465000 ;
-      RECT 3.815000 0.825000 3.985000 1.075000 ;
-      RECT 3.815000 1.075000 5.430000 1.245000 ;
-      RECT 3.815000 1.245000 3.985000 1.595000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.090000  0.295000 0.345000 0.625000 ;
+      RECT 0.090000  0.625000 0.260000 1.495000 ;
+      RECT 0.090000  1.495000 1.180000 1.665000 ;
+      RECT 0.090000  1.665000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.895000 0.465000 ;
+      RECT 0.515000  1.835000 0.870000 2.635000 ;
+      RECT 0.960000  0.995000 1.180000 1.495000 ;
+      RECT 1.040000  1.935000 1.440000 2.275000 ;
+      RECT 1.040000  2.275000 2.970000 2.445000 ;
+      RECT 1.630000  1.935000 3.445000 2.105000 ;
+      RECT 2.075000  0.295000 3.430000 0.465000 ;
+      RECT 2.130000  1.595000 3.985000 1.765000 ;
+      RECT 3.260000  0.465000 3.430000 0.655000 ;
+      RECT 3.260000  0.655000 3.985000 0.825000 ;
+      RECT 3.275000  2.105000 3.445000 2.465000 ;
+      RECT 3.615000  0.085000 3.995000 0.465000 ;
+      RECT 3.615000  2.255000 3.995000 2.635000 ;
+      RECT 3.815000  0.825000 3.985000 1.075000 ;
+      RECT 3.815000  1.075000 5.430000 1.245000 ;
+      RECT 3.815000  1.245000 3.985000 1.595000 ;
+      RECT 4.555000  0.085000 4.935000 0.465000 ;
+      RECT 4.555000  1.915000 4.935000 2.635000 ;
+      RECT 5.495000  0.085000 5.875000 0.465000 ;
+      RECT 5.495000  1.915000 5.875000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
index d6b28c2..1da6c1c 100644
--- a/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
+++ b/cells/mux2/sky130_fd_sc_hdll__mux2_8.magic.lef
@@ -53,14 +53,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 4.690000 1.105000 4.925000 1.275000 ;
-        RECT 4.705000 0.995000 4.925000 1.105000 ;
-        RECT 4.705000 1.275000 4.925000 1.325000 ;
-        RECT 8.885000 0.995000 9.170000 1.325000 ;
-      LAYER mcon ;
-        RECT 4.690000 1.105000 4.860000 1.275000 ;
-        RECT 8.885000 1.105000 9.055000 1.275000 ;
       LAYER met1 ;
         RECT 4.620000 1.075000 4.960000 1.120000 ;
         RECT 4.620000 1.120000 9.115000 1.260000 ;
@@ -74,14 +66,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 4.145000 0.995000  4.365000 1.495000 ;
-        RECT 4.145000 1.495000  6.585000 1.665000 ;
-        RECT 6.170000 0.995000  6.585000 1.495000 ;
-        RECT 9.805000 0.995000 10.235000 1.615000 ;
-      LAYER mcon ;
-        RECT 6.170000 1.445000 6.340000 1.615000 ;
-        RECT 9.805000 1.445000 9.975000 1.615000 ;
       LAYER met1 ;
         RECT 6.110000 1.415000  6.400000 1.460000 ;
         RECT 6.110000 1.460000 10.035000 1.600000 ;
@@ -113,39 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.580000 0.085000 ;
-        RECT 0.090000  0.085000  0.425000 0.465000 ;
-        RECT 0.985000  0.085000  1.365000 0.465000 ;
-        RECT 1.925000  0.085000  2.305000 0.465000 ;
-        RECT 2.865000  0.085000  3.245000 0.465000 ;
-        RECT 3.805000  0.085000  4.185000 0.465000 ;
-        RECT 6.660000  0.085000  6.990000 0.465000 ;
-        RECT 9.665000  0.085000 10.045000 0.465000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
@@ -154,69 +105,110 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.580000 2.805000 ;
-        RECT 0.090000 1.915000  0.425000 2.635000 ;
-        RECT 0.985000 1.915000  1.365000 2.635000 ;
-        RECT 1.925000 1.915000  2.305000 2.635000 ;
-        RECT 2.865000 1.915000  3.245000 2.635000 ;
-        RECT 3.805000 2.255000  4.185000 2.635000 ;
-        RECT 6.675000 2.175000  6.845000 2.635000 ;
-        RECT 9.665000 2.255000 10.045000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  1.085000 1.075000  3.975000 1.245000 ;
-      RECT  3.805000 0.635000  5.340000 0.805000 ;
-      RECT  3.805000 0.805000  3.975000 1.075000 ;
-      RECT  3.805000 1.245000  3.975000 1.835000 ;
-      RECT  3.805000 1.835000  8.975000 2.005000 ;
-      RECT  4.355000 0.295000  5.525000 0.465000 ;
-      RECT  4.630000 2.255000  6.405000 2.425000 ;
-      RECT  5.170000 0.805000  5.340000 0.935000 ;
-      RECT  6.895000 0.995000  7.115000 1.495000 ;
-      RECT  6.895000 1.495000  9.635000 1.665000 ;
-      RECT  7.030000 2.255000  9.445000 2.425000 ;
-      RECT  7.175000 0.295000  8.565000 0.465000 ;
-      RECT  7.715000 0.635000  8.370000 0.805000 ;
-      RECT  8.150000 0.805000  8.370000 0.935000 ;
-      RECT  9.415000 0.645000 10.385000 0.815000 ;
-      RECT  9.415000 0.815000  9.635000 1.495000 ;
-      RECT  9.415000 1.665000  9.635000 1.915000 ;
-      RECT  9.415000 1.915000 10.385000 2.085000 ;
-      RECT 10.215000 0.295000 10.385000 0.645000 ;
-      RECT 10.215000 1.795000 10.385000 1.915000 ;
-      RECT 10.215000 2.085000 10.385000 2.465000 ;
+      RECT  0.000000 -0.085000 10.580000 0.085000 ;
+      RECT  0.000000  2.635000 10.580000 2.805000 ;
+      RECT  0.090000  0.085000  0.425000 0.465000 ;
+      RECT  0.090000  1.915000  0.425000 2.635000 ;
+      RECT  0.985000  0.085000  1.365000 0.465000 ;
+      RECT  0.985000  1.915000  1.365000 2.635000 ;
+      RECT  1.085000  1.075000  3.975000 1.245000 ;
+      RECT  1.925000  0.085000  2.305000 0.465000 ;
+      RECT  1.925000  1.915000  2.305000 2.635000 ;
+      RECT  2.865000  0.085000  3.245000 0.465000 ;
+      RECT  2.865000  1.915000  3.245000 2.635000 ;
+      RECT  3.805000  0.085000  4.185000 0.465000 ;
+      RECT  3.805000  0.635000  5.340000 0.805000 ;
+      RECT  3.805000  0.805000  3.975000 1.075000 ;
+      RECT  3.805000  1.245000  3.975000 1.835000 ;
+      RECT  3.805000  1.835000  8.975000 2.005000 ;
+      RECT  3.805000  2.255000  4.185000 2.635000 ;
+      RECT  4.145000  0.995000  4.365000 1.495000 ;
+      RECT  4.145000  1.495000  6.585000 1.665000 ;
+      RECT  4.355000  0.295000  5.525000 0.465000 ;
+      RECT  4.630000  2.255000  6.405000 2.425000 ;
+      RECT  4.690000  1.105000  4.925000 1.275000 ;
+      RECT  4.705000  0.995000  4.925000 1.105000 ;
+      RECT  4.705000  1.275000  4.925000 1.325000 ;
+      RECT  5.170000  0.805000  5.340000 0.935000 ;
+      RECT  6.170000  0.995000  6.585000 1.495000 ;
+      RECT  6.660000  0.085000  6.990000 0.465000 ;
+      RECT  6.675000  2.175000  6.845000 2.635000 ;
+      RECT  6.895000  0.995000  7.115000 1.495000 ;
+      RECT  6.895000  1.495000  9.635000 1.665000 ;
+      RECT  7.030000  2.255000  9.445000 2.425000 ;
+      RECT  7.175000  0.295000  8.565000 0.465000 ;
+      RECT  7.715000  0.635000  8.370000 0.805000 ;
+      RECT  8.150000  0.805000  8.370000 0.935000 ;
+      RECT  8.885000  0.995000  9.170000 1.325000 ;
+      RECT  9.415000  0.645000 10.385000 0.815000 ;
+      RECT  9.415000  0.815000  9.635000 1.495000 ;
+      RECT  9.415000  1.665000  9.635000 1.915000 ;
+      RECT  9.415000  1.915000 10.385000 2.085000 ;
+      RECT  9.665000  0.085000 10.045000 0.465000 ;
+      RECT  9.665000  2.255000 10.045000 2.635000 ;
+      RECT  9.805000  0.995000 10.235000 1.615000 ;
+      RECT 10.215000  0.295000 10.385000 0.645000 ;
+      RECT 10.215000  1.795000 10.385000 1.915000 ;
+      RECT 10.215000  2.085000 10.385000 2.465000 ;
     LAYER mcon ;
-      RECT 5.170000 0.765000 5.340000 0.935000 ;
-      RECT 8.150000 0.765000 8.320000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.690000  1.105000  4.860000 1.275000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.170000  0.765000  5.340000 0.935000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.170000  1.445000  6.340000 1.615000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.150000  0.765000  8.320000 0.935000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  1.105000  9.055000 1.275000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  1.445000  9.975000 1.615000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
     LAYER met1 ;
       RECT 5.110000 0.735000 5.400000 0.780000 ;
       RECT 5.110000 0.780000 8.430000 0.920000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
index 4b48071..4e8454a 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_1.magic.lef
@@ -76,20 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 2.025000  0.085000 2.195000 0.525000 ;
-        RECT 3.515000  0.085000 3.735000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -98,42 +84,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 1.895000 1.835000 2.175000 2.635000 ;
-        RECT 3.475000 1.835000 3.770000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 1.855000 0.425000 ;
-      RECT 0.085000 0.425000 0.440000 0.465000 ;
-      RECT 0.085000 0.465000 0.345000 0.885000 ;
-      RECT 0.120000 1.455000 0.420000 2.295000 ;
-      RECT 0.120000 2.295000 1.725000 2.465000 ;
-      RECT 1.005000 0.655000 1.750000 0.715000 ;
-      RECT 1.005000 0.715000 2.700000 0.825000 ;
-      RECT 1.065000 0.425000 1.855000 0.465000 ;
-      RECT 1.485000 1.075000 3.195000 1.310000 ;
-      RECT 1.505000 1.480000 2.745000 1.650000 ;
-      RECT 1.505000 1.650000 1.725000 2.295000 ;
-      RECT 1.575000 0.825000 2.700000 0.885000 ;
-      RECT 2.365000 1.650000 2.745000 2.465000 ;
-      RECT 2.465000 0.255000 2.700000 0.715000 ;
-      RECT 2.930000 0.255000 3.195000 1.075000 ;
-      RECT 2.970000 1.310000 3.195000 2.465000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.255000 1.855000 0.425000 ;
+      RECT 0.085000  0.425000 0.440000 0.465000 ;
+      RECT 0.085000  0.465000 0.345000 0.885000 ;
+      RECT 0.120000  1.455000 0.420000 2.295000 ;
+      RECT 0.120000  2.295000 1.725000 2.465000 ;
+      RECT 1.005000  0.655000 1.750000 0.715000 ;
+      RECT 1.005000  0.715000 2.700000 0.825000 ;
+      RECT 1.065000  0.425000 1.855000 0.465000 ;
+      RECT 1.485000  1.075000 3.195000 1.310000 ;
+      RECT 1.505000  1.480000 2.745000 1.650000 ;
+      RECT 1.505000  1.650000 1.725000 2.295000 ;
+      RECT 1.575000  0.825000 2.700000 0.885000 ;
+      RECT 1.895000  1.835000 2.175000 2.635000 ;
+      RECT 2.025000  0.085000 2.195000 0.525000 ;
+      RECT 2.365000  1.650000 2.745000 2.465000 ;
+      RECT 2.465000  0.255000 2.700000 0.715000 ;
+      RECT 2.930000  0.255000 3.195000 1.075000 ;
+      RECT 2.970000  1.310000 3.195000 2.465000 ;
+      RECT 3.475000  1.835000 3.770000 2.635000 ;
+      RECT 3.515000  0.085000 3.735000 0.545000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
index 409b405..a10b884 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_2.magic.lef
@@ -78,24 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.515000  0.085000 0.885000 0.545000 ;
-        RECT 1.585000  0.085000 1.835000 0.885000 ;
-        RECT 2.525000  0.085000 2.695000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -104,56 +86,70 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.515000 2.255000 0.895000 2.635000 ;
-        RECT 1.455000 2.255000 1.835000 2.635000 ;
-        RECT 2.525000 2.175000 2.775000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.345000 0.345000 0.675000 ;
-      RECT 0.085000 0.675000 0.260000 1.495000 ;
-      RECT 0.085000 1.495000 1.545000 1.665000 ;
-      RECT 0.085000 1.665000 0.260000 2.135000 ;
-      RECT 0.085000 2.135000 0.345000 2.465000 ;
-      RECT 0.985000 1.835000 1.885000 2.005000 ;
-      RECT 1.115000 0.575000 1.355000 0.935000 ;
-      RECT 1.325000 1.155000 2.185000 1.325000 ;
-      RECT 1.325000 1.325000 1.545000 1.495000 ;
-      RECT 1.715000 1.495000 3.765000 1.665000 ;
-      RECT 1.715000 1.665000 1.885000 1.835000 ;
-      RECT 1.805000 1.075000 2.185000 1.155000 ;
-      RECT 2.055000 0.295000 2.225000 0.735000 ;
-      RECT 2.055000 0.735000 3.765000 0.905000 ;
-      RECT 2.055000 2.135000 2.280000 2.465000 ;
-      RECT 2.110000 1.835000 3.135000 1.915000 ;
-      RECT 2.110000 1.915000 4.750000 2.005000 ;
-      RECT 2.110000 2.005000 2.280000 2.135000 ;
-      RECT 2.965000 2.005000 4.750000 2.085000 ;
-      RECT 3.385000 0.655000 3.765000 0.735000 ;
-      RECT 3.385000 1.665000 3.765000 1.715000 ;
-      RECT 4.200000 0.655000 4.745000 0.825000 ;
-      RECT 4.200000 0.825000 4.505000 0.935000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.085000  0.345000 0.345000 0.675000 ;
+      RECT 0.085000  0.675000 0.260000 1.495000 ;
+      RECT 0.085000  1.495000 1.545000 1.665000 ;
+      RECT 0.085000  1.665000 0.260000 2.135000 ;
+      RECT 0.085000  2.135000 0.345000 2.465000 ;
+      RECT 0.515000  0.085000 0.885000 0.545000 ;
+      RECT 0.515000  2.255000 0.895000 2.635000 ;
+      RECT 0.985000  1.835000 1.885000 2.005000 ;
+      RECT 1.115000  0.575000 1.355000 0.935000 ;
+      RECT 1.325000  1.155000 2.185000 1.325000 ;
+      RECT 1.325000  1.325000 1.545000 1.495000 ;
+      RECT 1.455000  2.255000 1.835000 2.635000 ;
+      RECT 1.585000  0.085000 1.835000 0.885000 ;
+      RECT 1.715000  1.495000 3.765000 1.665000 ;
+      RECT 1.715000  1.665000 1.885000 1.835000 ;
+      RECT 1.805000  1.075000 2.185000 1.155000 ;
+      RECT 2.055000  0.295000 2.225000 0.735000 ;
+      RECT 2.055000  0.735000 3.765000 0.905000 ;
+      RECT 2.055000  2.135000 2.280000 2.465000 ;
+      RECT 2.110000  1.835000 3.135000 1.915000 ;
+      RECT 2.110000  1.915000 4.750000 2.005000 ;
+      RECT 2.110000  2.005000 2.280000 2.135000 ;
+      RECT 2.525000  0.085000 2.695000 0.545000 ;
+      RECT 2.525000  2.175000 2.775000 2.635000 ;
+      RECT 2.965000  2.005000 4.750000 2.085000 ;
+      RECT 3.385000  0.655000 3.765000 0.735000 ;
+      RECT 3.385000  1.665000 3.765000 1.715000 ;
+      RECT 4.200000  0.655000 4.745000 0.825000 ;
+      RECT 4.200000  0.825000 4.505000 0.935000 ;
     LAYER mcon ;
-      RECT 1.170000 0.765000 1.340000 0.935000 ;
-      RECT 4.200000 0.765000 4.370000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.170000  0.765000 1.340000 0.935000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.200000  0.765000 4.370000 0.935000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
     LAYER met1 ;
       RECT 1.110000 0.735000 1.400000 0.780000 ;
       RECT 1.110000 0.780000 4.480000 0.920000 ;
diff --git a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
index 3fa2cf1..7e57db1 100644
--- a/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
+++ b/cells/mux2i/sky130_fd_sc_hdll__mux2i_4.magic.lef
@@ -79,34 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 4.375000  0.085000 4.705000 0.465000 ;
-        RECT 5.265000  0.085000 5.645000 0.465000 ;
-        RECT 6.205000  0.085000 6.580000 0.590000 ;
-        RECT 7.245000  0.085000 7.495000 0.545000 ;
-        RECT 8.235000  0.085000 8.565000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -115,64 +87,88 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 4.375000 2.255000 4.705000 2.635000 ;
-        RECT 5.265000 2.255000 5.645000 2.635000 ;
-        RECT 6.205000 2.255000 6.585000 2.635000 ;
-        RECT 7.145000 2.255000 7.525000 2.635000 ;
-        RECT 8.235000 2.255000 8.565000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.655000 1.850000 0.825000 ;
-      RECT 0.515000 1.575000 6.130000 1.745000 ;
-      RECT 1.455000 0.825000 1.850000 0.935000 ;
-      RECT 2.395000 0.655000 6.035000 0.825000 ;
-      RECT 2.395000 1.915000 7.915000 2.085000 ;
-      RECT 4.925000 0.255000 5.095000 0.655000 ;
-      RECT 5.865000 0.255000 6.035000 0.655000 ;
-      RECT 6.800000 0.255000 6.975000 0.715000 ;
-      RECT 6.800000 0.715000 7.915000 0.905000 ;
-      RECT 6.800000 0.905000 7.100000 0.935000 ;
-      RECT 6.805000 1.795000 6.975000 1.915000 ;
-      RECT 6.805000 2.085000 6.975000 2.465000 ;
-      RECT 7.430000 1.075000 8.310000 1.245000 ;
-      RECT 7.745000 0.510000 7.915000 0.715000 ;
-      RECT 7.745000 1.795000 7.915000 1.915000 ;
-      RECT 7.745000 2.085000 7.915000 2.465000 ;
-      RECT 8.090000 0.655000 9.045000 0.825000 ;
-      RECT 8.090000 0.825000 8.310000 1.075000 ;
-      RECT 8.785000 0.255000 9.045000 0.655000 ;
-      RECT 8.785000 1.795000 9.045000 2.465000 ;
-      RECT 8.870000 0.825000 9.045000 1.795000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.515000  0.655000 1.850000 0.825000 ;
+      RECT 0.515000  1.575000 6.130000 1.745000 ;
+      RECT 1.455000  0.825000 1.850000 0.935000 ;
+      RECT 2.395000  0.655000 6.035000 0.825000 ;
+      RECT 2.395000  1.915000 7.915000 2.085000 ;
+      RECT 4.375000  0.085000 4.705000 0.465000 ;
+      RECT 4.375000  2.255000 4.705000 2.635000 ;
+      RECT 4.925000  0.255000 5.095000 0.655000 ;
+      RECT 5.265000  0.085000 5.645000 0.465000 ;
+      RECT 5.265000  2.255000 5.645000 2.635000 ;
+      RECT 5.865000  0.255000 6.035000 0.655000 ;
+      RECT 6.205000  0.085000 6.580000 0.590000 ;
+      RECT 6.205000  2.255000 6.585000 2.635000 ;
+      RECT 6.800000  0.255000 6.975000 0.715000 ;
+      RECT 6.800000  0.715000 7.915000 0.905000 ;
+      RECT 6.800000  0.905000 7.100000 0.935000 ;
+      RECT 6.805000  1.795000 6.975000 1.915000 ;
+      RECT 6.805000  2.085000 6.975000 2.465000 ;
+      RECT 7.145000  2.255000 7.525000 2.635000 ;
+      RECT 7.245000  0.085000 7.495000 0.545000 ;
+      RECT 7.430000  1.075000 8.310000 1.245000 ;
+      RECT 7.745000  0.510000 7.915000 0.715000 ;
+      RECT 7.745000  1.795000 7.915000 1.915000 ;
+      RECT 7.745000  2.085000 7.915000 2.465000 ;
+      RECT 8.090000  0.655000 9.045000 0.825000 ;
+      RECT 8.090000  0.825000 8.310000 1.075000 ;
+      RECT 8.235000  0.085000 8.565000 0.465000 ;
+      RECT 8.235000  2.255000 8.565000 2.635000 ;
+      RECT 8.785000  0.255000 9.045000 0.655000 ;
+      RECT 8.785000  1.795000 9.045000 2.465000 ;
+      RECT 8.870000  0.825000 9.045000 1.795000 ;
     LAYER mcon ;
-      RECT 1.680000 0.765000 1.850000 0.935000 ;
-      RECT 6.800000 0.765000 6.970000 0.935000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.680000  0.765000 1.850000 0.935000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 6.800000  0.765000 6.970000 0.935000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
     LAYER met1 ;
       RECT 1.620000 0.735000 1.910000 0.780000 ;
       RECT 1.620000 0.780000 7.030000 0.920000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
index 349e527..4cd9834 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_1.magic.lef
@@ -360,71 +360,25 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT  0.900000 0.835000  1.290000 1.005000 ;
-        RECT  0.900000 1.005000  1.070000 1.755000 ;
-        RECT  0.900000 1.755000  1.295000 1.805000 ;
-        RECT  0.900000 1.805000  1.420000 1.985000 ;
-        RECT  0.900000 3.455000  1.420000 3.635000 ;
-        RECT  0.900000 3.635000  1.295000 3.685000 ;
-        RECT  0.900000 3.685000  1.070000 4.435000 ;
-        RECT  0.900000 4.435000  1.290000 4.605000 ;
-        RECT  1.045000 0.330000  1.290000 0.835000 ;
-        RECT  1.045000 4.605000  1.290000 5.110000 ;
-        RECT  1.090000 1.985000  1.420000 2.465000 ;
-        RECT  1.090000 2.465000  1.295000 2.975000 ;
-        RECT  1.090000 2.975000  1.420000 3.455000 ;
-        RECT  3.180000 1.805000  3.700000 1.985000 ;
-        RECT  3.180000 1.985000  3.510000 2.465000 ;
-        RECT  3.180000 2.975000  3.510000 3.455000 ;
-        RECT  3.180000 3.455000  3.700000 3.635000 ;
-        RECT  3.305000 1.755000  3.700000 1.805000 ;
-        RECT  3.305000 2.465000  3.510000 2.975000 ;
-        RECT  3.305000 3.635000  3.700000 3.685000 ;
-        RECT  3.310000 0.330000  3.555000 0.835000 ;
-        RECT  3.310000 0.835000  3.700000 1.005000 ;
-        RECT  3.310000 4.435000  3.700000 4.605000 ;
-        RECT  3.310000 4.605000  3.555000 5.110000 ;
-        RECT  3.530000 1.005000  3.700000 1.755000 ;
-        RECT  3.530000 3.685000  3.700000 4.435000 ;
-        RECT  5.040000 0.835000  5.430000 1.005000 ;
-        RECT  5.040000 1.005000  5.210000 1.755000 ;
-        RECT  5.040000 1.755000  5.435000 1.805000 ;
-        RECT  5.040000 1.805000  5.560000 1.985000 ;
-        RECT  5.040000 3.455000  5.560000 3.635000 ;
-        RECT  5.040000 3.635000  5.435000 3.685000 ;
-        RECT  5.040000 3.685000  5.210000 4.435000 ;
-        RECT  5.040000 4.435000  5.430000 4.605000 ;
-        RECT  5.185000 0.330000  5.430000 0.835000 ;
-        RECT  5.185000 4.605000  5.430000 5.110000 ;
-        RECT  5.230000 1.985000  5.560000 2.465000 ;
-        RECT  5.230000 2.465000  5.435000 2.975000 ;
-        RECT  5.230000 2.975000  5.560000 3.455000 ;
-        RECT  7.320000 1.805000  7.840000 1.985000 ;
-        RECT  7.320000 1.985000  7.650000 2.465000 ;
-        RECT  7.320000 2.975000  7.650000 3.455000 ;
-        RECT  7.320000 3.455000  7.840000 3.635000 ;
-        RECT  7.445000 1.755000  7.840000 1.805000 ;
-        RECT  7.445000 2.465000  7.650000 2.975000 ;
-        RECT  7.445000 3.635000  7.840000 3.685000 ;
-        RECT  7.450000 0.330000  7.695000 0.835000 ;
-        RECT  7.450000 0.835000  7.840000 1.005000 ;
-        RECT  7.450000 4.435000  7.840000 4.605000 ;
-        RECT  7.450000 4.605000  7.695000 5.110000 ;
-        RECT  7.670000 1.005000  7.840000 1.755000 ;
-        RECT  7.670000 3.685000  7.840000 4.435000 ;
-        RECT  9.180000 0.835000  9.570000 1.005000 ;
-        RECT  9.180000 1.005000  9.350000 1.755000 ;
-        RECT  9.180000 1.755000  9.575000 1.805000 ;
-        RECT  9.180000 1.805000  9.700000 1.985000 ;
-        RECT  9.180000 3.455000  9.700000 3.635000 ;
-        RECT  9.180000 3.635000  9.575000 3.685000 ;
-        RECT  9.180000 3.685000  9.350000 4.435000 ;
-        RECT  9.180000 4.435000  9.570000 4.605000 ;
-        RECT  9.325000 0.330000  9.570000 0.835000 ;
-        RECT  9.325000 4.605000  9.570000 5.110000 ;
-        RECT  9.370000 1.985000  9.700000 2.465000 ;
-        RECT  9.370000 2.465000  9.575000 2.975000 ;
-        RECT  9.370000 2.975000  9.700000 3.455000 ;
+        RECT 0.900000 0.835000 1.290000 1.005000 ;
+        RECT 0.900000 1.005000 1.070000 1.755000 ;
+        RECT 0.900000 1.755000 1.295000 1.805000 ;
+        RECT 0.900000 1.805000 1.420000 1.985000 ;
+        RECT 0.900000 3.455000 1.420000 3.635000 ;
+        RECT 0.900000 3.635000 1.295000 3.685000 ;
+        RECT 0.900000 3.685000 1.070000 4.435000 ;
+        RECT 0.900000 4.435000 1.290000 4.605000 ;
+        RECT 1.045000 0.330000 1.290000 0.835000 ;
+        RECT 1.045000 4.605000 1.290000 5.110000 ;
+        RECT 1.090000 1.985000 1.420000 2.465000 ;
+        RECT 1.090000 2.465000 1.295000 2.975000 ;
+        RECT 1.090000 2.975000 1.420000 3.455000 ;
+      LAYER mcon ;
+        RECT 1.065000 1.785000 1.235000 1.955000 ;
+        RECT 1.065000 3.485000 1.235000 3.655000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 11.460000 1.805000 11.980000 1.985000 ;
         RECT 11.460000 1.985000 11.790000 2.465000 ;
         RECT 11.460000 2.975000 11.790000 3.455000 ;
@@ -438,6 +392,12 @@
         RECT 11.590000 4.605000 11.835000 5.110000 ;
         RECT 11.810000 1.005000 11.980000 1.755000 ;
         RECT 11.810000 3.685000 11.980000 4.435000 ;
+      LAYER mcon ;
+        RECT 11.645000 1.785000 11.815000 1.955000 ;
+        RECT 11.645000 3.485000 11.815000 3.655000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 13.320000 0.835000 13.710000 1.005000 ;
         RECT 13.320000 1.005000 13.490000 1.755000 ;
         RECT 13.320000 1.755000 13.715000 1.805000 ;
@@ -451,6 +411,12 @@
         RECT 13.510000 1.985000 13.840000 2.465000 ;
         RECT 13.510000 2.465000 13.715000 2.975000 ;
         RECT 13.510000 2.975000 13.840000 3.455000 ;
+      LAYER mcon ;
+        RECT 13.485000 1.785000 13.655000 1.955000 ;
+        RECT 13.485000 3.485000 13.655000 3.655000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 15.600000 1.805000 16.120000 1.985000 ;
         RECT 15.600000 1.985000 15.930000 2.465000 ;
         RECT 15.600000 2.975000 15.930000 3.455000 ;
@@ -465,22 +431,86 @@
         RECT 15.950000 1.005000 16.120000 1.755000 ;
         RECT 15.950000 3.685000 16.120000 4.435000 ;
       LAYER mcon ;
-        RECT  1.065000 1.785000  1.235000 1.955000 ;
-        RECT  1.065000 3.485000  1.235000 3.655000 ;
-        RECT  3.365000 1.785000  3.535000 1.955000 ;
-        RECT  3.365000 3.485000  3.535000 3.655000 ;
-        RECT  5.205000 1.785000  5.375000 1.955000 ;
-        RECT  5.205000 3.485000  5.375000 3.655000 ;
-        RECT  7.505000 1.785000  7.675000 1.955000 ;
-        RECT  7.505000 3.485000  7.675000 3.655000 ;
-        RECT  9.345000 1.785000  9.515000 1.955000 ;
-        RECT  9.345000 3.485000  9.515000 3.655000 ;
-        RECT 11.645000 1.785000 11.815000 1.955000 ;
-        RECT 11.645000 3.485000 11.815000 3.655000 ;
-        RECT 13.485000 1.785000 13.655000 1.955000 ;
-        RECT 13.485000 3.485000 13.655000 3.655000 ;
         RECT 15.785000 1.785000 15.955000 1.955000 ;
         RECT 15.785000 3.485000 15.955000 3.655000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.180000 1.805000 3.700000 1.985000 ;
+        RECT 3.180000 1.985000 3.510000 2.465000 ;
+        RECT 3.180000 2.975000 3.510000 3.455000 ;
+        RECT 3.180000 3.455000 3.700000 3.635000 ;
+        RECT 3.305000 1.755000 3.700000 1.805000 ;
+        RECT 3.305000 2.465000 3.510000 2.975000 ;
+        RECT 3.305000 3.635000 3.700000 3.685000 ;
+        RECT 3.310000 0.330000 3.555000 0.835000 ;
+        RECT 3.310000 0.835000 3.700000 1.005000 ;
+        RECT 3.310000 4.435000 3.700000 4.605000 ;
+        RECT 3.310000 4.605000 3.555000 5.110000 ;
+        RECT 3.530000 1.005000 3.700000 1.755000 ;
+        RECT 3.530000 3.685000 3.700000 4.435000 ;
+      LAYER mcon ;
+        RECT 3.365000 1.785000 3.535000 1.955000 ;
+        RECT 3.365000 3.485000 3.535000 3.655000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.040000 0.835000 5.430000 1.005000 ;
+        RECT 5.040000 1.005000 5.210000 1.755000 ;
+        RECT 5.040000 1.755000 5.435000 1.805000 ;
+        RECT 5.040000 1.805000 5.560000 1.985000 ;
+        RECT 5.040000 3.455000 5.560000 3.635000 ;
+        RECT 5.040000 3.635000 5.435000 3.685000 ;
+        RECT 5.040000 3.685000 5.210000 4.435000 ;
+        RECT 5.040000 4.435000 5.430000 4.605000 ;
+        RECT 5.185000 0.330000 5.430000 0.835000 ;
+        RECT 5.185000 4.605000 5.430000 5.110000 ;
+        RECT 5.230000 1.985000 5.560000 2.465000 ;
+        RECT 5.230000 2.465000 5.435000 2.975000 ;
+        RECT 5.230000 2.975000 5.560000 3.455000 ;
+      LAYER mcon ;
+        RECT 5.205000 1.785000 5.375000 1.955000 ;
+        RECT 5.205000 3.485000 5.375000 3.655000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.320000 1.805000 7.840000 1.985000 ;
+        RECT 7.320000 1.985000 7.650000 2.465000 ;
+        RECT 7.320000 2.975000 7.650000 3.455000 ;
+        RECT 7.320000 3.455000 7.840000 3.635000 ;
+        RECT 7.445000 1.755000 7.840000 1.805000 ;
+        RECT 7.445000 2.465000 7.650000 2.975000 ;
+        RECT 7.445000 3.635000 7.840000 3.685000 ;
+        RECT 7.450000 0.330000 7.695000 0.835000 ;
+        RECT 7.450000 0.835000 7.840000 1.005000 ;
+        RECT 7.450000 4.435000 7.840000 4.605000 ;
+        RECT 7.450000 4.605000 7.695000 5.110000 ;
+        RECT 7.670000 1.005000 7.840000 1.755000 ;
+        RECT 7.670000 3.685000 7.840000 4.435000 ;
+      LAYER mcon ;
+        RECT 7.505000 1.785000 7.675000 1.955000 ;
+        RECT 7.505000 3.485000 7.675000 3.655000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 9.180000 0.835000 9.570000 1.005000 ;
+        RECT 9.180000 1.005000 9.350000 1.755000 ;
+        RECT 9.180000 1.755000 9.575000 1.805000 ;
+        RECT 9.180000 1.805000 9.700000 1.985000 ;
+        RECT 9.180000 3.455000 9.700000 3.635000 ;
+        RECT 9.180000 3.635000 9.575000 3.685000 ;
+        RECT 9.180000 3.685000 9.350000 4.435000 ;
+        RECT 9.180000 4.435000 9.570000 4.605000 ;
+        RECT 9.325000 0.330000 9.570000 0.835000 ;
+        RECT 9.325000 4.605000 9.570000 5.110000 ;
+        RECT 9.370000 1.985000 9.700000 2.465000 ;
+        RECT 9.370000 2.465000 9.575000 2.975000 ;
+        RECT 9.370000 2.975000 9.700000 3.455000 ;
+      LAYER mcon ;
+        RECT 9.345000 1.785000 9.515000 1.955000 ;
+        RECT 9.345000 3.485000 9.515000 3.655000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT  1.005000 1.755000  1.295000 1.800000 ;
         RECT  1.005000 1.800000 16.015000 1.940000 ;
@@ -571,8 +601,6 @@
         RECT 15.785000 -0.085000 15.955000 0.085000 ;
         RECT 16.245000 -0.085000 16.415000 0.085000 ;
         RECT 16.705000 -0.085000 16.875000 0.085000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 17.020000 0.240000 ;
     END
     PORT
       LAYER li1 ;
@@ -624,6 +652,12 @@
         RECT 15.785000 5.355000 15.955000 5.525000 ;
         RECT 16.245000 5.355000 16.415000 5.525000 ;
         RECT 16.705000 5.355000 16.875000 5.525000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 17.020000 0.240000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 5.200000 17.020000 5.680000 ;
     END
@@ -633,63 +667,53 @@
     USE POWER ;
     PORT
       LAYER li1 ;
-        RECT  0.000000 2.635000  0.920000 2.805000 ;
-        RECT  0.095000 1.495000  0.425000 2.635000 ;
-        RECT  0.095000 2.805000  0.425000 3.945000 ;
-        RECT  1.465000 2.635000  3.135000 2.805000 ;
-        RECT  2.135000 1.465000  2.465000 2.635000 ;
-        RECT  2.135000 2.805000  2.465000 3.975000 ;
-        RECT  3.680000 2.635000  5.060000 2.805000 ;
-        RECT  4.175000 1.495000  4.565000 2.635000 ;
-        RECT  4.175000 2.805000  4.565000 3.945000 ;
-        RECT  5.605000 2.635000  7.275000 2.805000 ;
-        RECT  6.275000 1.465000  6.605000 2.635000 ;
-        RECT  6.275000 2.805000  6.605000 3.975000 ;
-        RECT  7.820000 2.635000  9.200000 2.805000 ;
-        RECT  8.315000 1.495000  8.705000 2.635000 ;
-        RECT  8.315000 2.805000  8.705000 3.945000 ;
-        RECT  9.745000 2.635000 11.415000 2.805000 ;
-        RECT 10.415000 1.465000 10.745000 2.635000 ;
-        RECT 10.415000 2.805000 10.745000 3.975000 ;
+        RECT 0.000000 2.635000 0.920000 2.805000 ;
+        RECT 0.095000 1.495000 0.425000 2.635000 ;
+        RECT 0.095000 2.805000 0.425000 3.945000 ;
+      LAYER mcon ;
+        RECT 0.145000 2.635000 0.315000 2.805000 ;
+        RECT 0.605000 2.635000 0.775000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 11.960000 2.635000 13.340000 2.805000 ;
         RECT 12.455000 1.495000 12.845000 2.635000 ;
         RECT 12.455000 2.805000 12.845000 3.945000 ;
-        RECT 13.885000 2.635000 15.555000 2.805000 ;
-        RECT 14.555000 1.465000 14.885000 2.635000 ;
-        RECT 14.555000 2.805000 14.885000 3.975000 ;
+      LAYER mcon ;
+        RECT 12.105000 2.635000 12.275000 2.805000 ;
+        RECT 12.565000 2.635000 12.735000 2.805000 ;
+        RECT 13.025000 2.635000 13.195000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 16.100000 2.635000 17.020000 2.805000 ;
         RECT 16.595000 1.495000 16.925000 2.635000 ;
         RECT 16.595000 2.805000 16.925000 3.945000 ;
       LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
         RECT 16.245000 2.635000 16.415000 2.805000 ;
         RECT 16.705000 2.635000 16.875000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.680000 2.635000 5.060000 2.805000 ;
+        RECT 4.175000 1.495000 4.565000 2.635000 ;
+        RECT 4.175000 2.805000 4.565000 3.945000 ;
+      LAYER mcon ;
+        RECT 3.825000 2.635000 3.995000 2.805000 ;
+        RECT 4.285000 2.635000 4.455000 2.805000 ;
+        RECT 4.745000 2.635000 4.915000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.820000 2.635000 9.200000 2.805000 ;
+        RECT 8.315000 1.495000 8.705000 2.635000 ;
+        RECT 8.315000 2.805000 8.705000 3.945000 ;
+      LAYER mcon ;
+        RECT 7.965000 2.635000 8.135000 2.805000 ;
+        RECT 8.425000 2.635000 8.595000 2.805000 ;
+        RECT 8.885000 2.635000 9.055000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 17.020000 2.960000 ;
     END
@@ -706,10 +730,13 @@
       RECT  1.460000 3.805000  1.940000 3.935000 ;
       RECT  1.460000 4.265000  1.630000 4.685000 ;
       RECT  1.460000 4.685000  1.900000 4.855000 ;
+      RECT  1.465000 2.635000  3.135000 2.805000 ;
       RECT  1.610000 1.635000  1.940000 2.465000 ;
       RECT  1.610000 2.975000  1.940000 3.805000 ;
       RECT  1.650000 0.330000  1.900000 0.585000 ;
       RECT  1.650000 4.855000  1.900000 5.110000 ;
+      RECT  2.135000 1.465000  2.465000 2.635000 ;
+      RECT  2.135000 2.805000  2.465000 3.975000 ;
       RECT  2.660000 1.465000  3.360000 1.505000 ;
       RECT  2.660000 1.505000  3.140000 1.635000 ;
       RECT  2.660000 1.635000  2.990000 2.465000 ;
@@ -734,10 +761,13 @@
       RECT  5.600000 3.805000  6.080000 3.935000 ;
       RECT  5.600000 4.265000  5.770000 4.685000 ;
       RECT  5.600000 4.685000  6.040000 4.855000 ;
+      RECT  5.605000 2.635000  7.275000 2.805000 ;
       RECT  5.750000 1.635000  6.080000 2.465000 ;
       RECT  5.750000 2.975000  6.080000 3.805000 ;
       RECT  5.790000 0.330000  6.040000 0.585000 ;
       RECT  5.790000 4.855000  6.040000 5.110000 ;
+      RECT  6.275000 1.465000  6.605000 2.635000 ;
+      RECT  6.275000 2.805000  6.605000 3.975000 ;
       RECT  6.800000 1.465000  7.500000 1.505000 ;
       RECT  6.800000 1.505000  7.280000 1.635000 ;
       RECT  6.800000 1.635000  7.130000 2.465000 ;
@@ -762,10 +792,13 @@
       RECT  9.740000 3.805000 10.220000 3.935000 ;
       RECT  9.740000 4.265000  9.910000 4.685000 ;
       RECT  9.740000 4.685000 10.180000 4.855000 ;
+      RECT  9.745000 2.635000 11.415000 2.805000 ;
       RECT  9.890000 1.635000 10.220000 2.465000 ;
       RECT  9.890000 2.975000 10.220000 3.805000 ;
       RECT  9.930000 0.330000 10.180000 0.585000 ;
       RECT  9.930000 4.855000 10.180000 5.110000 ;
+      RECT 10.415000 1.465000 10.745000 2.635000 ;
+      RECT 10.415000 2.805000 10.745000 3.975000 ;
       RECT 10.940000 1.465000 11.640000 1.505000 ;
       RECT 10.940000 1.505000 11.420000 1.635000 ;
       RECT 10.940000 1.635000 11.270000 2.465000 ;
@@ -790,10 +823,13 @@
       RECT 13.880000 3.805000 14.360000 3.935000 ;
       RECT 13.880000 4.265000 14.050000 4.685000 ;
       RECT 13.880000 4.685000 14.320000 4.855000 ;
+      RECT 13.885000 2.635000 15.555000 2.805000 ;
       RECT 14.030000 1.635000 14.360000 2.465000 ;
       RECT 14.030000 2.975000 14.360000 3.805000 ;
       RECT 14.070000 0.330000 14.320000 0.585000 ;
       RECT 14.070000 4.855000 14.320000 5.110000 ;
+      RECT 14.555000 1.465000 14.885000 2.635000 ;
+      RECT 14.555000 2.805000 14.885000 3.975000 ;
       RECT 15.080000 1.465000 15.780000 1.505000 ;
       RECT 15.080000 1.505000 15.560000 1.635000 ;
       RECT 15.080000 1.635000 15.410000 2.465000 ;
@@ -808,6 +844,23 @@
       RECT 15.390000 1.175000 15.780000 1.465000 ;
       RECT 15.390000 3.975000 15.780000 4.265000 ;
       RECT 15.390000 4.265000 15.560000 4.685000 ;
+    LAYER mcon ;
+      RECT  1.525000 2.635000  1.695000 2.805000 ;
+      RECT  1.985000 2.635000  2.155000 2.805000 ;
+      RECT  2.445000 2.635000  2.615000 2.805000 ;
+      RECT  2.905000 2.635000  3.075000 2.805000 ;
+      RECT  5.665000 2.635000  5.835000 2.805000 ;
+      RECT  6.125000 2.635000  6.295000 2.805000 ;
+      RECT  6.585000 2.635000  6.755000 2.805000 ;
+      RECT  7.045000 2.635000  7.215000 2.805000 ;
+      RECT  9.805000 2.635000  9.975000 2.805000 ;
+      RECT 10.265000 2.635000 10.435000 2.805000 ;
+      RECT 10.725000 2.635000 10.895000 2.805000 ;
+      RECT 11.185000 2.635000 11.355000 2.805000 ;
+      RECT 13.945000 2.635000 14.115000 2.805000 ;
+      RECT 14.405000 2.635000 14.575000 2.805000 ;
+      RECT 14.865000 2.635000 15.035000 2.805000 ;
+      RECT 15.325000 2.635000 15.495000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
index f98e230..b5e83b7 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_2.magic.lef
@@ -328,79 +328,18 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT  1.465000 1.755000  1.895000 2.125000 ;
-        RECT  1.465000 3.315000  1.895000 3.685000 ;
-        RECT  1.505000 0.595000  1.835000 0.885000 ;
-        RECT  1.505000 4.555000  1.835000 4.845000 ;
-        RECT  1.585000 0.885000  1.755000 1.755000 ;
-        RECT  1.585000 2.125000  1.755000 3.315000 ;
-        RECT  1.585000 3.685000  1.755000 4.555000 ;
-        RECT  4.545000 1.755000  4.975000 2.125000 ;
-        RECT  4.545000 3.315000  4.975000 3.685000 ;
-        RECT  4.605000 0.595000  4.935000 0.885000 ;
-        RECT  4.605000 4.555000  4.935000 4.845000 ;
-        RECT  4.685000 0.885000  4.855000 1.755000 ;
-        RECT  4.685000 2.125000  4.855000 3.315000 ;
-        RECT  4.685000 3.685000  4.855000 4.555000 ;
-        RECT  7.905000 1.755000  8.335000 2.125000 ;
-        RECT  7.905000 3.315000  8.335000 3.685000 ;
-        RECT  7.945000 0.595000  8.275000 0.885000 ;
-        RECT  7.945000 4.555000  8.275000 4.845000 ;
-        RECT  8.025000 0.885000  8.195000 1.755000 ;
-        RECT  8.025000 2.125000  8.195000 3.315000 ;
-        RECT  8.025000 3.685000  8.195000 4.555000 ;
-        RECT 10.985000 1.755000 11.415000 2.125000 ;
-        RECT 10.985000 3.315000 11.415000 3.685000 ;
-        RECT 11.045000 0.595000 11.375000 0.885000 ;
-        RECT 11.045000 4.555000 11.375000 4.845000 ;
-        RECT 11.125000 0.885000 11.295000 1.755000 ;
-        RECT 11.125000 2.125000 11.295000 3.315000 ;
-        RECT 11.125000 3.685000 11.295000 4.555000 ;
-        RECT 14.345000 1.755000 14.775000 2.125000 ;
-        RECT 14.345000 3.315000 14.775000 3.685000 ;
-        RECT 14.385000 0.595000 14.715000 0.885000 ;
-        RECT 14.385000 4.555000 14.715000 4.845000 ;
-        RECT 14.465000 0.885000 14.635000 1.755000 ;
-        RECT 14.465000 2.125000 14.635000 3.315000 ;
-        RECT 14.465000 3.685000 14.635000 4.555000 ;
-        RECT 17.425000 1.755000 17.855000 2.125000 ;
-        RECT 17.425000 3.315000 17.855000 3.685000 ;
-        RECT 17.485000 0.595000 17.815000 0.885000 ;
-        RECT 17.485000 4.555000 17.815000 4.845000 ;
-        RECT 17.565000 0.885000 17.735000 1.755000 ;
-        RECT 17.565000 2.125000 17.735000 3.315000 ;
-        RECT 17.565000 3.685000 17.735000 4.555000 ;
-        RECT 20.785000 1.755000 21.215000 2.125000 ;
-        RECT 20.785000 3.315000 21.215000 3.685000 ;
-        RECT 20.825000 0.595000 21.155000 0.885000 ;
-        RECT 20.825000 4.555000 21.155000 4.845000 ;
-        RECT 20.905000 0.885000 21.075000 1.755000 ;
-        RECT 20.905000 2.125000 21.075000 3.315000 ;
-        RECT 20.905000 3.685000 21.075000 4.555000 ;
-        RECT 23.865000 1.755000 24.295000 2.125000 ;
-        RECT 23.865000 3.315000 24.295000 3.685000 ;
-        RECT 23.925000 0.595000 24.255000 0.885000 ;
-        RECT 23.925000 4.555000 24.255000 4.845000 ;
-        RECT 24.005000 0.885000 24.175000 1.755000 ;
-        RECT 24.005000 2.125000 24.175000 3.315000 ;
-        RECT 24.005000 3.685000 24.175000 4.555000 ;
+        RECT 1.465000 1.755000 1.895000 2.125000 ;
+        RECT 1.465000 3.315000 1.895000 3.685000 ;
+        RECT 1.505000 0.595000 1.835000 0.885000 ;
+        RECT 1.505000 4.555000 1.835000 4.845000 ;
+        RECT 1.585000 0.885000 1.755000 1.755000 ;
+        RECT 1.585000 2.125000 1.755000 3.315000 ;
+        RECT 1.585000 3.685000 1.755000 4.555000 ;
       LAYER mcon ;
-        RECT  1.525000 1.785000  1.695000 1.955000 ;
-        RECT  1.525000 3.485000  1.695000 3.655000 ;
-        RECT  4.745000 1.785000  4.915000 1.955000 ;
-        RECT  4.745000 3.485000  4.915000 3.655000 ;
-        RECT  7.965000 1.785000  8.135000 1.955000 ;
-        RECT  7.965000 3.485000  8.135000 3.655000 ;
-        RECT 11.185000 1.785000 11.355000 1.955000 ;
-        RECT 11.185000 3.485000 11.355000 3.655000 ;
-        RECT 14.405000 1.785000 14.575000 1.955000 ;
-        RECT 14.405000 3.485000 14.575000 3.655000 ;
-        RECT 17.625000 1.785000 17.795000 1.955000 ;
-        RECT 17.625000 3.485000 17.795000 3.655000 ;
-        RECT 20.845000 1.785000 21.015000 1.955000 ;
-        RECT 20.845000 3.485000 21.015000 3.655000 ;
-        RECT 24.065000 1.785000 24.235000 1.955000 ;
-        RECT 24.065000 3.485000 24.235000 3.655000 ;
+        RECT 1.525000 1.785000 1.695000 1.955000 ;
+        RECT 1.525000 3.485000 1.695000 3.655000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT  1.465000 1.755000  1.755000 1.800000 ;
         RECT  1.465000 1.800000 24.295000 1.940000 ;
@@ -513,8 +452,6 @@
         RECT 24.525000 -0.085000 24.695000 0.085000 ;
         RECT 24.985000 -0.085000 25.155000 0.085000 ;
         RECT 25.445000 -0.085000 25.615000 0.085000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
     PORT
       LAYER li1 ;
@@ -588,6 +525,12 @@
         RECT 24.525000 5.355000 24.695000 5.525000 ;
         RECT 24.985000 5.355000 25.155000 5.525000 ;
         RECT 25.445000 5.355000 25.615000 5.525000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 25.760000 0.240000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 5.200000 25.760000 5.680000 ;
     END
@@ -597,26 +540,18 @@
     USE POWER ;
     PORT
       LAYER li1 ;
-        RECT  0.000000 2.635000  1.415000 2.805000 ;
-        RECT  0.565000 1.835000  0.895000 2.105000 ;
-        RECT  0.565000 3.335000  0.895000 3.605000 ;
-        RECT  0.595000 2.105000  0.895000 2.635000 ;
-        RECT  0.595000 2.805000  0.895000 3.335000 ;
-        RECT  1.925000 2.635000  4.515000 2.805000 ;
-        RECT  3.055000 1.465000  3.385000 2.635000 ;
-        RECT  3.055000 2.805000  3.385000 3.975000 ;
-        RECT  5.025000 2.635000  7.855000 2.805000 ;
-        RECT  5.545000 1.835000  5.875000 2.105000 ;
-        RECT  5.545000 2.105000  5.845000 2.635000 ;
-        RECT  5.545000 2.805000  5.845000 3.335000 ;
-        RECT  5.545000 3.335000  5.875000 3.605000 ;
-        RECT  7.005000 1.835000  7.335000 2.105000 ;
-        RECT  7.005000 3.335000  7.335000 3.605000 ;
-        RECT  7.035000 2.105000  7.335000 2.635000 ;
-        RECT  7.035000 2.805000  7.335000 3.335000 ;
-        RECT  8.365000 2.635000 10.955000 2.805000 ;
-        RECT  9.495000 1.465000  9.825000 2.635000 ;
-        RECT  9.495000 2.805000  9.825000 3.975000 ;
+        RECT 0.000000 2.635000 1.415000 2.805000 ;
+        RECT 0.565000 1.835000 0.895000 2.105000 ;
+        RECT 0.565000 3.335000 0.895000 3.605000 ;
+        RECT 0.595000 2.105000 0.895000 2.635000 ;
+        RECT 0.595000 2.805000 0.895000 3.335000 ;
+      LAYER mcon ;
+        RECT 0.145000 2.635000 0.315000 2.805000 ;
+        RECT 0.605000 2.635000 0.775000 2.805000 ;
+        RECT 1.065000 2.635000 1.235000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 11.465000 2.635000 14.295000 2.805000 ;
         RECT 11.985000 1.835000 12.315000 2.105000 ;
         RECT 11.985000 2.105000 12.285000 2.635000 ;
@@ -626,9 +561,16 @@
         RECT 13.445000 3.335000 13.775000 3.605000 ;
         RECT 13.475000 2.105000 13.775000 2.635000 ;
         RECT 13.475000 2.805000 13.775000 3.335000 ;
-        RECT 14.805000 2.635000 17.395000 2.805000 ;
-        RECT 15.935000 1.465000 16.265000 2.635000 ;
-        RECT 15.935000 2.805000 16.265000 3.975000 ;
+      LAYER mcon ;
+        RECT 11.645000 2.635000 11.815000 2.805000 ;
+        RECT 12.105000 2.635000 12.275000 2.805000 ;
+        RECT 12.565000 2.635000 12.735000 2.805000 ;
+        RECT 13.025000 2.635000 13.195000 2.805000 ;
+        RECT 13.485000 2.635000 13.655000 2.805000 ;
+        RECT 13.945000 2.635000 14.115000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 17.905000 2.635000 20.735000 2.805000 ;
         RECT 18.425000 1.835000 18.755000 2.105000 ;
         RECT 18.425000 2.105000 18.725000 2.635000 ;
@@ -638,63 +580,46 @@
         RECT 19.885000 3.335000 20.215000 3.605000 ;
         RECT 19.915000 2.105000 20.215000 2.635000 ;
         RECT 19.915000 2.805000 20.215000 3.335000 ;
-        RECT 21.245000 2.635000 23.835000 2.805000 ;
-        RECT 22.375000 1.465000 22.705000 2.635000 ;
-        RECT 22.375000 2.805000 22.705000 3.975000 ;
-        RECT 24.345000 2.635000 25.760000 2.805000 ;
-        RECT 24.865000 1.835000 25.195000 2.105000 ;
-        RECT 24.865000 2.105000 25.165000 2.635000 ;
-        RECT 24.865000 2.805000 25.165000 3.335000 ;
-        RECT 24.865000 3.335000 25.195000 3.605000 ;
       LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 15.785000 2.635000 15.955000 2.805000 ;
-        RECT 16.245000 2.635000 16.415000 2.805000 ;
-        RECT 16.705000 2.635000 16.875000 2.805000 ;
-        RECT 17.165000 2.635000 17.335000 2.805000 ;
         RECT 18.085000 2.635000 18.255000 2.805000 ;
         RECT 18.545000 2.635000 18.715000 2.805000 ;
         RECT 19.005000 2.635000 19.175000 2.805000 ;
         RECT 19.465000 2.635000 19.635000 2.805000 ;
         RECT 19.925000 2.635000 20.095000 2.805000 ;
         RECT 20.385000 2.635000 20.555000 2.805000 ;
-        RECT 21.305000 2.635000 21.475000 2.805000 ;
-        RECT 21.765000 2.635000 21.935000 2.805000 ;
-        RECT 22.225000 2.635000 22.395000 2.805000 ;
-        RECT 22.685000 2.635000 22.855000 2.805000 ;
-        RECT 23.145000 2.635000 23.315000 2.805000 ;
-        RECT 23.605000 2.635000 23.775000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 24.345000 2.635000 25.760000 2.805000 ;
+        RECT 24.865000 1.835000 25.195000 2.105000 ;
+        RECT 24.865000 2.105000 25.165000 2.635000 ;
+        RECT 24.865000 2.805000 25.165000 3.335000 ;
+        RECT 24.865000 3.335000 25.195000 3.605000 ;
+      LAYER mcon ;
         RECT 24.525000 2.635000 24.695000 2.805000 ;
         RECT 24.985000 2.635000 25.155000 2.805000 ;
         RECT 25.445000 2.635000 25.615000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.025000 2.635000 7.855000 2.805000 ;
+        RECT 5.545000 1.835000 5.875000 2.105000 ;
+        RECT 5.545000 2.105000 5.845000 2.635000 ;
+        RECT 5.545000 2.805000 5.845000 3.335000 ;
+        RECT 5.545000 3.335000 5.875000 3.605000 ;
+        RECT 7.005000 1.835000 7.335000 2.105000 ;
+        RECT 7.005000 3.335000 7.335000 3.605000 ;
+        RECT 7.035000 2.105000 7.335000 2.635000 ;
+        RECT 7.035000 2.805000 7.335000 3.335000 ;
+      LAYER mcon ;
+        RECT 5.205000 2.635000 5.375000 2.805000 ;
+        RECT 5.665000 2.635000 5.835000 2.805000 ;
+        RECT 6.125000 2.635000 6.295000 2.805000 ;
+        RECT 6.585000 2.635000 6.755000 2.805000 ;
+        RECT 7.045000 2.635000 7.215000 2.805000 ;
+        RECT 7.505000 2.635000 7.675000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 25.760000 2.960000 ;
     END
@@ -722,6 +647,7 @@
       RECT  1.115000 2.975000  1.415000 3.145000 ;
       RECT  1.115000 3.145000  1.285000 3.775000 ;
       RECT  1.925000 2.295000  2.280000 2.465000 ;
+      RECT  1.925000 2.635000  4.515000 2.805000 ;
       RECT  1.925000 2.975000  2.280000 3.145000 ;
       RECT  2.005000 0.425000  2.175000 0.770000 ;
       RECT  2.005000 4.670000  2.175000 5.015000 ;
@@ -743,6 +669,8 @@
       RECT  2.550000 2.975000  2.880000 3.805000 ;
       RECT  2.675000 0.330000  2.925000 0.585000 ;
       RECT  2.675000 4.855000  2.925000 5.110000 ;
+      RECT  3.055000 1.465000  3.385000 2.635000 ;
+      RECT  3.055000 2.805000  3.385000 3.975000 ;
       RECT  3.515000 0.330000  3.765000 0.585000 ;
       RECT  3.515000 0.585000  4.095000 0.755000 ;
       RECT  3.515000 4.685000  4.095000 4.855000 ;
@@ -767,6 +695,13 @@
       RECT  4.265000 0.425000  4.435000 0.770000 ;
       RECT  4.265000 4.670000  4.435000 5.015000 ;
       RECT  4.265000 5.015000  5.410000 5.185000 ;
+      RECT  4.545000 1.755000  4.975000 2.125000 ;
+      RECT  4.545000 3.315000  4.975000 3.685000 ;
+      RECT  4.605000 0.595000  4.935000 0.885000 ;
+      RECT  4.605000 4.555000  4.935000 4.845000 ;
+      RECT  4.685000 0.885000  4.855000 1.755000 ;
+      RECT  4.685000 2.125000  4.855000 3.315000 ;
+      RECT  4.685000 3.685000  4.855000 4.555000 ;
       RECT  5.025000 2.295000  5.325000 2.465000 ;
       RECT  5.025000 2.975000  5.325000 3.145000 ;
       RECT  5.105000 0.425000  5.410000 0.715000 ;
@@ -805,7 +740,15 @@
       RECT  7.555000 2.295000  7.855000 2.465000 ;
       RECT  7.555000 2.975000  7.855000 3.145000 ;
       RECT  7.555000 3.145000  7.725000 3.775000 ;
+      RECT  7.905000 1.755000  8.335000 2.125000 ;
+      RECT  7.905000 3.315000  8.335000 3.685000 ;
+      RECT  7.945000 0.595000  8.275000 0.885000 ;
+      RECT  7.945000 4.555000  8.275000 4.845000 ;
+      RECT  8.025000 0.885000  8.195000 1.755000 ;
+      RECT  8.025000 2.125000  8.195000 3.315000 ;
+      RECT  8.025000 3.685000  8.195000 4.555000 ;
       RECT  8.365000 2.295000  8.720000 2.465000 ;
+      RECT  8.365000 2.635000 10.955000 2.805000 ;
       RECT  8.365000 2.975000  8.720000 3.145000 ;
       RECT  8.445000 0.425000  8.615000 0.770000 ;
       RECT  8.445000 4.670000  8.615000 5.015000 ;
@@ -827,6 +770,8 @@
       RECT  8.990000 2.975000  9.320000 3.805000 ;
       RECT  9.115000 0.330000  9.365000 0.585000 ;
       RECT  9.115000 4.855000  9.365000 5.110000 ;
+      RECT  9.495000 1.465000  9.825000 2.635000 ;
+      RECT  9.495000 2.805000  9.825000 3.975000 ;
       RECT  9.955000 0.330000 10.205000 0.585000 ;
       RECT  9.955000 0.585000 10.535000 0.755000 ;
       RECT  9.955000 4.685000 10.535000 4.855000 ;
@@ -851,6 +796,13 @@
       RECT 10.705000 0.425000 10.875000 0.770000 ;
       RECT 10.705000 4.670000 10.875000 5.015000 ;
       RECT 10.705000 5.015000 11.850000 5.185000 ;
+      RECT 10.985000 1.755000 11.415000 2.125000 ;
+      RECT 10.985000 3.315000 11.415000 3.685000 ;
+      RECT 11.045000 0.595000 11.375000 0.885000 ;
+      RECT 11.045000 4.555000 11.375000 4.845000 ;
+      RECT 11.125000 0.885000 11.295000 1.755000 ;
+      RECT 11.125000 2.125000 11.295000 3.315000 ;
+      RECT 11.125000 3.685000 11.295000 4.555000 ;
       RECT 11.465000 2.295000 11.765000 2.465000 ;
       RECT 11.465000 2.975000 11.765000 3.145000 ;
       RECT 11.545000 0.425000 11.850000 0.715000 ;
@@ -889,7 +841,15 @@
       RECT 13.995000 2.295000 14.295000 2.465000 ;
       RECT 13.995000 2.975000 14.295000 3.145000 ;
       RECT 13.995000 3.145000 14.165000 3.775000 ;
+      RECT 14.345000 1.755000 14.775000 2.125000 ;
+      RECT 14.345000 3.315000 14.775000 3.685000 ;
+      RECT 14.385000 0.595000 14.715000 0.885000 ;
+      RECT 14.385000 4.555000 14.715000 4.845000 ;
+      RECT 14.465000 0.885000 14.635000 1.755000 ;
+      RECT 14.465000 2.125000 14.635000 3.315000 ;
+      RECT 14.465000 3.685000 14.635000 4.555000 ;
       RECT 14.805000 2.295000 15.160000 2.465000 ;
+      RECT 14.805000 2.635000 17.395000 2.805000 ;
       RECT 14.805000 2.975000 15.160000 3.145000 ;
       RECT 14.885000 0.425000 15.055000 0.770000 ;
       RECT 14.885000 4.670000 15.055000 5.015000 ;
@@ -911,6 +871,8 @@
       RECT 15.430000 2.975000 15.760000 3.805000 ;
       RECT 15.555000 0.330000 15.805000 0.585000 ;
       RECT 15.555000 4.855000 15.805000 5.110000 ;
+      RECT 15.935000 1.465000 16.265000 2.635000 ;
+      RECT 15.935000 2.805000 16.265000 3.975000 ;
       RECT 16.395000 0.330000 16.645000 0.585000 ;
       RECT 16.395000 0.585000 16.975000 0.755000 ;
       RECT 16.395000 4.685000 16.975000 4.855000 ;
@@ -935,6 +897,13 @@
       RECT 17.145000 0.425000 17.315000 0.770000 ;
       RECT 17.145000 4.670000 17.315000 5.015000 ;
       RECT 17.145000 5.015000 18.290000 5.185000 ;
+      RECT 17.425000 1.755000 17.855000 2.125000 ;
+      RECT 17.425000 3.315000 17.855000 3.685000 ;
+      RECT 17.485000 0.595000 17.815000 0.885000 ;
+      RECT 17.485000 4.555000 17.815000 4.845000 ;
+      RECT 17.565000 0.885000 17.735000 1.755000 ;
+      RECT 17.565000 2.125000 17.735000 3.315000 ;
+      RECT 17.565000 3.685000 17.735000 4.555000 ;
       RECT 17.905000 2.295000 18.205000 2.465000 ;
       RECT 17.905000 2.975000 18.205000 3.145000 ;
       RECT 17.985000 0.425000 18.290000 0.715000 ;
@@ -973,7 +942,15 @@
       RECT 20.435000 2.295000 20.735000 2.465000 ;
       RECT 20.435000 2.975000 20.735000 3.145000 ;
       RECT 20.435000 3.145000 20.605000 3.775000 ;
+      RECT 20.785000 1.755000 21.215000 2.125000 ;
+      RECT 20.785000 3.315000 21.215000 3.685000 ;
+      RECT 20.825000 0.595000 21.155000 0.885000 ;
+      RECT 20.825000 4.555000 21.155000 4.845000 ;
+      RECT 20.905000 0.885000 21.075000 1.755000 ;
+      RECT 20.905000 2.125000 21.075000 3.315000 ;
+      RECT 20.905000 3.685000 21.075000 4.555000 ;
       RECT 21.245000 2.295000 21.600000 2.465000 ;
+      RECT 21.245000 2.635000 23.835000 2.805000 ;
       RECT 21.245000 2.975000 21.600000 3.145000 ;
       RECT 21.325000 0.425000 21.495000 0.770000 ;
       RECT 21.325000 4.670000 21.495000 5.015000 ;
@@ -995,6 +972,8 @@
       RECT 21.870000 2.975000 22.200000 3.805000 ;
       RECT 21.995000 0.330000 22.245000 0.585000 ;
       RECT 21.995000 4.855000 22.245000 5.110000 ;
+      RECT 22.375000 1.465000 22.705000 2.635000 ;
+      RECT 22.375000 2.805000 22.705000 3.975000 ;
       RECT 22.835000 0.330000 23.085000 0.585000 ;
       RECT 22.835000 0.585000 23.415000 0.755000 ;
       RECT 22.835000 4.685000 23.415000 4.855000 ;
@@ -1019,6 +998,13 @@
       RECT 23.585000 0.425000 23.755000 0.770000 ;
       RECT 23.585000 4.670000 23.755000 5.015000 ;
       RECT 23.585000 5.015000 24.730000 5.185000 ;
+      RECT 23.865000 1.755000 24.295000 2.125000 ;
+      RECT 23.865000 3.315000 24.295000 3.685000 ;
+      RECT 23.925000 0.595000 24.255000 0.885000 ;
+      RECT 23.925000 4.555000 24.255000 4.845000 ;
+      RECT 24.005000 0.885000 24.175000 1.755000 ;
+      RECT 24.005000 2.125000 24.175000 3.315000 ;
+      RECT 24.005000 3.685000 24.175000 4.555000 ;
       RECT 24.345000 2.295000 24.645000 2.465000 ;
       RECT 24.345000 2.975000 24.645000 3.145000 ;
       RECT 24.425000 0.425000 24.730000 0.715000 ;
@@ -1042,10 +1028,18 @@
       RECT  0.175000 3.130000  0.345000 3.300000 ;
       RECT  1.115000 2.140000  1.285000 2.310000 ;
       RECT  1.115000 3.130000  1.285000 3.300000 ;
+      RECT  1.985000 2.635000  2.155000 2.805000 ;
       RECT  2.110000 2.140000  2.280000 2.310000 ;
       RECT  2.110000 3.130000  2.280000 3.300000 ;
+      RECT  2.445000 2.635000  2.615000 2.805000 ;
+      RECT  2.905000 2.635000  3.075000 2.805000 ;
+      RECT  3.365000 2.635000  3.535000 2.805000 ;
+      RECT  3.825000 2.635000  3.995000 2.805000 ;
       RECT  4.160000 2.140000  4.330000 2.310000 ;
       RECT  4.160000 3.130000  4.330000 3.300000 ;
+      RECT  4.285000 2.635000  4.455000 2.805000 ;
+      RECT  4.745000 1.785000  4.915000 1.955000 ;
+      RECT  4.745000 3.485000  4.915000 3.655000 ;
       RECT  5.155000 2.140000  5.325000 2.310000 ;
       RECT  5.155000 3.130000  5.325000 3.300000 ;
       RECT  6.095000 2.140000  6.265000 2.310000 ;
@@ -1054,10 +1048,20 @@
       RECT  6.615000 3.130000  6.785000 3.300000 ;
       RECT  7.555000 2.140000  7.725000 2.310000 ;
       RECT  7.555000 3.130000  7.725000 3.300000 ;
+      RECT  7.965000 1.785000  8.135000 1.955000 ;
+      RECT  7.965000 3.485000  8.135000 3.655000 ;
+      RECT  8.425000 2.635000  8.595000 2.805000 ;
       RECT  8.550000 2.140000  8.720000 2.310000 ;
       RECT  8.550000 3.130000  8.720000 3.300000 ;
+      RECT  8.885000 2.635000  9.055000 2.805000 ;
+      RECT  9.345000 2.635000  9.515000 2.805000 ;
+      RECT  9.805000 2.635000  9.975000 2.805000 ;
+      RECT 10.265000 2.635000 10.435000 2.805000 ;
       RECT 10.600000 2.140000 10.770000 2.310000 ;
       RECT 10.600000 3.130000 10.770000 3.300000 ;
+      RECT 10.725000 2.635000 10.895000 2.805000 ;
+      RECT 11.185000 1.785000 11.355000 1.955000 ;
+      RECT 11.185000 3.485000 11.355000 3.655000 ;
       RECT 11.595000 2.140000 11.765000 2.310000 ;
       RECT 11.595000 3.130000 11.765000 3.300000 ;
       RECT 12.535000 2.140000 12.705000 2.310000 ;
@@ -1066,10 +1070,20 @@
       RECT 13.055000 3.130000 13.225000 3.300000 ;
       RECT 13.995000 2.140000 14.165000 2.310000 ;
       RECT 13.995000 3.130000 14.165000 3.300000 ;
+      RECT 14.405000 1.785000 14.575000 1.955000 ;
+      RECT 14.405000 3.485000 14.575000 3.655000 ;
+      RECT 14.865000 2.635000 15.035000 2.805000 ;
       RECT 14.990000 2.140000 15.160000 2.310000 ;
       RECT 14.990000 3.130000 15.160000 3.300000 ;
+      RECT 15.325000 2.635000 15.495000 2.805000 ;
+      RECT 15.785000 2.635000 15.955000 2.805000 ;
+      RECT 16.245000 2.635000 16.415000 2.805000 ;
+      RECT 16.705000 2.635000 16.875000 2.805000 ;
       RECT 17.040000 2.140000 17.210000 2.310000 ;
       RECT 17.040000 3.130000 17.210000 3.300000 ;
+      RECT 17.165000 2.635000 17.335000 2.805000 ;
+      RECT 17.625000 1.785000 17.795000 1.955000 ;
+      RECT 17.625000 3.485000 17.795000 3.655000 ;
       RECT 18.035000 2.140000 18.205000 2.310000 ;
       RECT 18.035000 3.130000 18.205000 3.300000 ;
       RECT 18.975000 2.140000 19.145000 2.310000 ;
@@ -1078,10 +1092,20 @@
       RECT 19.495000 3.130000 19.665000 3.300000 ;
       RECT 20.435000 2.140000 20.605000 2.310000 ;
       RECT 20.435000 3.130000 20.605000 3.300000 ;
+      RECT 20.845000 1.785000 21.015000 1.955000 ;
+      RECT 20.845000 3.485000 21.015000 3.655000 ;
+      RECT 21.305000 2.635000 21.475000 2.805000 ;
       RECT 21.430000 2.140000 21.600000 2.310000 ;
       RECT 21.430000 3.130000 21.600000 3.300000 ;
+      RECT 21.765000 2.635000 21.935000 2.805000 ;
+      RECT 22.225000 2.635000 22.395000 2.805000 ;
+      RECT 22.685000 2.635000 22.855000 2.805000 ;
+      RECT 23.145000 2.635000 23.315000 2.805000 ;
       RECT 23.480000 2.140000 23.650000 2.310000 ;
       RECT 23.480000 3.130000 23.650000 3.300000 ;
+      RECT 23.605000 2.635000 23.775000 2.805000 ;
+      RECT 24.065000 1.785000 24.235000 1.955000 ;
+      RECT 24.065000 3.485000 24.235000 3.655000 ;
       RECT 24.475000 2.140000 24.645000 2.310000 ;
       RECT 24.475000 3.130000 24.645000 3.300000 ;
       RECT 25.415000 2.140000 25.585000 2.310000 ;
diff --git a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
index 90ddd58..4ac86e4 100644
--- a/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
+++ b/cells/muxb16to1/sky130_fd_sc_hdll__muxb16to1_4.magic.lef
@@ -347,119 +347,23 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT  2.865000 0.595000  3.195000 0.885000 ;
-        RECT  2.865000 4.555000  3.195000 4.845000 ;
-        RECT  2.965000 0.885000  3.195000 1.065000 ;
-        RECT  2.965000 1.065000  4.235000 1.365000 ;
-        RECT  2.965000 1.365000  3.295000 4.075000 ;
-        RECT  2.965000 4.075000  4.235000 4.375000 ;
-        RECT  2.965000 4.375000  3.195000 4.555000 ;
-        RECT  3.705000 0.595000  4.035000 1.065000 ;
-        RECT  3.705000 4.375000  4.035000 4.845000 ;
-        RECT  3.905000 1.365000  4.235000 4.075000 ;
-        RECT  8.645000 1.065000  9.915000 1.365000 ;
-        RECT  8.645000 1.365000  8.975000 4.075000 ;
-        RECT  8.645000 4.075000  9.915000 4.375000 ;
-        RECT  8.845000 0.595000  9.175000 1.065000 ;
-        RECT  8.845000 4.375000  9.175000 4.845000 ;
-        RECT  9.585000 1.365000  9.915000 4.075000 ;
-        RECT  9.685000 0.595000 10.015000 0.885000 ;
-        RECT  9.685000 0.885000  9.915000 1.065000 ;
-        RECT  9.685000 4.375000  9.915000 4.555000 ;
-        RECT  9.685000 4.555000 10.015000 4.845000 ;
-        RECT 15.745000 0.595000 16.075000 0.885000 ;
-        RECT 15.745000 4.555000 16.075000 4.845000 ;
-        RECT 15.845000 0.885000 16.075000 1.065000 ;
-        RECT 15.845000 1.065000 17.115000 1.365000 ;
-        RECT 15.845000 1.365000 16.175000 4.075000 ;
-        RECT 15.845000 4.075000 17.115000 4.375000 ;
-        RECT 15.845000 4.375000 16.075000 4.555000 ;
-        RECT 16.585000 0.595000 16.915000 1.065000 ;
-        RECT 16.585000 4.375000 16.915000 4.845000 ;
-        RECT 16.785000 1.365000 17.115000 4.075000 ;
-        RECT 21.525000 1.065000 22.795000 1.365000 ;
-        RECT 21.525000 1.365000 21.855000 4.075000 ;
-        RECT 21.525000 4.075000 22.795000 4.375000 ;
-        RECT 21.725000 0.595000 22.055000 1.065000 ;
-        RECT 21.725000 4.375000 22.055000 4.845000 ;
-        RECT 22.465000 1.365000 22.795000 4.075000 ;
-        RECT 22.565000 0.595000 22.895000 0.885000 ;
-        RECT 22.565000 0.885000 22.795000 1.065000 ;
-        RECT 22.565000 4.375000 22.795000 4.555000 ;
-        RECT 22.565000 4.555000 22.895000 4.845000 ;
-        RECT 29.085000 0.595000 29.415000 0.885000 ;
-        RECT 29.085000 4.555000 29.415000 4.845000 ;
-        RECT 29.185000 0.885000 29.415000 1.065000 ;
-        RECT 29.185000 1.065000 30.455000 1.365000 ;
-        RECT 29.185000 1.365000 29.515000 4.075000 ;
-        RECT 29.185000 4.075000 30.455000 4.375000 ;
-        RECT 29.185000 4.375000 29.415000 4.555000 ;
-        RECT 29.925000 0.595000 30.255000 1.065000 ;
-        RECT 29.925000 4.375000 30.255000 4.845000 ;
-        RECT 30.125000 1.365000 30.455000 4.075000 ;
-        RECT 34.865000 1.065000 36.135000 1.365000 ;
-        RECT 34.865000 1.365000 35.195000 4.075000 ;
-        RECT 34.865000 4.075000 36.135000 4.375000 ;
-        RECT 35.065000 0.595000 35.395000 1.065000 ;
-        RECT 35.065000 4.375000 35.395000 4.845000 ;
-        RECT 35.805000 1.365000 36.135000 4.075000 ;
-        RECT 35.905000 0.595000 36.235000 0.885000 ;
-        RECT 35.905000 0.885000 36.135000 1.065000 ;
-        RECT 35.905000 4.375000 36.135000 4.555000 ;
-        RECT 35.905000 4.555000 36.235000 4.845000 ;
-        RECT 41.965000 0.595000 42.295000 0.885000 ;
-        RECT 41.965000 4.555000 42.295000 4.845000 ;
-        RECT 42.065000 0.885000 42.295000 1.065000 ;
-        RECT 42.065000 1.065000 43.335000 1.365000 ;
-        RECT 42.065000 1.365000 42.395000 4.075000 ;
-        RECT 42.065000 4.075000 43.335000 4.375000 ;
-        RECT 42.065000 4.375000 42.295000 4.555000 ;
-        RECT 42.805000 0.595000 43.135000 1.065000 ;
-        RECT 42.805000 4.375000 43.135000 4.845000 ;
-        RECT 43.005000 1.365000 43.335000 4.075000 ;
-        RECT 47.745000 1.065000 49.015000 1.365000 ;
-        RECT 47.745000 1.365000 48.075000 4.075000 ;
-        RECT 47.745000 4.075000 49.015000 4.375000 ;
-        RECT 47.945000 0.595000 48.275000 1.065000 ;
-        RECT 47.945000 4.375000 48.275000 4.845000 ;
-        RECT 48.685000 1.365000 49.015000 4.075000 ;
-        RECT 48.785000 0.595000 49.115000 0.885000 ;
-        RECT 48.785000 0.885000 49.015000 1.065000 ;
-        RECT 48.785000 4.375000 49.015000 4.555000 ;
-        RECT 48.785000 4.555000 49.115000 4.845000 ;
+        RECT 2.865000 0.595000 3.195000 0.885000 ;
+        RECT 2.865000 4.555000 3.195000 4.845000 ;
+        RECT 2.965000 0.885000 3.195000 1.065000 ;
+        RECT 2.965000 1.065000 4.235000 1.365000 ;
+        RECT 2.965000 1.365000 3.295000 4.075000 ;
+        RECT 2.965000 4.075000 4.235000 4.375000 ;
+        RECT 2.965000 4.375000 3.195000 4.555000 ;
+        RECT 3.705000 0.595000 4.035000 1.065000 ;
+        RECT 3.705000 4.375000 4.035000 4.845000 ;
+        RECT 3.905000 1.365000 4.235000 4.075000 ;
       LAYER mcon ;
-        RECT  3.045000 1.785000  3.215000 1.955000 ;
-        RECT  3.045000 3.485000  3.215000 3.655000 ;
-        RECT  3.985000 1.785000  4.155000 1.955000 ;
-        RECT  3.985000 3.485000  4.155000 3.655000 ;
-        RECT  8.725000 1.785000  8.895000 1.955000 ;
-        RECT  8.725000 3.485000  8.895000 3.655000 ;
-        RECT  9.665000 1.785000  9.835000 1.955000 ;
-        RECT  9.665000 3.485000  9.835000 3.655000 ;
-        RECT 15.925000 1.785000 16.095000 1.955000 ;
-        RECT 15.925000 3.485000 16.095000 3.655000 ;
-        RECT 16.865000 1.785000 17.035000 1.955000 ;
-        RECT 16.865000 3.485000 17.035000 3.655000 ;
-        RECT 21.605000 1.785000 21.775000 1.955000 ;
-        RECT 21.605000 3.485000 21.775000 3.655000 ;
-        RECT 22.545000 1.785000 22.715000 1.955000 ;
-        RECT 22.545000 3.485000 22.715000 3.655000 ;
-        RECT 29.265000 1.785000 29.435000 1.955000 ;
-        RECT 29.265000 3.485000 29.435000 3.655000 ;
-        RECT 30.205000 1.785000 30.375000 1.955000 ;
-        RECT 30.205000 3.485000 30.375000 3.655000 ;
-        RECT 34.945000 1.785000 35.115000 1.955000 ;
-        RECT 34.945000 3.485000 35.115000 3.655000 ;
-        RECT 35.885000 1.785000 36.055000 1.955000 ;
-        RECT 35.885000 3.485000 36.055000 3.655000 ;
-        RECT 42.145000 1.785000 42.315000 1.955000 ;
-        RECT 42.145000 3.485000 42.315000 3.655000 ;
-        RECT 43.085000 1.785000 43.255000 1.955000 ;
-        RECT 43.085000 3.485000 43.255000 3.655000 ;
-        RECT 47.825000 1.785000 47.995000 1.955000 ;
-        RECT 47.825000 3.485000 47.995000 3.655000 ;
-        RECT 48.765000 1.785000 48.935000 1.955000 ;
-        RECT 48.765000 3.485000 48.935000 3.655000 ;
+        RECT 3.045000 1.785000 3.215000 1.955000 ;
+        RECT 3.045000 3.485000 3.215000 3.655000 ;
+        RECT 3.985000 1.785000 4.155000 1.955000 ;
+        RECT 3.985000 3.485000 4.155000 3.655000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT  2.985000 1.755000  3.275000 1.800000 ;
         RECT  2.985000 1.800000 48.995000 1.940000 ;
@@ -689,8 +593,6 @@
         RECT 50.745000 -0.085000 50.915000 0.085000 ;
         RECT 51.205000 -0.085000 51.375000 0.085000 ;
         RECT 51.665000 -0.085000 51.835000 0.085000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 51.980000 0.240000 ;
     END
     PORT
       LAYER li1 ;
@@ -849,6 +751,12 @@
         RECT 50.745000 5.355000 50.915000 5.525000 ;
         RECT 51.205000 5.355000 51.375000 5.525000 ;
         RECT 51.665000 5.355000 51.835000 5.525000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 51.980000 0.240000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 5.200000 51.980000 5.680000 ;
     END
@@ -858,22 +766,23 @@
     USE POWER ;
     PORT
       LAYER li1 ;
-        RECT  0.000000 2.635000  2.795000 2.805000 ;
-        RECT  0.125000 1.495000  0.395000 2.635000 ;
-        RECT  0.125000 2.805000  0.395000 3.945000 ;
-        RECT  1.065000 1.835000  1.335000 2.635000 ;
-        RECT  1.065000 2.805000  1.335000 3.605000 ;
-        RECT  2.005000 1.835000  2.275000 2.635000 ;
-        RECT  2.005000 2.805000  2.275000 3.605000 ;
-        RECT  4.405000 2.635000  8.475000 2.805000 ;
-        RECT  4.950000 1.605000  5.225000 2.635000 ;
-        RECT  4.950000 2.805000  5.225000 3.835000 ;
-        RECT  5.920000 1.605000  6.220000 2.635000 ;
-        RECT  5.920000 2.805000  6.220000 3.835000 ;
-        RECT  6.660000 1.605000  6.960000 2.635000 ;
-        RECT  6.660000 2.805000  6.960000 3.835000 ;
-        RECT  7.655000 1.605000  7.930000 2.635000 ;
-        RECT  7.655000 2.805000  7.930000 3.835000 ;
+        RECT 0.000000 2.635000 2.795000 2.805000 ;
+        RECT 0.125000 1.495000 0.395000 2.635000 ;
+        RECT 0.125000 2.805000 0.395000 3.945000 ;
+        RECT 1.065000 1.835000 1.335000 2.635000 ;
+        RECT 1.065000 2.805000 1.335000 3.605000 ;
+        RECT 2.005000 1.835000 2.275000 2.635000 ;
+        RECT 2.005000 2.805000 2.275000 3.605000 ;
+      LAYER mcon ;
+        RECT 0.145000 2.635000 0.315000 2.805000 ;
+        RECT 0.605000 2.635000 0.775000 2.805000 ;
+        RECT 1.065000 2.635000 1.235000 2.805000 ;
+        RECT 1.525000 2.635000 1.695000 2.805000 ;
+        RECT 1.985000 2.635000 2.155000 2.805000 ;
+        RECT 2.445000 2.635000 2.615000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 10.085000 2.635000 15.675000 2.805000 ;
         RECT 10.605000 1.835000 10.875000 2.635000 ;
         RECT 10.605000 2.805000 10.875000 3.605000 ;
@@ -887,15 +796,22 @@
         RECT 13.945000 2.805000 14.215000 3.605000 ;
         RECT 14.885000 1.835000 15.155000 2.635000 ;
         RECT 14.885000 2.805000 15.155000 3.605000 ;
-        RECT 17.285000 2.635000 21.355000 2.805000 ;
-        RECT 17.830000 1.605000 18.105000 2.635000 ;
-        RECT 17.830000 2.805000 18.105000 3.835000 ;
-        RECT 18.800000 1.605000 19.100000 2.635000 ;
-        RECT 18.800000 2.805000 19.100000 3.835000 ;
-        RECT 19.540000 1.605000 19.840000 2.635000 ;
-        RECT 19.540000 2.805000 19.840000 3.835000 ;
-        RECT 20.535000 1.605000 20.810000 2.635000 ;
-        RECT 20.535000 2.805000 20.810000 3.835000 ;
+      LAYER mcon ;
+        RECT 10.265000 2.635000 10.435000 2.805000 ;
+        RECT 10.725000 2.635000 10.895000 2.805000 ;
+        RECT 11.185000 2.635000 11.355000 2.805000 ;
+        RECT 11.645000 2.635000 11.815000 2.805000 ;
+        RECT 12.105000 2.635000 12.275000 2.805000 ;
+        RECT 12.565000 2.635000 12.735000 2.805000 ;
+        RECT 13.025000 2.635000 13.195000 2.805000 ;
+        RECT 13.485000 2.635000 13.655000 2.805000 ;
+        RECT 13.945000 2.635000 14.115000 2.805000 ;
+        RECT 14.405000 2.635000 14.575000 2.805000 ;
+        RECT 14.865000 2.635000 15.035000 2.805000 ;
+        RECT 15.325000 2.635000 15.495000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 22.965000 2.635000 29.015000 2.805000 ;
         RECT 23.485000 1.835000 23.755000 2.635000 ;
         RECT 23.485000 2.805000 23.755000 3.605000 ;
@@ -909,79 +825,7 @@
         RECT 27.285000 2.805000 27.555000 3.605000 ;
         RECT 28.225000 1.835000 28.495000 2.635000 ;
         RECT 28.225000 2.805000 28.495000 3.605000 ;
-        RECT 30.625000 2.635000 34.695000 2.805000 ;
-        RECT 31.170000 1.605000 31.445000 2.635000 ;
-        RECT 31.170000 2.805000 31.445000 3.835000 ;
-        RECT 32.140000 1.605000 32.440000 2.635000 ;
-        RECT 32.140000 2.805000 32.440000 3.835000 ;
-        RECT 32.880000 1.605000 33.180000 2.635000 ;
-        RECT 32.880000 2.805000 33.180000 3.835000 ;
-        RECT 33.875000 1.605000 34.150000 2.635000 ;
-        RECT 33.875000 2.805000 34.150000 3.835000 ;
-        RECT 36.305000 2.635000 41.895000 2.805000 ;
-        RECT 36.825000 1.835000 37.095000 2.635000 ;
-        RECT 36.825000 2.805000 37.095000 3.605000 ;
-        RECT 37.765000 1.835000 38.035000 2.635000 ;
-        RECT 37.765000 2.805000 38.035000 3.605000 ;
-        RECT 38.705000 1.495000 38.975000 2.635000 ;
-        RECT 38.705000 2.805000 38.975000 3.945000 ;
-        RECT 39.225000 1.495000 39.495000 2.635000 ;
-        RECT 39.225000 2.805000 39.495000 3.945000 ;
-        RECT 40.165000 1.835000 40.435000 2.635000 ;
-        RECT 40.165000 2.805000 40.435000 3.605000 ;
-        RECT 41.105000 1.835000 41.375000 2.635000 ;
-        RECT 41.105000 2.805000 41.375000 3.605000 ;
-        RECT 43.505000 2.635000 47.575000 2.805000 ;
-        RECT 44.050000 1.605000 44.325000 2.635000 ;
-        RECT 44.050000 2.805000 44.325000 3.835000 ;
-        RECT 45.020000 1.605000 45.320000 2.635000 ;
-        RECT 45.020000 2.805000 45.320000 3.835000 ;
-        RECT 45.760000 1.605000 46.060000 2.635000 ;
-        RECT 45.760000 2.805000 46.060000 3.835000 ;
-        RECT 46.755000 1.605000 47.030000 2.635000 ;
-        RECT 46.755000 2.805000 47.030000 3.835000 ;
-        RECT 49.185000 2.635000 51.980000 2.805000 ;
-        RECT 49.705000 1.835000 49.975000 2.635000 ;
-        RECT 49.705000 2.805000 49.975000 3.605000 ;
-        RECT 50.645000 1.835000 50.915000 2.635000 ;
-        RECT 50.645000 2.805000 50.915000 3.605000 ;
-        RECT 51.585000 1.495000 51.855000 2.635000 ;
-        RECT 51.585000 2.805000 51.855000 3.945000 ;
       LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 17.625000 2.635000 17.795000 2.805000 ;
-        RECT 18.085000 2.635000 18.255000 2.805000 ;
-        RECT 18.545000 2.635000 18.715000 2.805000 ;
-        RECT 19.005000 2.635000 19.175000 2.805000 ;
-        RECT 19.465000 2.635000 19.635000 2.805000 ;
-        RECT 19.925000 2.635000 20.095000 2.805000 ;
-        RECT 20.385000 2.635000 20.555000 2.805000 ;
-        RECT 20.845000 2.635000 21.015000 2.805000 ;
         RECT 23.145000 2.635000 23.315000 2.805000 ;
         RECT 23.605000 2.635000 23.775000 2.805000 ;
         RECT 24.065000 2.635000 24.235000 2.805000 ;
@@ -995,14 +839,23 @@
         RECT 27.745000 2.635000 27.915000 2.805000 ;
         RECT 28.205000 2.635000 28.375000 2.805000 ;
         RECT 28.665000 2.635000 28.835000 2.805000 ;
-        RECT 30.965000 2.635000 31.135000 2.805000 ;
-        RECT 31.425000 2.635000 31.595000 2.805000 ;
-        RECT 31.885000 2.635000 32.055000 2.805000 ;
-        RECT 32.345000 2.635000 32.515000 2.805000 ;
-        RECT 32.805000 2.635000 32.975000 2.805000 ;
-        RECT 33.265000 2.635000 33.435000 2.805000 ;
-        RECT 33.725000 2.635000 33.895000 2.805000 ;
-        RECT 34.185000 2.635000 34.355000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 36.305000 2.635000 41.895000 2.805000 ;
+        RECT 36.825000 1.835000 37.095000 2.635000 ;
+        RECT 36.825000 2.805000 37.095000 3.605000 ;
+        RECT 37.765000 1.835000 38.035000 2.635000 ;
+        RECT 37.765000 2.805000 38.035000 3.605000 ;
+        RECT 38.705000 1.495000 38.975000 2.635000 ;
+        RECT 38.705000 2.805000 38.975000 3.945000 ;
+        RECT 39.225000 1.495000 39.495000 2.635000 ;
+        RECT 39.225000 2.805000 39.495000 3.945000 ;
+        RECT 40.165000 1.835000 40.435000 2.635000 ;
+        RECT 40.165000 2.805000 40.435000 3.605000 ;
+        RECT 41.105000 1.835000 41.375000 2.635000 ;
+        RECT 41.105000 2.805000 41.375000 3.605000 ;
+      LAYER mcon ;
         RECT 36.485000 2.635000 36.655000 2.805000 ;
         RECT 36.945000 2.635000 37.115000 2.805000 ;
         RECT 37.405000 2.635000 37.575000 2.805000 ;
@@ -1015,20 +868,25 @@
         RECT 40.625000 2.635000 40.795000 2.805000 ;
         RECT 41.085000 2.635000 41.255000 2.805000 ;
         RECT 41.545000 2.635000 41.715000 2.805000 ;
-        RECT 43.845000 2.635000 44.015000 2.805000 ;
-        RECT 44.305000 2.635000 44.475000 2.805000 ;
-        RECT 44.765000 2.635000 44.935000 2.805000 ;
-        RECT 45.225000 2.635000 45.395000 2.805000 ;
-        RECT 45.685000 2.635000 45.855000 2.805000 ;
-        RECT 46.145000 2.635000 46.315000 2.805000 ;
-        RECT 46.605000 2.635000 46.775000 2.805000 ;
-        RECT 47.065000 2.635000 47.235000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 49.185000 2.635000 51.980000 2.805000 ;
+        RECT 49.705000 1.835000 49.975000 2.635000 ;
+        RECT 49.705000 2.805000 49.975000 3.605000 ;
+        RECT 50.645000 1.835000 50.915000 2.635000 ;
+        RECT 50.645000 2.805000 50.915000 3.605000 ;
+        RECT 51.585000 1.495000 51.855000 2.635000 ;
+        RECT 51.585000 2.805000 51.855000 3.945000 ;
+      LAYER mcon ;
         RECT 49.365000 2.635000 49.535000 2.805000 ;
         RECT 49.825000 2.635000 49.995000 2.805000 ;
         RECT 50.285000 2.635000 50.455000 2.805000 ;
         RECT 50.745000 2.635000 50.915000 2.805000 ;
         RECT 51.205000 2.635000 51.375000 2.805000 ;
         RECT 51.665000 2.635000 51.835000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 51.980000 2.960000 ;
     END
@@ -1061,8 +919,11 @@
       RECT  4.205000 4.670000  4.455000 5.015000 ;
       RECT  4.405000 1.065000  5.590000 1.395000 ;
       RECT  4.405000 1.565000  4.705000 2.465000 ;
+      RECT  4.405000 2.635000  8.475000 2.805000 ;
       RECT  4.405000 2.975000  4.705000 3.875000 ;
       RECT  4.405000 4.045000  5.590000 4.375000 ;
+      RECT  4.950000 1.605000  5.225000 2.635000 ;
+      RECT  4.950000 2.805000  5.225000 3.835000 ;
       RECT  5.420000 0.280000  5.670000 0.825000 ;
       RECT  5.420000 0.825000  5.590000 1.065000 ;
       RECT  5.420000 1.395000  5.590000 1.605000 ;
@@ -1071,6 +932,10 @@
       RECT  5.420000 3.835000  5.590000 4.045000 ;
       RECT  5.420000 4.375000  5.590000 4.615000 ;
       RECT  5.420000 4.615000  5.670000 5.160000 ;
+      RECT  5.920000 1.605000  6.220000 2.635000 ;
+      RECT  5.920000 2.805000  6.220000 3.835000 ;
+      RECT  6.660000 1.605000  6.960000 2.635000 ;
+      RECT  6.660000 2.805000  6.960000 3.835000 ;
       RECT  7.130000 1.605000  7.460000 2.465000 ;
       RECT  7.130000 2.975000  7.460000 3.835000 ;
       RECT  7.210000 0.280000  7.460000 0.825000 ;
@@ -1081,16 +946,28 @@
       RECT  7.290000 3.835000  7.460000 4.045000 ;
       RECT  7.290000 4.045000  8.475000 4.375000 ;
       RECT  7.290000 4.375000  7.460000 4.615000 ;
+      RECT  7.655000 1.605000  7.930000 2.635000 ;
+      RECT  7.655000 2.805000  7.930000 3.835000 ;
       RECT  8.175000 1.565000  8.475000 2.465000 ;
       RECT  8.175000 2.975000  8.475000 3.875000 ;
       RECT  8.425000 0.255000 10.455000 0.425000 ;
       RECT  8.425000 0.425000  8.675000 0.770000 ;
       RECT  8.425000 4.670000  8.675000 5.015000 ;
       RECT  8.425000 5.015000 10.455000 5.185000 ;
+      RECT  8.645000 1.065000  9.915000 1.365000 ;
+      RECT  8.645000 1.365000  8.975000 4.075000 ;
+      RECT  8.645000 4.075000  9.915000 4.375000 ;
+      RECT  8.845000 0.595000  9.175000 1.065000 ;
+      RECT  8.845000 4.375000  9.175000 4.845000 ;
       RECT  9.145000 1.535000  9.415000 2.465000 ;
       RECT  9.145000 2.975000  9.415000 3.905000 ;
       RECT  9.345000 0.425000  9.515000 0.770000 ;
       RECT  9.345000 4.670000  9.515000 5.015000 ;
+      RECT  9.585000 1.365000  9.915000 4.075000 ;
+      RECT  9.685000 0.595000 10.015000 0.885000 ;
+      RECT  9.685000 0.885000  9.915000 1.065000 ;
+      RECT  9.685000 4.375000  9.915000 4.555000 ;
+      RECT  9.685000 4.555000 10.015000 4.845000 ;
       RECT 10.085000 1.495000 12.315000 1.665000 ;
       RECT 10.085000 1.665000 10.385000 2.465000 ;
       RECT 10.085000 2.975000 10.385000 3.775000 ;
@@ -1125,16 +1002,29 @@
       RECT 15.305000 5.015000 17.335000 5.185000 ;
       RECT 15.375000 1.665000 15.675000 2.465000 ;
       RECT 15.375000 2.975000 15.675000 3.775000 ;
+      RECT 15.745000 0.595000 16.075000 0.885000 ;
+      RECT 15.745000 4.555000 16.075000 4.845000 ;
+      RECT 15.845000 0.885000 16.075000 1.065000 ;
+      RECT 15.845000 1.065000 17.115000 1.365000 ;
+      RECT 15.845000 1.365000 16.175000 4.075000 ;
+      RECT 15.845000 4.075000 17.115000 4.375000 ;
+      RECT 15.845000 4.375000 16.075000 4.555000 ;
       RECT 16.245000 0.425000 16.415000 0.770000 ;
       RECT 16.245000 4.670000 16.415000 5.015000 ;
       RECT 16.345000 1.535000 16.615000 2.465000 ;
       RECT 16.345000 2.975000 16.615000 3.905000 ;
+      RECT 16.585000 0.595000 16.915000 1.065000 ;
+      RECT 16.585000 4.375000 16.915000 4.845000 ;
+      RECT 16.785000 1.365000 17.115000 4.075000 ;
       RECT 17.085000 0.425000 17.335000 0.770000 ;
       RECT 17.085000 4.670000 17.335000 5.015000 ;
       RECT 17.285000 1.065000 18.470000 1.395000 ;
       RECT 17.285000 1.565000 17.585000 2.465000 ;
+      RECT 17.285000 2.635000 21.355000 2.805000 ;
       RECT 17.285000 2.975000 17.585000 3.875000 ;
       RECT 17.285000 4.045000 18.470000 4.375000 ;
+      RECT 17.830000 1.605000 18.105000 2.635000 ;
+      RECT 17.830000 2.805000 18.105000 3.835000 ;
       RECT 18.300000 0.280000 18.550000 0.825000 ;
       RECT 18.300000 0.825000 18.470000 1.065000 ;
       RECT 18.300000 1.395000 18.470000 1.605000 ;
@@ -1143,6 +1033,10 @@
       RECT 18.300000 3.835000 18.470000 4.045000 ;
       RECT 18.300000 4.375000 18.470000 4.615000 ;
       RECT 18.300000 4.615000 18.550000 5.160000 ;
+      RECT 18.800000 1.605000 19.100000 2.635000 ;
+      RECT 18.800000 2.805000 19.100000 3.835000 ;
+      RECT 19.540000 1.605000 19.840000 2.635000 ;
+      RECT 19.540000 2.805000 19.840000 3.835000 ;
       RECT 20.010000 1.605000 20.340000 2.465000 ;
       RECT 20.010000 2.975000 20.340000 3.835000 ;
       RECT 20.090000 0.280000 20.340000 0.825000 ;
@@ -1153,16 +1047,28 @@
       RECT 20.170000 3.835000 20.340000 4.045000 ;
       RECT 20.170000 4.045000 21.355000 4.375000 ;
       RECT 20.170000 4.375000 20.340000 4.615000 ;
+      RECT 20.535000 1.605000 20.810000 2.635000 ;
+      RECT 20.535000 2.805000 20.810000 3.835000 ;
       RECT 21.055000 1.565000 21.355000 2.465000 ;
       RECT 21.055000 2.975000 21.355000 3.875000 ;
       RECT 21.305000 0.255000 23.335000 0.425000 ;
       RECT 21.305000 0.425000 21.555000 0.770000 ;
       RECT 21.305000 4.670000 21.555000 5.015000 ;
       RECT 21.305000 5.015000 23.335000 5.185000 ;
+      RECT 21.525000 1.065000 22.795000 1.365000 ;
+      RECT 21.525000 1.365000 21.855000 4.075000 ;
+      RECT 21.525000 4.075000 22.795000 4.375000 ;
+      RECT 21.725000 0.595000 22.055000 1.065000 ;
+      RECT 21.725000 4.375000 22.055000 4.845000 ;
       RECT 22.025000 1.535000 22.295000 2.465000 ;
       RECT 22.025000 2.975000 22.295000 3.905000 ;
       RECT 22.225000 0.425000 22.395000 0.770000 ;
       RECT 22.225000 4.670000 22.395000 5.015000 ;
+      RECT 22.465000 1.365000 22.795000 4.075000 ;
+      RECT 22.565000 0.595000 22.895000 0.885000 ;
+      RECT 22.565000 0.885000 22.795000 1.065000 ;
+      RECT 22.565000 4.375000 22.795000 4.555000 ;
+      RECT 22.565000 4.555000 22.895000 4.845000 ;
       RECT 22.965000 1.495000 25.195000 1.665000 ;
       RECT 22.965000 1.665000 23.265000 2.465000 ;
       RECT 22.965000 2.975000 23.265000 3.775000 ;
@@ -1197,16 +1103,29 @@
       RECT 28.645000 5.015000 30.675000 5.185000 ;
       RECT 28.715000 1.665000 29.015000 2.465000 ;
       RECT 28.715000 2.975000 29.015000 3.775000 ;
+      RECT 29.085000 0.595000 29.415000 0.885000 ;
+      RECT 29.085000 4.555000 29.415000 4.845000 ;
+      RECT 29.185000 0.885000 29.415000 1.065000 ;
+      RECT 29.185000 1.065000 30.455000 1.365000 ;
+      RECT 29.185000 1.365000 29.515000 4.075000 ;
+      RECT 29.185000 4.075000 30.455000 4.375000 ;
+      RECT 29.185000 4.375000 29.415000 4.555000 ;
       RECT 29.585000 0.425000 29.755000 0.770000 ;
       RECT 29.585000 4.670000 29.755000 5.015000 ;
       RECT 29.685000 1.535000 29.955000 2.465000 ;
       RECT 29.685000 2.975000 29.955000 3.905000 ;
+      RECT 29.925000 0.595000 30.255000 1.065000 ;
+      RECT 29.925000 4.375000 30.255000 4.845000 ;
+      RECT 30.125000 1.365000 30.455000 4.075000 ;
       RECT 30.425000 0.425000 30.675000 0.770000 ;
       RECT 30.425000 4.670000 30.675000 5.015000 ;
       RECT 30.625000 1.065000 31.810000 1.395000 ;
       RECT 30.625000 1.565000 30.925000 2.465000 ;
+      RECT 30.625000 2.635000 34.695000 2.805000 ;
       RECT 30.625000 2.975000 30.925000 3.875000 ;
       RECT 30.625000 4.045000 31.810000 4.375000 ;
+      RECT 31.170000 1.605000 31.445000 2.635000 ;
+      RECT 31.170000 2.805000 31.445000 3.835000 ;
       RECT 31.640000 0.280000 31.890000 0.825000 ;
       RECT 31.640000 0.825000 31.810000 1.065000 ;
       RECT 31.640000 1.395000 31.810000 1.605000 ;
@@ -1215,6 +1134,10 @@
       RECT 31.640000 3.835000 31.810000 4.045000 ;
       RECT 31.640000 4.375000 31.810000 4.615000 ;
       RECT 31.640000 4.615000 31.890000 5.160000 ;
+      RECT 32.140000 1.605000 32.440000 2.635000 ;
+      RECT 32.140000 2.805000 32.440000 3.835000 ;
+      RECT 32.880000 1.605000 33.180000 2.635000 ;
+      RECT 32.880000 2.805000 33.180000 3.835000 ;
       RECT 33.350000 1.605000 33.680000 2.465000 ;
       RECT 33.350000 2.975000 33.680000 3.835000 ;
       RECT 33.430000 0.280000 33.680000 0.825000 ;
@@ -1225,16 +1148,28 @@
       RECT 33.510000 3.835000 33.680000 4.045000 ;
       RECT 33.510000 4.045000 34.695000 4.375000 ;
       RECT 33.510000 4.375000 33.680000 4.615000 ;
+      RECT 33.875000 1.605000 34.150000 2.635000 ;
+      RECT 33.875000 2.805000 34.150000 3.835000 ;
       RECT 34.395000 1.565000 34.695000 2.465000 ;
       RECT 34.395000 2.975000 34.695000 3.875000 ;
       RECT 34.645000 0.255000 36.675000 0.425000 ;
       RECT 34.645000 0.425000 34.895000 0.770000 ;
       RECT 34.645000 4.670000 34.895000 5.015000 ;
       RECT 34.645000 5.015000 36.675000 5.185000 ;
+      RECT 34.865000 1.065000 36.135000 1.365000 ;
+      RECT 34.865000 1.365000 35.195000 4.075000 ;
+      RECT 34.865000 4.075000 36.135000 4.375000 ;
+      RECT 35.065000 0.595000 35.395000 1.065000 ;
+      RECT 35.065000 4.375000 35.395000 4.845000 ;
       RECT 35.365000 1.535000 35.635000 2.465000 ;
       RECT 35.365000 2.975000 35.635000 3.905000 ;
       RECT 35.565000 0.425000 35.735000 0.770000 ;
       RECT 35.565000 4.670000 35.735000 5.015000 ;
+      RECT 35.805000 1.365000 36.135000 4.075000 ;
+      RECT 35.905000 0.595000 36.235000 0.885000 ;
+      RECT 35.905000 0.885000 36.135000 1.065000 ;
+      RECT 35.905000 4.375000 36.135000 4.555000 ;
+      RECT 35.905000 4.555000 36.235000 4.845000 ;
       RECT 36.305000 1.495000 38.535000 1.665000 ;
       RECT 36.305000 1.665000 36.605000 2.465000 ;
       RECT 36.305000 2.975000 36.605000 3.775000 ;
@@ -1269,16 +1204,29 @@
       RECT 41.525000 5.015000 43.555000 5.185000 ;
       RECT 41.595000 1.665000 41.895000 2.465000 ;
       RECT 41.595000 2.975000 41.895000 3.775000 ;
+      RECT 41.965000 0.595000 42.295000 0.885000 ;
+      RECT 41.965000 4.555000 42.295000 4.845000 ;
+      RECT 42.065000 0.885000 42.295000 1.065000 ;
+      RECT 42.065000 1.065000 43.335000 1.365000 ;
+      RECT 42.065000 1.365000 42.395000 4.075000 ;
+      RECT 42.065000 4.075000 43.335000 4.375000 ;
+      RECT 42.065000 4.375000 42.295000 4.555000 ;
       RECT 42.465000 0.425000 42.635000 0.770000 ;
       RECT 42.465000 4.670000 42.635000 5.015000 ;
       RECT 42.565000 1.535000 42.835000 2.465000 ;
       RECT 42.565000 2.975000 42.835000 3.905000 ;
+      RECT 42.805000 0.595000 43.135000 1.065000 ;
+      RECT 42.805000 4.375000 43.135000 4.845000 ;
+      RECT 43.005000 1.365000 43.335000 4.075000 ;
       RECT 43.305000 0.425000 43.555000 0.770000 ;
       RECT 43.305000 4.670000 43.555000 5.015000 ;
       RECT 43.505000 1.065000 44.690000 1.395000 ;
       RECT 43.505000 1.565000 43.805000 2.465000 ;
+      RECT 43.505000 2.635000 47.575000 2.805000 ;
       RECT 43.505000 2.975000 43.805000 3.875000 ;
       RECT 43.505000 4.045000 44.690000 4.375000 ;
+      RECT 44.050000 1.605000 44.325000 2.635000 ;
+      RECT 44.050000 2.805000 44.325000 3.835000 ;
       RECT 44.520000 0.280000 44.770000 0.825000 ;
       RECT 44.520000 0.825000 44.690000 1.065000 ;
       RECT 44.520000 1.395000 44.690000 1.605000 ;
@@ -1287,6 +1235,10 @@
       RECT 44.520000 3.835000 44.690000 4.045000 ;
       RECT 44.520000 4.375000 44.690000 4.615000 ;
       RECT 44.520000 4.615000 44.770000 5.160000 ;
+      RECT 45.020000 1.605000 45.320000 2.635000 ;
+      RECT 45.020000 2.805000 45.320000 3.835000 ;
+      RECT 45.760000 1.605000 46.060000 2.635000 ;
+      RECT 45.760000 2.805000 46.060000 3.835000 ;
       RECT 46.230000 1.605000 46.560000 2.465000 ;
       RECT 46.230000 2.975000 46.560000 3.835000 ;
       RECT 46.310000 0.280000 46.560000 0.825000 ;
@@ -1297,16 +1249,28 @@
       RECT 46.390000 3.835000 46.560000 4.045000 ;
       RECT 46.390000 4.045000 47.575000 4.375000 ;
       RECT 46.390000 4.375000 46.560000 4.615000 ;
+      RECT 46.755000 1.605000 47.030000 2.635000 ;
+      RECT 46.755000 2.805000 47.030000 3.835000 ;
       RECT 47.275000 1.565000 47.575000 2.465000 ;
       RECT 47.275000 2.975000 47.575000 3.875000 ;
       RECT 47.525000 0.255000 49.555000 0.425000 ;
       RECT 47.525000 0.425000 47.775000 0.770000 ;
       RECT 47.525000 4.670000 47.775000 5.015000 ;
       RECT 47.525000 5.015000 49.555000 5.185000 ;
+      RECT 47.745000 1.065000 49.015000 1.365000 ;
+      RECT 47.745000 1.365000 48.075000 4.075000 ;
+      RECT 47.745000 4.075000 49.015000 4.375000 ;
+      RECT 47.945000 0.595000 48.275000 1.065000 ;
+      RECT 47.945000 4.375000 48.275000 4.845000 ;
       RECT 48.245000 1.535000 48.515000 2.465000 ;
       RECT 48.245000 2.975000 48.515000 3.905000 ;
       RECT 48.445000 0.425000 48.615000 0.770000 ;
       RECT 48.445000 4.670000 48.615000 5.015000 ;
+      RECT 48.685000 1.365000 49.015000 4.075000 ;
+      RECT 48.785000 0.595000 49.115000 0.885000 ;
+      RECT 48.785000 0.885000 49.015000 1.065000 ;
+      RECT 48.785000 4.375000 49.015000 4.555000 ;
+      RECT 48.785000 4.555000 49.115000 4.845000 ;
       RECT 49.185000 1.495000 51.415000 1.665000 ;
       RECT 49.185000 1.665000 49.485000 2.465000 ;
       RECT 49.185000 2.975000 49.485000 3.775000 ;
@@ -1334,10 +1298,22 @@
       RECT  3.515000 3.130000  3.685000 3.300000 ;
       RECT  4.465000 2.140000  4.635000 2.310000 ;
       RECT  4.465000 3.130000  4.635000 3.300000 ;
+      RECT  4.745000 2.635000  4.915000 2.805000 ;
+      RECT  5.205000 2.635000  5.375000 2.805000 ;
+      RECT  5.665000 2.635000  5.835000 2.805000 ;
+      RECT  6.125000 2.635000  6.295000 2.805000 ;
+      RECT  6.585000 2.635000  6.755000 2.805000 ;
+      RECT  7.045000 2.635000  7.215000 2.805000 ;
+      RECT  7.505000 2.635000  7.675000 2.805000 ;
+      RECT  7.965000 2.635000  8.135000 2.805000 ;
       RECT  8.245000 2.140000  8.415000 2.310000 ;
       RECT  8.245000 3.130000  8.415000 3.300000 ;
+      RECT  8.725000 1.785000  8.895000 1.955000 ;
+      RECT  8.725000 3.485000  8.895000 3.655000 ;
       RECT  9.195000 2.140000  9.365000 2.310000 ;
       RECT  9.195000 3.130000  9.365000 3.300000 ;
+      RECT  9.665000 1.785000  9.835000 1.955000 ;
+      RECT  9.665000 3.485000  9.835000 3.655000 ;
       RECT 10.145000 2.140000 10.315000 2.310000 ;
       RECT 10.145000 3.130000 10.315000 3.300000 ;
       RECT 11.125000 2.140000 11.295000 2.310000 ;
@@ -1350,14 +1326,30 @@
       RECT 14.465000 3.130000 14.635000 3.300000 ;
       RECT 15.445000 2.140000 15.615000 2.310000 ;
       RECT 15.445000 3.130000 15.615000 3.300000 ;
+      RECT 15.925000 1.785000 16.095000 1.955000 ;
+      RECT 15.925000 3.485000 16.095000 3.655000 ;
       RECT 16.395000 2.140000 16.565000 2.310000 ;
       RECT 16.395000 3.130000 16.565000 3.300000 ;
+      RECT 16.865000 1.785000 17.035000 1.955000 ;
+      RECT 16.865000 3.485000 17.035000 3.655000 ;
       RECT 17.345000 2.140000 17.515000 2.310000 ;
       RECT 17.345000 3.130000 17.515000 3.300000 ;
+      RECT 17.625000 2.635000 17.795000 2.805000 ;
+      RECT 18.085000 2.635000 18.255000 2.805000 ;
+      RECT 18.545000 2.635000 18.715000 2.805000 ;
+      RECT 19.005000 2.635000 19.175000 2.805000 ;
+      RECT 19.465000 2.635000 19.635000 2.805000 ;
+      RECT 19.925000 2.635000 20.095000 2.805000 ;
+      RECT 20.385000 2.635000 20.555000 2.805000 ;
+      RECT 20.845000 2.635000 21.015000 2.805000 ;
       RECT 21.125000 2.140000 21.295000 2.310000 ;
       RECT 21.125000 3.130000 21.295000 3.300000 ;
+      RECT 21.605000 1.785000 21.775000 1.955000 ;
+      RECT 21.605000 3.485000 21.775000 3.655000 ;
       RECT 22.075000 2.140000 22.245000 2.310000 ;
       RECT 22.075000 3.130000 22.245000 3.300000 ;
+      RECT 22.545000 1.785000 22.715000 1.955000 ;
+      RECT 22.545000 3.485000 22.715000 3.655000 ;
       RECT 23.025000 2.140000 23.195000 2.310000 ;
       RECT 23.025000 3.130000 23.195000 3.300000 ;
       RECT 24.005000 2.140000 24.175000 2.310000 ;
@@ -1370,14 +1362,30 @@
       RECT 27.805000 3.130000 27.975000 3.300000 ;
       RECT 28.785000 2.140000 28.955000 2.310000 ;
       RECT 28.785000 3.130000 28.955000 3.300000 ;
+      RECT 29.265000 1.785000 29.435000 1.955000 ;
+      RECT 29.265000 3.485000 29.435000 3.655000 ;
       RECT 29.735000 2.140000 29.905000 2.310000 ;
       RECT 29.735000 3.130000 29.905000 3.300000 ;
+      RECT 30.205000 1.785000 30.375000 1.955000 ;
+      RECT 30.205000 3.485000 30.375000 3.655000 ;
       RECT 30.685000 2.140000 30.855000 2.310000 ;
       RECT 30.685000 3.130000 30.855000 3.300000 ;
+      RECT 30.965000 2.635000 31.135000 2.805000 ;
+      RECT 31.425000 2.635000 31.595000 2.805000 ;
+      RECT 31.885000 2.635000 32.055000 2.805000 ;
+      RECT 32.345000 2.635000 32.515000 2.805000 ;
+      RECT 32.805000 2.635000 32.975000 2.805000 ;
+      RECT 33.265000 2.635000 33.435000 2.805000 ;
+      RECT 33.725000 2.635000 33.895000 2.805000 ;
+      RECT 34.185000 2.635000 34.355000 2.805000 ;
       RECT 34.465000 2.140000 34.635000 2.310000 ;
       RECT 34.465000 3.130000 34.635000 3.300000 ;
+      RECT 34.945000 1.785000 35.115000 1.955000 ;
+      RECT 34.945000 3.485000 35.115000 3.655000 ;
       RECT 35.415000 2.140000 35.585000 2.310000 ;
       RECT 35.415000 3.130000 35.585000 3.300000 ;
+      RECT 35.885000 1.785000 36.055000 1.955000 ;
+      RECT 35.885000 3.485000 36.055000 3.655000 ;
       RECT 36.365000 2.140000 36.535000 2.310000 ;
       RECT 36.365000 3.130000 36.535000 3.300000 ;
       RECT 37.345000 2.140000 37.515000 2.310000 ;
@@ -1390,14 +1398,30 @@
       RECT 40.685000 3.130000 40.855000 3.300000 ;
       RECT 41.665000 2.140000 41.835000 2.310000 ;
       RECT 41.665000 3.130000 41.835000 3.300000 ;
+      RECT 42.145000 1.785000 42.315000 1.955000 ;
+      RECT 42.145000 3.485000 42.315000 3.655000 ;
       RECT 42.615000 2.140000 42.785000 2.310000 ;
       RECT 42.615000 3.130000 42.785000 3.300000 ;
+      RECT 43.085000 1.785000 43.255000 1.955000 ;
+      RECT 43.085000 3.485000 43.255000 3.655000 ;
       RECT 43.565000 2.140000 43.735000 2.310000 ;
       RECT 43.565000 3.130000 43.735000 3.300000 ;
+      RECT 43.845000 2.635000 44.015000 2.805000 ;
+      RECT 44.305000 2.635000 44.475000 2.805000 ;
+      RECT 44.765000 2.635000 44.935000 2.805000 ;
+      RECT 45.225000 2.635000 45.395000 2.805000 ;
+      RECT 45.685000 2.635000 45.855000 2.805000 ;
+      RECT 46.145000 2.635000 46.315000 2.805000 ;
+      RECT 46.605000 2.635000 46.775000 2.805000 ;
+      RECT 47.065000 2.635000 47.235000 2.805000 ;
       RECT 47.345000 2.140000 47.515000 2.310000 ;
       RECT 47.345000 3.130000 47.515000 3.300000 ;
+      RECT 47.825000 1.785000 47.995000 1.955000 ;
+      RECT 47.825000 3.485000 47.995000 3.655000 ;
       RECT 48.295000 2.140000 48.465000 2.310000 ;
       RECT 48.295000 3.130000 48.465000 3.300000 ;
+      RECT 48.765000 1.785000 48.935000 1.955000 ;
+      RECT 48.765000 3.485000 48.935000 3.655000 ;
       RECT 49.245000 2.140000 49.415000 2.310000 ;
       RECT 49.245000 3.130000 49.415000 3.300000 ;
       RECT 50.225000 2.140000 50.395000 2.310000 ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
index e236707..4feaea2 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_1.magic.lef
@@ -119,36 +119,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.900000 0.835000 1.290000 1.005000 ;
-        RECT 0.900000 1.005000 1.070000 1.755000 ;
-        RECT 0.900000 1.755000 1.295000 1.805000 ;
-        RECT 0.900000 1.805000 1.420000 1.985000 ;
-        RECT 1.045000 0.330000 1.290000 0.835000 ;
-        RECT 1.090000 1.985000 1.420000 2.465000 ;
-        RECT 3.180000 1.805000 3.700000 1.985000 ;
-        RECT 3.180000 1.985000 3.510000 2.465000 ;
-        RECT 3.305000 1.755000 3.700000 1.805000 ;
-        RECT 3.310000 0.330000 3.555000 0.835000 ;
-        RECT 3.310000 0.835000 3.700000 1.005000 ;
-        RECT 3.530000 1.005000 3.700000 1.755000 ;
-        RECT 5.040000 0.835000 5.430000 1.005000 ;
-        RECT 5.040000 1.005000 5.210000 1.755000 ;
-        RECT 5.040000 1.755000 5.435000 1.805000 ;
-        RECT 5.040000 1.805000 5.560000 1.985000 ;
-        RECT 5.185000 0.330000 5.430000 0.835000 ;
-        RECT 5.230000 1.985000 5.560000 2.465000 ;
-        RECT 7.320000 1.805000 7.840000 1.985000 ;
-        RECT 7.320000 1.985000 7.650000 2.465000 ;
-        RECT 7.445000 1.755000 7.840000 1.805000 ;
-        RECT 7.450000 0.330000 7.695000 0.835000 ;
-        RECT 7.450000 0.835000 7.840000 1.005000 ;
-        RECT 7.670000 1.005000 7.840000 1.755000 ;
-      LAYER mcon ;
-        RECT 1.065000 1.785000 1.235000 1.955000 ;
-        RECT 3.365000 1.785000 3.535000 1.955000 ;
-        RECT 5.205000 1.785000 5.375000 1.955000 ;
-        RECT 7.505000 1.785000 7.675000 1.955000 ;
       LAYER met1 ;
         RECT 1.005000 1.755000 1.295000 1.800000 ;
         RECT 1.005000 1.800000 7.735000 1.940000 ;
@@ -165,33 +135,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.130000  0.085000 0.390000 0.885000 ;
-        RECT 2.135000  0.085000 2.465000 0.660000 ;
-        RECT 4.210000  0.085000 4.530000 0.885000 ;
-        RECT 6.275000  0.085000 6.605000 0.660000 ;
-        RECT 8.350000  0.085000 8.610000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -200,67 +143,119 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.095000 1.495000 0.425000 2.635000 ;
-        RECT 2.165000 1.465000 2.465000 2.635000 ;
-        RECT 4.175000 1.495000 4.565000 2.635000 ;
-        RECT 6.275000 1.465000 6.575000 2.635000 ;
-        RECT 8.315000 1.495000 8.645000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.240000 1.175000 1.630000 1.465000 ;
-      RECT 1.240000 1.465000 1.940000 1.505000 ;
-      RECT 1.460000 0.585000 1.900000 0.755000 ;
-      RECT 1.460000 0.755000 1.630000 1.175000 ;
-      RECT 1.460000 1.505000 1.940000 1.635000 ;
-      RECT 1.610000 1.635000 1.940000 2.465000 ;
-      RECT 1.650000 0.330000 1.900000 0.585000 ;
-      RECT 2.660000 1.465000 3.360000 1.505000 ;
-      RECT 2.660000 1.505000 3.140000 1.635000 ;
-      RECT 2.660000 1.635000 2.990000 2.465000 ;
-      RECT 2.700000 0.330000 2.950000 0.585000 ;
-      RECT 2.700000 0.585000 3.140000 0.755000 ;
-      RECT 2.970000 0.755000 3.140000 1.175000 ;
-      RECT 2.970000 1.175000 3.360000 1.465000 ;
-      RECT 5.380000 1.175000 5.770000 1.465000 ;
-      RECT 5.380000 1.465000 6.080000 1.505000 ;
-      RECT 5.600000 0.585000 6.040000 0.755000 ;
-      RECT 5.600000 0.755000 5.770000 1.175000 ;
-      RECT 5.600000 1.505000 6.080000 1.635000 ;
-      RECT 5.750000 1.635000 6.080000 2.465000 ;
-      RECT 5.790000 0.330000 6.040000 0.585000 ;
-      RECT 6.800000 1.465000 7.500000 1.505000 ;
-      RECT 6.800000 1.505000 7.280000 1.635000 ;
-      RECT 6.800000 1.635000 7.130000 2.465000 ;
-      RECT 6.840000 0.330000 7.090000 0.585000 ;
-      RECT 6.840000 0.585000 7.280000 0.755000 ;
-      RECT 7.110000 0.755000 7.280000 1.175000 ;
-      RECT 7.110000 1.175000 7.500000 1.465000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.095000  1.495000 0.425000 2.635000 ;
+      RECT 0.130000  0.085000 0.390000 0.885000 ;
+      RECT 0.900000  0.835000 1.290000 1.005000 ;
+      RECT 0.900000  1.005000 1.070000 1.755000 ;
+      RECT 0.900000  1.755000 1.295000 1.805000 ;
+      RECT 0.900000  1.805000 1.420000 1.985000 ;
+      RECT 1.045000  0.330000 1.290000 0.835000 ;
+      RECT 1.090000  1.985000 1.420000 2.465000 ;
+      RECT 1.240000  1.175000 1.630000 1.465000 ;
+      RECT 1.240000  1.465000 1.940000 1.505000 ;
+      RECT 1.460000  0.585000 1.900000 0.755000 ;
+      RECT 1.460000  0.755000 1.630000 1.175000 ;
+      RECT 1.460000  1.505000 1.940000 1.635000 ;
+      RECT 1.610000  1.635000 1.940000 2.465000 ;
+      RECT 1.650000  0.330000 1.900000 0.585000 ;
+      RECT 2.135000  0.085000 2.465000 0.660000 ;
+      RECT 2.165000  1.465000 2.465000 2.635000 ;
+      RECT 2.660000  1.465000 3.360000 1.505000 ;
+      RECT 2.660000  1.505000 3.140000 1.635000 ;
+      RECT 2.660000  1.635000 2.990000 2.465000 ;
+      RECT 2.700000  0.330000 2.950000 0.585000 ;
+      RECT 2.700000  0.585000 3.140000 0.755000 ;
+      RECT 2.970000  0.755000 3.140000 1.175000 ;
+      RECT 2.970000  1.175000 3.360000 1.465000 ;
+      RECT 3.180000  1.805000 3.700000 1.985000 ;
+      RECT 3.180000  1.985000 3.510000 2.465000 ;
+      RECT 3.305000  1.755000 3.700000 1.805000 ;
+      RECT 3.310000  0.330000 3.555000 0.835000 ;
+      RECT 3.310000  0.835000 3.700000 1.005000 ;
+      RECT 3.530000  1.005000 3.700000 1.755000 ;
+      RECT 4.175000  1.495000 4.565000 2.635000 ;
+      RECT 4.210000  0.085000 4.530000 0.885000 ;
+      RECT 5.040000  0.835000 5.430000 1.005000 ;
+      RECT 5.040000  1.005000 5.210000 1.755000 ;
+      RECT 5.040000  1.755000 5.435000 1.805000 ;
+      RECT 5.040000  1.805000 5.560000 1.985000 ;
+      RECT 5.185000  0.330000 5.430000 0.835000 ;
+      RECT 5.230000  1.985000 5.560000 2.465000 ;
+      RECT 5.380000  1.175000 5.770000 1.465000 ;
+      RECT 5.380000  1.465000 6.080000 1.505000 ;
+      RECT 5.600000  0.585000 6.040000 0.755000 ;
+      RECT 5.600000  0.755000 5.770000 1.175000 ;
+      RECT 5.600000  1.505000 6.080000 1.635000 ;
+      RECT 5.750000  1.635000 6.080000 2.465000 ;
+      RECT 5.790000  0.330000 6.040000 0.585000 ;
+      RECT 6.275000  0.085000 6.605000 0.660000 ;
+      RECT 6.275000  1.465000 6.575000 2.635000 ;
+      RECT 6.800000  1.465000 7.500000 1.505000 ;
+      RECT 6.800000  1.505000 7.280000 1.635000 ;
+      RECT 6.800000  1.635000 7.130000 2.465000 ;
+      RECT 6.840000  0.330000 7.090000 0.585000 ;
+      RECT 6.840000  0.585000 7.280000 0.755000 ;
+      RECT 7.110000  0.755000 7.280000 1.175000 ;
+      RECT 7.110000  1.175000 7.500000 1.465000 ;
+      RECT 7.320000  1.805000 7.840000 1.985000 ;
+      RECT 7.320000  1.985000 7.650000 2.465000 ;
+      RECT 7.445000  1.755000 7.840000 1.805000 ;
+      RECT 7.450000  0.330000 7.695000 0.835000 ;
+      RECT 7.450000  0.835000 7.840000 1.005000 ;
+      RECT 7.670000  1.005000 7.840000 1.755000 ;
+      RECT 8.315000  1.495000 8.645000 2.635000 ;
+      RECT 8.350000  0.085000 8.610000 0.885000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  1.785000 1.235000 1.955000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  1.785000 3.535000 1.955000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  1.785000 5.375000 1.955000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  1.785000 7.675000 1.955000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
index f35b183..05bac77 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_2.magic.lef
@@ -111,24 +111,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  1.465000 1.755000  1.895000 2.125000 ;
-        RECT  1.505000 0.595000  1.835000 0.885000 ;
-        RECT  1.585000 0.885000  1.755000 1.755000 ;
-        RECT  4.545000 1.755000  4.975000 2.125000 ;
-        RECT  4.605000 0.595000  4.935000 0.885000 ;
-        RECT  4.685000 0.885000  4.855000 1.755000 ;
-        RECT  7.905000 1.755000  8.335000 2.125000 ;
-        RECT  7.945000 0.595000  8.275000 0.885000 ;
-        RECT  8.025000 0.885000  8.195000 1.755000 ;
-        RECT 10.985000 1.755000 11.415000 2.125000 ;
-        RECT 11.045000 0.595000 11.375000 0.885000 ;
-        RECT 11.125000 0.885000 11.295000 1.755000 ;
-      LAYER mcon ;
-        RECT  1.525000 1.785000  1.695000 1.955000 ;
-        RECT  4.745000 1.785000  4.915000 1.955000 ;
-        RECT  7.965000 1.785000  8.135000 1.955000 ;
-        RECT 11.185000 1.785000 11.355000 1.955000 ;
       LAYER met1 ;
         RECT  1.465000 1.755000  1.755000 1.800000 ;
         RECT  1.465000 1.800000 11.415000 1.940000 ;
@@ -182,6 +164,8 @@
         RECT 11.645000 -0.085000 11.815000 0.085000 ;
         RECT 12.105000 -0.085000 12.275000 0.085000 ;
         RECT 12.565000 -0.085000 12.735000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
@@ -231,6 +215,8 @@
         RECT 11.645000 2.635000 11.815000 2.805000 ;
         RECT 12.105000 2.635000 12.275000 2.805000 ;
         RECT 12.565000 2.635000 12.735000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
@@ -247,6 +233,9 @@
       RECT  1.030000 0.885000  1.335000 0.925000 ;
       RECT  1.115000 1.665000  1.285000 2.295000 ;
       RECT  1.115000 2.295000  2.280000 2.465000 ;
+      RECT  1.465000 1.755000  1.895000 2.125000 ;
+      RECT  1.505000 0.595000  1.835000 0.885000 ;
+      RECT  1.585000 0.885000  1.755000 1.755000 ;
       RECT  2.005000 0.425000  2.175000 0.770000 ;
       RECT  2.100000 1.205000  2.515000 1.305000 ;
       RECT  2.100000 1.305000  2.620000 1.465000 ;
@@ -269,6 +258,9 @@
       RECT  4.160000 2.295000  5.325000 2.465000 ;
       RECT  4.265000 0.255000  5.410000 0.425000 ;
       RECT  4.265000 0.425000  4.435000 0.770000 ;
+      RECT  4.545000 1.755000  4.975000 2.125000 ;
+      RECT  4.605000 0.595000  4.935000 0.885000 ;
+      RECT  4.685000 0.885000  4.855000 1.755000 ;
       RECT  5.105000 0.425000  5.410000 0.715000 ;
       RECT  5.105000 0.715000  6.295000 0.885000 ;
       RECT  5.105000 0.885000  5.410000 0.925000 ;
@@ -287,6 +279,9 @@
       RECT  7.470000 0.885000  7.775000 0.925000 ;
       RECT  7.555000 1.665000  7.725000 2.295000 ;
       RECT  7.555000 2.295000  8.720000 2.465000 ;
+      RECT  7.905000 1.755000  8.335000 2.125000 ;
+      RECT  7.945000 0.595000  8.275000 0.885000 ;
+      RECT  8.025000 0.885000  8.195000 1.755000 ;
       RECT  8.445000 0.425000  8.615000 0.770000 ;
       RECT  8.540000 1.205000  8.955000 1.305000 ;
       RECT  8.540000 1.305000  9.060000 1.465000 ;
@@ -309,6 +304,9 @@
       RECT 10.600000 2.295000 11.765000 2.465000 ;
       RECT 10.705000 0.255000 11.850000 0.425000 ;
       RECT 10.705000 0.425000 10.875000 0.770000 ;
+      RECT 10.985000 1.755000 11.415000 2.125000 ;
+      RECT 11.045000 0.595000 11.375000 0.885000 ;
+      RECT 11.125000 0.885000 11.295000 1.755000 ;
       RECT 11.545000 0.425000 11.850000 0.715000 ;
       RECT 11.545000 0.715000 12.735000 0.885000 ;
       RECT 11.545000 0.885000 11.850000 0.925000 ;
@@ -317,6 +315,11 @@
       RECT 12.405000 0.255000 12.735000 0.715000 ;
       RECT 12.455000 2.210000 12.785000 2.465000 ;
       RECT 12.485000 1.665000 12.785000 2.210000 ;
+    LAYER mcon ;
+      RECT  1.525000 1.785000  1.695000 1.955000 ;
+      RECT  4.745000 1.785000  4.915000 1.955000 ;
+      RECT  7.965000 1.785000  8.135000 1.955000 ;
+      RECT 11.185000 1.785000 11.355000 1.955000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
index 81243c0..0ac20ff 100644
--- a/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
+++ b/cells/muxb4to1/sky130_fd_sc_hdll__muxb4to1_4.magic.lef
@@ -111,40 +111,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  2.865000 0.595000  3.195000 0.885000 ;
-        RECT  2.965000 0.885000  3.195000 1.065000 ;
-        RECT  2.965000 1.065000  4.235000 1.365000 ;
-        RECT  2.965000 1.365000  3.295000 2.125000 ;
-        RECT  3.705000 0.595000  4.035000 1.065000 ;
-        RECT  3.905000 1.365000  4.235000 2.125000 ;
-        RECT  8.645000 1.065000  9.915000 1.365000 ;
-        RECT  8.645000 1.365000  8.975000 2.125000 ;
-        RECT  8.845000 0.595000  9.175000 1.065000 ;
-        RECT  9.585000 1.365000  9.915000 2.125000 ;
-        RECT  9.685000 0.595000 10.015000 0.885000 ;
-        RECT  9.685000 0.885000  9.915000 1.065000 ;
-        RECT 15.745000 0.595000 16.075000 0.885000 ;
-        RECT 15.845000 0.885000 16.075000 1.065000 ;
-        RECT 15.845000 1.065000 17.115000 1.365000 ;
-        RECT 15.845000 1.365000 16.175000 2.125000 ;
-        RECT 16.585000 0.595000 16.915000 1.065000 ;
-        RECT 16.785000 1.365000 17.115000 2.125000 ;
-        RECT 21.525000 1.065000 22.795000 1.365000 ;
-        RECT 21.525000 1.365000 21.855000 2.125000 ;
-        RECT 21.725000 0.595000 22.055000 1.065000 ;
-        RECT 22.465000 1.365000 22.795000 2.125000 ;
-        RECT 22.565000 0.595000 22.895000 0.885000 ;
-        RECT 22.565000 0.885000 22.795000 1.065000 ;
-      LAYER mcon ;
-        RECT  3.045000 1.785000  3.215000 1.955000 ;
-        RECT  3.985000 1.785000  4.155000 1.955000 ;
-        RECT  8.725000 1.785000  8.895000 1.955000 ;
-        RECT  9.665000 1.785000  9.835000 1.955000 ;
-        RECT 15.925000 1.785000 16.095000 1.955000 ;
-        RECT 16.865000 1.785000 17.035000 1.955000 ;
-        RECT 21.605000 1.785000 21.775000 1.955000 ;
-        RECT 22.545000 1.785000 22.715000 1.955000 ;
       LAYER met1 ;
         RECT  2.985000 1.755000  3.275000 1.800000 ;
         RECT  2.985000 1.800000 22.775000 1.940000 ;
@@ -248,6 +214,8 @@
         RECT 24.525000 -0.085000 24.695000 0.085000 ;
         RECT 24.985000 -0.085000 25.155000 0.085000 ;
         RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
@@ -335,6 +303,8 @@
         RECT 24.525000 2.635000 24.695000 2.805000 ;
         RECT 24.985000 2.635000 25.155000 2.805000 ;
         RECT 25.445000 2.635000 25.615000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 25.760000 2.960000 ;
     END
@@ -351,8 +321,14 @@
       RECT  2.425000 0.425000  2.695000 0.715000 ;
       RECT  2.495000 1.665000  2.795000 2.295000 ;
       RECT  2.495000 2.295000  4.705000 2.465000 ;
+      RECT  2.865000 0.595000  3.195000 0.885000 ;
+      RECT  2.965000 0.885000  3.195000 1.065000 ;
+      RECT  2.965000 1.065000  4.235000 1.365000 ;
+      RECT  2.965000 1.365000  3.295000 2.125000 ;
       RECT  3.365000 0.425000  3.535000 0.770000 ;
       RECT  3.465000 1.535000  3.735000 2.295000 ;
+      RECT  3.705000 0.595000  4.035000 1.065000 ;
+      RECT  3.905000 1.365000  4.235000 2.125000 ;
       RECT  4.205000 0.425000  4.455000 0.770000 ;
       RECT  4.405000 1.065000  5.590000 1.395000 ;
       RECT  4.405000 1.565000  4.705000 2.295000 ;
@@ -369,8 +345,14 @@
       RECT  8.175000 2.295000 10.385000 2.465000 ;
       RECT  8.425000 0.255000 10.455000 0.425000 ;
       RECT  8.425000 0.425000  8.675000 0.770000 ;
+      RECT  8.645000 1.065000  9.915000 1.365000 ;
+      RECT  8.645000 1.365000  8.975000 2.125000 ;
+      RECT  8.845000 0.595000  9.175000 1.065000 ;
       RECT  9.145000 1.535000  9.415000 2.295000 ;
       RECT  9.345000 0.425000  9.515000 0.770000 ;
+      RECT  9.585000 1.365000  9.915000 2.125000 ;
+      RECT  9.685000 0.595000 10.015000 0.885000 ;
+      RECT  9.685000 0.885000  9.915000 1.065000 ;
       RECT 10.085000 1.495000 12.315000 1.665000 ;
       RECT 10.085000 1.665000 10.385000 2.295000 ;
       RECT 10.185000 0.425000 10.455000 0.715000 ;
@@ -389,8 +371,14 @@
       RECT 15.305000 0.425000 15.575000 0.715000 ;
       RECT 15.375000 1.665000 15.675000 2.295000 ;
       RECT 15.375000 2.295000 17.585000 2.465000 ;
+      RECT 15.745000 0.595000 16.075000 0.885000 ;
+      RECT 15.845000 0.885000 16.075000 1.065000 ;
+      RECT 15.845000 1.065000 17.115000 1.365000 ;
+      RECT 15.845000 1.365000 16.175000 2.125000 ;
       RECT 16.245000 0.425000 16.415000 0.770000 ;
       RECT 16.345000 1.535000 16.615000 2.295000 ;
+      RECT 16.585000 0.595000 16.915000 1.065000 ;
+      RECT 16.785000 1.365000 17.115000 2.125000 ;
       RECT 17.085000 0.425000 17.335000 0.770000 ;
       RECT 17.285000 1.065000 18.470000 1.395000 ;
       RECT 17.285000 1.565000 17.585000 2.295000 ;
@@ -407,8 +395,14 @@
       RECT 21.055000 2.295000 23.265000 2.465000 ;
       RECT 21.305000 0.255000 23.335000 0.425000 ;
       RECT 21.305000 0.425000 21.555000 0.770000 ;
+      RECT 21.525000 1.065000 22.795000 1.365000 ;
+      RECT 21.525000 1.365000 21.855000 2.125000 ;
+      RECT 21.725000 0.595000 22.055000 1.065000 ;
       RECT 22.025000 1.535000 22.295000 2.295000 ;
       RECT 22.225000 0.425000 22.395000 0.770000 ;
+      RECT 22.465000 1.365000 22.795000 2.125000 ;
+      RECT 22.565000 0.595000 22.895000 0.885000 ;
+      RECT 22.565000 0.885000 22.795000 1.065000 ;
       RECT 22.965000 1.495000 25.195000 1.665000 ;
       RECT 22.965000 1.665000 23.265000 2.295000 ;
       RECT 23.065000 0.425000 23.335000 0.715000 ;
@@ -417,6 +411,15 @@
       RECT 23.925000 1.665000 24.255000 2.465000 ;
       RECT 24.865000 0.255000 25.195000 0.715000 ;
       RECT 24.865000 1.665000 25.195000 2.465000 ;
+    LAYER mcon ;
+      RECT  3.045000 1.785000  3.215000 1.955000 ;
+      RECT  3.985000 1.785000  4.155000 1.955000 ;
+      RECT  8.725000 1.785000  8.895000 1.955000 ;
+      RECT  9.665000 1.785000  9.835000 1.955000 ;
+      RECT 15.925000 1.785000 16.095000 1.955000 ;
+      RECT 16.865000 1.785000 17.035000 1.955000 ;
+      RECT 21.605000 1.785000 21.775000 1.955000 ;
+      RECT 22.545000 1.785000 22.715000 1.955000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
index 5600f2f..f0d56fc 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_1.magic.lef
@@ -200,48 +200,39 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT  0.900000 0.835000  1.290000 1.005000 ;
-        RECT  0.900000 1.005000  1.070000 1.755000 ;
-        RECT  0.900000 1.755000  1.295000 1.805000 ;
-        RECT  0.900000 1.805000  1.420000 1.985000 ;
-        RECT  1.045000 0.330000  1.290000 0.835000 ;
-        RECT  1.090000 1.985000  1.420000 2.465000 ;
-        RECT  3.180000 1.805000  3.700000 1.985000 ;
-        RECT  3.180000 1.985000  3.510000 2.465000 ;
-        RECT  3.305000 1.755000  3.700000 1.805000 ;
-        RECT  3.310000 0.330000  3.555000 0.835000 ;
-        RECT  3.310000 0.835000  3.700000 1.005000 ;
-        RECT  3.530000 1.005000  3.700000 1.755000 ;
-        RECT  5.040000 0.835000  5.430000 1.005000 ;
-        RECT  5.040000 1.005000  5.210000 1.755000 ;
-        RECT  5.040000 1.755000  5.435000 1.805000 ;
-        RECT  5.040000 1.805000  5.560000 1.985000 ;
-        RECT  5.185000 0.330000  5.430000 0.835000 ;
-        RECT  5.230000 1.985000  5.560000 2.465000 ;
-        RECT  7.320000 1.805000  7.840000 1.985000 ;
-        RECT  7.320000 1.985000  7.650000 2.465000 ;
-        RECT  7.445000 1.755000  7.840000 1.805000 ;
-        RECT  7.450000 0.330000  7.695000 0.835000 ;
-        RECT  7.450000 0.835000  7.840000 1.005000 ;
-        RECT  7.670000 1.005000  7.840000 1.755000 ;
-        RECT  9.180000 0.835000  9.570000 1.005000 ;
-        RECT  9.180000 1.005000  9.350000 1.755000 ;
-        RECT  9.180000 1.755000  9.575000 1.805000 ;
-        RECT  9.180000 1.805000  9.700000 1.985000 ;
-        RECT  9.325000 0.330000  9.570000 0.835000 ;
-        RECT  9.370000 1.985000  9.700000 2.465000 ;
+        RECT 0.900000 0.835000 1.290000 1.005000 ;
+        RECT 0.900000 1.005000 1.070000 1.755000 ;
+        RECT 0.900000 1.755000 1.295000 1.805000 ;
+        RECT 0.900000 1.805000 1.420000 1.985000 ;
+        RECT 1.045000 0.330000 1.290000 0.835000 ;
+        RECT 1.090000 1.985000 1.420000 2.465000 ;
+      LAYER mcon ;
+        RECT 1.065000 1.785000 1.235000 1.955000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 11.460000 1.805000 11.980000 1.985000 ;
         RECT 11.460000 1.985000 11.790000 2.465000 ;
         RECT 11.585000 1.755000 11.980000 1.805000 ;
         RECT 11.590000 0.330000 11.835000 0.835000 ;
         RECT 11.590000 0.835000 11.980000 1.005000 ;
         RECT 11.810000 1.005000 11.980000 1.755000 ;
+      LAYER mcon ;
+        RECT 11.645000 1.785000 11.815000 1.955000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 13.320000 0.835000 13.710000 1.005000 ;
         RECT 13.320000 1.005000 13.490000 1.755000 ;
         RECT 13.320000 1.755000 13.715000 1.805000 ;
         RECT 13.320000 1.805000 13.840000 1.985000 ;
         RECT 13.465000 0.330000 13.710000 0.835000 ;
         RECT 13.510000 1.985000 13.840000 2.465000 ;
+      LAYER mcon ;
+        RECT 13.485000 1.785000 13.655000 1.955000 ;
+    END
+    PORT
+      LAYER li1 ;
         RECT 15.600000 1.805000 16.120000 1.985000 ;
         RECT 15.600000 1.985000 15.930000 2.465000 ;
         RECT 15.725000 1.755000 16.120000 1.805000 ;
@@ -249,14 +240,53 @@
         RECT 15.730000 0.835000 16.120000 1.005000 ;
         RECT 15.950000 1.005000 16.120000 1.755000 ;
       LAYER mcon ;
-        RECT  1.065000 1.785000  1.235000 1.955000 ;
-        RECT  3.365000 1.785000  3.535000 1.955000 ;
-        RECT  5.205000 1.785000  5.375000 1.955000 ;
-        RECT  7.505000 1.785000  7.675000 1.955000 ;
-        RECT  9.345000 1.785000  9.515000 1.955000 ;
-        RECT 11.645000 1.785000 11.815000 1.955000 ;
-        RECT 13.485000 1.785000 13.655000 1.955000 ;
         RECT 15.785000 1.785000 15.955000 1.955000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.180000 1.805000 3.700000 1.985000 ;
+        RECT 3.180000 1.985000 3.510000 2.465000 ;
+        RECT 3.305000 1.755000 3.700000 1.805000 ;
+        RECT 3.310000 0.330000 3.555000 0.835000 ;
+        RECT 3.310000 0.835000 3.700000 1.005000 ;
+        RECT 3.530000 1.005000 3.700000 1.755000 ;
+      LAYER mcon ;
+        RECT 3.365000 1.785000 3.535000 1.955000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 5.040000 0.835000 5.430000 1.005000 ;
+        RECT 5.040000 1.005000 5.210000 1.755000 ;
+        RECT 5.040000 1.755000 5.435000 1.805000 ;
+        RECT 5.040000 1.805000 5.560000 1.985000 ;
+        RECT 5.185000 0.330000 5.430000 0.835000 ;
+        RECT 5.230000 1.985000 5.560000 2.465000 ;
+      LAYER mcon ;
+        RECT 5.205000 1.785000 5.375000 1.955000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 7.320000 1.805000 7.840000 1.985000 ;
+        RECT 7.320000 1.985000 7.650000 2.465000 ;
+        RECT 7.445000 1.755000 7.840000 1.805000 ;
+        RECT 7.450000 0.330000 7.695000 0.835000 ;
+        RECT 7.450000 0.835000 7.840000 1.005000 ;
+        RECT 7.670000 1.005000 7.840000 1.755000 ;
+      LAYER mcon ;
+        RECT 7.505000 1.785000 7.675000 1.955000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 9.180000 0.835000 9.570000 1.005000 ;
+        RECT 9.180000 1.005000 9.350000 1.755000 ;
+        RECT 9.180000 1.755000 9.575000 1.805000 ;
+        RECT 9.180000 1.805000 9.700000 1.985000 ;
+        RECT 9.325000 0.330000 9.570000 0.835000 ;
+        RECT 9.370000 1.985000 9.700000 2.465000 ;
+      LAYER mcon ;
+        RECT 9.345000 1.785000 9.515000 1.955000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT  1.005000 1.755000  1.295000 1.800000 ;
         RECT  1.005000 1.800000 16.015000 1.940000 ;
@@ -330,6 +360,8 @@
         RECT 15.785000 -0.085000 15.955000 0.085000 ;
         RECT 16.245000 -0.085000 16.415000 0.085000 ;
         RECT 16.705000 -0.085000 16.875000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 17.020000 0.240000 ;
     END
@@ -387,6 +419,8 @@
         RECT 15.785000 2.635000 15.955000 2.805000 ;
         RECT 16.245000 2.635000 16.415000 2.805000 ;
         RECT 16.705000 2.635000 16.875000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 17.020000 2.960000 ;
     END
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
index 54a1541..068055f 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_2.magic.lef
@@ -183,40 +183,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  1.465000 1.755000  1.895000 2.125000 ;
-        RECT  1.505000 0.595000  1.835000 0.885000 ;
-        RECT  1.585000 0.885000  1.755000 1.755000 ;
-        RECT  4.545000 1.755000  4.975000 2.125000 ;
-        RECT  4.605000 0.595000  4.935000 0.885000 ;
-        RECT  4.685000 0.885000  4.855000 1.755000 ;
-        RECT  7.905000 1.755000  8.335000 2.125000 ;
-        RECT  7.945000 0.595000  8.275000 0.885000 ;
-        RECT  8.025000 0.885000  8.195000 1.755000 ;
-        RECT 10.985000 1.755000 11.415000 2.125000 ;
-        RECT 11.045000 0.595000 11.375000 0.885000 ;
-        RECT 11.125000 0.885000 11.295000 1.755000 ;
-        RECT 14.345000 1.755000 14.775000 2.125000 ;
-        RECT 14.385000 0.595000 14.715000 0.885000 ;
-        RECT 14.465000 0.885000 14.635000 1.755000 ;
-        RECT 17.425000 1.755000 17.855000 2.125000 ;
-        RECT 17.485000 0.595000 17.815000 0.885000 ;
-        RECT 17.565000 0.885000 17.735000 1.755000 ;
-        RECT 20.785000 1.755000 21.215000 2.125000 ;
-        RECT 20.825000 0.595000 21.155000 0.885000 ;
-        RECT 20.905000 0.885000 21.075000 1.755000 ;
-        RECT 23.865000 1.755000 24.295000 2.125000 ;
-        RECT 23.925000 0.595000 24.255000 0.885000 ;
-        RECT 24.005000 0.885000 24.175000 1.755000 ;
-      LAYER mcon ;
-        RECT  1.525000 1.785000  1.695000 1.955000 ;
-        RECT  4.745000 1.785000  4.915000 1.955000 ;
-        RECT  7.965000 1.785000  8.135000 1.955000 ;
-        RECT 11.185000 1.785000 11.355000 1.955000 ;
-        RECT 14.405000 1.785000 14.575000 1.955000 ;
-        RECT 17.625000 1.785000 17.795000 1.955000 ;
-        RECT 20.845000 1.785000 21.015000 1.955000 ;
-        RECT 24.065000 1.785000 24.235000 1.955000 ;
       LAYER met1 ;
         RECT  1.465000 1.755000  1.755000 1.800000 ;
         RECT  1.465000 1.800000 24.295000 1.940000 ;
@@ -312,6 +278,8 @@
         RECT 24.525000 -0.085000 24.695000 0.085000 ;
         RECT 24.985000 -0.085000 25.155000 0.085000 ;
         RECT 25.445000 -0.085000 25.615000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 25.760000 0.240000 ;
     END
@@ -399,6 +367,8 @@
         RECT 24.525000 2.635000 24.695000 2.805000 ;
         RECT 24.985000 2.635000 25.155000 2.805000 ;
         RECT 25.445000 2.635000 25.615000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 25.760000 2.960000 ;
     END
@@ -415,6 +385,9 @@
       RECT  1.030000 0.885000  1.335000 0.925000 ;
       RECT  1.115000 1.665000  1.285000 2.295000 ;
       RECT  1.115000 2.295000  2.280000 2.465000 ;
+      RECT  1.465000 1.755000  1.895000 2.125000 ;
+      RECT  1.505000 0.595000  1.835000 0.885000 ;
+      RECT  1.585000 0.885000  1.755000 1.755000 ;
       RECT  2.005000 0.425000  2.175000 0.770000 ;
       RECT  2.100000 1.205000  2.515000 1.305000 ;
       RECT  2.100000 1.305000  2.620000 1.465000 ;
@@ -437,6 +410,9 @@
       RECT  4.160000 2.295000  5.325000 2.465000 ;
       RECT  4.265000 0.255000  5.410000 0.425000 ;
       RECT  4.265000 0.425000  4.435000 0.770000 ;
+      RECT  4.545000 1.755000  4.975000 2.125000 ;
+      RECT  4.605000 0.595000  4.935000 0.885000 ;
+      RECT  4.685000 0.885000  4.855000 1.755000 ;
       RECT  5.105000 0.425000  5.410000 0.715000 ;
       RECT  5.105000 0.715000  6.295000 0.885000 ;
       RECT  5.105000 0.885000  5.410000 0.925000 ;
@@ -455,6 +431,9 @@
       RECT  7.470000 0.885000  7.775000 0.925000 ;
       RECT  7.555000 1.665000  7.725000 2.295000 ;
       RECT  7.555000 2.295000  8.720000 2.465000 ;
+      RECT  7.905000 1.755000  8.335000 2.125000 ;
+      RECT  7.945000 0.595000  8.275000 0.885000 ;
+      RECT  8.025000 0.885000  8.195000 1.755000 ;
       RECT  8.445000 0.425000  8.615000 0.770000 ;
       RECT  8.540000 1.205000  8.955000 1.305000 ;
       RECT  8.540000 1.305000  9.060000 1.465000 ;
@@ -477,6 +456,9 @@
       RECT 10.600000 2.295000 11.765000 2.465000 ;
       RECT 10.705000 0.255000 11.850000 0.425000 ;
       RECT 10.705000 0.425000 10.875000 0.770000 ;
+      RECT 10.985000 1.755000 11.415000 2.125000 ;
+      RECT 11.045000 0.595000 11.375000 0.885000 ;
+      RECT 11.125000 0.885000 11.295000 1.755000 ;
       RECT 11.545000 0.425000 11.850000 0.715000 ;
       RECT 11.545000 0.715000 12.735000 0.885000 ;
       RECT 11.545000 0.885000 11.850000 0.925000 ;
@@ -495,6 +477,9 @@
       RECT 13.910000 0.885000 14.215000 0.925000 ;
       RECT 13.995000 1.665000 14.165000 2.295000 ;
       RECT 13.995000 2.295000 15.160000 2.465000 ;
+      RECT 14.345000 1.755000 14.775000 2.125000 ;
+      RECT 14.385000 0.595000 14.715000 0.885000 ;
+      RECT 14.465000 0.885000 14.635000 1.755000 ;
       RECT 14.885000 0.425000 15.055000 0.770000 ;
       RECT 14.980000 1.205000 15.395000 1.305000 ;
       RECT 14.980000 1.305000 15.500000 1.465000 ;
@@ -517,6 +502,9 @@
       RECT 17.040000 2.295000 18.205000 2.465000 ;
       RECT 17.145000 0.255000 18.290000 0.425000 ;
       RECT 17.145000 0.425000 17.315000 0.770000 ;
+      RECT 17.425000 1.755000 17.855000 2.125000 ;
+      RECT 17.485000 0.595000 17.815000 0.885000 ;
+      RECT 17.565000 0.885000 17.735000 1.755000 ;
       RECT 17.985000 0.425000 18.290000 0.715000 ;
       RECT 17.985000 0.715000 19.175000 0.885000 ;
       RECT 17.985000 0.885000 18.290000 0.925000 ;
@@ -535,6 +523,9 @@
       RECT 20.350000 0.885000 20.655000 0.925000 ;
       RECT 20.435000 1.665000 20.605000 2.295000 ;
       RECT 20.435000 2.295000 21.600000 2.465000 ;
+      RECT 20.785000 1.755000 21.215000 2.125000 ;
+      RECT 20.825000 0.595000 21.155000 0.885000 ;
+      RECT 20.905000 0.885000 21.075000 1.755000 ;
       RECT 21.325000 0.425000 21.495000 0.770000 ;
       RECT 21.420000 1.205000 21.835000 1.305000 ;
       RECT 21.420000 1.305000 21.940000 1.465000 ;
@@ -557,6 +548,9 @@
       RECT 23.480000 2.295000 24.645000 2.465000 ;
       RECT 23.585000 0.255000 24.730000 0.425000 ;
       RECT 23.585000 0.425000 23.755000 0.770000 ;
+      RECT 23.865000 1.755000 24.295000 2.125000 ;
+      RECT 23.925000 0.595000 24.255000 0.885000 ;
+      RECT 24.005000 0.885000 24.175000 1.755000 ;
       RECT 24.425000 0.425000 24.730000 0.715000 ;
       RECT 24.425000 0.715000 25.615000 0.885000 ;
       RECT 24.425000 0.885000 24.730000 0.925000 ;
@@ -565,6 +559,15 @@
       RECT 25.285000 0.255000 25.615000 0.715000 ;
       RECT 25.335000 2.210000 25.665000 2.465000 ;
       RECT 25.365000 1.665000 25.665000 2.210000 ;
+    LAYER mcon ;
+      RECT  1.525000 1.785000  1.695000 1.955000 ;
+      RECT  4.745000 1.785000  4.915000 1.955000 ;
+      RECT  7.965000 1.785000  8.135000 1.955000 ;
+      RECT 11.185000 1.785000 11.355000 1.955000 ;
+      RECT 14.405000 1.785000 14.575000 1.955000 ;
+      RECT 17.625000 1.785000 17.795000 1.955000 ;
+      RECT 20.845000 1.785000 21.015000 1.955000 ;
+      RECT 24.065000 1.785000 24.235000 1.955000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
index 157852a..03b32c3 100644
--- a/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
+++ b/cells/muxb8to1/sky130_fd_sc_hdll__muxb8to1_4.magic.lef
@@ -184,63 +184,23 @@
     USE SIGNAL ;
     PORT
       LAYER li1 ;
-        RECT  2.205000 1.065000  3.475000 1.365000 ;
-        RECT  2.205000 1.365000  2.535000 4.075000 ;
-        RECT  2.205000 4.075000  3.475000 4.375000 ;
-        RECT  2.405000 0.595000  2.735000 1.065000 ;
-        RECT  2.405000 4.375000  2.735000 4.845000 ;
-        RECT  3.145000 1.365000  3.475000 4.075000 ;
-        RECT  3.245000 0.595000  3.575000 0.885000 ;
-        RECT  3.245000 0.885000  3.475000 1.065000 ;
-        RECT  3.245000 4.375000  3.475000 4.555000 ;
-        RECT  3.245000 4.555000  3.575000 4.845000 ;
-        RECT  8.845000 0.595000  9.175000 0.885000 ;
-        RECT  8.845000 4.555000  9.175000 4.845000 ;
-        RECT  8.945000 0.885000  9.175000 1.065000 ;
-        RECT  8.945000 1.065000 10.215000 1.365000 ;
-        RECT  8.945000 1.365000  9.275000 4.075000 ;
-        RECT  8.945000 4.075000 10.215000 4.375000 ;
-        RECT  8.945000 4.375000  9.175000 4.555000 ;
-        RECT  9.685000 0.595000 10.015000 1.065000 ;
-        RECT  9.685000 4.375000 10.015000 4.845000 ;
-        RECT  9.885000 1.365000 10.215000 4.075000 ;
-        RECT 14.625000 1.065000 15.895000 1.365000 ;
-        RECT 14.625000 1.365000 14.955000 4.075000 ;
-        RECT 14.625000 4.075000 15.895000 4.375000 ;
-        RECT 14.825000 0.595000 15.155000 1.065000 ;
-        RECT 14.825000 4.375000 15.155000 4.845000 ;
-        RECT 15.565000 1.365000 15.895000 4.075000 ;
-        RECT 15.665000 0.595000 15.995000 0.885000 ;
-        RECT 15.665000 0.885000 15.895000 1.065000 ;
-        RECT 15.665000 4.375000 15.895000 4.555000 ;
-        RECT 15.665000 4.555000 15.995000 4.845000 ;
-        RECT 21.265000 0.595000 21.595000 0.885000 ;
-        RECT 21.265000 4.555000 21.595000 4.845000 ;
-        RECT 21.365000 0.885000 21.595000 1.065000 ;
-        RECT 21.365000 1.065000 22.635000 1.365000 ;
-        RECT 21.365000 1.365000 21.695000 4.075000 ;
-        RECT 21.365000 4.075000 22.635000 4.375000 ;
-        RECT 21.365000 4.375000 21.595000 4.555000 ;
-        RECT 22.105000 0.595000 22.435000 1.065000 ;
-        RECT 22.105000 4.375000 22.435000 4.845000 ;
-        RECT 22.305000 1.365000 22.635000 4.075000 ;
+        RECT 2.205000 1.065000 3.475000 1.365000 ;
+        RECT 2.205000 1.365000 2.535000 4.075000 ;
+        RECT 2.205000 4.075000 3.475000 4.375000 ;
+        RECT 2.405000 0.595000 2.735000 1.065000 ;
+        RECT 2.405000 4.375000 2.735000 4.845000 ;
+        RECT 3.145000 1.365000 3.475000 4.075000 ;
+        RECT 3.245000 0.595000 3.575000 0.885000 ;
+        RECT 3.245000 0.885000 3.475000 1.065000 ;
+        RECT 3.245000 4.375000 3.475000 4.555000 ;
+        RECT 3.245000 4.555000 3.575000 4.845000 ;
       LAYER mcon ;
-        RECT  2.285000 1.785000  2.455000 1.955000 ;
-        RECT  2.285000 3.485000  2.455000 3.655000 ;
-        RECT  3.225000 1.785000  3.395000 1.955000 ;
-        RECT  3.225000 3.485000  3.395000 3.655000 ;
-        RECT  9.025000 1.785000  9.195000 1.955000 ;
-        RECT  9.025000 3.485000  9.195000 3.655000 ;
-        RECT  9.965000 1.785000 10.135000 1.955000 ;
-        RECT  9.965000 3.485000 10.135000 3.655000 ;
-        RECT 14.705000 1.785000 14.875000 1.955000 ;
-        RECT 14.705000 3.485000 14.875000 3.655000 ;
-        RECT 15.645000 1.785000 15.815000 1.955000 ;
-        RECT 15.645000 3.485000 15.815000 3.655000 ;
-        RECT 21.445000 1.785000 21.615000 1.955000 ;
-        RECT 21.445000 3.485000 21.615000 3.655000 ;
-        RECT 22.385000 1.785000 22.555000 1.955000 ;
-        RECT 22.385000 3.485000 22.555000 3.655000 ;
+        RECT 2.285000 1.785000 2.455000 1.955000 ;
+        RECT 2.285000 3.485000 2.455000 3.655000 ;
+        RECT 3.225000 1.785000 3.395000 1.955000 ;
+        RECT 3.225000 3.485000 3.395000 3.655000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT  2.225000 1.755000  2.515000 1.800000 ;
         RECT  2.225000 1.800000 22.615000 1.940000 ;
@@ -357,8 +317,6 @@
         RECT 23.605000 -0.085000 23.775000 0.085000 ;
         RECT 24.065000 -0.085000 24.235000 0.085000 ;
         RECT 24.525000 -0.085000 24.695000 0.085000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 24.840000 0.240000 ;
     END
     PORT
       LAYER li1 ;
@@ -436,6 +394,12 @@
         RECT 23.605000 5.355000 23.775000 5.525000 ;
         RECT 24.065000 5.355000 24.235000 5.525000 ;
         RECT 24.525000 5.355000 24.695000 5.525000 ;
+    END
+    PORT
+      LAYER met1 ;
+        RECT 0.000000 -0.240000 24.840000 0.240000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 5.200000 24.840000 5.680000 ;
     END
@@ -445,31 +409,6 @@
     USE POWER ;
     PORT
       LAYER li1 ;
-        RECT  0.000000 2.635000  2.035000 2.805000 ;
-        RECT  0.220000 1.605000  0.520000 2.635000 ;
-        RECT  0.220000 2.805000  0.520000 3.835000 ;
-        RECT  1.215000 1.605000  1.490000 2.635000 ;
-        RECT  1.215000 2.805000  1.490000 3.835000 ;
-        RECT  3.645000 2.635000  8.775000 2.805000 ;
-        RECT  4.165000 1.835000  4.435000 2.635000 ;
-        RECT  4.165000 2.805000  4.435000 3.605000 ;
-        RECT  5.105000 1.835000  5.375000 2.635000 ;
-        RECT  5.105000 2.805000  5.375000 3.605000 ;
-        RECT  6.045000 1.495000  6.375000 2.635000 ;
-        RECT  6.045000 2.805000  6.375000 3.945000 ;
-        RECT  7.045000 1.835000  7.315000 2.635000 ;
-        RECT  7.045000 2.805000  7.315000 3.605000 ;
-        RECT  7.985000 1.835000  8.255000 2.635000 ;
-        RECT  7.985000 2.805000  8.255000 3.605000 ;
-        RECT 10.385000 2.635000 14.455000 2.805000 ;
-        RECT 10.930000 1.605000 11.205000 2.635000 ;
-        RECT 10.930000 2.805000 11.205000 3.835000 ;
-        RECT 11.900000 1.605000 12.200000 2.635000 ;
-        RECT 11.900000 2.805000 12.200000 3.835000 ;
-        RECT 12.640000 1.605000 12.940000 2.635000 ;
-        RECT 12.640000 2.805000 12.940000 3.835000 ;
-        RECT 13.635000 1.605000 13.910000 2.635000 ;
-        RECT 13.635000 2.805000 13.910000 3.835000 ;
         RECT 16.065000 2.635000 21.195000 2.805000 ;
         RECT 16.585000 1.835000 16.855000 2.635000 ;
         RECT 16.585000 2.805000 16.855000 3.605000 ;
@@ -481,35 +420,7 @@
         RECT 19.465000 2.805000 19.735000 3.605000 ;
         RECT 20.405000 1.835000 20.675000 2.635000 ;
         RECT 20.405000 2.805000 20.675000 3.605000 ;
-        RECT 22.805000 2.635000 24.840000 2.805000 ;
-        RECT 23.350000 1.605000 23.625000 2.635000 ;
-        RECT 23.350000 2.805000 23.625000 3.835000 ;
-        RECT 24.320000 1.605000 24.620000 2.635000 ;
-        RECT 24.320000 2.805000 24.620000 3.835000 ;
       LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
         RECT 16.245000 2.635000 16.415000 2.805000 ;
         RECT 16.705000 2.635000 16.875000 2.805000 ;
         RECT 17.165000 2.635000 17.335000 2.805000 ;
@@ -521,16 +432,43 @@
         RECT 19.925000 2.635000 20.095000 2.805000 ;
         RECT 20.385000 2.635000 20.555000 2.805000 ;
         RECT 20.845000 2.635000 21.015000 2.805000 ;
-        RECT 23.145000 2.635000 23.315000 2.805000 ;
-        RECT 23.605000 2.635000 23.775000 2.805000 ;
-        RECT 24.065000 2.635000 24.235000 2.805000 ;
-        RECT 24.525000 2.635000 24.695000 2.805000 ;
+    END
+    PORT
+      LAYER li1 ;
+        RECT 3.645000 2.635000 8.775000 2.805000 ;
+        RECT 4.165000 1.835000 4.435000 2.635000 ;
+        RECT 4.165000 2.805000 4.435000 3.605000 ;
+        RECT 5.105000 1.835000 5.375000 2.635000 ;
+        RECT 5.105000 2.805000 5.375000 3.605000 ;
+        RECT 6.045000 1.495000 6.375000 2.635000 ;
+        RECT 6.045000 2.805000 6.375000 3.945000 ;
+        RECT 7.045000 1.835000 7.315000 2.635000 ;
+        RECT 7.045000 2.805000 7.315000 3.605000 ;
+        RECT 7.985000 1.835000 8.255000 2.635000 ;
+        RECT 7.985000 2.805000 8.255000 3.605000 ;
+      LAYER mcon ;
+        RECT 3.825000 2.635000 3.995000 2.805000 ;
+        RECT 4.285000 2.635000 4.455000 2.805000 ;
+        RECT 4.745000 2.635000 4.915000 2.805000 ;
+        RECT 5.205000 2.635000 5.375000 2.805000 ;
+        RECT 5.665000 2.635000 5.835000 2.805000 ;
+        RECT 6.125000 2.635000 6.295000 2.805000 ;
+        RECT 6.585000 2.635000 6.755000 2.805000 ;
+        RECT 7.045000 2.635000 7.215000 2.805000 ;
+        RECT 7.505000 2.635000 7.675000 2.805000 ;
+        RECT 7.965000 2.635000 8.135000 2.805000 ;
+        RECT 8.425000 2.635000 8.595000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 24.840000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
+      RECT  0.000000 2.635000  2.035000 2.805000 ;
+      RECT  0.220000 1.605000  0.520000 2.635000 ;
+      RECT  0.220000 2.805000  0.520000 3.835000 ;
       RECT  0.690000 1.605000  1.020000 2.465000 ;
       RECT  0.690000 2.975000  1.020000 3.835000 ;
       RECT  0.770000 0.280000  1.020000 0.825000 ;
@@ -541,6 +479,8 @@
       RECT  0.850000 3.835000  1.020000 4.045000 ;
       RECT  0.850000 4.045000  2.035000 4.375000 ;
       RECT  0.850000 4.375000  1.020000 4.615000 ;
+      RECT  1.215000 1.605000  1.490000 2.635000 ;
+      RECT  1.215000 2.805000  1.490000 3.835000 ;
       RECT  1.735000 1.565000  2.035000 2.465000 ;
       RECT  1.735000 2.975000  2.035000 3.875000 ;
       RECT  1.985000 0.255000  4.015000 0.425000 ;
@@ -585,16 +525,29 @@
       RECT  8.405000 5.015000 10.435000 5.185000 ;
       RECT  8.475000 1.665000  8.775000 2.465000 ;
       RECT  8.475000 2.975000  8.775000 3.775000 ;
+      RECT  8.845000 0.595000  9.175000 0.885000 ;
+      RECT  8.845000 4.555000  9.175000 4.845000 ;
+      RECT  8.945000 0.885000  9.175000 1.065000 ;
+      RECT  8.945000 1.065000 10.215000 1.365000 ;
+      RECT  8.945000 1.365000  9.275000 4.075000 ;
+      RECT  8.945000 4.075000 10.215000 4.375000 ;
+      RECT  8.945000 4.375000  9.175000 4.555000 ;
       RECT  9.345000 0.425000  9.515000 0.770000 ;
       RECT  9.345000 4.670000  9.515000 5.015000 ;
       RECT  9.445000 1.535000  9.715000 2.465000 ;
       RECT  9.445000 2.975000  9.715000 3.905000 ;
+      RECT  9.685000 0.595000 10.015000 1.065000 ;
+      RECT  9.685000 4.375000 10.015000 4.845000 ;
+      RECT  9.885000 1.365000 10.215000 4.075000 ;
       RECT 10.185000 0.425000 10.435000 0.770000 ;
       RECT 10.185000 4.670000 10.435000 5.015000 ;
       RECT 10.385000 1.065000 11.570000 1.395000 ;
       RECT 10.385000 1.565000 10.685000 2.465000 ;
+      RECT 10.385000 2.635000 14.455000 2.805000 ;
       RECT 10.385000 2.975000 10.685000 3.875000 ;
       RECT 10.385000 4.045000 11.570000 4.375000 ;
+      RECT 10.930000 1.605000 11.205000 2.635000 ;
+      RECT 10.930000 2.805000 11.205000 3.835000 ;
       RECT 11.400000 0.280000 11.650000 0.825000 ;
       RECT 11.400000 0.825000 11.570000 1.065000 ;
       RECT 11.400000 1.395000 11.570000 1.605000 ;
@@ -603,6 +556,10 @@
       RECT 11.400000 3.835000 11.570000 4.045000 ;
       RECT 11.400000 4.375000 11.570000 4.615000 ;
       RECT 11.400000 4.615000 11.650000 5.160000 ;
+      RECT 11.900000 1.605000 12.200000 2.635000 ;
+      RECT 11.900000 2.805000 12.200000 3.835000 ;
+      RECT 12.640000 1.605000 12.940000 2.635000 ;
+      RECT 12.640000 2.805000 12.940000 3.835000 ;
       RECT 13.110000 1.605000 13.440000 2.465000 ;
       RECT 13.110000 2.975000 13.440000 3.835000 ;
       RECT 13.190000 0.280000 13.440000 0.825000 ;
@@ -613,16 +570,28 @@
       RECT 13.270000 3.835000 13.440000 4.045000 ;
       RECT 13.270000 4.045000 14.455000 4.375000 ;
       RECT 13.270000 4.375000 13.440000 4.615000 ;
+      RECT 13.635000 1.605000 13.910000 2.635000 ;
+      RECT 13.635000 2.805000 13.910000 3.835000 ;
       RECT 14.155000 1.565000 14.455000 2.465000 ;
       RECT 14.155000 2.975000 14.455000 3.875000 ;
       RECT 14.405000 0.255000 16.435000 0.425000 ;
       RECT 14.405000 0.425000 14.655000 0.770000 ;
       RECT 14.405000 4.670000 14.655000 5.015000 ;
       RECT 14.405000 5.015000 16.435000 5.185000 ;
+      RECT 14.625000 1.065000 15.895000 1.365000 ;
+      RECT 14.625000 1.365000 14.955000 4.075000 ;
+      RECT 14.625000 4.075000 15.895000 4.375000 ;
+      RECT 14.825000 0.595000 15.155000 1.065000 ;
+      RECT 14.825000 4.375000 15.155000 4.845000 ;
       RECT 15.125000 1.535000 15.395000 2.465000 ;
       RECT 15.125000 2.975000 15.395000 3.905000 ;
       RECT 15.325000 0.425000 15.495000 0.770000 ;
       RECT 15.325000 4.670000 15.495000 5.015000 ;
+      RECT 15.565000 1.365000 15.895000 4.075000 ;
+      RECT 15.665000 0.595000 15.995000 0.885000 ;
+      RECT 15.665000 0.885000 15.895000 1.065000 ;
+      RECT 15.665000 4.375000 15.895000 4.555000 ;
+      RECT 15.665000 4.555000 15.995000 4.845000 ;
       RECT 16.065000 1.495000 18.295000 1.665000 ;
       RECT 16.065000 1.665000 16.365000 2.465000 ;
       RECT 16.065000 2.975000 16.365000 3.775000 ;
@@ -657,16 +626,29 @@
       RECT 20.825000 5.015000 22.855000 5.185000 ;
       RECT 20.895000 1.665000 21.195000 2.465000 ;
       RECT 20.895000 2.975000 21.195000 3.775000 ;
+      RECT 21.265000 0.595000 21.595000 0.885000 ;
+      RECT 21.265000 4.555000 21.595000 4.845000 ;
+      RECT 21.365000 0.885000 21.595000 1.065000 ;
+      RECT 21.365000 1.065000 22.635000 1.365000 ;
+      RECT 21.365000 1.365000 21.695000 4.075000 ;
+      RECT 21.365000 4.075000 22.635000 4.375000 ;
+      RECT 21.365000 4.375000 21.595000 4.555000 ;
       RECT 21.765000 0.425000 21.935000 0.770000 ;
       RECT 21.765000 4.670000 21.935000 5.015000 ;
       RECT 21.865000 1.535000 22.135000 2.465000 ;
       RECT 21.865000 2.975000 22.135000 3.905000 ;
+      RECT 22.105000 0.595000 22.435000 1.065000 ;
+      RECT 22.105000 4.375000 22.435000 4.845000 ;
+      RECT 22.305000 1.365000 22.635000 4.075000 ;
       RECT 22.605000 0.425000 22.855000 0.770000 ;
       RECT 22.605000 4.670000 22.855000 5.015000 ;
       RECT 22.805000 1.065000 23.990000 1.395000 ;
       RECT 22.805000 1.565000 23.105000 2.465000 ;
+      RECT 22.805000 2.635000 24.840000 2.805000 ;
       RECT 22.805000 2.975000 23.105000 3.875000 ;
       RECT 22.805000 4.045000 23.990000 4.375000 ;
+      RECT 23.350000 1.605000 23.625000 2.635000 ;
+      RECT 23.350000 2.805000 23.625000 3.835000 ;
       RECT 23.820000 0.280000 24.070000 0.825000 ;
       RECT 23.820000 0.825000 23.990000 1.065000 ;
       RECT 23.820000 1.395000 23.990000 1.605000 ;
@@ -675,7 +657,13 @@
       RECT 23.820000 3.835000 23.990000 4.045000 ;
       RECT 23.820000 4.375000 23.990000 4.615000 ;
       RECT 23.820000 4.615000 24.070000 5.160000 ;
+      RECT 24.320000 1.605000 24.620000 2.635000 ;
+      RECT 24.320000 2.805000 24.620000 3.835000 ;
     LAYER mcon ;
+      RECT  0.145000 2.635000  0.315000 2.805000 ;
+      RECT  0.605000 2.635000  0.775000 2.805000 ;
+      RECT  1.065000 2.635000  1.235000 2.805000 ;
+      RECT  1.525000 2.635000  1.695000 2.805000 ;
       RECT  1.805000 2.140000  1.975000 2.310000 ;
       RECT  1.805000 3.130000  1.975000 3.300000 ;
       RECT  2.755000 2.140000  2.925000 2.310000 ;
@@ -692,14 +680,30 @@
       RECT  7.565000 3.130000  7.735000 3.300000 ;
       RECT  8.545000 2.140000  8.715000 2.310000 ;
       RECT  8.545000 3.130000  8.715000 3.300000 ;
+      RECT  9.025000 1.785000  9.195000 1.955000 ;
+      RECT  9.025000 3.485000  9.195000 3.655000 ;
       RECT  9.495000 2.140000  9.665000 2.310000 ;
       RECT  9.495000 3.130000  9.665000 3.300000 ;
+      RECT  9.965000 1.785000 10.135000 1.955000 ;
+      RECT  9.965000 3.485000 10.135000 3.655000 ;
       RECT 10.445000 2.140000 10.615000 2.310000 ;
       RECT 10.445000 3.130000 10.615000 3.300000 ;
+      RECT 10.725000 2.635000 10.895000 2.805000 ;
+      RECT 11.185000 2.635000 11.355000 2.805000 ;
+      RECT 11.645000 2.635000 11.815000 2.805000 ;
+      RECT 12.105000 2.635000 12.275000 2.805000 ;
+      RECT 12.565000 2.635000 12.735000 2.805000 ;
+      RECT 13.025000 2.635000 13.195000 2.805000 ;
+      RECT 13.485000 2.635000 13.655000 2.805000 ;
+      RECT 13.945000 2.635000 14.115000 2.805000 ;
       RECT 14.225000 2.140000 14.395000 2.310000 ;
       RECT 14.225000 3.130000 14.395000 3.300000 ;
+      RECT 14.705000 1.785000 14.875000 1.955000 ;
+      RECT 14.705000 3.485000 14.875000 3.655000 ;
       RECT 15.175000 2.140000 15.345000 2.310000 ;
       RECT 15.175000 3.130000 15.345000 3.300000 ;
+      RECT 15.645000 1.785000 15.815000 1.955000 ;
+      RECT 15.645000 3.485000 15.815000 3.655000 ;
       RECT 16.125000 2.140000 16.295000 2.310000 ;
       RECT 16.125000 3.130000 16.295000 3.300000 ;
       RECT 17.105000 2.140000 17.275000 2.310000 ;
@@ -712,10 +716,18 @@
       RECT 19.985000 3.130000 20.155000 3.300000 ;
       RECT 20.965000 2.140000 21.135000 2.310000 ;
       RECT 20.965000 3.130000 21.135000 3.300000 ;
+      RECT 21.445000 1.785000 21.615000 1.955000 ;
+      RECT 21.445000 3.485000 21.615000 3.655000 ;
       RECT 21.915000 2.140000 22.085000 2.310000 ;
       RECT 21.915000 3.130000 22.085000 3.300000 ;
+      RECT 22.385000 1.785000 22.555000 1.955000 ;
+      RECT 22.385000 3.485000 22.555000 3.655000 ;
       RECT 22.865000 2.140000 23.035000 2.310000 ;
       RECT 22.865000 3.130000 23.035000 3.300000 ;
+      RECT 23.145000 2.635000 23.315000 2.805000 ;
+      RECT 23.605000 2.635000 23.775000 2.805000 ;
+      RECT 24.065000 2.635000 24.235000 2.805000 ;
+      RECT 24.525000 2.635000 24.695000 2.805000 ;
     LAYER met1 ;
       RECT  1.745000 2.110000  2.035000 2.155000 ;
       RECT  1.745000 2.155000  5.855000 2.295000 ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
index c6b8567..d746b4a 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_1.magic.lef
@@ -67,14 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.085000  0.085000 0.395000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -83,19 +75,27 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 0.085000 1.495000 0.365000 2.635000 ;
-        RECT 1.135000 1.495000 1.395000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.085000  0.085000 0.395000 0.885000 ;
+      RECT 0.085000  1.495000 0.365000 2.635000 ;
+      RECT 1.135000  1.495000 1.395000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
index 94e6d66..3044f22 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_12.magic.lef
@@ -83,41 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 11.960000 0.085000 ;
-        RECT 0.595000  0.085000  0.865000 0.545000 ;
-        RECT 1.535000  0.085000  1.805000 0.545000 ;
-        RECT 2.475000  0.085000  2.745000 0.545000 ;
-        RECT 3.415000  0.085000  3.685000 0.545000 ;
-        RECT 4.355000  0.085000  4.625000 0.545000 ;
-        RECT 5.295000  0.085000  5.565000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
@@ -126,64 +91,96 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.960000 2.805000 ;
-        RECT  0.125000 1.495000  0.395000 2.635000 ;
-        RECT  1.065000 1.835000  1.335000 2.635000 ;
-        RECT  2.005000 1.835000  2.275000 2.635000 ;
-        RECT  2.945000 1.835000  3.215000 2.635000 ;
-        RECT  3.885000 1.835000  4.155000 2.635000 ;
-        RECT  4.825000 1.835000  5.095000 2.635000 ;
-        RECT  5.765000 1.835000  6.035000 2.635000 ;
-        RECT  6.705000 1.835000  6.975000 2.635000 ;
-        RECT  7.645000 1.835000  7.915000 2.635000 ;
-        RECT  8.585000 1.835000  8.855000 2.635000 ;
-        RECT  9.525000 1.835000  9.795000 2.635000 ;
-        RECT 10.465000 1.835000 10.735000 2.635000 ;
-        RECT 11.405000 1.495000 11.675000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 0.255000  0.425000 0.715000 ;
-      RECT  0.090000 0.715000  5.985000 0.885000 ;
-      RECT  1.035000 0.255000  1.365000 0.715000 ;
-      RECT  1.975000 0.255000  2.305000 0.715000 ;
-      RECT  2.915000 0.255000  3.245000 0.715000 ;
-      RECT  3.855000 0.255000  4.185000 0.715000 ;
-      RECT  4.795000 0.255000  5.125000 0.715000 ;
-      RECT  5.735000 0.255000 11.705000 0.465000 ;
-      RECT  5.735000 0.465000  5.985000 0.715000 ;
-      RECT 11.455000 0.465000 11.705000 0.885000 ;
+      RECT  0.000000 -0.085000 11.960000 0.085000 ;
+      RECT  0.000000  2.635000 11.960000 2.805000 ;
+      RECT  0.090000  0.255000  0.425000 0.715000 ;
+      RECT  0.090000  0.715000  5.985000 0.885000 ;
+      RECT  0.125000  1.495000  0.395000 2.635000 ;
+      RECT  0.595000  0.085000  0.865000 0.545000 ;
+      RECT  1.035000  0.255000  1.365000 0.715000 ;
+      RECT  1.065000  1.835000  1.335000 2.635000 ;
+      RECT  1.535000  0.085000  1.805000 0.545000 ;
+      RECT  1.975000  0.255000  2.305000 0.715000 ;
+      RECT  2.005000  1.835000  2.275000 2.635000 ;
+      RECT  2.475000  0.085000  2.745000 0.545000 ;
+      RECT  2.915000  0.255000  3.245000 0.715000 ;
+      RECT  2.945000  1.835000  3.215000 2.635000 ;
+      RECT  3.415000  0.085000  3.685000 0.545000 ;
+      RECT  3.855000  0.255000  4.185000 0.715000 ;
+      RECT  3.885000  1.835000  4.155000 2.635000 ;
+      RECT  4.355000  0.085000  4.625000 0.545000 ;
+      RECT  4.795000  0.255000  5.125000 0.715000 ;
+      RECT  4.825000  1.835000  5.095000 2.635000 ;
+      RECT  5.295000  0.085000  5.565000 0.545000 ;
+      RECT  5.735000  0.255000 11.705000 0.465000 ;
+      RECT  5.735000  0.465000  5.985000 0.715000 ;
+      RECT  5.765000  1.835000  6.035000 2.635000 ;
+      RECT  6.705000  1.835000  6.975000 2.635000 ;
+      RECT  7.645000  1.835000  7.915000 2.635000 ;
+      RECT  8.585000  1.835000  8.855000 2.635000 ;
+      RECT  9.525000  1.835000  9.795000 2.635000 ;
+      RECT 10.465000  1.835000 10.735000 2.635000 ;
+      RECT 11.405000  1.495000 11.675000 2.635000 ;
+      RECT 11.455000  0.465000 11.705000 0.885000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
index 72c23ba..c80b625 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_16.magic.lef
@@ -87,51 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 15.640000 0.085000 ;
-        RECT 0.595000  0.085000  0.865000 0.545000 ;
-        RECT 1.535000  0.085000  1.805000 0.545000 ;
-        RECT 2.475000  0.085000  2.745000 0.545000 ;
-        RECT 3.415000  0.085000  3.685000 0.545000 ;
-        RECT 4.355000  0.085000  4.625000 0.545000 ;
-        RECT 5.295000  0.085000  5.565000 0.545000 ;
-        RECT 6.235000  0.085000  6.505000 0.545000 ;
-        RECT 7.175000  0.085000  7.445000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
@@ -140,78 +95,120 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 15.640000 2.805000 ;
-        RECT  0.125000 1.495000  0.395000 2.635000 ;
-        RECT  1.065000 1.835000  1.335000 2.635000 ;
-        RECT  2.005000 1.835000  2.275000 2.635000 ;
-        RECT  2.945000 1.835000  3.215000 2.635000 ;
-        RECT  3.885000 1.835000  4.155000 2.635000 ;
-        RECT  4.825000 1.835000  5.095000 2.635000 ;
-        RECT  5.765000 1.835000  6.035000 2.635000 ;
-        RECT  6.705000 1.835000  6.975000 2.635000 ;
-        RECT  7.645000 1.835000  7.915000 2.635000 ;
-        RECT  8.585000 1.835000  8.855000 2.635000 ;
-        RECT  9.525000 1.835000  9.795000 2.635000 ;
-        RECT 10.465000 1.835000 10.735000 2.635000 ;
-        RECT 11.405000 1.835000 11.675000 2.635000 ;
-        RECT 12.345000 1.835000 12.615000 2.635000 ;
-        RECT 13.285000 1.835000 13.555000 2.635000 ;
-        RECT 14.225000 1.835000 14.495000 2.635000 ;
-        RECT 15.165000 1.495000 15.435000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 15.640000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.095000 0.255000  0.425000 0.715000 ;
-      RECT  0.095000 0.715000  7.865000 0.885000 ;
-      RECT  1.035000 0.255000  1.365000 0.715000 ;
-      RECT  1.975000 0.255000  2.305000 0.715000 ;
-      RECT  2.915000 0.255000  3.245000 0.715000 ;
-      RECT  3.855000 0.255000  4.185000 0.715000 ;
-      RECT  4.795000 0.255000  5.125000 0.715000 ;
-      RECT  5.735000 0.255000  6.065000 0.715000 ;
-      RECT  6.675000 0.255000  7.005000 0.715000 ;
-      RECT  7.615000 0.255000 15.465000 0.465000 ;
-      RECT  7.615000 0.465000  7.865000 0.715000 ;
-      RECT 15.215000 0.465000 15.465000 0.885000 ;
+      RECT  0.000000 -0.085000 15.640000 0.085000 ;
+      RECT  0.000000  2.635000 15.640000 2.805000 ;
+      RECT  0.095000  0.255000  0.425000 0.715000 ;
+      RECT  0.095000  0.715000  7.865000 0.885000 ;
+      RECT  0.125000  1.495000  0.395000 2.635000 ;
+      RECT  0.595000  0.085000  0.865000 0.545000 ;
+      RECT  1.035000  0.255000  1.365000 0.715000 ;
+      RECT  1.065000  1.835000  1.335000 2.635000 ;
+      RECT  1.535000  0.085000  1.805000 0.545000 ;
+      RECT  1.975000  0.255000  2.305000 0.715000 ;
+      RECT  2.005000  1.835000  2.275000 2.635000 ;
+      RECT  2.475000  0.085000  2.745000 0.545000 ;
+      RECT  2.915000  0.255000  3.245000 0.715000 ;
+      RECT  2.945000  1.835000  3.215000 2.635000 ;
+      RECT  3.415000  0.085000  3.685000 0.545000 ;
+      RECT  3.855000  0.255000  4.185000 0.715000 ;
+      RECT  3.885000  1.835000  4.155000 2.635000 ;
+      RECT  4.355000  0.085000  4.625000 0.545000 ;
+      RECT  4.795000  0.255000  5.125000 0.715000 ;
+      RECT  4.825000  1.835000  5.095000 2.635000 ;
+      RECT  5.295000  0.085000  5.565000 0.545000 ;
+      RECT  5.735000  0.255000  6.065000 0.715000 ;
+      RECT  5.765000  1.835000  6.035000 2.635000 ;
+      RECT  6.235000  0.085000  6.505000 0.545000 ;
+      RECT  6.675000  0.255000  7.005000 0.715000 ;
+      RECT  6.705000  1.835000  6.975000 2.635000 ;
+      RECT  7.175000  0.085000  7.445000 0.545000 ;
+      RECT  7.615000  0.255000 15.465000 0.465000 ;
+      RECT  7.615000  0.465000  7.865000 0.715000 ;
+      RECT  7.645000  1.835000  7.915000 2.635000 ;
+      RECT  8.585000  1.835000  8.855000 2.635000 ;
+      RECT  9.525000  1.835000  9.795000 2.635000 ;
+      RECT 10.465000  1.835000 10.735000 2.635000 ;
+      RECT 11.405000  1.835000 11.675000 2.635000 ;
+      RECT 12.345000  1.835000 12.615000 2.635000 ;
+      RECT 13.285000  1.835000 13.555000 2.635000 ;
+      RECT 14.225000  1.835000 14.495000 2.635000 ;
+      RECT 15.165000  1.495000 15.435000 2.635000 ;
+      RECT 15.215000  0.465000 15.465000 0.885000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
+      RECT 15.325000 -0.085000 15.495000 0.085000 ;
+      RECT 15.325000  2.635000 15.495000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
index f17935f..178c891 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_2.magic.lef
@@ -69,16 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -87,28 +77,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.285000 2.635000 ;
-        RECT 2.055000 1.835000 2.310000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.425000 0.715000 ;
-      RECT 0.085000 0.715000 1.285000 0.885000 ;
-      RECT 0.985000 0.255000 2.305000 0.485000 ;
-      RECT 0.985000 0.485000 1.285000 0.715000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.255000 0.425000 0.715000 ;
+      RECT 0.085000  0.715000 1.285000 0.885000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 0.645000  0.085000 0.815000 0.545000 ;
+      RECT 0.985000  0.255000 2.305000 0.485000 ;
+      RECT 0.985000  0.485000 1.285000 0.715000 ;
+      RECT 1.115000  1.835000 1.285000 2.635000 ;
+      RECT 2.055000  1.835000 2.310000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
index 1d2a84e..d311312 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_4.magic.lef
@@ -71,21 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.545000 ;
-        RECT 1.585000  0.085000 1.755000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -94,36 +79,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.285000 2.635000 ;
-        RECT 2.055000 1.835000 2.225000 2.635000 ;
-        RECT 2.995000 1.835000 3.165000 2.635000 ;
-        RECT 3.935000 1.835000 4.185000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.715000 ;
-      RECT 0.090000 0.715000 2.225000 0.905000 ;
-      RECT 0.985000 0.255000 1.365000 0.715000 ;
-      RECT 1.925000 0.255000 4.185000 0.465000 ;
-      RECT 1.925000 0.465000 2.225000 0.715000 ;
-      RECT 3.935000 0.465000 4.185000 0.885000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.715000 ;
+      RECT 0.090000  0.715000 2.225000 0.905000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.645000  0.085000 0.815000 0.545000 ;
+      RECT 0.985000  0.255000 1.365000 0.715000 ;
+      RECT 1.115000  1.835000 1.285000 2.635000 ;
+      RECT 1.585000  0.085000 1.755000 0.545000 ;
+      RECT 1.925000  0.255000 4.185000 0.465000 ;
+      RECT 1.925000  0.465000 2.225000 0.715000 ;
+      RECT 2.055000  1.835000 2.225000 2.635000 ;
+      RECT 2.995000  1.835000 3.165000 2.635000 ;
+      RECT 3.935000  0.465000 4.185000 0.885000 ;
+      RECT 3.935000  1.835000 4.185000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
index 16995dc..238eb43 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_6.magic.lef
@@ -76,26 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.595000  0.085000 0.865000 0.545000 ;
-        RECT 1.535000  0.085000 1.805000 0.545000 ;
-        RECT 2.475000  0.085000 2.745000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -104,43 +84,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.125000 1.495000 0.395000 2.635000 ;
-        RECT 1.065000 1.835000 1.335000 2.635000 ;
-        RECT 2.005000 1.835000 2.275000 2.635000 ;
-        RECT 2.945000 1.835000 3.215000 2.635000 ;
-        RECT 3.885000 1.835000 4.155000 2.635000 ;
-        RECT 4.825000 1.835000 5.095000 2.635000 ;
-        RECT 5.765000 1.495000 6.035000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.715000 ;
-      RECT 0.090000 0.715000 3.165000 0.885000 ;
-      RECT 1.035000 0.255000 1.365000 0.715000 ;
-      RECT 1.975000 0.255000 2.305000 0.715000 ;
-      RECT 2.915000 0.255000 6.065000 0.465000 ;
-      RECT 2.915000 0.465000 3.165000 0.715000 ;
-      RECT 5.765000 0.465000 6.065000 0.885000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.715000 ;
+      RECT 0.090000  0.715000 3.165000 0.885000 ;
+      RECT 0.125000  1.495000 0.395000 2.635000 ;
+      RECT 0.595000  0.085000 0.865000 0.545000 ;
+      RECT 1.035000  0.255000 1.365000 0.715000 ;
+      RECT 1.065000  1.835000 1.335000 2.635000 ;
+      RECT 1.535000  0.085000 1.805000 0.545000 ;
+      RECT 1.975000  0.255000 2.305000 0.715000 ;
+      RECT 2.005000  1.835000 2.275000 2.635000 ;
+      RECT 2.475000  0.085000 2.745000 0.545000 ;
+      RECT 2.915000  0.255000 6.065000 0.465000 ;
+      RECT 2.915000  0.465000 3.165000 0.715000 ;
+      RECT 2.945000  1.835000 3.215000 2.635000 ;
+      RECT 3.885000  1.835000 4.155000 2.635000 ;
+      RECT 4.825000  1.835000 5.095000 2.635000 ;
+      RECT 5.765000  0.465000 6.065000 0.885000 ;
+      RECT 5.765000  1.495000 6.035000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
index c8c067a..4ea1816 100644
--- a/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
+++ b/cells/nand2/sky130_fd_sc_hdll__nand2_8.magic.lef
@@ -77,31 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.565000 ;
-        RECT 1.585000  0.085000 1.755000 0.565000 ;
-        RECT 2.525000  0.085000 2.695000 0.565000 ;
-        RECT 3.465000  0.085000 3.635000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -110,50 +85,72 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.285000 2.635000 ;
-        RECT 2.055000 1.835000 2.225000 2.635000 ;
-        RECT 2.995000 1.835000 3.165000 2.635000 ;
-        RECT 3.935000 1.835000 4.105000 2.635000 ;
-        RECT 4.875000 1.835000 5.045000 2.635000 ;
-        RECT 5.815000 1.835000 5.985000 2.635000 ;
-        RECT 6.755000 1.835000 6.925000 2.635000 ;
-        RECT 7.715000 1.495000 8.070000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.735000 ;
-      RECT 0.090000 0.735000 4.105000 0.905000 ;
-      RECT 0.985000 0.255000 1.365000 0.735000 ;
-      RECT 1.925000 0.255000 2.305000 0.735000 ;
-      RECT 2.865000 0.255000 3.245000 0.735000 ;
-      RECT 3.805000 0.255000 8.070000 0.485000 ;
-      RECT 3.805000 0.485000 4.105000 0.735000 ;
-      RECT 7.695000 0.485000 8.070000 0.905000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.735000 ;
+      RECT 0.090000  0.735000 4.105000 0.905000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.645000  0.085000 0.815000 0.565000 ;
+      RECT 0.985000  0.255000 1.365000 0.735000 ;
+      RECT 1.115000  1.835000 1.285000 2.635000 ;
+      RECT 1.585000  0.085000 1.755000 0.565000 ;
+      RECT 1.925000  0.255000 2.305000 0.735000 ;
+      RECT 2.055000  1.835000 2.225000 2.635000 ;
+      RECT 2.525000  0.085000 2.695000 0.565000 ;
+      RECT 2.865000  0.255000 3.245000 0.735000 ;
+      RECT 2.995000  1.835000 3.165000 2.635000 ;
+      RECT 3.465000  0.085000 3.635000 0.565000 ;
+      RECT 3.805000  0.255000 8.070000 0.485000 ;
+      RECT 3.805000  0.485000 4.105000 0.735000 ;
+      RECT 3.935000  1.835000 4.105000 2.635000 ;
+      RECT 4.875000  1.835000 5.045000 2.635000 ;
+      RECT 5.815000  1.835000 5.985000 2.635000 ;
+      RECT 6.755000  1.835000 6.925000 2.635000 ;
+      RECT 7.695000  0.485000 8.070000 0.905000 ;
+      RECT 7.715000  1.495000 8.070000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
index 76f09df..6ae6935 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_1.magic.lef
@@ -68,15 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.630000  0.085000 0.960000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -85,27 +76,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.630000 1.835000 0.880000 2.635000 ;
-        RECT 1.650000 2.175000 1.865000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.525000 0.360000 0.735000 ;
-      RECT 0.090000 0.735000 1.620000 0.905000 ;
-      RECT 0.090000 1.495000 1.620000 1.665000 ;
-      RECT 0.090000 1.665000 0.370000 1.825000 ;
-      RECT 1.450000 0.905000 1.620000 1.495000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.090000  0.525000 0.360000 0.735000 ;
+      RECT 0.090000  0.735000 1.620000 0.905000 ;
+      RECT 0.090000  1.495000 1.620000 1.665000 ;
+      RECT 0.090000  1.665000 0.370000 1.825000 ;
+      RECT 0.630000  0.085000 0.960000 0.545000 ;
+      RECT 0.630000  1.835000 0.880000 2.635000 ;
+      RECT 1.450000  0.905000 1.620000 1.495000 ;
+      RECT 1.650000  2.175000 1.865000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
index c1b4411..6fff989 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_2.magic.lef
@@ -70,18 +70,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.595000  0.085000 0.765000 0.775000 ;
-        RECT 2.425000  0.085000 2.595000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -90,34 +78,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.630000 1.835000 0.885000 2.635000 ;
-        RECT 1.725000 2.175000 2.100000 2.635000 ;
-        RECT 2.845000 1.835000 3.015000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.510000 0.345000 0.840000 ;
-      RECT 0.110000 0.840000 0.280000 1.495000 ;
-      RECT 0.110000 1.495000 1.190000 1.665000 ;
-      RECT 0.110000 1.665000 0.410000 1.860000 ;
-      RECT 1.020000 0.995000 1.190000 1.495000 ;
-      RECT 1.035000 0.255000 2.205000 0.465000 ;
-      RECT 1.955000 0.465000 2.205000 0.695000 ;
-      RECT 1.955000 0.695000 3.095000 0.905000 ;
-      RECT 2.765000 0.255000 3.095000 0.695000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.110000  0.510000 0.345000 0.840000 ;
+      RECT 0.110000  0.840000 0.280000 1.495000 ;
+      RECT 0.110000  1.495000 1.190000 1.665000 ;
+      RECT 0.110000  1.665000 0.410000 1.860000 ;
+      RECT 0.595000  0.085000 0.765000 0.775000 ;
+      RECT 0.630000  1.835000 0.885000 2.635000 ;
+      RECT 1.020000  0.995000 1.190000 1.495000 ;
+      RECT 1.035000  0.255000 2.205000 0.465000 ;
+      RECT 1.725000  2.175000 2.100000 2.635000 ;
+      RECT 1.955000  0.465000 2.205000 0.695000 ;
+      RECT 1.955000  0.695000 3.095000 0.905000 ;
+      RECT 2.425000  0.085000 2.595000 0.525000 ;
+      RECT 2.765000  0.255000 3.095000 0.695000 ;
+      RECT 2.845000  1.835000 3.015000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
index c572cc3..a12468a 100644
--- a/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
+++ b/cells/nand2b/sky130_fd_sc_hdll__nand2b_4.magic.lef
@@ -71,24 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.645000  0.085000 0.840000 0.545000 ;
-        RECT 3.530000  0.085000 3.700000 0.545000 ;
-        RECT 4.470000  0.085000 4.710000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -97,46 +79,61 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.645000 1.835000 1.335000 2.635000 ;
-        RECT 1.020000 1.445000 1.335000 1.835000 ;
-        RECT 2.105000 1.835000 2.275000 2.635000 ;
-        RECT 3.060000 1.835000 3.230000 2.635000 ;
-        RECT 4.000000 1.835000 4.170000 2.635000 ;
-        RECT 4.970000 1.495000 5.300000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.715000 ;
-      RECT 0.090000 0.715000 0.830000 0.905000 ;
-      RECT 0.090000 1.445000 0.830000 1.665000 ;
-      RECT 0.090000 1.665000 0.425000 2.465000 ;
-      RECT 0.660000 0.905000 0.830000 1.075000 ;
-      RECT 0.660000 1.075000 2.355000 1.275000 ;
-      RECT 0.660000 1.275000 0.830000 1.445000 ;
-      RECT 1.085000 0.255000 3.310000 0.465000 ;
-      RECT 1.085000 0.465000 1.335000 0.905000 ;
-      RECT 3.060000 0.465000 3.310000 0.715000 ;
-      RECT 3.060000 0.715000 5.300000 0.905000 ;
-      RECT 3.870000 0.255000 4.250000 0.715000 ;
-      RECT 4.970000 0.255000 5.300000 0.715000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.715000 ;
+      RECT 0.090000  0.715000 0.830000 0.905000 ;
+      RECT 0.090000  1.445000 0.830000 1.665000 ;
+      RECT 0.090000  1.665000 0.425000 2.465000 ;
+      RECT 0.645000  0.085000 0.840000 0.545000 ;
+      RECT 0.645000  1.835000 1.335000 2.635000 ;
+      RECT 0.660000  0.905000 0.830000 1.075000 ;
+      RECT 0.660000  1.075000 2.355000 1.275000 ;
+      RECT 0.660000  1.275000 0.830000 1.445000 ;
+      RECT 1.020000  1.445000 1.335000 1.835000 ;
+      RECT 1.085000  0.255000 3.310000 0.465000 ;
+      RECT 1.085000  0.465000 1.335000 0.905000 ;
+      RECT 2.105000  1.835000 2.275000 2.635000 ;
+      RECT 3.060000  0.465000 3.310000 0.715000 ;
+      RECT 3.060000  0.715000 5.300000 0.905000 ;
+      RECT 3.060000  1.835000 3.230000 2.635000 ;
+      RECT 3.530000  0.085000 3.700000 0.545000 ;
+      RECT 3.870000  0.255000 4.250000 0.715000 ;
+      RECT 4.000000  1.835000 4.170000 2.635000 ;
+      RECT 4.470000  0.085000 4.710000 0.545000 ;
+      RECT 4.970000  0.255000 5.300000 0.715000 ;
+      RECT 4.970000  1.495000 5.300000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
index c50156b..ef484f5 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_1.magic.lef
@@ -79,15 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.090000  0.085000 0.345000 0.575000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -96,20 +87,29 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.345000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.090000  0.085000 0.345000 0.575000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 1.115000  1.835000 1.345000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
index 6fcdcc3..f1160cc 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_2.magic.lef
@@ -78,20 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 2.495000  0.085000 2.825000 0.465000 ;
-        RECT 3.515000  0.085000 3.895000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -100,31 +86,42 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.285000 2.635000 ;
-        RECT 2.055000 1.835000 2.745000 2.635000 ;
-        RECT 3.515000 1.445000 3.895000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.295000 2.305000 0.465000 ;
-      RECT 0.090000 0.465000 0.345000 0.785000 ;
-      RECT 1.455000 0.635000 3.295000 0.905000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.090000  0.295000 2.305000 0.465000 ;
+      RECT 0.090000  0.465000 0.345000 0.785000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 1.115000  1.835000 1.285000 2.635000 ;
+      RECT 1.455000  0.635000 3.295000 0.905000 ;
+      RECT 2.055000  1.835000 2.745000 2.635000 ;
+      RECT 2.495000  0.085000 2.825000 0.465000 ;
+      RECT 3.515000  0.085000 3.895000 0.885000 ;
+      RECT 3.515000  1.445000 3.895000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
index 89e2994..995f54f 100644
--- a/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
+++ b/cells/nand3/sky130_fd_sc_hdll__nand3_4.magic.lef
@@ -82,26 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.565000 ;
-        RECT 1.585000  0.085000 1.755000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -110,44 +90,61 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.090000 1.445000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.285000 2.635000 ;
-        RECT 2.055000 1.835000 2.225000 2.635000 ;
-        RECT 2.995000 1.835000 3.165000 2.635000 ;
-        RECT 3.935000 1.835000 4.625000 2.635000 ;
-        RECT 5.395000 1.835000 5.565000 2.635000 ;
-        RECT 6.335000 1.835000 6.600000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.735000 ;
-      RECT 0.090000 0.735000 4.185000 0.905000 ;
-      RECT 0.985000 0.255000 1.365000 0.735000 ;
-      RECT 1.925000 0.655000 2.305000 0.735000 ;
-      RECT 2.395000 0.255000 6.600000 0.485000 ;
-      RECT 2.865000 0.655000 3.245000 0.735000 ;
-      RECT 3.805000 0.655000 4.185000 0.735000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.735000 ;
+      RECT 0.090000  0.735000 4.185000 0.905000 ;
+      RECT 0.090000  1.445000 0.345000 2.635000 ;
+      RECT 0.645000  0.085000 0.815000 0.565000 ;
+      RECT 0.985000  0.255000 1.365000 0.735000 ;
+      RECT 1.115000  1.835000 1.285000 2.635000 ;
+      RECT 1.585000  0.085000 1.755000 0.565000 ;
+      RECT 1.925000  0.655000 2.305000 0.735000 ;
+      RECT 2.055000  1.835000 2.225000 2.635000 ;
+      RECT 2.395000  0.255000 6.600000 0.485000 ;
+      RECT 2.865000  0.655000 3.245000 0.735000 ;
+      RECT 2.995000  1.835000 3.165000 2.635000 ;
+      RECT 3.805000  0.655000 4.185000 0.735000 ;
+      RECT 3.935000  1.835000 4.625000 2.635000 ;
+      RECT 5.395000  1.835000 5.565000 2.635000 ;
+      RECT 6.335000  1.835000 6.600000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
index ea33905..a42e2c8 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_1.magic.lef
@@ -78,16 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.760000  0.085000 1.090000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -96,28 +86,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.760000 1.495000 1.010000 2.635000 ;
-        RECT 1.790000 1.835000 1.960000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.445000 0.510000 0.655000 ;
-      RECT 0.085000 0.655000 2.220000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.595000 ;
-      RECT 0.085000 1.595000 0.510000 1.925000 ;
-      RECT 2.000000 0.825000 2.220000 1.325000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.445000 0.510000 0.655000 ;
+      RECT 0.085000  0.655000 2.220000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.595000 ;
+      RECT 0.085000  1.595000 0.510000 1.925000 ;
+      RECT 0.760000  0.085000 1.090000 0.485000 ;
+      RECT 0.760000  1.495000 1.010000 2.635000 ;
+      RECT 1.790000  1.835000 1.960000 2.635000 ;
+      RECT 2.000000  0.825000 2.220000 1.325000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
index 28188fb..b24288c 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_2.magic.lef
@@ -81,21 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.630000  0.085000 0.940000 0.905000 ;
-        RECT 1.710000  0.085000 1.960000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -104,41 +89,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.630000 1.835000 0.940000 2.635000 ;
-        RECT 1.710000 2.175000 1.880000 2.635000 ;
-        RECT 2.650000 2.175000 2.900000 2.635000 ;
-        RECT 3.090000 2.175000 3.390000 2.635000 ;
-        RECT 4.160000 2.175000 4.450000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.410000 0.655000 ;
-      RECT 0.090000 0.655000 0.260000 1.445000 ;
-      RECT 0.090000 1.445000 4.000000 1.615000 ;
-      RECT 0.090000 1.615000 0.260000 2.065000 ;
-      RECT 0.090000 2.065000 0.410000 2.465000 ;
-      RECT 1.110000 0.255000 1.490000 0.715000 ;
-      RECT 1.110000 0.715000 3.000000 0.905000 ;
-      RECT 2.200000 0.255000 4.450000 0.465000 ;
-      RECT 2.200000 0.635000 3.000000 0.715000 ;
-      RECT 3.220000 0.465000 3.390000 0.905000 ;
-      RECT 3.670000 1.075000 4.000000 1.445000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  0.255000 0.410000 0.655000 ;
+      RECT 0.090000  0.655000 0.260000 1.445000 ;
+      RECT 0.090000  1.445000 4.000000 1.615000 ;
+      RECT 0.090000  1.615000 0.260000 2.065000 ;
+      RECT 0.090000  2.065000 0.410000 2.465000 ;
+      RECT 0.630000  0.085000 0.940000 0.905000 ;
+      RECT 0.630000  1.835000 0.940000 2.635000 ;
+      RECT 1.110000  0.255000 1.490000 0.715000 ;
+      RECT 1.110000  0.715000 3.000000 0.905000 ;
+      RECT 1.710000  0.085000 1.960000 0.545000 ;
+      RECT 1.710000  2.175000 1.880000 2.635000 ;
+      RECT 2.200000  0.255000 4.450000 0.465000 ;
+      RECT 2.200000  0.635000 3.000000 0.715000 ;
+      RECT 2.650000  2.175000 2.900000 2.635000 ;
+      RECT 3.090000  2.175000 3.390000 2.635000 ;
+      RECT 3.220000  0.465000 3.390000 0.905000 ;
+      RECT 3.670000  1.075000 4.000000 1.445000 ;
+      RECT 4.160000  2.175000 4.450000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
index 636f5d6..77f3471 100644
--- a/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
+++ b/cells/nand3b/sky130_fd_sc_hdll__nand3b_4.magic.lef
@@ -84,30 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.645000  0.085000 0.895000 0.545000 ;
-        RECT 5.365000  0.085000 5.615000 0.545000 ;
-        RECT 6.385000  0.085000 6.555000 0.545000 ;
-        RECT 7.325000  0.085000 7.655000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -116,50 +92,71 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.645000 1.445000 1.335000 2.635000 ;
-        RECT 2.105000 1.835000 2.275000 2.635000 ;
-        RECT 3.045000 2.175000 3.215000 2.635000 ;
-        RECT 3.985000 1.835000 4.155000 2.635000 ;
-        RECT 4.925000 1.835000 5.615000 2.635000 ;
-        RECT 6.385000 1.835000 6.555000 2.635000 ;
-        RECT 7.325000 1.445000 7.655000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.425000 0.715000 ;
-      RECT 0.085000 0.715000 1.335000 0.905000 ;
-      RECT 0.085000 0.905000 0.260000 1.445000 ;
-      RECT 0.085000 1.445000 0.425000 2.465000 ;
-      RECT 1.055000 0.905000 1.335000 1.075000 ;
-      RECT 1.055000 1.075000 2.825000 1.275000 ;
-      RECT 1.085000 0.255000 5.175000 0.465000 ;
-      RECT 3.385000 0.635000 5.175000 0.715000 ;
-      RECT 3.385000 0.715000 7.105000 0.905000 ;
-      RECT 5.785000 0.255000 6.165000 0.715000 ;
-      RECT 6.725000 0.255000 7.105000 0.715000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.085000  0.255000 0.425000 0.715000 ;
+      RECT 0.085000  0.715000 1.335000 0.905000 ;
+      RECT 0.085000  0.905000 0.260000 1.445000 ;
+      RECT 0.085000  1.445000 0.425000 2.465000 ;
+      RECT 0.645000  0.085000 0.895000 0.545000 ;
+      RECT 0.645000  1.445000 1.335000 2.635000 ;
+      RECT 1.055000  0.905000 1.335000 1.075000 ;
+      RECT 1.055000  1.075000 2.825000 1.275000 ;
+      RECT 1.085000  0.255000 5.175000 0.465000 ;
+      RECT 2.105000  1.835000 2.275000 2.635000 ;
+      RECT 3.045000  2.175000 3.215000 2.635000 ;
+      RECT 3.385000  0.635000 5.175000 0.715000 ;
+      RECT 3.385000  0.715000 7.105000 0.905000 ;
+      RECT 3.985000  1.835000 4.155000 2.635000 ;
+      RECT 4.925000  1.835000 5.615000 2.635000 ;
+      RECT 5.365000  0.085000 5.615000 0.545000 ;
+      RECT 5.785000  0.255000 6.165000 0.715000 ;
+      RECT 6.385000  0.085000 6.555000 0.545000 ;
+      RECT 6.385000  1.835000 6.555000 2.635000 ;
+      RECT 6.725000  0.255000 7.105000 0.715000 ;
+      RECT 7.325000  0.085000 7.655000 0.905000 ;
+      RECT 7.325000  1.445000 7.655000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
index 1955a53..1bcc6fa 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_1.magic.lef
@@ -90,16 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -108,22 +98,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.285000 2.635000 ;
-        RECT 2.115000 1.835000 2.395000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 0.090000  0.085000 0.425000 0.825000 ;
+      RECT 1.115000  1.835000 1.285000 2.635000 ;
+      RECT 2.115000  1.835000 2.395000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
index 95a6eb4..d97dc9c 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_2.magic.lef
@@ -89,21 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -112,39 +97,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.285000 2.635000 ;
-        RECT 2.055000 1.835000 2.385000 2.635000 ;
-        RECT 3.295000 1.835000 3.675000 2.635000 ;
-        RECT 4.545000 1.445000 4.875000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.735000 ;
-      RECT 0.090000 0.735000 1.285000 0.905000 ;
-      RECT 0.985000 0.255000 2.325000 0.465000 ;
-      RECT 0.985000 0.465000 1.285000 0.735000 ;
-      RECT 1.455000 0.635000 3.385000 0.905000 ;
-      RECT 2.515000 0.255000 4.875000 0.465000 ;
-      RECT 3.605000 0.465000 3.775000 0.885000 ;
-      RECT 4.545000 0.465000 4.875000 0.905000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.735000 ;
+      RECT 0.090000  0.735000 1.285000 0.905000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.645000  0.085000 0.815000 0.545000 ;
+      RECT 0.985000  0.255000 2.325000 0.465000 ;
+      RECT 0.985000  0.465000 1.285000 0.735000 ;
+      RECT 1.115000  1.835000 1.285000 2.635000 ;
+      RECT 1.455000  0.635000 3.385000 0.905000 ;
+      RECT 2.055000  1.835000 2.385000 2.635000 ;
+      RECT 2.515000  0.255000 4.875000 0.465000 ;
+      RECT 3.295000  1.835000 3.675000 2.635000 ;
+      RECT 3.605000  0.465000 3.775000 0.885000 ;
+      RECT 4.545000  0.465000 4.875000 0.905000 ;
+      RECT 4.545000  1.445000 4.875000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
index 4442dee..546d31b 100644
--- a/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
+++ b/cells/nand4/sky130_fd_sc_hdll__nand4_4.magic.lef
@@ -93,30 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.485000 ;
-        RECT 1.455000  0.085000 1.835000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -125,51 +101,72 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.090000 1.445000 0.345000 2.635000 ;
-        RECT 1.115000 1.835000 1.285000 2.635000 ;
-        RECT 2.055000 1.835000 2.225000 2.635000 ;
-        RECT 2.995000 1.835000 3.165000 2.635000 ;
-        RECT 3.935000 1.835000 4.625000 2.635000 ;
-        RECT 5.395000 1.835000 5.565000 2.635000 ;
-        RECT 6.370000 1.835000 6.540000 2.635000 ;
-        RECT 7.335000 1.835000 7.505000 2.635000 ;
-        RECT 8.275000 1.445000 8.535000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.345000 0.655000 ;
-      RECT 0.090000 0.655000 2.225000 0.905000 ;
-      RECT 1.115000 0.255000 1.285000 0.655000 ;
-      RECT 2.055000 0.255000 4.185000 0.485000 ;
-      RECT 2.055000 0.485000 2.225000 0.655000 ;
-      RECT 2.395000 0.655000 6.115000 0.905000 ;
-      RECT 4.375000 0.255000 8.530000 0.485000 ;
-      RECT 8.275000 0.485000 8.530000 0.905000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.090000  0.255000 0.345000 0.655000 ;
+      RECT 0.090000  0.655000 2.225000 0.905000 ;
+      RECT 0.090000  1.445000 0.345000 2.635000 ;
+      RECT 0.515000  0.085000 0.895000 0.485000 ;
+      RECT 1.115000  0.255000 1.285000 0.655000 ;
+      RECT 1.115000  1.835000 1.285000 2.635000 ;
+      RECT 1.455000  0.085000 1.835000 0.485000 ;
+      RECT 2.055000  0.255000 4.185000 0.485000 ;
+      RECT 2.055000  0.485000 2.225000 0.655000 ;
+      RECT 2.055000  1.835000 2.225000 2.635000 ;
+      RECT 2.395000  0.655000 6.115000 0.905000 ;
+      RECT 2.995000  1.835000 3.165000 2.635000 ;
+      RECT 3.935000  1.835000 4.625000 2.635000 ;
+      RECT 4.375000  0.255000 8.530000 0.485000 ;
+      RECT 5.395000  1.835000 5.565000 2.635000 ;
+      RECT 6.370000  1.835000 6.540000 2.635000 ;
+      RECT 7.335000  1.835000 7.505000 2.635000 ;
+      RECT 8.275000  0.485000 8.530000 0.905000 ;
+      RECT 8.275000  1.445000 8.535000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
index e5afe6d..068be46 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_1.magic.lef
@@ -88,17 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.665000  0.085000 1.030000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -107,33 +96,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.755000 1.495000 1.005000 2.635000 ;
-        RECT 1.725000 1.835000 2.000000 2.635000 ;
-        RECT 2.875000 1.835000 3.090000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.445000 0.470000 0.655000 ;
-      RECT 0.085000 0.655000 1.370000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.595000 ;
-      RECT 0.085000 1.595000 0.505000 1.925000 ;
-      RECT 1.200000 0.425000 2.600000 0.595000 ;
-      RECT 1.200000 0.595000 1.370000 0.655000 ;
-      RECT 2.395000 0.595000 2.600000 0.995000 ;
-      RECT 2.395000 0.995000 2.705000 1.325000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.445000 0.470000 0.655000 ;
+      RECT 0.085000  0.655000 1.370000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.595000 ;
+      RECT 0.085000  1.595000 0.505000 1.925000 ;
+      RECT 0.665000  0.085000 1.030000 0.485000 ;
+      RECT 0.755000  1.495000 1.005000 2.635000 ;
+      RECT 1.200000  0.425000 2.600000 0.595000 ;
+      RECT 1.200000  0.595000 1.370000 0.655000 ;
+      RECT 1.725000  1.835000 2.000000 2.635000 ;
+      RECT 2.395000  0.595000 2.600000 0.995000 ;
+      RECT 2.395000  0.995000 2.705000 1.325000 ;
+      RECT 2.875000  1.835000 3.090000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
index f69beff..1511adf 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_2.magic.lef
@@ -88,24 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.465000 ;
-        RECT 5.065000  0.085000 5.235000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -114,51 +96,66 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.515000 2.255000 1.335000 2.635000 ;
-        RECT 1.085000 1.445000 1.335000 2.255000 ;
-        RECT 2.105000 1.835000 2.275000 2.635000 ;
-        RECT 3.045000 1.835000 3.685000 2.635000 ;
-        RECT 4.455000 1.835000 4.715000 2.635000 ;
-        RECT 5.485000 1.495000 5.880000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.345000 0.635000 ;
-      RECT 0.090000 0.635000 0.720000 0.805000 ;
-      RECT 0.090000 1.915000 0.720000 2.085000 ;
-      RECT 0.090000 2.085000 0.345000 2.465000 ;
-      RECT 0.500000 0.805000 0.720000 1.075000 ;
-      RECT 0.500000 1.075000 1.335000 1.245000 ;
-      RECT 0.500000 1.245000 0.720000 1.915000 ;
-      RECT 1.085000 0.255000 2.275000 0.465000 ;
-      RECT 1.085000 0.465000 1.335000 0.905000 ;
-      RECT 2.105000 0.465000 2.275000 0.635000 ;
-      RECT 2.105000 0.635000 3.295000 0.905000 ;
-      RECT 2.445000 0.255000 4.285000 0.465000 ;
-      RECT 3.485000 0.635000 4.805000 0.715000 ;
-      RECT 3.485000 0.715000 5.790000 0.905000 ;
-      RECT 4.505000 0.255000 4.765000 0.615000 ;
-      RECT 4.505000 0.615000 4.805000 0.635000 ;
-      RECT 5.455000 0.255000 5.790000 0.715000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.090000  0.255000 0.345000 0.635000 ;
+      RECT 0.090000  0.635000 0.720000 0.805000 ;
+      RECT 0.090000  1.915000 0.720000 2.085000 ;
+      RECT 0.090000  2.085000 0.345000 2.465000 ;
+      RECT 0.500000  0.805000 0.720000 1.075000 ;
+      RECT 0.500000  1.075000 1.335000 1.245000 ;
+      RECT 0.500000  1.245000 0.720000 1.915000 ;
+      RECT 0.515000  0.085000 0.895000 0.465000 ;
+      RECT 0.515000  2.255000 1.335000 2.635000 ;
+      RECT 1.085000  0.255000 2.275000 0.465000 ;
+      RECT 1.085000  0.465000 1.335000 0.905000 ;
+      RECT 1.085000  1.445000 1.335000 2.255000 ;
+      RECT 2.105000  0.465000 2.275000 0.635000 ;
+      RECT 2.105000  0.635000 3.295000 0.905000 ;
+      RECT 2.105000  1.835000 2.275000 2.635000 ;
+      RECT 2.445000  0.255000 4.285000 0.465000 ;
+      RECT 3.045000  1.835000 3.685000 2.635000 ;
+      RECT 3.485000  0.635000 4.805000 0.715000 ;
+      RECT 3.485000  0.715000 5.790000 0.905000 ;
+      RECT 4.455000  1.835000 4.715000 2.635000 ;
+      RECT 4.505000  0.255000 4.765000 0.615000 ;
+      RECT 4.505000  0.615000 4.805000 0.635000 ;
+      RECT 5.065000  0.085000 5.235000 0.545000 ;
+      RECT 5.455000  0.255000 5.790000 0.715000 ;
+      RECT 5.485000  1.495000 5.880000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
index c2fab0b..123cf13 100644
--- a/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
+++ b/cells/nand4b/sky130_fd_sc_hdll__nand4b_4.magic.lef
@@ -93,33 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.645000  0.085000 0.895000 0.545000 ;
-        RECT 7.795000  0.085000 7.965000 0.545000 ;
-        RECT 8.735000  0.085000 8.905000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -128,61 +101,85 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.645000 1.835000 1.335000 2.635000 ;
-        RECT 1.045000 1.495000 1.335000 1.835000 ;
-        RECT 2.105000 1.835000 2.275000 2.635000 ;
-        RECT 3.045000 1.835000 3.215000 2.635000 ;
-        RECT 3.985000 1.835000 4.155000 2.635000 ;
-        RECT 4.925000 1.835000 5.615000 2.635000 ;
-        RECT 6.385000 1.835000 6.555000 2.635000 ;
-        RECT 7.325000 1.835000 7.495000 2.635000 ;
-        RECT 8.265000 1.835000 8.435000 2.635000 ;
-        RECT 9.205000 1.445000 9.460000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.425000 0.735000 ;
-      RECT 0.090000 0.735000 0.855000 0.905000 ;
-      RECT 0.090000 1.495000 0.855000 1.665000 ;
-      RECT 0.090000 1.665000 0.425000 2.465000 ;
-      RECT 0.660000 0.905000 0.855000 1.075000 ;
-      RECT 0.660000 1.075000 1.975000 1.275000 ;
-      RECT 0.660000 1.275000 0.855000 1.495000 ;
-      RECT 1.085000 0.255000 5.175000 0.465000 ;
-      RECT 1.085000 0.465000 1.335000 0.905000 ;
-      RECT 3.385000 0.635000 7.105000 0.905000 ;
-      RECT 5.365000 0.255000 7.575000 0.465000 ;
-      RECT 7.325000 0.465000 7.575000 0.735000 ;
-      RECT 7.325000 0.735000 9.460000 0.905000 ;
-      RECT 8.135000 0.255000 8.515000 0.735000 ;
-      RECT 9.075000 0.255000 9.460000 0.735000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.090000  0.255000 0.425000 0.735000 ;
+      RECT 0.090000  0.735000 0.855000 0.905000 ;
+      RECT 0.090000  1.495000 0.855000 1.665000 ;
+      RECT 0.090000  1.665000 0.425000 2.465000 ;
+      RECT 0.645000  0.085000 0.895000 0.545000 ;
+      RECT 0.645000  1.835000 1.335000 2.635000 ;
+      RECT 0.660000  0.905000 0.855000 1.075000 ;
+      RECT 0.660000  1.075000 1.975000 1.275000 ;
+      RECT 0.660000  1.275000 0.855000 1.495000 ;
+      RECT 1.045000  1.495000 1.335000 1.835000 ;
+      RECT 1.085000  0.255000 5.175000 0.465000 ;
+      RECT 1.085000  0.465000 1.335000 0.905000 ;
+      RECT 2.105000  1.835000 2.275000 2.635000 ;
+      RECT 3.045000  1.835000 3.215000 2.635000 ;
+      RECT 3.385000  0.635000 7.105000 0.905000 ;
+      RECT 3.985000  1.835000 4.155000 2.635000 ;
+      RECT 4.925000  1.835000 5.615000 2.635000 ;
+      RECT 5.365000  0.255000 7.575000 0.465000 ;
+      RECT 6.385000  1.835000 6.555000 2.635000 ;
+      RECT 7.325000  0.465000 7.575000 0.735000 ;
+      RECT 7.325000  0.735000 9.460000 0.905000 ;
+      RECT 7.325000  1.835000 7.495000 2.635000 ;
+      RECT 7.795000  0.085000 7.965000 0.545000 ;
+      RECT 8.135000  0.255000 8.515000 0.735000 ;
+      RECT 8.265000  1.835000 8.435000 2.635000 ;
+      RECT 8.735000  0.085000 8.905000 0.545000 ;
+      RECT 9.075000  0.255000 9.460000 0.735000 ;
+      RECT 9.205000  1.445000 9.460000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
index 317423a..0f50bbf 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_1.magic.lef
@@ -88,20 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.645000  0.085000 0.880000 0.545000 ;
-        RECT 3.190000  0.085000 3.540000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -110,39 +96,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.645000 1.835000 0.975000 2.635000 ;
-        RECT 1.695000 1.835000 2.015000 2.635000 ;
-        RECT 2.750000 2.175000 3.520000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.485000 0.425000 0.715000 ;
-      RECT 0.085000 0.715000 1.220000 0.905000 ;
-      RECT 0.085000 0.905000 0.260000 2.065000 ;
-      RECT 0.085000 2.065000 0.425000 2.465000 ;
-      RECT 1.050000 0.365000 2.240000 0.555000 ;
-      RECT 1.050000 0.555000 1.220000 0.715000 ;
-      RECT 1.990000 0.555000 2.240000 1.325000 ;
-      RECT 2.850000 0.995000 3.125000 1.835000 ;
-      RECT 2.850000 1.835000 4.055000 2.005000 ;
-      RECT 3.710000 0.255000 4.055000 0.545000 ;
-      RECT 3.740000 2.005000 4.055000 2.465000 ;
-      RECT 3.885000 0.545000 4.055000 1.835000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.485000 0.425000 0.715000 ;
+      RECT 0.085000  0.715000 1.220000 0.905000 ;
+      RECT 0.085000  0.905000 0.260000 2.065000 ;
+      RECT 0.085000  2.065000 0.425000 2.465000 ;
+      RECT 0.645000  0.085000 0.880000 0.545000 ;
+      RECT 0.645000  1.835000 0.975000 2.635000 ;
+      RECT 1.050000  0.365000 2.240000 0.555000 ;
+      RECT 1.050000  0.555000 1.220000 0.715000 ;
+      RECT 1.695000  1.835000 2.015000 2.635000 ;
+      RECT 1.990000  0.555000 2.240000 1.325000 ;
+      RECT 2.750000  2.175000 3.520000 2.635000 ;
+      RECT 2.850000  0.995000 3.125000 1.835000 ;
+      RECT 2.850000  1.835000 4.055000 2.005000 ;
+      RECT 3.190000  0.085000 3.540000 0.545000 ;
+      RECT 3.710000  0.255000 4.055000 0.545000 ;
+      RECT 3.740000  2.005000 4.055000 2.465000 ;
+      RECT 3.885000  0.545000 4.055000 1.835000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
index fa2e1e5..1021685 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_2.magic.lef
@@ -89,25 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.515000  0.085000 0.815000 0.545000 ;
-        RECT 5.625000  0.085000 5.795000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -116,54 +97,69 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.540000 2.195000 0.815000 2.635000 ;
-        RECT 1.845000 1.495000 2.015000 2.635000 ;
-        RECT 2.655000 1.835000 2.955000 2.635000 ;
-        RECT 3.725000 1.835000 4.385000 2.635000 ;
-        RECT 5.155000 1.835000 5.325000 2.635000 ;
-        RECT 6.095000 1.445000 6.345000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.730000 ;
-      RECT 0.085000 0.730000 1.330000 0.900000 ;
-      RECT 0.085000 1.785000 1.330000 1.980000 ;
-      RECT 0.085000 1.980000 0.370000 2.440000 ;
-      RECT 0.985000 0.255000 1.675000 0.560000 ;
-      RECT 0.985000 2.150000 1.675000 2.465000 ;
-      RECT 1.160000 0.900000 1.330000 1.785000 ;
-      RECT 1.500000 0.560000 1.675000 2.150000 ;
-      RECT 1.845000 0.255000 3.975000 0.485000 ;
-      RECT 1.845000 0.485000 2.015000 0.585000 ;
-      RECT 2.945000 1.075000 3.325000 1.275000 ;
-      RECT 3.125000 0.655000 4.935000 0.905000 ;
-      RECT 4.165000 0.255000 5.405000 0.485000 ;
-      RECT 5.155000 0.485000 5.405000 0.735000 ;
-      RECT 5.155000 0.735000 6.345000 0.905000 ;
-      RECT 5.965000 0.255000 6.345000 0.735000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.730000 ;
+      RECT 0.085000  0.730000 1.330000 0.900000 ;
+      RECT 0.085000  1.785000 1.330000 1.980000 ;
+      RECT 0.085000  1.980000 0.370000 2.440000 ;
+      RECT 0.515000  0.085000 0.815000 0.545000 ;
+      RECT 0.540000  2.195000 0.815000 2.635000 ;
+      RECT 0.985000  0.255000 1.675000 0.560000 ;
+      RECT 0.985000  2.150000 1.675000 2.465000 ;
+      RECT 1.160000  0.900000 1.330000 1.785000 ;
+      RECT 1.500000  0.560000 1.675000 2.150000 ;
+      RECT 1.845000  0.255000 3.975000 0.485000 ;
+      RECT 1.845000  0.485000 2.015000 0.585000 ;
+      RECT 1.845000  1.495000 2.015000 2.635000 ;
+      RECT 2.655000  1.835000 2.955000 2.635000 ;
+      RECT 2.945000  1.075000 3.325000 1.275000 ;
+      RECT 3.125000  0.655000 4.935000 0.905000 ;
+      RECT 3.725000  1.835000 4.385000 2.635000 ;
+      RECT 4.165000  0.255000 5.405000 0.485000 ;
+      RECT 5.155000  0.485000 5.405000 0.735000 ;
+      RECT 5.155000  0.735000 6.345000 0.905000 ;
+      RECT 5.155000  1.835000 5.325000 2.635000 ;
+      RECT 5.625000  0.085000 5.795000 0.565000 ;
+      RECT 5.965000  0.255000 6.345000 0.735000 ;
+      RECT 6.095000  1.445000 6.345000 2.635000 ;
     LAYER mcon ;
-      RECT 1.160000 1.105000 1.330000 1.275000 ;
-      RECT 3.155000 1.105000 3.325000 1.275000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.160000  1.105000 1.330000 1.275000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.155000  1.105000 3.325000 1.275000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 1.100000 1.075000 3.385000 1.305000 ;
   END
diff --git a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
index 59fbefa..3ee30dd 100644
--- a/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
+++ b/cells/nand4bb/sky130_fd_sc_hdll__nand4bb_4.magic.lef
@@ -93,35 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.580000 0.085000 ;
-        RECT 0.515000  0.085000  0.895000 0.465000 ;
-        RECT 8.595000  0.085000  8.925000 0.485000 ;
-        RECT 9.535000  0.085000  9.865000 0.485000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
@@ -130,69 +101,94 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 10.580000 2.805000 ;
-        RECT  0.540000 2.195000  0.815000 2.635000 ;
-        RECT  2.015000 1.495000  2.185000 2.635000 ;
-        RECT  2.825000 1.835000  3.125000 2.635000 ;
-        RECT  3.895000 1.835000  4.065000 2.635000 ;
-        RECT  4.835000 1.835000  5.005000 2.635000 ;
-        RECT  5.825000 1.835000  6.465000 2.635000 ;
-        RECT  7.265000 1.835000  7.435000 2.635000 ;
-        RECT  8.205000 1.835000  8.375000 2.635000 ;
-        RECT  9.145000 1.835000  9.315000 2.635000 ;
-        RECT 10.085000 1.445000 10.360000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000  0.345000 0.635000 ;
-      RECT 0.085000 0.635000  1.505000 0.805000 ;
-      RECT 0.085000 1.785000  1.505000 1.980000 ;
-      RECT 0.085000 1.980000  0.370000 2.440000 ;
-      RECT 0.985000 2.150000  1.845000 2.465000 ;
-      RECT 1.115000 0.255000  1.845000 0.465000 ;
-      RECT 1.195000 0.805000  1.505000 1.785000 ;
-      RECT 1.675000 0.465000  1.845000 1.075000 ;
-      RECT 1.675000 1.075000  2.025000 1.305000 ;
-      RECT 1.675000 1.305000  1.845000 2.150000 ;
-      RECT 2.015000 0.255000  6.025000 0.485000 ;
-      RECT 2.015000 0.485000  2.185000 0.905000 ;
-      RECT 2.355000 1.075000  3.200000 1.245000 ;
-      RECT 4.185000 1.075000  5.555000 1.275000 ;
-      RECT 4.235000 0.655000  8.010000 0.905000 ;
-      RECT 6.265000 0.255000  8.375000 0.485000 ;
-      RECT 8.205000 0.485000  8.375000 0.655000 ;
-      RECT 8.205000 0.655000 10.285000 0.825000 ;
+      RECT  0.000000 -0.085000 10.580000 0.085000 ;
+      RECT  0.000000  2.635000 10.580000 2.805000 ;
+      RECT  0.085000  0.255000  0.345000 0.635000 ;
+      RECT  0.085000  0.635000  1.505000 0.805000 ;
+      RECT  0.085000  1.785000  1.505000 1.980000 ;
+      RECT  0.085000  1.980000  0.370000 2.440000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.540000  2.195000  0.815000 2.635000 ;
+      RECT  0.985000  2.150000  1.845000 2.465000 ;
+      RECT  1.115000  0.255000  1.845000 0.465000 ;
+      RECT  1.195000  0.805000  1.505000 1.785000 ;
+      RECT  1.675000  0.465000  1.845000 1.075000 ;
+      RECT  1.675000  1.075000  2.025000 1.305000 ;
+      RECT  1.675000  1.305000  1.845000 2.150000 ;
+      RECT  2.015000  0.255000  6.025000 0.485000 ;
+      RECT  2.015000  0.485000  2.185000 0.905000 ;
+      RECT  2.015000  1.495000  2.185000 2.635000 ;
+      RECT  2.355000  1.075000  3.200000 1.245000 ;
+      RECT  2.825000  1.835000  3.125000 2.635000 ;
+      RECT  3.895000  1.835000  4.065000 2.635000 ;
+      RECT  4.185000  1.075000  5.555000 1.275000 ;
+      RECT  4.235000  0.655000  8.010000 0.905000 ;
+      RECT  4.835000  1.835000  5.005000 2.635000 ;
+      RECT  5.825000  1.835000  6.465000 2.635000 ;
+      RECT  6.265000  0.255000  8.375000 0.485000 ;
+      RECT  7.265000  1.835000  7.435000 2.635000 ;
+      RECT  8.205000  0.485000  8.375000 0.655000 ;
+      RECT  8.205000  0.655000 10.285000 0.825000 ;
+      RECT  8.205000  1.835000  8.375000 2.635000 ;
+      RECT  8.595000  0.085000  8.925000 0.485000 ;
+      RECT  9.145000  1.835000  9.315000 2.635000 ;
+      RECT  9.535000  0.085000  9.865000 0.485000 ;
+      RECT 10.085000  1.445000 10.360000 2.635000 ;
     LAYER mcon ;
-      RECT 1.795000 1.105000 1.965000 1.275000 ;
-      RECT 4.330000 1.105000 4.500000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.795000  1.105000  1.965000 1.275000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.330000  1.105000  4.500000 1.275000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
     LAYER met1 ;
       RECT 1.735000 1.075000 2.025000 1.120000 ;
       RECT 1.735000 1.120000 4.575000 1.260000 ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
index dfe3ff1..16e2dd1 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_1.magic.lef
@@ -68,15 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 1.840000 0.085000 ;
-        RECT 0.105000  0.085000 0.345000 0.895000 ;
-        RECT 1.065000  0.085000 1.575000 0.895000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 1.840000 0.240000 ;
     END
@@ -85,18 +76,27 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 1.840000 2.805000 ;
-        RECT 1.115000 1.495000 1.625000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 1.840000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 1.840000 0.085000 ;
+      RECT 0.000000  2.635000 1.840000 2.805000 ;
+      RECT 0.105000  0.085000 0.345000 0.895000 ;
+      RECT 1.065000  0.085000 1.575000 0.895000 ;
+      RECT 1.115000  1.495000 1.625000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
index 2436657..0912303 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_2.magic.lef
@@ -71,18 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.140000  0.085000 2.480000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -91,27 +79,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.535000 1.835000 0.915000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 1.305000 1.665000 ;
-      RECT 0.090000 1.665000 0.365000 2.465000 ;
-      RECT 1.135000 1.665000 1.305000 2.295000 ;
-      RECT 1.135000 2.295000 2.375000 2.465000 ;
-      RECT 2.075000 1.835000 2.375000 2.295000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.090000  1.455000 1.305000 1.665000 ;
+      RECT 0.090000  1.665000 0.365000 2.465000 ;
+      RECT 0.535000  1.835000 0.915000 2.635000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 1.135000  1.665000 1.305000 2.295000 ;
+      RECT 1.135000  2.295000 2.375000 2.465000 ;
+      RECT 2.075000  1.835000 2.375000 2.295000 ;
+      RECT 2.140000  0.085000 2.480000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
index 9c905e4..9e6a733 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_4.magic.lef
@@ -73,24 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.245000 0.555000 ;
-        RECT 3.015000  0.085000 3.185000 0.555000 ;
-        RECT 3.955000  0.085000 4.240000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -99,34 +81,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.535000 1.835000 0.915000 2.635000 ;
-        RECT 1.475000 1.835000 1.775000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 2.325000 1.665000 ;
-      RECT 0.090000 1.665000 0.365000 2.465000 ;
-      RECT 1.135000 1.665000 1.305000 2.465000 ;
-      RECT 1.945000 1.665000 2.325000 2.295000 ;
-      RECT 1.945000 2.295000 4.290000 2.465000 ;
-      RECT 2.885000 1.935000 3.265000 2.295000 ;
-      RECT 3.825000 1.915000 4.290000 2.295000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.090000  1.455000 2.325000 1.665000 ;
+      RECT 0.090000  1.665000 0.365000 2.465000 ;
+      RECT 0.535000  1.835000 0.915000 2.635000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 1.135000  1.665000 1.305000 2.465000 ;
+      RECT 1.475000  1.835000 1.775000 2.635000 ;
+      RECT 1.945000  1.665000 2.325000 2.295000 ;
+      RECT 1.945000  2.295000 4.290000 2.465000 ;
+      RECT 2.075000  0.085000 2.245000 0.555000 ;
+      RECT 2.885000  1.935000 3.265000 2.295000 ;
+      RECT 3.015000  0.085000 3.185000 0.555000 ;
+      RECT 3.825000  1.915000 4.290000 2.295000 ;
+      RECT 3.955000  0.085000 4.240000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
index 1b88f71..3f499cf 100644
--- a/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
+++ b/cells/nor2/sky130_fd_sc_hdll__nor2_8.magic.lef
@@ -79,36 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.245000 0.555000 ;
-        RECT 3.015000  0.085000 3.185000 0.555000 ;
-        RECT 3.955000  0.085000 4.125000 0.555000 ;
-        RECT 4.895000  0.085000 5.065000 0.555000 ;
-        RECT 5.835000  0.085000 6.005000 0.555000 ;
-        RECT 6.775000  0.085000 6.945000 0.555000 ;
-        RECT 7.715000  0.085000 8.005000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -117,48 +87,75 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.625000 1.835000 0.875000 2.635000 ;
-        RECT 1.565000 1.835000 1.815000 2.635000 ;
-        RECT 2.505000 1.835000 2.755000 2.635000 ;
-        RECT 3.445000 1.835000 3.695000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 4.165000 1.665000 ;
-      RECT 0.090000 1.665000 0.405000 2.465000 ;
-      RECT 1.095000 1.665000 1.345000 2.465000 ;
-      RECT 2.035000 1.665000 2.285000 2.465000 ;
-      RECT 2.975000 1.665000 3.225000 2.465000 ;
-      RECT 3.915000 1.665000 4.165000 2.295000 ;
-      RECT 3.915000 2.295000 7.925000 2.465000 ;
-      RECT 4.855000 1.785000 5.105000 2.295000 ;
-      RECT 5.795000 1.785000 6.045000 2.295000 ;
-      RECT 6.735000 1.785000 6.985000 2.295000 ;
-      RECT 7.675000 1.785000 7.925000 2.295000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.090000  1.455000 4.165000 1.665000 ;
+      RECT 0.090000  1.665000 0.405000 2.465000 ;
+      RECT 0.625000  1.835000 0.875000 2.635000 ;
+      RECT 1.095000  1.665000 1.345000 2.465000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 1.565000  1.835000 1.815000 2.635000 ;
+      RECT 2.035000  1.665000 2.285000 2.465000 ;
+      RECT 2.075000  0.085000 2.245000 0.555000 ;
+      RECT 2.505000  1.835000 2.755000 2.635000 ;
+      RECT 2.975000  1.665000 3.225000 2.465000 ;
+      RECT 3.015000  0.085000 3.185000 0.555000 ;
+      RECT 3.445000  1.835000 3.695000 2.635000 ;
+      RECT 3.915000  1.665000 4.165000 2.295000 ;
+      RECT 3.915000  2.295000 7.925000 2.465000 ;
+      RECT 3.955000  0.085000 4.125000 0.555000 ;
+      RECT 4.855000  1.785000 5.105000 2.295000 ;
+      RECT 4.895000  0.085000 5.065000 0.555000 ;
+      RECT 5.795000  1.785000 6.045000 2.295000 ;
+      RECT 5.835000  0.085000 6.005000 0.555000 ;
+      RECT 6.735000  1.785000 6.985000 2.295000 ;
+      RECT 6.775000  0.085000 6.945000 0.555000 ;
+      RECT 7.675000  1.785000 7.925000 2.295000 ;
+      RECT 7.715000  0.085000 8.005000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
index 46958c1..527b62e 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_1.magic.lef
@@ -68,16 +68,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.675000  0.085000 0.965000 0.625000 ;
-        RECT 1.735000  0.085000 2.120000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -86,27 +76,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.775000 2.255000 1.105000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.290000 0.345000 1.915000 ;
-      RECT 0.095000 1.915000 1.485000 2.085000 ;
-      RECT 1.315000 1.495000 1.655000 1.665000 ;
-      RECT 1.315000 1.665000 1.485000 1.915000 ;
-      RECT 1.485000 1.075000 1.865000 1.325000 ;
-      RECT 1.485000 1.325000 1.655000 1.495000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.095000  0.290000 0.345000 1.915000 ;
+      RECT 0.095000  1.915000 1.485000 2.085000 ;
+      RECT 0.675000  0.085000 0.965000 0.625000 ;
+      RECT 0.775000  2.255000 1.105000 2.635000 ;
+      RECT 1.315000  1.495000 1.655000 1.665000 ;
+      RECT 1.315000  1.665000 1.485000 1.915000 ;
+      RECT 1.485000  1.075000 1.865000 1.325000 ;
+      RECT 1.485000  1.325000 1.655000 1.495000 ;
+      RECT 1.735000  0.085000 2.120000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
index a97e505..09c57a6 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_2.magic.lef
@@ -69,21 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.085000  0.085000 0.365000 0.895000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.245000 0.895000 ;
-        RECT 3.185000  0.085000 3.440000 0.845000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -92,33 +77,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.625000 1.825000 0.875000 2.635000 ;
-        RECT 3.185000 2.145000 3.435000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.445000 1.345000 1.655000 ;
-      RECT 0.085000 1.655000 0.405000 2.465000 ;
-      RECT 1.095000 1.655000 1.345000 2.295000 ;
-      RECT 1.095000 2.295000 2.325000 2.465000 ;
-      RECT 2.035000 1.445000 2.325000 2.295000 ;
-      RECT 2.075000 1.075000 2.765000 1.245000 ;
-      RECT 2.595000 0.445000 2.765000 1.075000 ;
-      RECT 2.595000 1.245000 2.765000 2.460000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.085000 0.365000 0.895000 ;
+      RECT 0.085000  1.445000 1.345000 1.655000 ;
+      RECT 0.085000  1.655000 0.405000 2.465000 ;
+      RECT 0.625000  1.825000 0.875000 2.635000 ;
+      RECT 1.095000  1.655000 1.345000 2.295000 ;
+      RECT 1.095000  2.295000 2.325000 2.465000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 2.035000  1.445000 2.325000 2.295000 ;
+      RECT 2.075000  0.085000 2.245000 0.895000 ;
+      RECT 2.075000  1.075000 2.765000 1.245000 ;
+      RECT 2.595000  0.445000 2.765000 1.075000 ;
+      RECT 2.595000  1.245000 2.765000 2.460000 ;
+      RECT 3.185000  0.085000 3.440000 0.845000 ;
+      RECT 3.185000  2.145000 3.435000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
index 3fed3eb..04a190a 100644
--- a/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
+++ b/cells/nor2b/sky130_fd_sc_hdll__nor2b_4.magic.lef
@@ -73,27 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.085000  0.085000 0.365000 0.905000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.245000 0.555000 ;
-        RECT 3.015000  0.085000 3.185000 0.555000 ;
-        RECT 3.955000  0.085000 4.125000 0.905000 ;
-        RECT 4.975000  0.085000 5.265000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -102,40 +81,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.535000 1.835000 0.915000 2.635000 ;
-        RECT 1.475000 1.835000 1.775000 2.635000 ;
-        RECT 4.975000 1.495000 5.380000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.455000 2.325000 1.665000 ;
-      RECT 0.085000 1.665000 0.365000 2.465000 ;
-      RECT 1.135000 1.665000 1.305000 2.465000 ;
-      RECT 1.945000 1.665000 2.325000 2.295000 ;
-      RECT 1.945000 2.295000 4.225000 2.465000 ;
-      RECT 2.885000 1.935000 3.265000 2.295000 ;
-      RECT 3.065000 1.075000 4.755000 1.245000 ;
-      RECT 3.825000 1.575000 4.225000 2.295000 ;
-      RECT 4.395000 0.255000 4.755000 1.075000 ;
-      RECT 4.395000 1.245000 4.755000 2.465000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.085000  0.085000 0.365000 0.905000 ;
+      RECT 0.085000  1.455000 2.325000 1.665000 ;
+      RECT 0.085000  1.665000 0.365000 2.465000 ;
+      RECT 0.535000  1.835000 0.915000 2.635000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 1.135000  1.665000 1.305000 2.465000 ;
+      RECT 1.475000  1.835000 1.775000 2.635000 ;
+      RECT 1.945000  1.665000 2.325000 2.295000 ;
+      RECT 1.945000  2.295000 4.225000 2.465000 ;
+      RECT 2.075000  0.085000 2.245000 0.555000 ;
+      RECT 2.885000  1.935000 3.265000 2.295000 ;
+      RECT 3.015000  0.085000 3.185000 0.555000 ;
+      RECT 3.065000  1.075000 4.755000 1.245000 ;
+      RECT 3.825000  1.575000 4.225000 2.295000 ;
+      RECT 3.955000  0.085000 4.125000 0.905000 ;
+      RECT 4.395000  0.255000 4.755000 1.075000 ;
+      RECT 4.395000  1.245000 4.755000 2.465000 ;
+      RECT 4.975000  0.085000 5.265000 0.905000 ;
+      RECT 4.975000  1.495000 5.380000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
index 0460469..64bf54b 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_1.magic.lef
@@ -80,16 +80,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.485000 ;
-        RECT 1.455000  0.085000 2.175000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -98,19 +88,29 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 1.585000 1.835000 2.175000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.515000  0.085000 0.895000 0.485000 ;
+      RECT 1.455000  0.085000 2.175000 0.485000 ;
+      RECT 1.585000  1.835000 2.175000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
index c9d118f..4106853 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_2.magic.lef
@@ -81,22 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.880000 0.555000 ;
-        RECT 3.650000  0.085000 3.940000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -105,33 +89,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.625000 1.795000 0.875000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 1.455000 2.275000 1.625000 ;
-      RECT 0.150000 1.625000 0.405000 2.465000 ;
-      RECT 1.095000 1.625000 1.345000 2.465000 ;
-      RECT 1.565000 1.795000 1.815000 2.295000 ;
-      RECT 1.565000 2.295000 3.860000 2.465000 ;
-      RECT 2.035000 1.625000 2.275000 2.125000 ;
-      RECT 2.710000 1.795000 2.920000 2.295000 ;
-      RECT 3.610000 1.795000 3.860000 2.295000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.150000  1.455000 2.275000 1.625000 ;
+      RECT 0.150000  1.625000 0.405000 2.465000 ;
+      RECT 0.625000  1.795000 0.875000 2.635000 ;
+      RECT 1.095000  1.625000 1.345000 2.465000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 1.565000  1.795000 1.815000 2.295000 ;
+      RECT 1.565000  2.295000 3.860000 2.465000 ;
+      RECT 2.035000  1.625000 2.275000 2.125000 ;
+      RECT 2.075000  0.085000 2.880000 0.555000 ;
+      RECT 2.710000  1.795000 2.920000 2.295000 ;
+      RECT 3.610000  1.795000 3.860000 2.295000 ;
+      RECT 3.650000  0.085000 3.940000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
index 05223f5..1a321a1 100644
--- a/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
+++ b/cells/nor3/sky130_fd_sc_hdll__nor3_4.magic.lef
@@ -89,30 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.245000 0.555000 ;
-        RECT 3.015000  0.085000 3.185000 0.555000 ;
-        RECT 3.955000  0.085000 4.125000 0.555000 ;
-        RECT 4.895000  0.085000 5.065000 0.555000 ;
-        RECT 5.835000  0.085000 6.005000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -121,47 +97,67 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.625000 1.795000 0.875000 2.635000 ;
-        RECT 1.565000 1.795000 1.815000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 1.455000 2.285000 1.625000 ;
-      RECT 0.150000 1.625000 0.405000 2.465000 ;
-      RECT 1.095000 1.625000 1.345000 2.465000 ;
-      RECT 2.035000 1.625000 2.285000 2.085000 ;
-      RECT 2.035000 2.085000 3.225000 2.465000 ;
-      RECT 2.505000 1.455000 3.695000 1.625000 ;
-      RECT 2.505000 1.625000 2.755000 1.915000 ;
-      RECT 2.975000 1.795000 3.225000 2.085000 ;
-      RECT 3.445000 1.625000 3.695000 2.295000 ;
-      RECT 3.445000 2.295000 5.575000 2.465000 ;
-      RECT 4.385000 2.135000 4.635000 2.295000 ;
-      RECT 5.325000 2.135000 5.575000 2.295000 ;
-      RECT 5.795000 2.125000 6.045000 2.465000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.150000  1.455000 2.285000 1.625000 ;
+      RECT 0.150000  1.625000 0.405000 2.465000 ;
+      RECT 0.625000  1.795000 0.875000 2.635000 ;
+      RECT 1.095000  1.625000 1.345000 2.465000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 1.565000  1.795000 1.815000 2.635000 ;
+      RECT 2.035000  1.625000 2.285000 2.085000 ;
+      RECT 2.035000  2.085000 3.225000 2.465000 ;
+      RECT 2.075000  0.085000 2.245000 0.555000 ;
+      RECT 2.505000  1.455000 3.695000 1.625000 ;
+      RECT 2.505000  1.625000 2.755000 1.915000 ;
+      RECT 2.975000  1.795000 3.225000 2.085000 ;
+      RECT 3.015000  0.085000 3.185000 0.555000 ;
+      RECT 3.445000  1.625000 3.695000 2.295000 ;
+      RECT 3.445000  2.295000 5.575000 2.465000 ;
+      RECT 3.955000  0.085000 4.125000 0.555000 ;
+      RECT 4.385000  2.135000 4.635000 2.295000 ;
+      RECT 4.895000  0.085000 5.065000 0.555000 ;
+      RECT 5.325000  2.135000 5.575000 2.295000 ;
+      RECT 5.795000  2.125000 6.045000 2.465000 ;
+      RECT 5.835000  0.085000 6.005000 0.555000 ;
     LAYER mcon ;
-      RECT 2.695000 2.125000 2.865000 2.295000 ;
-      RECT 5.805000 2.125000 5.975000 2.295000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.695000  2.125000 2.865000 2.295000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 5.805000  2.125000 5.975000 2.295000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 2.635000 2.065000 2.980000 2.140000 ;
       RECT 2.635000 2.140000 6.040000 2.280000 ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
index 5523e4f..440a67d 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_1.magic.lef
@@ -78,17 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.775000  0.085000 1.155000 0.485000 ;
-        RECT 1.715000  0.085000 2.095000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -97,28 +86,36 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 1.715000 2.125000 2.095000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.425000 1.075000 0.885000 1.245000 ;
-      RECT 0.715000 1.245000 0.885000 1.785000 ;
-      RECT 0.715000 1.785000 2.675000 1.955000 ;
-      RECT 2.380000 0.405000 2.550000 0.655000 ;
-      RECT 2.380000 0.655000 2.675000 0.825000 ;
-      RECT 2.505000 0.825000 2.675000 1.785000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.425000  1.075000 0.885000 1.245000 ;
+      RECT 0.715000  1.245000 0.885000 1.785000 ;
+      RECT 0.715000  1.785000 2.675000 1.955000 ;
+      RECT 0.775000  0.085000 1.155000 0.485000 ;
+      RECT 1.715000  0.085000 2.095000 0.825000 ;
+      RECT 1.715000  2.125000 2.095000 2.635000 ;
+      RECT 2.380000  0.405000 2.550000 0.655000 ;
+      RECT 2.380000  0.655000 2.675000 0.825000 ;
+      RECT 2.505000  0.825000 2.675000 1.785000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
index 0340a1c..7d71392 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_2.magic.lef
@@ -78,25 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.765000 0.555000 ;
-        RECT 3.575000  0.085000 3.780000 0.895000 ;
-        RECT 4.565000  0.085000 4.855000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -105,40 +86,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.625000 1.795000 0.875000 2.635000 ;
-        RECT 4.565000 1.540000 4.815000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 2.325000 1.625000 ;
-      RECT 0.090000 1.625000 0.405000 2.465000 ;
-      RECT 1.095000 1.625000 1.345000 2.465000 ;
-      RECT 1.565000 1.795000 1.815000 2.275000 ;
-      RECT 1.565000 2.275000 3.780000 2.465000 ;
-      RECT 1.995000 1.625000 2.325000 2.035000 ;
-      RECT 3.535000 1.075000 4.160000 1.285000 ;
-      RECT 3.535000 1.455000 3.780000 2.275000 ;
-      RECT 3.990000 0.380000 4.345000 0.905000 ;
-      RECT 3.990000 0.905000 4.160000 1.075000 ;
-      RECT 3.990000 1.285000 4.160000 1.455000 ;
-      RECT 3.990000 1.455000 4.345000 1.870000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.090000  1.455000 2.325000 1.625000 ;
+      RECT 0.090000  1.625000 0.405000 2.465000 ;
+      RECT 0.625000  1.795000 0.875000 2.635000 ;
+      RECT 1.095000  1.625000 1.345000 2.465000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 1.565000  1.795000 1.815000 2.275000 ;
+      RECT 1.565000  2.275000 3.780000 2.465000 ;
+      RECT 1.995000  1.625000 2.325000 2.035000 ;
+      RECT 2.075000  0.085000 2.765000 0.555000 ;
+      RECT 3.535000  1.075000 4.160000 1.285000 ;
+      RECT 3.535000  1.455000 3.780000 2.275000 ;
+      RECT 3.575000  0.085000 3.780000 0.895000 ;
+      RECT 3.990000  0.380000 4.345000 0.905000 ;
+      RECT 3.990000  0.905000 4.160000 1.075000 ;
+      RECT 3.990000  1.285000 4.160000 1.455000 ;
+      RECT 3.990000  1.455000 4.345000 1.870000 ;
+      RECT 4.565000  0.085000 4.855000 0.825000 ;
+      RECT 4.565000  1.540000 4.815000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
index f5270b0..bc3c80d 100644
--- a/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
+++ b/cells/nor3b/sky130_fd_sc_hdll__nor3b_4.magic.lef
@@ -84,32 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.665000  0.085000 0.835000 0.555000 ;
-        RECT 1.605000  0.085000 1.775000 0.555000 ;
-        RECT 2.545000  0.085000 3.235000 0.555000 ;
-        RECT 4.005000  0.085000 4.175000 0.555000 ;
-        RECT 4.945000  0.085000 5.115000 0.555000 ;
-        RECT 5.885000  0.085000 6.055000 0.555000 ;
-        RECT 6.825000  0.085000 6.995000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -118,52 +92,75 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.625000 1.795000 0.875000 2.635000 ;
-        RECT 1.565000 2.135000 1.815000 2.635000 ;
-        RECT 2.505000 2.135000 2.755000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.255000 0.445000 0.735000 ;
-      RECT 0.110000 0.735000 0.835000 0.905000 ;
-      RECT 0.110000 1.455000 5.155000 1.625000 ;
-      RECT 0.110000 1.625000 0.405000 2.465000 ;
-      RECT 0.665000 0.905000 0.835000 1.455000 ;
-      RECT 1.095000 1.795000 4.685000 1.965000 ;
-      RECT 1.095000 1.965000 1.345000 2.465000 ;
-      RECT 2.035000 1.965000 2.285000 2.465000 ;
-      RECT 3.025000 2.135000 3.275000 2.295000 ;
-      RECT 3.025000 2.295000 7.035000 2.465000 ;
-      RECT 3.495000 1.965000 3.745000 2.125000 ;
-      RECT 3.965000 2.135000 4.215000 2.295000 ;
-      RECT 4.435000 1.965000 4.685000 2.125000 ;
-      RECT 4.905000 1.795000 5.155000 2.295000 ;
-      RECT 4.985000 1.075000 6.720000 1.285000 ;
-      RECT 4.985000 1.285000 5.155000 1.455000 ;
-      RECT 5.845000 1.795000 6.095000 2.295000 ;
-      RECT 6.785000 1.795000 7.035000 2.295000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.110000  0.255000 0.445000 0.735000 ;
+      RECT 0.110000  0.735000 0.835000 0.905000 ;
+      RECT 0.110000  1.455000 5.155000 1.625000 ;
+      RECT 0.110000  1.625000 0.405000 2.465000 ;
+      RECT 0.625000  1.795000 0.875000 2.635000 ;
+      RECT 0.665000  0.085000 0.835000 0.555000 ;
+      RECT 0.665000  0.905000 0.835000 1.455000 ;
+      RECT 1.095000  1.795000 4.685000 1.965000 ;
+      RECT 1.095000  1.965000 1.345000 2.465000 ;
+      RECT 1.565000  2.135000 1.815000 2.635000 ;
+      RECT 1.605000  0.085000 1.775000 0.555000 ;
+      RECT 2.035000  1.965000 2.285000 2.465000 ;
+      RECT 2.505000  2.135000 2.755000 2.635000 ;
+      RECT 2.545000  0.085000 3.235000 0.555000 ;
+      RECT 3.025000  2.135000 3.275000 2.295000 ;
+      RECT 3.025000  2.295000 7.035000 2.465000 ;
+      RECT 3.495000  1.965000 3.745000 2.125000 ;
+      RECT 3.965000  2.135000 4.215000 2.295000 ;
+      RECT 4.005000  0.085000 4.175000 0.555000 ;
+      RECT 4.435000  1.965000 4.685000 2.125000 ;
+      RECT 4.905000  1.795000 5.155000 2.295000 ;
+      RECT 4.945000  0.085000 5.115000 0.555000 ;
+      RECT 4.985000  1.075000 6.720000 1.285000 ;
+      RECT 4.985000  1.285000 5.155000 1.455000 ;
+      RECT 5.845000  1.795000 6.095000 2.295000 ;
+      RECT 5.885000  0.085000 6.055000 0.555000 ;
+      RECT 6.785000  1.795000 7.035000 2.295000 ;
+      RECT 6.825000  0.085000 6.995000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
index a0f116a..3907ef0 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_1.magic.lef
@@ -88,18 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.575000 ;
-        RECT 1.035000  0.085000 1.365000 0.485000 ;
-        RECT 2.005000  0.085000 2.520000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -108,20 +96,32 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 2.135000 1.835000 2.535000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.575000 ;
+      RECT 1.035000  0.085000 1.365000 0.485000 ;
+      RECT 2.005000  0.085000 2.520000 0.485000 ;
+      RECT 2.135000  1.835000 2.535000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
index c63f498..9369bc5 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_2.magic.lef
@@ -90,25 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.805000 0.555000 ;
-        RECT 3.575000  0.085000 3.745000 0.555000 ;
-        RECT 4.515000  0.085000 4.805000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -117,39 +98,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.625000 1.795000 0.875000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.150000 1.455000 2.285000 1.625000 ;
-      RECT 0.150000 1.625000 0.405000 2.465000 ;
-      RECT 1.095000 1.625000 1.345000 2.465000 ;
-      RECT 1.565000 1.795000 1.815000 2.295000 ;
-      RECT 1.565000 2.295000 3.315000 2.465000 ;
-      RECT 2.035000 1.625000 2.285000 2.125000 ;
-      RECT 2.595000 1.455000 3.785000 1.625000 ;
-      RECT 2.595000 1.625000 2.845000 2.125000 ;
-      RECT 3.065000 1.795000 3.315000 2.295000 ;
-      RECT 3.535000 1.625000 3.785000 2.295000 ;
-      RECT 3.535000 2.295000 4.725000 2.465000 ;
-      RECT 4.475000 1.795000 4.725000 2.295000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.150000  1.455000 2.285000 1.625000 ;
+      RECT 0.150000  1.625000 0.405000 2.465000 ;
+      RECT 0.625000  1.795000 0.875000 2.635000 ;
+      RECT 1.095000  1.625000 1.345000 2.465000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 1.565000  1.795000 1.815000 2.295000 ;
+      RECT 1.565000  2.295000 3.315000 2.465000 ;
+      RECT 2.035000  1.625000 2.285000 2.125000 ;
+      RECT 2.075000  0.085000 2.805000 0.555000 ;
+      RECT 2.595000  1.455000 3.785000 1.625000 ;
+      RECT 2.595000  1.625000 2.845000 2.125000 ;
+      RECT 3.065000  1.795000 3.315000 2.295000 ;
+      RECT 3.535000  1.625000 3.785000 2.295000 ;
+      RECT 3.535000  2.295000 4.725000 2.465000 ;
+      RECT 3.575000  0.085000 3.745000 0.555000 ;
+      RECT 4.475000  1.795000 4.725000 2.295000 ;
+      RECT 4.515000  0.085000 4.805000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
index 460917a..13468c1 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_4.magic.lef
@@ -95,37 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.090000  0.085000 0.365000 0.905000 ;
-        RECT 1.135000  0.085000 1.305000 0.555000 ;
-        RECT 2.075000  0.085000 2.245000 0.555000 ;
-        RECT 3.015000  0.085000 3.185000 0.555000 ;
-        RECT 3.955000  0.085000 4.645000 0.555000 ;
-        RECT 5.415000  0.085000 5.585000 0.555000 ;
-        RECT 6.355000  0.085000 6.525000 0.555000 ;
-        RECT 7.295000  0.085000 7.465000 0.555000 ;
-        RECT 8.235000  0.085000 8.405000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -134,54 +103,82 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.625000 1.795000 0.875000 2.635000 ;
-        RECT 1.565000 1.795000 1.815000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 2.285000 1.625000 ;
-      RECT 0.090000 1.625000 0.405000 2.465000 ;
-      RECT 1.095000 1.625000 1.345000 2.465000 ;
-      RECT 2.035000 1.625000 2.285000 2.295000 ;
-      RECT 2.035000 2.295000 4.220000 2.465000 ;
-      RECT 2.505000 1.455000 6.095000 1.625000 ;
-      RECT 2.505000 1.625000 2.755000 2.125000 ;
-      RECT 2.975000 1.795000 3.225000 2.295000 ;
-      RECT 3.445000 1.625000 3.695000 2.125000 ;
-      RECT 3.915000 1.795000 4.220000 2.295000 ;
-      RECT 4.405000 1.795000 4.685000 2.295000 ;
-      RECT 4.405000 2.295000 8.445000 2.465000 ;
-      RECT 4.905000 1.625000 5.155000 2.125000 ;
-      RECT 5.375000 1.795000 5.625000 2.295000 ;
-      RECT 5.845000 1.625000 6.095000 2.125000 ;
-      RECT 6.315000 1.795000 6.565000 2.295000 ;
-      RECT 7.255000 1.795000 7.505000 2.295000 ;
-      RECT 8.195000 1.795000 8.445000 2.295000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.090000  0.085000 0.365000 0.905000 ;
+      RECT 0.090000  1.455000 2.285000 1.625000 ;
+      RECT 0.090000  1.625000 0.405000 2.465000 ;
+      RECT 0.625000  1.795000 0.875000 2.635000 ;
+      RECT 1.095000  1.625000 1.345000 2.465000 ;
+      RECT 1.135000  0.085000 1.305000 0.555000 ;
+      RECT 1.565000  1.795000 1.815000 2.635000 ;
+      RECT 2.035000  1.625000 2.285000 2.295000 ;
+      RECT 2.035000  2.295000 4.220000 2.465000 ;
+      RECT 2.075000  0.085000 2.245000 0.555000 ;
+      RECT 2.505000  1.455000 6.095000 1.625000 ;
+      RECT 2.505000  1.625000 2.755000 2.125000 ;
+      RECT 2.975000  1.795000 3.225000 2.295000 ;
+      RECT 3.015000  0.085000 3.185000 0.555000 ;
+      RECT 3.445000  1.625000 3.695000 2.125000 ;
+      RECT 3.915000  1.795000 4.220000 2.295000 ;
+      RECT 3.955000  0.085000 4.645000 0.555000 ;
+      RECT 4.405000  1.795000 4.685000 2.295000 ;
+      RECT 4.405000  2.295000 8.445000 2.465000 ;
+      RECT 4.905000  1.625000 5.155000 2.125000 ;
+      RECT 5.375000  1.795000 5.625000 2.295000 ;
+      RECT 5.415000  0.085000 5.585000 0.555000 ;
+      RECT 5.845000  1.625000 6.095000 2.125000 ;
+      RECT 6.315000  1.795000 6.565000 2.295000 ;
+      RECT 6.355000  0.085000 6.525000 0.555000 ;
+      RECT 7.255000  1.795000 7.505000 2.295000 ;
+      RECT 7.295000  0.085000 7.465000 0.555000 ;
+      RECT 8.195000  1.795000 8.445000 2.295000 ;
+      RECT 8.235000  0.085000 8.405000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
index 24489cc..c30c0a4 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_6.magic.lef
@@ -100,49 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.420000 0.085000 ;
-        RECT  0.115000  0.085000  0.415000 0.905000 ;
-        RECT  1.085000  0.085000  1.355000 0.555000 ;
-        RECT  2.025000  0.085000  2.295000 0.555000 ;
-        RECT  2.965000  0.085000  3.235000 0.555000 ;
-        RECT  3.905000  0.085000  4.175000 0.555000 ;
-        RECT  4.845000  0.085000  5.115000 0.555000 ;
-        RECT  5.785000  0.085000  6.575000 0.555000 ;
-        RECT  7.245000  0.085000  7.515000 0.555000 ;
-        RECT  8.185000  0.085000  8.455000 0.555000 ;
-        RECT  9.125000  0.085000  9.395000 0.555000 ;
-        RECT 10.065000  0.085000 10.335000 0.555000 ;
-        RECT 11.005000  0.085000 11.275000 0.555000 ;
-        RECT 12.005000  0.085000 12.255000 0.905000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.420000 0.240000 ;
     END
@@ -151,69 +108,109 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 12.420000 2.805000 ;
-        RECT 0.625000 1.795000  0.875000 2.635000 ;
-        RECT 1.565000 1.795000  1.815000 2.635000 ;
-        RECT 2.505000 1.795000  2.755000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.420000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 1.455000  3.225000 1.625000 ;
-      RECT  0.115000 1.625000  0.405000 2.465000 ;
-      RECT  1.095000 1.625000  1.345000 2.465000 ;
-      RECT  2.035000 1.625000  2.285000 2.465000 ;
-      RECT  2.975000 1.625000  3.225000 2.295000 ;
-      RECT  2.975000 2.295000  6.085000 2.465000 ;
-      RECT  3.445000 1.455000  8.915000 1.625000 ;
-      RECT  3.445000 1.625000  3.695000 2.125000 ;
-      RECT  3.915000 1.795000  4.165000 2.295000 ;
-      RECT  4.385000 1.625000  4.635000 2.125000 ;
-      RECT  4.855000 1.795000  5.105000 2.295000 ;
-      RECT  5.325000 1.625000  5.575000 2.125000 ;
-      RECT  5.795000 1.795000  6.085000 2.295000 ;
-      RECT  6.275000 1.795000  6.565000 2.295000 ;
-      RECT  6.275000 2.295000 12.255000 2.465000 ;
-      RECT  6.785000 1.625000  7.035000 2.125000 ;
-      RECT  7.255000 1.795000  7.505000 2.295000 ;
-      RECT  7.725000 1.625000  7.975000 2.125000 ;
-      RECT  8.195000 1.795000  8.445000 2.295000 ;
-      RECT  8.665000 1.625000  8.915000 2.125000 ;
-      RECT  9.135000 1.455000  9.385000 2.295000 ;
-      RECT 10.075000 1.795000 10.325000 2.295000 ;
-      RECT 11.015000 1.795000 11.265000 2.295000 ;
-      RECT 12.005000 1.455000 12.255000 2.295000 ;
+      RECT  0.000000 -0.085000 12.420000 0.085000 ;
+      RECT  0.000000  2.635000 12.420000 2.805000 ;
+      RECT  0.115000  0.085000  0.415000 0.905000 ;
+      RECT  0.115000  1.455000  3.225000 1.625000 ;
+      RECT  0.115000  1.625000  0.405000 2.465000 ;
+      RECT  0.625000  1.795000  0.875000 2.635000 ;
+      RECT  1.085000  0.085000  1.355000 0.555000 ;
+      RECT  1.095000  1.625000  1.345000 2.465000 ;
+      RECT  1.565000  1.795000  1.815000 2.635000 ;
+      RECT  2.025000  0.085000  2.295000 0.555000 ;
+      RECT  2.035000  1.625000  2.285000 2.465000 ;
+      RECT  2.505000  1.795000  2.755000 2.635000 ;
+      RECT  2.965000  0.085000  3.235000 0.555000 ;
+      RECT  2.975000  1.625000  3.225000 2.295000 ;
+      RECT  2.975000  2.295000  6.085000 2.465000 ;
+      RECT  3.445000  1.455000  8.915000 1.625000 ;
+      RECT  3.445000  1.625000  3.695000 2.125000 ;
+      RECT  3.905000  0.085000  4.175000 0.555000 ;
+      RECT  3.915000  1.795000  4.165000 2.295000 ;
+      RECT  4.385000  1.625000  4.635000 2.125000 ;
+      RECT  4.845000  0.085000  5.115000 0.555000 ;
+      RECT  4.855000  1.795000  5.105000 2.295000 ;
+      RECT  5.325000  1.625000  5.575000 2.125000 ;
+      RECT  5.785000  0.085000  6.575000 0.555000 ;
+      RECT  5.795000  1.795000  6.085000 2.295000 ;
+      RECT  6.275000  1.795000  6.565000 2.295000 ;
+      RECT  6.275000  2.295000 12.255000 2.465000 ;
+      RECT  6.785000  1.625000  7.035000 2.125000 ;
+      RECT  7.245000  0.085000  7.515000 0.555000 ;
+      RECT  7.255000  1.795000  7.505000 2.295000 ;
+      RECT  7.725000  1.625000  7.975000 2.125000 ;
+      RECT  8.185000  0.085000  8.455000 0.555000 ;
+      RECT  8.195000  1.795000  8.445000 2.295000 ;
+      RECT  8.665000  1.625000  8.915000 2.125000 ;
+      RECT  9.125000  0.085000  9.395000 0.555000 ;
+      RECT  9.135000  1.455000  9.385000 2.295000 ;
+      RECT 10.065000  0.085000 10.335000 0.555000 ;
+      RECT 10.075000  1.795000 10.325000 2.295000 ;
+      RECT 11.005000  0.085000 11.275000 0.555000 ;
+      RECT 11.015000  1.795000 11.265000 2.295000 ;
+      RECT 12.005000  0.085000 12.255000 0.905000 ;
+      RECT 12.005000  1.455000 12.255000 2.295000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
index f3153ff..5be2815 100644
--- a/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
+++ b/cells/nor4/sky130_fd_sc_hdll__nor4_8.magic.lef
@@ -105,61 +105,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 16.100000 0.085000 ;
-        RECT  0.135000  0.085000  0.395000 0.905000 ;
-        RECT  1.065000  0.085000  1.335000 0.555000 ;
-        RECT  2.005000  0.085000  2.275000 0.555000 ;
-        RECT  2.945000  0.085000  3.215000 0.555000 ;
-        RECT  3.885000  0.085000  4.155000 0.555000 ;
-        RECT  4.825000  0.085000  5.095000 0.555000 ;
-        RECT  5.765000  0.085000  6.035000 0.555000 ;
-        RECT  6.705000  0.085000  6.975000 0.555000 ;
-        RECT  7.645000  0.085000  8.435000 0.555000 ;
-        RECT  9.105000  0.085000  9.375000 0.555000 ;
-        RECT 10.045000  0.085000 10.315000 0.555000 ;
-        RECT 10.985000  0.085000 11.255000 0.555000 ;
-        RECT 11.925000  0.085000 12.195000 0.555000 ;
-        RECT 12.865000  0.085000 13.135000 0.555000 ;
-        RECT 13.805000  0.085000 14.075000 0.555000 ;
-        RECT 14.745000  0.085000 15.015000 0.555000 ;
-        RECT 15.685000  0.085000 15.965000 0.905000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
-        RECT 15.785000 -0.085000 15.955000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 16.100000 0.240000 ;
     END
@@ -168,84 +113,136 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 16.100000 2.805000 ;
-        RECT 0.605000 1.795000  0.855000 2.635000 ;
-        RECT 1.545000 1.795000  1.795000 2.635000 ;
-        RECT 2.485000 1.795000  2.735000 2.635000 ;
-        RECT 3.425000 1.795000  3.675000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 15.785000 2.635000 15.955000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 16.100000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.095000 1.455000  4.145000 1.625000 ;
-      RECT  0.095000 1.625000  0.425000 2.465000 ;
-      RECT  1.075000 1.625000  1.325000 2.465000 ;
-      RECT  2.015000 1.625000  2.265000 2.465000 ;
-      RECT  2.955000 1.625000  3.205000 2.465000 ;
-      RECT  3.895000 1.625000  4.145000 2.295000 ;
-      RECT  3.895000 2.295000  7.945000 2.465000 ;
-      RECT  4.365000 1.455000 11.715000 1.625000 ;
-      RECT  4.365000 1.625000  4.615000 2.125000 ;
-      RECT  4.835000 1.795000  5.085000 2.295000 ;
-      RECT  5.305000 1.625000  5.555000 2.125000 ;
-      RECT  5.775000 1.795000  6.025000 2.295000 ;
-      RECT  6.245000 1.625000  6.495000 2.125000 ;
-      RECT  6.715000 1.795000  6.965000 2.295000 ;
-      RECT  7.185000 1.625000  7.435000 2.125000 ;
-      RECT  7.655000 1.795000  7.945000 2.295000 ;
-      RECT  8.135000 1.795000  8.425000 2.295000 ;
-      RECT  8.135000 2.295000 15.995000 2.465000 ;
-      RECT  8.645000 1.625000  8.895000 2.125000 ;
-      RECT  9.075000 1.795000  9.365000 2.295000 ;
-      RECT  9.585000 1.625000  9.835000 2.125000 ;
-      RECT 10.055000 1.795000 10.305000 2.295000 ;
-      RECT 10.525000 1.625000 10.775000 2.125000 ;
-      RECT 10.995000 1.795000 11.245000 2.295000 ;
-      RECT 11.465000 1.625000 11.715000 2.125000 ;
-      RECT 11.935000 1.455000 12.185000 2.295000 ;
-      RECT 12.875000 1.795000 13.125000 2.295000 ;
-      RECT 13.815000 1.795000 14.065000 2.295000 ;
-      RECT 14.755000 1.795000 15.005000 2.295000 ;
-      RECT 15.695000 1.465000 15.995000 2.295000 ;
+      RECT  0.000000 -0.085000 16.100000 0.085000 ;
+      RECT  0.000000  2.635000 16.100000 2.805000 ;
+      RECT  0.095000  1.455000  4.145000 1.625000 ;
+      RECT  0.095000  1.625000  0.425000 2.465000 ;
+      RECT  0.135000  0.085000  0.395000 0.905000 ;
+      RECT  0.605000  1.795000  0.855000 2.635000 ;
+      RECT  1.065000  0.085000  1.335000 0.555000 ;
+      RECT  1.075000  1.625000  1.325000 2.465000 ;
+      RECT  1.545000  1.795000  1.795000 2.635000 ;
+      RECT  2.005000  0.085000  2.275000 0.555000 ;
+      RECT  2.015000  1.625000  2.265000 2.465000 ;
+      RECT  2.485000  1.795000  2.735000 2.635000 ;
+      RECT  2.945000  0.085000  3.215000 0.555000 ;
+      RECT  2.955000  1.625000  3.205000 2.465000 ;
+      RECT  3.425000  1.795000  3.675000 2.635000 ;
+      RECT  3.885000  0.085000  4.155000 0.555000 ;
+      RECT  3.895000  1.625000  4.145000 2.295000 ;
+      RECT  3.895000  2.295000  7.945000 2.465000 ;
+      RECT  4.365000  1.455000 11.715000 1.625000 ;
+      RECT  4.365000  1.625000  4.615000 2.125000 ;
+      RECT  4.825000  0.085000  5.095000 0.555000 ;
+      RECT  4.835000  1.795000  5.085000 2.295000 ;
+      RECT  5.305000  1.625000  5.555000 2.125000 ;
+      RECT  5.765000  0.085000  6.035000 0.555000 ;
+      RECT  5.775000  1.795000  6.025000 2.295000 ;
+      RECT  6.245000  1.625000  6.495000 2.125000 ;
+      RECT  6.705000  0.085000  6.975000 0.555000 ;
+      RECT  6.715000  1.795000  6.965000 2.295000 ;
+      RECT  7.185000  1.625000  7.435000 2.125000 ;
+      RECT  7.645000  0.085000  8.435000 0.555000 ;
+      RECT  7.655000  1.795000  7.945000 2.295000 ;
+      RECT  8.135000  1.795000  8.425000 2.295000 ;
+      RECT  8.135000  2.295000 15.995000 2.465000 ;
+      RECT  8.645000  1.625000  8.895000 2.125000 ;
+      RECT  9.075000  1.795000  9.365000 2.295000 ;
+      RECT  9.105000  0.085000  9.375000 0.555000 ;
+      RECT  9.585000  1.625000  9.835000 2.125000 ;
+      RECT 10.045000  0.085000 10.315000 0.555000 ;
+      RECT 10.055000  1.795000 10.305000 2.295000 ;
+      RECT 10.525000  1.625000 10.775000 2.125000 ;
+      RECT 10.985000  0.085000 11.255000 0.555000 ;
+      RECT 10.995000  1.795000 11.245000 2.295000 ;
+      RECT 11.465000  1.625000 11.715000 2.125000 ;
+      RECT 11.925000  0.085000 12.195000 0.555000 ;
+      RECT 11.935000  1.455000 12.185000 2.295000 ;
+      RECT 12.865000  0.085000 13.135000 0.555000 ;
+      RECT 12.875000  1.795000 13.125000 2.295000 ;
+      RECT 13.805000  0.085000 14.075000 0.555000 ;
+      RECT 13.815000  1.795000 14.065000 2.295000 ;
+      RECT 14.745000  0.085000 15.015000 0.555000 ;
+      RECT 14.755000  1.795000 15.005000 2.295000 ;
+      RECT 15.685000  0.085000 15.965000 0.905000 ;
+      RECT 15.695000  1.465000 15.995000 2.295000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
+      RECT 15.325000 -0.085000 15.495000 0.085000 ;
+      RECT 15.325000  2.635000 15.495000 2.805000 ;
+      RECT 15.785000 -0.085000 15.955000 0.085000 ;
+      RECT 15.785000  2.635000 15.955000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
index 786d046..d67cf91 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_1.magic.lef
@@ -86,20 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.355000  0.085000 0.685000 0.480000 ;
-        RECT 1.325000  0.085000 1.655000 0.485000 ;
-        RECT 2.245000  0.085000 2.735000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -108,29 +94,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 2.325000 2.185000 2.705000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 0.995000 0.745000 1.795000 ;
-      RECT 0.525000 1.795000 3.565000 2.005000 ;
-      RECT 3.090000 0.405000 3.260000 0.655000 ;
-      RECT 3.090000 0.655000 3.565000 0.825000 ;
-      RECT 3.395000 0.825000 3.565000 1.795000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.355000  0.085000 0.685000 0.480000 ;
+      RECT 0.525000  0.995000 0.745000 1.795000 ;
+      RECT 0.525000  1.795000 3.565000 2.005000 ;
+      RECT 1.325000  0.085000 1.655000 0.485000 ;
+      RECT 2.245000  0.085000 2.735000 0.825000 ;
+      RECT 2.325000  2.185000 2.705000 2.635000 ;
+      RECT 3.090000  0.405000 3.260000 0.655000 ;
+      RECT 3.090000  0.655000 3.565000 0.825000 ;
+      RECT 3.395000  0.825000 3.565000 1.795000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
index 8f2e9ff..b60192c 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_2.magic.lef
@@ -92,28 +92,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.905000 ;
-        RECT 1.115000  0.085000 1.285000 0.555000 ;
-        RECT 2.055000  0.085000 2.780000 0.555000 ;
-        RECT 3.550000  0.085000 3.720000 0.555000 ;
-        RECT 4.490000  0.085000 4.695000 0.895000 ;
-        RECT 5.440000  0.085000 5.690000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -122,47 +100,66 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.645000 1.795000 0.855000 2.635000 ;
-        RECT 5.440000 2.135000 5.690000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.455000 2.305000 1.625000 ;
-      RECT 0.085000 1.625000 0.425000 2.465000 ;
-      RECT 1.075000 1.625000 1.325000 2.465000 ;
-      RECT 1.545000 1.795000 1.755000 2.295000 ;
-      RECT 1.545000 2.295000 3.290000 2.465000 ;
-      RECT 1.925000 1.625000 2.305000 2.125000 ;
-      RECT 2.475000 1.455000 3.760000 1.625000 ;
-      RECT 2.475000 1.625000 2.860000 2.125000 ;
-      RECT 3.080000 1.795000 3.290000 2.295000 ;
-      RECT 3.510000 1.625000 3.760000 2.295000 ;
-      RECT 3.510000 2.295000 4.695000 2.465000 ;
-      RECT 4.450000 1.795000 4.695000 2.295000 ;
-      RECT 4.720000 1.075000 5.035000 1.245000 ;
-      RECT 4.865000 0.380000 5.220000 0.905000 ;
-      RECT 4.865000 0.905000 5.035000 1.075000 ;
-      RECT 4.865000 1.245000 5.035000 2.035000 ;
-      RECT 4.865000 2.035000 5.220000 2.450000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.905000 ;
+      RECT 0.085000  1.455000 2.305000 1.625000 ;
+      RECT 0.085000  1.625000 0.425000 2.465000 ;
+      RECT 0.645000  1.795000 0.855000 2.635000 ;
+      RECT 1.075000  1.625000 1.325000 2.465000 ;
+      RECT 1.115000  0.085000 1.285000 0.555000 ;
+      RECT 1.545000  1.795000 1.755000 2.295000 ;
+      RECT 1.545000  2.295000 3.290000 2.465000 ;
+      RECT 1.925000  1.625000 2.305000 2.125000 ;
+      RECT 2.055000  0.085000 2.780000 0.555000 ;
+      RECT 2.475000  1.455000 3.760000 1.625000 ;
+      RECT 2.475000  1.625000 2.860000 2.125000 ;
+      RECT 3.080000  1.795000 3.290000 2.295000 ;
+      RECT 3.510000  1.625000 3.760000 2.295000 ;
+      RECT 3.510000  2.295000 4.695000 2.465000 ;
+      RECT 3.550000  0.085000 3.720000 0.555000 ;
+      RECT 4.450000  1.795000 4.695000 2.295000 ;
+      RECT 4.490000  0.085000 4.695000 0.895000 ;
+      RECT 4.720000  1.075000 5.035000 1.245000 ;
+      RECT 4.865000  0.380000 5.220000 0.905000 ;
+      RECT 4.865000  0.905000 5.035000 1.075000 ;
+      RECT 4.865000  1.245000 5.035000 2.035000 ;
+      RECT 4.865000  2.035000 5.220000 2.450000 ;
+      RECT 5.440000  0.085000 5.690000 0.825000 ;
+      RECT 5.440000  2.135000 5.690000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
index 4ffca0b..e30f13a 100644
--- a/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
+++ b/cells/nor4b/sky130_fd_sc_hdll__nor4b_4.magic.lef
@@ -95,40 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.895000 ;
-        RECT 1.115000  0.085000 1.285000 0.555000 ;
-        RECT 2.055000  0.085000 2.225000 0.555000 ;
-        RECT 2.995000  0.085000 3.165000 0.555000 ;
-        RECT 3.935000  0.085000 4.625000 0.555000 ;
-        RECT 5.395000  0.085000 5.565000 0.555000 ;
-        RECT 6.335000  0.085000 6.505000 0.555000 ;
-        RECT 7.275000  0.085000 7.445000 0.555000 ;
-        RECT 8.215000  0.085000 8.385000 0.555000 ;
-        RECT 9.205000  0.085000 9.435000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -137,64 +103,95 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.645000 1.795000 0.855000 2.635000 ;
-        RECT 1.545000 1.795000 1.795000 2.635000 ;
-        RECT 9.205000 1.455000 9.435000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.455000 2.265000 1.625000 ;
-      RECT 0.095000 1.625000 0.425000 2.465000 ;
-      RECT 1.075000 1.625000 1.325000 2.465000 ;
-      RECT 2.015000 1.625000 2.265000 2.295000 ;
-      RECT 2.015000 2.295000 4.145000 2.465000 ;
-      RECT 2.485000 1.455000 6.075000 1.625000 ;
-      RECT 2.485000 1.625000 2.735000 2.125000 ;
-      RECT 2.955000 1.795000 3.205000 2.295000 ;
-      RECT 3.425000 1.625000 3.675000 2.125000 ;
-      RECT 3.895000 1.795000 4.145000 2.295000 ;
-      RECT 4.415000 1.795000 4.665000 2.295000 ;
-      RECT 4.415000 2.295000 8.425000 2.465000 ;
-      RECT 4.885000 1.625000 5.135000 2.125000 ;
-      RECT 5.355000 1.795000 5.605000 2.295000 ;
-      RECT 5.825000 1.625000 6.075000 2.125000 ;
-      RECT 6.295000 1.455000 6.545000 2.295000 ;
-      RECT 7.235000 1.795000 7.485000 2.295000 ;
-      RECT 7.420000 1.075000 8.440000 1.285000 ;
-      RECT 8.175000 1.795000 8.425000 2.295000 ;
-      RECT 8.270000 0.735000 8.985000 0.905000 ;
-      RECT 8.270000 0.905000 8.440000 1.075000 ;
-      RECT 8.270000 1.285000 8.440000 1.455000 ;
-      RECT 8.270000 1.455000 8.985000 1.625000 ;
-      RECT 8.610000 0.255000 8.985000 0.735000 ;
-      RECT 8.650000 1.625000 8.985000 2.465000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.095000  1.455000 2.265000 1.625000 ;
+      RECT 0.095000  1.625000 0.425000 2.465000 ;
+      RECT 0.175000  0.085000 0.345000 0.895000 ;
+      RECT 0.645000  1.795000 0.855000 2.635000 ;
+      RECT 1.075000  1.625000 1.325000 2.465000 ;
+      RECT 1.115000  0.085000 1.285000 0.555000 ;
+      RECT 1.545000  1.795000 1.795000 2.635000 ;
+      RECT 2.015000  1.625000 2.265000 2.295000 ;
+      RECT 2.015000  2.295000 4.145000 2.465000 ;
+      RECT 2.055000  0.085000 2.225000 0.555000 ;
+      RECT 2.485000  1.455000 6.075000 1.625000 ;
+      RECT 2.485000  1.625000 2.735000 2.125000 ;
+      RECT 2.955000  1.795000 3.205000 2.295000 ;
+      RECT 2.995000  0.085000 3.165000 0.555000 ;
+      RECT 3.425000  1.625000 3.675000 2.125000 ;
+      RECT 3.895000  1.795000 4.145000 2.295000 ;
+      RECT 3.935000  0.085000 4.625000 0.555000 ;
+      RECT 4.415000  1.795000 4.665000 2.295000 ;
+      RECT 4.415000  2.295000 8.425000 2.465000 ;
+      RECT 4.885000  1.625000 5.135000 2.125000 ;
+      RECT 5.355000  1.795000 5.605000 2.295000 ;
+      RECT 5.395000  0.085000 5.565000 0.555000 ;
+      RECT 5.825000  1.625000 6.075000 2.125000 ;
+      RECT 6.295000  1.455000 6.545000 2.295000 ;
+      RECT 6.335000  0.085000 6.505000 0.555000 ;
+      RECT 7.235000  1.795000 7.485000 2.295000 ;
+      RECT 7.275000  0.085000 7.445000 0.555000 ;
+      RECT 7.420000  1.075000 8.440000 1.285000 ;
+      RECT 8.175000  1.795000 8.425000 2.295000 ;
+      RECT 8.215000  0.085000 8.385000 0.555000 ;
+      RECT 8.270000  0.735000 8.985000 0.905000 ;
+      RECT 8.270000  0.905000 8.440000 1.075000 ;
+      RECT 8.270000  1.285000 8.440000 1.455000 ;
+      RECT 8.270000  1.455000 8.985000 1.625000 ;
+      RECT 8.610000  0.255000 8.985000 0.735000 ;
+      RECT 8.650000  1.625000 8.985000 2.465000 ;
+      RECT 9.205000  0.085000 9.435000 0.905000 ;
+      RECT 9.205000  1.455000 9.435000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
index 686de4f..2b41e2c 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_1.magic.lef
@@ -87,22 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.705000  0.085000 0.875000 0.825000 ;
-        RECT 1.620000  0.085000 1.950000 0.480000 ;
-        RECT 2.590000  0.085000 2.920000 0.485000 ;
-        RECT 3.510000  0.085000 3.990000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -111,37 +95,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.515000 2.240000 0.895000 2.635000 ;
-        RECT 3.510000 1.875000 3.990000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.405000 0.825000 ;
-      RECT 0.085000 0.825000 0.260000 1.885000 ;
-      RECT 0.085000 1.885000 1.305000 2.070000 ;
-      RECT 0.085000 2.070000 0.345000 2.455000 ;
-      RECT 1.100000 1.525000 1.790000 1.715000 ;
-      RECT 1.135000 2.070000 1.305000 2.295000 ;
-      RECT 1.135000 2.295000 2.615000 2.465000 ;
-      RECT 1.175000 0.450000 1.345000 0.655000 ;
-      RECT 1.175000 0.655000 1.790000 0.825000 ;
-      RECT 1.620000 0.825000 1.790000 1.525000 ;
-      RECT 2.380000 0.995000 2.615000 2.295000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.450000 0.405000 0.825000 ;
+      RECT 0.085000  0.825000 0.260000 1.885000 ;
+      RECT 0.085000  1.885000 1.305000 2.070000 ;
+      RECT 0.085000  2.070000 0.345000 2.455000 ;
+      RECT 0.515000  2.240000 0.895000 2.635000 ;
+      RECT 0.705000  0.085000 0.875000 0.825000 ;
+      RECT 1.100000  1.525000 1.790000 1.715000 ;
+      RECT 1.135000  2.070000 1.305000 2.295000 ;
+      RECT 1.135000  2.295000 2.615000 2.465000 ;
+      RECT 1.175000  0.450000 1.345000 0.655000 ;
+      RECT 1.175000  0.655000 1.790000 0.825000 ;
+      RECT 1.620000  0.085000 1.950000 0.480000 ;
+      RECT 1.620000  0.825000 1.790000 1.525000 ;
+      RECT 2.380000  0.995000 2.615000 2.295000 ;
+      RECT 2.590000  0.085000 2.920000 0.485000 ;
+      RECT 3.510000  0.085000 3.990000 0.825000 ;
+      RECT 3.510000  1.875000 3.990000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
index 384beb0..b962bcb 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_2.magic.lef
@@ -89,29 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.685000  0.085000 0.855000 0.825000 ;
-        RECT 1.595000  0.085000 1.925000 0.480000 ;
-        RECT 2.695000  0.085000 2.865000 0.555000 ;
-        RECT 3.635000  0.085000 4.345000 0.555000 ;
-        RECT 5.115000  0.085000 5.285000 0.555000 ;
-        RECT 6.055000  0.085000 6.330000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -120,52 +97,72 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.515000 2.240000 0.895000 2.635000 ;
-        RECT 5.545000 1.795000 5.755000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.465000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.885000 ;
-      RECT 0.085000 1.885000 1.950000 2.055000 ;
-      RECT 0.085000 2.055000 0.345000 2.455000 ;
-      RECT 1.045000 1.525000 1.610000 1.715000 ;
-      RECT 1.155000 0.450000 1.350000 0.655000 ;
-      RECT 1.155000 0.655000 1.610000 0.825000 ;
-      RECT 1.440000 0.825000 1.610000 1.075000 ;
-      RECT 1.440000 1.075000 2.475000 1.245000 ;
-      RECT 1.440000 1.245000 1.610000 1.525000 ;
-      RECT 1.675000 2.225000 3.885000 2.465000 ;
-      RECT 1.780000 1.415000 2.865000 1.585000 ;
-      RECT 1.780000 1.585000 1.950000 1.885000 ;
-      RECT 2.145000 1.875000 4.895000 2.045000 ;
-      RECT 2.695000 1.075000 3.640000 1.275000 ;
-      RECT 2.695000 1.275000 2.865000 1.415000 ;
-      RECT 4.095000 2.215000 5.325000 2.465000 ;
-      RECT 4.605000 1.455000 4.895000 1.875000 ;
-      RECT 5.115000 1.455000 6.305000 1.625000 ;
-      RECT 5.115000 1.625000 5.325000 2.215000 ;
-      RECT 5.925000 1.625000 6.305000 2.465000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.085000  0.450000 0.465000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.885000 ;
+      RECT 0.085000  1.885000 1.950000 2.055000 ;
+      RECT 0.085000  2.055000 0.345000 2.455000 ;
+      RECT 0.515000  2.240000 0.895000 2.635000 ;
+      RECT 0.685000  0.085000 0.855000 0.825000 ;
+      RECT 1.045000  1.525000 1.610000 1.715000 ;
+      RECT 1.155000  0.450000 1.350000 0.655000 ;
+      RECT 1.155000  0.655000 1.610000 0.825000 ;
+      RECT 1.440000  0.825000 1.610000 1.075000 ;
+      RECT 1.440000  1.075000 2.475000 1.245000 ;
+      RECT 1.440000  1.245000 1.610000 1.525000 ;
+      RECT 1.595000  0.085000 1.925000 0.480000 ;
+      RECT 1.675000  2.225000 3.885000 2.465000 ;
+      RECT 1.780000  1.415000 2.865000 1.585000 ;
+      RECT 1.780000  1.585000 1.950000 1.885000 ;
+      RECT 2.145000  1.875000 4.895000 2.045000 ;
+      RECT 2.695000  0.085000 2.865000 0.555000 ;
+      RECT 2.695000  1.075000 3.640000 1.275000 ;
+      RECT 2.695000  1.275000 2.865000 1.415000 ;
+      RECT 3.635000  0.085000 4.345000 0.555000 ;
+      RECT 4.095000  2.215000 5.325000 2.465000 ;
+      RECT 4.605000  1.455000 4.895000 1.875000 ;
+      RECT 5.115000  0.085000 5.285000 0.555000 ;
+      RECT 5.115000  1.455000 6.305000 1.625000 ;
+      RECT 5.115000  1.625000 5.325000 2.215000 ;
+      RECT 5.545000  1.795000 5.755000 2.635000 ;
+      RECT 5.925000  1.625000 6.305000 2.465000 ;
+      RECT 6.055000  0.085000 6.330000 0.905000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
index f3a2400..5548a34 100644
--- a/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
+++ b/cells/nor4bb/sky130_fd_sc_hdll__nor4bb_4.magic.lef
@@ -93,41 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.120000 0.085000 ;
-        RECT 0.665000  0.085000  0.835000 0.555000 ;
-        RECT 1.695000  0.085000  1.865000 0.555000 ;
-        RECT 2.635000  0.085000  2.805000 0.555000 ;
-        RECT 3.575000  0.085000  3.745000 0.555000 ;
-        RECT 4.515000  0.085000  4.685000 0.555000 ;
-        RECT 5.455000  0.085000  6.145000 0.555000 ;
-        RECT 6.915000  0.085000  7.085000 0.555000 ;
-        RECT 7.855000  0.085000  8.025000 0.555000 ;
-        RECT 8.795000  0.085000  8.965000 0.555000 ;
-        RECT 9.735000  0.085000 10.010000 0.905000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
-        RECT 9.805000 -0.085000 9.975000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.120000 0.240000 ;
     END
@@ -136,70 +101,102 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.120000 2.805000 ;
-        RECT 0.535000 2.215000  0.915000 2.635000 ;
-        RECT 8.285000 1.795000  8.535000 2.635000 ;
-        RECT 9.225000 1.795000  9.475000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
-        RECT 9.805000 2.635000 9.975000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.120000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000  0.445000 0.725000 ;
-      RECT 0.085000 0.725000  0.835000 0.895000 ;
-      RECT 0.085000 1.535000  0.835000 1.875000 ;
-      RECT 0.085000 1.875000  3.825000 2.045000 ;
-      RECT 0.085000 2.045000  0.365000 2.465000 ;
-      RECT 0.665000 0.895000  0.835000 1.535000 ;
-      RECT 1.005000 0.255000  1.385000 0.735000 ;
-      RECT 1.005000 0.735000  1.735000 0.905000 ;
-      RECT 1.005000 1.535000  1.735000 1.705000 ;
-      RECT 1.565000 0.905000  1.735000 1.075000 ;
-      RECT 1.565000 1.075000  3.095000 1.245000 ;
-      RECT 1.565000 1.245000  1.735000 1.535000 ;
-      RECT 1.615000 2.215000  3.825000 2.295000 ;
-      RECT 1.615000 2.295000  5.695000 2.465000 ;
-      RECT 3.655000 1.075000  5.405000 1.285000 ;
-      RECT 3.655000 1.285000  3.825000 1.875000 ;
-      RECT 4.045000 1.455000  7.595000 1.625000 ;
-      RECT 4.045000 1.625000  4.255000 2.125000 ;
-      RECT 4.475000 1.795000  4.725000 2.295000 ;
-      RECT 4.945000 1.625000  5.195000 2.125000 ;
-      RECT 5.415000 1.795000  5.695000 2.295000 ;
-      RECT 5.880000 1.795000  6.185000 2.295000 ;
-      RECT 5.880000 2.295000  8.065000 2.465000 ;
-      RECT 6.405000 1.625000  6.655000 2.125000 ;
-      RECT 6.875000 1.795000  7.125000 2.295000 ;
-      RECT 7.345000 1.625000  7.595000 2.125000 ;
-      RECT 7.815000 1.455000 10.010000 1.625000 ;
-      RECT 7.815000 1.625000  8.065000 2.295000 ;
-      RECT 8.755000 1.625000  9.005000 2.465000 ;
-      RECT 9.695000 1.625000 10.010000 2.465000 ;
+      RECT 0.000000 -0.085000 10.120000 0.085000 ;
+      RECT 0.000000  2.635000 10.120000 2.805000 ;
+      RECT 0.085000  0.255000  0.445000 0.725000 ;
+      RECT 0.085000  0.725000  0.835000 0.895000 ;
+      RECT 0.085000  1.535000  0.835000 1.875000 ;
+      RECT 0.085000  1.875000  3.825000 2.045000 ;
+      RECT 0.085000  2.045000  0.365000 2.465000 ;
+      RECT 0.535000  2.215000  0.915000 2.635000 ;
+      RECT 0.665000  0.085000  0.835000 0.555000 ;
+      RECT 0.665000  0.895000  0.835000 1.535000 ;
+      RECT 1.005000  0.255000  1.385000 0.735000 ;
+      RECT 1.005000  0.735000  1.735000 0.905000 ;
+      RECT 1.005000  1.535000  1.735000 1.705000 ;
+      RECT 1.565000  0.905000  1.735000 1.075000 ;
+      RECT 1.565000  1.075000  3.095000 1.245000 ;
+      RECT 1.565000  1.245000  1.735000 1.535000 ;
+      RECT 1.615000  2.215000  3.825000 2.295000 ;
+      RECT 1.615000  2.295000  5.695000 2.465000 ;
+      RECT 1.695000  0.085000  1.865000 0.555000 ;
+      RECT 2.635000  0.085000  2.805000 0.555000 ;
+      RECT 3.575000  0.085000  3.745000 0.555000 ;
+      RECT 3.655000  1.075000  5.405000 1.285000 ;
+      RECT 3.655000  1.285000  3.825000 1.875000 ;
+      RECT 4.045000  1.455000  7.595000 1.625000 ;
+      RECT 4.045000  1.625000  4.255000 2.125000 ;
+      RECT 4.475000  1.795000  4.725000 2.295000 ;
+      RECT 4.515000  0.085000  4.685000 0.555000 ;
+      RECT 4.945000  1.625000  5.195000 2.125000 ;
+      RECT 5.415000  1.795000  5.695000 2.295000 ;
+      RECT 5.455000  0.085000  6.145000 0.555000 ;
+      RECT 5.880000  1.795000  6.185000 2.295000 ;
+      RECT 5.880000  2.295000  8.065000 2.465000 ;
+      RECT 6.405000  1.625000  6.655000 2.125000 ;
+      RECT 6.875000  1.795000  7.125000 2.295000 ;
+      RECT 6.915000  0.085000  7.085000 0.555000 ;
+      RECT 7.345000  1.625000  7.595000 2.125000 ;
+      RECT 7.815000  1.455000 10.010000 1.625000 ;
+      RECT 7.815000  1.625000  8.065000 2.295000 ;
+      RECT 7.855000  0.085000  8.025000 0.555000 ;
+      RECT 8.285000  1.795000  8.535000 2.635000 ;
+      RECT 8.755000  1.625000  9.005000 2.465000 ;
+      RECT 8.795000  0.085000  8.965000 0.555000 ;
+      RECT 9.225000  1.795000  9.475000 2.635000 ;
+      RECT 9.695000  1.625000 10.010000 2.465000 ;
+      RECT 9.735000  0.085000 10.010000 0.905000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
+      RECT 9.805000 -0.085000 9.975000 0.085000 ;
+      RECT 9.805000  2.635000 9.975000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
index c9b7d50..464d5d0 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_1.magic.lef
@@ -86,20 +86,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.645000  0.085000 0.895000 0.885000 ;
-        RECT 1.635000  0.085000 1.860000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -108,37 +94,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.645000 1.495000 0.815000 2.635000 ;
-        RECT 1.085000 1.835000 1.335000 2.635000 ;
-        RECT 2.760000 1.835000 3.090000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 1.075000 1.175000 1.245000 ;
-      RECT 1.005000 1.245000 1.175000 1.495000 ;
-      RECT 1.005000 1.495000 3.800000 1.665000 ;
-      RECT 1.085000 0.255000 1.415000 0.735000 ;
-      RECT 1.085000 0.735000 2.410000 0.905000 ;
-      RECT 2.030000 0.255000 2.410000 0.735000 ;
-      RECT 2.085000 1.665000 2.465000 2.465000 ;
-      RECT 3.250000 0.255000 3.800000 0.865000 ;
-      RECT 3.250000 0.865000 3.470000 1.495000 ;
-      RECT 3.470000 1.665000 3.800000 2.465000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.430000  1.075000 1.175000 1.245000 ;
+      RECT 0.645000  0.085000 0.895000 0.885000 ;
+      RECT 0.645000  1.495000 0.815000 2.635000 ;
+      RECT 1.005000  1.245000 1.175000 1.495000 ;
+      RECT 1.005000  1.495000 3.800000 1.665000 ;
+      RECT 1.085000  0.255000 1.415000 0.735000 ;
+      RECT 1.085000  0.735000 2.410000 0.905000 ;
+      RECT 1.085000  1.835000 1.335000 2.635000 ;
+      RECT 1.635000  0.085000 1.860000 0.545000 ;
+      RECT 2.030000  0.255000 2.410000 0.735000 ;
+      RECT 2.085000  1.665000 2.465000 2.465000 ;
+      RECT 2.760000  1.835000 3.090000 2.635000 ;
+      RECT 3.250000  0.255000 3.800000 0.865000 ;
+      RECT 3.250000  0.865000 3.470000 1.495000 ;
+      RECT 3.470000  1.665000 3.800000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
index 61b9093..4e859b4 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_2.magic.lef
@@ -87,21 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 1.535000  0.085000 1.870000 0.465000 ;
-        RECT 2.540000  0.085000 2.775000 0.525000 ;
-        RECT 3.545000  0.085000 3.875000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -110,37 +95,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.525000 1.935000 0.905000 2.635000 ;
-        RECT 2.375000 1.935000 2.855000 2.635000 ;
-        RECT 3.445000 2.255000 3.825000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.510000 3.025000 1.735000 ;
-      RECT 0.090000 1.735000 1.820000 1.765000 ;
-      RECT 0.090000 1.765000 0.355000 2.465000 ;
-      RECT 0.095000 0.255000 0.430000 0.425000 ;
-      RECT 0.095000 0.425000 0.760000 0.825000 ;
-      RECT 0.530000 0.825000 0.760000 1.510000 ;
-      RECT 0.930000 0.635000 2.375000 0.825000 ;
-      RECT 1.125000 1.765000 1.820000 2.465000 ;
-      RECT 2.855000 0.995000 3.565000 1.325000 ;
-      RECT 2.855000 1.325000 3.025000 1.510000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.090000  1.510000 3.025000 1.735000 ;
+      RECT 0.090000  1.735000 1.820000 1.765000 ;
+      RECT 0.090000  1.765000 0.355000 2.465000 ;
+      RECT 0.095000  0.255000 0.430000 0.425000 ;
+      RECT 0.095000  0.425000 0.760000 0.825000 ;
+      RECT 0.525000  1.935000 0.905000 2.635000 ;
+      RECT 0.530000  0.825000 0.760000 1.510000 ;
+      RECT 0.930000  0.635000 2.375000 0.825000 ;
+      RECT 1.125000  1.765000 1.820000 2.465000 ;
+      RECT 1.535000  0.085000 1.870000 0.465000 ;
+      RECT 2.375000  1.935000 2.855000 2.635000 ;
+      RECT 2.540000  0.085000 2.775000 0.525000 ;
+      RECT 2.855000  0.995000 3.565000 1.325000 ;
+      RECT 2.855000  1.325000 3.025000 1.510000 ;
+      RECT 3.445000  2.255000 3.825000 2.635000 ;
+      RECT 3.545000  0.085000 3.875000 0.445000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
index 50fc730..9a263e5 100644
--- a/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
+++ b/cells/o211a/sky130_fd_sc_hdll__o211a_4.magic.lef
@@ -94,29 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.465000 ;
-        RECT 1.035000  0.085000 1.365000 0.445000 ;
-        RECT 1.925000  0.085000 2.340000 0.465000 ;
-        RECT 4.980000  0.085000 5.295000 0.525000 ;
-        RECT 6.065000  0.085000 6.255000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -125,49 +102,69 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.480000 1.870000 0.860000 2.635000 ;
-        RECT 1.440000 1.870000 1.820000 2.635000 ;
-        RECT 2.400000 2.200000 2.780000 2.635000 ;
-        RECT 3.535000 2.195000 3.915000 2.635000 ;
-        RECT 4.595000 2.195000 4.860000 2.635000 ;
-        RECT 6.425000 1.915000 6.805000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 1.065000 2.620000 1.265000 ;
-      RECT 2.400000 0.635000 3.820000 0.815000 ;
-      RECT 2.400000 0.815000 2.620000 1.065000 ;
-      RECT 2.400000 1.265000 2.620000 1.855000 ;
-      RECT 2.400000 1.855000 5.845000 2.025000 ;
-      RECT 2.580000 0.255000 4.805000 0.465000 ;
-      RECT 3.000000 2.025000 3.360000 2.465000 ;
-      RECT 4.085000 2.025000 4.415000 2.465000 ;
-      RECT 4.475000 0.465000 4.805000 0.695000 ;
-      RECT 4.475000 0.695000 6.805000 0.865000 ;
-      RECT 5.465000 0.255000 5.845000 0.695000 ;
-      RECT 5.465000 2.025000 5.845000 2.465000 ;
-      RECT 6.425000 0.255000 6.805000 0.695000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.465000 ;
+      RECT 0.480000  1.870000 0.860000 2.635000 ;
+      RECT 0.535000  1.065000 2.620000 1.265000 ;
+      RECT 1.035000  0.085000 1.365000 0.445000 ;
+      RECT 1.440000  1.870000 1.820000 2.635000 ;
+      RECT 1.925000  0.085000 2.340000 0.465000 ;
+      RECT 2.400000  0.635000 3.820000 0.815000 ;
+      RECT 2.400000  0.815000 2.620000 1.065000 ;
+      RECT 2.400000  1.265000 2.620000 1.855000 ;
+      RECT 2.400000  1.855000 5.845000 2.025000 ;
+      RECT 2.400000  2.200000 2.780000 2.635000 ;
+      RECT 2.580000  0.255000 4.805000 0.465000 ;
+      RECT 3.000000  2.025000 3.360000 2.465000 ;
+      RECT 3.535000  2.195000 3.915000 2.635000 ;
+      RECT 4.085000  2.025000 4.415000 2.465000 ;
+      RECT 4.475000  0.465000 4.805000 0.695000 ;
+      RECT 4.475000  0.695000 6.805000 0.865000 ;
+      RECT 4.595000  2.195000 4.860000 2.635000 ;
+      RECT 4.980000  0.085000 5.295000 0.525000 ;
+      RECT 5.465000  0.255000 5.845000 0.695000 ;
+      RECT 5.465000  2.025000 5.845000 2.465000 ;
+      RECT 6.065000  0.085000 6.255000 0.525000 ;
+      RECT 6.425000  0.255000 6.805000 0.695000 ;
+      RECT 6.425000  1.915000 6.805000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
index b7a7921..4f01a8d 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_1.magic.lef
@@ -90,16 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.570000  0.085000 0.900000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -108,26 +98,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.095000 1.495000 0.395000 2.635000 ;
-        RECT 1.540000 2.275000 1.870000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.400000 0.615000 ;
-      RECT 0.095000 0.615000 1.450000 0.825000 ;
-      RECT 1.070000 0.255000 1.450000 0.615000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.095000  0.255000 0.400000 0.615000 ;
+      RECT 0.095000  0.615000 1.450000 0.825000 ;
+      RECT 0.095000  1.495000 0.395000 2.635000 ;
+      RECT 0.570000  0.085000 0.900000 0.445000 ;
+      RECT 1.070000  0.255000 1.450000 0.615000 ;
+      RECT 1.540000  2.275000 1.870000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
index f0c0f61..c1b8888 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_2.magic.lef
@@ -88,23 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 2.595000  0.085000 2.925000 0.445000 ;
-        RECT 3.525000  0.085000 3.905000 0.445000 ;
-        RECT 4.465000  0.085000 4.870000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -113,40 +96,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.115000 2.175000 0.375000 2.635000 ;
-        RECT 1.025000 1.915000 1.405000 2.635000 ;
-        RECT 1.985000 1.915000 2.365000 2.635000 ;
-        RECT 3.985000 1.865000 4.365000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 2.365000 0.445000 ;
-      RECT 1.145000 0.445000 2.365000 0.465000 ;
-      RECT 1.145000 0.465000 1.335000 0.890000 ;
-      RECT 1.505000 0.635000 4.295000 0.845000 ;
-      RECT 2.595000 2.100000 2.855000 2.295000 ;
-      RECT 2.595000 2.295000 3.815000 2.465000 ;
-      RECT 3.625000 1.525000 4.845000 1.695000 ;
-      RECT 3.625000 1.695000 3.815000 2.295000 ;
-      RECT 4.105000 0.515000 4.295000 0.635000 ;
-      RECT 4.585000 1.695000 4.845000 2.465000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.095000  0.255000 2.365000 0.445000 ;
+      RECT 0.115000  2.175000 0.375000 2.635000 ;
+      RECT 1.025000  1.915000 1.405000 2.635000 ;
+      RECT 1.145000  0.445000 2.365000 0.465000 ;
+      RECT 1.145000  0.465000 1.335000 0.890000 ;
+      RECT 1.505000  0.635000 4.295000 0.845000 ;
+      RECT 1.985000  1.915000 2.365000 2.635000 ;
+      RECT 2.595000  0.085000 2.925000 0.445000 ;
+      RECT 2.595000  2.100000 2.855000 2.295000 ;
+      RECT 2.595000  2.295000 3.815000 2.465000 ;
+      RECT 3.525000  0.085000 3.905000 0.445000 ;
+      RECT 3.625000  1.525000 4.845000 1.695000 ;
+      RECT 3.625000  1.695000 3.815000 2.295000 ;
+      RECT 3.985000  1.865000 4.365000 2.635000 ;
+      RECT 4.105000  0.515000 4.295000 0.635000 ;
+      RECT 4.465000  0.085000 4.870000 0.445000 ;
+      RECT 4.585000  1.695000 4.845000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
index 236f7ed..3675158 100644
--- a/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
+++ b/cells/o211ai/sky130_fd_sc_hdll__o211ai_4.magic.lef
@@ -96,32 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.525000  0.085000 0.905000 0.445000 ;
-        RECT 1.535000  0.085000 1.865000 0.455000 ;
-        RECT 2.445000  0.085000 2.825000 0.445000 ;
-        RECT 3.405000  0.085000 3.785000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -130,58 +104,80 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.090000 1.665000 0.385000 2.635000 ;
-        RECT 1.005000 2.275000 1.385000 2.635000 ;
-        RECT 4.015000 2.195000 4.285000 2.635000 ;
-        RECT 4.885000 2.275000 5.265000 2.635000 ;
-        RECT 5.830000 2.275000 6.210000 2.635000 ;
-        RECT 6.770000 2.275000 7.155000 2.635000 ;
-        RECT 8.155000 2.275000 8.485000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 0.535000 0.355000 0.625000 ;
-      RECT 0.155000 0.625000 4.235000 0.795000 ;
-      RECT 0.155000 0.795000 3.480000 0.905000 ;
-      RECT 0.605000 1.860000 0.825000 1.935000 ;
-      RECT 0.605000 1.935000 1.785000 2.105000 ;
-      RECT 0.605000 2.105000 0.825000 2.190000 ;
-      RECT 1.125000 0.425000 1.340000 0.625000 ;
-      RECT 1.605000 2.105000 1.785000 2.275000 ;
-      RECT 1.605000 2.275000 3.785000 2.465000 ;
-      RECT 4.005000 0.255000 5.470000 0.455000 ;
-      RECT 4.005000 0.455000 4.235000 0.625000 ;
-      RECT 4.405000 0.635000 6.870000 0.815000 ;
-      RECT 7.730000 0.310000 8.490000 0.480000 ;
-      RECT 8.320000 0.480000 8.490000 0.595000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.090000  1.665000 0.385000 2.635000 ;
+      RECT 0.155000  0.535000 0.355000 0.625000 ;
+      RECT 0.155000  0.625000 4.235000 0.795000 ;
+      RECT 0.155000  0.795000 3.480000 0.905000 ;
+      RECT 0.525000  0.085000 0.905000 0.445000 ;
+      RECT 0.605000  1.860000 0.825000 1.935000 ;
+      RECT 0.605000  1.935000 1.785000 2.105000 ;
+      RECT 0.605000  2.105000 0.825000 2.190000 ;
+      RECT 1.005000  2.275000 1.385000 2.635000 ;
+      RECT 1.125000  0.425000 1.340000 0.625000 ;
+      RECT 1.535000  0.085000 1.865000 0.455000 ;
+      RECT 1.605000  2.105000 1.785000 2.275000 ;
+      RECT 1.605000  2.275000 3.785000 2.465000 ;
+      RECT 2.445000  0.085000 2.825000 0.445000 ;
+      RECT 3.405000  0.085000 3.785000 0.445000 ;
+      RECT 4.005000  0.255000 5.470000 0.455000 ;
+      RECT 4.005000  0.455000 4.235000 0.625000 ;
+      RECT 4.015000  2.195000 4.285000 2.635000 ;
+      RECT 4.405000  0.635000 6.870000 0.815000 ;
+      RECT 4.885000  2.275000 5.265000 2.635000 ;
+      RECT 5.830000  2.275000 6.210000 2.635000 ;
+      RECT 6.770000  2.275000 7.155000 2.635000 ;
+      RECT 7.730000  0.310000 8.490000 0.480000 ;
+      RECT 8.155000  2.275000 8.485000 2.635000 ;
+      RECT 8.320000  0.480000 8.490000 0.595000 ;
     LAYER mcon ;
-      RECT 1.170000 0.425000 1.340000 0.595000 ;
-      RECT 8.320000 0.425000 8.490000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.170000  0.425000 1.340000 0.595000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.320000  0.425000 8.490000 0.595000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
     LAYER met1 ;
       RECT 1.110000 0.395000 1.400000 0.440000 ;
       RECT 1.110000 0.440000 8.550000 0.580000 ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
index eaeeb5b..5d438f8 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_1.magic.lef
@@ -76,18 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.615000  0.085000 0.785000 0.545000 ;
-        RECT 1.980000  0.085000 2.150000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -96,32 +84,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.535000 1.860000 1.265000 2.635000 ;
-        RECT 2.380000 1.915000 3.100000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.600000 0.715000 1.385000 0.905000 ;
-      RECT 0.600000 0.905000 0.885000 1.475000 ;
-      RECT 0.600000 1.475000 1.810000 1.690000 ;
-      RECT 1.025000 0.255000 1.385000 0.715000 ;
-      RECT 1.480000 1.690000 1.810000 2.465000 ;
-      RECT 1.555000 0.555000 1.765000 0.715000 ;
-      RECT 1.555000 0.715000 2.710000 0.905000 ;
-      RECT 2.380000 0.255000 2.710000 0.715000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.535000  1.860000 1.265000 2.635000 ;
+      RECT 0.600000  0.715000 1.385000 0.905000 ;
+      RECT 0.600000  0.905000 0.885000 1.475000 ;
+      RECT 0.600000  1.475000 1.810000 1.690000 ;
+      RECT 0.615000  0.085000 0.785000 0.545000 ;
+      RECT 1.025000  0.255000 1.385000 0.715000 ;
+      RECT 1.480000  1.690000 1.810000 2.465000 ;
+      RECT 1.555000  0.555000 1.765000 0.715000 ;
+      RECT 1.555000  0.715000 2.710000 0.905000 ;
+      RECT 1.980000  0.085000 2.150000 0.545000 ;
+      RECT 2.380000  0.255000 2.710000 0.715000 ;
+      RECT 2.380000  1.915000 3.100000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
index 4407e9e..101f2b6 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_2.magic.lef
@@ -75,20 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.105000  0.085000 0.345000 0.885000 ;
-        RECT 0.995000  0.085000 1.375000 0.465000 ;
-        RECT 2.495000  0.085000 3.035000 0.465000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -97,35 +83,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.090000 1.635000 0.345000 2.635000 ;
-        RECT 0.995000 2.185000 1.895000 2.635000 ;
-        RECT 3.245000 1.650000 3.530000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.995000 0.635000 1.895000 0.840000 ;
-      RECT 0.995000 0.840000 1.355000 1.330000 ;
-      RECT 1.185000 1.330000 1.355000 1.785000 ;
-      RECT 1.185000 1.785000 2.375000 2.005000 ;
-      RECT 1.565000 0.255000 1.895000 0.635000 ;
-      RECT 2.115000 0.465000 2.325000 0.635000 ;
-      RECT 2.115000 0.635000 3.530000 0.825000 ;
-      RECT 2.115000 2.005000 2.375000 2.465000 ;
-      RECT 3.255000 0.495000 3.530000 0.635000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.090000  1.635000 0.345000 2.635000 ;
+      RECT 0.105000  0.085000 0.345000 0.885000 ;
+      RECT 0.995000  0.085000 1.375000 0.465000 ;
+      RECT 0.995000  0.635000 1.895000 0.840000 ;
+      RECT 0.995000  0.840000 1.355000 1.330000 ;
+      RECT 0.995000  2.185000 1.895000 2.635000 ;
+      RECT 1.185000  1.330000 1.355000 1.785000 ;
+      RECT 1.185000  1.785000 2.375000 2.005000 ;
+      RECT 1.565000  0.255000 1.895000 0.635000 ;
+      RECT 2.115000  0.465000 2.325000 0.635000 ;
+      RECT 2.115000  0.635000 3.530000 0.825000 ;
+      RECT 2.115000  2.005000 2.375000 2.465000 ;
+      RECT 2.495000  0.085000 3.035000 0.465000 ;
+      RECT 3.245000  1.650000 3.530000 2.635000 ;
+      RECT 3.255000  0.495000 3.530000 0.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
index 44a8c20..2dd2b14 100644
--- a/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
+++ b/cells/o21a/sky130_fd_sc_hdll__o21a_4.magic.lef
@@ -81,27 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.465000 ;
-        RECT 1.055000  0.085000 1.385000 0.445000 ;
-        RECT 2.015000  0.085000 2.345000 0.465000 ;
-        RECT 4.055000  0.085000 4.395000 0.445000 ;
-        RECT 4.975000  0.085000 5.355000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -110,45 +89,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.415000 1.870000 0.795000 2.635000 ;
-        RECT 1.375000 1.870000 1.755000 2.635000 ;
-        RECT 2.335000 2.255000 2.735000 2.635000 ;
-        RECT 3.515000 2.275000 3.845000 2.635000 ;
-        RECT 5.455000 1.935000 5.865000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.520000 0.995000 2.565000 1.335000 ;
-      RECT 2.315000 0.655000 3.385000 0.870000 ;
-      RECT 2.315000 0.870000 2.565000 0.995000 ;
-      RECT 2.325000 1.335000 2.565000 1.830000 ;
-      RECT 2.325000 1.830000 3.195000 1.875000 ;
-      RECT 2.325000 1.875000 4.875000 2.085000 ;
-      RECT 2.585000 0.255000 3.885000 0.485000 ;
-      RECT 2.955000 2.085000 4.875000 2.105000 ;
-      RECT 2.955000 2.105000 3.195000 2.465000 ;
-      RECT 3.555000 0.485000 3.885000 0.615000 ;
-      RECT 3.555000 0.615000 5.835000 0.785000 ;
-      RECT 4.495000 2.105000 4.875000 2.445000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.095000  0.085000 0.425000 0.465000 ;
+      RECT 0.415000  1.870000 0.795000 2.635000 ;
+      RECT 0.520000  0.995000 2.565000 1.335000 ;
+      RECT 1.055000  0.085000 1.385000 0.445000 ;
+      RECT 1.375000  1.870000 1.755000 2.635000 ;
+      RECT 2.015000  0.085000 2.345000 0.465000 ;
+      RECT 2.315000  0.655000 3.385000 0.870000 ;
+      RECT 2.315000  0.870000 2.565000 0.995000 ;
+      RECT 2.325000  1.335000 2.565000 1.830000 ;
+      RECT 2.325000  1.830000 3.195000 1.875000 ;
+      RECT 2.325000  1.875000 4.875000 2.085000 ;
+      RECT 2.335000  2.255000 2.735000 2.635000 ;
+      RECT 2.585000  0.255000 3.885000 0.485000 ;
+      RECT 2.955000  2.085000 4.875000 2.105000 ;
+      RECT 2.955000  2.105000 3.195000 2.465000 ;
+      RECT 3.515000  2.275000 3.845000 2.635000 ;
+      RECT 3.555000  0.485000 3.885000 0.615000 ;
+      RECT 3.555000  0.615000 5.835000 0.785000 ;
+      RECT 4.055000  0.085000 4.395000 0.445000 ;
+      RECT 4.495000  2.105000 4.875000 2.445000 ;
+      RECT 4.975000  0.085000 5.355000 0.445000 ;
+      RECT 5.455000  1.935000 5.865000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
index 14c2b09..5ab9fec 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_1.magic.lef
@@ -78,15 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.625000  0.085000 1.005000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -95,25 +86,31 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 0.090000 1.495000 0.410000 2.635000 ;
-        RECT 1.645000 1.835000 2.110000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.265000 0.380000 0.615000 ;
-      RECT 0.090000 0.615000 1.405000 0.785000 ;
-      RECT 1.175000 0.310000 1.405000 0.615000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.090000  0.265000 0.380000 0.615000 ;
+      RECT 0.090000  0.615000 1.405000 0.785000 ;
+      RECT 0.090000  1.495000 0.410000 2.635000 ;
+      RECT 0.625000  0.085000 1.005000 0.445000 ;
+      RECT 1.175000  0.310000 1.405000 0.615000 ;
+      RECT 1.645000  1.835000 2.110000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
index dbe9cd1..2e11fb5 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_2.magic.lef
@@ -79,19 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.665000  0.085000 0.835000 0.545000 ;
-        RECT 1.675000  0.085000 1.845000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -100,35 +87,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.105000 1.785000 0.435000 2.635000 ;
-        RECT 2.060000 2.175000 2.440000 2.635000 ;
-        RECT 3.280000 1.570000 3.530000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.255000 0.435000 0.715000 ;
-      RECT 0.105000 0.715000 2.465000 0.885000 ;
-      RECT 0.655000 1.785000 0.875000 2.295000 ;
-      RECT 0.655000 2.295000 1.865000 2.465000 ;
-      RECT 1.015000 0.255000 1.395000 0.715000 ;
-      RECT 1.675000 2.135000 1.865000 2.295000 ;
-      RECT 2.135000 0.255000 3.530000 0.425000 ;
-      RECT 2.135000 0.425000 2.465000 0.715000 ;
-      RECT 3.280000 0.425000 3.530000 0.595000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.105000  0.255000 0.435000 0.715000 ;
+      RECT 0.105000  0.715000 2.465000 0.885000 ;
+      RECT 0.105000  1.785000 0.435000 2.635000 ;
+      RECT 0.655000  1.785000 0.875000 2.295000 ;
+      RECT 0.655000  2.295000 1.865000 2.465000 ;
+      RECT 0.665000  0.085000 0.835000 0.545000 ;
+      RECT 1.015000  0.255000 1.395000 0.715000 ;
+      RECT 1.675000  0.085000 1.845000 0.545000 ;
+      RECT 1.675000  2.135000 1.865000 2.295000 ;
+      RECT 2.060000  2.175000 2.440000 2.635000 ;
+      RECT 2.135000  0.255000 3.530000 0.425000 ;
+      RECT 2.135000  0.425000 2.465000 0.715000 ;
+      RECT 3.280000  0.425000 3.530000 0.595000 ;
+      RECT 3.280000  1.570000 3.530000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
index 2aba00f..85b6f48 100644
--- a/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
+++ b/cells/o21ai/sky130_fd_sc_hdll__o21ai_4.magic.lef
@@ -84,27 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.550000  0.085000 0.930000 0.445000 ;
-        RECT 1.510000  0.085000 1.890000 0.445000 ;
-        RECT 2.470000  0.085000 2.850000 0.445000 ;
-        RECT 3.430000  0.085000 3.810000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -113,41 +92,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.120000 1.820000 0.405000 2.635000 ;
-        RECT 1.030000 2.255000 1.410000 2.635000 ;
-        RECT 4.030000 2.195000 4.310000 2.635000 ;
-        RECT 4.910000 2.255000 5.290000 2.635000 ;
-        RECT 5.870000 1.880000 6.250000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.120000 0.615000 4.260000 0.820000 ;
-      RECT 0.625000 1.915000 1.820000 2.085000 ;
-      RECT 0.625000 2.085000 0.860000 2.465000 ;
-      RECT 1.630000 2.085000 1.820000 2.275000 ;
-      RECT 1.630000 2.275000 3.810000 2.465000 ;
-      RECT 4.030000 0.255000 6.250000 0.445000 ;
-      RECT 4.030000 0.445000 4.260000 0.615000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.120000  0.615000 4.260000 0.820000 ;
+      RECT 0.120000  1.820000 0.405000 2.635000 ;
+      RECT 0.550000  0.085000 0.930000 0.445000 ;
+      RECT 0.625000  1.915000 1.820000 2.085000 ;
+      RECT 0.625000  2.085000 0.860000 2.465000 ;
+      RECT 1.030000  2.255000 1.410000 2.635000 ;
+      RECT 1.510000  0.085000 1.890000 0.445000 ;
+      RECT 1.630000  2.085000 1.820000 2.275000 ;
+      RECT 1.630000  2.275000 3.810000 2.465000 ;
+      RECT 2.470000  0.085000 2.850000 0.445000 ;
+      RECT 3.430000  0.085000 3.810000 0.445000 ;
+      RECT 4.030000  0.255000 6.250000 0.445000 ;
+      RECT 4.030000  0.445000 4.260000 0.615000 ;
+      RECT 4.030000  2.195000 4.310000 2.635000 ;
+      RECT 4.910000  2.255000 5.290000 2.635000 ;
+      RECT 5.870000  1.880000 6.250000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
index 87813aa..558c6d8 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_1.magic.lef
@@ -76,19 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.675000  0.085000 0.845000 0.825000 ;
-        RECT 2.830000  0.085000 3.000000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -97,39 +84,49 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.595000 2.205000 1.005000 2.635000 ;
-        RECT 1.770000 2.215000 2.100000 2.635000 ;
-        RECT 3.170000 1.535000 3.550000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.510000 0.995000 0.860000 1.325000 ;
-      RECT 0.645000 1.325000 0.860000 1.865000 ;
-      RECT 0.645000 1.865000 2.585000 2.035000 ;
-      RECT 1.075000 1.525000 1.720000 1.695000 ;
-      RECT 1.210000 0.450000 1.380000 0.655000 ;
-      RECT 1.210000 0.655000 1.720000 0.825000 ;
-      RECT 1.550000 0.825000 1.720000 1.525000 ;
-      RECT 1.890000 0.255000 2.060000 1.455000 ;
-      RECT 1.890000 1.455000 2.585000 1.865000 ;
-      RECT 2.280000 0.255000 2.610000 0.735000 ;
-      RECT 2.280000 0.735000 3.565000 0.905000 ;
-      RECT 2.280000 2.035000 2.585000 2.465000 ;
-      RECT 3.235000 0.270000 3.565000 0.735000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.510000  0.995000 0.860000 1.325000 ;
+      RECT 0.595000  2.205000 1.005000 2.635000 ;
+      RECT 0.645000  1.325000 0.860000 1.865000 ;
+      RECT 0.645000  1.865000 2.585000 2.035000 ;
+      RECT 0.675000  0.085000 0.845000 0.825000 ;
+      RECT 1.075000  1.525000 1.720000 1.695000 ;
+      RECT 1.210000  0.450000 1.380000 0.655000 ;
+      RECT 1.210000  0.655000 1.720000 0.825000 ;
+      RECT 1.550000  0.825000 1.720000 1.525000 ;
+      RECT 1.770000  2.215000 2.100000 2.635000 ;
+      RECT 1.890000  0.255000 2.060000 1.455000 ;
+      RECT 1.890000  1.455000 2.585000 1.865000 ;
+      RECT 2.280000  0.255000 2.610000 0.735000 ;
+      RECT 2.280000  0.735000 3.565000 0.905000 ;
+      RECT 2.280000  2.035000 2.585000 2.465000 ;
+      RECT 2.830000  0.085000 3.000000 0.555000 ;
+      RECT 3.170000  1.535000 3.550000 2.635000 ;
+      RECT 3.235000  0.270000 3.565000 0.735000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
index 79158d9..6c47a60 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_2.magic.lef
@@ -77,21 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.645000  0.085000 0.825000 0.825000 ;
-        RECT 1.560000  0.085000 1.925000 0.465000 ;
-        RECT 3.165000  0.085000 3.335000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -100,41 +85,53 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.520000 2.205000 0.960000 2.635000 ;
-        RECT 1.520000 2.205000 2.380000 2.635000 ;
-        RECT 3.450000 1.875000 3.830000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.430000 0.345000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.495000 ;
-      RECT 0.085000 1.495000 0.395000 1.865000 ;
-      RECT 0.085000 1.865000 2.085000 2.035000 ;
-      RECT 1.405000 0.655000 2.470000 0.825000 ;
-      RECT 1.405000 0.825000 1.575000 1.325000 ;
-      RECT 1.915000 0.995000 2.085000 1.865000 ;
-      RECT 2.140000 0.255000 2.470000 0.655000 ;
-      RECT 2.255000 0.825000 2.470000 1.455000 ;
-      RECT 2.255000 1.455000 2.925000 2.035000 ;
-      RECT 2.600000 2.035000 2.925000 2.465000 ;
-      RECT 2.695000 0.365000 2.945000 0.735000 ;
-      RECT 2.695000 0.735000 3.890000 0.905000 ;
-      RECT 3.555000 0.270000 3.890000 0.735000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.430000 0.345000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.495000 ;
+      RECT 0.085000  1.495000 0.395000 1.865000 ;
+      RECT 0.085000  1.865000 2.085000 2.035000 ;
+      RECT 0.520000  2.205000 0.960000 2.635000 ;
+      RECT 0.645000  0.085000 0.825000 0.825000 ;
+      RECT 1.405000  0.655000 2.470000 0.825000 ;
+      RECT 1.405000  0.825000 1.575000 1.325000 ;
+      RECT 1.520000  2.205000 2.380000 2.635000 ;
+      RECT 1.560000  0.085000 1.925000 0.465000 ;
+      RECT 1.915000  0.995000 2.085000 1.865000 ;
+      RECT 2.140000  0.255000 2.470000 0.655000 ;
+      RECT 2.255000  0.825000 2.470000 1.455000 ;
+      RECT 2.255000  1.455000 2.925000 2.035000 ;
+      RECT 2.600000  2.035000 2.925000 2.465000 ;
+      RECT 2.695000  0.365000 2.945000 0.735000 ;
+      RECT 2.695000  0.735000 3.890000 0.905000 ;
+      RECT 3.165000  0.085000 3.335000 0.555000 ;
+      RECT 3.450000  1.875000 3.830000 2.635000 ;
+      RECT 3.555000  0.270000 3.890000 0.735000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
index 954206f..6580903 100644
--- a/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
+++ b/cells/o21ba/sky130_fd_sc_hdll__o21ba_4.magic.lef
@@ -79,28 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.765000  0.085000 0.935000 0.905000 ;
-        RECT 1.705000  0.085000 1.875000 0.555000 ;
-        RECT 2.565000  0.085000 2.895000 0.475000 ;
-        RECT 4.625000  0.085000 4.795000 0.555000 ;
-        RECT 5.565000  0.085000 5.735000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -109,61 +87,80 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.635000 2.215000 1.015000 2.635000 ;
-        RECT 1.575000 2.215000 1.955000 2.635000 ;
-        RECT 2.515000 2.215000 2.895000 2.635000 ;
-        RECT 3.550000 2.135000 3.800000 2.635000 ;
-        RECT 5.435000 1.835000 5.815000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.265000 0.545000 0.855000 ;
-      RECT 0.085000 0.855000 0.255000 1.455000 ;
-      RECT 0.085000 1.455000 0.435000 1.875000 ;
-      RECT 0.085000 1.875000 2.815000 2.045000 ;
-      RECT 0.085000 2.045000 0.435000 2.465000 ;
-      RECT 1.875000 1.080000 2.815000 1.250000 ;
-      RECT 2.645000 0.645000 3.935000 0.895000 ;
-      RECT 2.645000 0.895000 2.815000 1.080000 ;
-      RECT 2.645000 1.445000 3.205000 1.615000 ;
-      RECT 2.645000 1.615000 2.815000 1.875000 ;
-      RECT 2.985000 1.075000 3.435000 1.245000 ;
-      RECT 2.985000 1.245000 3.205000 1.445000 ;
-      RECT 3.105000 0.255000 4.405000 0.475000 ;
-      RECT 3.115000 1.795000 4.830000 1.965000 ;
-      RECT 3.115000 1.965000 3.285000 2.465000 ;
-      RECT 3.745000 0.895000 3.935000 1.795000 ;
-      RECT 4.035000 2.135000 4.325000 2.295000 ;
-      RECT 4.035000 2.295000 5.265000 2.465000 ;
-      RECT 4.155000 0.475000 4.405000 0.725000 ;
-      RECT 4.155000 0.725000 6.310000 0.905000 ;
-      RECT 4.585000 1.445000 4.830000 1.795000 ;
-      RECT 4.585000 1.965000 4.830000 2.125000 ;
-      RECT 4.965000 0.255000 5.345000 0.725000 ;
-      RECT 5.095000 1.455000 6.310000 1.665000 ;
-      RECT 5.095000 1.665000 5.265000 2.295000 ;
-      RECT 5.905000 0.265000 6.310000 0.725000 ;
-      RECT 6.035000 1.665000 6.310000 2.465000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.085000  0.265000 0.545000 0.855000 ;
+      RECT 0.085000  0.855000 0.255000 1.455000 ;
+      RECT 0.085000  1.455000 0.435000 1.875000 ;
+      RECT 0.085000  1.875000 2.815000 2.045000 ;
+      RECT 0.085000  2.045000 0.435000 2.465000 ;
+      RECT 0.635000  2.215000 1.015000 2.635000 ;
+      RECT 0.765000  0.085000 0.935000 0.905000 ;
+      RECT 1.575000  2.215000 1.955000 2.635000 ;
+      RECT 1.705000  0.085000 1.875000 0.555000 ;
+      RECT 1.875000  1.080000 2.815000 1.250000 ;
+      RECT 2.515000  2.215000 2.895000 2.635000 ;
+      RECT 2.565000  0.085000 2.895000 0.475000 ;
+      RECT 2.645000  0.645000 3.935000 0.895000 ;
+      RECT 2.645000  0.895000 2.815000 1.080000 ;
+      RECT 2.645000  1.445000 3.205000 1.615000 ;
+      RECT 2.645000  1.615000 2.815000 1.875000 ;
+      RECT 2.985000  1.075000 3.435000 1.245000 ;
+      RECT 2.985000  1.245000 3.205000 1.445000 ;
+      RECT 3.105000  0.255000 4.405000 0.475000 ;
+      RECT 3.115000  1.795000 4.830000 1.965000 ;
+      RECT 3.115000  1.965000 3.285000 2.465000 ;
+      RECT 3.550000  2.135000 3.800000 2.635000 ;
+      RECT 3.745000  0.895000 3.935000 1.795000 ;
+      RECT 4.035000  2.135000 4.325000 2.295000 ;
+      RECT 4.035000  2.295000 5.265000 2.465000 ;
+      RECT 4.155000  0.475000 4.405000 0.725000 ;
+      RECT 4.155000  0.725000 6.310000 0.905000 ;
+      RECT 4.585000  1.445000 4.830000 1.795000 ;
+      RECT 4.585000  1.965000 4.830000 2.125000 ;
+      RECT 4.625000  0.085000 4.795000 0.555000 ;
+      RECT 4.965000  0.255000 5.345000 0.725000 ;
+      RECT 5.095000  1.455000 6.310000 1.665000 ;
+      RECT 5.095000  1.665000 5.265000 2.295000 ;
+      RECT 5.435000  1.835000 5.815000 2.635000 ;
+      RECT 5.565000  0.085000 5.735000 0.555000 ;
+      RECT 5.905000  0.265000 6.310000 0.725000 ;
+      RECT 6.035000  1.665000 6.310000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
index 8083f7f..aa1af82 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_1.magic.lef
@@ -77,18 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.085000  0.085000 0.360000 0.825000 ;
-        RECT 2.195000  0.085000 2.365000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -97,32 +85,41 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.070000 1.875000 1.400000 2.635000 ;
-        RECT 2.470000 1.535000 3.060000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.525000 1.535000 1.065000 1.705000 ;
-      RECT 0.525000 1.705000 0.850000 2.210000 ;
-      RECT 0.675000 0.495000 0.940000 0.825000 ;
-      RECT 0.770000 0.825000 0.940000 0.995000 ;
-      RECT 0.770000 0.995000 1.065000 1.535000 ;
-      RECT 1.640000 0.255000 1.970000 0.735000 ;
-      RECT 1.640000 0.735000 2.915000 0.905000 ;
-      RECT 2.535000 0.270000 2.915000 0.735000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.085000 0.360000 0.825000 ;
+      RECT 0.525000  1.535000 1.065000 1.705000 ;
+      RECT 0.525000  1.705000 0.850000 2.210000 ;
+      RECT 0.675000  0.495000 0.940000 0.825000 ;
+      RECT 0.770000  0.825000 0.940000 0.995000 ;
+      RECT 0.770000  0.995000 1.065000 1.535000 ;
+      RECT 1.070000  1.875000 1.400000 2.635000 ;
+      RECT 1.640000  0.255000 1.970000 0.735000 ;
+      RECT 1.640000  0.735000 2.915000 0.905000 ;
+      RECT 2.195000  0.085000 2.365000 0.555000 ;
+      RECT 2.470000  1.535000 3.060000 2.635000 ;
+      RECT 2.535000  0.270000 2.915000 0.735000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
index 4bd320f..83c251f 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_2.magic.lef
@@ -77,22 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.180000  0.085000 0.350000 0.825000 ;
-        RECT 2.695000  0.085000 2.865000 0.555000 ;
-        RECT 3.635000  0.085000 3.805000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -101,44 +85,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.635000 1.875000 0.965000 2.635000 ;
-        RECT 1.620000 1.795000 1.870000 2.635000 ;
-        RECT 3.505000 1.835000 3.885000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.180000 1.495000 0.915000 1.665000 ;
-      RECT 0.180000 1.665000 0.350000 1.915000 ;
-      RECT 0.650000 0.445000 0.820000 1.075000 ;
-      RECT 0.650000 1.075000 1.340000 1.245000 ;
-      RECT 0.650000 1.245000 0.915000 1.495000 ;
-      RECT 1.060000 0.255000 2.475000 0.475000 ;
-      RECT 1.060000 0.475000 1.340000 0.905000 ;
-      RECT 2.105000 1.795000 2.435000 2.295000 ;
-      RECT 2.105000 2.295000 3.335000 2.465000 ;
-      RECT 2.225000 0.475000 2.475000 0.725000 ;
-      RECT 2.225000 0.725000 4.380000 0.905000 ;
-      RECT 3.035000 0.255000 3.415000 0.725000 ;
-      RECT 3.165000 1.455000 4.380000 1.665000 ;
-      RECT 3.165000 1.665000 3.335000 2.295000 ;
-      RECT 3.975000 0.265000 4.380000 0.725000 ;
-      RECT 4.105000 1.665000 4.380000 2.465000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.180000  0.085000 0.350000 0.825000 ;
+      RECT 0.180000  1.495000 0.915000 1.665000 ;
+      RECT 0.180000  1.665000 0.350000 1.915000 ;
+      RECT 0.635000  1.875000 0.965000 2.635000 ;
+      RECT 0.650000  0.445000 0.820000 1.075000 ;
+      RECT 0.650000  1.075000 1.340000 1.245000 ;
+      RECT 0.650000  1.245000 0.915000 1.495000 ;
+      RECT 1.060000  0.255000 2.475000 0.475000 ;
+      RECT 1.060000  0.475000 1.340000 0.905000 ;
+      RECT 1.620000  1.795000 1.870000 2.635000 ;
+      RECT 2.105000  1.795000 2.435000 2.295000 ;
+      RECT 2.105000  2.295000 3.335000 2.465000 ;
+      RECT 2.225000  0.475000 2.475000 0.725000 ;
+      RECT 2.225000  0.725000 4.380000 0.905000 ;
+      RECT 2.695000  0.085000 2.865000 0.555000 ;
+      RECT 3.035000  0.255000 3.415000 0.725000 ;
+      RECT 3.165000  1.455000 4.380000 1.665000 ;
+      RECT 3.165000  1.665000 3.335000 2.295000 ;
+      RECT 3.505000  1.835000 3.885000 2.635000 ;
+      RECT 3.635000  0.085000 3.805000 0.555000 ;
+      RECT 3.975000  0.265000 4.380000 0.725000 ;
+      RECT 4.105000  1.665000 4.380000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
index 10aa7db..c7e3f12 100644
--- a/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
+++ b/cells/o21bai/sky130_fd_sc_hdll__o21bai_4.magic.lef
@@ -82,30 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.225000  0.085000 0.395000 0.895000 ;
-        RECT 3.615000  0.085000 3.785000 0.555000 ;
-        RECT 4.555000  0.085000 4.725000 0.555000 ;
-        RECT 5.495000  0.085000 5.665000 0.555000 ;
-        RECT 6.435000  0.085000 6.605000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -114,56 +90,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.695000 1.795000 0.865000 2.635000 ;
-        RECT 1.595000 1.795000 1.845000 2.635000 ;
-        RECT 2.535000 1.795000 2.785000 2.635000 ;
-        RECT 5.455000 1.795000 5.705000 2.635000 ;
-        RECT 6.395000 1.795000 6.645000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.145000 1.455000 0.850000 1.625000 ;
-      RECT 0.145000 1.625000 0.475000 2.435000 ;
-      RECT 0.565000 0.290000 0.945000 0.895000 ;
-      RECT 0.680000 0.895000 0.945000 1.075000 ;
-      RECT 0.680000 1.075000 2.525000 1.285000 ;
-      RECT 0.680000 1.285000 0.850000 1.455000 ;
-      RECT 1.180000 0.305000 3.395000 0.475000 ;
-      RECT 3.025000 1.795000 3.355000 2.295000 ;
-      RECT 3.025000 2.295000 5.235000 2.465000 ;
-      RECT 3.145000 0.475000 3.395000 0.725000 ;
-      RECT 3.145000 0.725000 7.155000 0.905000 ;
-      RECT 3.955000 0.255000 4.335000 0.725000 ;
-      RECT 4.045000 1.795000 4.295000 2.295000 ;
-      RECT 4.895000 0.255000 5.275000 0.725000 ;
-      RECT 4.985000 1.455000 7.115000 1.625000 ;
-      RECT 4.985000 1.625000 5.235000 2.295000 ;
-      RECT 5.835000 0.255000 6.215000 0.725000 ;
-      RECT 5.925000 1.625000 6.175000 2.465000 ;
-      RECT 6.775000 0.255000 7.155000 0.725000 ;
-      RECT 6.865000 1.625000 7.115000 2.465000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.145000  1.455000 0.850000 1.625000 ;
+      RECT 0.145000  1.625000 0.475000 2.435000 ;
+      RECT 0.225000  0.085000 0.395000 0.895000 ;
+      RECT 0.565000  0.290000 0.945000 0.895000 ;
+      RECT 0.680000  0.895000 0.945000 1.075000 ;
+      RECT 0.680000  1.075000 2.525000 1.285000 ;
+      RECT 0.680000  1.285000 0.850000 1.455000 ;
+      RECT 0.695000  1.795000 0.865000 2.635000 ;
+      RECT 1.180000  0.305000 3.395000 0.475000 ;
+      RECT 1.595000  1.795000 1.845000 2.635000 ;
+      RECT 2.535000  1.795000 2.785000 2.635000 ;
+      RECT 3.025000  1.795000 3.355000 2.295000 ;
+      RECT 3.025000  2.295000 5.235000 2.465000 ;
+      RECT 3.145000  0.475000 3.395000 0.725000 ;
+      RECT 3.145000  0.725000 7.155000 0.905000 ;
+      RECT 3.615000  0.085000 3.785000 0.555000 ;
+      RECT 3.955000  0.255000 4.335000 0.725000 ;
+      RECT 4.045000  1.795000 4.295000 2.295000 ;
+      RECT 4.555000  0.085000 4.725000 0.555000 ;
+      RECT 4.895000  0.255000 5.275000 0.725000 ;
+      RECT 4.985000  1.455000 7.115000 1.625000 ;
+      RECT 4.985000  1.625000 5.235000 2.295000 ;
+      RECT 5.455000  1.795000 5.705000 2.635000 ;
+      RECT 5.495000  0.085000 5.665000 0.555000 ;
+      RECT 5.835000  0.255000 6.215000 0.725000 ;
+      RECT 5.925000  1.625000 6.175000 2.465000 ;
+      RECT 6.395000  1.795000 6.645000 2.635000 ;
+      RECT 6.435000  0.085000 6.605000 0.555000 ;
+      RECT 6.775000  0.255000 7.155000 0.725000 ;
+      RECT 6.865000  1.625000 7.115000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
index 08ae7a4..e15aacd 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_1.magic.lef
@@ -95,20 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 2.085000  0.085000 2.425000 0.475000 ;
-        RECT 3.105000  0.085000 3.275000 0.640000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -117,41 +103,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.560000 2.085000 0.860000 2.635000 ;
-        RECT 2.915000 1.795000 3.295000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.455000 0.755000 1.495000 ;
-      RECT 0.085000 1.495000 1.235000 1.720000 ;
-      RECT 0.085000 1.720000 0.365000 2.465000 ;
-      RECT 0.170000 0.255000 0.500000 0.645000 ;
-      RECT 0.170000 0.645000 0.755000 0.825000 ;
-      RECT 0.585000 0.825000 0.755000 1.455000 ;
-      RECT 0.700000 0.305000 1.905000 0.475000 ;
-      RECT 1.030000 1.720000 1.235000 1.875000 ;
-      RECT 1.030000 1.875000 2.745000 2.045000 ;
-      RECT 1.035000 0.645000 2.935000 0.815000 ;
-      RECT 1.500000 2.045000 2.355000 2.465000 ;
-      RECT 2.575000 1.455000 3.545000 1.625000 ;
-      RECT 2.575000 1.625000 2.745000 1.875000 ;
-      RECT 2.605000 0.270000 2.935000 0.645000 ;
-      RECT 3.375000 0.995000 3.545000 1.455000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  1.455000 0.755000 1.495000 ;
+      RECT 0.085000  1.495000 1.235000 1.720000 ;
+      RECT 0.085000  1.720000 0.365000 2.465000 ;
+      RECT 0.170000  0.255000 0.500000 0.645000 ;
+      RECT 0.170000  0.645000 0.755000 0.825000 ;
+      RECT 0.560000  2.085000 0.860000 2.635000 ;
+      RECT 0.585000  0.825000 0.755000 1.455000 ;
+      RECT 0.700000  0.305000 1.905000 0.475000 ;
+      RECT 1.030000  1.720000 1.235000 1.875000 ;
+      RECT 1.030000  1.875000 2.745000 2.045000 ;
+      RECT 1.035000  0.645000 2.935000 0.815000 ;
+      RECT 1.500000  2.045000 2.355000 2.465000 ;
+      RECT 2.085000  0.085000 2.425000 0.475000 ;
+      RECT 2.575000  1.455000 3.545000 1.625000 ;
+      RECT 2.575000  1.625000 2.745000 1.875000 ;
+      RECT 2.605000  0.270000 2.935000 0.645000 ;
+      RECT 2.915000  1.795000 3.295000 2.635000 ;
+      RECT 3.105000  0.085000 3.275000 0.640000 ;
+      RECT 3.375000  0.995000 3.545000 1.455000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
index 8793783..e624273 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_2.magic.lef
@@ -96,22 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 2.265000  0.085000 2.435000 0.555000 ;
-        RECT 3.205000  0.085000 3.375000 0.905000 ;
-        RECT 4.145000  0.085000 4.315000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -120,45 +104,58 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.800000 1.850000 1.010000 2.635000 ;
-        RECT 3.145000 1.795000 3.375000 2.635000 ;
-        RECT 4.015000 2.215000 4.405000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.170000 0.255000 0.500000 0.635000 ;
-      RECT 0.170000 0.635000 0.765000 0.805000 ;
-      RECT 0.250000 1.495000 1.350000 1.670000 ;
-      RECT 0.250000 1.670000 0.580000 2.465000 ;
-      RECT 0.545000 0.805000 0.765000 1.445000 ;
-      RECT 0.545000 1.445000 1.350000 1.495000 ;
-      RECT 0.670000 0.295000 2.005000 0.465000 ;
-      RECT 1.135000 0.645000 1.570000 0.735000 ;
-      RECT 1.135000 0.735000 2.985000 0.905000 ;
-      RECT 1.180000 1.670000 1.350000 1.875000 ;
-      RECT 1.180000 1.875000 2.965000 2.045000 ;
-      RECT 1.700000 2.045000 2.455000 2.465000 ;
-      RECT 2.605000 0.270000 2.985000 0.735000 ;
-      RECT 2.795000 1.455000 3.715000 1.625000 ;
-      RECT 2.795000 1.625000 2.965000 1.875000 ;
-      RECT 3.495000 1.075000 3.875000 1.285000 ;
-      RECT 3.495000 1.285000 3.715000 1.455000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.170000  0.255000 0.500000 0.635000 ;
+      RECT 0.170000  0.635000 0.765000 0.805000 ;
+      RECT 0.250000  1.495000 1.350000 1.670000 ;
+      RECT 0.250000  1.670000 0.580000 2.465000 ;
+      RECT 0.545000  0.805000 0.765000 1.445000 ;
+      RECT 0.545000  1.445000 1.350000 1.495000 ;
+      RECT 0.670000  0.295000 2.005000 0.465000 ;
+      RECT 0.800000  1.850000 1.010000 2.635000 ;
+      RECT 1.135000  0.645000 1.570000 0.735000 ;
+      RECT 1.135000  0.735000 2.985000 0.905000 ;
+      RECT 1.180000  1.670000 1.350000 1.875000 ;
+      RECT 1.180000  1.875000 2.965000 2.045000 ;
+      RECT 1.700000  2.045000 2.455000 2.465000 ;
+      RECT 2.265000  0.085000 2.435000 0.555000 ;
+      RECT 2.605000  0.270000 2.985000 0.735000 ;
+      RECT 2.795000  1.455000 3.715000 1.625000 ;
+      RECT 2.795000  1.625000 2.965000 1.875000 ;
+      RECT 3.145000  1.795000 3.375000 2.635000 ;
+      RECT 3.205000  0.085000 3.375000 0.905000 ;
+      RECT 3.495000  1.075000 3.875000 1.285000 ;
+      RECT 3.495000  1.285000 3.715000 1.455000 ;
+      RECT 4.015000  2.215000 4.405000 2.635000 ;
+      RECT 4.145000  0.085000 4.315000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
index cbe8492..31d2d52 100644
--- a/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
+++ b/cells/o221a/sky130_fd_sc_hdll__o221a_4.magic.lef
@@ -106,31 +106,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 3.435000  0.085000 3.765000 0.465000 ;
-        RECT 4.455000  0.085000 4.625000 0.555000 ;
-        RECT 5.395000  0.085000 5.565000 0.905000 ;
-        RECT 6.335000  0.085000 6.505000 0.555000 ;
-        RECT 7.275000  0.085000 7.530000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -139,59 +114,81 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.145000 1.455000 0.395000 2.635000 ;
-        RECT 1.085000 2.125000 1.335000 2.635000 ;
-        RECT 2.965000 2.125000 3.725000 2.635000 ;
-        RECT 5.355000 2.125000 5.605000 2.635000 ;
-        RECT 6.295000 2.125000 6.545000 2.635000 ;
-        RECT 7.235000 1.795000 7.485000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 3.255000 0.475000 ;
-      RECT 0.085000 0.475000 0.345000 0.895000 ;
-      RECT 0.515000 0.645000 0.895000 0.865000 ;
-      RECT 0.615000 0.865000 0.895000 1.785000 ;
-      RECT 0.615000 1.785000 5.645000 1.955000 ;
-      RECT 0.615000 1.955000 0.865000 2.465000 ;
-      RECT 1.115000 0.475000 1.285000 0.905000 ;
-      RECT 1.455000 0.645000 4.235000 0.725000 ;
-      RECT 1.455000 0.725000 5.175000 0.905000 ;
-      RECT 1.555000 2.125000 1.805000 2.295000 ;
-      RECT 1.555000 2.295000 2.745000 2.465000 ;
-      RECT 2.495000 2.125000 2.745000 2.295000 ;
-      RECT 3.945000 2.125000 4.195000 2.295000 ;
-      RECT 3.945000 2.295000 5.135000 2.465000 ;
-      RECT 3.985000 0.255000 4.235000 0.645000 ;
-      RECT 4.795000 0.255000 5.175000 0.725000 ;
-      RECT 4.885000 2.125000 5.135000 2.295000 ;
-      RECT 5.475000 1.445000 5.925000 1.615000 ;
-      RECT 5.475000 1.615000 5.645000 1.785000 ;
-      RECT 5.705000 1.075000 7.055000 1.275000 ;
-      RECT 5.705000 1.275000 5.925000 1.445000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.085000  0.255000 3.255000 0.475000 ;
+      RECT 0.085000  0.475000 0.345000 0.895000 ;
+      RECT 0.145000  1.455000 0.395000 2.635000 ;
+      RECT 0.515000  0.645000 0.895000 0.865000 ;
+      RECT 0.615000  0.865000 0.895000 1.785000 ;
+      RECT 0.615000  1.785000 5.645000 1.955000 ;
+      RECT 0.615000  1.955000 0.865000 2.465000 ;
+      RECT 1.085000  2.125000 1.335000 2.635000 ;
+      RECT 1.115000  0.475000 1.285000 0.905000 ;
+      RECT 1.455000  0.645000 4.235000 0.725000 ;
+      RECT 1.455000  0.725000 5.175000 0.905000 ;
+      RECT 1.555000  2.125000 1.805000 2.295000 ;
+      RECT 1.555000  2.295000 2.745000 2.465000 ;
+      RECT 2.495000  2.125000 2.745000 2.295000 ;
+      RECT 2.965000  2.125000 3.725000 2.635000 ;
+      RECT 3.435000  0.085000 3.765000 0.465000 ;
+      RECT 3.945000  2.125000 4.195000 2.295000 ;
+      RECT 3.945000  2.295000 5.135000 2.465000 ;
+      RECT 3.985000  0.255000 4.235000 0.645000 ;
+      RECT 4.455000  0.085000 4.625000 0.555000 ;
+      RECT 4.795000  0.255000 5.175000 0.725000 ;
+      RECT 4.885000  2.125000 5.135000 2.295000 ;
+      RECT 5.355000  2.125000 5.605000 2.635000 ;
+      RECT 5.395000  0.085000 5.565000 0.905000 ;
+      RECT 5.475000  1.445000 5.925000 1.615000 ;
+      RECT 5.475000  1.615000 5.645000 1.785000 ;
+      RECT 5.705000  1.075000 7.055000 1.275000 ;
+      RECT 5.705000  1.275000 5.925000 1.445000 ;
+      RECT 6.295000  2.125000 6.545000 2.635000 ;
+      RECT 6.335000  0.085000 6.505000 0.555000 ;
+      RECT 7.235000  1.795000 7.485000 2.635000 ;
+      RECT 7.275000  0.085000 7.530000 0.565000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
index 14f01cf..8fe25db 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_1.magic.lef
@@ -101,18 +101,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 2.845000  0.085000 3.015000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -121,31 +109,40 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.600000 1.875000 1.580000 2.635000 ;
-        RECT 3.315000 1.455000 3.575000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.305000 2.065000 0.475000 ;
-      RECT 1.250000 0.645000 2.560000 0.695000 ;
-      RECT 1.250000 0.695000 3.575000 0.825000 ;
-      RECT 2.285000 0.280000 2.560000 0.645000 ;
-      RECT 2.445000 0.825000 3.575000 0.865000 ;
-      RECT 3.185000 0.280000 3.575000 0.695000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.515000  0.305000 2.065000 0.475000 ;
+      RECT 0.600000  1.875000 1.580000 2.635000 ;
+      RECT 1.250000  0.645000 2.560000 0.695000 ;
+      RECT 1.250000  0.695000 3.575000 0.825000 ;
+      RECT 2.285000  0.280000 2.560000 0.645000 ;
+      RECT 2.445000  0.825000 3.575000 0.865000 ;
+      RECT 2.845000  0.085000 3.015000 0.525000 ;
+      RECT 3.185000  0.280000 3.575000 0.695000 ;
+      RECT 3.315000  1.455000 3.575000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
index 4b6a3e0..2a3489a 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_2.magic.lef
@@ -103,24 +103,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 4.070000  0.085000 4.240000 0.555000 ;
-        RECT 5.010000  0.085000 5.180000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -129,48 +111,63 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.140000 1.455000 0.390000 2.635000 ;
-        RECT 1.080000 2.125000 1.850000 2.635000 ;
-        RECT 3.480000 2.125000 3.810000 2.635000 ;
-        RECT 5.485000 1.455000 5.690000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.255000 1.370000 0.475000 ;
-      RECT 0.100000 0.475000 0.350000 0.895000 ;
-      RECT 1.120000 0.475000 1.370000 0.645000 ;
-      RECT 1.120000 0.645000 3.300000 0.905000 ;
-      RECT 1.560000 0.255000 3.850000 0.475000 ;
-      RECT 2.070000 2.125000 2.320000 2.295000 ;
-      RECT 2.070000 2.295000 3.260000 2.465000 ;
-      RECT 3.010000 2.125000 3.260000 2.295000 ;
-      RECT 3.520000 0.475000 3.850000 0.735000 ;
-      RECT 3.520000 0.735000 5.730000 0.905000 ;
-      RECT 4.030000 2.125000 4.280000 2.295000 ;
-      RECT 4.030000 2.295000 5.220000 2.465000 ;
-      RECT 4.410000 0.255000 4.790000 0.725000 ;
-      RECT 4.410000 0.725000 5.730000 0.735000 ;
-      RECT 4.970000 1.785000 5.220000 2.295000 ;
-      RECT 5.350000 0.255000 5.730000 0.725000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.100000  0.255000 1.370000 0.475000 ;
+      RECT 0.100000  0.475000 0.350000 0.895000 ;
+      RECT 0.140000  1.455000 0.390000 2.635000 ;
+      RECT 1.080000  2.125000 1.850000 2.635000 ;
+      RECT 1.120000  0.475000 1.370000 0.645000 ;
+      RECT 1.120000  0.645000 3.300000 0.905000 ;
+      RECT 1.560000  0.255000 3.850000 0.475000 ;
+      RECT 2.070000  2.125000 2.320000 2.295000 ;
+      RECT 2.070000  2.295000 3.260000 2.465000 ;
+      RECT 3.010000  2.125000 3.260000 2.295000 ;
+      RECT 3.480000  2.125000 3.810000 2.635000 ;
+      RECT 3.520000  0.475000 3.850000 0.735000 ;
+      RECT 3.520000  0.735000 5.730000 0.905000 ;
+      RECT 4.030000  2.125000 4.280000 2.295000 ;
+      RECT 4.030000  2.295000 5.220000 2.465000 ;
+      RECT 4.070000  0.085000 4.240000 0.555000 ;
+      RECT 4.410000  0.255000 4.790000 0.725000 ;
+      RECT 4.410000  0.725000 5.730000 0.735000 ;
+      RECT 4.970000  1.785000 5.220000 2.295000 ;
+      RECT 5.010000  0.085000 5.180000 0.555000 ;
+      RECT 5.350000  0.255000 5.730000 0.725000 ;
+      RECT 5.485000  1.455000 5.690000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
index 6adf15a..f0bc7a1 100644
--- a/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
+++ b/cells/o221ai/sky130_fd_sc_hdll__o221ai_4.magic.lef
@@ -105,36 +105,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.580000 0.085000 ;
-        RECT 6.905000  0.085000  7.075000 0.555000 ;
-        RECT 7.845000  0.085000  8.015000 0.555000 ;
-        RECT 8.785000  0.085000  8.955000 0.555000 ;
-        RECT 9.725000  0.085000  9.895000 0.555000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
@@ -143,66 +113,93 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 10.580000 2.805000 ;
-        RECT  0.155000 1.485000  0.405000 2.635000 ;
-        RECT  1.095000 1.825000  1.345000 2.635000 ;
-        RECT  2.035000 2.125000  2.805000 2.635000 ;
-        RECT  3.495000 2.125000  3.745000 2.635000 ;
-        RECT  6.355000 2.175000  6.605000 2.635000 ;
-        RECT  9.215000 2.125000  9.465000 2.635000 ;
-        RECT 10.155000 1.445000 10.405000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.115000 0.255000  6.135000 0.475000 ;
-      RECT  0.115000 0.475000  0.365000 0.895000 ;
-      RECT  2.515000 0.645000  6.685000 0.735000 ;
-      RECT  2.515000 0.735000 10.445000 0.820000 ;
-      RECT  3.025000 1.785000  4.175000 1.955000 ;
-      RECT  3.025000 1.955000  3.275000 2.465000 ;
-      RECT  3.965000 1.955000  4.175000 2.265000 ;
-      RECT  3.965000 2.265000  6.135000 2.465000 ;
-      RECT  6.015000 0.820000 10.445000 0.905000 ;
-      RECT  6.355000 0.255000  6.685000 0.645000 ;
-      RECT  6.775000 2.265000  8.995000 2.465000 ;
-      RECT  7.245000 0.255000  7.625000 0.725000 ;
-      RECT  7.245000 0.725000  8.565000 0.735000 ;
-      RECT  8.185000 0.255000  8.565000 0.725000 ;
-      RECT  8.785000 1.785000  9.935000 1.955000 ;
-      RECT  8.785000 1.955000  8.995000 2.265000 ;
-      RECT  9.125000 0.255000  9.505000 0.725000 ;
-      RECT  9.125000 0.725000 10.445000 0.735000 ;
-      RECT  9.685000 1.445000  9.935000 1.785000 ;
-      RECT  9.685000 1.955000  9.935000 2.465000 ;
-      RECT 10.065000 0.255000 10.445000 0.725000 ;
+      RECT  0.000000 -0.085000 10.580000 0.085000 ;
+      RECT  0.000000  2.635000 10.580000 2.805000 ;
+      RECT  0.115000  0.255000  6.135000 0.475000 ;
+      RECT  0.115000  0.475000  0.365000 0.895000 ;
+      RECT  0.155000  1.485000  0.405000 2.635000 ;
+      RECT  1.095000  1.825000  1.345000 2.635000 ;
+      RECT  2.035000  2.125000  2.805000 2.635000 ;
+      RECT  2.515000  0.645000  6.685000 0.735000 ;
+      RECT  2.515000  0.735000 10.445000 0.820000 ;
+      RECT  3.025000  1.785000  4.175000 1.955000 ;
+      RECT  3.025000  1.955000  3.275000 2.465000 ;
+      RECT  3.495000  2.125000  3.745000 2.635000 ;
+      RECT  3.965000  1.955000  4.175000 2.265000 ;
+      RECT  3.965000  2.265000  6.135000 2.465000 ;
+      RECT  6.015000  0.820000 10.445000 0.905000 ;
+      RECT  6.355000  0.255000  6.685000 0.645000 ;
+      RECT  6.355000  2.175000  6.605000 2.635000 ;
+      RECT  6.775000  2.265000  8.995000 2.465000 ;
+      RECT  6.905000  0.085000  7.075000 0.555000 ;
+      RECT  7.245000  0.255000  7.625000 0.725000 ;
+      RECT  7.245000  0.725000  8.565000 0.735000 ;
+      RECT  7.845000  0.085000  8.015000 0.555000 ;
+      RECT  8.185000  0.255000  8.565000 0.725000 ;
+      RECT  8.785000  0.085000  8.955000 0.555000 ;
+      RECT  8.785000  1.785000  9.935000 1.955000 ;
+      RECT  8.785000  1.955000  8.995000 2.265000 ;
+      RECT  9.125000  0.255000  9.505000 0.725000 ;
+      RECT  9.125000  0.725000 10.445000 0.735000 ;
+      RECT  9.215000  2.125000  9.465000 2.635000 ;
+      RECT  9.685000  1.445000  9.935000 1.785000 ;
+      RECT  9.685000  1.955000  9.935000 2.465000 ;
+      RECT  9.725000  0.085000  9.895000 0.555000 ;
+      RECT 10.065000  0.255000 10.445000 0.725000 ;
+      RECT 10.155000  1.445000 10.405000 2.635000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
index 0e18494..809729f 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_1.magic.lef
@@ -84,19 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.615000  0.085000 0.785000 0.545000 ;
-        RECT 2.625000  0.085000 2.795000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -105,34 +92,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.605000 1.875000 1.360000 2.635000 ;
-        RECT 2.985000 1.455000 3.540000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 0.715000 1.805000 0.895000 ;
-      RECT 0.535000 0.895000 0.860000 1.495000 ;
-      RECT 0.535000 1.495000 2.275000 1.705000 ;
-      RECT 1.055000 0.295000 2.395000 0.475000 ;
-      RECT 1.440000 0.645000 1.805000 0.715000 ;
-      RECT 1.805000 1.705000 2.275000 2.465000 ;
-      RECT 2.065000 0.475000 2.395000 0.695000 ;
-      RECT 2.065000 0.695000 3.355000 0.865000 ;
-      RECT 2.965000 0.280000 3.355000 0.695000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.535000  0.715000 1.805000 0.895000 ;
+      RECT 0.535000  0.895000 0.860000 1.495000 ;
+      RECT 0.535000  1.495000 2.275000 1.705000 ;
+      RECT 0.605000  1.875000 1.360000 2.635000 ;
+      RECT 0.615000  0.085000 0.785000 0.545000 ;
+      RECT 1.055000  0.295000 2.395000 0.475000 ;
+      RECT 1.440000  0.645000 1.805000 0.715000 ;
+      RECT 1.805000  1.705000 2.275000 2.465000 ;
+      RECT 2.065000  0.475000 2.395000 0.695000 ;
+      RECT 2.065000  0.695000 3.355000 0.865000 ;
+      RECT 2.625000  0.085000 2.795000 0.525000 ;
+      RECT 2.965000  0.280000 3.355000 0.695000 ;
+      RECT 2.985000  1.455000 3.540000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
index eeacc08..bd337a3 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_2.magic.lef
@@ -84,21 +84,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.185000  0.085000 0.355000 0.885000 ;
-        RECT 1.125000  0.085000 1.305000 0.545000 ;
-        RECT 3.195000  0.085000 3.365000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -107,36 +92,48 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.115000 1.445000 0.365000 2.635000 ;
-        RECT 1.095000 1.875000 1.895000 2.635000 ;
-        RECT 3.570000 1.795000 3.890000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.075000 0.715000 2.365000 0.895000 ;
-      RECT 1.075000 0.895000 1.355000 1.455000 ;
-      RECT 1.075000 1.455000 2.695000 1.705000 ;
-      RECT 1.565000 0.295000 2.930000 0.475000 ;
-      RECT 1.950000 0.645000 2.365000 0.715000 ;
-      RECT 2.340000 1.705000 2.695000 2.465000 ;
-      RECT 2.590000 0.475000 2.930000 0.695000 ;
-      RECT 2.590000 0.695000 3.890000 0.865000 ;
-      RECT 3.555000 0.280000 3.890000 0.695000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.115000  1.445000 0.365000 2.635000 ;
+      RECT 0.185000  0.085000 0.355000 0.885000 ;
+      RECT 1.075000  0.715000 2.365000 0.895000 ;
+      RECT 1.075000  0.895000 1.355000 1.455000 ;
+      RECT 1.075000  1.455000 2.695000 1.705000 ;
+      RECT 1.095000  1.875000 1.895000 2.635000 ;
+      RECT 1.125000  0.085000 1.305000 0.545000 ;
+      RECT 1.565000  0.295000 2.930000 0.475000 ;
+      RECT 1.950000  0.645000 2.365000 0.715000 ;
+      RECT 2.340000  1.705000 2.695000 2.465000 ;
+      RECT 2.590000  0.475000 2.930000 0.695000 ;
+      RECT 2.590000  0.695000 3.890000 0.865000 ;
+      RECT 3.195000  0.085000 3.365000 0.525000 ;
+      RECT 3.555000  0.280000 3.890000 0.695000 ;
+      RECT 3.570000  1.795000 3.890000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
index acfd2da..e18ce0e 100644
--- a/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
+++ b/cells/o22a/sky130_fd_sc_hdll__o22a_4.magic.lef
@@ -94,29 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.260000  0.085000 0.430000 0.555000 ;
-        RECT 1.200000  0.085000 1.370000 0.555000 ;
-        RECT 2.140000  0.085000 2.310000 0.555000 ;
-        RECT 5.090000  0.085000 5.260000 0.555000 ;
-        RECT 6.030000  0.085000 6.200000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -125,55 +102,75 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.220000 1.825000 0.470000 2.635000 ;
-        RECT 1.160000 1.795000 1.410000 2.635000 ;
-        RECT 2.100000 2.125000 2.870000 2.635000 ;
-        RECT 4.500000 2.125000 4.830000 2.635000 ;
-        RECT 6.505000 1.455000 6.710000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.540000 1.075000 2.430000 1.275000 ;
-      RECT 2.100000 1.275000 2.430000 1.785000 ;
-      RECT 2.100000 1.785000 5.770000 1.955000 ;
-      RECT 2.140000 0.735000 4.320000 0.905000 ;
-      RECT 2.140000 0.905000 2.430000 1.075000 ;
-      RECT 2.580000 0.255000 4.870000 0.475000 ;
-      RECT 2.615000 0.645000 4.320000 0.735000 ;
-      RECT 3.090000 2.125000 3.340000 2.295000 ;
-      RECT 3.090000 2.295000 4.280000 2.465000 ;
-      RECT 3.560000 1.955000 3.810000 2.125000 ;
-      RECT 4.030000 2.125000 4.280000 2.295000 ;
-      RECT 4.540000 0.475000 4.870000 0.735000 ;
-      RECT 4.540000 0.735000 6.750000 0.905000 ;
-      RECT 5.050000 2.125000 5.300000 2.295000 ;
-      RECT 5.050000 2.295000 6.240000 2.465000 ;
-      RECT 5.430000 0.255000 5.810000 0.725000 ;
-      RECT 5.430000 0.725000 6.750000 0.735000 ;
-      RECT 5.520000 1.955000 5.770000 2.125000 ;
-      RECT 5.990000 1.785000 6.240000 2.295000 ;
-      RECT 6.370000 0.255000 6.750000 0.725000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.220000  1.825000 0.470000 2.635000 ;
+      RECT 0.260000  0.085000 0.430000 0.555000 ;
+      RECT 0.540000  1.075000 2.430000 1.275000 ;
+      RECT 1.160000  1.795000 1.410000 2.635000 ;
+      RECT 1.200000  0.085000 1.370000 0.555000 ;
+      RECT 2.100000  1.275000 2.430000 1.785000 ;
+      RECT 2.100000  1.785000 5.770000 1.955000 ;
+      RECT 2.100000  2.125000 2.870000 2.635000 ;
+      RECT 2.140000  0.085000 2.310000 0.555000 ;
+      RECT 2.140000  0.735000 4.320000 0.905000 ;
+      RECT 2.140000  0.905000 2.430000 1.075000 ;
+      RECT 2.580000  0.255000 4.870000 0.475000 ;
+      RECT 2.615000  0.645000 4.320000 0.735000 ;
+      RECT 3.090000  2.125000 3.340000 2.295000 ;
+      RECT 3.090000  2.295000 4.280000 2.465000 ;
+      RECT 3.560000  1.955000 3.810000 2.125000 ;
+      RECT 4.030000  2.125000 4.280000 2.295000 ;
+      RECT 4.500000  2.125000 4.830000 2.635000 ;
+      RECT 4.540000  0.475000 4.870000 0.735000 ;
+      RECT 4.540000  0.735000 6.750000 0.905000 ;
+      RECT 5.050000  2.125000 5.300000 2.295000 ;
+      RECT 5.050000  2.295000 6.240000 2.465000 ;
+      RECT 5.090000  0.085000 5.260000 0.555000 ;
+      RECT 5.430000  0.255000 5.810000 0.725000 ;
+      RECT 5.430000  0.725000 6.750000 0.735000 ;
+      RECT 5.520000  1.955000 5.770000 2.125000 ;
+      RECT 5.990000  1.785000 6.240000 2.295000 ;
+      RECT 6.030000  0.085000 6.200000 0.555000 ;
+      RECT 6.370000  0.255000 6.750000 0.725000 ;
+      RECT 6.505000  1.455000 6.710000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
index cab726a..c935091 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_1.magic.lef
@@ -89,16 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 1.890000  0.085000 2.060000 0.525000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -107,28 +97,35 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 0.135000 2.175000 0.345000 2.635000 ;
-        RECT 2.340000 1.455000 2.660000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.295000 1.620000 0.475000 ;
-      RECT 1.290000 0.475000 1.620000 0.695000 ;
-      RECT 1.290000 0.695000 2.660000 0.825000 ;
-      RECT 1.460000 0.825000 2.660000 0.865000 ;
-      RECT 2.270000 0.280000 2.660000 0.695000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.085000  0.295000 1.620000 0.475000 ;
+      RECT 0.135000  2.175000 0.345000 2.635000 ;
+      RECT 1.290000  0.475000 1.620000 0.695000 ;
+      RECT 1.290000  0.695000 2.660000 0.825000 ;
+      RECT 1.460000  0.825000 2.660000 0.865000 ;
+      RECT 1.890000  0.085000 2.060000 0.525000 ;
+      RECT 2.270000  0.280000 2.660000 0.695000 ;
+      RECT 2.340000  1.455000 2.660000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
index 646de47..568e335 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_2.magic.lef
@@ -87,22 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 3.155000  0.085000 3.325000 0.555000 ;
-        RECT 4.045000  0.085000 4.215000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -111,44 +95,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.625000 1.795000 0.875000 2.635000 ;
-        RECT 4.005000 1.795000 4.255000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.305000 2.985000 0.475000 ;
-      RECT 0.090000 0.475000 0.365000 0.905000 ;
-      RECT 0.150000 1.455000 1.345000 1.625000 ;
-      RECT 0.150000 1.625000 0.405000 2.465000 ;
-      RECT 1.095000 1.625000 1.345000 2.295000 ;
-      RECT 1.095000 2.295000 2.285000 2.465000 ;
-      RECT 2.035000 1.795000 2.285000 2.295000 ;
-      RECT 2.595000 1.795000 2.845000 2.295000 ;
-      RECT 2.595000 2.295000 3.785000 2.465000 ;
-      RECT 2.815000 0.475000 2.985000 0.725000 ;
-      RECT 2.815000 0.725000 4.765000 0.905000 ;
-      RECT 3.495000 0.255000 3.825000 0.725000 ;
-      RECT 3.535000 1.455000 4.730000 1.625000 ;
-      RECT 3.535000 1.625000 3.785000 2.295000 ;
-      RECT 4.385000 0.255000 4.765000 0.725000 ;
-      RECT 4.475000 1.625000 4.730000 2.465000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.090000  0.305000 2.985000 0.475000 ;
+      RECT 0.090000  0.475000 0.365000 0.905000 ;
+      RECT 0.150000  1.455000 1.345000 1.625000 ;
+      RECT 0.150000  1.625000 0.405000 2.465000 ;
+      RECT 0.625000  1.795000 0.875000 2.635000 ;
+      RECT 1.095000  1.625000 1.345000 2.295000 ;
+      RECT 1.095000  2.295000 2.285000 2.465000 ;
+      RECT 2.035000  1.795000 2.285000 2.295000 ;
+      RECT 2.595000  1.795000 2.845000 2.295000 ;
+      RECT 2.595000  2.295000 3.785000 2.465000 ;
+      RECT 2.815000  0.475000 2.985000 0.725000 ;
+      RECT 2.815000  0.725000 4.765000 0.905000 ;
+      RECT 3.155000  0.085000 3.325000 0.555000 ;
+      RECT 3.495000  0.255000 3.825000 0.725000 ;
+      RECT 3.535000  1.455000 4.730000 1.625000 ;
+      RECT 3.535000  1.625000 3.785000 2.295000 ;
+      RECT 4.005000  1.795000 4.255000 2.635000 ;
+      RECT 4.045000  0.085000 4.215000 0.555000 ;
+      RECT 4.385000  0.255000 4.765000 0.725000 ;
+      RECT 4.475000  1.625000 4.730000 2.465000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
index 9dffe6d..772ba52 100644
--- a/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
+++ b/cells/o22ai/sky130_fd_sc_hdll__o22ai_4.magic.lef
@@ -98,31 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.280000 0.085000 ;
-        RECT 0.675000  0.085000 0.845000 0.555000 ;
-        RECT 1.615000  0.085000 1.785000 0.555000 ;
-        RECT 2.555000  0.085000 2.725000 0.555000 ;
-        RECT 3.495000  0.085000 3.665000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.280000 0.240000 ;
     END
@@ -131,61 +106,83 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.280000 2.805000 ;
-        RECT 0.165000 1.445000 0.415000 2.635000 ;
-        RECT 1.105000 2.125000 1.355000 2.635000 ;
-        RECT 3.965000 2.125000 4.185000 2.635000 ;
-        RECT 4.925000 2.125000 5.165000 2.635000 ;
-        RECT 7.735000 2.125000 8.015000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.280000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.125000 0.255000 0.455000 0.725000 ;
-      RECT 0.125000 0.725000 1.395000 0.735000 ;
-      RECT 0.125000 0.735000 4.185000 0.905000 ;
-      RECT 0.635000 1.445000 0.885000 1.785000 ;
-      RECT 0.635000 1.785000 1.785000 1.955000 ;
-      RECT 0.635000 1.955000 0.885000 2.465000 ;
-      RECT 1.015000 0.255000 1.395000 0.725000 ;
-      RECT 1.575000 1.955000 1.785000 2.295000 ;
-      RECT 1.575000 2.295000 3.745000 2.465000 ;
-      RECT 1.955000 0.255000 2.335000 0.725000 ;
-      RECT 1.955000 0.725000 3.275000 0.735000 ;
-      RECT 2.515000 2.125000 2.765000 2.295000 ;
-      RECT 2.895000 0.255000 3.275000 0.725000 ;
-      RECT 3.455000 2.125000 3.745000 2.295000 ;
-      RECT 3.835000 0.255000 8.045000 0.475000 ;
-      RECT 3.835000 0.475000 4.185000 0.735000 ;
-      RECT 4.355000 2.125000 4.710000 2.465000 ;
-      RECT 4.540000 1.785000 5.635000 1.955000 ;
-      RECT 4.540000 1.955000 4.710000 2.125000 ;
-      RECT 5.385000 1.955000 5.635000 2.295000 ;
-      RECT 5.385000 2.295000 7.515000 2.465000 ;
-      RECT 6.325000 2.125000 6.575000 2.295000 ;
-      RECT 7.265000 2.135000 7.515000 2.295000 ;
+      RECT 0.000000 -0.085000 8.280000 0.085000 ;
+      RECT 0.000000  2.635000 8.280000 2.805000 ;
+      RECT 0.125000  0.255000 0.455000 0.725000 ;
+      RECT 0.125000  0.725000 1.395000 0.735000 ;
+      RECT 0.125000  0.735000 4.185000 0.905000 ;
+      RECT 0.165000  1.445000 0.415000 2.635000 ;
+      RECT 0.635000  1.445000 0.885000 1.785000 ;
+      RECT 0.635000  1.785000 1.785000 1.955000 ;
+      RECT 0.635000  1.955000 0.885000 2.465000 ;
+      RECT 0.675000  0.085000 0.845000 0.555000 ;
+      RECT 1.015000  0.255000 1.395000 0.725000 ;
+      RECT 1.105000  2.125000 1.355000 2.635000 ;
+      RECT 1.575000  1.955000 1.785000 2.295000 ;
+      RECT 1.575000  2.295000 3.745000 2.465000 ;
+      RECT 1.615000  0.085000 1.785000 0.555000 ;
+      RECT 1.955000  0.255000 2.335000 0.725000 ;
+      RECT 1.955000  0.725000 3.275000 0.735000 ;
+      RECT 2.515000  2.125000 2.765000 2.295000 ;
+      RECT 2.555000  0.085000 2.725000 0.555000 ;
+      RECT 2.895000  0.255000 3.275000 0.725000 ;
+      RECT 3.455000  2.125000 3.745000 2.295000 ;
+      RECT 3.495000  0.085000 3.665000 0.555000 ;
+      RECT 3.835000  0.255000 8.045000 0.475000 ;
+      RECT 3.835000  0.475000 4.185000 0.735000 ;
+      RECT 3.965000  2.125000 4.185000 2.635000 ;
+      RECT 4.355000  2.125000 4.710000 2.465000 ;
+      RECT 4.540000  1.785000 5.635000 1.955000 ;
+      RECT 4.540000  1.955000 4.710000 2.125000 ;
+      RECT 4.925000  2.125000 5.165000 2.635000 ;
+      RECT 5.385000  1.955000 5.635000 2.295000 ;
+      RECT 5.385000  2.295000 7.515000 2.465000 ;
+      RECT 6.325000  2.125000 6.575000 2.295000 ;
+      RECT 7.265000  2.135000 7.515000 2.295000 ;
+      RECT 7.735000  2.125000 8.015000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
index 6fbd2ed..e7d4e37 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_1.magic.lef
@@ -88,20 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.670000  0.085000 0.840000 0.750000 ;
-        RECT 3.135000  0.085000 3.485000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -110,44 +96,55 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.515000 2.235000 0.895000 2.635000 ;
-        RECT 1.865000 2.235000 2.265000 2.635000 ;
-        RECT 3.705000 1.815000 4.055000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.430000 0.995000 0.650000 1.445000 ;
-      RECT 0.430000 1.445000 0.875000 1.615000 ;
-      RECT 0.705000 1.615000 0.875000 1.885000 ;
-      RECT 0.705000 1.885000 2.935000 2.055000 ;
-      RECT 1.045000 1.495000 2.160000 1.715000 ;
-      RECT 1.560000 0.395000 2.055000 0.565000 ;
-      RECT 1.885000 0.565000 2.055000 1.355000 ;
-      RECT 1.885000 1.355000 2.160000 1.495000 ;
-      RECT 2.225000 0.320000 2.475000 0.690000 ;
-      RECT 2.305000 0.690000 2.475000 1.075000 ;
-      RECT 2.305000 1.075000 2.500000 1.245000 ;
-      RECT 2.330000 1.245000 2.500000 1.495000 ;
-      RECT 2.330000 1.495000 2.935000 1.885000 ;
-      RECT 2.555000 2.055000 2.935000 2.290000 ;
-      RECT 2.695000 0.320000 2.945000 0.725000 ;
-      RECT 2.695000 0.725000 4.055000 0.905000 ;
-      RECT 3.665000 0.320000 4.055000 0.725000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.430000  0.995000 0.650000 1.445000 ;
+      RECT 0.430000  1.445000 0.875000 1.615000 ;
+      RECT 0.515000  2.235000 0.895000 2.635000 ;
+      RECT 0.670000  0.085000 0.840000 0.750000 ;
+      RECT 0.705000  1.615000 0.875000 1.885000 ;
+      RECT 0.705000  1.885000 2.935000 2.055000 ;
+      RECT 1.045000  1.495000 2.160000 1.715000 ;
+      RECT 1.560000  0.395000 2.055000 0.565000 ;
+      RECT 1.865000  2.235000 2.265000 2.635000 ;
+      RECT 1.885000  0.565000 2.055000 1.355000 ;
+      RECT 1.885000  1.355000 2.160000 1.495000 ;
+      RECT 2.225000  0.320000 2.475000 0.690000 ;
+      RECT 2.305000  0.690000 2.475000 1.075000 ;
+      RECT 2.305000  1.075000 2.500000 1.245000 ;
+      RECT 2.330000  1.245000 2.500000 1.495000 ;
+      RECT 2.330000  1.495000 2.935000 1.885000 ;
+      RECT 2.555000  2.055000 2.935000 2.290000 ;
+      RECT 2.695000  0.320000 2.945000 0.725000 ;
+      RECT 2.695000  0.725000 4.055000 0.905000 ;
+      RECT 3.135000  0.085000 3.485000 0.555000 ;
+      RECT 3.665000  0.320000 4.055000 0.725000 ;
+      RECT 3.705000  1.815000 4.055000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
index 412e61a..2119c6f 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_2.magic.lef
@@ -89,22 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.110000  0.085000 0.365000 0.910000 ;
-        RECT 1.135000  0.085000 1.305000 0.750000 ;
-        RECT 3.675000  0.085000 3.845000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -113,46 +97,59 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.110000 1.410000 0.365000 2.635000 ;
-        RECT 1.010000 2.235000 1.390000 2.635000 ;
-        RECT 2.360000 2.235000 2.765000 2.635000 ;
-        RECT 4.165000 1.815000 4.480000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.925000 0.995000 1.145000 1.445000 ;
-      RECT 0.925000 1.445000 1.370000 1.615000 ;
-      RECT 1.200000 1.615000 1.370000 1.885000 ;
-      RECT 1.200000 1.885000 3.435000 2.055000 ;
-      RECT 1.540000 1.495000 2.660000 1.715000 ;
-      RECT 2.055000 0.395000 2.565000 0.565000 ;
-      RECT 2.395000 0.565000 2.565000 1.355000 ;
-      RECT 2.395000 1.355000 2.660000 1.495000 ;
-      RECT 2.735000 0.320000 2.980000 0.690000 ;
-      RECT 2.810000 0.690000 2.980000 1.075000 ;
-      RECT 2.810000 1.075000 3.000000 1.245000 ;
-      RECT 2.830000 1.245000 3.000000 1.495000 ;
-      RECT 2.830000 1.495000 3.435000 1.885000 ;
-      RECT 3.035000 2.055000 3.435000 2.425000 ;
-      RECT 3.205000 0.320000 3.435000 0.725000 ;
-      RECT 3.205000 0.725000 4.405000 0.905000 ;
-      RECT 4.015000 0.320000 4.405000 0.725000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.110000  0.085000 0.365000 0.910000 ;
+      RECT 0.110000  1.410000 0.365000 2.635000 ;
+      RECT 0.925000  0.995000 1.145000 1.445000 ;
+      RECT 0.925000  1.445000 1.370000 1.615000 ;
+      RECT 1.010000  2.235000 1.390000 2.635000 ;
+      RECT 1.135000  0.085000 1.305000 0.750000 ;
+      RECT 1.200000  1.615000 1.370000 1.885000 ;
+      RECT 1.200000  1.885000 3.435000 2.055000 ;
+      RECT 1.540000  1.495000 2.660000 1.715000 ;
+      RECT 2.055000  0.395000 2.565000 0.565000 ;
+      RECT 2.360000  2.235000 2.765000 2.635000 ;
+      RECT 2.395000  0.565000 2.565000 1.355000 ;
+      RECT 2.395000  1.355000 2.660000 1.495000 ;
+      RECT 2.735000  0.320000 2.980000 0.690000 ;
+      RECT 2.810000  0.690000 2.980000 1.075000 ;
+      RECT 2.810000  1.075000 3.000000 1.245000 ;
+      RECT 2.830000  1.245000 3.000000 1.495000 ;
+      RECT 2.830000  1.495000 3.435000 1.885000 ;
+      RECT 3.035000  2.055000 3.435000 2.425000 ;
+      RECT 3.205000  0.320000 3.435000 0.725000 ;
+      RECT 3.205000  0.725000 4.405000 0.905000 ;
+      RECT 3.675000  0.085000 3.845000 0.555000 ;
+      RECT 4.015000  0.320000 4.405000 0.725000 ;
+      RECT 4.165000  1.815000 4.480000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
index a10d68c..8023e72 100644
--- a/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
+++ b/cells/o2bb2a/sky130_fd_sc_hdll__o2bb2a_4.magic.lef
@@ -95,32 +95,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.555000 ;
-        RECT 1.585000  0.085000 1.755000 0.555000 ;
-        RECT 3.515000  0.085000 3.685000 0.555000 ;
-        RECT 5.395000  0.085000 5.565000 0.895000 ;
-        RECT 6.335000  0.085000 6.505000 0.555000 ;
-        RECT 7.275000  0.085000 7.445000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -129,71 +103,93 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.140000 1.795000 0.345000 2.635000 ;
-        RECT 2.015000 2.125000 2.265000 2.635000 ;
-        RECT 2.995000 2.135000 3.725000 2.635000 ;
-        RECT 4.415000 2.135000 4.665000 2.635000 ;
-        RECT 5.355000 1.795000 5.605000 2.635000 ;
-        RECT 6.295000 2.165000 6.545000 2.635000 ;
-        RECT 7.235000 1.825000 7.485000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.255000 0.425000 0.725000 ;
-      RECT 0.095000 0.725000 1.365000 0.735000 ;
-      RECT 0.095000 0.735000 2.225000 0.905000 ;
-      RECT 0.605000 1.785000 0.855000 2.295000 ;
-      RECT 0.605000 2.295000 1.795000 2.465000 ;
-      RECT 0.985000 0.255000 1.365000 0.725000 ;
-      RECT 1.075000 1.785000 2.865000 1.955000 ;
-      RECT 1.075000 1.955000 1.325000 2.125000 ;
-      RECT 1.545000 2.125000 1.795000 2.295000 ;
-      RECT 1.925000 0.255000 3.245000 0.475000 ;
-      RECT 1.925000 0.475000 2.225000 0.735000 ;
-      RECT 2.265000 1.075000 2.695000 1.415000 ;
-      RECT 2.265000 1.415000 2.865000 1.785000 ;
-      RECT 2.395000 0.645000 2.775000 0.815000 ;
-      RECT 2.395000 0.815000 2.695000 1.075000 ;
-      RECT 2.485000 1.955000 2.865000 1.965000 ;
-      RECT 2.485000 1.965000 2.775000 2.465000 ;
-      RECT 2.865000 1.075000 3.445000 1.245000 ;
-      RECT 3.255000 0.725000 4.705000 0.905000 ;
-      RECT 3.255000 0.905000 3.445000 1.075000 ;
-      RECT 3.255000 1.245000 3.445000 1.785000 ;
-      RECT 3.255000 1.785000 5.135000 1.965000 ;
-      RECT 3.855000 0.305000 5.175000 0.475000 ;
-      RECT 3.945000 1.965000 4.195000 2.125000 ;
-      RECT 4.325000 0.645000 4.705000 0.725000 ;
-      RECT 4.885000 1.965000 5.135000 2.465000 ;
-      RECT 4.925000 0.475000 5.175000 0.895000 ;
-      RECT 5.665000 1.075000 7.085000 1.245000 ;
-      RECT 5.665000 1.245000 6.005000 1.615000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.095000  0.255000 0.425000 0.725000 ;
+      RECT 0.095000  0.725000 1.365000 0.735000 ;
+      RECT 0.095000  0.735000 2.225000 0.905000 ;
+      RECT 0.140000  1.795000 0.345000 2.635000 ;
+      RECT 0.605000  1.785000 0.855000 2.295000 ;
+      RECT 0.605000  2.295000 1.795000 2.465000 ;
+      RECT 0.645000  0.085000 0.815000 0.555000 ;
+      RECT 0.985000  0.255000 1.365000 0.725000 ;
+      RECT 1.075000  1.785000 2.865000 1.955000 ;
+      RECT 1.075000  1.955000 1.325000 2.125000 ;
+      RECT 1.545000  2.125000 1.795000 2.295000 ;
+      RECT 1.585000  0.085000 1.755000 0.555000 ;
+      RECT 1.925000  0.255000 3.245000 0.475000 ;
+      RECT 1.925000  0.475000 2.225000 0.735000 ;
+      RECT 2.015000  2.125000 2.265000 2.635000 ;
+      RECT 2.265000  1.075000 2.695000 1.415000 ;
+      RECT 2.265000  1.415000 2.865000 1.785000 ;
+      RECT 2.395000  0.645000 2.775000 0.815000 ;
+      RECT 2.395000  0.815000 2.695000 1.075000 ;
+      RECT 2.485000  1.955000 2.865000 1.965000 ;
+      RECT 2.485000  1.965000 2.775000 2.465000 ;
+      RECT 2.865000  1.075000 3.445000 1.245000 ;
+      RECT 2.995000  2.135000 3.725000 2.635000 ;
+      RECT 3.255000  0.725000 4.705000 0.905000 ;
+      RECT 3.255000  0.905000 3.445000 1.075000 ;
+      RECT 3.255000  1.245000 3.445000 1.785000 ;
+      RECT 3.255000  1.785000 5.135000 1.965000 ;
+      RECT 3.515000  0.085000 3.685000 0.555000 ;
+      RECT 3.855000  0.305000 5.175000 0.475000 ;
+      RECT 3.945000  1.965000 4.195000 2.125000 ;
+      RECT 4.325000  0.645000 4.705000 0.725000 ;
+      RECT 4.415000  2.135000 4.665000 2.635000 ;
+      RECT 4.885000  1.965000 5.135000 2.465000 ;
+      RECT 4.925000  0.475000 5.175000 0.895000 ;
+      RECT 5.355000  1.795000 5.605000 2.635000 ;
+      RECT 5.395000  0.085000 5.565000 0.895000 ;
+      RECT 5.665000  1.075000 7.085000 1.245000 ;
+      RECT 5.665000  1.245000 6.005000 1.615000 ;
+      RECT 6.295000  2.165000 6.545000 2.635000 ;
+      RECT 6.335000  0.085000 6.505000 0.555000 ;
+      RECT 7.235000  1.825000 7.485000 2.635000 ;
+      RECT 7.275000  0.085000 7.445000 0.555000 ;
     LAYER mcon ;
-      RECT 2.695000 1.435000 2.865000 1.605000 ;
-      RECT 5.725000 1.445000 5.895000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.695000  1.435000 2.865000 1.605000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 5.725000  1.445000 5.895000 1.615000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
     LAYER met1 ;
       RECT 2.635000 1.385000 2.975000 1.460000 ;
       RECT 2.635000 1.460000 5.960000 1.600000 ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
index af273f7..78fe6b5 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_1.magic.lef
@@ -88,19 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.815000 ;
-        RECT 2.520000  0.085000 2.690000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -109,35 +96,45 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.150000 1.455000 0.400000 2.635000 ;
-        RECT 1.090000 1.835000 1.780000 2.635000 ;
-        RECT 2.950000 1.455000 3.200000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.620000 1.495000 1.440000 1.665000 ;
-      RECT 0.620000 1.665000 0.870000 2.465000 ;
-      RECT 1.000000 0.280000 1.440000 0.825000 ;
-      RECT 1.270000 0.825000 1.440000 0.995000 ;
-      RECT 1.270000 0.995000 1.580000 1.325000 ;
-      RECT 1.270000 1.325000 1.440000 1.495000 ;
-      RECT 2.100000 0.425000 2.350000 0.725000 ;
-      RECT 2.100000 0.725000 3.240000 0.905000 ;
-      RECT 2.860000 0.275000 3.240000 0.725000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.090000  0.085000 0.425000 0.815000 ;
+      RECT 0.150000  1.455000 0.400000 2.635000 ;
+      RECT 0.620000  1.495000 1.440000 1.665000 ;
+      RECT 0.620000  1.665000 0.870000 2.465000 ;
+      RECT 1.000000  0.280000 1.440000 0.825000 ;
+      RECT 1.090000  1.835000 1.780000 2.635000 ;
+      RECT 1.270000  0.825000 1.440000 0.995000 ;
+      RECT 1.270000  0.995000 1.580000 1.325000 ;
+      RECT 1.270000  1.325000 1.440000 1.495000 ;
+      RECT 2.100000  0.425000 2.350000 0.725000 ;
+      RECT 2.100000  0.725000 3.240000 0.905000 ;
+      RECT 2.520000  0.085000 2.690000 0.555000 ;
+      RECT 2.860000  0.275000 3.240000 0.725000 ;
+      RECT 2.950000  1.455000 3.200000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
index 6b2476f..75c6d70 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_2.magic.lef
@@ -91,26 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.195000  0.085000 0.365000 0.895000 ;
-        RECT 2.035000  0.085000 2.205000 0.555000 ;
-        RECT 4.000000  0.085000 4.170000 0.555000 ;
-        RECT 4.940000  0.085000 5.110000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -119,52 +99,69 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.150000 1.795000 0.400000 2.635000 ;
-        RECT 1.095000 2.135000 1.345000 2.635000 ;
-        RECT 2.035000 2.135000 2.725000 2.635000 ;
-        RECT 3.455000 2.125000 3.740000 2.635000 ;
-        RECT 5.415000 1.795000 5.620000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.535000 0.305000 1.855000 0.475000 ;
-      RECT 0.535000 0.475000 0.835000 0.895000 ;
-      RECT 0.625000 1.785000 2.485000 1.965000 ;
-      RECT 0.625000 1.965000 0.875000 2.465000 ;
-      RECT 1.005000 0.645000 1.385000 0.725000 ;
-      RECT 1.005000 0.725000 2.485000 0.905000 ;
-      RECT 2.315000 0.905000 2.485000 0.995000 ;
-      RECT 2.315000 0.995000 2.725000 1.325000 ;
-      RECT 2.315000 1.325000 2.485000 1.785000 ;
-      RECT 2.475000 0.255000 3.780000 0.475000 ;
-      RECT 2.475000 0.475000 2.725000 0.555000 ;
-      RECT 3.495000 0.475000 3.780000 0.735000 ;
-      RECT 3.495000 0.735000 5.660000 0.905000 ;
-      RECT 3.960000 2.125000 4.210000 2.295000 ;
-      RECT 3.960000 2.295000 5.150000 2.465000 ;
-      RECT 4.340000 0.255000 4.720000 0.725000 ;
-      RECT 4.340000 0.725000 5.660000 0.735000 ;
-      RECT 4.900000 1.785000 5.150000 2.295000 ;
-      RECT 5.280000 0.255000 5.660000 0.725000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.150000  1.795000 0.400000 2.635000 ;
+      RECT 0.195000  0.085000 0.365000 0.895000 ;
+      RECT 0.535000  0.305000 1.855000 0.475000 ;
+      RECT 0.535000  0.475000 0.835000 0.895000 ;
+      RECT 0.625000  1.785000 2.485000 1.965000 ;
+      RECT 0.625000  1.965000 0.875000 2.465000 ;
+      RECT 1.005000  0.645000 1.385000 0.725000 ;
+      RECT 1.005000  0.725000 2.485000 0.905000 ;
+      RECT 1.095000  2.135000 1.345000 2.635000 ;
+      RECT 2.035000  0.085000 2.205000 0.555000 ;
+      RECT 2.035000  2.135000 2.725000 2.635000 ;
+      RECT 2.315000  0.905000 2.485000 0.995000 ;
+      RECT 2.315000  0.995000 2.725000 1.325000 ;
+      RECT 2.315000  1.325000 2.485000 1.785000 ;
+      RECT 2.475000  0.255000 3.780000 0.475000 ;
+      RECT 2.475000  0.475000 2.725000 0.555000 ;
+      RECT 3.455000  2.125000 3.740000 2.635000 ;
+      RECT 3.495000  0.475000 3.780000 0.735000 ;
+      RECT 3.495000  0.735000 5.660000 0.905000 ;
+      RECT 3.960000  2.125000 4.210000 2.295000 ;
+      RECT 3.960000  2.295000 5.150000 2.465000 ;
+      RECT 4.000000  0.085000 4.170000 0.555000 ;
+      RECT 4.340000  0.255000 4.720000 0.725000 ;
+      RECT 4.340000  0.725000 5.660000 0.735000 ;
+      RECT 4.900000  1.785000 5.150000 2.295000 ;
+      RECT 4.940000  0.085000 5.110000 0.555000 ;
+      RECT 5.280000  0.255000 5.660000 0.725000 ;
+      RECT 5.415000  1.795000 5.620000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
index d9cb218..63b0bed 100644
--- a/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
+++ b/cells/o2bb2ai/sky130_fd_sc_hdll__o2bb2ai_4.magic.lef
@@ -89,39 +89,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  2.545000  0.085000  2.715000 0.555000 ;
-        RECT  3.485000  0.085000  3.655000 0.555000 ;
-        RECT  7.315000  0.085000  7.485000 0.555000 ;
-        RECT  8.255000  0.085000  8.425000 0.555000 ;
-        RECT  9.195000  0.085000  9.365000 0.555000 ;
-        RECT 10.135000  0.085000 10.305000 0.555000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -130,78 +97,108 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.155000 1.795000  0.405000 2.635000 ;
-        RECT  1.095000 1.795000  1.345000 2.635000 ;
-        RECT  2.035000 1.795000  2.285000 2.635000 ;
-        RECT  2.975000 1.795000  3.225000 2.635000 ;
-        RECT  3.915000 1.795000  4.655000 2.635000 ;
-        RECT  5.345000 1.795000  5.595000 2.635000 ;
-        RECT  6.285000 1.795000  6.535000 2.635000 ;
-        RECT  9.155000 1.795000  9.405000 2.635000 ;
-        RECT 10.095000 1.795000 10.345000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.645000  1.855000 0.905000 ;
-      RECT  0.085000 0.905000  0.255000 1.455000 ;
-      RECT  0.085000 1.455000  4.315000 1.625000 ;
-      RECT  0.100000 0.255000  2.325000 0.475000 ;
-      RECT  0.625000 1.625000  0.875000 2.465000 ;
-      RECT  1.565000 1.625000  1.815000 2.465000 ;
-      RECT  2.075000 0.475000  2.325000 0.725000 ;
-      RECT  2.075000 0.725000  4.205000 0.905000 ;
-      RECT  2.505000 1.625000  2.755000 2.465000 ;
-      RECT  2.885000 0.255000  3.265000 0.725000 ;
-      RECT  3.445000 1.625000  3.695000 2.465000 ;
-      RECT  3.825000 0.255000  4.205000 0.725000 ;
-      RECT  4.145000 1.075000  6.305000 1.285000 ;
-      RECT  4.145000 1.285000  4.315000 1.455000 ;
-      RECT  4.460000 0.255000  7.145000 0.475000 ;
-      RECT  4.460000 0.475000  4.645000 0.835000 ;
-      RECT  6.775000 1.795000  7.055000 2.295000 ;
-      RECT  6.775000 2.295000  8.935000 2.465000 ;
-      RECT  6.975000 0.475000  7.145000 0.735000 ;
-      RECT  6.975000 0.735000 10.855000 0.905000 ;
-      RECT  7.655000 0.255000  8.035000 0.725000 ;
-      RECT  7.655000 0.725000 10.855000 0.735000 ;
-      RECT  7.745000 1.795000  7.995000 2.295000 ;
-      RECT  8.595000 0.255000  8.975000 0.725000 ;
-      RECT  8.685000 1.455000 10.875000 1.625000 ;
-      RECT  8.685000 1.625000  8.935000 2.295000 ;
-      RECT  9.535000 0.255000  9.915000 0.725000 ;
-      RECT  9.625000 1.625000  9.875000 2.465000 ;
-      RECT 10.475000 0.255000 10.855000 0.725000 ;
-      RECT 10.565000 1.625000 10.875000 2.465000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.085000  0.645000  1.855000 0.905000 ;
+      RECT  0.085000  0.905000  0.255000 1.455000 ;
+      RECT  0.085000  1.455000  4.315000 1.625000 ;
+      RECT  0.100000  0.255000  2.325000 0.475000 ;
+      RECT  0.155000  1.795000  0.405000 2.635000 ;
+      RECT  0.625000  1.625000  0.875000 2.465000 ;
+      RECT  1.095000  1.795000  1.345000 2.635000 ;
+      RECT  1.565000  1.625000  1.815000 2.465000 ;
+      RECT  2.035000  1.795000  2.285000 2.635000 ;
+      RECT  2.075000  0.475000  2.325000 0.725000 ;
+      RECT  2.075000  0.725000  4.205000 0.905000 ;
+      RECT  2.505000  1.625000  2.755000 2.465000 ;
+      RECT  2.545000  0.085000  2.715000 0.555000 ;
+      RECT  2.885000  0.255000  3.265000 0.725000 ;
+      RECT  2.975000  1.795000  3.225000 2.635000 ;
+      RECT  3.445000  1.625000  3.695000 2.465000 ;
+      RECT  3.485000  0.085000  3.655000 0.555000 ;
+      RECT  3.825000  0.255000  4.205000 0.725000 ;
+      RECT  3.915000  1.795000  4.655000 2.635000 ;
+      RECT  4.145000  1.075000  6.305000 1.285000 ;
+      RECT  4.145000  1.285000  4.315000 1.455000 ;
+      RECT  4.460000  0.255000  7.145000 0.475000 ;
+      RECT  4.460000  0.475000  4.645000 0.835000 ;
+      RECT  5.345000  1.795000  5.595000 2.635000 ;
+      RECT  6.285000  1.795000  6.535000 2.635000 ;
+      RECT  6.775000  1.795000  7.055000 2.295000 ;
+      RECT  6.775000  2.295000  8.935000 2.465000 ;
+      RECT  6.975000  0.475000  7.145000 0.735000 ;
+      RECT  6.975000  0.735000 10.855000 0.905000 ;
+      RECT  7.315000  0.085000  7.485000 0.555000 ;
+      RECT  7.655000  0.255000  8.035000 0.725000 ;
+      RECT  7.655000  0.725000 10.855000 0.735000 ;
+      RECT  7.745000  1.795000  7.995000 2.295000 ;
+      RECT  8.255000  0.085000  8.425000 0.555000 ;
+      RECT  8.595000  0.255000  8.975000 0.725000 ;
+      RECT  8.685000  1.455000 10.875000 1.625000 ;
+      RECT  8.685000  1.625000  8.935000 2.295000 ;
+      RECT  9.155000  1.795000  9.405000 2.635000 ;
+      RECT  9.195000  0.085000  9.365000 0.555000 ;
+      RECT  9.535000  0.255000  9.915000 0.725000 ;
+      RECT  9.625000  1.625000  9.875000 2.465000 ;
+      RECT 10.095000  1.795000 10.345000 2.635000 ;
+      RECT 10.135000  0.085000 10.305000 0.555000 ;
+      RECT 10.475000  0.255000 10.855000 0.725000 ;
+      RECT 10.565000  1.625000 10.875000 2.465000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
index 6688105..41bad1f 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_1.magic.lef
@@ -85,17 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.175000  0.085000 0.345000 0.905000 ;
-        RECT 1.125000  0.085000 1.295000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -104,26 +93,34 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT -0.015000 2.635000 2.760000 2.805000 ;
-        RECT  0.085000 1.495000 0.420000 2.635000 ;
-        RECT  2.355000 1.495000 2.525000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.255000 0.895000 0.735000 ;
-      RECT 0.515000 0.735000 1.715000 0.905000 ;
-      RECT 1.465000 0.460000 1.715000 0.735000 ;
+      RECT -0.015000  2.635000 2.760000 2.805000 ;
+      RECT  0.000000 -0.085000 2.760000 0.085000 ;
+      RECT  0.085000  1.495000 0.420000 2.635000 ;
+      RECT  0.175000  0.085000 0.345000 0.905000 ;
+      RECT  0.515000  0.255000 0.895000 0.735000 ;
+      RECT  0.515000  0.735000 1.715000 0.905000 ;
+      RECT  1.125000  0.085000 1.295000 0.565000 ;
+      RECT  1.465000  0.460000 1.715000 0.735000 ;
+      RECT  2.355000  1.495000 2.525000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
index a27d0cd..995c953 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_2.magic.lef
@@ -87,23 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.665000  0.085000 0.835000 0.545000 ;
-        RECT 1.605000  0.085000 2.165000 0.545000 ;
-        RECT 2.925000  0.085000 3.305000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -112,42 +95,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.665000 1.835000 0.835000 2.635000 ;
-        RECT 4.075000 1.835000 4.405000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.445000 0.715000 ;
-      RECT 0.090000 0.715000 3.855000 0.885000 ;
-      RECT 0.090000 1.495000 2.325000 1.665000 ;
-      RECT 0.090000 1.665000 0.445000 2.465000 ;
-      RECT 1.005000 0.255000 1.385000 0.715000 ;
-      RECT 1.005000 1.665000 1.385000 2.465000 ;
-      RECT 1.605000 1.835000 1.775000 2.295000 ;
-      RECT 1.605000 2.295000 3.305000 2.465000 ;
-      RECT 1.945000 1.665000 2.325000 2.125000 ;
-      RECT 2.425000 0.255000 2.755000 0.715000 ;
-      RECT 3.135000 1.835000 3.305000 2.295000 ;
-      RECT 3.475000 0.255000 4.965000 0.425000 ;
-      RECT 3.475000 0.425000 3.855000 0.715000 ;
-      RECT 4.630000 0.425000 4.965000 0.585000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.090000  0.255000 0.445000 0.715000 ;
+      RECT 0.090000  0.715000 3.855000 0.885000 ;
+      RECT 0.090000  1.495000 2.325000 1.665000 ;
+      RECT 0.090000  1.665000 0.445000 2.465000 ;
+      RECT 0.665000  0.085000 0.835000 0.545000 ;
+      RECT 0.665000  1.835000 0.835000 2.635000 ;
+      RECT 1.005000  0.255000 1.385000 0.715000 ;
+      RECT 1.005000  1.665000 1.385000 2.465000 ;
+      RECT 1.605000  0.085000 2.165000 0.545000 ;
+      RECT 1.605000  1.835000 1.775000 2.295000 ;
+      RECT 1.605000  2.295000 3.305000 2.465000 ;
+      RECT 1.945000  1.665000 2.325000 2.125000 ;
+      RECT 2.425000  0.255000 2.755000 0.715000 ;
+      RECT 2.925000  0.085000 3.305000 0.545000 ;
+      RECT 3.135000  1.835000 3.305000 2.295000 ;
+      RECT 3.475000  0.255000 4.965000 0.425000 ;
+      RECT 3.475000  0.425000 3.855000 0.715000 ;
+      RECT 4.075000  1.835000 4.405000 2.635000 ;
+      RECT 4.630000  0.425000 4.965000 0.585000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
index 7f04e85..070dbcd 100644
--- a/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
+++ b/cells/o31ai/sky130_fd_sc_hdll__o31ai_4.magic.lef
@@ -88,34 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 8.740000 0.085000 ;
-        RECT 0.665000  0.085000 0.835000 0.545000 ;
-        RECT 1.605000  0.085000 1.775000 0.545000 ;
-        RECT 2.545000  0.085000 2.715000 0.545000 ;
-        RECT 3.485000  0.085000 3.655000 0.545000 ;
-        RECT 4.445000  0.085000 5.140000 0.545000 ;
-        RECT 5.790000  0.085000 6.160000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 8.740000 0.240000 ;
     END
@@ -124,59 +96,84 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 8.740000 2.805000 ;
-        RECT 0.665000 2.065000 0.835000 2.635000 ;
-        RECT 1.605000 2.065000 1.775000 2.635000 ;
-        RECT 6.760000 1.890000 7.140000 2.635000 ;
-        RECT 7.700000 1.890000 8.080000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 8.740000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 0.445000 0.715000 ;
-      RECT 0.090000 0.715000 6.590000 0.885000 ;
-      RECT 0.090000 1.595000 2.325000 1.895000 ;
-      RECT 0.090000 1.895000 0.445000 2.465000 ;
-      RECT 1.005000 0.255000 1.385000 0.715000 ;
-      RECT 1.005000 1.895000 1.385000 2.465000 ;
-      RECT 1.945000 0.255000 2.325000 0.715000 ;
-      RECT 1.945000 1.895000 2.325000 2.205000 ;
-      RECT 1.945000 2.205000 4.285000 2.465000 ;
-      RECT 2.545000 1.595000 4.005000 1.765000 ;
-      RECT 2.545000 1.765000 2.715000 2.035000 ;
-      RECT 2.885000 0.255000 3.265000 0.715000 ;
-      RECT 2.885000 1.935000 3.265000 2.205000 ;
-      RECT 3.485000 1.765000 4.005000 1.865000 ;
-      RECT 3.485000 1.865000 6.200000 2.035000 ;
-      RECT 3.825000 0.255000 4.205000 0.715000 ;
-      RECT 4.530000 2.035000 6.200000 2.465000 ;
-      RECT 5.360000 0.395000 5.530000 0.715000 ;
-      RECT 6.420000 0.255000 8.585000 0.475000 ;
-      RECT 6.420000 0.475000 6.590000 0.715000 ;
-      RECT 8.300000 0.475000 8.585000 0.885000 ;
+      RECT 0.000000 -0.085000 8.740000 0.085000 ;
+      RECT 0.000000  2.635000 8.740000 2.805000 ;
+      RECT 0.090000  0.255000 0.445000 0.715000 ;
+      RECT 0.090000  0.715000 6.590000 0.885000 ;
+      RECT 0.090000  1.595000 2.325000 1.895000 ;
+      RECT 0.090000  1.895000 0.445000 2.465000 ;
+      RECT 0.665000  0.085000 0.835000 0.545000 ;
+      RECT 0.665000  2.065000 0.835000 2.635000 ;
+      RECT 1.005000  0.255000 1.385000 0.715000 ;
+      RECT 1.005000  1.895000 1.385000 2.465000 ;
+      RECT 1.605000  0.085000 1.775000 0.545000 ;
+      RECT 1.605000  2.065000 1.775000 2.635000 ;
+      RECT 1.945000  0.255000 2.325000 0.715000 ;
+      RECT 1.945000  1.895000 2.325000 2.205000 ;
+      RECT 1.945000  2.205000 4.285000 2.465000 ;
+      RECT 2.545000  0.085000 2.715000 0.545000 ;
+      RECT 2.545000  1.595000 4.005000 1.765000 ;
+      RECT 2.545000  1.765000 2.715000 2.035000 ;
+      RECT 2.885000  0.255000 3.265000 0.715000 ;
+      RECT 2.885000  1.935000 3.265000 2.205000 ;
+      RECT 3.485000  0.085000 3.655000 0.545000 ;
+      RECT 3.485000  1.765000 4.005000 1.865000 ;
+      RECT 3.485000  1.865000 6.200000 2.035000 ;
+      RECT 3.825000  0.255000 4.205000 0.715000 ;
+      RECT 4.445000  0.085000 5.140000 0.545000 ;
+      RECT 4.530000  2.035000 6.200000 2.465000 ;
+      RECT 5.360000  0.395000 5.530000 0.715000 ;
+      RECT 5.790000  0.085000 6.160000 0.545000 ;
+      RECT 6.420000  0.255000 8.585000 0.475000 ;
+      RECT 6.420000  0.475000 6.590000 0.715000 ;
+      RECT 6.760000  1.890000 7.140000 2.635000 ;
+      RECT 7.700000  1.890000 8.080000 2.635000 ;
+      RECT 8.300000  0.475000 8.585000 0.885000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
index 0b3ad08..ba79217 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_1.magic.lef
@@ -94,18 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 1.645000  0.085000 1.975000 0.485000 ;
-        RECT 2.725000  0.085000 3.095000 0.825000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -114,28 +102,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.090000 1.495000 0.360000 2.635000 ;
-        RECT 2.785000 1.495000 3.135000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 1.440000 0.485000 ;
-      RECT 1.065000 0.485000 1.440000 0.655000 ;
-      RECT 1.065000 0.655000 2.555000 0.825000 ;
-      RECT 2.385000 0.375000 2.555000 0.655000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.085000  0.255000 1.440000 0.485000 ;
+      RECT 0.090000  1.495000 0.360000 2.635000 ;
+      RECT 1.065000  0.485000 1.440000 0.655000 ;
+      RECT 1.065000  0.655000 2.555000 0.825000 ;
+      RECT 1.645000  0.085000 1.975000 0.485000 ;
+      RECT 2.385000  0.375000 2.555000 0.655000 ;
+      RECT 2.725000  0.085000 3.095000 0.825000 ;
+      RECT 2.785000  1.495000 3.135000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
index c16c9db..a678cf6 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_2.magic.lef
@@ -97,26 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 2.870000  0.085000 3.250000 0.545000 ;
-        RECT 4.035000  0.085000 4.205000 0.545000 ;
-        RECT 5.355000  0.085000 5.735000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -125,51 +105,68 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 1.585000 2.175000 1.755000 2.635000 ;
-        RECT 5.070000 1.835000 5.275000 2.635000 ;
-        RECT 6.045000 1.495000 6.265000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 0.255000 2.655000 0.485000 ;
-      RECT 0.090000 0.485000 0.345000 0.905000 ;
-      RECT 0.090000 1.495000 0.345000 2.295000 ;
-      RECT 0.090000 2.295000 1.365000 2.465000 ;
-      RECT 1.115000 1.835000 2.305000 2.005000 ;
-      RECT 1.115000 2.005000 1.365000 2.295000 ;
-      RECT 1.925000 2.005000 2.305000 2.455000 ;
-      RECT 2.485000 0.485000 2.655000 0.715000 ;
-      RECT 2.485000 0.715000 6.305000 0.905000 ;
-      RECT 2.585000 1.835000 2.835000 2.255000 ;
-      RECT 2.585000 2.255000 4.835000 2.445000 ;
-      RECT 3.435000 0.255000 3.815000 0.715000 ;
-      RECT 3.625000 1.495000 3.795000 2.255000 ;
-      RECT 4.015000 1.495000 5.825000 1.665000 ;
-      RECT 4.015000 1.665000 4.345000 2.085000 ;
-      RECT 4.505000 0.255000 5.175000 0.715000 ;
-      RECT 4.585000 1.835000 4.835000 2.255000 ;
-      RECT 5.495000 1.665000 5.825000 2.460000 ;
-      RECT 5.975000 0.255000 6.305000 0.715000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.090000  0.255000 2.655000 0.485000 ;
+      RECT 0.090000  0.485000 0.345000 0.905000 ;
+      RECT 0.090000  1.495000 0.345000 2.295000 ;
+      RECT 0.090000  2.295000 1.365000 2.465000 ;
+      RECT 1.115000  1.835000 2.305000 2.005000 ;
+      RECT 1.115000  2.005000 1.365000 2.295000 ;
+      RECT 1.585000  2.175000 1.755000 2.635000 ;
+      RECT 1.925000  2.005000 2.305000 2.455000 ;
+      RECT 2.485000  0.485000 2.655000 0.715000 ;
+      RECT 2.485000  0.715000 6.305000 0.905000 ;
+      RECT 2.585000  1.835000 2.835000 2.255000 ;
+      RECT 2.585000  2.255000 4.835000 2.445000 ;
+      RECT 2.870000  0.085000 3.250000 0.545000 ;
+      RECT 3.435000  0.255000 3.815000 0.715000 ;
+      RECT 3.625000  1.495000 3.795000 2.255000 ;
+      RECT 4.015000  1.495000 5.825000 1.665000 ;
+      RECT 4.015000  1.665000 4.345000 2.085000 ;
+      RECT 4.035000  0.085000 4.205000 0.545000 ;
+      RECT 4.505000  0.255000 5.175000 0.715000 ;
+      RECT 4.585000  1.835000 4.835000 2.255000 ;
+      RECT 5.070000  1.835000 5.275000 2.635000 ;
+      RECT 5.355000  0.085000 5.735000 0.545000 ;
+      RECT 5.495000  1.665000 5.825000 2.460000 ;
+      RECT 5.975000  0.255000 6.305000 0.715000 ;
+      RECT 6.045000  1.495000 6.265000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
index 89cba7b..e39e288 100644
--- a/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
+++ b/cells/o32ai/sky130_fd_sc_hdll__o32ai_4.magic.lef
@@ -98,39 +98,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  4.420000  0.085000  4.590000 0.545000 ;
-        RECT  5.360000  0.085000  5.690000 0.545000 ;
-        RECT  6.820000  0.085000  6.990000 0.545000 ;
-        RECT  7.760000  0.085000  7.930000 0.545000 ;
-        RECT  9.220000  0.085000  9.390000 0.545000 ;
-        RECT 10.160000  0.085000 10.375000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -139,72 +106,102 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  2.410000 2.175000  2.790000 2.635000 ;
-        RECT  3.350000 2.175000  3.730000 2.635000 ;
-        RECT  8.670000 1.835000  8.920000 2.635000 ;
-        RECT  9.690000 1.835000  9.860000 2.635000 ;
-        RECT 10.675000 1.495000 10.925000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 0.255000  4.200000 0.465000 ;
-      RECT  0.090000 0.465000  0.345000 0.905000 ;
-      RECT  0.090000 1.495000  0.345000 2.255000 ;
-      RECT  0.090000 2.255000  2.240000 2.465000 ;
-      RECT  1.115000 1.835000  1.285000 2.255000 ;
-      RECT  2.070000 1.835000  4.200000 2.005000 ;
-      RECT  2.070000 2.005000  2.240000 2.255000 ;
-      RECT  3.010000 2.005000  3.180000 2.425000 ;
-      RECT  3.950000 0.465000  4.200000 0.735000 ;
-      RECT  3.950000 0.735000 10.925000 0.905000 ;
-      RECT  3.950000 2.005000  4.200000 2.465000 ;
-      RECT  4.390000 1.835000  4.640000 2.255000 ;
-      RECT  4.390000 2.255000  8.480000 2.465000 ;
-      RECT  4.760000 0.255000  5.140000 0.735000 ;
-      RECT  5.410000 1.835000  5.580000 2.255000 ;
-      RECT  5.910000 0.255000  6.580000 0.735000 ;
-      RECT  6.350000 1.835000  6.520000 2.255000 ;
-      RECT  6.690000 1.495000 10.410000 1.665000 ;
-      RECT  6.690000 1.665000  7.070000 2.085000 ;
-      RECT  7.160000 0.255000  7.540000 0.735000 ;
-      RECT  7.290000 1.835000  7.460000 2.255000 ;
-      RECT  7.630000 1.665000  8.010000 2.085000 ;
-      RECT  8.100000 0.255000  8.840000 0.735000 ;
-      RECT  8.230000 1.835000  8.480000 2.255000 ;
-      RECT  9.090000 1.665000  9.470000 2.465000 ;
-      RECT  9.560000 0.255000  9.940000 0.735000 ;
-      RECT 10.030000 1.665000 10.410000 2.465000 ;
-      RECT 10.545000 0.255000 10.925000 0.735000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.090000  0.255000  4.200000 0.465000 ;
+      RECT  0.090000  0.465000  0.345000 0.905000 ;
+      RECT  0.090000  1.495000  0.345000 2.255000 ;
+      RECT  0.090000  2.255000  2.240000 2.465000 ;
+      RECT  1.115000  1.835000  1.285000 2.255000 ;
+      RECT  2.070000  1.835000  4.200000 2.005000 ;
+      RECT  2.070000  2.005000  2.240000 2.255000 ;
+      RECT  2.410000  2.175000  2.790000 2.635000 ;
+      RECT  3.010000  2.005000  3.180000 2.425000 ;
+      RECT  3.350000  2.175000  3.730000 2.635000 ;
+      RECT  3.950000  0.465000  4.200000 0.735000 ;
+      RECT  3.950000  0.735000 10.925000 0.905000 ;
+      RECT  3.950000  2.005000  4.200000 2.465000 ;
+      RECT  4.390000  1.835000  4.640000 2.255000 ;
+      RECT  4.390000  2.255000  8.480000 2.465000 ;
+      RECT  4.420000  0.085000  4.590000 0.545000 ;
+      RECT  4.760000  0.255000  5.140000 0.735000 ;
+      RECT  5.360000  0.085000  5.690000 0.545000 ;
+      RECT  5.410000  1.835000  5.580000 2.255000 ;
+      RECT  5.910000  0.255000  6.580000 0.735000 ;
+      RECT  6.350000  1.835000  6.520000 2.255000 ;
+      RECT  6.690000  1.495000 10.410000 1.665000 ;
+      RECT  6.690000  1.665000  7.070000 2.085000 ;
+      RECT  6.820000  0.085000  6.990000 0.545000 ;
+      RECT  7.160000  0.255000  7.540000 0.735000 ;
+      RECT  7.290000  1.835000  7.460000 2.255000 ;
+      RECT  7.630000  1.665000  8.010000 2.085000 ;
+      RECT  7.760000  0.085000  7.930000 0.545000 ;
+      RECT  8.100000  0.255000  8.840000 0.735000 ;
+      RECT  8.230000  1.835000  8.480000 2.255000 ;
+      RECT  8.670000  1.835000  8.920000 2.635000 ;
+      RECT  9.090000  1.665000  9.470000 2.465000 ;
+      RECT  9.220000  0.085000  9.390000 0.545000 ;
+      RECT  9.560000  0.255000  9.940000 0.735000 ;
+      RECT  9.690000  1.835000  9.860000 2.635000 ;
+      RECT 10.030000  1.665000 10.410000 2.465000 ;
+      RECT 10.160000  0.085000 10.375000 0.545000 ;
+      RECT 10.545000  0.255000 10.925000 0.735000 ;
+      RECT 10.675000  1.495000 10.925000 2.635000 ;
+    LAYER mcon ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
index b0ef654..c3ecadc 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_1.magic.lef
@@ -67,16 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.300000 0.085000 ;
-        RECT 0.110000  0.085000 0.350000 0.595000 ;
-        RECT 1.130000  0.085000 1.345000 0.595000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.300000 0.240000 ;
     END
@@ -85,26 +75,33 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.300000 2.805000 ;
-        RECT 1.095000 1.835000 1.425000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.300000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.120000 1.495000 1.745000 1.665000 ;
-      RECT 0.120000 1.665000 0.510000 1.840000 ;
-      RECT 0.610000 0.265000 0.850000 0.595000 ;
-      RECT 0.610000 0.595000 0.780000 1.495000 ;
-      RECT 1.525000 0.995000 1.745000 1.495000 ;
+      RECT 0.000000 -0.085000 2.300000 0.085000 ;
+      RECT 0.000000  2.635000 2.300000 2.805000 ;
+      RECT 0.110000  0.085000 0.350000 0.595000 ;
+      RECT 0.120000  1.495000 1.745000 1.665000 ;
+      RECT 0.120000  1.665000 0.510000 1.840000 ;
+      RECT 0.610000  0.265000 0.850000 0.595000 ;
+      RECT 0.610000  0.595000 0.780000 1.495000 ;
+      RECT 1.095000  1.835000 1.425000 2.635000 ;
+      RECT 1.130000  0.085000 1.345000 0.595000 ;
+      RECT 1.525000  0.995000 1.745000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
index eb02b45..64510f7 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_2.magic.lef
@@ -69,18 +69,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.105000  0.085000 0.345000 0.595000 ;
-        RECT 1.135000  0.085000 1.450000 0.595000 ;
-        RECT 2.010000  0.085000 2.390000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -89,28 +77,37 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 1.200000 1.835000 1.370000 2.635000 ;
-        RECT 2.140000 2.175000 2.310000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 1.495000 1.765000 1.665000 ;
-      RECT 0.155000 1.665000 0.515000 1.840000 ;
-      RECT 0.515000 0.255000 0.855000 0.595000 ;
-      RECT 0.515000 0.595000 0.745000 1.495000 ;
-      RECT 1.545000 0.995000 1.765000 1.495000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.105000  0.085000 0.345000 0.595000 ;
+      RECT 0.155000  1.495000 1.765000 1.665000 ;
+      RECT 0.155000  1.665000 0.515000 1.840000 ;
+      RECT 0.515000  0.255000 0.855000 0.595000 ;
+      RECT 0.515000  0.595000 0.745000 1.495000 ;
+      RECT 1.135000  0.085000 1.450000 0.595000 ;
+      RECT 1.200000  1.835000 1.370000 2.635000 ;
+      RECT 1.545000  0.995000 1.765000 1.495000 ;
+      RECT 2.010000  0.085000 2.390000 0.485000 ;
+      RECT 2.140000  2.175000 2.310000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
index 51eda3d..9a8d36f 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_4.magic.lef
@@ -73,21 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.105000  0.085000 0.345000 0.595000 ;
-        RECT 1.160000  0.085000 1.330000 0.825000 ;
-        RECT 2.140000  0.085000 2.310000 0.565000 ;
-        RECT 3.080000  0.085000 3.250000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -96,32 +81,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 1.160000 1.835000 1.330000 2.635000 ;
-        RECT 2.140000 2.175000 2.310000 2.635000 ;
-        RECT 3.080000 1.835000 3.250000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.155000 1.495000 1.765000 1.665000 ;
-      RECT 0.155000 1.665000 0.515000 2.465000 ;
-      RECT 0.515000 0.290000 0.895000 0.825000 ;
-      RECT 0.515000 0.825000 0.745000 1.495000 ;
-      RECT 1.510000 1.075000 2.620000 1.245000 ;
-      RECT 1.510000 1.245000 1.765000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.105000  0.085000 0.345000 0.595000 ;
+      RECT 0.155000  1.495000 1.765000 1.665000 ;
+      RECT 0.155000  1.665000 0.515000 2.465000 ;
+      RECT 0.515000  0.290000 0.895000 0.825000 ;
+      RECT 0.515000  0.825000 0.745000 1.495000 ;
+      RECT 1.160000  0.085000 1.330000 0.825000 ;
+      RECT 1.160000  1.835000 1.330000 2.635000 ;
+      RECT 1.510000  1.075000 2.620000 1.245000 ;
+      RECT 1.510000  1.245000 1.765000 1.495000 ;
+      RECT 2.140000  0.085000 2.310000 0.565000 ;
+      RECT 2.140000  2.175000 2.310000 2.635000 ;
+      RECT 3.080000  0.085000 3.250000 0.565000 ;
+      RECT 3.080000  1.835000 3.250000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
index 4202f66..c86ccd5 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_6.magic.lef
@@ -73,29 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.145000  0.085000 0.415000 0.905000 ;
-        RECT 1.085000  0.085000 1.355000 0.555000 ;
-        RECT 2.025000  0.085000 2.815000 0.555000 ;
-        RECT 2.545000  0.555000 2.815000 0.905000 ;
-        RECT 3.455000  0.085000 3.785000 0.555000 ;
-        RECT 4.395000  0.085000 4.725000 0.555000 ;
-        RECT 5.335000  0.085000 5.665000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -104,47 +81,67 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.585000 1.835000 0.915000 2.635000 ;
-        RECT 2.545000 1.495000 2.815000 2.635000 ;
-        RECT 3.485000 1.835000 3.755000 2.635000 ;
-        RECT 4.425000 1.835000 4.695000 2.635000 ;
-        RECT 5.365000 1.835000 5.635000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 1.355000 1.665000 ;
-      RECT 0.090000 1.665000 0.415000 2.465000 ;
-      RECT 0.585000 0.255000 0.915000 0.725000 ;
-      RECT 0.585000 0.725000 1.855000 0.735000 ;
-      RECT 0.585000 0.735000 2.375000 0.905000 ;
-      RECT 1.085000 1.665000 1.355000 2.295000 ;
-      RECT 1.085000 2.295000 2.325000 2.465000 ;
-      RECT 1.525000 0.255000 1.855000 0.725000 ;
-      RECT 1.525000 1.445000 2.375000 1.665000 ;
-      RECT 1.525000 1.665000 1.855000 2.125000 ;
-      RECT 2.025000 1.835000 2.325000 2.295000 ;
-      RECT 2.195000 0.905000 2.375000 1.075000 ;
-      RECT 2.195000 1.075000 4.845000 1.275000 ;
-      RECT 2.195000 1.275000 2.375000 1.445000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.090000  1.455000 1.355000 1.665000 ;
+      RECT 0.090000  1.665000 0.415000 2.465000 ;
+      RECT 0.145000  0.085000 0.415000 0.905000 ;
+      RECT 0.585000  0.255000 0.915000 0.725000 ;
+      RECT 0.585000  0.725000 1.855000 0.735000 ;
+      RECT 0.585000  0.735000 2.375000 0.905000 ;
+      RECT 0.585000  1.835000 0.915000 2.635000 ;
+      RECT 1.085000  0.085000 1.355000 0.555000 ;
+      RECT 1.085000  1.665000 1.355000 2.295000 ;
+      RECT 1.085000  2.295000 2.325000 2.465000 ;
+      RECT 1.525000  0.255000 1.855000 0.725000 ;
+      RECT 1.525000  1.445000 2.375000 1.665000 ;
+      RECT 1.525000  1.665000 1.855000 2.125000 ;
+      RECT 2.025000  0.085000 2.815000 0.555000 ;
+      RECT 2.025000  1.835000 2.325000 2.295000 ;
+      RECT 2.195000  0.905000 2.375000 1.075000 ;
+      RECT 2.195000  1.075000 4.845000 1.275000 ;
+      RECT 2.195000  1.275000 2.375000 1.445000 ;
+      RECT 2.545000  0.555000 2.815000 0.905000 ;
+      RECT 2.545000  1.495000 2.815000 2.635000 ;
+      RECT 3.455000  0.085000 3.785000 0.555000 ;
+      RECT 3.485000  1.835000 3.755000 2.635000 ;
+      RECT 4.395000  0.085000 4.725000 0.555000 ;
+      RECT 4.425000  1.835000 4.695000 2.635000 ;
+      RECT 5.335000  0.085000 5.665000 0.555000 ;
+      RECT 5.365000  1.835000 5.635000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
index 071c869..33553fc 100644
--- a/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
+++ b/cells/or2/sky130_fd_sc_hdll__or2_8.magic.lef
@@ -75,32 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.900000 0.085000 ;
-        RECT 0.145000  0.085000 0.415000 0.905000 ;
-        RECT 1.085000  0.085000 1.355000 0.555000 ;
-        RECT 2.025000  0.085000 2.815000 0.555000 ;
-        RECT 2.545000  0.555000 2.815000 0.905000 ;
-        RECT 3.455000  0.085000 3.785000 0.555000 ;
-        RECT 4.395000  0.085000 4.725000 0.555000 ;
-        RECT 5.335000  0.085000 5.665000 0.555000 ;
-        RECT 6.275000  0.085000 6.605000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.900000 0.240000 ;
     END
@@ -109,50 +83,73 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.900000 2.805000 ;
-        RECT 0.585000 1.835000 0.915000 2.635000 ;
-        RECT 2.545000 1.495000 2.815000 2.635000 ;
-        RECT 3.485000 1.835000 3.755000 2.635000 ;
-        RECT 4.425000 1.835000 4.695000 2.635000 ;
-        RECT 5.365000 1.835000 5.635000 2.635000 ;
-        RECT 6.305000 1.835000 6.575000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.900000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.455000 1.355000 1.665000 ;
-      RECT 0.090000 1.665000 0.415000 2.465000 ;
-      RECT 0.585000 0.255000 0.915000 0.725000 ;
-      RECT 0.585000 0.725000 1.855000 0.735000 ;
-      RECT 0.585000 0.735000 2.375000 0.905000 ;
-      RECT 1.085000 1.665000 1.355000 2.295000 ;
-      RECT 1.085000 2.295000 2.325000 2.465000 ;
-      RECT 1.525000 0.255000 1.855000 0.725000 ;
-      RECT 1.525000 1.445000 2.375000 1.665000 ;
-      RECT 1.525000 1.665000 1.855000 2.125000 ;
-      RECT 2.025000 1.835000 2.325000 2.295000 ;
-      RECT 2.195000 0.905000 2.375000 1.075000 ;
-      RECT 2.195000 1.075000 5.525000 1.275000 ;
-      RECT 2.195000 1.275000 2.375000 1.445000 ;
+      RECT 0.000000 -0.085000 6.900000 0.085000 ;
+      RECT 0.000000  2.635000 6.900000 2.805000 ;
+      RECT 0.090000  1.455000 1.355000 1.665000 ;
+      RECT 0.090000  1.665000 0.415000 2.465000 ;
+      RECT 0.145000  0.085000 0.415000 0.905000 ;
+      RECT 0.585000  0.255000 0.915000 0.725000 ;
+      RECT 0.585000  0.725000 1.855000 0.735000 ;
+      RECT 0.585000  0.735000 2.375000 0.905000 ;
+      RECT 0.585000  1.835000 0.915000 2.635000 ;
+      RECT 1.085000  0.085000 1.355000 0.555000 ;
+      RECT 1.085000  1.665000 1.355000 2.295000 ;
+      RECT 1.085000  2.295000 2.325000 2.465000 ;
+      RECT 1.525000  0.255000 1.855000 0.725000 ;
+      RECT 1.525000  1.445000 2.375000 1.665000 ;
+      RECT 1.525000  1.665000 1.855000 2.125000 ;
+      RECT 2.025000  0.085000 2.815000 0.555000 ;
+      RECT 2.025000  1.835000 2.325000 2.295000 ;
+      RECT 2.195000  0.905000 2.375000 1.075000 ;
+      RECT 2.195000  1.075000 5.525000 1.275000 ;
+      RECT 2.195000  1.275000 2.375000 1.445000 ;
+      RECT 2.545000  0.555000 2.815000 0.905000 ;
+      RECT 2.545000  1.495000 2.815000 2.635000 ;
+      RECT 3.455000  0.085000 3.785000 0.555000 ;
+      RECT 3.485000  1.835000 3.755000 2.635000 ;
+      RECT 4.395000  0.085000 4.725000 0.555000 ;
+      RECT 4.425000  1.835000 4.695000 2.635000 ;
+      RECT 5.335000  0.085000 5.665000 0.555000 ;
+      RECT 5.365000  1.835000 5.635000 2.635000 ;
+      RECT 6.275000  0.085000 6.605000 0.555000 ;
+      RECT 6.305000  1.835000 6.575000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
index 7c65241..b0aa957 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_1.magic.lef
@@ -67,17 +67,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.640000  0.085000 1.375000 0.565000 ;
-        RECT 1.935000  0.085000 2.365000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -86,35 +75,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 0.090000 1.495000 0.345000 2.635000 ;
-        RECT 2.065000 1.835000 2.345000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.265000 0.420000 0.735000 ;
-      RECT 0.110000 0.735000 0.895000 0.905000 ;
-      RECT 0.645000 0.905000 0.895000 0.995000 ;
-      RECT 0.645000 0.995000 1.385000 1.325000 ;
-      RECT 0.645000 1.325000 0.815000 1.885000 ;
-      RECT 1.040000 1.495000 2.385000 1.665000 ;
-      RECT 1.040000 1.665000 1.460000 1.915000 ;
-      RECT 1.595000 0.305000 1.765000 0.655000 ;
-      RECT 1.595000 0.655000 2.385000 0.825000 ;
-      RECT 2.215000 0.825000 2.385000 0.995000 ;
-      RECT 2.215000 0.995000 2.445000 1.325000 ;
-      RECT 2.215000 1.325000 2.385000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.090000  1.495000 0.345000 2.635000 ;
+      RECT 0.110000  0.265000 0.420000 0.735000 ;
+      RECT 0.110000  0.735000 0.895000 0.905000 ;
+      RECT 0.640000  0.085000 1.375000 0.565000 ;
+      RECT 0.645000  0.905000 0.895000 0.995000 ;
+      RECT 0.645000  0.995000 1.385000 1.325000 ;
+      RECT 0.645000  1.325000 0.815000 1.885000 ;
+      RECT 1.040000  1.495000 2.385000 1.665000 ;
+      RECT 1.040000  1.665000 1.460000 1.915000 ;
+      RECT 1.595000  0.305000 1.765000 0.655000 ;
+      RECT 1.595000  0.655000 2.385000 0.825000 ;
+      RECT 1.935000  0.085000 2.365000 0.485000 ;
+      RECT 2.065000  1.835000 2.345000 2.635000 ;
+      RECT 2.215000  0.825000 2.385000 0.995000 ;
+      RECT 2.215000  0.995000 2.445000 1.325000 ;
+      RECT 2.215000  1.325000 2.385000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
index 8750712..c8d9628 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_2.magic.lef
@@ -65,20 +65,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.640000  0.085000 1.370000 0.565000 ;
-        RECT 2.030000  0.085000 2.360000 0.485000 ;
-        RECT 3.285000  0.085000 3.520000 0.925000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -87,36 +73,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 2.060000 1.835000 2.340000 2.635000 ;
-        RECT 3.285000 1.460000 3.520000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.265000 0.420000 0.735000 ;
-      RECT 0.105000 0.735000 0.890000 0.905000 ;
-      RECT 0.645000 0.905000 0.890000 0.995000 ;
-      RECT 0.645000 0.995000 1.380000 1.325000 ;
-      RECT 0.645000 1.325000 0.815000 1.885000 ;
-      RECT 1.035000 1.495000 2.440000 1.665000 ;
-      RECT 1.035000 1.665000 1.455000 1.915000 ;
-      RECT 1.590000 0.305000 1.760000 0.655000 ;
-      RECT 1.590000 0.655000 2.440000 0.825000 ;
-      RECT 2.270000 0.825000 2.440000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 0.105000  0.265000 0.420000 0.735000 ;
+      RECT 0.105000  0.735000 0.890000 0.905000 ;
+      RECT 0.640000  0.085000 1.370000 0.565000 ;
+      RECT 0.645000  0.905000 0.890000 0.995000 ;
+      RECT 0.645000  0.995000 1.380000 1.325000 ;
+      RECT 0.645000  1.325000 0.815000 1.885000 ;
+      RECT 1.035000  1.495000 2.440000 1.665000 ;
+      RECT 1.035000  1.665000 1.455000 1.915000 ;
+      RECT 1.590000  0.305000 1.760000 0.655000 ;
+      RECT 1.590000  0.655000 2.440000 0.825000 ;
+      RECT 2.030000  0.085000 2.360000 0.485000 ;
+      RECT 2.060000  1.835000 2.340000 2.635000 ;
+      RECT 2.270000  0.825000 2.440000 1.495000 ;
+      RECT 3.285000  0.085000 3.520000 0.925000 ;
+      RECT 3.285000  1.460000 3.520000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
index 5e009dd..6c64949 100644
--- a/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
+++ b/cells/or2b/sky130_fd_sc_hdll__or2b_4.magic.lef
@@ -73,23 +73,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.640000  0.085000 1.295000 0.565000 ;
-        RECT 2.130000  0.085000 2.305000 0.905000 ;
-        RECT 3.075000  0.085000 3.245000 0.550000 ;
-        RECT 4.015000  0.085000 4.185000 0.550000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -98,42 +81,56 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.090000 2.125000 0.345000 2.635000 ;
-        RECT 2.065000 1.835000 2.345000 2.635000 ;
-        RECT 3.035000 2.135000 3.285000 2.635000 ;
-        RECT 3.975000 1.795000 4.225000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.110000 0.265000 0.420000 0.735000 ;
-      RECT 0.110000 0.735000 0.895000 0.905000 ;
-      RECT 0.645000 0.905000 0.895000 0.995000 ;
-      RECT 0.645000 0.995000 1.170000 1.325000 ;
-      RECT 0.645000 1.325000 0.815000 2.465000 ;
-      RECT 1.040000 1.495000 2.860000 1.615000 ;
-      RECT 1.040000 1.615000 1.560000 2.465000 ;
-      RECT 1.340000 0.735000 1.845000 0.905000 ;
-      RECT 1.340000 0.905000 1.560000 1.445000 ;
-      RECT 1.340000 1.445000 2.860000 1.495000 ;
-      RECT 1.465000 0.305000 1.845000 0.735000 ;
-      RECT 2.690000 1.075000 3.800000 1.245000 ;
-      RECT 2.690000 1.245000 2.860000 1.445000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.090000  2.125000 0.345000 2.635000 ;
+      RECT 0.110000  0.265000 0.420000 0.735000 ;
+      RECT 0.110000  0.735000 0.895000 0.905000 ;
+      RECT 0.640000  0.085000 1.295000 0.565000 ;
+      RECT 0.645000  0.905000 0.895000 0.995000 ;
+      RECT 0.645000  0.995000 1.170000 1.325000 ;
+      RECT 0.645000  1.325000 0.815000 2.465000 ;
+      RECT 1.040000  1.495000 2.860000 1.615000 ;
+      RECT 1.040000  1.615000 1.560000 2.465000 ;
+      RECT 1.340000  0.735000 1.845000 0.905000 ;
+      RECT 1.340000  0.905000 1.560000 1.445000 ;
+      RECT 1.340000  1.445000 2.860000 1.495000 ;
+      RECT 1.465000  0.305000 1.845000 0.735000 ;
+      RECT 2.065000  1.835000 2.345000 2.635000 ;
+      RECT 2.130000  0.085000 2.305000 0.905000 ;
+      RECT 2.690000  1.075000 3.800000 1.245000 ;
+      RECT 2.690000  1.245000 2.860000 1.445000 ;
+      RECT 3.035000  2.135000 3.285000 2.635000 ;
+      RECT 3.075000  0.085000 3.245000 0.550000 ;
+      RECT 3.975000  1.795000 4.225000 2.635000 ;
+      RECT 4.015000  0.085000 4.185000 0.550000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
index 4fad2d6..962e60b 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_1.magic.lef
@@ -77,17 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 2.760000 0.085000 ;
-        RECT 0.525000  0.085000 0.905000 0.485000 ;
-        RECT 1.465000  0.085000 1.895000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 2.760000 0.240000 ;
     END
@@ -96,30 +85,38 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 2.760000 2.805000 ;
-        RECT 1.595000 1.835000 1.875000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 2.760000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.100000 0.305000 0.355000 0.655000 ;
-      RECT 0.100000 0.655000 1.975000 0.825000 ;
-      RECT 0.105000 1.495000 0.430000 1.785000 ;
-      RECT 0.105000 1.785000 1.375000 1.955000 ;
-      RECT 1.125000 0.305000 1.295000 0.655000 ;
-      RECT 1.205000 1.495000 1.975000 1.665000 ;
-      RECT 1.205000 1.665000 1.375000 1.785000 ;
-      RECT 1.805000 0.825000 1.975000 1.495000 ;
+      RECT 0.000000 -0.085000 2.760000 0.085000 ;
+      RECT 0.000000  2.635000 2.760000 2.805000 ;
+      RECT 0.100000  0.305000 0.355000 0.655000 ;
+      RECT 0.100000  0.655000 1.975000 0.825000 ;
+      RECT 0.105000  1.495000 0.430000 1.785000 ;
+      RECT 0.105000  1.785000 1.375000 1.955000 ;
+      RECT 0.525000  0.085000 0.905000 0.485000 ;
+      RECT 1.125000  0.305000 1.295000 0.655000 ;
+      RECT 1.205000  1.495000 1.975000 1.665000 ;
+      RECT 1.205000  1.665000 1.375000 1.785000 ;
+      RECT 1.465000  0.085000 1.895000 0.485000 ;
+      RECT 1.595000  1.835000 1.875000 2.635000 ;
+      RECT 1.805000  0.825000 1.975000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
index d20eef6..c58eb04 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_2.magic.lef
@@ -77,19 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.530000  0.085000 0.910000 0.485000 ;
-        RECT 1.470000  0.085000 2.090000 0.485000 ;
-        RECT 2.825000  0.085000 3.115000 0.915000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -98,34 +85,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 1.600000 1.835000 2.070000 2.635000 ;
-        RECT 2.825000 1.430000 3.115000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.105000 0.305000 0.360000 0.655000 ;
-      RECT 0.105000 0.655000 2.110000 0.825000 ;
-      RECT 0.105000 1.495000 0.385000 1.785000 ;
-      RECT 0.105000 1.785000 1.370000 1.955000 ;
-      RECT 1.130000 0.305000 1.300000 0.655000 ;
-      RECT 1.200000 1.495000 2.110000 1.665000 ;
-      RECT 1.200000 1.665000 1.370000 1.785000 ;
-      RECT 1.890000 0.825000 2.110000 0.995000 ;
-      RECT 1.890000 0.995000 2.300000 1.325000 ;
-      RECT 1.890000 1.325000 2.110000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.105000  0.305000 0.360000 0.655000 ;
+      RECT 0.105000  0.655000 2.110000 0.825000 ;
+      RECT 0.105000  1.495000 0.385000 1.785000 ;
+      RECT 0.105000  1.785000 1.370000 1.955000 ;
+      RECT 0.530000  0.085000 0.910000 0.485000 ;
+      RECT 1.130000  0.305000 1.300000 0.655000 ;
+      RECT 1.200000  1.495000 2.110000 1.665000 ;
+      RECT 1.200000  1.665000 1.370000 1.785000 ;
+      RECT 1.470000  0.085000 2.090000 0.485000 ;
+      RECT 1.600000  1.835000 2.070000 2.635000 ;
+      RECT 1.890000  0.825000 2.110000 0.995000 ;
+      RECT 1.890000  0.995000 2.300000 1.325000 ;
+      RECT 1.890000  1.325000 2.110000 1.495000 ;
+      RECT 2.825000  0.085000 3.115000 0.915000 ;
+      RECT 2.825000  1.430000 3.115000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
index 68c4101..301ca9a 100644
--- a/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
+++ b/cells/or3/sky130_fd_sc_hdll__or3_4.magic.lef
@@ -81,23 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.555000 ;
-        RECT 1.585000  0.085000 2.285000 0.555000 ;
-        RECT 3.055000  0.085000 3.225000 0.555000 ;
-        RECT 3.995000  0.085000 4.165000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -106,38 +89,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 1.585000 1.835000 2.285000 2.635000 ;
-        RECT 3.015000 1.795000 3.265000 2.635000 ;
-        RECT 3.955000 1.795000 4.205000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.425000 0.725000 ;
-      RECT 0.085000 0.725000 2.240000 0.905000 ;
-      RECT 0.085000 1.495000 0.425000 2.295000 ;
-      RECT 0.085000 2.295000 1.365000 2.465000 ;
-      RECT 0.985000 0.255000 1.365000 0.725000 ;
-      RECT 1.100000 1.495000 2.240000 1.665000 ;
-      RECT 1.100000 1.665000 1.365000 2.295000 ;
-      RECT 2.020000 0.905000 2.240000 1.075000 ;
-      RECT 2.020000 1.075000 3.945000 1.245000 ;
-      RECT 2.020000 1.245000 2.240000 1.495000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.255000 0.425000 0.725000 ;
+      RECT 0.085000  0.725000 2.240000 0.905000 ;
+      RECT 0.085000  1.495000 0.425000 2.295000 ;
+      RECT 0.085000  2.295000 1.365000 2.465000 ;
+      RECT 0.645000  0.085000 0.815000 0.555000 ;
+      RECT 0.985000  0.255000 1.365000 0.725000 ;
+      RECT 1.100000  1.495000 2.240000 1.665000 ;
+      RECT 1.100000  1.665000 1.365000 2.295000 ;
+      RECT 1.585000  0.085000 2.285000 0.555000 ;
+      RECT 1.585000  1.835000 2.285000 2.635000 ;
+      RECT 2.020000  0.905000 2.240000 1.075000 ;
+      RECT 2.020000  1.075000 3.945000 1.245000 ;
+      RECT 2.020000  1.245000 2.240000 1.495000 ;
+      RECT 3.015000  1.795000 3.265000 2.635000 ;
+      RECT 3.055000  0.085000 3.225000 0.555000 ;
+      RECT 3.955000  1.795000 4.205000 2.635000 ;
+      RECT 3.995000  0.085000 4.165000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
index e69fd39..58c97f5 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_1.magic.lef
@@ -77,20 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.905000 ;
-        RECT 1.505000  0.085000 1.885000 0.485000 ;
-        RECT 2.445000  0.085000 2.870000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -99,39 +85,50 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.085000 1.495000 0.345000 2.635000 ;
-        RECT 2.570000 1.835000 2.850000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.485000 0.895000 0.905000 ;
-      RECT 0.645000 0.905000 0.895000 0.995000 ;
-      RECT 0.645000 0.995000 1.270000 1.325000 ;
-      RECT 0.645000 1.325000 0.815000 1.885000 ;
-      RECT 1.075000 0.255000 1.335000 0.655000 ;
-      RECT 1.075000 0.655000 2.890000 0.825000 ;
-      RECT 1.075000 1.495000 1.335000 1.785000 ;
-      RECT 1.075000 1.785000 2.350000 1.955000 ;
-      RECT 2.105000 0.305000 2.275000 0.655000 ;
-      RECT 2.180000 1.495000 2.890000 1.665000 ;
-      RECT 2.180000 1.665000 2.350000 1.785000 ;
-      RECT 2.720000 0.825000 2.890000 0.995000 ;
-      RECT 2.720000 0.995000 2.995000 1.325000 ;
-      RECT 2.720000 1.325000 2.890000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.905000 ;
+      RECT 0.085000  1.495000 0.345000 2.635000 ;
+      RECT 0.515000  0.485000 0.895000 0.905000 ;
+      RECT 0.645000  0.905000 0.895000 0.995000 ;
+      RECT 0.645000  0.995000 1.270000 1.325000 ;
+      RECT 0.645000  1.325000 0.815000 1.885000 ;
+      RECT 1.075000  0.255000 1.335000 0.655000 ;
+      RECT 1.075000  0.655000 2.890000 0.825000 ;
+      RECT 1.075000  1.495000 1.335000 1.785000 ;
+      RECT 1.075000  1.785000 2.350000 1.955000 ;
+      RECT 1.505000  0.085000 1.885000 0.485000 ;
+      RECT 2.105000  0.305000 2.275000 0.655000 ;
+      RECT 2.180000  1.495000 2.890000 1.665000 ;
+      RECT 2.180000  1.665000 2.350000 1.785000 ;
+      RECT 2.445000  0.085000 2.870000 0.485000 ;
+      RECT 2.570000  1.835000 2.850000 2.635000 ;
+      RECT 2.720000  0.825000 2.890000 0.995000 ;
+      RECT 2.720000  0.995000 2.995000 1.325000 ;
+      RECT 2.720000  1.325000 2.890000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
index 875e445..b23328b 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_2.magic.lef
@@ -76,20 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.645000  0.085000 0.815000 0.565000 ;
-        RECT 1.865000  0.085000 2.035000 0.565000 ;
-        RECT 2.740000  0.085000 3.070000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -98,43 +84,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.600000 2.210000 0.960000 2.635000 ;
-        RECT 1.685000 2.210000 2.015000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.290000 0.345000 0.735000 ;
-      RECT 0.085000 0.735000 0.815000 0.905000 ;
-      RECT 0.085000 1.810000 0.815000 1.870000 ;
-      RECT 0.085000 1.870000 3.020000 1.955000 ;
-      RECT 0.085000 1.955000 1.980000 2.040000 ;
-      RECT 0.085000 2.040000 0.345000 2.220000 ;
-      RECT 0.645000 0.905000 0.815000 1.810000 ;
-      RECT 1.485000 0.735000 3.545000 0.825000 ;
-      RECT 1.485000 0.825000 2.535000 0.905000 ;
-      RECT 1.485000 0.905000 1.655000 1.325000 ;
-      RECT 1.810000 1.785000 3.020000 1.870000 ;
-      RECT 2.365000 0.305000 2.535000 0.655000 ;
-      RECT 2.365000 0.655000 3.545000 0.735000 ;
-      RECT 2.850000 0.995000 3.200000 1.325000 ;
-      RECT 2.850000 1.325000 3.020000 1.785000 ;
-      RECT 3.240000 0.305000 3.545000 0.655000 ;
-      RECT 3.240000 1.495000 3.545000 1.925000 ;
-      RECT 3.375000 0.825000 3.545000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.290000 0.345000 0.735000 ;
+      RECT 0.085000  0.735000 0.815000 0.905000 ;
+      RECT 0.085000  1.810000 0.815000 1.870000 ;
+      RECT 0.085000  1.870000 3.020000 1.955000 ;
+      RECT 0.085000  1.955000 1.980000 2.040000 ;
+      RECT 0.085000  2.040000 0.345000 2.220000 ;
+      RECT 0.600000  2.210000 0.960000 2.635000 ;
+      RECT 0.645000  0.085000 0.815000 0.565000 ;
+      RECT 0.645000  0.905000 0.815000 1.810000 ;
+      RECT 1.485000  0.735000 3.545000 0.825000 ;
+      RECT 1.485000  0.825000 2.535000 0.905000 ;
+      RECT 1.485000  0.905000 1.655000 1.325000 ;
+      RECT 1.685000  2.210000 2.015000 2.635000 ;
+      RECT 1.810000  1.785000 3.020000 1.870000 ;
+      RECT 1.865000  0.085000 2.035000 0.565000 ;
+      RECT 2.365000  0.305000 2.535000 0.655000 ;
+      RECT 2.365000  0.655000 3.545000 0.735000 ;
+      RECT 2.740000  0.085000 3.070000 0.485000 ;
+      RECT 2.850000  0.995000 3.200000 1.325000 ;
+      RECT 2.850000  1.325000 3.020000 1.785000 ;
+      RECT 3.240000  0.305000 3.545000 0.655000 ;
+      RECT 3.240000  1.495000 3.545000 1.925000 ;
+      RECT 3.375000  0.825000 3.545000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
index bcc567a..bd40b65 100644
--- a/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
+++ b/cells/or3b/sky130_fd_sc_hdll__or3b_4.magic.lef
@@ -78,23 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.670000  0.085000 0.840000 0.565000 ;
-        RECT 1.650000  0.085000 1.820000 0.565000 ;
-        RECT 2.460000  0.085000 2.840000 0.485000 ;
-        RECT 3.400000  0.085000 3.840000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -103,40 +86,54 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.600000 2.210000 0.960000 2.635000 ;
-        RECT 1.520000 2.210000 1.900000 2.635000 ;
-        RECT 2.455000 2.210000 2.845000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.290000 0.345000 0.735000 ;
-      RECT 0.085000 0.735000 0.815000 0.905000 ;
-      RECT 0.085000 1.810000 0.815000 1.870000 ;
-      RECT 0.085000 1.870000 4.030000 2.040000 ;
-      RECT 0.085000 2.040000 0.345000 2.220000 ;
-      RECT 0.645000 0.905000 0.815000 1.810000 ;
-      RECT 1.440000 1.075000 2.615000 1.245000 ;
-      RECT 2.445000 0.655000 4.455000 0.825000 ;
-      RECT 2.445000 0.825000 2.615000 1.075000 ;
-      RECT 3.860000 0.995000 4.030000 1.870000 ;
-      RECT 3.870000 2.210000 4.455000 2.425000 ;
-      RECT 4.250000 0.825000 4.455000 2.210000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.290000 0.345000 0.735000 ;
+      RECT 0.085000  0.735000 0.815000 0.905000 ;
+      RECT 0.085000  1.810000 0.815000 1.870000 ;
+      RECT 0.085000  1.870000 4.030000 2.040000 ;
+      RECT 0.085000  2.040000 0.345000 2.220000 ;
+      RECT 0.600000  2.210000 0.960000 2.635000 ;
+      RECT 0.645000  0.905000 0.815000 1.810000 ;
+      RECT 0.670000  0.085000 0.840000 0.565000 ;
+      RECT 1.440000  1.075000 2.615000 1.245000 ;
+      RECT 1.520000  2.210000 1.900000 2.635000 ;
+      RECT 1.650000  0.085000 1.820000 0.565000 ;
+      RECT 2.445000  0.655000 4.455000 0.825000 ;
+      RECT 2.445000  0.825000 2.615000 1.075000 ;
+      RECT 2.455000  2.210000 2.845000 2.635000 ;
+      RECT 2.460000  0.085000 2.840000 0.485000 ;
+      RECT 3.400000  0.085000 3.840000 0.485000 ;
+      RECT 3.860000  0.995000 4.030000 1.870000 ;
+      RECT 3.870000  2.210000 4.455000 2.425000 ;
+      RECT 4.250000  0.825000 4.455000 2.210000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
index 10ea3ef..2b2e47f 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_1.magic.lef
@@ -85,19 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.220000 0.085000 ;
-        RECT 0.095000  0.085000 0.425000 0.585000 ;
-        RECT 1.045000  0.085000 1.425000 0.485000 ;
-        RECT 1.985000  0.085000 2.415000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.220000 0.240000 ;
     END
@@ -106,33 +93,43 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.220000 2.805000 ;
-        RECT 2.115000 1.835000 2.395000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.220000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.090000 1.495000 0.410000 1.785000 ;
-      RECT 0.090000 1.785000 1.830000 1.955000 ;
-      RECT 0.675000 0.305000 0.845000 0.655000 ;
-      RECT 0.675000 0.655000 2.435000 0.825000 ;
-      RECT 1.645000 0.305000 1.815000 0.655000 ;
-      RECT 1.660000 1.495000 2.435000 1.665000 ;
-      RECT 1.660000 1.665000 1.830000 1.785000 ;
-      RECT 2.265000 0.825000 2.435000 0.995000 ;
-      RECT 2.265000 0.995000 2.555000 1.325000 ;
-      RECT 2.265000 1.325000 2.435000 1.495000 ;
+      RECT 0.000000 -0.085000 3.220000 0.085000 ;
+      RECT 0.000000  2.635000 3.220000 2.805000 ;
+      RECT 0.090000  1.495000 0.410000 1.785000 ;
+      RECT 0.090000  1.785000 1.830000 1.955000 ;
+      RECT 0.095000  0.085000 0.425000 0.585000 ;
+      RECT 0.675000  0.305000 0.845000 0.655000 ;
+      RECT 0.675000  0.655000 2.435000 0.825000 ;
+      RECT 1.045000  0.085000 1.425000 0.485000 ;
+      RECT 1.645000  0.305000 1.815000 0.655000 ;
+      RECT 1.660000  1.495000 2.435000 1.665000 ;
+      RECT 1.660000  1.665000 1.830000 1.785000 ;
+      RECT 1.985000  0.085000 2.415000 0.485000 ;
+      RECT 2.115000  1.835000 2.395000 2.635000 ;
+      RECT 2.265000  0.825000 2.435000 0.995000 ;
+      RECT 2.265000  0.995000 2.555000 1.325000 ;
+      RECT 2.265000  1.325000 2.435000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
index 612e0c4..540441b 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_2.magic.lef
@@ -85,21 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.090000  0.085000 0.425000 0.585000 ;
-        RECT 1.045000  0.085000 1.425000 0.485000 ;
-        RECT 1.985000  0.085000 2.415000 0.485000 ;
-        RECT 3.315000  0.085000 3.535000 1.000000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -108,35 +93,47 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 2.115000 1.835000 2.395000 2.635000 ;
-        RECT 3.315000 1.455000 3.535000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 1.495000 0.410000 1.785000 ;
-      RECT 0.085000 1.785000 1.830000 1.955000 ;
-      RECT 0.675000 0.305000 0.845000 0.655000 ;
-      RECT 0.675000 0.655000 2.435000 0.825000 ;
-      RECT 1.645000 0.305000 1.815000 0.655000 ;
-      RECT 1.660000 1.495000 2.435000 1.665000 ;
-      RECT 1.660000 1.665000 1.830000 1.785000 ;
-      RECT 2.265000 0.825000 2.435000 0.995000 ;
-      RECT 2.265000 0.995000 2.700000 1.325000 ;
-      RECT 2.265000 1.325000 2.435000 1.495000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  1.495000 0.410000 1.785000 ;
+      RECT 0.085000  1.785000 1.830000 1.955000 ;
+      RECT 0.090000  0.085000 0.425000 0.585000 ;
+      RECT 0.675000  0.305000 0.845000 0.655000 ;
+      RECT 0.675000  0.655000 2.435000 0.825000 ;
+      RECT 1.045000  0.085000 1.425000 0.485000 ;
+      RECT 1.645000  0.305000 1.815000 0.655000 ;
+      RECT 1.660000  1.495000 2.435000 1.665000 ;
+      RECT 1.660000  1.665000 1.830000 1.785000 ;
+      RECT 1.985000  0.085000 2.415000 0.485000 ;
+      RECT 2.115000  1.835000 2.395000 2.635000 ;
+      RECT 2.265000  0.825000 2.435000 0.995000 ;
+      RECT 2.265000  0.995000 2.700000 1.325000 ;
+      RECT 2.265000  1.325000 2.435000 1.495000 ;
+      RECT 3.315000  0.085000 3.535000 1.000000 ;
+      RECT 3.315000  1.455000 3.535000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
index c89156a..547fb13 100644
--- a/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
+++ b/cells/or4/sky130_fd_sc_hdll__or4_4.magic.lef
@@ -93,24 +93,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.120000  0.085000 0.370000 0.585000 ;
-        RECT 1.120000  0.085000 1.500000 0.485000 ;
-        RECT 2.160000  0.085000 2.540000 0.485000 ;
-        RECT 3.240000  0.085000 3.410000 0.555000 ;
-        RECT 4.180000  0.085000 4.350000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -119,36 +101,51 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 2.205000 1.795000 2.455000 2.635000 ;
-        RECT 3.200000 1.795000 3.450000 2.635000 ;
-        RECT 4.140000 1.795000 4.390000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.115000 1.495000 0.760000 1.665000 ;
-      RECT 0.115000 1.665000 0.450000 2.450000 ;
-      RECT 0.540000 0.655000 2.550000 0.825000 ;
-      RECT 0.540000 0.825000 0.760000 1.495000 ;
-      RECT 0.750000 0.305000 0.920000 0.655000 ;
-      RECT 1.720000 0.305000 1.890000 0.655000 ;
-      RECT 2.380000 0.825000 2.550000 1.075000 ;
-      RECT 2.380000 1.075000 3.990000 1.245000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.115000  1.495000 0.760000 1.665000 ;
+      RECT 0.115000  1.665000 0.450000 2.450000 ;
+      RECT 0.120000  0.085000 0.370000 0.585000 ;
+      RECT 0.540000  0.655000 2.550000 0.825000 ;
+      RECT 0.540000  0.825000 0.760000 1.495000 ;
+      RECT 0.750000  0.305000 0.920000 0.655000 ;
+      RECT 1.120000  0.085000 1.500000 0.485000 ;
+      RECT 1.720000  0.305000 1.890000 0.655000 ;
+      RECT 2.160000  0.085000 2.540000 0.485000 ;
+      RECT 2.205000  1.795000 2.455000 2.635000 ;
+      RECT 2.380000  0.825000 2.550000 1.075000 ;
+      RECT 2.380000  1.075000 3.990000 1.245000 ;
+      RECT 3.200000  1.795000 3.450000 2.635000 ;
+      RECT 3.240000  0.085000 3.410000 0.555000 ;
+      RECT 4.140000  1.795000 4.390000 2.635000 ;
+      RECT 4.180000  0.085000 4.350000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
index 2c94a54..1e0be5b 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_1.magic.lef
@@ -85,22 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.085000  0.085000 0.425000 0.585000 ;
-        RECT 1.085000  0.085000 1.415000 0.585000 ;
-        RECT 2.010000  0.085000 2.390000 0.485000 ;
-        RECT 2.950000  0.085000 3.380000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -109,39 +93,52 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.085000 1.560000 0.425000 2.635000 ;
-        RECT 3.080000 1.835000 3.360000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.645000 0.305000 0.890000 0.995000 ;
-      RECT 0.645000 0.995000 1.300000 1.325000 ;
-      RECT 0.645000 1.325000 0.885000 1.920000 ;
-      RECT 1.080000 1.495000 1.400000 1.785000 ;
-      RECT 1.080000 1.785000 2.860000 1.955000 ;
-      RECT 1.665000 0.305000 1.835000 0.655000 ;
-      RECT 1.665000 0.655000 3.415000 0.825000 ;
-      RECT 2.610000 0.305000 2.780000 0.655000 ;
-      RECT 2.690000 1.495000 3.415000 1.665000 ;
-      RECT 2.690000 1.665000 2.860000 1.785000 ;
-      RECT 3.245000 0.825000 3.415000 0.995000 ;
-      RECT 3.245000 0.995000 3.505000 1.325000 ;
-      RECT 3.245000 1.325000 3.415000 1.495000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.085000 0.425000 0.585000 ;
+      RECT 0.085000  1.560000 0.425000 2.635000 ;
+      RECT 0.645000  0.305000 0.890000 0.995000 ;
+      RECT 0.645000  0.995000 1.300000 1.325000 ;
+      RECT 0.645000  1.325000 0.885000 1.920000 ;
+      RECT 1.080000  1.495000 1.400000 1.785000 ;
+      RECT 1.080000  1.785000 2.860000 1.955000 ;
+      RECT 1.085000  0.085000 1.415000 0.585000 ;
+      RECT 1.665000  0.305000 1.835000 0.655000 ;
+      RECT 1.665000  0.655000 3.415000 0.825000 ;
+      RECT 2.010000  0.085000 2.390000 0.485000 ;
+      RECT 2.610000  0.305000 2.780000 0.655000 ;
+      RECT 2.690000  1.495000 3.415000 1.665000 ;
+      RECT 2.690000  1.665000 2.860000 1.785000 ;
+      RECT 2.950000  0.085000 3.380000 0.485000 ;
+      RECT 3.080000  1.835000 3.360000 2.635000 ;
+      RECT 3.245000  0.825000 3.415000 0.995000 ;
+      RECT 3.245000  0.995000 3.505000 1.325000 ;
+      RECT 3.245000  1.325000 3.415000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
index 1d7447d..02b67a7 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_2.magic.lef
@@ -85,22 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.140000 0.085000 ;
-        RECT 0.680000  0.085000 0.850000 0.565000 ;
-        RECT 1.535000  0.085000 1.965000 0.485000 ;
-        RECT 2.585000  0.085000 2.915000 0.485000 ;
-        RECT 3.525000  0.085000 3.905000 0.585000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.140000 0.240000 ;
     END
@@ -109,44 +93,57 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.140000 2.805000 ;
-        RECT 0.515000 2.335000 0.895000 2.635000 ;
-        RECT 1.630000 2.335000 1.965000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.140000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.325000 0.350000 0.735000 ;
-      RECT 0.085000 0.735000 0.815000 0.905000 ;
-      RECT 0.085000 1.605000 0.815000 1.890000 ;
-      RECT 0.510000 1.890000 0.815000 1.995000 ;
-      RECT 0.510000 1.995000 1.865000 2.165000 ;
-      RECT 0.645000 0.905000 0.815000 1.605000 ;
-      RECT 1.405000 0.960000 1.735000 1.325000 ;
-      RECT 1.520000 1.325000 1.735000 1.445000 ;
-      RECT 1.520000 1.445000 3.910000 1.615000 ;
-      RECT 1.540000 1.785000 3.330000 1.955000 ;
-      RECT 1.540000 1.955000 1.865000 1.995000 ;
-      RECT 1.565000 0.700000 3.305000 0.870000 ;
-      RECT 1.565000 0.870000 1.735000 0.960000 ;
-      RECT 2.185000 0.270000 2.355000 0.700000 ;
-      RECT 3.135000 0.270000 3.305000 0.700000 ;
-      RECT 3.160000 1.955000 3.330000 2.215000 ;
-      RECT 3.160000 2.215000 3.695000 2.385000 ;
-      RECT 3.525000 1.615000 3.910000 1.780000 ;
+      RECT 0.000000 -0.085000 4.140000 0.085000 ;
+      RECT 0.000000  2.635000 4.140000 2.805000 ;
+      RECT 0.085000  0.325000 0.350000 0.735000 ;
+      RECT 0.085000  0.735000 0.815000 0.905000 ;
+      RECT 0.085000  1.605000 0.815000 1.890000 ;
+      RECT 0.510000  1.890000 0.815000 1.995000 ;
+      RECT 0.510000  1.995000 1.865000 2.165000 ;
+      RECT 0.515000  2.335000 0.895000 2.635000 ;
+      RECT 0.645000  0.905000 0.815000 1.605000 ;
+      RECT 0.680000  0.085000 0.850000 0.565000 ;
+      RECT 1.405000  0.960000 1.735000 1.325000 ;
+      RECT 1.520000  1.325000 1.735000 1.445000 ;
+      RECT 1.520000  1.445000 3.910000 1.615000 ;
+      RECT 1.535000  0.085000 1.965000 0.485000 ;
+      RECT 1.540000  1.785000 3.330000 1.955000 ;
+      RECT 1.540000  1.955000 1.865000 1.995000 ;
+      RECT 1.565000  0.700000 3.305000 0.870000 ;
+      RECT 1.565000  0.870000 1.735000 0.960000 ;
+      RECT 1.630000  2.335000 1.965000 2.635000 ;
+      RECT 2.185000  0.270000 2.355000 0.700000 ;
+      RECT 2.585000  0.085000 2.915000 0.485000 ;
+      RECT 3.135000  0.270000 3.305000 0.700000 ;
+      RECT 3.160000  1.955000 3.330000 2.215000 ;
+      RECT 3.160000  2.215000 3.695000 2.385000 ;
+      RECT 3.525000  0.085000 3.905000 0.585000 ;
+      RECT 3.525000  1.615000 3.910000 1.780000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
index 63718c0..2ba681f 100644
--- a/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
+++ b/cells/or4b/sky130_fd_sc_hdll__or4b_4.magic.lef
@@ -90,27 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.520000 0.085000 ;
-        RECT 0.085000  0.085000 0.345000 0.825000 ;
-        RECT 1.085000  0.085000 1.335000 0.585000 ;
-        RECT 2.085000  0.085000 2.465000 0.485000 ;
-        RECT 3.125000  0.085000 3.505000 0.485000 ;
-        RECT 4.205000  0.085000 4.375000 0.555000 ;
-        RECT 5.145000  0.085000 5.315000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.520000 0.240000 ;
     END
@@ -119,42 +98,60 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.520000 2.805000 ;
-        RECT 0.085000 2.135000 0.365000 2.635000 ;
-        RECT 3.170000 1.795000 3.420000 2.635000 ;
-        RECT 4.165000 1.795000 4.415000 2.635000 ;
-        RECT 5.105000 1.795000 5.355000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.520000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.645000 0.435000 0.835000 0.995000 ;
-      RECT 0.645000 0.995000 1.265000 1.325000 ;
-      RECT 0.645000 1.325000 0.835000 2.455000 ;
-      RECT 1.085000 1.575000 1.725000 1.745000 ;
-      RECT 1.085000 1.745000 1.415000 2.450000 ;
-      RECT 1.505000 0.655000 3.515000 0.825000 ;
-      RECT 1.505000 0.825000 1.725000 1.575000 ;
-      RECT 1.715000 0.305000 1.885000 0.655000 ;
-      RECT 2.685000 0.305000 2.855000 0.655000 ;
-      RECT 3.345000 0.825000 3.515000 1.075000 ;
-      RECT 3.345000 1.075000 4.955000 1.245000 ;
+      RECT 0.000000 -0.085000 5.520000 0.085000 ;
+      RECT 0.000000  2.635000 5.520000 2.805000 ;
+      RECT 0.085000  0.085000 0.345000 0.825000 ;
+      RECT 0.085000  2.135000 0.365000 2.635000 ;
+      RECT 0.645000  0.435000 0.835000 0.995000 ;
+      RECT 0.645000  0.995000 1.265000 1.325000 ;
+      RECT 0.645000  1.325000 0.835000 2.455000 ;
+      RECT 1.085000  0.085000 1.335000 0.585000 ;
+      RECT 1.085000  1.575000 1.725000 1.745000 ;
+      RECT 1.085000  1.745000 1.415000 2.450000 ;
+      RECT 1.505000  0.655000 3.515000 0.825000 ;
+      RECT 1.505000  0.825000 1.725000 1.575000 ;
+      RECT 1.715000  0.305000 1.885000 0.655000 ;
+      RECT 2.085000  0.085000 2.465000 0.485000 ;
+      RECT 2.685000  0.305000 2.855000 0.655000 ;
+      RECT 3.125000  0.085000 3.505000 0.485000 ;
+      RECT 3.170000  1.795000 3.420000 2.635000 ;
+      RECT 3.345000  0.825000 3.515000 1.075000 ;
+      RECT 3.345000  1.075000 4.955000 1.245000 ;
+      RECT 4.165000  1.795000 4.415000 2.635000 ;
+      RECT 4.205000  0.085000 4.375000 0.555000 ;
+      RECT 5.105000  1.795000 5.355000 2.635000 ;
+      RECT 5.145000  0.085000 5.315000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
index c9550dc..9b77c0f 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_1.magic.lef
@@ -85,23 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 4.600000 0.085000 ;
-        RECT 0.705000  0.085000 0.875000 0.825000 ;
-        RECT 1.570000  0.085000 1.945000 0.485000 ;
-        RECT 2.520000  0.085000 2.900000 0.485000 ;
-        RECT 3.460000  0.085000 3.890000 0.485000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 4.600000 0.240000 ;
     END
@@ -110,51 +93,65 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 4.600000 2.805000 ;
-        RECT 0.515000 2.205000 0.895000 2.635000 ;
-        RECT 3.590000 1.835000 3.870000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 4.600000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.400000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.865000 ;
-      RECT 0.085000 1.865000 2.015000 2.035000 ;
-      RECT 0.085000 2.035000 0.345000 2.455000 ;
-      RECT 1.040000 1.525000 1.675000 1.695000 ;
-      RECT 1.175000 0.450000 1.345000 0.655000 ;
-      RECT 1.175000 0.655000 1.675000 0.825000 ;
-      RECT 1.505000 0.825000 1.675000 1.075000 ;
-      RECT 1.505000 1.075000 2.155000 1.245000 ;
-      RECT 1.505000 1.245000 1.675000 1.525000 ;
-      RECT 1.610000 2.205000 2.405000 2.375000 ;
-      RECT 1.845000 1.415000 2.545000 1.585000 ;
-      RECT 1.845000 1.585000 2.015000 1.865000 ;
-      RECT 2.165000 0.305000 2.335000 0.655000 ;
-      RECT 2.165000 0.655000 3.910000 0.825000 ;
-      RECT 2.235000 1.785000 3.370000 1.955000 ;
-      RECT 2.235000 1.955000 2.405000 2.205000 ;
-      RECT 2.375000 0.995000 2.545000 1.415000 ;
-      RECT 3.120000 0.305000 3.290000 0.655000 ;
-      RECT 3.200000 1.495000 3.910000 1.665000 ;
-      RECT 3.200000 1.665000 3.370000 1.785000 ;
-      RECT 3.740000 0.825000 3.910000 0.995000 ;
-      RECT 3.740000 0.995000 4.030000 1.325000 ;
-      RECT 3.740000 1.325000 3.910000 1.495000 ;
+      RECT 0.000000 -0.085000 4.600000 0.085000 ;
+      RECT 0.000000  2.635000 4.600000 2.805000 ;
+      RECT 0.085000  0.450000 0.400000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.865000 ;
+      RECT 0.085000  1.865000 2.015000 2.035000 ;
+      RECT 0.085000  2.035000 0.345000 2.455000 ;
+      RECT 0.515000  2.205000 0.895000 2.635000 ;
+      RECT 0.705000  0.085000 0.875000 0.825000 ;
+      RECT 1.040000  1.525000 1.675000 1.695000 ;
+      RECT 1.175000  0.450000 1.345000 0.655000 ;
+      RECT 1.175000  0.655000 1.675000 0.825000 ;
+      RECT 1.505000  0.825000 1.675000 1.075000 ;
+      RECT 1.505000  1.075000 2.155000 1.245000 ;
+      RECT 1.505000  1.245000 1.675000 1.525000 ;
+      RECT 1.570000  0.085000 1.945000 0.485000 ;
+      RECT 1.610000  2.205000 2.405000 2.375000 ;
+      RECT 1.845000  1.415000 2.545000 1.585000 ;
+      RECT 1.845000  1.585000 2.015000 1.865000 ;
+      RECT 2.165000  0.305000 2.335000 0.655000 ;
+      RECT 2.165000  0.655000 3.910000 0.825000 ;
+      RECT 2.235000  1.785000 3.370000 1.955000 ;
+      RECT 2.235000  1.955000 2.405000 2.205000 ;
+      RECT 2.375000  0.995000 2.545000 1.415000 ;
+      RECT 2.520000  0.085000 2.900000 0.485000 ;
+      RECT 3.120000  0.305000 3.290000 0.655000 ;
+      RECT 3.200000  1.495000 3.910000 1.665000 ;
+      RECT 3.200000  1.665000 3.370000 1.785000 ;
+      RECT 3.460000  0.085000 3.890000 0.485000 ;
+      RECT 3.590000  1.835000 3.870000 2.635000 ;
+      RECT 3.740000  0.825000 3.910000 0.995000 ;
+      RECT 3.740000  0.995000 4.030000 1.325000 ;
+      RECT 3.740000  1.325000 3.910000 1.495000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
index 8b68f29..1754ab0 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_2.magic.lef
@@ -85,25 +85,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.060000 0.085000 ;
-        RECT 0.710000  0.085000 0.880000 0.825000 ;
-        RECT 1.595000  0.085000 1.970000 0.485000 ;
-        RECT 2.545000  0.085000 2.925000 0.485000 ;
-        RECT 3.485000  0.085000 3.915000 0.485000 ;
-        RECT 4.650000  0.085000 4.820000 0.915000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.060000 0.240000 ;
     END
@@ -112,53 +93,69 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.060000 2.805000 ;
-        RECT 0.515000 2.205000 0.895000 2.635000 ;
-        RECT 3.615000 1.835000 3.895000 2.635000 ;
-        RECT 4.650000 1.440000 4.820000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.060000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.450000 0.405000 0.825000 ;
-      RECT 0.085000 0.825000 0.260000 1.865000 ;
-      RECT 0.085000 1.865000 2.040000 2.035000 ;
-      RECT 0.085000 2.035000 0.345000 2.455000 ;
-      RECT 1.045000 1.525000 1.700000 1.695000 ;
-      RECT 1.180000 0.450000 1.350000 0.655000 ;
-      RECT 1.180000 0.655000 1.700000 0.825000 ;
-      RECT 1.510000 0.825000 1.700000 1.075000 ;
-      RECT 1.510000 1.075000 1.955000 1.245000 ;
-      RECT 1.510000 1.245000 1.700000 1.525000 ;
-      RECT 1.635000 2.205000 2.430000 2.375000 ;
-      RECT 1.870000 1.415000 2.570000 1.585000 ;
-      RECT 1.870000 1.585000 2.040000 1.865000 ;
-      RECT 2.190000 0.305000 2.360000 0.655000 ;
-      RECT 2.190000 0.655000 3.935000 0.825000 ;
-      RECT 2.260000 1.785000 3.395000 1.955000 ;
-      RECT 2.260000 1.955000 2.430000 2.205000 ;
-      RECT 2.400000 0.995000 2.570000 1.415000 ;
-      RECT 3.145000 0.305000 3.315000 0.655000 ;
-      RECT 3.225000 1.495000 3.935000 1.665000 ;
-      RECT 3.225000 1.665000 3.395000 1.785000 ;
-      RECT 3.765000 0.825000 3.935000 0.995000 ;
-      RECT 3.765000 0.995000 4.040000 1.325000 ;
-      RECT 3.765000 1.325000 3.935000 1.495000 ;
+      RECT 0.000000 -0.085000 5.060000 0.085000 ;
+      RECT 0.000000  2.635000 5.060000 2.805000 ;
+      RECT 0.085000  0.450000 0.405000 0.825000 ;
+      RECT 0.085000  0.825000 0.260000 1.865000 ;
+      RECT 0.085000  1.865000 2.040000 2.035000 ;
+      RECT 0.085000  2.035000 0.345000 2.455000 ;
+      RECT 0.515000  2.205000 0.895000 2.635000 ;
+      RECT 0.710000  0.085000 0.880000 0.825000 ;
+      RECT 1.045000  1.525000 1.700000 1.695000 ;
+      RECT 1.180000  0.450000 1.350000 0.655000 ;
+      RECT 1.180000  0.655000 1.700000 0.825000 ;
+      RECT 1.510000  0.825000 1.700000 1.075000 ;
+      RECT 1.510000  1.075000 1.955000 1.245000 ;
+      RECT 1.510000  1.245000 1.700000 1.525000 ;
+      RECT 1.595000  0.085000 1.970000 0.485000 ;
+      RECT 1.635000  2.205000 2.430000 2.375000 ;
+      RECT 1.870000  1.415000 2.570000 1.585000 ;
+      RECT 1.870000  1.585000 2.040000 1.865000 ;
+      RECT 2.190000  0.305000 2.360000 0.655000 ;
+      RECT 2.190000  0.655000 3.935000 0.825000 ;
+      RECT 2.260000  1.785000 3.395000 1.955000 ;
+      RECT 2.260000  1.955000 2.430000 2.205000 ;
+      RECT 2.400000  0.995000 2.570000 1.415000 ;
+      RECT 2.545000  0.085000 2.925000 0.485000 ;
+      RECT 3.145000  0.305000 3.315000 0.655000 ;
+      RECT 3.225000  1.495000 3.935000 1.665000 ;
+      RECT 3.225000  1.665000 3.395000 1.785000 ;
+      RECT 3.485000  0.085000 3.915000 0.485000 ;
+      RECT 3.615000  1.835000 3.895000 2.635000 ;
+      RECT 3.765000  0.825000 3.935000 0.995000 ;
+      RECT 3.765000  0.995000 4.040000 1.325000 ;
+      RECT 3.765000  1.325000 3.935000 1.495000 ;
+      RECT 4.650000  0.085000 4.820000 0.915000 ;
+      RECT 4.650000  1.440000 4.820000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
index 055f9a2..3c7affe 100644
--- a/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
+++ b/cells/or4bb/sky130_fd_sc_hdll__or4bb_4.magic.lef
@@ -90,28 +90,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.705000  0.085000 0.875000 0.825000 ;
-        RECT 1.615000  0.085000 1.945000 0.480000 ;
-        RECT 2.585000  0.085000 2.965000 0.485000 ;
-        RECT 3.615000  0.085000 3.995000 0.485000 ;
-        RECT 4.695000  0.085000 4.865000 0.555000 ;
-        RECT 5.635000  0.085000 5.805000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -120,52 +98,71 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.515000 2.240000 0.895000 2.635000 ;
-        RECT 3.660000 1.795000 3.910000 2.635000 ;
-        RECT 4.655000 1.795000 4.905000 2.635000 ;
-        RECT 5.595000 1.795000 5.845000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 0.450000 0.400000 0.825000 ;
-      RECT 0.095000 0.825000 0.265000 1.900000 ;
-      RECT 0.095000 1.900000 1.395000 2.070000 ;
-      RECT 0.095000 2.070000 0.345000 2.455000 ;
-      RECT 1.040000 1.560000 1.695000 1.730000 ;
-      RECT 1.175000 0.450000 1.345000 0.655000 ;
-      RECT 1.175000 0.655000 1.695000 0.825000 ;
-      RECT 1.225000 2.070000 1.395000 2.295000 ;
-      RECT 1.225000 2.295000 2.565000 2.465000 ;
-      RECT 1.505000 0.825000 1.695000 0.995000 ;
-      RECT 1.505000 0.995000 1.795000 1.325000 ;
-      RECT 1.505000 1.325000 1.695000 1.560000 ;
-      RECT 1.610000 1.955000 2.225000 2.125000 ;
-      RECT 2.035000 0.655000 4.015000 0.825000 ;
-      RECT 2.035000 0.825000 2.225000 1.955000 ;
-      RECT 2.245000 0.305000 2.415000 0.655000 ;
-      RECT 2.395000 0.995000 2.565000 2.295000 ;
-      RECT 3.185000 0.305000 3.355000 0.655000 ;
-      RECT 3.845000 0.825000 4.015000 1.075000 ;
-      RECT 3.845000 1.075000 5.445000 1.245000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.095000  0.450000 0.400000 0.825000 ;
+      RECT 0.095000  0.825000 0.265000 1.900000 ;
+      RECT 0.095000  1.900000 1.395000 2.070000 ;
+      RECT 0.095000  2.070000 0.345000 2.455000 ;
+      RECT 0.515000  2.240000 0.895000 2.635000 ;
+      RECT 0.705000  0.085000 0.875000 0.825000 ;
+      RECT 1.040000  1.560000 1.695000 1.730000 ;
+      RECT 1.175000  0.450000 1.345000 0.655000 ;
+      RECT 1.175000  0.655000 1.695000 0.825000 ;
+      RECT 1.225000  2.070000 1.395000 2.295000 ;
+      RECT 1.225000  2.295000 2.565000 2.465000 ;
+      RECT 1.505000  0.825000 1.695000 0.995000 ;
+      RECT 1.505000  0.995000 1.795000 1.325000 ;
+      RECT 1.505000  1.325000 1.695000 1.560000 ;
+      RECT 1.610000  1.955000 2.225000 2.125000 ;
+      RECT 1.615000  0.085000 1.945000 0.480000 ;
+      RECT 2.035000  0.655000 4.015000 0.825000 ;
+      RECT 2.035000  0.825000 2.225000 1.955000 ;
+      RECT 2.245000  0.305000 2.415000 0.655000 ;
+      RECT 2.395000  0.995000 2.565000 2.295000 ;
+      RECT 2.585000  0.085000 2.965000 0.485000 ;
+      RECT 3.185000  0.305000 3.355000 0.655000 ;
+      RECT 3.615000  0.085000 3.995000 0.485000 ;
+      RECT 3.660000  1.795000 3.910000 2.635000 ;
+      RECT 3.845000  0.825000 4.015000 1.075000 ;
+      RECT 3.845000  1.075000 5.445000 1.245000 ;
+      RECT 4.655000  1.795000 4.905000 2.635000 ;
+      RECT 4.695000  0.085000 4.865000 0.555000 ;
+      RECT 5.595000  1.795000 5.845000 2.635000 ;
+      RECT 5.635000  0.085000 5.805000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
index b87d02a..7927a4a 100644
--- a/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
+++ b/cells/probe_p/sky130_fd_sc_hdll__probe_p_8.magic.lef
@@ -77,6 +77,8 @@
         RECT 4.745000 -0.085000 4.915000 0.085000 ;
         RECT 5.205000 -0.085000 5.375000 0.085000 ;
         RECT 5.665000 -0.085000 5.835000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 5.980000 0.240000 ;
     END
@@ -107,6 +109,8 @@
         RECT 4.745000 2.635000 4.915000 2.805000 ;
         RECT 5.205000 2.635000 5.375000 2.805000 ;
         RECT 5.665000 2.635000 5.835000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 5.980000 2.960000 ;
     END
diff --git a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
index e908570..1b3a06d 100644
--- a/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
+++ b/cells/probec_p/sky130_fd_sc_hdll__probec_p_8.magic.lef
@@ -47,165 +47,150 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER met3 ;
-        RECT -0.715000 1.030000 0.065000 1.350000 ;
-      LAYER met4 ;
-        RECT -1.140000 0.770000 0.040000 1.950000 ;
       LAYER met5 ;
         RECT -1.260000 0.560000 1.060000 2.160000 ;
-      LAYER via3 ;
-        RECT -0.685000 1.030000 -0.365000 1.350000 ;
-        RECT -0.285000 1.030000  0.035000 1.350000 ;
     END
   END X
   PIN VGND
     DIRECTION INPUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 5.980000 0.085000 ;
-        RECT 0.615000  0.085000 0.895000 0.565000 ;
-        RECT 1.505000  0.085000 1.805000 0.565000 ;
-        RECT 2.475000  0.085000 2.745000 0.565000 ;
-        RECT 3.415000  0.085000 3.685000 0.565000 ;
-        RECT 4.355000  0.085000 4.625000 0.565000 ;
-        RECT 5.295000  0.085000 5.545000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-      LAYER met1 ;
-        RECT 0.000000 -0.240000 5.980000 0.240000 ;
-      LAYER met2 ;
-        RECT 5.135000 -0.140000 5.905000 0.140000 ;
-      LAYER met3 ;
-        RECT 5.130000 -0.165000 5.910000 0.165000 ;
       LAYER met4 ;
         RECT 4.930000 -0.895000 6.110000 0.285000 ;
+    END
+    PORT
       LAYER met5 ;
         RECT 4.360000 -1.170000 6.675000 -0.455000 ;
         RECT 4.360000 -0.155000 6.675000  0.560000 ;
         RECT 4.560000 -0.455000 6.675000 -0.155000 ;
-      LAYER via ;
-        RECT 5.230000 -0.130000 5.490000 0.130000 ;
-        RECT 5.550000 -0.130000 5.810000 0.130000 ;
-      LAYER via2 ;
-        RECT 5.180000 -0.140000 5.460000 0.140000 ;
-        RECT 5.580000 -0.140000 5.860000 0.140000 ;
-      LAYER via3 ;
-        RECT 5.160000 -0.160000 5.480000 0.160000 ;
-        RECT 5.560000 -0.160000 5.880000 0.160000 ;
     END
   END VGND
   PIN VPWR
     DIRECTION INPUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 5.980000 2.805000 ;
-        RECT 0.595000 1.835000 0.865000 2.635000 ;
-        RECT 1.535000 1.835000 1.805000 2.635000 ;
-        RECT 2.475000 1.835000 2.745000 2.635000 ;
-        RECT 3.415000 1.835000 3.685000 2.635000 ;
-        RECT 4.355000 1.835000 4.625000 2.635000 ;
-        RECT 5.295000 1.485000 5.595000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-      LAYER met1 ;
-        RECT 0.000000 2.480000 5.980000 2.960000 ;
-      LAYER met2 ;
-        RECT 5.135000 2.580000 5.905000 2.860000 ;
-      LAYER met3 ;
-        RECT 5.130000 2.555000 5.910000 2.885000 ;
       LAYER met4 ;
         RECT 4.930000 2.435000 6.110000 3.615000 ;
+    END
+    PORT
       LAYER met5 ;
         RECT 4.360000 2.160000 6.675000 2.875000 ;
         RECT 4.360000 3.175000 6.675000 3.890000 ;
         RECT 4.560000 2.875000 6.675000 3.175000 ;
-      LAYER via ;
-        RECT 5.230000 2.590000 5.490000 2.850000 ;
-        RECT 5.550000 2.590000 5.810000 2.850000 ;
-      LAYER via2 ;
-        RECT 5.180000 2.580000 5.460000 2.860000 ;
-        RECT 5.580000 2.580000 5.860000 2.860000 ;
-      LAYER via3 ;
-        RECT 5.160000 2.560000 5.480000 2.880000 ;
-        RECT 5.560000 2.560000 5.880000 2.880000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.095000 1.445000 1.595000 1.615000 ;
-      RECT 0.095000 1.615000 0.425000 2.465000 ;
-      RECT 0.145000 0.255000 0.445000 0.735000 ;
-      RECT 0.145000 0.735000 1.595000 0.905000 ;
-      RECT 1.035000 1.615000 1.365000 2.465000 ;
-      RECT 1.065000 0.255000 1.335000 0.735000 ;
-      RECT 1.420000 0.905000 1.595000 1.075000 ;
-      RECT 1.420000 1.075000 4.045000 1.245000 ;
-      RECT 1.420000 1.245000 1.595000 1.445000 ;
-      RECT 1.975000 0.255000 2.305000 0.735000 ;
-      RECT 1.975000 0.735000 5.125000 0.905000 ;
-      RECT 1.975000 1.445000 5.125000 1.615000 ;
-      RECT 1.975000 1.615000 2.305000 2.465000 ;
-      RECT 2.915000 0.255000 3.245000 0.735000 ;
-      RECT 2.915000 1.615000 3.245000 2.465000 ;
-      RECT 3.855000 0.255000 4.185000 0.735000 ;
-      RECT 3.855000 1.615000 4.185000 2.465000 ;
-      RECT 4.290000 0.905000 5.125000 1.445000 ;
-      RECT 4.795000 0.255000 5.125000 0.735000 ;
-      RECT 4.795000 1.615000 5.125000 2.465000 ;
+      RECT 0.000000 -0.085000 5.980000 0.085000 ;
+      RECT 0.000000  2.635000 5.980000 2.805000 ;
+      RECT 0.095000  1.445000 1.595000 1.615000 ;
+      RECT 0.095000  1.615000 0.425000 2.465000 ;
+      RECT 0.145000  0.255000 0.445000 0.735000 ;
+      RECT 0.145000  0.735000 1.595000 0.905000 ;
+      RECT 0.595000  1.835000 0.865000 2.635000 ;
+      RECT 0.615000  0.085000 0.895000 0.565000 ;
+      RECT 1.035000  1.615000 1.365000 2.465000 ;
+      RECT 1.065000  0.255000 1.335000 0.735000 ;
+      RECT 1.420000  0.905000 1.595000 1.075000 ;
+      RECT 1.420000  1.075000 4.045000 1.245000 ;
+      RECT 1.420000  1.245000 1.595000 1.445000 ;
+      RECT 1.505000  0.085000 1.805000 0.565000 ;
+      RECT 1.535000  1.835000 1.805000 2.635000 ;
+      RECT 1.975000  0.255000 2.305000 0.735000 ;
+      RECT 1.975000  0.735000 5.125000 0.905000 ;
+      RECT 1.975000  1.445000 5.125000 1.615000 ;
+      RECT 1.975000  1.615000 2.305000 2.465000 ;
+      RECT 2.475000  0.085000 2.745000 0.565000 ;
+      RECT 2.475000  1.835000 2.745000 2.635000 ;
+      RECT 2.915000  0.255000 3.245000 0.735000 ;
+      RECT 2.915000  1.615000 3.245000 2.465000 ;
+      RECT 3.415000  0.085000 3.685000 0.565000 ;
+      RECT 3.415000  1.835000 3.685000 2.635000 ;
+      RECT 3.855000  0.255000 4.185000 0.735000 ;
+      RECT 3.855000  1.615000 4.185000 2.465000 ;
+      RECT 4.290000  0.905000 5.125000 1.445000 ;
+      RECT 4.355000  0.085000 4.625000 0.565000 ;
+      RECT 4.355000  1.835000 4.625000 2.635000 ;
+      RECT 4.795000  0.255000 5.125000 0.735000 ;
+      RECT 4.795000  1.615000 5.125000 2.465000 ;
+      RECT 5.295000  0.085000 5.545000 0.885000 ;
+      RECT 5.295000  1.485000 5.595000 2.635000 ;
     LAYER mcon ;
-      RECT 4.305000 1.105000 4.475000 1.275000 ;
-      RECT 4.665000 1.105000 4.835000 1.275000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.305000  1.105000 4.475000 1.275000 ;
+      RECT 4.665000  1.105000 4.835000 1.275000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
     LAYER met1 ;
-      RECT 2.020000 1.060000 2.660000 1.120000 ;
-      RECT 2.020000 1.120000 4.895000 1.260000 ;
-      RECT 2.020000 1.260000 2.660000 1.320000 ;
-      RECT 4.245000 1.075000 4.895000 1.120000 ;
-      RECT 4.245000 1.260000 4.895000 1.305000 ;
+      RECT 0.000000 -0.240000 5.980000 0.240000 ;
+      RECT 0.000000  2.480000 5.980000 2.960000 ;
+      RECT 2.020000  1.060000 2.660000 1.120000 ;
+      RECT 2.020000  1.120000 4.895000 1.260000 ;
+      RECT 2.020000  1.260000 2.660000 1.320000 ;
+      RECT 4.245000  1.075000 4.895000 1.120000 ;
+      RECT 4.245000  1.260000 4.895000 1.305000 ;
     LAYER met2 ;
-      RECT 1.890000 1.050000 2.660000 1.330000 ;
+      RECT 1.890000  1.050000 2.660000 1.330000 ;
+      RECT 5.135000 -0.140000 5.905000 0.140000 ;
+      RECT 5.135000  2.580000 5.905000 2.860000 ;
     LAYER met3 ;
-      RECT 1.885000 1.025000 2.665000 1.355000 ;
+      RECT -0.715000  1.030000 0.065000 1.350000 ;
+      RECT  1.885000  1.025000 2.665000 1.355000 ;
+      RECT  5.130000 -0.165000 5.910000 0.165000 ;
+      RECT  5.130000  2.555000 5.910000 2.885000 ;
     LAYER met4 ;
-      RECT 1.460000 0.770000 2.640000 1.950000 ;
+      RECT -1.140000 0.770000 0.040000 1.950000 ;
+      RECT  1.460000 0.770000 2.640000 1.950000 ;
     LAYER met5 ;
       RECT 1.160000 -1.105000 2.760000  3.825000 ;
       RECT 4.360000 -0.355000 4.460000 -0.255000 ;
       RECT 4.360000  2.975000 4.460000  3.075000 ;
     LAYER via ;
-      RECT 2.050000 1.060000 2.310000 1.320000 ;
-      RECT 2.370000 1.060000 2.630000 1.320000 ;
+      RECT 2.050000  1.060000 2.310000 1.320000 ;
+      RECT 2.370000  1.060000 2.630000 1.320000 ;
+      RECT 5.230000 -0.130000 5.490000 0.130000 ;
+      RECT 5.230000  2.590000 5.490000 2.850000 ;
+      RECT 5.550000 -0.130000 5.810000 0.130000 ;
+      RECT 5.550000  2.590000 5.810000 2.850000 ;
     LAYER via2 ;
-      RECT 1.935000 1.050000 2.215000 1.330000 ;
-      RECT 2.335000 1.050000 2.615000 1.330000 ;
+      RECT 1.935000  1.050000 2.215000 1.330000 ;
+      RECT 2.335000  1.050000 2.615000 1.330000 ;
+      RECT 5.180000 -0.140000 5.460000 0.140000 ;
+      RECT 5.180000  2.580000 5.460000 2.860000 ;
+      RECT 5.580000 -0.140000 5.860000 0.140000 ;
+      RECT 5.580000  2.580000 5.860000 2.860000 ;
     LAYER via3 ;
-      RECT 1.915000 1.030000 2.235000 1.350000 ;
-      RECT 2.315000 1.030000 2.635000 1.350000 ;
+      RECT -0.685000  1.030000 -0.365000 1.350000 ;
+      RECT -0.285000  1.030000  0.035000 1.350000 ;
+      RECT  1.915000  1.030000  2.235000 1.350000 ;
+      RECT  2.315000  1.030000  2.635000 1.350000 ;
+      RECT  5.160000 -0.160000  5.480000 0.160000 ;
+      RECT  5.160000  2.560000  5.480000 2.880000 ;
+      RECT  5.560000 -0.160000  5.880000 0.160000 ;
+      RECT  5.560000  2.560000  5.880000 2.880000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
index 02faf59..8372f79 100644
--- a/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
+++ b/cells/sdfbbp/sky130_fd_sc_hdll__sdfbbp_1.magic.lef
@@ -110,12 +110,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  6.385000 0.735000  6.795000 1.065000 ;
-        RECT 10.655000 0.735000 11.080000 1.065000 ;
-      LAYER mcon ;
-        RECT  6.585000 0.765000  6.755000 0.935000 ;
-        RECT 10.715000 0.765000 10.885000 0.935000 ;
       LAYER met1 ;
         RECT  6.525000 0.735000  6.815000 0.780000 ;
         RECT  6.525000 0.780000 10.945000 0.920000 ;
@@ -173,6 +167,8 @@
         RECT 14.405000 -0.085000 14.575000 0.085000 ;
         RECT 14.865000 -0.085000 15.035000 0.085000 ;
         RECT 15.325000 -0.085000 15.495000 0.085000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
@@ -226,6 +222,8 @@
         RECT 14.405000 2.635000 14.575000 2.805000 ;
         RECT 14.865000 2.635000 15.035000 2.805000 ;
         RECT 15.325000 2.635000 15.495000 2.805000 ;
+    END
+    PORT
       LAYER met1 ;
         RECT 0.000000 2.480000 15.640000 2.960000 ;
     END
@@ -264,6 +262,7 @@
       RECT  5.995000 0.465000  6.215000 1.195000 ;
       RECT  6.085000 1.575000  6.385000 1.785000 ;
       RECT  6.085000 1.785000  7.585000 2.035000 ;
+      RECT  6.385000 0.735000  6.795000 1.065000 ;
       RECT  6.775000 0.255000  8.045000 0.425000 ;
       RECT  6.775000 0.425000  7.105000 0.465000 ;
       RECT  6.935000 2.035000  7.105000 2.375000 ;
@@ -288,6 +287,7 @@
       RECT 10.060000 1.405000 10.230000 2.250000 ;
       RECT 10.400000 1.575000 10.700000 1.915000 ;
       RECT 10.400000 1.915000 13.430000 2.085000 ;
+      RECT 10.655000 0.735000 11.080000 1.065000 ;
       RECT 10.980000 0.255000 12.300000 0.425000 ;
       RECT 10.980000 0.425000 11.380000 0.465000 ;
       RECT 11.190000 2.085000 11.360000 2.375000 ;
@@ -312,9 +312,11 @@
       RECT  4.645000 1.105000  4.815000 1.275000 ;
       RECT  5.145000 1.785000  5.315000 1.955000 ;
       RECT  5.655000 0.765000  5.825000 0.935000 ;
+      RECT  6.585000 0.765000  6.755000 0.935000 ;
       RECT  8.715000 1.445000  8.885000 1.615000 ;
       RECT  9.175000 1.105000  9.345000 1.275000 ;
       RECT  9.175000 1.785000  9.345000 1.955000 ;
+      RECT 10.715000 0.765000 10.885000 0.935000 ;
       RECT 12.165000 1.445000 12.335000 1.615000 ;
     LAYER met1 ;
       RECT  0.595000 1.755000  0.885000 1.800000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
index b7b3a41..d433e31 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_1.magic.lef
@@ -77,14 +77,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.230000 0.765000  7.810000 1.045000 ;
-        RECT 10.600000 1.065000 11.370000 1.275000 ;
-        RECT 11.065000 0.635000 11.370000 1.065000 ;
-      LAYER mcon ;
-        RECT  7.255000 0.765000  7.425000 0.935000 ;
-        RECT  7.615000 0.765000  7.785000 0.935000 ;
-        RECT 11.175000 0.765000 11.345000 0.935000 ;
       LAYER met1 ;
         RECT  7.145000 0.735000  7.900000 0.780000 ;
         RECT  7.145000 0.780000 11.405000 0.920000 ;
@@ -116,48 +108,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.260000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.035000  0.085000  2.415000 0.560000 ;
-        RECT  2.655000  0.085000  3.035000 0.825000 ;
-        RECT  5.005000  0.085000  5.350000 0.540000 ;
-        RECT  7.690000  0.085000  8.020000 0.545000 ;
-        RECT 10.110000  0.085000 10.330000 0.525000 ;
-        RECT 11.905000  0.085000 12.190000 0.710000 ;
-        RECT 13.285000  0.085000 13.695000 0.465000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
@@ -166,141 +116,185 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 14.260000 2.805000 ;
-        RECT  0.530000 2.135000  0.910000 2.635000 ;
-        RECT  2.600000 2.255000  2.930000 2.635000 ;
-        RECT  4.855000 2.275000  5.205000 2.635000 ;
-        RECT  7.135000 2.355000  7.465000 2.635000 ;
-        RECT  8.150000 2.175000  8.570000 2.635000 ;
-        RECT 10.415000 2.195000 10.665000 2.635000 ;
-        RECT 11.255000 2.255000 11.635000 2.635000 ;
-        RECT 11.905000 1.495000 12.190000 2.635000 ;
-        RECT 13.285000 1.875000 13.695000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.795000  0.915000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.885000 0.805000 ;
-      RECT  0.710000 0.805000  0.885000 0.995000 ;
-      RECT  0.710000 0.995000  1.025000 1.325000 ;
-      RECT  0.710000 1.325000  0.915000 1.795000 ;
-      RECT  1.115000 0.345000  1.365000 0.675000 ;
-      RECT  1.135000 1.730000  1.365000 2.465000 ;
-      RECT  1.195000 0.675000  1.365000 1.730000 ;
-      RECT  1.695000 0.395000  1.865000 0.730000 ;
-      RECT  1.695000 0.730000  2.435000 0.900000 ;
-      RECT  2.110000 1.915000  2.730000 2.085000 ;
-      RECT  2.110000 2.085000  2.380000 2.400000 ;
-      RECT  2.265000 0.900000  2.435000 0.995000 ;
-      RECT  2.265000 0.995000  3.445000 1.165000 ;
-      RECT  2.475000 1.165000  3.445000 1.185000 ;
-      RECT  2.475000 1.185000  2.730000 1.915000 ;
-      RECT  3.275000 0.255000  4.435000 0.425000 ;
-      RECT  3.275000 0.425000  3.445000 0.995000 ;
-      RECT  3.665000 0.675000  4.045000 1.075000 ;
-      RECT  3.870000 1.075000  4.045000 1.935000 ;
-      RECT  3.870000 1.935000  5.650000 2.105000 ;
-      RECT  3.870000 2.105000  4.040000 2.465000 ;
-      RECT  4.265000 0.425000  4.435000 1.685000 ;
-      RECT  5.140000 0.715000  5.720000 0.895000 ;
-      RECT  5.140000 0.895000  5.310000 1.935000 ;
-      RECT  5.480000 1.065000  5.650000 1.395000 ;
-      RECT  5.480000 2.105000  5.650000 2.185000 ;
-      RECT  5.480000 2.185000  5.850000 2.435000 ;
-      RECT  5.550000 0.335000  5.890000 0.505000 ;
-      RECT  5.550000 0.505000  5.720000 0.715000 ;
-      RECT  5.820000 1.575000  6.120000 1.955000 ;
-      RECT  5.900000 0.705000  6.650000 1.035000 ;
-      RECT  5.900000 1.035000  6.120000 1.575000 ;
-      RECT  6.095000 2.135000  6.460000 2.465000 ;
-      RECT  6.110000 0.305000  7.010000 0.475000 ;
-      RECT  6.290000 1.215000  8.150000 1.385000 ;
-      RECT  6.290000 1.385000  6.460000 2.135000 ;
-      RECT  6.680000 1.935000  7.940000 2.105000 ;
-      RECT  6.680000 2.105000  6.850000 2.375000 ;
-      RECT  6.840000 0.475000  7.010000 1.215000 ;
-      RECT  6.960000 1.595000  8.540000 1.765000 ;
-      RECT  7.770000 2.105000  7.940000 2.375000 ;
-      RECT  7.980000 1.005000  8.150000 1.215000 ;
-      RECT  8.230000 0.275000  8.610000 0.445000 ;
-      RECT  8.230000 0.445000  8.540000 0.835000 ;
-      RECT  8.230000 1.765000  8.540000 1.835000 ;
-      RECT  8.230000 1.835000  8.985000 2.005000 ;
-      RECT  8.370000 0.835000  8.540000 1.595000 ;
-      RECT  8.710000 0.705000  8.970000 1.495000 ;
-      RECT  8.710000 1.495000  9.445000 1.660000 ;
-      RECT  8.710000 1.660000  9.845000 1.665000 ;
-      RECT  8.780000 0.255000  9.890000 0.535000 ;
-      RECT  8.815000 2.005000  8.985000 2.465000 ;
-      RECT  9.185000 1.665000  9.845000 1.955000 ;
-      RECT  9.195000 2.125000 10.215000 2.465000 ;
-      RECT  9.235000 0.920000  9.405000 1.325000 ;
-      RECT  9.670000 0.535000  9.890000 1.315000 ;
-      RECT  9.670000 1.315000 10.285000 1.485000 ;
-      RECT 10.040000 1.485000 10.285000 1.575000 ;
-      RECT 10.040000 1.575000 11.370000 1.745000 ;
-      RECT 10.040000 1.745000 10.215000 2.125000 ;
-      RECT 10.150000 0.695000 10.730000 0.865000 ;
-      RECT 10.150000 0.865000 10.370000 1.145000 ;
-      RECT 10.560000 0.295000 11.735000 0.465000 ;
-      RECT 10.560000 0.465000 10.730000 0.695000 ;
-      RECT 10.910000 1.915000 11.730000 2.085000 ;
-      RECT 10.910000 2.085000 11.080000 2.375000 ;
-      RECT 11.560000 0.465000 11.735000 0.995000 ;
-      RECT 11.560000 0.995000 12.205000 1.325000 ;
-      RECT 11.560000 1.325000 11.730000 1.915000 ;
-      RECT 12.940000 0.255000 13.110000 0.635000 ;
-      RECT 12.940000 0.635000 13.605000 0.805000 ;
-      RECT 12.940000 1.535000 13.605000 1.705000 ;
-      RECT 12.940000 1.705000 13.110000 2.465000 ;
-      RECT 13.435000 0.805000 13.605000 0.995000 ;
-      RECT 13.435000 0.995000 13.765000 1.325000 ;
-      RECT 13.435000 1.325000 13.605000 1.535000 ;
+      RECT  0.000000 -0.085000 14.260000 0.085000 ;
+      RECT  0.000000  2.635000 14.260000 2.805000 ;
+      RECT  0.090000  1.795000  0.915000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.885000 0.805000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.530000  2.135000  0.910000 2.635000 ;
+      RECT  0.710000  0.805000  0.885000 0.995000 ;
+      RECT  0.710000  0.995000  1.025000 1.325000 ;
+      RECT  0.710000  1.325000  0.915000 1.795000 ;
+      RECT  1.115000  0.345000  1.365000 0.675000 ;
+      RECT  1.135000  1.730000  1.365000 2.465000 ;
+      RECT  1.195000  0.675000  1.365000 1.730000 ;
+      RECT  1.695000  0.395000  1.865000 0.730000 ;
+      RECT  1.695000  0.730000  2.435000 0.900000 ;
+      RECT  2.035000  0.085000  2.415000 0.560000 ;
+      RECT  2.110000  1.915000  2.730000 2.085000 ;
+      RECT  2.110000  2.085000  2.380000 2.400000 ;
+      RECT  2.265000  0.900000  2.435000 0.995000 ;
+      RECT  2.265000  0.995000  3.445000 1.165000 ;
+      RECT  2.475000  1.165000  3.445000 1.185000 ;
+      RECT  2.475000  1.185000  2.730000 1.915000 ;
+      RECT  2.600000  2.255000  2.930000 2.635000 ;
+      RECT  2.655000  0.085000  3.035000 0.825000 ;
+      RECT  3.275000  0.255000  4.435000 0.425000 ;
+      RECT  3.275000  0.425000  3.445000 0.995000 ;
+      RECT  3.665000  0.675000  4.045000 1.075000 ;
+      RECT  3.870000  1.075000  4.045000 1.935000 ;
+      RECT  3.870000  1.935000  5.650000 2.105000 ;
+      RECT  3.870000  2.105000  4.040000 2.465000 ;
+      RECT  4.265000  0.425000  4.435000 1.685000 ;
+      RECT  4.855000  2.275000  5.205000 2.635000 ;
+      RECT  5.005000  0.085000  5.350000 0.540000 ;
+      RECT  5.140000  0.715000  5.720000 0.895000 ;
+      RECT  5.140000  0.895000  5.310000 1.935000 ;
+      RECT  5.480000  1.065000  5.650000 1.395000 ;
+      RECT  5.480000  2.105000  5.650000 2.185000 ;
+      RECT  5.480000  2.185000  5.850000 2.435000 ;
+      RECT  5.550000  0.335000  5.890000 0.505000 ;
+      RECT  5.550000  0.505000  5.720000 0.715000 ;
+      RECT  5.820000  1.575000  6.120000 1.955000 ;
+      RECT  5.900000  0.705000  6.650000 1.035000 ;
+      RECT  5.900000  1.035000  6.120000 1.575000 ;
+      RECT  6.095000  2.135000  6.460000 2.465000 ;
+      RECT  6.110000  0.305000  7.010000 0.475000 ;
+      RECT  6.290000  1.215000  8.150000 1.385000 ;
+      RECT  6.290000  1.385000  6.460000 2.135000 ;
+      RECT  6.680000  1.935000  7.940000 2.105000 ;
+      RECT  6.680000  2.105000  6.850000 2.375000 ;
+      RECT  6.840000  0.475000  7.010000 1.215000 ;
+      RECT  6.960000  1.595000  8.540000 1.765000 ;
+      RECT  7.135000  2.355000  7.465000 2.635000 ;
+      RECT  7.230000  0.765000  7.810000 1.045000 ;
+      RECT  7.690000  0.085000  8.020000 0.545000 ;
+      RECT  7.770000  2.105000  7.940000 2.375000 ;
+      RECT  7.980000  1.005000  8.150000 1.215000 ;
+      RECT  8.150000  2.175000  8.570000 2.635000 ;
+      RECT  8.230000  0.275000  8.610000 0.445000 ;
+      RECT  8.230000  0.445000  8.540000 0.835000 ;
+      RECT  8.230000  1.765000  8.540000 1.835000 ;
+      RECT  8.230000  1.835000  8.985000 2.005000 ;
+      RECT  8.370000  0.835000  8.540000 1.595000 ;
+      RECT  8.710000  0.705000  8.970000 1.495000 ;
+      RECT  8.710000  1.495000  9.445000 1.660000 ;
+      RECT  8.710000  1.660000  9.845000 1.665000 ;
+      RECT  8.780000  0.255000  9.890000 0.535000 ;
+      RECT  8.815000  2.005000  8.985000 2.465000 ;
+      RECT  9.185000  1.665000  9.845000 1.955000 ;
+      RECT  9.195000  2.125000 10.215000 2.465000 ;
+      RECT  9.235000  0.920000  9.405000 1.325000 ;
+      RECT  9.670000  0.535000  9.890000 1.315000 ;
+      RECT  9.670000  1.315000 10.285000 1.485000 ;
+      RECT 10.040000  1.485000 10.285000 1.575000 ;
+      RECT 10.040000  1.575000 11.370000 1.745000 ;
+      RECT 10.040000  1.745000 10.215000 2.125000 ;
+      RECT 10.110000  0.085000 10.330000 0.525000 ;
+      RECT 10.150000  0.695000 10.730000 0.865000 ;
+      RECT 10.150000  0.865000 10.370000 1.145000 ;
+      RECT 10.415000  2.195000 10.665000 2.635000 ;
+      RECT 10.560000  0.295000 11.735000 0.465000 ;
+      RECT 10.560000  0.465000 10.730000 0.695000 ;
+      RECT 10.600000  1.065000 11.370000 1.275000 ;
+      RECT 10.910000  1.915000 11.730000 2.085000 ;
+      RECT 10.910000  2.085000 11.080000 2.375000 ;
+      RECT 11.065000  0.635000 11.370000 1.065000 ;
+      RECT 11.255000  2.255000 11.635000 2.635000 ;
+      RECT 11.560000  0.465000 11.735000 0.995000 ;
+      RECT 11.560000  0.995000 12.205000 1.325000 ;
+      RECT 11.560000  1.325000 11.730000 1.915000 ;
+      RECT 11.905000  0.085000 12.190000 0.710000 ;
+      RECT 11.905000  1.495000 12.190000 2.635000 ;
+      RECT 12.940000  0.255000 13.110000 0.635000 ;
+      RECT 12.940000  0.635000 13.605000 0.805000 ;
+      RECT 12.940000  1.535000 13.605000 1.705000 ;
+      RECT 12.940000  1.705000 13.110000 2.465000 ;
+      RECT 13.285000  0.085000 13.695000 0.465000 ;
+      RECT 13.285000  1.875000 13.695000 2.635000 ;
+      RECT 13.435000  0.805000 13.605000 0.995000 ;
+      RECT 13.435000  0.995000 13.765000 1.325000 ;
+      RECT 13.435000  1.325000 13.605000 1.535000 ;
     LAYER mcon ;
-      RECT 0.855000 1.105000 1.025000 1.275000 ;
-      RECT 1.135000 1.785000 1.305000 1.955000 ;
-      RECT 5.480000 1.105000 5.650000 1.275000 ;
-      RECT 5.950000 1.785000 6.120000 1.955000 ;
-      RECT 9.235000 1.105000 9.405000 1.275000 ;
-      RECT 9.565000 1.785000 9.735000 1.955000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.855000  1.105000  1.025000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.135000  1.785000  1.305000 1.955000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.480000  1.105000  5.650000 1.275000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  5.950000  1.785000  6.120000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.255000  0.765000  7.425000 0.935000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.615000  0.765000  7.785000 0.935000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.235000  1.105000  9.405000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.565000  1.785000  9.735000 1.955000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.175000  0.765000 11.345000 0.935000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
     LAYER met1 ;
       RECT 0.795000 1.075000 1.085000 1.120000 ;
       RECT 0.795000 1.120000 9.465000 1.260000 ;
diff --git a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
index 2651294..f9b5ad8 100644
--- a/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
+++ b/cells/sdfrbp/sky130_fd_sc_hdll__sdfrbp_2.magic.lef
@@ -77,14 +77,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.230000 0.765000  7.810000 1.045000 ;
-        RECT 10.600000 1.065000 11.370000 1.275000 ;
-        RECT 11.065000 0.635000 11.370000 1.065000 ;
-      LAYER mcon ;
-        RECT  7.255000 0.765000  7.425000 0.935000 ;
-        RECT  7.615000 0.765000  7.785000 0.935000 ;
-        RECT 11.175000 0.765000 11.345000 0.935000 ;
       LAYER met1 ;
         RECT  7.145000 0.735000  7.900000 0.780000 ;
         RECT  7.145000 0.780000 11.405000 0.920000 ;
@@ -116,50 +108,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.720000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.035000  0.085000  2.415000 0.560000 ;
-        RECT  2.655000  0.085000  3.035000 0.825000 ;
-        RECT  5.005000  0.085000  5.350000 0.540000 ;
-        RECT  7.690000  0.085000  8.020000 0.545000 ;
-        RECT 10.110000  0.085000 10.330000 0.525000 ;
-        RECT 12.325000  0.085000 12.655000 0.485000 ;
-        RECT 13.440000  0.085000 13.610000 0.825000 ;
-        RECT 14.375000  0.085000 14.545000 0.930000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
     END
@@ -168,144 +116,190 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 14.720000 2.805000 ;
-        RECT  0.530000 2.135000  0.910000 2.635000 ;
-        RECT  2.600000 2.255000  2.930000 2.635000 ;
-        RECT  4.855000 2.275000  5.205000 2.635000 ;
-        RECT  7.135000 2.355000  7.465000 2.635000 ;
-        RECT  8.150000 2.175000  8.570000 2.635000 ;
-        RECT 10.415000 2.195000 10.665000 2.635000 ;
-        RECT 11.255000 2.255000 11.635000 2.635000 ;
-        RECT 12.255000 2.205000 12.715000 2.635000 ;
-        RECT 13.270000 2.255000 13.725000 2.635000 ;
-        RECT 14.375000 1.495000 14.625000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.720000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.795000  0.915000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.885000 0.805000 ;
-      RECT  0.710000 0.805000  0.885000 0.995000 ;
-      RECT  0.710000 0.995000  1.025000 1.325000 ;
-      RECT  0.710000 1.325000  0.915000 1.795000 ;
-      RECT  1.115000 0.345000  1.365000 0.675000 ;
-      RECT  1.135000 1.730000  1.365000 2.465000 ;
-      RECT  1.195000 0.675000  1.365000 1.730000 ;
-      RECT  1.695000 0.395000  1.865000 0.730000 ;
-      RECT  1.695000 0.730000  2.435000 0.900000 ;
-      RECT  2.110000 1.915000  2.730000 2.085000 ;
-      RECT  2.110000 2.085000  2.380000 2.400000 ;
-      RECT  2.265000 0.900000  2.435000 0.995000 ;
-      RECT  2.265000 0.995000  3.445000 1.165000 ;
-      RECT  2.475000 1.165000  3.445000 1.185000 ;
-      RECT  2.475000 1.185000  2.730000 1.915000 ;
-      RECT  3.275000 0.255000  4.435000 0.425000 ;
-      RECT  3.275000 0.425000  3.445000 0.995000 ;
-      RECT  3.665000 0.675000  4.045000 1.075000 ;
-      RECT  3.870000 1.075000  4.045000 1.935000 ;
-      RECT  3.870000 1.935000  5.650000 2.105000 ;
-      RECT  3.870000 2.105000  4.040000 2.465000 ;
-      RECT  4.265000 0.425000  4.435000 1.685000 ;
-      RECT  5.140000 0.715000  5.720000 0.895000 ;
-      RECT  5.140000 0.895000  5.310000 1.935000 ;
-      RECT  5.480000 1.065000  5.650000 1.395000 ;
-      RECT  5.480000 2.105000  5.650000 2.185000 ;
-      RECT  5.480000 2.185000  5.850000 2.435000 ;
-      RECT  5.550000 0.335000  5.890000 0.505000 ;
-      RECT  5.550000 0.505000  5.720000 0.715000 ;
-      RECT  5.820000 1.575000  6.120000 1.955000 ;
-      RECT  5.900000 0.705000  6.650000 1.035000 ;
-      RECT  5.900000 1.035000  6.120000 1.575000 ;
-      RECT  6.095000 2.135000  6.460000 2.465000 ;
-      RECT  6.110000 0.305000  7.010000 0.475000 ;
-      RECT  6.290000 1.215000  8.150000 1.385000 ;
-      RECT  6.290000 1.385000  6.460000 2.135000 ;
-      RECT  6.680000 1.935000  7.940000 2.105000 ;
-      RECT  6.680000 2.105000  6.850000 2.375000 ;
-      RECT  6.840000 0.475000  7.010000 1.215000 ;
-      RECT  6.960000 1.595000  8.540000 1.765000 ;
-      RECT  7.770000 2.105000  7.940000 2.375000 ;
-      RECT  7.980000 1.005000  8.150000 1.215000 ;
-      RECT  8.230000 0.275000  8.610000 0.445000 ;
-      RECT  8.230000 0.445000  8.540000 0.835000 ;
-      RECT  8.230000 1.765000  8.540000 1.835000 ;
-      RECT  8.230000 1.835000  8.985000 2.005000 ;
-      RECT  8.370000 0.835000  8.540000 1.595000 ;
-      RECT  8.710000 0.705000  8.970000 1.495000 ;
-      RECT  8.710000 1.495000  9.445000 1.660000 ;
-      RECT  8.710000 1.660000  9.845000 1.665000 ;
-      RECT  8.780000 0.255000  9.890000 0.535000 ;
-      RECT  8.815000 2.005000  8.985000 2.465000 ;
-      RECT  9.185000 1.665000  9.845000 1.955000 ;
-      RECT  9.195000 2.125000 10.215000 2.465000 ;
-      RECT  9.235000 0.920000  9.405000 1.325000 ;
-      RECT  9.670000 0.535000  9.890000 1.315000 ;
-      RECT  9.670000 1.315000 10.285000 1.485000 ;
-      RECT 10.040000 1.485000 10.285000 1.575000 ;
-      RECT 10.040000 1.575000 11.370000 1.745000 ;
-      RECT 10.040000 1.745000 10.215000 2.125000 ;
-      RECT 10.150000 0.695000 10.730000 0.865000 ;
-      RECT 10.150000 0.865000 10.370000 1.145000 ;
-      RECT 10.560000 0.295000 11.730000 0.465000 ;
-      RECT 10.560000 0.465000 10.730000 0.695000 ;
-      RECT 10.910000 1.915000 11.730000 2.085000 ;
-      RECT 10.910000 2.085000 11.080000 2.375000 ;
-      RECT 11.560000 0.465000 11.730000 0.995000 ;
-      RECT 11.560000 0.995000 12.205000 1.325000 ;
-      RECT 11.560000 1.325000 11.730000 1.915000 ;
-      RECT 11.900000 0.345000 12.070000 0.655000 ;
-      RECT 11.900000 0.655000 12.640000 0.825000 ;
-      RECT 11.900000 1.795000 12.640000 1.865000 ;
-      RECT 11.900000 1.865000 13.600000 2.035000 ;
-      RECT 11.900000 2.035000 12.075000 2.465000 ;
-      RECT 12.465000 0.825000 12.640000 1.795000 ;
-      RECT 13.430000 0.995000 13.865000 1.325000 ;
-      RECT 13.430000 1.325000 13.600000 1.865000 ;
+      RECT  0.000000 -0.085000 14.720000 0.085000 ;
+      RECT  0.000000  2.635000 14.720000 2.805000 ;
+      RECT  0.090000  1.795000  0.915000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.885000 0.805000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.530000  2.135000  0.910000 2.635000 ;
+      RECT  0.710000  0.805000  0.885000 0.995000 ;
+      RECT  0.710000  0.995000  1.025000 1.325000 ;
+      RECT  0.710000  1.325000  0.915000 1.795000 ;
+      RECT  1.115000  0.345000  1.365000 0.675000 ;
+      RECT  1.135000  1.730000  1.365000 2.465000 ;
+      RECT  1.195000  0.675000  1.365000 1.730000 ;
+      RECT  1.695000  0.395000  1.865000 0.730000 ;
+      RECT  1.695000  0.730000  2.435000 0.900000 ;
+      RECT  2.035000  0.085000  2.415000 0.560000 ;
+      RECT  2.110000  1.915000  2.730000 2.085000 ;
+      RECT  2.110000  2.085000  2.380000 2.400000 ;
+      RECT  2.265000  0.900000  2.435000 0.995000 ;
+      RECT  2.265000  0.995000  3.445000 1.165000 ;
+      RECT  2.475000  1.165000  3.445000 1.185000 ;
+      RECT  2.475000  1.185000  2.730000 1.915000 ;
+      RECT  2.600000  2.255000  2.930000 2.635000 ;
+      RECT  2.655000  0.085000  3.035000 0.825000 ;
+      RECT  3.275000  0.255000  4.435000 0.425000 ;
+      RECT  3.275000  0.425000  3.445000 0.995000 ;
+      RECT  3.665000  0.675000  4.045000 1.075000 ;
+      RECT  3.870000  1.075000  4.045000 1.935000 ;
+      RECT  3.870000  1.935000  5.650000 2.105000 ;
+      RECT  3.870000  2.105000  4.040000 2.465000 ;
+      RECT  4.265000  0.425000  4.435000 1.685000 ;
+      RECT  4.855000  2.275000  5.205000 2.635000 ;
+      RECT  5.005000  0.085000  5.350000 0.540000 ;
+      RECT  5.140000  0.715000  5.720000 0.895000 ;
+      RECT  5.140000  0.895000  5.310000 1.935000 ;
+      RECT  5.480000  1.065000  5.650000 1.395000 ;
+      RECT  5.480000  2.105000  5.650000 2.185000 ;
+      RECT  5.480000  2.185000  5.850000 2.435000 ;
+      RECT  5.550000  0.335000  5.890000 0.505000 ;
+      RECT  5.550000  0.505000  5.720000 0.715000 ;
+      RECT  5.820000  1.575000  6.120000 1.955000 ;
+      RECT  5.900000  0.705000  6.650000 1.035000 ;
+      RECT  5.900000  1.035000  6.120000 1.575000 ;
+      RECT  6.095000  2.135000  6.460000 2.465000 ;
+      RECT  6.110000  0.305000  7.010000 0.475000 ;
+      RECT  6.290000  1.215000  8.150000 1.385000 ;
+      RECT  6.290000  1.385000  6.460000 2.135000 ;
+      RECT  6.680000  1.935000  7.940000 2.105000 ;
+      RECT  6.680000  2.105000  6.850000 2.375000 ;
+      RECT  6.840000  0.475000  7.010000 1.215000 ;
+      RECT  6.960000  1.595000  8.540000 1.765000 ;
+      RECT  7.135000  2.355000  7.465000 2.635000 ;
+      RECT  7.230000  0.765000  7.810000 1.045000 ;
+      RECT  7.690000  0.085000  8.020000 0.545000 ;
+      RECT  7.770000  2.105000  7.940000 2.375000 ;
+      RECT  7.980000  1.005000  8.150000 1.215000 ;
+      RECT  8.150000  2.175000  8.570000 2.635000 ;
+      RECT  8.230000  0.275000  8.610000 0.445000 ;
+      RECT  8.230000  0.445000  8.540000 0.835000 ;
+      RECT  8.230000  1.765000  8.540000 1.835000 ;
+      RECT  8.230000  1.835000  8.985000 2.005000 ;
+      RECT  8.370000  0.835000  8.540000 1.595000 ;
+      RECT  8.710000  0.705000  8.970000 1.495000 ;
+      RECT  8.710000  1.495000  9.445000 1.660000 ;
+      RECT  8.710000  1.660000  9.845000 1.665000 ;
+      RECT  8.780000  0.255000  9.890000 0.535000 ;
+      RECT  8.815000  2.005000  8.985000 2.465000 ;
+      RECT  9.185000  1.665000  9.845000 1.955000 ;
+      RECT  9.195000  2.125000 10.215000 2.465000 ;
+      RECT  9.235000  0.920000  9.405000 1.325000 ;
+      RECT  9.670000  0.535000  9.890000 1.315000 ;
+      RECT  9.670000  1.315000 10.285000 1.485000 ;
+      RECT 10.040000  1.485000 10.285000 1.575000 ;
+      RECT 10.040000  1.575000 11.370000 1.745000 ;
+      RECT 10.040000  1.745000 10.215000 2.125000 ;
+      RECT 10.110000  0.085000 10.330000 0.525000 ;
+      RECT 10.150000  0.695000 10.730000 0.865000 ;
+      RECT 10.150000  0.865000 10.370000 1.145000 ;
+      RECT 10.415000  2.195000 10.665000 2.635000 ;
+      RECT 10.560000  0.295000 11.730000 0.465000 ;
+      RECT 10.560000  0.465000 10.730000 0.695000 ;
+      RECT 10.600000  1.065000 11.370000 1.275000 ;
+      RECT 10.910000  1.915000 11.730000 2.085000 ;
+      RECT 10.910000  2.085000 11.080000 2.375000 ;
+      RECT 11.065000  0.635000 11.370000 1.065000 ;
+      RECT 11.255000  2.255000 11.635000 2.635000 ;
+      RECT 11.560000  0.465000 11.730000 0.995000 ;
+      RECT 11.560000  0.995000 12.205000 1.325000 ;
+      RECT 11.560000  1.325000 11.730000 1.915000 ;
+      RECT 11.900000  0.345000 12.070000 0.655000 ;
+      RECT 11.900000  0.655000 12.640000 0.825000 ;
+      RECT 11.900000  1.795000 12.640000 1.865000 ;
+      RECT 11.900000  1.865000 13.600000 2.035000 ;
+      RECT 11.900000  2.035000 12.075000 2.465000 ;
+      RECT 12.255000  2.205000 12.715000 2.635000 ;
+      RECT 12.325000  0.085000 12.655000 0.485000 ;
+      RECT 12.465000  0.825000 12.640000 1.795000 ;
+      RECT 13.270000  2.255000 13.725000 2.635000 ;
+      RECT 13.430000  0.995000 13.865000 1.325000 ;
+      RECT 13.430000  1.325000 13.600000 1.865000 ;
+      RECT 13.440000  0.085000 13.610000 0.825000 ;
+      RECT 14.375000  0.085000 14.545000 0.930000 ;
+      RECT 14.375000  1.495000 14.625000 2.635000 ;
     LAYER mcon ;
-      RECT 0.855000 1.105000 1.025000 1.275000 ;
-      RECT 1.135000 1.785000 1.305000 1.955000 ;
-      RECT 5.480000 1.105000 5.650000 1.275000 ;
-      RECT 5.950000 1.785000 6.120000 1.955000 ;
-      RECT 9.235000 1.105000 9.405000 1.275000 ;
-      RECT 9.565000 1.785000 9.735000 1.955000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.855000  1.105000  1.025000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.135000  1.785000  1.305000 1.955000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.480000  1.105000  5.650000 1.275000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  5.950000  1.785000  6.120000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.255000  0.765000  7.425000 0.935000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.615000  0.765000  7.785000 0.935000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.235000  1.105000  9.405000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.565000  1.785000  9.735000 1.955000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.175000  0.765000 11.345000 0.935000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
     LAYER met1 ;
       RECT 0.795000 1.075000 1.085000 1.120000 ;
       RECT 0.795000 1.120000 9.465000 1.260000 ;
diff --git a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
index e1cbf79..da0b5cf 100644
--- a/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
+++ b/cells/sdfrtn/sky130_fd_sc_hdll__sdfrtn_1.magic.lef
@@ -66,14 +66,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.230000 0.765000  7.810000 1.045000 ;
-        RECT 10.600000 1.065000 11.370000 1.275000 ;
-        RECT 11.065000 0.635000 11.370000 1.065000 ;
-      LAYER mcon ;
-        RECT  7.255000 0.765000  7.425000 0.935000 ;
-        RECT  7.615000 0.765000  7.785000 0.935000 ;
-        RECT 11.175000 0.765000 11.345000 0.935000 ;
       LAYER met1 ;
         RECT  7.145000 0.735000  7.900000 0.780000 ;
         RECT  7.145000 0.780000 11.405000 0.920000 ;
@@ -105,44 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.880000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.035000  0.085000  2.415000 0.560000 ;
-        RECT  2.655000  0.085000  3.035000 0.825000 ;
-        RECT  5.005000  0.085000  5.350000 0.540000 ;
-        RECT  7.690000  0.085000  8.020000 0.545000 ;
-        RECT 10.110000  0.085000 10.330000 0.525000 ;
-        RECT 11.905000  0.085000 12.190000 0.710000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
@@ -151,130 +105,170 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.880000 2.805000 ;
-        RECT  0.530000 2.135000  0.910000 2.635000 ;
-        RECT  2.600000 2.255000  2.930000 2.635000 ;
-        RECT  4.855000 2.275000  5.205000 2.635000 ;
-        RECT  7.135000 2.355000  7.465000 2.635000 ;
-        RECT  8.150000 2.175000  8.570000 2.635000 ;
-        RECT 10.415000 2.195000 10.665000 2.635000 ;
-        RECT 11.255000 2.255000 11.635000 2.635000 ;
-        RECT 11.905000 1.495000 12.190000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.795000  0.915000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.885000 0.805000 ;
-      RECT  0.710000 0.805000  0.885000 0.995000 ;
-      RECT  0.710000 0.995000  1.025000 1.325000 ;
-      RECT  0.710000 1.325000  0.915000 1.795000 ;
-      RECT  1.115000 0.345000  1.365000 0.675000 ;
-      RECT  1.135000 1.730000  1.365000 2.465000 ;
-      RECT  1.195000 0.675000  1.365000 1.730000 ;
-      RECT  1.695000 0.395000  1.865000 0.730000 ;
-      RECT  1.695000 0.730000  2.435000 0.900000 ;
-      RECT  2.110000 1.915000  2.730000 2.085000 ;
-      RECT  2.110000 2.085000  2.380000 2.400000 ;
-      RECT  2.265000 0.900000  2.435000 0.995000 ;
-      RECT  2.265000 0.995000  3.445000 1.165000 ;
-      RECT  2.475000 1.165000  3.445000 1.185000 ;
-      RECT  2.475000 1.185000  2.730000 1.915000 ;
-      RECT  3.275000 0.255000  4.435000 0.425000 ;
-      RECT  3.275000 0.425000  3.445000 0.995000 ;
-      RECT  3.665000 0.675000  4.045000 1.075000 ;
-      RECT  3.870000 1.075000  4.045000 1.935000 ;
-      RECT  3.870000 1.935000  5.650000 2.105000 ;
-      RECT  3.870000 2.105000  4.040000 2.465000 ;
-      RECT  4.265000 0.425000  4.435000 1.685000 ;
-      RECT  5.140000 0.715000  5.720000 0.895000 ;
-      RECT  5.140000 0.895000  5.310000 1.935000 ;
-      RECT  5.480000 1.065000  5.650000 1.395000 ;
-      RECT  5.480000 2.105000  5.650000 2.185000 ;
-      RECT  5.480000 2.185000  5.850000 2.435000 ;
-      RECT  5.550000 0.335000  5.890000 0.505000 ;
-      RECT  5.550000 0.505000  5.720000 0.715000 ;
-      RECT  5.820000 1.575000  6.120000 1.955000 ;
-      RECT  5.900000 0.705000  6.650000 1.035000 ;
-      RECT  5.900000 1.035000  6.120000 1.575000 ;
-      RECT  6.095000 2.135000  6.460000 2.465000 ;
-      RECT  6.110000 0.305000  7.010000 0.475000 ;
-      RECT  6.290000 1.215000  8.150000 1.385000 ;
-      RECT  6.290000 1.385000  6.460000 2.135000 ;
-      RECT  6.680000 1.935000  7.940000 2.105000 ;
-      RECT  6.680000 2.105000  6.850000 2.375000 ;
-      RECT  6.840000 0.475000  7.010000 1.215000 ;
-      RECT  6.960000 1.595000  8.540000 1.765000 ;
-      RECT  7.770000 2.105000  7.940000 2.375000 ;
-      RECT  7.980000 1.005000  8.150000 1.215000 ;
-      RECT  8.230000 0.275000  8.610000 0.445000 ;
-      RECT  8.230000 0.445000  8.540000 0.835000 ;
-      RECT  8.230000 1.765000  8.540000 1.835000 ;
-      RECT  8.230000 1.835000  8.985000 2.005000 ;
-      RECT  8.370000 0.835000  8.540000 1.595000 ;
-      RECT  8.710000 0.705000  8.970000 1.495000 ;
-      RECT  8.710000 1.495000  9.445000 1.660000 ;
-      RECT  8.710000 1.660000  9.845000 1.665000 ;
-      RECT  8.780000 0.255000  9.890000 0.535000 ;
-      RECT  8.815000 2.005000  8.985000 2.465000 ;
-      RECT  9.185000 1.665000  9.845000 1.955000 ;
-      RECT  9.195000 2.125000 10.215000 2.465000 ;
-      RECT  9.235000 0.920000  9.405000 1.325000 ;
-      RECT  9.670000 0.535000  9.890000 1.315000 ;
-      RECT  9.670000 1.315000 10.285000 1.485000 ;
-      RECT 10.040000 1.485000 10.285000 1.575000 ;
-      RECT 10.040000 1.575000 11.370000 1.745000 ;
-      RECT 10.040000 1.745000 10.215000 2.125000 ;
-      RECT 10.150000 0.695000 10.730000 0.865000 ;
-      RECT 10.150000 0.865000 10.370000 1.145000 ;
-      RECT 10.560000 0.295000 11.735000 0.465000 ;
-      RECT 10.560000 0.465000 10.730000 0.695000 ;
-      RECT 10.910000 1.915000 11.730000 2.085000 ;
-      RECT 10.910000 2.085000 11.080000 2.375000 ;
-      RECT 11.560000 0.465000 11.735000 0.995000 ;
-      RECT 11.560000 0.995000 12.205000 1.325000 ;
-      RECT 11.560000 1.325000 11.730000 1.915000 ;
+      RECT  0.000000 -0.085000 12.880000 0.085000 ;
+      RECT  0.000000  2.635000 12.880000 2.805000 ;
+      RECT  0.090000  1.795000  0.915000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.885000 0.805000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.530000  2.135000  0.910000 2.635000 ;
+      RECT  0.710000  0.805000  0.885000 0.995000 ;
+      RECT  0.710000  0.995000  1.025000 1.325000 ;
+      RECT  0.710000  1.325000  0.915000 1.795000 ;
+      RECT  1.115000  0.345000  1.365000 0.675000 ;
+      RECT  1.135000  1.730000  1.365000 2.465000 ;
+      RECT  1.195000  0.675000  1.365000 1.730000 ;
+      RECT  1.695000  0.395000  1.865000 0.730000 ;
+      RECT  1.695000  0.730000  2.435000 0.900000 ;
+      RECT  2.035000  0.085000  2.415000 0.560000 ;
+      RECT  2.110000  1.915000  2.730000 2.085000 ;
+      RECT  2.110000  2.085000  2.380000 2.400000 ;
+      RECT  2.265000  0.900000  2.435000 0.995000 ;
+      RECT  2.265000  0.995000  3.445000 1.165000 ;
+      RECT  2.475000  1.165000  3.445000 1.185000 ;
+      RECT  2.475000  1.185000  2.730000 1.915000 ;
+      RECT  2.600000  2.255000  2.930000 2.635000 ;
+      RECT  2.655000  0.085000  3.035000 0.825000 ;
+      RECT  3.275000  0.255000  4.435000 0.425000 ;
+      RECT  3.275000  0.425000  3.445000 0.995000 ;
+      RECT  3.665000  0.675000  4.045000 1.075000 ;
+      RECT  3.870000  1.075000  4.045000 1.935000 ;
+      RECT  3.870000  1.935000  5.650000 2.105000 ;
+      RECT  3.870000  2.105000  4.040000 2.465000 ;
+      RECT  4.265000  0.425000  4.435000 1.685000 ;
+      RECT  4.855000  2.275000  5.205000 2.635000 ;
+      RECT  5.005000  0.085000  5.350000 0.540000 ;
+      RECT  5.140000  0.715000  5.720000 0.895000 ;
+      RECT  5.140000  0.895000  5.310000 1.935000 ;
+      RECT  5.480000  1.065000  5.650000 1.395000 ;
+      RECT  5.480000  2.105000  5.650000 2.185000 ;
+      RECT  5.480000  2.185000  5.850000 2.435000 ;
+      RECT  5.550000  0.335000  5.890000 0.505000 ;
+      RECT  5.550000  0.505000  5.720000 0.715000 ;
+      RECT  5.820000  1.575000  6.120000 1.955000 ;
+      RECT  5.900000  0.705000  6.650000 1.035000 ;
+      RECT  5.900000  1.035000  6.120000 1.575000 ;
+      RECT  6.095000  2.135000  6.460000 2.465000 ;
+      RECT  6.110000  0.305000  7.010000 0.475000 ;
+      RECT  6.290000  1.215000  8.150000 1.385000 ;
+      RECT  6.290000  1.385000  6.460000 2.135000 ;
+      RECT  6.680000  1.935000  7.940000 2.105000 ;
+      RECT  6.680000  2.105000  6.850000 2.375000 ;
+      RECT  6.840000  0.475000  7.010000 1.215000 ;
+      RECT  6.960000  1.595000  8.540000 1.765000 ;
+      RECT  7.135000  2.355000  7.465000 2.635000 ;
+      RECT  7.230000  0.765000  7.810000 1.045000 ;
+      RECT  7.690000  0.085000  8.020000 0.545000 ;
+      RECT  7.770000  2.105000  7.940000 2.375000 ;
+      RECT  7.980000  1.005000  8.150000 1.215000 ;
+      RECT  8.150000  2.175000  8.570000 2.635000 ;
+      RECT  8.230000  0.275000  8.610000 0.445000 ;
+      RECT  8.230000  0.445000  8.540000 0.835000 ;
+      RECT  8.230000  1.765000  8.540000 1.835000 ;
+      RECT  8.230000  1.835000  8.985000 2.005000 ;
+      RECT  8.370000  0.835000  8.540000 1.595000 ;
+      RECT  8.710000  0.705000  8.970000 1.495000 ;
+      RECT  8.710000  1.495000  9.445000 1.660000 ;
+      RECT  8.710000  1.660000  9.845000 1.665000 ;
+      RECT  8.780000  0.255000  9.890000 0.535000 ;
+      RECT  8.815000  2.005000  8.985000 2.465000 ;
+      RECT  9.185000  1.665000  9.845000 1.955000 ;
+      RECT  9.195000  2.125000 10.215000 2.465000 ;
+      RECT  9.235000  0.920000  9.405000 1.325000 ;
+      RECT  9.670000  0.535000  9.890000 1.315000 ;
+      RECT  9.670000  1.315000 10.285000 1.485000 ;
+      RECT 10.040000  1.485000 10.285000 1.575000 ;
+      RECT 10.040000  1.575000 11.370000 1.745000 ;
+      RECT 10.040000  1.745000 10.215000 2.125000 ;
+      RECT 10.110000  0.085000 10.330000 0.525000 ;
+      RECT 10.150000  0.695000 10.730000 0.865000 ;
+      RECT 10.150000  0.865000 10.370000 1.145000 ;
+      RECT 10.415000  2.195000 10.665000 2.635000 ;
+      RECT 10.560000  0.295000 11.735000 0.465000 ;
+      RECT 10.560000  0.465000 10.730000 0.695000 ;
+      RECT 10.600000  1.065000 11.370000 1.275000 ;
+      RECT 10.910000  1.915000 11.730000 2.085000 ;
+      RECT 10.910000  2.085000 11.080000 2.375000 ;
+      RECT 11.065000  0.635000 11.370000 1.065000 ;
+      RECT 11.255000  2.255000 11.635000 2.635000 ;
+      RECT 11.560000  0.465000 11.735000 0.995000 ;
+      RECT 11.560000  0.995000 12.205000 1.325000 ;
+      RECT 11.560000  1.325000 11.730000 1.915000 ;
+      RECT 11.905000  0.085000 12.190000 0.710000 ;
+      RECT 11.905000  1.495000 12.190000 2.635000 ;
     LAYER mcon ;
-      RECT 0.725000 1.785000 0.895000 1.955000 ;
-      RECT 1.195000 1.105000 1.365000 1.275000 ;
-      RECT 5.480000 1.105000 5.650000 1.275000 ;
-      RECT 5.950000 1.785000 6.120000 1.955000 ;
-      RECT 9.235000 1.105000 9.405000 1.275000 ;
-      RECT 9.565000 1.785000 9.735000 1.955000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.725000  1.785000  0.895000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.195000  1.105000  1.365000 1.275000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.480000  1.105000  5.650000 1.275000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  5.950000  1.785000  6.120000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.255000  0.765000  7.425000 0.935000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.615000  0.765000  7.785000 0.935000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.235000  1.105000  9.405000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.565000  1.785000  9.735000 1.955000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.175000  0.765000 11.345000 0.935000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
     LAYER met1 ;
       RECT 0.660000 1.755000 0.960000 1.800000 ;
       RECT 0.660000 1.800000 9.795000 1.940000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
index 9c8b1c5..6c0c8b7 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_1.magic.lef
@@ -66,14 +66,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.230000 0.765000  7.810000 1.045000 ;
-        RECT 10.600000 1.065000 11.370000 1.275000 ;
-        RECT 11.065000 0.635000 11.370000 1.065000 ;
-      LAYER mcon ;
-        RECT  7.255000 0.765000  7.425000 0.935000 ;
-        RECT  7.615000 0.765000  7.785000 0.935000 ;
-        RECT 11.175000 0.765000 11.345000 0.935000 ;
       LAYER met1 ;
         RECT  7.145000 0.735000  7.900000 0.780000 ;
         RECT  7.145000 0.780000 11.405000 0.920000 ;
@@ -105,44 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 12.880000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.035000  0.085000  2.415000 0.560000 ;
-        RECT  2.655000  0.085000  3.035000 0.825000 ;
-        RECT  5.005000  0.085000  5.350000 0.540000 ;
-        RECT  7.690000  0.085000  8.020000 0.545000 ;
-        RECT 10.110000  0.085000 10.330000 0.525000 ;
-        RECT 11.905000  0.085000 12.190000 0.710000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 12.880000 0.240000 ;
     END
@@ -151,130 +105,170 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 12.880000 2.805000 ;
-        RECT  0.530000 2.135000  0.910000 2.635000 ;
-        RECT  2.600000 2.255000  2.930000 2.635000 ;
-        RECT  4.855000 2.275000  5.205000 2.635000 ;
-        RECT  7.135000 2.355000  7.465000 2.635000 ;
-        RECT  8.150000 2.175000  8.570000 2.635000 ;
-        RECT 10.415000 2.195000 10.665000 2.635000 ;
-        RECT 11.255000 2.255000 11.635000 2.635000 ;
-        RECT 11.905000 1.495000 12.190000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 12.880000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.795000  0.915000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.885000 0.805000 ;
-      RECT  0.710000 0.805000  0.885000 0.995000 ;
-      RECT  0.710000 0.995000  1.025000 1.325000 ;
-      RECT  0.710000 1.325000  0.915000 1.795000 ;
-      RECT  1.115000 0.345000  1.365000 0.675000 ;
-      RECT  1.135000 1.730000  1.365000 2.465000 ;
-      RECT  1.195000 0.675000  1.365000 1.730000 ;
-      RECT  1.695000 0.395000  1.865000 0.730000 ;
-      RECT  1.695000 0.730000  2.435000 0.900000 ;
-      RECT  2.110000 1.915000  2.730000 2.085000 ;
-      RECT  2.110000 2.085000  2.380000 2.400000 ;
-      RECT  2.265000 0.900000  2.435000 0.995000 ;
-      RECT  2.265000 0.995000  3.445000 1.165000 ;
-      RECT  2.475000 1.165000  3.445000 1.185000 ;
-      RECT  2.475000 1.185000  2.730000 1.915000 ;
-      RECT  3.275000 0.255000  4.435000 0.425000 ;
-      RECT  3.275000 0.425000  3.445000 0.995000 ;
-      RECT  3.665000 0.675000  4.045000 1.075000 ;
-      RECT  3.870000 1.075000  4.045000 1.935000 ;
-      RECT  3.870000 1.935000  5.650000 2.105000 ;
-      RECT  3.870000 2.105000  4.040000 2.465000 ;
-      RECT  4.265000 0.425000  4.435000 1.685000 ;
-      RECT  5.140000 0.715000  5.720000 0.895000 ;
-      RECT  5.140000 0.895000  5.310000 1.935000 ;
-      RECT  5.480000 1.065000  5.650000 1.395000 ;
-      RECT  5.480000 2.105000  5.650000 2.185000 ;
-      RECT  5.480000 2.185000  5.850000 2.435000 ;
-      RECT  5.550000 0.335000  5.890000 0.505000 ;
-      RECT  5.550000 0.505000  5.720000 0.715000 ;
-      RECT  5.820000 1.575000  6.120000 1.955000 ;
-      RECT  5.900000 0.705000  6.650000 1.035000 ;
-      RECT  5.900000 1.035000  6.120000 1.575000 ;
-      RECT  6.095000 2.135000  6.460000 2.465000 ;
-      RECT  6.110000 0.305000  7.010000 0.475000 ;
-      RECT  6.290000 1.215000  8.150000 1.385000 ;
-      RECT  6.290000 1.385000  6.460000 2.135000 ;
-      RECT  6.680000 1.935000  7.940000 2.105000 ;
-      RECT  6.680000 2.105000  6.850000 2.375000 ;
-      RECT  6.840000 0.475000  7.010000 1.215000 ;
-      RECT  6.960000 1.595000  8.540000 1.765000 ;
-      RECT  7.770000 2.105000  7.940000 2.375000 ;
-      RECT  7.980000 1.005000  8.150000 1.215000 ;
-      RECT  8.230000 0.275000  8.610000 0.445000 ;
-      RECT  8.230000 0.445000  8.540000 0.835000 ;
-      RECT  8.230000 1.765000  8.540000 1.835000 ;
-      RECT  8.230000 1.835000  8.985000 2.005000 ;
-      RECT  8.370000 0.835000  8.540000 1.595000 ;
-      RECT  8.710000 0.705000  8.970000 1.495000 ;
-      RECT  8.710000 1.495000  9.445000 1.660000 ;
-      RECT  8.710000 1.660000  9.845000 1.665000 ;
-      RECT  8.780000 0.255000  9.890000 0.535000 ;
-      RECT  8.815000 2.005000  8.985000 2.465000 ;
-      RECT  9.185000 1.665000  9.845000 1.955000 ;
-      RECT  9.195000 2.125000 10.215000 2.465000 ;
-      RECT  9.235000 0.920000  9.405000 1.325000 ;
-      RECT  9.670000 0.535000  9.890000 1.315000 ;
-      RECT  9.670000 1.315000 10.285000 1.485000 ;
-      RECT 10.040000 1.485000 10.285000 1.575000 ;
-      RECT 10.040000 1.575000 11.370000 1.745000 ;
-      RECT 10.040000 1.745000 10.215000 2.125000 ;
-      RECT 10.150000 0.695000 10.730000 0.865000 ;
-      RECT 10.150000 0.865000 10.370000 1.145000 ;
-      RECT 10.560000 0.295000 11.735000 0.465000 ;
-      RECT 10.560000 0.465000 10.730000 0.695000 ;
-      RECT 10.910000 1.915000 11.730000 2.085000 ;
-      RECT 10.910000 2.085000 11.080000 2.375000 ;
-      RECT 11.560000 0.465000 11.735000 0.995000 ;
-      RECT 11.560000 0.995000 12.205000 1.325000 ;
-      RECT 11.560000 1.325000 11.730000 1.915000 ;
+      RECT  0.000000 -0.085000 12.880000 0.085000 ;
+      RECT  0.000000  2.635000 12.880000 2.805000 ;
+      RECT  0.090000  1.795000  0.915000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.885000 0.805000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.530000  2.135000  0.910000 2.635000 ;
+      RECT  0.710000  0.805000  0.885000 0.995000 ;
+      RECT  0.710000  0.995000  1.025000 1.325000 ;
+      RECT  0.710000  1.325000  0.915000 1.795000 ;
+      RECT  1.115000  0.345000  1.365000 0.675000 ;
+      RECT  1.135000  1.730000  1.365000 2.465000 ;
+      RECT  1.195000  0.675000  1.365000 1.730000 ;
+      RECT  1.695000  0.395000  1.865000 0.730000 ;
+      RECT  1.695000  0.730000  2.435000 0.900000 ;
+      RECT  2.035000  0.085000  2.415000 0.560000 ;
+      RECT  2.110000  1.915000  2.730000 2.085000 ;
+      RECT  2.110000  2.085000  2.380000 2.400000 ;
+      RECT  2.265000  0.900000  2.435000 0.995000 ;
+      RECT  2.265000  0.995000  3.445000 1.165000 ;
+      RECT  2.475000  1.165000  3.445000 1.185000 ;
+      RECT  2.475000  1.185000  2.730000 1.915000 ;
+      RECT  2.600000  2.255000  2.930000 2.635000 ;
+      RECT  2.655000  0.085000  3.035000 0.825000 ;
+      RECT  3.275000  0.255000  4.435000 0.425000 ;
+      RECT  3.275000  0.425000  3.445000 0.995000 ;
+      RECT  3.665000  0.675000  4.045000 1.075000 ;
+      RECT  3.870000  1.075000  4.045000 1.935000 ;
+      RECT  3.870000  1.935000  5.650000 2.105000 ;
+      RECT  3.870000  2.105000  4.040000 2.465000 ;
+      RECT  4.265000  0.425000  4.435000 1.685000 ;
+      RECT  4.855000  2.275000  5.205000 2.635000 ;
+      RECT  5.005000  0.085000  5.350000 0.540000 ;
+      RECT  5.140000  0.715000  5.720000 0.895000 ;
+      RECT  5.140000  0.895000  5.310000 1.935000 ;
+      RECT  5.480000  1.065000  5.650000 1.395000 ;
+      RECT  5.480000  2.105000  5.650000 2.185000 ;
+      RECT  5.480000  2.185000  5.850000 2.435000 ;
+      RECT  5.550000  0.335000  5.890000 0.505000 ;
+      RECT  5.550000  0.505000  5.720000 0.715000 ;
+      RECT  5.820000  1.575000  6.120000 1.955000 ;
+      RECT  5.900000  0.705000  6.650000 1.035000 ;
+      RECT  5.900000  1.035000  6.120000 1.575000 ;
+      RECT  6.095000  2.135000  6.460000 2.465000 ;
+      RECT  6.110000  0.305000  7.010000 0.475000 ;
+      RECT  6.290000  1.215000  8.150000 1.385000 ;
+      RECT  6.290000  1.385000  6.460000 2.135000 ;
+      RECT  6.680000  1.935000  7.940000 2.105000 ;
+      RECT  6.680000  2.105000  6.850000 2.375000 ;
+      RECT  6.840000  0.475000  7.010000 1.215000 ;
+      RECT  6.960000  1.595000  8.540000 1.765000 ;
+      RECT  7.135000  2.355000  7.465000 2.635000 ;
+      RECT  7.230000  0.765000  7.810000 1.045000 ;
+      RECT  7.690000  0.085000  8.020000 0.545000 ;
+      RECT  7.770000  2.105000  7.940000 2.375000 ;
+      RECT  7.980000  1.005000  8.150000 1.215000 ;
+      RECT  8.150000  2.175000  8.570000 2.635000 ;
+      RECT  8.230000  0.275000  8.610000 0.445000 ;
+      RECT  8.230000  0.445000  8.540000 0.835000 ;
+      RECT  8.230000  1.765000  8.540000 1.835000 ;
+      RECT  8.230000  1.835000  8.985000 2.005000 ;
+      RECT  8.370000  0.835000  8.540000 1.595000 ;
+      RECT  8.710000  0.705000  8.970000 1.495000 ;
+      RECT  8.710000  1.495000  9.445000 1.660000 ;
+      RECT  8.710000  1.660000  9.845000 1.665000 ;
+      RECT  8.780000  0.255000  9.890000 0.535000 ;
+      RECT  8.815000  2.005000  8.985000 2.465000 ;
+      RECT  9.185000  1.665000  9.845000 1.955000 ;
+      RECT  9.195000  2.125000 10.215000 2.465000 ;
+      RECT  9.235000  0.920000  9.405000 1.325000 ;
+      RECT  9.670000  0.535000  9.890000 1.315000 ;
+      RECT  9.670000  1.315000 10.285000 1.485000 ;
+      RECT 10.040000  1.485000 10.285000 1.575000 ;
+      RECT 10.040000  1.575000 11.370000 1.745000 ;
+      RECT 10.040000  1.745000 10.215000 2.125000 ;
+      RECT 10.110000  0.085000 10.330000 0.525000 ;
+      RECT 10.150000  0.695000 10.730000 0.865000 ;
+      RECT 10.150000  0.865000 10.370000 1.145000 ;
+      RECT 10.415000  2.195000 10.665000 2.635000 ;
+      RECT 10.560000  0.295000 11.735000 0.465000 ;
+      RECT 10.560000  0.465000 10.730000 0.695000 ;
+      RECT 10.600000  1.065000 11.370000 1.275000 ;
+      RECT 10.910000  1.915000 11.730000 2.085000 ;
+      RECT 10.910000  2.085000 11.080000 2.375000 ;
+      RECT 11.065000  0.635000 11.370000 1.065000 ;
+      RECT 11.255000  2.255000 11.635000 2.635000 ;
+      RECT 11.560000  0.465000 11.735000 0.995000 ;
+      RECT 11.560000  0.995000 12.205000 1.325000 ;
+      RECT 11.560000  1.325000 11.730000 1.915000 ;
+      RECT 11.905000  0.085000 12.190000 0.710000 ;
+      RECT 11.905000  1.495000 12.190000 2.635000 ;
     LAYER mcon ;
-      RECT 0.855000 1.105000 1.025000 1.275000 ;
-      RECT 1.135000 1.785000 1.305000 1.955000 ;
-      RECT 5.480000 1.105000 5.650000 1.275000 ;
-      RECT 5.950000 1.785000 6.120000 1.955000 ;
-      RECT 9.235000 1.105000 9.405000 1.275000 ;
-      RECT 9.565000 1.785000 9.735000 1.955000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.855000  1.105000  1.025000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.135000  1.785000  1.305000 1.955000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.480000  1.105000  5.650000 1.275000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  5.950000  1.785000  6.120000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.255000  0.765000  7.425000 0.935000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.615000  0.765000  7.785000 0.935000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.235000  1.105000  9.405000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.565000  1.785000  9.735000 1.955000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.175000  0.765000 11.345000 0.935000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
     LAYER met1 ;
       RECT 0.795000 1.075000 1.085000 1.120000 ;
       RECT 0.795000 1.120000 9.465000 1.260000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
index 97d3ce1..0155709 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_2.magic.lef
@@ -66,14 +66,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.230000 0.765000  7.810000 1.045000 ;
-        RECT 10.600000 1.065000 11.370000 1.275000 ;
-        RECT 11.065000 0.635000 11.370000 1.065000 ;
-      LAYER mcon ;
-        RECT  7.255000 0.765000  7.425000 0.935000 ;
-        RECT  7.615000 0.765000  7.785000 0.935000 ;
-        RECT 11.140000 0.765000 11.310000 0.935000 ;
       LAYER met1 ;
         RECT  7.145000 0.735000  7.900000 0.780000 ;
         RECT  7.145000 0.780000 11.370000 0.920000 ;
@@ -105,46 +97,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.340000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.035000  0.085000  2.415000 0.560000 ;
-        RECT  2.655000  0.085000  3.035000 0.825000 ;
-        RECT  5.005000  0.085000  5.350000 0.540000 ;
-        RECT  7.690000  0.085000  8.020000 0.545000 ;
-        RECT 10.110000  0.085000 10.330000 0.525000 ;
-        RECT 11.905000  0.085000 12.325000 0.670000 ;
-        RECT 12.995000  0.085000 13.165000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
@@ -153,132 +105,174 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 13.340000 2.805000 ;
-        RECT  0.530000 2.135000  0.910000 2.635000 ;
-        RECT  2.600000 2.255000  2.930000 2.635000 ;
-        RECT  4.855000 2.275000  5.205000 2.635000 ;
-        RECT  7.135000 2.355000  7.465000 2.635000 ;
-        RECT  8.150000 2.175000  8.570000 2.635000 ;
-        RECT 10.415000 2.195000 10.665000 2.635000 ;
-        RECT 11.255000 2.255000 11.635000 2.635000 ;
-        RECT 11.905000 1.495000 12.330000 2.635000 ;
-        RECT 12.995000 1.495000 13.245000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.795000  0.915000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.885000 0.805000 ;
-      RECT  0.710000 0.805000  0.885000 0.995000 ;
-      RECT  0.710000 0.995000  1.025000 1.325000 ;
-      RECT  0.710000 1.325000  0.915000 1.795000 ;
-      RECT  1.115000 0.345000  1.365000 0.675000 ;
-      RECT  1.135000 1.730000  1.365000 2.465000 ;
-      RECT  1.195000 0.675000  1.365000 1.730000 ;
-      RECT  1.695000 0.395000  1.865000 0.730000 ;
-      RECT  1.695000 0.730000  2.435000 0.900000 ;
-      RECT  2.110000 1.915000  2.730000 2.085000 ;
-      RECT  2.110000 2.085000  2.380000 2.400000 ;
-      RECT  2.265000 0.900000  2.435000 0.995000 ;
-      RECT  2.265000 0.995000  3.445000 1.165000 ;
-      RECT  2.475000 1.165000  3.445000 1.185000 ;
-      RECT  2.475000 1.185000  2.730000 1.915000 ;
-      RECT  3.275000 0.255000  4.435000 0.425000 ;
-      RECT  3.275000 0.425000  3.445000 0.995000 ;
-      RECT  3.665000 0.675000  4.045000 1.075000 ;
-      RECT  3.870000 1.075000  4.045000 1.935000 ;
-      RECT  3.870000 1.935000  5.650000 2.105000 ;
-      RECT  3.870000 2.105000  4.040000 2.465000 ;
-      RECT  4.265000 0.425000  4.435000 1.685000 ;
-      RECT  5.140000 0.715000  5.720000 0.895000 ;
-      RECT  5.140000 0.895000  5.310000 1.935000 ;
-      RECT  5.480000 1.065000  5.650000 1.395000 ;
-      RECT  5.480000 2.105000  5.650000 2.185000 ;
-      RECT  5.480000 2.185000  5.850000 2.435000 ;
-      RECT  5.550000 0.335000  5.890000 0.505000 ;
-      RECT  5.550000 0.505000  5.720000 0.715000 ;
-      RECT  5.820000 1.575000  6.120000 1.955000 ;
-      RECT  5.900000 0.705000  6.650000 1.035000 ;
-      RECT  5.900000 1.035000  6.120000 1.575000 ;
-      RECT  6.095000 2.135000  6.460000 2.465000 ;
-      RECT  6.110000 0.305000  7.010000 0.475000 ;
-      RECT  6.290000 1.215000  8.150000 1.385000 ;
-      RECT  6.290000 1.385000  6.460000 2.135000 ;
-      RECT  6.680000 1.935000  7.940000 2.105000 ;
-      RECT  6.680000 2.105000  6.850000 2.375000 ;
-      RECT  6.840000 0.475000  7.010000 1.215000 ;
-      RECT  6.960000 1.595000  8.540000 1.765000 ;
-      RECT  7.770000 2.105000  7.940000 2.375000 ;
-      RECT  7.980000 1.005000  8.150000 1.215000 ;
-      RECT  8.230000 0.275000  8.610000 0.445000 ;
-      RECT  8.230000 0.445000  8.540000 0.835000 ;
-      RECT  8.230000 1.765000  8.540000 1.835000 ;
-      RECT  8.230000 1.835000  8.985000 2.005000 ;
-      RECT  8.370000 0.835000  8.540000 1.595000 ;
-      RECT  8.710000 0.705000  8.970000 1.495000 ;
-      RECT  8.710000 1.495000  9.445000 1.660000 ;
-      RECT  8.710000 1.660000  9.845000 1.665000 ;
-      RECT  8.780000 0.255000  9.890000 0.535000 ;
-      RECT  8.815000 2.005000  8.985000 2.465000 ;
-      RECT  9.185000 1.665000  9.845000 1.955000 ;
-      RECT  9.195000 2.125000 10.215000 2.465000 ;
-      RECT  9.235000 0.920000  9.405000 1.325000 ;
-      RECT  9.670000 0.535000  9.890000 1.315000 ;
-      RECT  9.670000 1.315000 10.285000 1.485000 ;
-      RECT 10.040000 1.485000 10.285000 1.575000 ;
-      RECT 10.040000 1.575000 11.370000 1.745000 ;
-      RECT 10.040000 1.745000 10.215000 2.125000 ;
-      RECT 10.150000 0.695000 10.730000 0.865000 ;
-      RECT 10.150000 0.865000 10.370000 1.145000 ;
-      RECT 10.560000 0.295000 11.735000 0.465000 ;
-      RECT 10.560000 0.465000 10.730000 0.695000 ;
-      RECT 10.910000 1.915000 11.730000 2.085000 ;
-      RECT 10.910000 2.085000 11.080000 2.375000 ;
-      RECT 11.560000 0.465000 11.735000 0.995000 ;
-      RECT 11.560000 0.995000 12.235000 1.325000 ;
-      RECT 11.560000 1.325000 11.730000 1.915000 ;
+      RECT  0.000000 -0.085000 13.340000 0.085000 ;
+      RECT  0.000000  2.635000 13.340000 2.805000 ;
+      RECT  0.090000  1.795000  0.915000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.885000 0.805000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.530000  2.135000  0.910000 2.635000 ;
+      RECT  0.710000  0.805000  0.885000 0.995000 ;
+      RECT  0.710000  0.995000  1.025000 1.325000 ;
+      RECT  0.710000  1.325000  0.915000 1.795000 ;
+      RECT  1.115000  0.345000  1.365000 0.675000 ;
+      RECT  1.135000  1.730000  1.365000 2.465000 ;
+      RECT  1.195000  0.675000  1.365000 1.730000 ;
+      RECT  1.695000  0.395000  1.865000 0.730000 ;
+      RECT  1.695000  0.730000  2.435000 0.900000 ;
+      RECT  2.035000  0.085000  2.415000 0.560000 ;
+      RECT  2.110000  1.915000  2.730000 2.085000 ;
+      RECT  2.110000  2.085000  2.380000 2.400000 ;
+      RECT  2.265000  0.900000  2.435000 0.995000 ;
+      RECT  2.265000  0.995000  3.445000 1.165000 ;
+      RECT  2.475000  1.165000  3.445000 1.185000 ;
+      RECT  2.475000  1.185000  2.730000 1.915000 ;
+      RECT  2.600000  2.255000  2.930000 2.635000 ;
+      RECT  2.655000  0.085000  3.035000 0.825000 ;
+      RECT  3.275000  0.255000  4.435000 0.425000 ;
+      RECT  3.275000  0.425000  3.445000 0.995000 ;
+      RECT  3.665000  0.675000  4.045000 1.075000 ;
+      RECT  3.870000  1.075000  4.045000 1.935000 ;
+      RECT  3.870000  1.935000  5.650000 2.105000 ;
+      RECT  3.870000  2.105000  4.040000 2.465000 ;
+      RECT  4.265000  0.425000  4.435000 1.685000 ;
+      RECT  4.855000  2.275000  5.205000 2.635000 ;
+      RECT  5.005000  0.085000  5.350000 0.540000 ;
+      RECT  5.140000  0.715000  5.720000 0.895000 ;
+      RECT  5.140000  0.895000  5.310000 1.935000 ;
+      RECT  5.480000  1.065000  5.650000 1.395000 ;
+      RECT  5.480000  2.105000  5.650000 2.185000 ;
+      RECT  5.480000  2.185000  5.850000 2.435000 ;
+      RECT  5.550000  0.335000  5.890000 0.505000 ;
+      RECT  5.550000  0.505000  5.720000 0.715000 ;
+      RECT  5.820000  1.575000  6.120000 1.955000 ;
+      RECT  5.900000  0.705000  6.650000 1.035000 ;
+      RECT  5.900000  1.035000  6.120000 1.575000 ;
+      RECT  6.095000  2.135000  6.460000 2.465000 ;
+      RECT  6.110000  0.305000  7.010000 0.475000 ;
+      RECT  6.290000  1.215000  8.150000 1.385000 ;
+      RECT  6.290000  1.385000  6.460000 2.135000 ;
+      RECT  6.680000  1.935000  7.940000 2.105000 ;
+      RECT  6.680000  2.105000  6.850000 2.375000 ;
+      RECT  6.840000  0.475000  7.010000 1.215000 ;
+      RECT  6.960000  1.595000  8.540000 1.765000 ;
+      RECT  7.135000  2.355000  7.465000 2.635000 ;
+      RECT  7.230000  0.765000  7.810000 1.045000 ;
+      RECT  7.690000  0.085000  8.020000 0.545000 ;
+      RECT  7.770000  2.105000  7.940000 2.375000 ;
+      RECT  7.980000  1.005000  8.150000 1.215000 ;
+      RECT  8.150000  2.175000  8.570000 2.635000 ;
+      RECT  8.230000  0.275000  8.610000 0.445000 ;
+      RECT  8.230000  0.445000  8.540000 0.835000 ;
+      RECT  8.230000  1.765000  8.540000 1.835000 ;
+      RECT  8.230000  1.835000  8.985000 2.005000 ;
+      RECT  8.370000  0.835000  8.540000 1.595000 ;
+      RECT  8.710000  0.705000  8.970000 1.495000 ;
+      RECT  8.710000  1.495000  9.445000 1.660000 ;
+      RECT  8.710000  1.660000  9.845000 1.665000 ;
+      RECT  8.780000  0.255000  9.890000 0.535000 ;
+      RECT  8.815000  2.005000  8.985000 2.465000 ;
+      RECT  9.185000  1.665000  9.845000 1.955000 ;
+      RECT  9.195000  2.125000 10.215000 2.465000 ;
+      RECT  9.235000  0.920000  9.405000 1.325000 ;
+      RECT  9.670000  0.535000  9.890000 1.315000 ;
+      RECT  9.670000  1.315000 10.285000 1.485000 ;
+      RECT 10.040000  1.485000 10.285000 1.575000 ;
+      RECT 10.040000  1.575000 11.370000 1.745000 ;
+      RECT 10.040000  1.745000 10.215000 2.125000 ;
+      RECT 10.110000  0.085000 10.330000 0.525000 ;
+      RECT 10.150000  0.695000 10.730000 0.865000 ;
+      RECT 10.150000  0.865000 10.370000 1.145000 ;
+      RECT 10.415000  2.195000 10.665000 2.635000 ;
+      RECT 10.560000  0.295000 11.735000 0.465000 ;
+      RECT 10.560000  0.465000 10.730000 0.695000 ;
+      RECT 10.600000  1.065000 11.370000 1.275000 ;
+      RECT 10.910000  1.915000 11.730000 2.085000 ;
+      RECT 10.910000  2.085000 11.080000 2.375000 ;
+      RECT 11.065000  0.635000 11.370000 1.065000 ;
+      RECT 11.255000  2.255000 11.635000 2.635000 ;
+      RECT 11.560000  0.465000 11.735000 0.995000 ;
+      RECT 11.560000  0.995000 12.235000 1.325000 ;
+      RECT 11.560000  1.325000 11.730000 1.915000 ;
+      RECT 11.905000  0.085000 12.325000 0.670000 ;
+      RECT 11.905000  1.495000 12.330000 2.635000 ;
+      RECT 12.995000  0.085000 13.165000 0.545000 ;
+      RECT 12.995000  1.495000 13.245000 2.635000 ;
     LAYER mcon ;
-      RECT 0.855000 1.105000 1.025000 1.275000 ;
-      RECT 1.135000 1.785000 1.305000 1.955000 ;
-      RECT 5.480000 1.105000 5.650000 1.275000 ;
-      RECT 5.950000 1.785000 6.120000 1.955000 ;
-      RECT 9.235000 1.105000 9.405000 1.275000 ;
-      RECT 9.565000 1.785000 9.735000 1.955000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.855000  1.105000  1.025000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.135000  1.785000  1.305000 1.955000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.480000  1.105000  5.650000 1.275000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  5.950000  1.785000  6.120000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.255000  0.765000  7.425000 0.935000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.615000  0.765000  7.785000 0.935000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.235000  1.105000  9.405000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.565000  1.785000  9.735000 1.955000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.140000  0.765000 11.310000 0.935000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
     LAYER met1 ;
       RECT 0.795000 1.075000 1.085000 1.120000 ;
       RECT 0.795000 1.120000 9.465000 1.260000 ;
diff --git a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
index ea651f1..88c0a4d 100644
--- a/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
+++ b/cells/sdfrtp/sky130_fd_sc_hdll__sdfrtp_4.magic.lef
@@ -70,15 +70,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  7.230000 0.765000  7.810000 1.045000 ;
-        RECT 10.600000 1.065000 11.370000 1.275000 ;
-        RECT 11.065000 0.635000 11.370000 1.065000 ;
-      LAYER mcon ;
-        RECT  7.255000 0.765000  7.425000 0.935000 ;
-        RECT  7.615000 0.765000  7.785000 0.935000 ;
-        RECT 10.835000 1.085000 11.005000 1.255000 ;
-        RECT 11.175000 0.765000 11.345000 0.935000 ;
       LAYER met1 ;
         RECT  7.145000 0.735000  7.900000 0.780000 ;
         RECT  7.145000 0.780000 11.405000 0.920000 ;
@@ -111,49 +102,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.260000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.035000  0.085000  2.415000 0.560000 ;
-        RECT  2.655000  0.085000  3.035000 0.825000 ;
-        RECT  5.005000  0.085000  5.350000 0.540000 ;
-        RECT  7.690000  0.085000  8.020000 0.545000 ;
-        RECT 10.110000  0.085000 10.330000 0.525000 ;
-        RECT 11.905000  0.085000 12.075000 0.545000 ;
-        RECT 12.975000  0.085000 13.145000 0.545000 ;
-        RECT 13.915000  0.085000 14.085000 0.545000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
@@ -162,135 +110,181 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 14.260000 2.805000 ;
-        RECT  0.530000 2.135000  0.910000 2.635000 ;
-        RECT  2.600000 2.255000  2.930000 2.635000 ;
-        RECT  4.855000 2.275000  5.205000 2.635000 ;
-        RECT  7.135000 2.355000  7.465000 2.635000 ;
-        RECT  8.150000 2.175000  8.570000 2.635000 ;
-        RECT 10.415000 2.195000 10.665000 2.635000 ;
-        RECT 11.255000 2.255000 11.635000 2.635000 ;
-        RECT 11.905000 1.495000 12.155000 2.635000 ;
-        RECT 12.975000 1.495000 13.225000 2.635000 ;
-        RECT 13.915000 1.495000 14.165000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.090000 1.795000  0.915000 1.965000 ;
-      RECT  0.090000 1.965000  0.345000 2.465000 ;
-      RECT  0.095000 0.345000  0.345000 0.635000 ;
-      RECT  0.095000 0.635000  0.885000 0.805000 ;
-      RECT  0.710000 0.805000  0.885000 0.995000 ;
-      RECT  0.710000 0.995000  1.025000 1.325000 ;
-      RECT  0.710000 1.325000  0.915000 1.795000 ;
-      RECT  1.115000 0.345000  1.365000 0.675000 ;
-      RECT  1.135000 1.730000  1.365000 2.465000 ;
-      RECT  1.195000 0.675000  1.365000 1.730000 ;
-      RECT  1.695000 0.395000  1.865000 0.730000 ;
-      RECT  1.695000 0.730000  2.435000 0.900000 ;
-      RECT  2.110000 1.915000  2.730000 2.085000 ;
-      RECT  2.110000 2.085000  2.380000 2.400000 ;
-      RECT  2.265000 0.900000  2.435000 0.995000 ;
-      RECT  2.265000 0.995000  3.445000 1.165000 ;
-      RECT  2.475000 1.165000  3.445000 1.185000 ;
-      RECT  2.475000 1.185000  2.730000 1.915000 ;
-      RECT  3.275000 0.255000  4.435000 0.425000 ;
-      RECT  3.275000 0.425000  3.445000 0.995000 ;
-      RECT  3.665000 0.675000  4.045000 1.075000 ;
-      RECT  3.870000 1.075000  4.045000 1.935000 ;
-      RECT  3.870000 1.935000  5.650000 2.105000 ;
-      RECT  3.870000 2.105000  4.040000 2.465000 ;
-      RECT  4.265000 0.425000  4.435000 1.685000 ;
-      RECT  5.140000 0.715000  5.720000 0.895000 ;
-      RECT  5.140000 0.895000  5.310000 1.935000 ;
-      RECT  5.480000 1.065000  5.650000 1.395000 ;
-      RECT  5.480000 2.105000  5.650000 2.185000 ;
-      RECT  5.480000 2.185000  5.850000 2.435000 ;
-      RECT  5.550000 0.335000  5.890000 0.505000 ;
-      RECT  5.550000 0.505000  5.720000 0.715000 ;
-      RECT  5.820000 1.575000  6.120000 1.955000 ;
-      RECT  5.900000 0.705000  6.650000 1.035000 ;
-      RECT  5.900000 1.035000  6.120000 1.575000 ;
-      RECT  6.095000 2.135000  6.460000 2.465000 ;
-      RECT  6.110000 0.305000  7.010000 0.475000 ;
-      RECT  6.290000 1.215000  8.150000 1.385000 ;
-      RECT  6.290000 1.385000  6.460000 2.135000 ;
-      RECT  6.680000 1.935000  7.940000 2.105000 ;
-      RECT  6.680000 2.105000  6.850000 2.375000 ;
-      RECT  6.840000 0.475000  7.010000 1.215000 ;
-      RECT  6.960000 1.595000  8.540000 1.765000 ;
-      RECT  7.770000 2.105000  7.940000 2.375000 ;
-      RECT  7.980000 1.005000  8.150000 1.215000 ;
-      RECT  8.230000 0.275000  8.610000 0.445000 ;
-      RECT  8.230000 0.445000  8.540000 0.835000 ;
-      RECT  8.230000 1.765000  8.540000 1.835000 ;
-      RECT  8.230000 1.835000  8.985000 2.005000 ;
-      RECT  8.370000 0.835000  8.540000 1.595000 ;
-      RECT  8.710000 0.705000  8.970000 1.495000 ;
-      RECT  8.710000 1.495000  9.445000 1.660000 ;
-      RECT  8.710000 1.660000  9.845000 1.665000 ;
-      RECT  8.780000 0.255000  9.890000 0.535000 ;
-      RECT  8.815000 2.005000  8.985000 2.465000 ;
-      RECT  9.185000 1.665000  9.845000 1.955000 ;
-      RECT  9.195000 2.125000 10.215000 2.465000 ;
-      RECT  9.235000 0.920000  9.405000 1.325000 ;
-      RECT  9.670000 0.535000  9.890000 1.315000 ;
-      RECT  9.670000 1.315000 10.285000 1.485000 ;
-      RECT 10.040000 1.485000 10.285000 1.575000 ;
-      RECT 10.040000 1.575000 11.370000 1.745000 ;
-      RECT 10.040000 1.745000 10.215000 2.125000 ;
-      RECT 10.150000 0.695000 10.730000 0.865000 ;
-      RECT 10.150000 0.865000 10.370000 1.145000 ;
-      RECT 10.560000 0.295000 11.735000 0.465000 ;
-      RECT 10.560000 0.465000 10.730000 0.695000 ;
-      RECT 10.910000 1.915000 11.730000 2.085000 ;
-      RECT 10.910000 2.085000 11.080000 2.375000 ;
-      RECT 11.560000 0.465000 11.735000 0.995000 ;
-      RECT 11.560000 0.995000 12.205000 1.325000 ;
-      RECT 11.560000 1.325000 11.730000 1.915000 ;
+      RECT  0.000000 -0.085000 14.260000 0.085000 ;
+      RECT  0.000000  2.635000 14.260000 2.805000 ;
+      RECT  0.090000  1.795000  0.915000 1.965000 ;
+      RECT  0.090000  1.965000  0.345000 2.465000 ;
+      RECT  0.095000  0.345000  0.345000 0.635000 ;
+      RECT  0.095000  0.635000  0.885000 0.805000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.530000  2.135000  0.910000 2.635000 ;
+      RECT  0.710000  0.805000  0.885000 0.995000 ;
+      RECT  0.710000  0.995000  1.025000 1.325000 ;
+      RECT  0.710000  1.325000  0.915000 1.795000 ;
+      RECT  1.115000  0.345000  1.365000 0.675000 ;
+      RECT  1.135000  1.730000  1.365000 2.465000 ;
+      RECT  1.195000  0.675000  1.365000 1.730000 ;
+      RECT  1.695000  0.395000  1.865000 0.730000 ;
+      RECT  1.695000  0.730000  2.435000 0.900000 ;
+      RECT  2.035000  0.085000  2.415000 0.560000 ;
+      RECT  2.110000  1.915000  2.730000 2.085000 ;
+      RECT  2.110000  2.085000  2.380000 2.400000 ;
+      RECT  2.265000  0.900000  2.435000 0.995000 ;
+      RECT  2.265000  0.995000  3.445000 1.165000 ;
+      RECT  2.475000  1.165000  3.445000 1.185000 ;
+      RECT  2.475000  1.185000  2.730000 1.915000 ;
+      RECT  2.600000  2.255000  2.930000 2.635000 ;
+      RECT  2.655000  0.085000  3.035000 0.825000 ;
+      RECT  3.275000  0.255000  4.435000 0.425000 ;
+      RECT  3.275000  0.425000  3.445000 0.995000 ;
+      RECT  3.665000  0.675000  4.045000 1.075000 ;
+      RECT  3.870000  1.075000  4.045000 1.935000 ;
+      RECT  3.870000  1.935000  5.650000 2.105000 ;
+      RECT  3.870000  2.105000  4.040000 2.465000 ;
+      RECT  4.265000  0.425000  4.435000 1.685000 ;
+      RECT  4.855000  2.275000  5.205000 2.635000 ;
+      RECT  5.005000  0.085000  5.350000 0.540000 ;
+      RECT  5.140000  0.715000  5.720000 0.895000 ;
+      RECT  5.140000  0.895000  5.310000 1.935000 ;
+      RECT  5.480000  1.065000  5.650000 1.395000 ;
+      RECT  5.480000  2.105000  5.650000 2.185000 ;
+      RECT  5.480000  2.185000  5.850000 2.435000 ;
+      RECT  5.550000  0.335000  5.890000 0.505000 ;
+      RECT  5.550000  0.505000  5.720000 0.715000 ;
+      RECT  5.820000  1.575000  6.120000 1.955000 ;
+      RECT  5.900000  0.705000  6.650000 1.035000 ;
+      RECT  5.900000  1.035000  6.120000 1.575000 ;
+      RECT  6.095000  2.135000  6.460000 2.465000 ;
+      RECT  6.110000  0.305000  7.010000 0.475000 ;
+      RECT  6.290000  1.215000  8.150000 1.385000 ;
+      RECT  6.290000  1.385000  6.460000 2.135000 ;
+      RECT  6.680000  1.935000  7.940000 2.105000 ;
+      RECT  6.680000  2.105000  6.850000 2.375000 ;
+      RECT  6.840000  0.475000  7.010000 1.215000 ;
+      RECT  6.960000  1.595000  8.540000 1.765000 ;
+      RECT  7.135000  2.355000  7.465000 2.635000 ;
+      RECT  7.230000  0.765000  7.810000 1.045000 ;
+      RECT  7.690000  0.085000  8.020000 0.545000 ;
+      RECT  7.770000  2.105000  7.940000 2.375000 ;
+      RECT  7.980000  1.005000  8.150000 1.215000 ;
+      RECT  8.150000  2.175000  8.570000 2.635000 ;
+      RECT  8.230000  0.275000  8.610000 0.445000 ;
+      RECT  8.230000  0.445000  8.540000 0.835000 ;
+      RECT  8.230000  1.765000  8.540000 1.835000 ;
+      RECT  8.230000  1.835000  8.985000 2.005000 ;
+      RECT  8.370000  0.835000  8.540000 1.595000 ;
+      RECT  8.710000  0.705000  8.970000 1.495000 ;
+      RECT  8.710000  1.495000  9.445000 1.660000 ;
+      RECT  8.710000  1.660000  9.845000 1.665000 ;
+      RECT  8.780000  0.255000  9.890000 0.535000 ;
+      RECT  8.815000  2.005000  8.985000 2.465000 ;
+      RECT  9.185000  1.665000  9.845000 1.955000 ;
+      RECT  9.195000  2.125000 10.215000 2.465000 ;
+      RECT  9.235000  0.920000  9.405000 1.325000 ;
+      RECT  9.670000  0.535000  9.890000 1.315000 ;
+      RECT  9.670000  1.315000 10.285000 1.485000 ;
+      RECT 10.040000  1.485000 10.285000 1.575000 ;
+      RECT 10.040000  1.575000 11.370000 1.745000 ;
+      RECT 10.040000  1.745000 10.215000 2.125000 ;
+      RECT 10.110000  0.085000 10.330000 0.525000 ;
+      RECT 10.150000  0.695000 10.730000 0.865000 ;
+      RECT 10.150000  0.865000 10.370000 1.145000 ;
+      RECT 10.415000  2.195000 10.665000 2.635000 ;
+      RECT 10.560000  0.295000 11.735000 0.465000 ;
+      RECT 10.560000  0.465000 10.730000 0.695000 ;
+      RECT 10.600000  1.065000 11.370000 1.275000 ;
+      RECT 10.910000  1.915000 11.730000 2.085000 ;
+      RECT 10.910000  2.085000 11.080000 2.375000 ;
+      RECT 11.065000  0.635000 11.370000 1.065000 ;
+      RECT 11.255000  2.255000 11.635000 2.635000 ;
+      RECT 11.560000  0.465000 11.735000 0.995000 ;
+      RECT 11.560000  0.995000 12.205000 1.325000 ;
+      RECT 11.560000  1.325000 11.730000 1.915000 ;
+      RECT 11.905000  0.085000 12.075000 0.545000 ;
+      RECT 11.905000  1.495000 12.155000 2.635000 ;
+      RECT 12.975000  0.085000 13.145000 0.545000 ;
+      RECT 12.975000  1.495000 13.225000 2.635000 ;
+      RECT 13.915000  0.085000 14.085000 0.545000 ;
+      RECT 13.915000  1.495000 14.165000 2.635000 ;
     LAYER mcon ;
-      RECT 0.855000 1.105000 1.025000 1.275000 ;
-      RECT 1.135000 1.785000 1.305000 1.955000 ;
-      RECT 5.480000 1.105000 5.650000 1.275000 ;
-      RECT 5.950000 1.785000 6.120000 1.955000 ;
-      RECT 9.235000 1.105000 9.405000 1.275000 ;
-      RECT 9.565000 1.785000 9.735000 1.955000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.855000  1.105000  1.025000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.135000  1.785000  1.305000 1.955000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.480000  1.105000  5.650000 1.275000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  5.950000  1.785000  6.120000 1.955000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.255000  0.765000  7.425000 0.935000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.615000  0.765000  7.785000 0.935000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.235000  1.105000  9.405000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.565000  1.785000  9.735000 1.955000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 10.835000  1.085000 11.005000 1.255000 ;
+      RECT 11.175000  0.765000 11.345000 0.935000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
     LAYER met1 ;
       RECT 0.795000 1.075000 1.085000 1.120000 ;
       RECT 0.795000 1.120000 9.465000 1.260000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
index ab1fc9b..39a727e 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_1.magic.lef
@@ -88,12 +88,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.550000 0.765000 0.860000 1.675000 ;
-        RECT 2.570000 1.075000 2.950000 1.550000 ;
-      LAYER mcon ;
-        RECT 0.630000 1.105000 0.800000 1.275000 ;
-        RECT 2.645000 1.105000 2.815000 1.275000 ;
       LAYER met1 ;
         RECT 0.570000 1.075000 0.860000 1.120000 ;
         RECT 0.570000 1.120000 2.875000 1.260000 ;
@@ -107,13 +101,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 7.190000 1.445000  7.725000 1.765000 ;
-        RECT 9.685000 1.415000  9.960000 1.525000 ;
-        RECT 9.685000 1.525000 11.075000 1.725000 ;
-      LAYER mcon ;
-        RECT 7.445000 1.445000 7.615000 1.615000 ;
-        RECT 9.735000 1.445000 9.905000 1.615000 ;
       LAYER met1 ;
         RECT 7.385000 1.415000 7.725000 1.460000 ;
         RECT 7.385000 1.460000 9.965000 1.600000 ;
@@ -126,50 +113,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.720000 0.085000 ;
-        RECT  0.085000  0.085000  0.430000 0.595000 ;
-        RECT  2.025000  0.085000  2.205000 0.545000 ;
-        RECT  2.940000  0.085000  3.280000 0.555000 ;
-        RECT  3.930000  0.085000  4.240000 0.545000 ;
-        RECT  6.060000  0.085000  6.595000 0.465000 ;
-        RECT  7.540000  0.085000  8.275000 0.690000 ;
-        RECT 11.220000  0.085000 11.390000 0.545000 ;
-        RECT 12.170000  0.085000 12.380000 0.885000 ;
-        RECT 13.690000  0.085000 13.895000 0.825000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.720000 0.240000 ;
     END
@@ -178,124 +121,173 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 14.720000 2.805000 ;
-        RECT  0.515000 2.195000  0.815000 2.635000 ;
-        RECT  2.940000 2.140000  3.280000 2.635000 ;
-        RECT  3.845000 2.275000  4.225000 2.635000 ;
-        RECT  6.445000 2.275000  6.775000 2.635000 ;
-        RECT  7.655000 2.125000  8.710000 2.635000 ;
-        RECT 10.045000 2.235000 10.425000 2.635000 ;
-        RECT 11.135000 2.235000 11.465000 2.635000 ;
-        RECT 12.170000 1.485000 12.380000 2.635000 ;
-        RECT 13.725000 1.575000 13.895000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.720000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.845000  1.205000 2.025000 ;
-      RECT  0.085000 2.025000  0.345000 2.465000 ;
-      RECT  0.975000 0.280000  1.845000 0.560000 ;
-      RECT  1.035000 2.025000  1.205000 2.255000 ;
-      RECT  1.035000 2.255000  2.245000 2.465000 ;
-      RECT  1.395000 1.870000  1.845000 2.075000 ;
-      RECT  1.655000 0.560000  1.845000 1.870000 ;
-      RECT  2.065000 0.715000  2.715000 0.905000 ;
-      RECT  2.065000 0.905000  2.400000 1.770000 ;
-      RECT  2.065000 1.770000  2.685000 2.085000 ;
-      RECT  2.460000 0.255000  2.715000 0.715000 ;
-      RECT  2.470000 2.085000  2.685000 2.465000 ;
-      RECT  3.505000 1.775000  4.295000 1.955000 ;
-      RECT  3.505000 1.955000  3.675000 2.325000 ;
-      RECT  3.520000 0.255000  3.705000 0.715000 ;
-      RECT  3.520000 0.715000  4.295000 0.885000 ;
-      RECT  4.035000 0.885000  4.295000 1.775000 ;
-      RECT  4.445000 2.135000  4.790000 2.465000 ;
-      RECT  4.460000 0.255000  4.685000 0.585000 ;
-      RECT  4.515000 0.585000  4.685000 1.090000 ;
-      RECT  4.515000 1.090000  4.840000 1.420000 ;
-      RECT  4.515000 1.420000  4.790000 2.135000 ;
-      RECT  4.855000 0.255000  5.180000 0.920000 ;
-      RECT  4.960000 1.590000  5.180000 2.465000 ;
-      RECT  5.010000 0.920000  5.180000 1.590000 ;
-      RECT  5.400000 0.255000  5.890000 1.225000 ;
-      RECT  5.400000 1.225000  8.360000 1.275000 ;
-      RECT  5.430000 2.135000  6.205000 2.465000 ;
-      RECT  5.485000 1.275000  6.935000 1.395000 ;
-      RECT  5.605000 1.575000  5.865000 1.955000 ;
-      RECT  6.035000 1.395000  6.205000 2.135000 ;
-      RECT  6.060000 0.635000  7.085000 0.805000 ;
-      RECT  6.060000 0.805000  6.475000 1.015000 ;
-      RECT  6.425000 1.575000  6.595000 1.935000 ;
-      RECT  6.425000 1.935000  7.365000 2.105000 ;
-      RECT  6.750000 0.975000  8.360000 1.225000 ;
-      RECT  6.775000 0.255000  7.085000 0.635000 ;
-      RECT  7.100000 2.105000  7.365000 2.450000 ;
-      RECT  7.910000 1.495000  8.755000 1.955000 ;
-      RECT  7.950000 1.275000  8.360000 1.325000 ;
-      RECT  8.535000 0.695000  9.890000 0.895000 ;
-      RECT  8.535000 0.895000  8.755000 1.495000 ;
-      RECT  8.880000 2.125000  9.735000 2.460000 ;
-      RECT  9.115000 1.075000  9.395000 1.905000 ;
-      RECT  9.160000 0.275000 10.775000 0.445000 ;
-      RECT  9.565000 1.895000 11.465000 2.065000 ;
-      RECT  9.565000 2.065000  9.735000 2.125000 ;
-      RECT  9.610000 0.895000  9.890000 1.245000 ;
-      RECT 10.140000 0.855000 10.365000 1.185000 ;
-      RECT 10.140000 1.185000 11.945000 1.355000 ;
-      RECT 10.605000 0.445000 10.775000 0.845000 ;
-      RECT 10.605000 0.845000 11.545000 1.015000 ;
-      RECT 10.645000 2.065000 10.860000 2.450000 ;
-      RECT 11.245000 1.525000 11.465000 1.895000 ;
-      RECT 11.560000 0.255000 11.945000 0.540000 ;
-      RECT 11.685000 1.355000 11.945000 2.465000 ;
-      RECT 11.765000 0.540000 11.945000 1.185000 ;
-      RECT 13.160000 0.255000 13.370000 0.995000 ;
-      RECT 13.160000 0.995000 14.050000 1.325000 ;
-      RECT 13.160000 1.325000 13.370000 2.465000 ;
+      RECT  0.000000 -0.085000 14.720000 0.085000 ;
+      RECT  0.000000  2.635000 14.720000 2.805000 ;
+      RECT  0.085000  0.085000  0.430000 0.595000 ;
+      RECT  0.085000  1.845000  1.205000 2.025000 ;
+      RECT  0.085000  2.025000  0.345000 2.465000 ;
+      RECT  0.515000  2.195000  0.815000 2.635000 ;
+      RECT  0.550000  0.765000  0.860000 1.675000 ;
+      RECT  0.975000  0.280000  1.845000 0.560000 ;
+      RECT  1.035000  2.025000  1.205000 2.255000 ;
+      RECT  1.035000  2.255000  2.245000 2.465000 ;
+      RECT  1.395000  1.870000  1.845000 2.075000 ;
+      RECT  1.655000  0.560000  1.845000 1.870000 ;
+      RECT  2.025000  0.085000  2.205000 0.545000 ;
+      RECT  2.065000  0.715000  2.715000 0.905000 ;
+      RECT  2.065000  0.905000  2.400000 1.770000 ;
+      RECT  2.065000  1.770000  2.685000 2.085000 ;
+      RECT  2.460000  0.255000  2.715000 0.715000 ;
+      RECT  2.470000  2.085000  2.685000 2.465000 ;
+      RECT  2.570000  1.075000  2.950000 1.550000 ;
+      RECT  2.940000  0.085000  3.280000 0.555000 ;
+      RECT  2.940000  2.140000  3.280000 2.635000 ;
+      RECT  3.505000  1.775000  4.295000 1.955000 ;
+      RECT  3.505000  1.955000  3.675000 2.325000 ;
+      RECT  3.520000  0.255000  3.705000 0.715000 ;
+      RECT  3.520000  0.715000  4.295000 0.885000 ;
+      RECT  3.845000  2.275000  4.225000 2.635000 ;
+      RECT  3.930000  0.085000  4.240000 0.545000 ;
+      RECT  4.035000  0.885000  4.295000 1.775000 ;
+      RECT  4.445000  2.135000  4.790000 2.465000 ;
+      RECT  4.460000  0.255000  4.685000 0.585000 ;
+      RECT  4.515000  0.585000  4.685000 1.090000 ;
+      RECT  4.515000  1.090000  4.840000 1.420000 ;
+      RECT  4.515000  1.420000  4.790000 2.135000 ;
+      RECT  4.855000  0.255000  5.180000 0.920000 ;
+      RECT  4.960000  1.590000  5.180000 2.465000 ;
+      RECT  5.010000  0.920000  5.180000 1.590000 ;
+      RECT  5.400000  0.255000  5.890000 1.225000 ;
+      RECT  5.400000  1.225000  8.360000 1.275000 ;
+      RECT  5.430000  2.135000  6.205000 2.465000 ;
+      RECT  5.485000  1.275000  6.935000 1.395000 ;
+      RECT  5.605000  1.575000  5.865000 1.955000 ;
+      RECT  6.035000  1.395000  6.205000 2.135000 ;
+      RECT  6.060000  0.085000  6.595000 0.465000 ;
+      RECT  6.060000  0.635000  7.085000 0.805000 ;
+      RECT  6.060000  0.805000  6.475000 1.015000 ;
+      RECT  6.425000  1.575000  6.595000 1.935000 ;
+      RECT  6.425000  1.935000  7.365000 2.105000 ;
+      RECT  6.445000  2.275000  6.775000 2.635000 ;
+      RECT  6.750000  0.975000  8.360000 1.225000 ;
+      RECT  6.775000  0.255000  7.085000 0.635000 ;
+      RECT  7.100000  2.105000  7.365000 2.450000 ;
+      RECT  7.190000  1.445000  7.725000 1.765000 ;
+      RECT  7.540000  0.085000  8.275000 0.690000 ;
+      RECT  7.655000  2.125000  8.710000 2.635000 ;
+      RECT  7.910000  1.495000  8.755000 1.955000 ;
+      RECT  7.950000  1.275000  8.360000 1.325000 ;
+      RECT  8.535000  0.695000  9.890000 0.895000 ;
+      RECT  8.535000  0.895000  8.755000 1.495000 ;
+      RECT  8.880000  2.125000  9.735000 2.460000 ;
+      RECT  9.115000  1.075000  9.395000 1.905000 ;
+      RECT  9.160000  0.275000 10.775000 0.445000 ;
+      RECT  9.565000  1.895000 11.465000 2.065000 ;
+      RECT  9.565000  2.065000  9.735000 2.125000 ;
+      RECT  9.610000  0.895000  9.890000 1.245000 ;
+      RECT  9.685000  1.415000  9.960000 1.525000 ;
+      RECT  9.685000  1.525000 11.075000 1.725000 ;
+      RECT 10.045000  2.235000 10.425000 2.635000 ;
+      RECT 10.140000  0.855000 10.365000 1.185000 ;
+      RECT 10.140000  1.185000 11.945000 1.355000 ;
+      RECT 10.605000  0.445000 10.775000 0.845000 ;
+      RECT 10.605000  0.845000 11.545000 1.015000 ;
+      RECT 10.645000  2.065000 10.860000 2.450000 ;
+      RECT 11.135000  2.235000 11.465000 2.635000 ;
+      RECT 11.220000  0.085000 11.390000 0.545000 ;
+      RECT 11.245000  1.525000 11.465000 1.895000 ;
+      RECT 11.560000  0.255000 11.945000 0.540000 ;
+      RECT 11.685000  1.355000 11.945000 2.465000 ;
+      RECT 11.765000  0.540000 11.945000 1.185000 ;
+      RECT 12.170000  0.085000 12.380000 0.885000 ;
+      RECT 12.170000  1.485000 12.380000 2.635000 ;
+      RECT 13.160000  0.255000 13.370000 0.995000 ;
+      RECT 13.160000  0.995000 14.050000 1.325000 ;
+      RECT 13.160000  1.325000 13.370000 2.465000 ;
+      RECT 13.690000  0.085000 13.895000 0.825000 ;
+      RECT 13.725000  1.575000 13.895000 2.635000 ;
     LAYER mcon ;
-      RECT 1.675000 1.445000 1.845000 1.615000 ;
-      RECT 4.125000 1.785000 4.295000 1.955000 ;
-      RECT 4.585000 1.105000 4.755000 1.275000 ;
-      RECT 5.010000 1.445000 5.180000 1.615000 ;
-      RECT 5.605000 1.785000 5.775000 1.955000 ;
-      RECT 8.205000 1.785000 8.375000 1.955000 ;
-      RECT 9.225000 1.105000 9.395000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.630000  1.105000  0.800000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.675000  1.445000  1.845000 1.615000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.645000  1.105000  2.815000 1.275000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.125000  1.785000  4.295000 1.955000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.585000  1.105000  4.755000 1.275000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.010000  1.445000  5.180000 1.615000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.605000  1.785000  5.775000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.445000  1.445000  7.615000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.205000  1.785000  8.375000 1.955000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.225000  1.105000  9.395000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.735000  1.445000  9.905000 1.615000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
     LAYER met1 ;
       RECT 1.615000 1.415000 1.955000 1.460000 ;
       RECT 1.615000 1.460000 5.240000 1.600000 ;
diff --git a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
index c49f8fd..b6f8315 100644
--- a/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
+++ b/cells/sdfsbp/sky130_fd_sc_hdll__sdfsbp_2.magic.lef
@@ -88,12 +88,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.550000 0.765000 0.860000 1.675000 ;
-        RECT 2.570000 1.075000 2.950000 1.550000 ;
-      LAYER mcon ;
-        RECT 0.630000 1.105000 0.800000 1.275000 ;
-        RECT 2.645000 1.105000 2.815000 1.275000 ;
       LAYER met1 ;
         RECT 0.570000 1.075000 0.860000 1.120000 ;
         RECT 0.570000 1.120000 2.875000 1.260000 ;
@@ -107,13 +101,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 7.190000 1.445000  7.725000 1.765000 ;
-        RECT 9.685000 1.415000  9.960000 1.525000 ;
-        RECT 9.685000 1.525000 11.075000 1.725000 ;
-      LAYER mcon ;
-        RECT 7.445000 1.445000 7.615000 1.615000 ;
-        RECT 9.735000 1.445000 9.905000 1.615000 ;
       LAYER met1 ;
         RECT 7.385000 1.415000 7.725000 1.460000 ;
         RECT 7.385000 1.460000 9.965000 1.600000 ;
@@ -126,54 +113,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.640000 0.085000 ;
-        RECT  0.085000  0.085000  0.430000 0.595000 ;
-        RECT  2.025000  0.085000  2.205000 0.545000 ;
-        RECT  2.940000  0.085000  3.280000 0.555000 ;
-        RECT  3.930000  0.085000  4.240000 0.545000 ;
-        RECT  6.060000  0.085000  6.595000 0.465000 ;
-        RECT  7.540000  0.085000  8.275000 0.690000 ;
-        RECT 11.220000  0.085000 11.390000 0.545000 ;
-        RECT 12.170000  0.085000 12.380000 0.885000 ;
-        RECT 13.215000  0.085000 13.505000 0.885000 ;
-        RECT 14.075000  0.085000 14.480000 0.825000 ;
-        RECT 15.250000  0.085000 15.515000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.640000 0.240000 ;
     END
@@ -182,128 +121,181 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 15.640000 2.805000 ;
-        RECT  0.515000 2.195000  0.815000 2.635000 ;
-        RECT  2.940000 2.140000  3.280000 2.635000 ;
-        RECT  3.845000 2.275000  4.225000 2.635000 ;
-        RECT  6.445000 2.275000  6.775000 2.635000 ;
-        RECT  7.655000 2.125000  8.710000 2.635000 ;
-        RECT 10.045000 2.235000 10.425000 2.635000 ;
-        RECT 11.135000 2.235000 11.465000 2.635000 ;
-        RECT 12.170000 1.485000 12.380000 2.635000 ;
-        RECT 13.215000 1.485000 13.505000 2.635000 ;
-        RECT 14.075000 1.635000 14.480000 2.635000 ;
-        RECT 15.250000 1.485000 15.515000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 15.640000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.845000  1.205000 2.025000 ;
-      RECT  0.085000 2.025000  0.345000 2.465000 ;
-      RECT  0.975000 0.280000  1.845000 0.560000 ;
-      RECT  1.035000 2.025000  1.205000 2.255000 ;
-      RECT  1.035000 2.255000  2.245000 2.465000 ;
-      RECT  1.395000 1.870000  1.845000 2.075000 ;
-      RECT  1.655000 0.560000  1.845000 1.870000 ;
-      RECT  2.065000 0.715000  2.715000 0.905000 ;
-      RECT  2.065000 0.905000  2.400000 1.770000 ;
-      RECT  2.065000 1.770000  2.685000 2.085000 ;
-      RECT  2.460000 0.255000  2.715000 0.715000 ;
-      RECT  2.470000 2.085000  2.685000 2.465000 ;
-      RECT  3.505000 1.775000  4.295000 1.955000 ;
-      RECT  3.505000 1.955000  3.675000 2.325000 ;
-      RECT  3.520000 0.255000  3.705000 0.715000 ;
-      RECT  3.520000 0.715000  4.295000 0.885000 ;
-      RECT  4.035000 0.885000  4.295000 1.775000 ;
-      RECT  4.445000 2.135000  4.790000 2.465000 ;
-      RECT  4.460000 0.255000  4.685000 0.585000 ;
-      RECT  4.515000 0.585000  4.685000 1.090000 ;
-      RECT  4.515000 1.090000  4.840000 1.420000 ;
-      RECT  4.515000 1.420000  4.790000 2.135000 ;
-      RECT  4.855000 0.255000  5.180000 0.920000 ;
-      RECT  4.960000 1.590000  5.180000 2.465000 ;
-      RECT  5.010000 0.920000  5.180000 1.590000 ;
-      RECT  5.400000 0.255000  5.890000 1.225000 ;
-      RECT  5.400000 1.225000  8.360000 1.275000 ;
-      RECT  5.430000 2.135000  6.205000 2.465000 ;
-      RECT  5.485000 1.275000  6.935000 1.395000 ;
-      RECT  5.605000 1.575000  5.865000 1.955000 ;
-      RECT  6.035000 1.395000  6.205000 2.135000 ;
-      RECT  6.060000 0.635000  7.085000 0.805000 ;
-      RECT  6.060000 0.805000  6.475000 1.015000 ;
-      RECT  6.425000 1.575000  6.595000 1.935000 ;
-      RECT  6.425000 1.935000  7.365000 2.105000 ;
-      RECT  6.750000 0.975000  8.360000 1.225000 ;
-      RECT  6.775000 0.255000  7.085000 0.635000 ;
-      RECT  7.100000 2.105000  7.365000 2.450000 ;
-      RECT  7.910000 1.495000  8.755000 1.955000 ;
-      RECT  7.950000 1.275000  8.360000 1.325000 ;
-      RECT  8.535000 0.695000  9.890000 0.895000 ;
-      RECT  8.535000 0.895000  8.755000 1.495000 ;
-      RECT  8.880000 2.125000  9.735000 2.460000 ;
-      RECT  9.115000 1.075000  9.395000 1.905000 ;
-      RECT  9.160000 0.275000 10.775000 0.445000 ;
-      RECT  9.565000 1.895000 11.465000 2.065000 ;
-      RECT  9.565000 2.065000  9.735000 2.125000 ;
-      RECT  9.610000 0.895000  9.890000 1.245000 ;
-      RECT 10.140000 0.855000 10.365000 1.185000 ;
-      RECT 10.140000 1.185000 11.945000 1.355000 ;
-      RECT 10.605000 0.445000 10.775000 0.845000 ;
-      RECT 10.605000 0.845000 11.545000 1.015000 ;
-      RECT 10.645000 2.065000 10.860000 2.450000 ;
-      RECT 11.245000 1.525000 11.465000 1.895000 ;
-      RECT 11.560000 0.255000 11.945000 0.540000 ;
-      RECT 11.685000 1.355000 11.945000 2.465000 ;
-      RECT 11.765000 0.540000 11.945000 1.185000 ;
-      RECT 13.720000 0.255000 13.905000 0.995000 ;
-      RECT 13.720000 0.995000 14.585000 1.325000 ;
-      RECT 13.720000 1.325000 13.905000 2.465000 ;
+      RECT  0.000000 -0.085000 15.640000 0.085000 ;
+      RECT  0.000000  2.635000 15.640000 2.805000 ;
+      RECT  0.085000  0.085000  0.430000 0.595000 ;
+      RECT  0.085000  1.845000  1.205000 2.025000 ;
+      RECT  0.085000  2.025000  0.345000 2.465000 ;
+      RECT  0.515000  2.195000  0.815000 2.635000 ;
+      RECT  0.550000  0.765000  0.860000 1.675000 ;
+      RECT  0.975000  0.280000  1.845000 0.560000 ;
+      RECT  1.035000  2.025000  1.205000 2.255000 ;
+      RECT  1.035000  2.255000  2.245000 2.465000 ;
+      RECT  1.395000  1.870000  1.845000 2.075000 ;
+      RECT  1.655000  0.560000  1.845000 1.870000 ;
+      RECT  2.025000  0.085000  2.205000 0.545000 ;
+      RECT  2.065000  0.715000  2.715000 0.905000 ;
+      RECT  2.065000  0.905000  2.400000 1.770000 ;
+      RECT  2.065000  1.770000  2.685000 2.085000 ;
+      RECT  2.460000  0.255000  2.715000 0.715000 ;
+      RECT  2.470000  2.085000  2.685000 2.465000 ;
+      RECT  2.570000  1.075000  2.950000 1.550000 ;
+      RECT  2.940000  0.085000  3.280000 0.555000 ;
+      RECT  2.940000  2.140000  3.280000 2.635000 ;
+      RECT  3.505000  1.775000  4.295000 1.955000 ;
+      RECT  3.505000  1.955000  3.675000 2.325000 ;
+      RECT  3.520000  0.255000  3.705000 0.715000 ;
+      RECT  3.520000  0.715000  4.295000 0.885000 ;
+      RECT  3.845000  2.275000  4.225000 2.635000 ;
+      RECT  3.930000  0.085000  4.240000 0.545000 ;
+      RECT  4.035000  0.885000  4.295000 1.775000 ;
+      RECT  4.445000  2.135000  4.790000 2.465000 ;
+      RECT  4.460000  0.255000  4.685000 0.585000 ;
+      RECT  4.515000  0.585000  4.685000 1.090000 ;
+      RECT  4.515000  1.090000  4.840000 1.420000 ;
+      RECT  4.515000  1.420000  4.790000 2.135000 ;
+      RECT  4.855000  0.255000  5.180000 0.920000 ;
+      RECT  4.960000  1.590000  5.180000 2.465000 ;
+      RECT  5.010000  0.920000  5.180000 1.590000 ;
+      RECT  5.400000  0.255000  5.890000 1.225000 ;
+      RECT  5.400000  1.225000  8.360000 1.275000 ;
+      RECT  5.430000  2.135000  6.205000 2.465000 ;
+      RECT  5.485000  1.275000  6.935000 1.395000 ;
+      RECT  5.605000  1.575000  5.865000 1.955000 ;
+      RECT  6.035000  1.395000  6.205000 2.135000 ;
+      RECT  6.060000  0.085000  6.595000 0.465000 ;
+      RECT  6.060000  0.635000  7.085000 0.805000 ;
+      RECT  6.060000  0.805000  6.475000 1.015000 ;
+      RECT  6.425000  1.575000  6.595000 1.935000 ;
+      RECT  6.425000  1.935000  7.365000 2.105000 ;
+      RECT  6.445000  2.275000  6.775000 2.635000 ;
+      RECT  6.750000  0.975000  8.360000 1.225000 ;
+      RECT  6.775000  0.255000  7.085000 0.635000 ;
+      RECT  7.100000  2.105000  7.365000 2.450000 ;
+      RECT  7.190000  1.445000  7.725000 1.765000 ;
+      RECT  7.540000  0.085000  8.275000 0.690000 ;
+      RECT  7.655000  2.125000  8.710000 2.635000 ;
+      RECT  7.910000  1.495000  8.755000 1.955000 ;
+      RECT  7.950000  1.275000  8.360000 1.325000 ;
+      RECT  8.535000  0.695000  9.890000 0.895000 ;
+      RECT  8.535000  0.895000  8.755000 1.495000 ;
+      RECT  8.880000  2.125000  9.735000 2.460000 ;
+      RECT  9.115000  1.075000  9.395000 1.905000 ;
+      RECT  9.160000  0.275000 10.775000 0.445000 ;
+      RECT  9.565000  1.895000 11.465000 2.065000 ;
+      RECT  9.565000  2.065000  9.735000 2.125000 ;
+      RECT  9.610000  0.895000  9.890000 1.245000 ;
+      RECT  9.685000  1.415000  9.960000 1.525000 ;
+      RECT  9.685000  1.525000 11.075000 1.725000 ;
+      RECT 10.045000  2.235000 10.425000 2.635000 ;
+      RECT 10.140000  0.855000 10.365000 1.185000 ;
+      RECT 10.140000  1.185000 11.945000 1.355000 ;
+      RECT 10.605000  0.445000 10.775000 0.845000 ;
+      RECT 10.605000  0.845000 11.545000 1.015000 ;
+      RECT 10.645000  2.065000 10.860000 2.450000 ;
+      RECT 11.135000  2.235000 11.465000 2.635000 ;
+      RECT 11.220000  0.085000 11.390000 0.545000 ;
+      RECT 11.245000  1.525000 11.465000 1.895000 ;
+      RECT 11.560000  0.255000 11.945000 0.540000 ;
+      RECT 11.685000  1.355000 11.945000 2.465000 ;
+      RECT 11.765000  0.540000 11.945000 1.185000 ;
+      RECT 12.170000  0.085000 12.380000 0.885000 ;
+      RECT 12.170000  1.485000 12.380000 2.635000 ;
+      RECT 13.215000  0.085000 13.505000 0.885000 ;
+      RECT 13.215000  1.485000 13.505000 2.635000 ;
+      RECT 13.720000  0.255000 13.905000 0.995000 ;
+      RECT 13.720000  0.995000 14.585000 1.325000 ;
+      RECT 13.720000  1.325000 13.905000 2.465000 ;
+      RECT 14.075000  0.085000 14.480000 0.825000 ;
+      RECT 14.075000  1.635000 14.480000 2.635000 ;
+      RECT 15.250000  0.085000 15.515000 0.885000 ;
+      RECT 15.250000  1.485000 15.515000 2.635000 ;
     LAYER mcon ;
-      RECT 1.675000 1.445000 1.845000 1.615000 ;
-      RECT 4.125000 1.785000 4.295000 1.955000 ;
-      RECT 4.585000 1.105000 4.755000 1.275000 ;
-      RECT 5.010000 1.445000 5.180000 1.615000 ;
-      RECT 5.605000 1.785000 5.775000 1.955000 ;
-      RECT 8.205000 1.785000 8.375000 1.955000 ;
-      RECT 9.225000 1.105000 9.395000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.630000  1.105000  0.800000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.675000  1.445000  1.845000 1.615000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.645000  1.105000  2.815000 1.275000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.125000  1.785000  4.295000 1.955000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.585000  1.105000  4.755000 1.275000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.010000  1.445000  5.180000 1.615000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.605000  1.785000  5.775000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.445000  1.445000  7.615000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.205000  1.785000  8.375000 1.955000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.225000  1.105000  9.395000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.735000  1.445000  9.905000 1.615000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
+      RECT 15.325000 -0.085000 15.495000 0.085000 ;
+      RECT 15.325000  2.635000 15.495000 2.805000 ;
     LAYER met1 ;
       RECT 1.615000 1.415000 1.955000 1.460000 ;
       RECT 1.615000 1.460000 5.240000 1.600000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
index db3c0c9..c8cd60c 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_1.magic.lef
@@ -75,12 +75,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.540000 0.765000 0.870000 1.675000 ;
-        RECT 2.570000 1.075000 2.950000 1.600000 ;
-      LAYER mcon ;
-        RECT 0.640000 1.105000 0.810000 1.275000 ;
-        RECT 2.645000 1.105000 2.815000 1.275000 ;
       LAYER met1 ;
         RECT 0.580000 1.075000 0.870000 1.120000 ;
         RECT 0.580000 1.120000 2.875000 1.260000 ;
@@ -94,13 +88,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 7.190000 1.445000  7.715000 1.765000 ;
-        RECT 9.580000 1.425000  9.860000 1.545000 ;
-        RECT 9.580000 1.545000 10.695000 1.725000 ;
-      LAYER mcon ;
-        RECT 7.435000 1.445000 7.605000 1.615000 ;
-        RECT 9.625000 1.445000 9.795000 1.615000 ;
       LAYER met1 ;
         RECT 7.375000 1.415000 7.715000 1.460000 ;
         RECT 7.375000 1.460000 9.905000 1.600000 ;
@@ -113,46 +100,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.340000 0.085000 ;
-        RECT  0.085000  0.085000  0.750000 0.595000 ;
-        RECT  2.025000  0.085000  2.290000 0.545000 ;
-        RECT  2.940000  0.085000  3.350000 0.555000 ;
-        RECT  3.925000  0.085000  4.255000 0.545000 ;
-        RECT  6.060000  0.085000  6.595000 0.465000 ;
-        RECT  7.255000  0.085000  8.315000 0.805000 ;
-        RECT 10.835000  0.085000 11.085000 0.545000 ;
-        RECT 12.285000  0.085000 12.690000 0.550000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
@@ -161,119 +108,164 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 13.340000 2.805000 ;
-        RECT  0.515000 2.195000  0.835000 2.635000 ;
-        RECT  2.940000 2.140000  3.235000 2.635000 ;
-        RECT  3.845000 2.275000  4.225000 2.635000 ;
-        RECT  6.445000 2.275000  6.830000 2.635000 ;
-        RECT  7.710000 2.125000  8.625000 2.635000 ;
-        RECT  9.860000 2.235000 10.190000 2.635000 ;
-        RECT 10.875000 2.235000 11.255000 2.635000 ;
-        RECT 12.435000 1.845000 12.690000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.845000  1.225000 2.025000 ;
-      RECT  0.085000 2.025000  0.345000 2.465000 ;
-      RECT  0.920000 0.255000  1.845000 0.595000 ;
-      RECT  1.055000 2.025000  1.225000 2.255000 ;
-      RECT  1.055000 2.255000  2.245000 2.465000 ;
-      RECT  1.395000 1.845000  1.845000 2.085000 ;
-      RECT  1.655000 0.595000  1.845000 1.845000 ;
-      RECT  2.065000 0.715000  2.720000 0.905000 ;
-      RECT  2.065000 0.905000  2.400000 1.770000 ;
-      RECT  2.065000 1.770000  2.720000 2.085000 ;
-      RECT  2.460000 0.255000  2.720000 0.715000 ;
-      RECT  2.470000 2.085000  2.720000 2.465000 ;
-      RECT  3.505000 1.830000  4.295000 2.000000 ;
-      RECT  3.505000 2.000000  3.675000 2.325000 ;
-      RECT  3.520000 0.255000  3.705000 0.715000 ;
-      RECT  3.520000 0.715000  4.295000 0.885000 ;
-      RECT  4.035000 0.885000  4.295000 1.830000 ;
-      RECT  4.445000 2.135000  4.790000 2.465000 ;
-      RECT  4.475000 0.255000  4.685000 1.085000 ;
-      RECT  4.475000 1.085000  4.840000 1.420000 ;
-      RECT  4.475000 1.420000  4.790000 2.135000 ;
-      RECT  4.855000 0.255000  5.180000 0.780000 ;
-      RECT  4.965000 1.590000  5.180000 2.465000 ;
-      RECT  5.010000 0.780000  5.180000 1.590000 ;
-      RECT  5.435000 2.135000  6.205000 2.465000 ;
-      RECT  5.465000 0.255000  5.890000 1.225000 ;
-      RECT  5.465000 1.225000  8.315000 1.275000 ;
-      RECT  5.465000 1.275000  6.975000 1.395000 ;
-      RECT  5.605000 1.575000  5.865000 1.955000 ;
-      RECT  6.035000 1.395000  6.205000 2.135000 ;
-      RECT  6.095000 0.635000  7.035000 0.805000 ;
-      RECT  6.095000 0.805000  6.475000 1.015000 ;
-      RECT  6.425000 1.575000  6.595000 1.935000 ;
-      RECT  6.425000 1.935000  7.420000 2.105000 ;
-      RECT  6.785000 0.255000  7.035000 0.635000 ;
-      RECT  6.805000 0.975000  8.315000 1.225000 ;
-      RECT  7.155000 2.105000  7.420000 2.450000 ;
-      RECT  7.885000 1.670000  8.785000 1.955000 ;
-      RECT  7.905000 1.275000  8.315000 1.325000 ;
-      RECT  8.485000 0.720000  9.850000 0.905000 ;
-      RECT  8.485000 0.905000  8.785000 1.670000 ;
-      RECT  8.795000 2.125000  9.690000 2.460000 ;
-      RECT  8.955000 1.075000  9.290000 1.905000 ;
-      RECT  9.025000 0.275000 10.650000 0.545000 ;
-      RECT  9.520000 0.905000  9.850000 1.255000 ;
-      RECT  9.520000 1.895000 11.255000 2.065000 ;
-      RECT  9.520000 2.065000  9.690000 2.125000 ;
-      RECT 10.035000 0.855000 10.280000 1.195000 ;
-      RECT 10.035000 1.195000 11.685000 1.365000 ;
-      RECT 10.395000 2.065000 10.595000 2.450000 ;
-      RECT 10.450000 0.545000 10.650000 0.785000 ;
-      RECT 10.450000 0.785000 11.285000 1.015000 ;
-      RECT 10.875000 1.605000 11.255000 1.895000 ;
-      RECT 11.345000 0.255000 11.685000 0.585000 ;
-      RECT 11.425000 1.365000 11.685000 2.465000 ;
-      RECT 11.455000 0.585000 11.685000 1.195000 ;
-      RECT 11.855000 0.255000 12.115000 0.995000 ;
-      RECT 11.855000 0.995000 12.745000 1.325000 ;
-      RECT 11.855000 1.325000 12.195000 2.465000 ;
+      RECT  0.000000 -0.085000 13.340000 0.085000 ;
+      RECT  0.000000  2.635000 13.340000 2.805000 ;
+      RECT  0.085000  0.085000  0.750000 0.595000 ;
+      RECT  0.085000  1.845000  1.225000 2.025000 ;
+      RECT  0.085000  2.025000  0.345000 2.465000 ;
+      RECT  0.515000  2.195000  0.835000 2.635000 ;
+      RECT  0.540000  0.765000  0.870000 1.675000 ;
+      RECT  0.920000  0.255000  1.845000 0.595000 ;
+      RECT  1.055000  2.025000  1.225000 2.255000 ;
+      RECT  1.055000  2.255000  2.245000 2.465000 ;
+      RECT  1.395000  1.845000  1.845000 2.085000 ;
+      RECT  1.655000  0.595000  1.845000 1.845000 ;
+      RECT  2.025000  0.085000  2.290000 0.545000 ;
+      RECT  2.065000  0.715000  2.720000 0.905000 ;
+      RECT  2.065000  0.905000  2.400000 1.770000 ;
+      RECT  2.065000  1.770000  2.720000 2.085000 ;
+      RECT  2.460000  0.255000  2.720000 0.715000 ;
+      RECT  2.470000  2.085000  2.720000 2.465000 ;
+      RECT  2.570000  1.075000  2.950000 1.600000 ;
+      RECT  2.940000  0.085000  3.350000 0.555000 ;
+      RECT  2.940000  2.140000  3.235000 2.635000 ;
+      RECT  3.505000  1.830000  4.295000 2.000000 ;
+      RECT  3.505000  2.000000  3.675000 2.325000 ;
+      RECT  3.520000  0.255000  3.705000 0.715000 ;
+      RECT  3.520000  0.715000  4.295000 0.885000 ;
+      RECT  3.845000  2.275000  4.225000 2.635000 ;
+      RECT  3.925000  0.085000  4.255000 0.545000 ;
+      RECT  4.035000  0.885000  4.295000 1.830000 ;
+      RECT  4.445000  2.135000  4.790000 2.465000 ;
+      RECT  4.475000  0.255000  4.685000 1.085000 ;
+      RECT  4.475000  1.085000  4.840000 1.420000 ;
+      RECT  4.475000  1.420000  4.790000 2.135000 ;
+      RECT  4.855000  0.255000  5.180000 0.780000 ;
+      RECT  4.965000  1.590000  5.180000 2.465000 ;
+      RECT  5.010000  0.780000  5.180000 1.590000 ;
+      RECT  5.435000  2.135000  6.205000 2.465000 ;
+      RECT  5.465000  0.255000  5.890000 1.225000 ;
+      RECT  5.465000  1.225000  8.315000 1.275000 ;
+      RECT  5.465000  1.275000  6.975000 1.395000 ;
+      RECT  5.605000  1.575000  5.865000 1.955000 ;
+      RECT  6.035000  1.395000  6.205000 2.135000 ;
+      RECT  6.060000  0.085000  6.595000 0.465000 ;
+      RECT  6.095000  0.635000  7.035000 0.805000 ;
+      RECT  6.095000  0.805000  6.475000 1.015000 ;
+      RECT  6.425000  1.575000  6.595000 1.935000 ;
+      RECT  6.425000  1.935000  7.420000 2.105000 ;
+      RECT  6.445000  2.275000  6.830000 2.635000 ;
+      RECT  6.785000  0.255000  7.035000 0.635000 ;
+      RECT  6.805000  0.975000  8.315000 1.225000 ;
+      RECT  7.155000  2.105000  7.420000 2.450000 ;
+      RECT  7.190000  1.445000  7.715000 1.765000 ;
+      RECT  7.255000  0.085000  8.315000 0.805000 ;
+      RECT  7.710000  2.125000  8.625000 2.635000 ;
+      RECT  7.885000  1.670000  8.785000 1.955000 ;
+      RECT  7.905000  1.275000  8.315000 1.325000 ;
+      RECT  8.485000  0.720000  9.850000 0.905000 ;
+      RECT  8.485000  0.905000  8.785000 1.670000 ;
+      RECT  8.795000  2.125000  9.690000 2.460000 ;
+      RECT  8.955000  1.075000  9.290000 1.905000 ;
+      RECT  9.025000  0.275000 10.650000 0.545000 ;
+      RECT  9.520000  0.905000  9.850000 1.255000 ;
+      RECT  9.520000  1.895000 11.255000 2.065000 ;
+      RECT  9.520000  2.065000  9.690000 2.125000 ;
+      RECT  9.580000  1.425000  9.860000 1.545000 ;
+      RECT  9.580000  1.545000 10.695000 1.725000 ;
+      RECT  9.860000  2.235000 10.190000 2.635000 ;
+      RECT 10.035000  0.855000 10.280000 1.195000 ;
+      RECT 10.035000  1.195000 11.685000 1.365000 ;
+      RECT 10.395000  2.065000 10.595000 2.450000 ;
+      RECT 10.450000  0.545000 10.650000 0.785000 ;
+      RECT 10.450000  0.785000 11.285000 1.015000 ;
+      RECT 10.835000  0.085000 11.085000 0.545000 ;
+      RECT 10.875000  1.605000 11.255000 1.895000 ;
+      RECT 10.875000  2.235000 11.255000 2.635000 ;
+      RECT 11.345000  0.255000 11.685000 0.585000 ;
+      RECT 11.425000  1.365000 11.685000 2.465000 ;
+      RECT 11.455000  0.585000 11.685000 1.195000 ;
+      RECT 11.855000  0.255000 12.115000 0.995000 ;
+      RECT 11.855000  0.995000 12.745000 1.325000 ;
+      RECT 11.855000  1.325000 12.195000 2.465000 ;
+      RECT 12.285000  0.085000 12.690000 0.550000 ;
+      RECT 12.435000  1.845000 12.690000 2.635000 ;
     LAYER mcon ;
-      RECT 1.675000 1.445000 1.845000 1.615000 ;
-      RECT 4.125000 1.785000 4.295000 1.955000 ;
-      RECT 4.635000 1.100000 4.805000 1.270000 ;
-      RECT 5.010000 1.445000 5.180000 1.615000 ;
-      RECT 5.605000 1.785000 5.775000 1.955000 ;
-      RECT 8.210000 1.785000 8.380000 1.955000 ;
-      RECT 9.050000 1.105000 9.220000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.640000  1.105000  0.810000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.675000  1.445000  1.845000 1.615000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.645000  1.105000  2.815000 1.275000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.125000  1.785000  4.295000 1.955000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.635000  1.100000  4.805000 1.270000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.010000  1.445000  5.180000 1.615000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.605000  1.785000  5.775000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.435000  1.445000  7.605000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.210000  1.785000  8.380000 1.955000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.050000  1.105000  9.220000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.625000  1.445000  9.795000 1.615000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
     LAYER met1 ;
       RECT 1.615000 1.415000 1.955000 1.460000 ;
       RECT 1.615000 1.460000 5.240000 1.600000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
index 4011056..6c816b4 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_2.magic.lef
@@ -77,12 +77,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.540000 0.765000 0.870000 1.675000 ;
-        RECT 2.570000 1.075000 2.950000 1.600000 ;
-      LAYER mcon ;
-        RECT 0.640000 1.105000 0.810000 1.275000 ;
-        RECT 2.645000 1.105000 2.815000 1.275000 ;
       LAYER met1 ;
         RECT 0.580000 1.075000 0.870000 1.120000 ;
         RECT 0.580000 1.120000 2.875000 1.260000 ;
@@ -96,13 +90,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 7.190000 1.445000  7.715000 1.765000 ;
-        RECT 9.730000 1.425000 10.035000 1.545000 ;
-        RECT 9.730000 1.545000 10.995000 1.725000 ;
-      LAYER mcon ;
-        RECT 7.435000 1.445000 7.605000 1.615000 ;
-        RECT 9.790000 1.445000 9.960000 1.615000 ;
       LAYER met1 ;
         RECT 7.375000 1.415000  7.715000 1.460000 ;
         RECT 7.375000 1.460000 10.070000 1.600000 ;
@@ -115,49 +102,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 14.260000 0.085000 ;
-        RECT  0.085000  0.085000  0.750000 0.595000 ;
-        RECT  2.025000  0.085000  2.290000 0.545000 ;
-        RECT  2.940000  0.085000  3.350000 0.555000 ;
-        RECT  3.925000  0.085000  4.255000 0.545000 ;
-        RECT  6.060000  0.085000  6.595000 0.465000 ;
-        RECT  7.255000  0.085000  8.415000 0.805000 ;
-        RECT 11.165000  0.085000 11.415000 0.545000 ;
-        RECT 12.615000  0.085000 13.020000 0.550000 ;
-        RECT 13.825000  0.085000 13.995000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 14.260000 0.240000 ;
     END
@@ -166,122 +110,170 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 14.260000 2.805000 ;
-        RECT  0.515000 2.195000  0.835000 2.635000 ;
-        RECT  2.940000 2.140000  3.235000 2.635000 ;
-        RECT  3.845000 2.275000  4.225000 2.635000 ;
-        RECT  6.445000 2.275000  6.830000 2.635000 ;
-        RECT  7.710000 2.125000  8.765000 2.635000 ;
-        RECT 10.060000 2.235000 10.440000 2.635000 ;
-        RECT 11.205000 2.235000 11.585000 2.635000 ;
-        RECT 12.765000 1.845000 13.020000 2.635000 ;
-        RECT 13.825000 1.495000 13.995000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 14.260000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.845000  1.225000 2.025000 ;
-      RECT  0.085000 2.025000  0.345000 2.465000 ;
-      RECT  0.920000 0.255000  1.845000 0.595000 ;
-      RECT  1.055000 2.025000  1.225000 2.255000 ;
-      RECT  1.055000 2.255000  2.245000 2.465000 ;
-      RECT  1.395000 1.845000  1.845000 2.085000 ;
-      RECT  1.655000 0.595000  1.845000 1.845000 ;
-      RECT  2.065000 0.715000  2.720000 0.905000 ;
-      RECT  2.065000 0.905000  2.400000 1.770000 ;
-      RECT  2.065000 1.770000  2.720000 2.085000 ;
-      RECT  2.460000 0.255000  2.720000 0.715000 ;
-      RECT  2.470000 2.085000  2.720000 2.465000 ;
-      RECT  3.505000 1.830000  4.295000 2.000000 ;
-      RECT  3.505000 2.000000  3.675000 2.325000 ;
-      RECT  3.520000 0.255000  3.705000 0.715000 ;
-      RECT  3.520000 0.715000  4.295000 0.885000 ;
-      RECT  4.035000 0.885000  4.295000 1.830000 ;
-      RECT  4.445000 2.135000  4.790000 2.465000 ;
-      RECT  4.475000 0.255000  4.685000 1.085000 ;
-      RECT  4.475000 1.085000  4.840000 1.420000 ;
-      RECT  4.475000 1.420000  4.790000 2.135000 ;
-      RECT  4.855000 0.255000  5.180000 0.780000 ;
-      RECT  4.965000 1.590000  5.180000 2.465000 ;
-      RECT  5.010000 0.780000  5.180000 1.590000 ;
-      RECT  5.435000 2.135000  6.205000 2.465000 ;
-      RECT  5.465000 0.255000  5.890000 1.225000 ;
-      RECT  5.465000 1.225000  8.415000 1.275000 ;
-      RECT  5.465000 1.275000  6.975000 1.395000 ;
-      RECT  5.605000 1.575000  5.865000 1.955000 ;
-      RECT  6.035000 1.395000  6.205000 2.135000 ;
-      RECT  6.095000 0.635000  7.035000 0.805000 ;
-      RECT  6.095000 0.805000  6.475000 1.015000 ;
-      RECT  6.425000 1.575000  6.595000 1.935000 ;
-      RECT  6.425000 1.935000  7.420000 2.105000 ;
-      RECT  6.785000 0.255000  7.035000 0.635000 ;
-      RECT  6.805000 0.975000  8.415000 1.225000 ;
-      RECT  7.155000 2.105000  7.420000 2.450000 ;
-      RECT  7.885000 1.670000  8.885000 1.955000 ;
-      RECT  8.005000 1.275000  8.415000 1.325000 ;
-      RECT  8.585000 0.720000 10.005000 0.905000 ;
-      RECT  8.585000 0.905000  8.885000 1.670000 ;
-      RECT  8.935000 2.125000  9.840000 2.460000 ;
-      RECT  9.175000 1.075000  9.500000 1.905000 ;
-      RECT  9.265000 0.275000 10.910000 0.545000 ;
-      RECT  9.670000 0.905000 10.005000 1.255000 ;
-      RECT  9.670000 1.895000 11.585000 2.065000 ;
-      RECT  9.670000 2.065000  9.840000 2.125000 ;
-      RECT 10.220000 0.855000 10.480000 1.195000 ;
-      RECT 10.220000 1.195000 12.015000 1.365000 ;
-      RECT 10.610000 2.065000 11.015000 2.450000 ;
-      RECT 10.710000 0.545000 10.910000 0.785000 ;
-      RECT 10.710000 0.785000 11.615000 1.015000 ;
-      RECT 11.205000 1.605000 11.585000 1.895000 ;
-      RECT 11.675000 0.255000 12.015000 0.585000 ;
-      RECT 11.755000 1.365000 12.015000 2.465000 ;
-      RECT 11.785000 0.585000 12.015000 1.195000 ;
-      RECT 12.185000 0.255000 12.445000 0.995000 ;
-      RECT 12.185000 0.995000 13.125000 1.325000 ;
-      RECT 12.185000 1.325000 12.525000 2.465000 ;
+      RECT  0.000000 -0.085000 14.260000 0.085000 ;
+      RECT  0.000000  2.635000 14.260000 2.805000 ;
+      RECT  0.085000  0.085000  0.750000 0.595000 ;
+      RECT  0.085000  1.845000  1.225000 2.025000 ;
+      RECT  0.085000  2.025000  0.345000 2.465000 ;
+      RECT  0.515000  2.195000  0.835000 2.635000 ;
+      RECT  0.540000  0.765000  0.870000 1.675000 ;
+      RECT  0.920000  0.255000  1.845000 0.595000 ;
+      RECT  1.055000  2.025000  1.225000 2.255000 ;
+      RECT  1.055000  2.255000  2.245000 2.465000 ;
+      RECT  1.395000  1.845000  1.845000 2.085000 ;
+      RECT  1.655000  0.595000  1.845000 1.845000 ;
+      RECT  2.025000  0.085000  2.290000 0.545000 ;
+      RECT  2.065000  0.715000  2.720000 0.905000 ;
+      RECT  2.065000  0.905000  2.400000 1.770000 ;
+      RECT  2.065000  1.770000  2.720000 2.085000 ;
+      RECT  2.460000  0.255000  2.720000 0.715000 ;
+      RECT  2.470000  2.085000  2.720000 2.465000 ;
+      RECT  2.570000  1.075000  2.950000 1.600000 ;
+      RECT  2.940000  0.085000  3.350000 0.555000 ;
+      RECT  2.940000  2.140000  3.235000 2.635000 ;
+      RECT  3.505000  1.830000  4.295000 2.000000 ;
+      RECT  3.505000  2.000000  3.675000 2.325000 ;
+      RECT  3.520000  0.255000  3.705000 0.715000 ;
+      RECT  3.520000  0.715000  4.295000 0.885000 ;
+      RECT  3.845000  2.275000  4.225000 2.635000 ;
+      RECT  3.925000  0.085000  4.255000 0.545000 ;
+      RECT  4.035000  0.885000  4.295000 1.830000 ;
+      RECT  4.445000  2.135000  4.790000 2.465000 ;
+      RECT  4.475000  0.255000  4.685000 1.085000 ;
+      RECT  4.475000  1.085000  4.840000 1.420000 ;
+      RECT  4.475000  1.420000  4.790000 2.135000 ;
+      RECT  4.855000  0.255000  5.180000 0.780000 ;
+      RECT  4.965000  1.590000  5.180000 2.465000 ;
+      RECT  5.010000  0.780000  5.180000 1.590000 ;
+      RECT  5.435000  2.135000  6.205000 2.465000 ;
+      RECT  5.465000  0.255000  5.890000 1.225000 ;
+      RECT  5.465000  1.225000  8.415000 1.275000 ;
+      RECT  5.465000  1.275000  6.975000 1.395000 ;
+      RECT  5.605000  1.575000  5.865000 1.955000 ;
+      RECT  6.035000  1.395000  6.205000 2.135000 ;
+      RECT  6.060000  0.085000  6.595000 0.465000 ;
+      RECT  6.095000  0.635000  7.035000 0.805000 ;
+      RECT  6.095000  0.805000  6.475000 1.015000 ;
+      RECT  6.425000  1.575000  6.595000 1.935000 ;
+      RECT  6.425000  1.935000  7.420000 2.105000 ;
+      RECT  6.445000  2.275000  6.830000 2.635000 ;
+      RECT  6.785000  0.255000  7.035000 0.635000 ;
+      RECT  6.805000  0.975000  8.415000 1.225000 ;
+      RECT  7.155000  2.105000  7.420000 2.450000 ;
+      RECT  7.190000  1.445000  7.715000 1.765000 ;
+      RECT  7.255000  0.085000  8.415000 0.805000 ;
+      RECT  7.710000  2.125000  8.765000 2.635000 ;
+      RECT  7.885000  1.670000  8.885000 1.955000 ;
+      RECT  8.005000  1.275000  8.415000 1.325000 ;
+      RECT  8.585000  0.720000 10.005000 0.905000 ;
+      RECT  8.585000  0.905000  8.885000 1.670000 ;
+      RECT  8.935000  2.125000  9.840000 2.460000 ;
+      RECT  9.175000  1.075000  9.500000 1.905000 ;
+      RECT  9.265000  0.275000 10.910000 0.545000 ;
+      RECT  9.670000  0.905000 10.005000 1.255000 ;
+      RECT  9.670000  1.895000 11.585000 2.065000 ;
+      RECT  9.670000  2.065000  9.840000 2.125000 ;
+      RECT  9.730000  1.425000 10.035000 1.545000 ;
+      RECT  9.730000  1.545000 10.995000 1.725000 ;
+      RECT 10.060000  2.235000 10.440000 2.635000 ;
+      RECT 10.220000  0.855000 10.480000 1.195000 ;
+      RECT 10.220000  1.195000 12.015000 1.365000 ;
+      RECT 10.610000  2.065000 11.015000 2.450000 ;
+      RECT 10.710000  0.545000 10.910000 0.785000 ;
+      RECT 10.710000  0.785000 11.615000 1.015000 ;
+      RECT 11.165000  0.085000 11.415000 0.545000 ;
+      RECT 11.205000  1.605000 11.585000 1.895000 ;
+      RECT 11.205000  2.235000 11.585000 2.635000 ;
+      RECT 11.675000  0.255000 12.015000 0.585000 ;
+      RECT 11.755000  1.365000 12.015000 2.465000 ;
+      RECT 11.785000  0.585000 12.015000 1.195000 ;
+      RECT 12.185000  0.255000 12.445000 0.995000 ;
+      RECT 12.185000  0.995000 13.125000 1.325000 ;
+      RECT 12.185000  1.325000 12.525000 2.465000 ;
+      RECT 12.615000  0.085000 13.020000 0.550000 ;
+      RECT 12.765000  1.845000 13.020000 2.635000 ;
+      RECT 13.825000  0.085000 13.995000 0.885000 ;
+      RECT 13.825000  1.495000 13.995000 2.635000 ;
     LAYER mcon ;
-      RECT 1.675000 1.445000 1.845000 1.615000 ;
-      RECT 4.125000 1.785000 4.295000 1.955000 ;
-      RECT 4.635000 1.100000 4.805000 1.270000 ;
-      RECT 5.010000 1.445000 5.180000 1.615000 ;
-      RECT 5.605000 1.785000 5.775000 1.955000 ;
-      RECT 8.210000 1.785000 8.380000 1.955000 ;
-      RECT 9.280000 1.105000 9.450000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.640000  1.105000  0.810000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.675000  1.445000  1.845000 1.615000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.645000  1.105000  2.815000 1.275000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.125000  1.785000  4.295000 1.955000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.635000  1.100000  4.805000 1.270000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.010000  1.445000  5.180000 1.615000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.605000  1.785000  5.775000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.435000  1.445000  7.605000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.210000  1.785000  8.380000 1.955000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.280000  1.105000  9.450000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.790000  1.445000  9.960000 1.615000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
     LAYER met1 ;
       RECT 1.615000 1.415000 1.955000 1.460000 ;
       RECT 1.615000 1.460000 5.240000 1.600000 ;
diff --git a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
index 1a890bc..5e2b283 100644
--- a/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
+++ b/cells/sdfstp/sky130_fd_sc_hdll__sdfstp_4.magic.lef
@@ -81,12 +81,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 0.540000 0.765000 0.870000 1.675000 ;
-        RECT 2.570000 1.075000 2.950000 1.600000 ;
-      LAYER mcon ;
-        RECT 0.640000 1.105000 0.810000 1.275000 ;
-        RECT 2.645000 1.105000 2.815000 1.275000 ;
       LAYER met1 ;
         RECT 0.580000 1.075000 0.870000 1.120000 ;
         RECT 0.580000 1.120000 2.875000 1.260000 ;
@@ -100,13 +94,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 7.190000 1.445000  7.715000 1.765000 ;
-        RECT 9.730000 1.425000 10.035000 1.545000 ;
-        RECT 9.730000 1.545000 10.995000 1.725000 ;
-      LAYER mcon ;
-        RECT 7.435000 1.445000 7.605000 1.615000 ;
-        RECT 9.790000 1.445000 9.960000 1.615000 ;
       LAYER met1 ;
         RECT 7.375000 1.415000  7.715000 1.460000 ;
         RECT 7.375000 1.460000 10.070000 1.600000 ;
@@ -119,52 +106,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.180000 0.085000 ;
-        RECT  0.085000  0.085000  0.750000 0.595000 ;
-        RECT  2.025000  0.085000  2.290000 0.545000 ;
-        RECT  2.940000  0.085000  3.350000 0.555000 ;
-        RECT  3.925000  0.085000  4.255000 0.545000 ;
-        RECT  6.060000  0.085000  6.595000 0.465000 ;
-        RECT  7.255000  0.085000  8.415000 0.805000 ;
-        RECT 11.165000  0.085000 11.415000 0.545000 ;
-        RECT 12.615000  0.085000 13.020000 0.825000 ;
-        RECT 13.790000  0.085000 13.960000 0.885000 ;
-        RECT 14.780000  0.085000 15.065000 0.885000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
@@ -173,125 +114,176 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 15.180000 2.805000 ;
-        RECT  0.515000 2.195000  0.835000 2.635000 ;
-        RECT  2.940000 2.140000  3.235000 2.635000 ;
-        RECT  3.845000 2.275000  4.225000 2.635000 ;
-        RECT  6.445000 2.275000  6.830000 2.635000 ;
-        RECT  7.710000 2.125000  8.765000 2.635000 ;
-        RECT 10.060000 2.235000 10.440000 2.635000 ;
-        RECT 11.205000 2.235000 11.585000 2.635000 ;
-        RECT 12.615000 1.495000 13.020000 2.635000 ;
-        RECT 13.790000 1.495000 13.960000 2.635000 ;
-        RECT 14.780000 1.495000 15.065000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 15.180000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 1.845000  1.225000 2.025000 ;
-      RECT  0.085000 2.025000  0.345000 2.465000 ;
-      RECT  0.920000 0.255000  1.845000 0.595000 ;
-      RECT  1.055000 2.025000  1.225000 2.255000 ;
-      RECT  1.055000 2.255000  2.245000 2.465000 ;
-      RECT  1.395000 1.845000  1.845000 2.085000 ;
-      RECT  1.655000 0.595000  1.845000 1.845000 ;
-      RECT  2.065000 0.715000  2.720000 0.905000 ;
-      RECT  2.065000 0.905000  2.400000 1.770000 ;
-      RECT  2.065000 1.770000  2.720000 2.085000 ;
-      RECT  2.460000 0.255000  2.720000 0.715000 ;
-      RECT  2.470000 2.085000  2.720000 2.465000 ;
-      RECT  3.505000 1.830000  4.295000 2.000000 ;
-      RECT  3.505000 2.000000  3.675000 2.325000 ;
-      RECT  3.520000 0.255000  3.705000 0.715000 ;
-      RECT  3.520000 0.715000  4.295000 0.885000 ;
-      RECT  4.035000 0.885000  4.295000 1.830000 ;
-      RECT  4.445000 2.135000  4.790000 2.465000 ;
-      RECT  4.475000 0.255000  4.685000 1.085000 ;
-      RECT  4.475000 1.085000  4.840000 1.420000 ;
-      RECT  4.475000 1.420000  4.790000 2.135000 ;
-      RECT  4.855000 0.255000  5.180000 0.780000 ;
-      RECT  4.965000 1.590000  5.180000 2.465000 ;
-      RECT  5.010000 0.780000  5.180000 1.590000 ;
-      RECT  5.435000 2.135000  6.205000 2.465000 ;
-      RECT  5.465000 0.255000  5.890000 1.225000 ;
-      RECT  5.465000 1.225000  8.415000 1.275000 ;
-      RECT  5.465000 1.275000  6.975000 1.395000 ;
-      RECT  5.605000 1.575000  5.865000 1.955000 ;
-      RECT  6.035000 1.395000  6.205000 2.135000 ;
-      RECT  6.095000 0.635000  7.035000 0.805000 ;
-      RECT  6.095000 0.805000  6.475000 1.015000 ;
-      RECT  6.425000 1.575000  6.595000 1.935000 ;
-      RECT  6.425000 1.935000  7.420000 2.105000 ;
-      RECT  6.785000 0.255000  7.035000 0.635000 ;
-      RECT  6.805000 0.975000  8.415000 1.225000 ;
-      RECT  7.155000 2.105000  7.420000 2.450000 ;
-      RECT  7.885000 1.670000  8.885000 1.955000 ;
-      RECT  8.005000 1.275000  8.415000 1.325000 ;
-      RECT  8.585000 0.720000 10.005000 0.905000 ;
-      RECT  8.585000 0.905000  8.885000 1.670000 ;
-      RECT  8.935000 2.125000  9.840000 2.460000 ;
-      RECT  9.175000 1.075000  9.500000 1.905000 ;
-      RECT  9.265000 0.275000 10.910000 0.545000 ;
-      RECT  9.670000 0.905000 10.005000 1.255000 ;
-      RECT  9.670000 1.895000 11.585000 2.065000 ;
-      RECT  9.670000 2.065000  9.840000 2.125000 ;
-      RECT 10.220000 0.855000 10.480000 1.195000 ;
-      RECT 10.220000 1.195000 12.015000 1.365000 ;
-      RECT 10.610000 2.065000 11.015000 2.450000 ;
-      RECT 10.710000 0.545000 10.910000 0.785000 ;
-      RECT 10.710000 0.785000 11.615000 1.015000 ;
-      RECT 11.205000 1.605000 11.585000 1.895000 ;
-      RECT 11.675000 0.255000 12.015000 0.585000 ;
-      RECT 11.755000 1.365000 12.015000 2.465000 ;
-      RECT 11.785000 0.585000 12.015000 1.195000 ;
-      RECT 12.185000 0.255000 12.445000 0.995000 ;
-      RECT 12.185000 0.995000 13.125000 1.325000 ;
-      RECT 12.185000 1.325000 12.445000 2.465000 ;
+      RECT  0.000000 -0.085000 15.180000 0.085000 ;
+      RECT  0.000000  2.635000 15.180000 2.805000 ;
+      RECT  0.085000  0.085000  0.750000 0.595000 ;
+      RECT  0.085000  1.845000  1.225000 2.025000 ;
+      RECT  0.085000  2.025000  0.345000 2.465000 ;
+      RECT  0.515000  2.195000  0.835000 2.635000 ;
+      RECT  0.540000  0.765000  0.870000 1.675000 ;
+      RECT  0.920000  0.255000  1.845000 0.595000 ;
+      RECT  1.055000  2.025000  1.225000 2.255000 ;
+      RECT  1.055000  2.255000  2.245000 2.465000 ;
+      RECT  1.395000  1.845000  1.845000 2.085000 ;
+      RECT  1.655000  0.595000  1.845000 1.845000 ;
+      RECT  2.025000  0.085000  2.290000 0.545000 ;
+      RECT  2.065000  0.715000  2.720000 0.905000 ;
+      RECT  2.065000  0.905000  2.400000 1.770000 ;
+      RECT  2.065000  1.770000  2.720000 2.085000 ;
+      RECT  2.460000  0.255000  2.720000 0.715000 ;
+      RECT  2.470000  2.085000  2.720000 2.465000 ;
+      RECT  2.570000  1.075000  2.950000 1.600000 ;
+      RECT  2.940000  0.085000  3.350000 0.555000 ;
+      RECT  2.940000  2.140000  3.235000 2.635000 ;
+      RECT  3.505000  1.830000  4.295000 2.000000 ;
+      RECT  3.505000  2.000000  3.675000 2.325000 ;
+      RECT  3.520000  0.255000  3.705000 0.715000 ;
+      RECT  3.520000  0.715000  4.295000 0.885000 ;
+      RECT  3.845000  2.275000  4.225000 2.635000 ;
+      RECT  3.925000  0.085000  4.255000 0.545000 ;
+      RECT  4.035000  0.885000  4.295000 1.830000 ;
+      RECT  4.445000  2.135000  4.790000 2.465000 ;
+      RECT  4.475000  0.255000  4.685000 1.085000 ;
+      RECT  4.475000  1.085000  4.840000 1.420000 ;
+      RECT  4.475000  1.420000  4.790000 2.135000 ;
+      RECT  4.855000  0.255000  5.180000 0.780000 ;
+      RECT  4.965000  1.590000  5.180000 2.465000 ;
+      RECT  5.010000  0.780000  5.180000 1.590000 ;
+      RECT  5.435000  2.135000  6.205000 2.465000 ;
+      RECT  5.465000  0.255000  5.890000 1.225000 ;
+      RECT  5.465000  1.225000  8.415000 1.275000 ;
+      RECT  5.465000  1.275000  6.975000 1.395000 ;
+      RECT  5.605000  1.575000  5.865000 1.955000 ;
+      RECT  6.035000  1.395000  6.205000 2.135000 ;
+      RECT  6.060000  0.085000  6.595000 0.465000 ;
+      RECT  6.095000  0.635000  7.035000 0.805000 ;
+      RECT  6.095000  0.805000  6.475000 1.015000 ;
+      RECT  6.425000  1.575000  6.595000 1.935000 ;
+      RECT  6.425000  1.935000  7.420000 2.105000 ;
+      RECT  6.445000  2.275000  6.830000 2.635000 ;
+      RECT  6.785000  0.255000  7.035000 0.635000 ;
+      RECT  6.805000  0.975000  8.415000 1.225000 ;
+      RECT  7.155000  2.105000  7.420000 2.450000 ;
+      RECT  7.190000  1.445000  7.715000 1.765000 ;
+      RECT  7.255000  0.085000  8.415000 0.805000 ;
+      RECT  7.710000  2.125000  8.765000 2.635000 ;
+      RECT  7.885000  1.670000  8.885000 1.955000 ;
+      RECT  8.005000  1.275000  8.415000 1.325000 ;
+      RECT  8.585000  0.720000 10.005000 0.905000 ;
+      RECT  8.585000  0.905000  8.885000 1.670000 ;
+      RECT  8.935000  2.125000  9.840000 2.460000 ;
+      RECT  9.175000  1.075000  9.500000 1.905000 ;
+      RECT  9.265000  0.275000 10.910000 0.545000 ;
+      RECT  9.670000  0.905000 10.005000 1.255000 ;
+      RECT  9.670000  1.895000 11.585000 2.065000 ;
+      RECT  9.670000  2.065000  9.840000 2.125000 ;
+      RECT  9.730000  1.425000 10.035000 1.545000 ;
+      RECT  9.730000  1.545000 10.995000 1.725000 ;
+      RECT 10.060000  2.235000 10.440000 2.635000 ;
+      RECT 10.220000  0.855000 10.480000 1.195000 ;
+      RECT 10.220000  1.195000 12.015000 1.365000 ;
+      RECT 10.610000  2.065000 11.015000 2.450000 ;
+      RECT 10.710000  0.545000 10.910000 0.785000 ;
+      RECT 10.710000  0.785000 11.615000 1.015000 ;
+      RECT 11.165000  0.085000 11.415000 0.545000 ;
+      RECT 11.205000  1.605000 11.585000 1.895000 ;
+      RECT 11.205000  2.235000 11.585000 2.635000 ;
+      RECT 11.675000  0.255000 12.015000 0.585000 ;
+      RECT 11.755000  1.365000 12.015000 2.465000 ;
+      RECT 11.785000  0.585000 12.015000 1.195000 ;
+      RECT 12.185000  0.255000 12.445000 0.995000 ;
+      RECT 12.185000  0.995000 13.125000 1.325000 ;
+      RECT 12.185000  1.325000 12.445000 2.465000 ;
+      RECT 12.615000  0.085000 13.020000 0.825000 ;
+      RECT 12.615000  1.495000 13.020000 2.635000 ;
+      RECT 13.790000  0.085000 13.960000 0.885000 ;
+      RECT 13.790000  1.495000 13.960000 2.635000 ;
+      RECT 14.780000  0.085000 15.065000 0.885000 ;
+      RECT 14.780000  1.495000 15.065000 2.635000 ;
     LAYER mcon ;
-      RECT 1.675000 1.445000 1.845000 1.615000 ;
-      RECT 4.125000 1.785000 4.295000 1.955000 ;
-      RECT 4.635000 1.100000 4.805000 1.270000 ;
-      RECT 5.010000 1.445000 5.180000 1.615000 ;
-      RECT 5.605000 1.785000 5.775000 1.955000 ;
-      RECT 8.210000 1.785000 8.380000 1.955000 ;
-      RECT 9.280000 1.105000 9.450000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.640000  1.105000  0.810000 1.275000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.675000  1.445000  1.845000 1.615000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.645000  1.105000  2.815000 1.275000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.125000  1.785000  4.295000 1.955000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.635000  1.100000  4.805000 1.270000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.010000  1.445000  5.180000 1.615000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.605000  1.785000  5.775000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.435000  1.445000  7.605000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.210000  1.785000  8.380000 1.955000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.280000  1.105000  9.450000 1.275000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.790000  1.445000  9.960000 1.615000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
     LAYER met1 ;
       RECT 1.615000 1.415000 1.955000 1.460000 ;
       RECT 1.615000 1.460000 5.240000 1.600000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
index fbc6390..77edfc3 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_1.magic.lef
@@ -96,42 +96,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.960000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.145000  0.085000  2.475000 0.445000 ;
-        RECT  4.095000  0.085000  4.295000 0.545000 ;
-        RECT  6.175000  0.085000  6.545000 0.585000 ;
-        RECT  8.380000  0.085000  8.800000 0.615000 ;
-        RECT  9.620000  0.085000  9.790000 0.695000 ;
-        RECT 11.065000  0.085000 11.395000 0.805000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
@@ -140,116 +104,148 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.960000 2.805000 ;
-        RECT  0.515000 2.135000  0.895000 2.635000 ;
-        RECT  1.975000 2.245000  2.355000 2.635000 ;
-        RECT  4.090000 2.165000  4.260000 2.635000 ;
-        RECT  6.385000 1.835000  6.555000 2.635000 ;
-        RECT  8.515000 2.135000  8.820000 2.635000 ;
-        RECT  9.620000 1.625000  9.790000 2.635000 ;
-        RECT 11.090000 1.495000 11.395000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.860000 0.805000 ;
-      RECT  0.175000 1.795000  0.895000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.665000 0.805000  0.860000 0.970000 ;
-      RECT  0.665000 0.970000  0.895000 1.795000 ;
-      RECT  1.115000 0.345000  1.285000 2.465000 ;
-      RECT  1.520000 0.255000  1.905000 0.445000 ;
-      RECT  1.520000 0.445000  1.690000 1.860000 ;
-      RECT  1.520000 1.860000  3.530000 2.075000 ;
-      RECT  1.520000 2.075000  1.805000 2.445000 ;
-      RECT  2.250000 0.955000  2.695000 1.125000 ;
-      RECT  2.250000 1.125000  2.420000 1.860000 ;
-      RECT  2.875000 2.245000  3.870000 2.415000 ;
-      RECT  3.050000 0.275000  3.875000 0.445000 ;
-      RECT  3.335000 1.355000  3.555000 1.685000 ;
-      RECT  3.335000 1.685000  3.530000 1.860000 ;
-      RECT  3.700000 1.825000  4.685000 1.995000 ;
-      RECT  3.700000 1.995000  3.870000 2.245000 ;
-      RECT  3.705000 0.445000  3.875000 0.715000 ;
-      RECT  3.705000 0.715000  4.685000 0.885000 ;
-      RECT  4.515000 0.365000  4.865000 0.535000 ;
-      RECT  4.515000 0.535000  4.685000 0.715000 ;
-      RECT  4.515000 0.885000  4.685000 1.825000 ;
-      RECT  4.515000 1.995000  4.685000 2.070000 ;
-      RECT  4.515000 2.070000  4.800000 2.440000 ;
-      RECT  4.855000 0.705000  5.485000 1.035000 ;
-      RECT  4.855000 1.035000  5.145000 1.905000 ;
-      RECT  4.995000 2.190000  6.215000 2.360000 ;
-      RECT  5.085000 0.365000  5.875000 0.535000 ;
-      RECT  5.335000 1.655000  5.825000 2.010000 ;
-      RECT  5.705000 0.535000  5.875000 1.315000 ;
-      RECT  5.705000 1.315000  6.555000 1.485000 ;
-      RECT  5.995000 1.485000  6.555000 1.575000 ;
-      RECT  5.995000 1.575000  6.215000 2.190000 ;
-      RECT  6.095000 0.765000  6.945000 1.065000 ;
-      RECT  6.095000 1.065000  6.265000 1.095000 ;
-      RECT  6.385000 1.245000  6.555000 1.315000 ;
-      RECT  6.725000 0.365000  7.235000 0.535000 ;
-      RECT  6.725000 0.535000  6.945000 0.765000 ;
-      RECT  6.725000 1.065000  6.945000 2.135000 ;
-      RECT  6.725000 2.135000  7.025000 2.465000 ;
-      RECT  7.115000 0.705000  7.715000 1.035000 ;
-      RECT  7.115000 1.245000  7.355000 1.965000 ;
-      RECT  7.250000 2.165000  8.285000 2.335000 ;
-      RECT  7.515000 0.365000  8.155000 0.535000 ;
-      RECT  7.525000 1.035000  7.715000 1.575000 ;
-      RECT  7.525000 1.575000  7.895000 1.905000 ;
-      RECT  7.935000 0.535000  8.155000 0.995000 ;
-      RECT  7.935000 0.995000  9.045000 1.325000 ;
-      RECT  7.935000 1.325000  8.285000 1.405000 ;
-      RECT  8.115000 1.405000  8.285000 2.165000 ;
-      RECT  8.485000 1.575000  9.400000 1.905000 ;
-      RECT  9.070000 0.300000  9.400000 0.825000 ;
-      RECT  9.110000 1.905000  9.400000 2.455000 ;
-      RECT  9.215000 0.825000  9.400000 0.995000 ;
-      RECT  9.215000 0.995000 10.050000 1.325000 ;
-      RECT  9.215000 1.325000  9.400000 1.575000 ;
-      RECT 10.610000 0.345000 10.860000 0.995000 ;
-      RECT 10.610000 0.995000 11.440000 1.325000 ;
-      RECT 10.610000 1.325000 10.860000 2.425000 ;
+      RECT  0.000000 -0.085000 11.960000 0.085000 ;
+      RECT  0.000000  2.635000 11.960000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.860000 0.805000 ;
+      RECT  0.175000  1.795000  0.895000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.515000  2.135000  0.895000 2.635000 ;
+      RECT  0.665000  0.805000  0.860000 0.970000 ;
+      RECT  0.665000  0.970000  0.895000 1.795000 ;
+      RECT  1.115000  0.345000  1.285000 2.465000 ;
+      RECT  1.520000  0.255000  1.905000 0.445000 ;
+      RECT  1.520000  0.445000  1.690000 1.860000 ;
+      RECT  1.520000  1.860000  3.530000 2.075000 ;
+      RECT  1.520000  2.075000  1.805000 2.445000 ;
+      RECT  1.975000  2.245000  2.355000 2.635000 ;
+      RECT  2.145000  0.085000  2.475000 0.445000 ;
+      RECT  2.250000  0.955000  2.695000 1.125000 ;
+      RECT  2.250000  1.125000  2.420000 1.860000 ;
+      RECT  2.875000  2.245000  3.870000 2.415000 ;
+      RECT  3.050000  0.275000  3.875000 0.445000 ;
+      RECT  3.335000  1.355000  3.555000 1.685000 ;
+      RECT  3.335000  1.685000  3.530000 1.860000 ;
+      RECT  3.700000  1.825000  4.685000 1.995000 ;
+      RECT  3.700000  1.995000  3.870000 2.245000 ;
+      RECT  3.705000  0.445000  3.875000 0.715000 ;
+      RECT  3.705000  0.715000  4.685000 0.885000 ;
+      RECT  4.090000  2.165000  4.260000 2.635000 ;
+      RECT  4.095000  0.085000  4.295000 0.545000 ;
+      RECT  4.515000  0.365000  4.865000 0.535000 ;
+      RECT  4.515000  0.535000  4.685000 0.715000 ;
+      RECT  4.515000  0.885000  4.685000 1.825000 ;
+      RECT  4.515000  1.995000  4.685000 2.070000 ;
+      RECT  4.515000  2.070000  4.800000 2.440000 ;
+      RECT  4.855000  0.705000  5.485000 1.035000 ;
+      RECT  4.855000  1.035000  5.145000 1.905000 ;
+      RECT  4.995000  2.190000  6.215000 2.360000 ;
+      RECT  5.085000  0.365000  5.875000 0.535000 ;
+      RECT  5.335000  1.655000  5.825000 2.010000 ;
+      RECT  5.705000  0.535000  5.875000 1.315000 ;
+      RECT  5.705000  1.315000  6.555000 1.485000 ;
+      RECT  5.995000  1.485000  6.555000 1.575000 ;
+      RECT  5.995000  1.575000  6.215000 2.190000 ;
+      RECT  6.095000  0.765000  6.945000 1.065000 ;
+      RECT  6.095000  1.065000  6.265000 1.095000 ;
+      RECT  6.175000  0.085000  6.545000 0.585000 ;
+      RECT  6.385000  1.245000  6.555000 1.315000 ;
+      RECT  6.385000  1.835000  6.555000 2.635000 ;
+      RECT  6.725000  0.365000  7.235000 0.535000 ;
+      RECT  6.725000  0.535000  6.945000 0.765000 ;
+      RECT  6.725000  1.065000  6.945000 2.135000 ;
+      RECT  6.725000  2.135000  7.025000 2.465000 ;
+      RECT  7.115000  0.705000  7.715000 1.035000 ;
+      RECT  7.115000  1.245000  7.355000 1.965000 ;
+      RECT  7.250000  2.165000  8.285000 2.335000 ;
+      RECT  7.515000  0.365000  8.155000 0.535000 ;
+      RECT  7.525000  1.035000  7.715000 1.575000 ;
+      RECT  7.525000  1.575000  7.895000 1.905000 ;
+      RECT  7.935000  0.535000  8.155000 0.995000 ;
+      RECT  7.935000  0.995000  9.045000 1.325000 ;
+      RECT  7.935000  1.325000  8.285000 1.405000 ;
+      RECT  8.115000  1.405000  8.285000 2.165000 ;
+      RECT  8.380000  0.085000  8.800000 0.615000 ;
+      RECT  8.485000  1.575000  9.400000 1.905000 ;
+      RECT  8.515000  2.135000  8.820000 2.635000 ;
+      RECT  9.070000  0.300000  9.400000 0.825000 ;
+      RECT  9.110000  1.905000  9.400000 2.455000 ;
+      RECT  9.215000  0.825000  9.400000 0.995000 ;
+      RECT  9.215000  0.995000 10.050000 1.325000 ;
+      RECT  9.215000  1.325000  9.400000 1.575000 ;
+      RECT  9.620000  0.085000  9.790000 0.695000 ;
+      RECT  9.620000  1.625000  9.790000 2.635000 ;
+      RECT 10.610000  0.345000 10.860000 0.995000 ;
+      RECT 10.610000  0.995000 11.440000 1.325000 ;
+      RECT 10.610000  1.325000 10.860000 2.425000 ;
+      RECT 11.065000  0.085000 11.395000 0.805000 ;
+      RECT 11.090000  1.495000 11.395000 2.635000 ;
     LAYER mcon ;
-      RECT 0.695000 1.785000 0.865000 1.955000 ;
-      RECT 1.115000 0.425000 1.285000 0.595000 ;
-      RECT 5.205000 0.765000 5.375000 0.935000 ;
-      RECT 5.615000 1.785000 5.785000 1.955000 ;
-      RECT 7.175000 1.785000 7.345000 1.955000 ;
-      RECT 7.185000 0.765000 7.355000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.695000  1.785000  0.865000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.115000  0.425000  1.285000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  0.765000  5.375000 0.935000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.615000  1.785000  5.785000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.175000  1.785000  7.345000 1.955000 ;
+      RECT  7.185000  0.765000  7.355000 0.935000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
     LAYER met1 ;
       RECT 0.635000 1.755000 0.925000 1.800000 ;
       RECT 0.635000 1.800000 7.405000 1.940000 ;
diff --git a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
index 4607591..4cf9605 100644
--- a/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
+++ b/cells/sdfxbp/sky130_fd_sc_hdll__sdfxbp_2.magic.lef
@@ -94,47 +94,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 13.340000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.145000  0.085000  2.475000 0.445000 ;
-        RECT  4.095000  0.085000  4.295000 0.545000 ;
-        RECT  6.175000  0.085000  6.545000 0.585000 ;
-        RECT  8.380000  0.085000  8.800000 0.615000 ;
-        RECT  9.570000  0.085000  9.990000 0.695000 ;
-        RECT 10.680000  0.085000 10.910000 0.690000 ;
-        RECT 11.665000  0.085000 12.295000 0.805000 ;
-        RECT 12.985000  0.085000 13.155000 0.955000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 13.340000 0.240000 ;
     END
@@ -143,121 +102,158 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 13.340000 2.805000 ;
-        RECT  0.515000 2.135000  0.895000 2.635000 ;
-        RECT  1.975000 2.245000  2.355000 2.635000 ;
-        RECT  4.090000 2.165000  4.260000 2.635000 ;
-        RECT  6.385000 1.835000  6.555000 2.635000 ;
-        RECT  8.515000 2.135000  8.820000 2.635000 ;
-        RECT  9.570000 1.625000  9.990000 2.635000 ;
-        RECT 10.690000 1.615000 10.860000 2.635000 ;
-        RECT 11.690000 1.495000 12.295000 2.635000 ;
-        RECT 12.985000 1.395000 13.155000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 13.340000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.860000 0.805000 ;
-      RECT  0.175000 1.795000  0.895000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.665000 0.805000  0.860000 0.970000 ;
-      RECT  0.665000 0.970000  0.895000 1.795000 ;
-      RECT  1.115000 0.345000  1.285000 2.465000 ;
-      RECT  1.520000 0.255000  1.905000 0.445000 ;
-      RECT  1.520000 0.445000  1.690000 1.860000 ;
-      RECT  1.520000 1.860000  3.530000 2.075000 ;
-      RECT  1.520000 2.075000  1.805000 2.445000 ;
-      RECT  2.250000 0.955000  2.695000 1.125000 ;
-      RECT  2.250000 1.125000  2.420000 1.860000 ;
-      RECT  2.875000 2.245000  3.870000 2.415000 ;
-      RECT  3.050000 0.275000  3.875000 0.445000 ;
-      RECT  3.335000 1.355000  3.555000 1.685000 ;
-      RECT  3.335000 1.685000  3.530000 1.860000 ;
-      RECT  3.700000 1.825000  4.685000 1.995000 ;
-      RECT  3.700000 1.995000  3.870000 2.245000 ;
-      RECT  3.705000 0.445000  3.875000 0.715000 ;
-      RECT  3.705000 0.715000  4.685000 0.885000 ;
-      RECT  4.515000 0.365000  4.865000 0.535000 ;
-      RECT  4.515000 0.535000  4.685000 0.715000 ;
-      RECT  4.515000 0.885000  4.685000 1.825000 ;
-      RECT  4.515000 1.995000  4.685000 2.070000 ;
-      RECT  4.515000 2.070000  4.800000 2.440000 ;
-      RECT  4.855000 0.705000  5.485000 1.035000 ;
-      RECT  4.855000 1.035000  5.145000 1.905000 ;
-      RECT  4.995000 2.190000  6.215000 2.360000 ;
-      RECT  5.085000 0.365000  5.875000 0.535000 ;
-      RECT  5.335000 1.655000  5.825000 2.010000 ;
-      RECT  5.705000 0.535000  5.875000 1.315000 ;
-      RECT  5.705000 1.315000  6.555000 1.485000 ;
-      RECT  5.995000 1.485000  6.555000 1.575000 ;
-      RECT  5.995000 1.575000  6.215000 2.190000 ;
-      RECT  6.095000 0.765000  6.945000 1.065000 ;
-      RECT  6.095000 1.065000  6.265000 1.095000 ;
-      RECT  6.385000 1.245000  6.555000 1.315000 ;
-      RECT  6.725000 0.365000  7.235000 0.535000 ;
-      RECT  6.725000 0.535000  6.945000 0.765000 ;
-      RECT  6.725000 1.065000  6.945000 2.135000 ;
-      RECT  6.725000 2.135000  7.025000 2.465000 ;
-      RECT  7.115000 0.705000  7.715000 1.035000 ;
-      RECT  7.115000 1.245000  7.355000 1.965000 ;
-      RECT  7.250000 2.165000  8.285000 2.335000 ;
-      RECT  7.515000 0.365000  8.155000 0.535000 ;
-      RECT  7.525000 1.035000  7.715000 1.575000 ;
-      RECT  7.525000 1.575000  7.895000 1.905000 ;
-      RECT  7.935000 0.535000  8.155000 0.995000 ;
-      RECT  7.935000 0.995000  9.045000 1.325000 ;
-      RECT  7.935000 1.325000  8.285000 1.405000 ;
-      RECT  8.115000 1.405000  8.285000 2.165000 ;
-      RECT  8.485000 1.575000  9.400000 1.905000 ;
-      RECT  9.035000 0.300000  9.400000 0.825000 ;
-      RECT  9.070000 1.905000  9.400000 2.455000 ;
-      RECT  9.215000 0.825000  9.400000 0.995000 ;
-      RECT  9.215000 0.995000 10.000000 1.325000 ;
-      RECT  9.215000 1.325000  9.400000 1.575000 ;
-      RECT 11.130000 0.345000 11.380000 0.995000 ;
-      RECT 11.130000 0.995000 12.340000 1.325000 ;
-      RECT 11.130000 1.325000 11.460000 2.425000 ;
+      RECT  0.000000 -0.085000 13.340000 0.085000 ;
+      RECT  0.000000  2.635000 13.340000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.860000 0.805000 ;
+      RECT  0.175000  1.795000  0.895000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.515000  2.135000  0.895000 2.635000 ;
+      RECT  0.665000  0.805000  0.860000 0.970000 ;
+      RECT  0.665000  0.970000  0.895000 1.795000 ;
+      RECT  1.115000  0.345000  1.285000 2.465000 ;
+      RECT  1.520000  0.255000  1.905000 0.445000 ;
+      RECT  1.520000  0.445000  1.690000 1.860000 ;
+      RECT  1.520000  1.860000  3.530000 2.075000 ;
+      RECT  1.520000  2.075000  1.805000 2.445000 ;
+      RECT  1.975000  2.245000  2.355000 2.635000 ;
+      RECT  2.145000  0.085000  2.475000 0.445000 ;
+      RECT  2.250000  0.955000  2.695000 1.125000 ;
+      RECT  2.250000  1.125000  2.420000 1.860000 ;
+      RECT  2.875000  2.245000  3.870000 2.415000 ;
+      RECT  3.050000  0.275000  3.875000 0.445000 ;
+      RECT  3.335000  1.355000  3.555000 1.685000 ;
+      RECT  3.335000  1.685000  3.530000 1.860000 ;
+      RECT  3.700000  1.825000  4.685000 1.995000 ;
+      RECT  3.700000  1.995000  3.870000 2.245000 ;
+      RECT  3.705000  0.445000  3.875000 0.715000 ;
+      RECT  3.705000  0.715000  4.685000 0.885000 ;
+      RECT  4.090000  2.165000  4.260000 2.635000 ;
+      RECT  4.095000  0.085000  4.295000 0.545000 ;
+      RECT  4.515000  0.365000  4.865000 0.535000 ;
+      RECT  4.515000  0.535000  4.685000 0.715000 ;
+      RECT  4.515000  0.885000  4.685000 1.825000 ;
+      RECT  4.515000  1.995000  4.685000 2.070000 ;
+      RECT  4.515000  2.070000  4.800000 2.440000 ;
+      RECT  4.855000  0.705000  5.485000 1.035000 ;
+      RECT  4.855000  1.035000  5.145000 1.905000 ;
+      RECT  4.995000  2.190000  6.215000 2.360000 ;
+      RECT  5.085000  0.365000  5.875000 0.535000 ;
+      RECT  5.335000  1.655000  5.825000 2.010000 ;
+      RECT  5.705000  0.535000  5.875000 1.315000 ;
+      RECT  5.705000  1.315000  6.555000 1.485000 ;
+      RECT  5.995000  1.485000  6.555000 1.575000 ;
+      RECT  5.995000  1.575000  6.215000 2.190000 ;
+      RECT  6.095000  0.765000  6.945000 1.065000 ;
+      RECT  6.095000  1.065000  6.265000 1.095000 ;
+      RECT  6.175000  0.085000  6.545000 0.585000 ;
+      RECT  6.385000  1.245000  6.555000 1.315000 ;
+      RECT  6.385000  1.835000  6.555000 2.635000 ;
+      RECT  6.725000  0.365000  7.235000 0.535000 ;
+      RECT  6.725000  0.535000  6.945000 0.765000 ;
+      RECT  6.725000  1.065000  6.945000 2.135000 ;
+      RECT  6.725000  2.135000  7.025000 2.465000 ;
+      RECT  7.115000  0.705000  7.715000 1.035000 ;
+      RECT  7.115000  1.245000  7.355000 1.965000 ;
+      RECT  7.250000  2.165000  8.285000 2.335000 ;
+      RECT  7.515000  0.365000  8.155000 0.535000 ;
+      RECT  7.525000  1.035000  7.715000 1.575000 ;
+      RECT  7.525000  1.575000  7.895000 1.905000 ;
+      RECT  7.935000  0.535000  8.155000 0.995000 ;
+      RECT  7.935000  0.995000  9.045000 1.325000 ;
+      RECT  7.935000  1.325000  8.285000 1.405000 ;
+      RECT  8.115000  1.405000  8.285000 2.165000 ;
+      RECT  8.380000  0.085000  8.800000 0.615000 ;
+      RECT  8.485000  1.575000  9.400000 1.905000 ;
+      RECT  8.515000  2.135000  8.820000 2.635000 ;
+      RECT  9.035000  0.300000  9.400000 0.825000 ;
+      RECT  9.070000  1.905000  9.400000 2.455000 ;
+      RECT  9.215000  0.825000  9.400000 0.995000 ;
+      RECT  9.215000  0.995000 10.000000 1.325000 ;
+      RECT  9.215000  1.325000  9.400000 1.575000 ;
+      RECT  9.570000  0.085000  9.990000 0.695000 ;
+      RECT  9.570000  1.625000  9.990000 2.635000 ;
+      RECT 10.680000  0.085000 10.910000 0.690000 ;
+      RECT 10.690000  1.615000 10.860000 2.635000 ;
+      RECT 11.130000  0.345000 11.380000 0.995000 ;
+      RECT 11.130000  0.995000 12.340000 1.325000 ;
+      RECT 11.130000  1.325000 11.460000 2.425000 ;
+      RECT 11.665000  0.085000 12.295000 0.805000 ;
+      RECT 11.690000  1.495000 12.295000 2.635000 ;
+      RECT 12.985000  0.085000 13.155000 0.955000 ;
+      RECT 12.985000  1.395000 13.155000 2.635000 ;
     LAYER mcon ;
-      RECT 0.695000 1.785000 0.865000 1.955000 ;
-      RECT 1.115000 0.425000 1.285000 0.595000 ;
-      RECT 5.145000 0.765000 5.315000 0.935000 ;
-      RECT 5.615000 1.785000 5.785000 1.955000 ;
-      RECT 7.175000 1.785000 7.345000 1.955000 ;
-      RECT 7.185000 0.765000 7.355000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.695000  1.785000  0.865000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.115000  0.425000  1.285000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.145000  0.765000  5.315000 0.935000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.615000  1.785000  5.785000 1.955000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.175000  1.785000  7.345000 1.955000 ;
+      RECT  7.185000  0.765000  7.355000 0.935000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
     LAYER met1 ;
       RECT 0.635000 1.755000 0.925000 1.800000 ;
       RECT 0.635000 1.800000 7.405000 1.940000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
index 01bc8f5..03d65a3 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_1.magic.lef
@@ -87,38 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.580000 0.085000 ;
-        RECT 0.515000  0.085000  0.895000 0.465000 ;
-        RECT 2.075000  0.085000  2.405000 0.445000 ;
-        RECT 4.115000  0.085000  4.315000 0.525000 ;
-        RECT 6.225000  0.085000  6.595000 0.585000 ;
-        RECT 8.455000  0.085000  8.770000 0.615000 ;
-        RECT 9.590000  0.085000  9.760000 0.695000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
@@ -127,102 +95,130 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.580000 2.805000 ;
-        RECT 0.520000 2.135000  0.900000 2.635000 ;
-        RECT 1.980000 2.245000  2.360000 2.635000 ;
-        RECT 4.110000 2.165000  4.280000 2.635000 ;
-        RECT 6.400000 1.835000  6.570000 2.635000 ;
-        RECT 8.465000 2.135000  8.770000 2.635000 ;
-        RECT 9.590000 1.625000  9.760000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000  0.345000 0.635000 ;
-      RECT 0.175000 0.635000  0.895000 0.805000 ;
-      RECT 0.180000 1.795000  0.895000 1.965000 ;
-      RECT 0.180000 1.965000  0.350000 2.465000 ;
-      RECT 0.665000 0.805000  0.895000 1.795000 ;
-      RECT 1.115000 0.345000  1.345000 2.465000 ;
-      RECT 1.535000 0.275000  1.905000 0.445000 ;
-      RECT 1.535000 0.445000  1.705000 1.860000 ;
-      RECT 1.535000 1.860000  3.540000 2.075000 ;
-      RECT 1.535000 2.075000  1.810000 2.445000 ;
-      RECT 2.385000 0.955000  2.715000 1.125000 ;
-      RECT 2.385000 1.125000  2.555000 1.860000 ;
-      RECT 2.895000 2.245000  3.890000 2.415000 ;
-      RECT 3.070000 0.275000  3.895000 0.445000 ;
-      RECT 3.330000 1.355000  3.540000 1.860000 ;
-      RECT 3.720000 1.825000  4.735000 1.995000 ;
-      RECT 3.720000 1.995000  3.890000 2.245000 ;
-      RECT 3.725000 0.445000  3.895000 0.695000 ;
-      RECT 3.725000 0.695000  4.735000 0.865000 ;
-      RECT 4.565000 0.365000  4.915000 0.535000 ;
-      RECT 4.565000 0.535000  4.735000 0.695000 ;
-      RECT 4.565000 0.865000  4.735000 1.825000 ;
-      RECT 4.565000 1.995000  4.735000 2.065000 ;
-      RECT 4.565000 2.065000  4.800000 2.440000 ;
-      RECT 4.905000 0.705000  5.535000 1.035000 ;
-      RECT 4.905000 1.035000  5.195000 1.905000 ;
-      RECT 5.045000 2.190000  6.230000 2.360000 ;
-      RECT 5.135000 0.365000  5.875000 0.535000 ;
-      RECT 5.385000 1.655000  5.875000 2.010000 ;
-      RECT 5.705000 0.535000  5.875000 1.315000 ;
-      RECT 5.705000 1.315000  6.685000 1.485000 ;
-      RECT 6.045000 0.765000  7.060000 1.095000 ;
-      RECT 6.045000 1.485000  6.685000 1.575000 ;
-      RECT 6.045000 1.575000  6.230000 2.190000 ;
-      RECT 6.775000 0.365000  7.260000 0.535000 ;
-      RECT 6.775000 0.535000  7.060000 0.765000 ;
-      RECT 6.855000 1.095000  7.060000 2.465000 ;
-      RECT 7.230000 1.245000  7.470000 1.965000 ;
-      RECT 7.250000 0.705000  7.945000 1.035000 ;
-      RECT 7.250000 2.165000  8.285000 2.335000 ;
-      RECT 7.455000 0.365000  8.285000 0.535000 ;
-      RECT 7.735000 1.035000  7.945000 1.905000 ;
-      RECT 8.115000 0.535000  8.285000 0.995000 ;
-      RECT 8.115000 0.995000  9.050000 1.325000 ;
-      RECT 8.115000 1.325000  8.285000 2.165000 ;
-      RECT 8.455000 1.575000  9.405000 1.905000 ;
-      RECT 9.040000 0.300000  9.400000 0.825000 ;
-      RECT 9.120000 1.905000  9.405000 2.455000 ;
-      RECT 9.220000 0.825000  9.400000 0.995000 ;
-      RECT 9.220000 0.995000 10.030000 1.325000 ;
-      RECT 9.220000 1.325000  9.405000 1.575000 ;
+      RECT 0.000000 -0.085000 10.580000 0.085000 ;
+      RECT 0.000000  2.635000 10.580000 2.805000 ;
+      RECT 0.175000  0.345000  0.345000 0.635000 ;
+      RECT 0.175000  0.635000  0.895000 0.805000 ;
+      RECT 0.180000  1.795000  0.895000 1.965000 ;
+      RECT 0.180000  1.965000  0.350000 2.465000 ;
+      RECT 0.515000  0.085000  0.895000 0.465000 ;
+      RECT 0.520000  2.135000  0.900000 2.635000 ;
+      RECT 0.665000  0.805000  0.895000 1.795000 ;
+      RECT 1.115000  0.345000  1.345000 2.465000 ;
+      RECT 1.535000  0.275000  1.905000 0.445000 ;
+      RECT 1.535000  0.445000  1.705000 1.860000 ;
+      RECT 1.535000  1.860000  3.540000 2.075000 ;
+      RECT 1.535000  2.075000  1.810000 2.445000 ;
+      RECT 1.980000  2.245000  2.360000 2.635000 ;
+      RECT 2.075000  0.085000  2.405000 0.445000 ;
+      RECT 2.385000  0.955000  2.715000 1.125000 ;
+      RECT 2.385000  1.125000  2.555000 1.860000 ;
+      RECT 2.895000  2.245000  3.890000 2.415000 ;
+      RECT 3.070000  0.275000  3.895000 0.445000 ;
+      RECT 3.330000  1.355000  3.540000 1.860000 ;
+      RECT 3.720000  1.825000  4.735000 1.995000 ;
+      RECT 3.720000  1.995000  3.890000 2.245000 ;
+      RECT 3.725000  0.445000  3.895000 0.695000 ;
+      RECT 3.725000  0.695000  4.735000 0.865000 ;
+      RECT 4.110000  2.165000  4.280000 2.635000 ;
+      RECT 4.115000  0.085000  4.315000 0.525000 ;
+      RECT 4.565000  0.365000  4.915000 0.535000 ;
+      RECT 4.565000  0.535000  4.735000 0.695000 ;
+      RECT 4.565000  0.865000  4.735000 1.825000 ;
+      RECT 4.565000  1.995000  4.735000 2.065000 ;
+      RECT 4.565000  2.065000  4.800000 2.440000 ;
+      RECT 4.905000  0.705000  5.535000 1.035000 ;
+      RECT 4.905000  1.035000  5.195000 1.905000 ;
+      RECT 5.045000  2.190000  6.230000 2.360000 ;
+      RECT 5.135000  0.365000  5.875000 0.535000 ;
+      RECT 5.385000  1.655000  5.875000 2.010000 ;
+      RECT 5.705000  0.535000  5.875000 1.315000 ;
+      RECT 5.705000  1.315000  6.685000 1.485000 ;
+      RECT 6.045000  0.765000  7.060000 1.095000 ;
+      RECT 6.045000  1.485000  6.685000 1.575000 ;
+      RECT 6.045000  1.575000  6.230000 2.190000 ;
+      RECT 6.225000  0.085000  6.595000 0.585000 ;
+      RECT 6.400000  1.835000  6.570000 2.635000 ;
+      RECT 6.775000  0.365000  7.260000 0.535000 ;
+      RECT 6.775000  0.535000  7.060000 0.765000 ;
+      RECT 6.855000  1.095000  7.060000 2.465000 ;
+      RECT 7.230000  1.245000  7.470000 1.965000 ;
+      RECT 7.250000  0.705000  7.945000 1.035000 ;
+      RECT 7.250000  2.165000  8.285000 2.335000 ;
+      RECT 7.455000  0.365000  8.285000 0.535000 ;
+      RECT 7.735000  1.035000  7.945000 1.905000 ;
+      RECT 8.115000  0.535000  8.285000 0.995000 ;
+      RECT 8.115000  0.995000  9.050000 1.325000 ;
+      RECT 8.115000  1.325000  8.285000 2.165000 ;
+      RECT 8.455000  0.085000  8.770000 0.615000 ;
+      RECT 8.455000  1.575000  9.405000 1.905000 ;
+      RECT 8.465000  2.135000  8.770000 2.635000 ;
+      RECT 9.040000  0.300000  9.400000 0.825000 ;
+      RECT 9.120000  1.905000  9.405000 2.455000 ;
+      RECT 9.220000  0.825000  9.400000 0.995000 ;
+      RECT 9.220000  0.995000 10.030000 1.325000 ;
+      RECT 9.220000  1.325000  9.405000 1.575000 ;
+      RECT 9.590000  0.085000  9.760000 0.695000 ;
+      RECT 9.590000  1.625000  9.760000 2.635000 ;
     LAYER mcon ;
-      RECT 0.665000 1.740000 0.835000 1.910000 ;
-      RECT 1.155000 0.720000 1.325000 0.890000 ;
-      RECT 5.155000 0.720000 5.325000 0.890000 ;
-      RECT 5.665000 1.740000 5.835000 1.910000 ;
-      RECT 7.240000 1.740000 7.410000 1.910000 ;
-      RECT 7.310000 0.720000 7.480000 0.890000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.665000  1.740000  0.835000 1.910000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.155000  0.720000  1.325000 0.890000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.155000  0.720000  5.325000 0.890000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  1.740000  5.835000 1.910000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.240000  1.740000  7.410000 1.910000 ;
+      RECT  7.310000  0.720000  7.480000 0.890000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
     LAYER met1 ;
       RECT 0.605000 1.710000 0.895000 1.800000 ;
       RECT 0.605000 1.800000 7.470000 1.940000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
index 3b8921d..ea9b775 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_2.magic.lef
@@ -87,40 +87,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.125000  0.085000  2.455000 0.445000 ;
-        RECT  4.115000  0.085000  4.315000 0.525000 ;
-        RECT  6.225000  0.085000  6.595000 0.585000 ;
-        RECT  8.450000  0.085000  8.870000 0.615000 ;
-        RECT  9.690000  0.085000  9.860000 0.695000 ;
-        RECT 10.670000  0.085000 10.840000 0.565000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -129,107 +95,137 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.520000 2.135000  0.900000 2.635000 ;
-        RECT  1.980000 2.245000  2.360000 2.635000 ;
-        RECT  4.110000 2.165000  4.280000 2.635000 ;
-        RECT  6.435000 1.835000  6.605000 2.635000 ;
-        RECT  8.565000 2.135000  8.870000 2.635000 ;
-        RECT  9.690000 1.625000  9.860000 2.635000 ;
-        RECT 10.670000 1.845000 10.840000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000  0.345000 0.635000 ;
-      RECT 0.175000 0.635000  0.895000 0.805000 ;
-      RECT 0.180000 1.795000  0.895000 1.965000 ;
-      RECT 0.180000 1.965000  0.350000 2.465000 ;
-      RECT 0.665000 0.805000  0.895000 1.795000 ;
-      RECT 1.115000 0.345000  1.345000 2.465000 ;
-      RECT 1.535000 0.275000  1.905000 0.445000 ;
-      RECT 1.535000 0.445000  1.705000 1.860000 ;
-      RECT 1.535000 1.860000  3.525000 2.075000 ;
-      RECT 1.535000 2.075000  1.810000 2.445000 ;
-      RECT 2.385000 0.955000  2.715000 1.125000 ;
-      RECT 2.385000 1.125000  2.555000 1.860000 ;
-      RECT 2.895000 2.245000  3.890000 2.415000 ;
-      RECT 3.070000 0.275000  3.895000 0.445000 ;
-      RECT 3.330000 1.355000  3.525000 1.860000 ;
-      RECT 3.720000 1.825000  4.735000 1.995000 ;
-      RECT 3.720000 1.995000  3.890000 2.245000 ;
-      RECT 3.725000 0.445000  3.895000 0.695000 ;
-      RECT 3.725000 0.695000  4.735000 0.865000 ;
-      RECT 4.565000 0.365000  4.915000 0.535000 ;
-      RECT 4.565000 0.535000  4.735000 0.695000 ;
-      RECT 4.565000 0.865000  4.735000 1.825000 ;
-      RECT 4.565000 1.995000  4.735000 2.065000 ;
-      RECT 4.565000 2.065000  4.800000 2.440000 ;
-      RECT 4.905000 0.705000  5.535000 1.035000 ;
-      RECT 4.905000 1.035000  5.195000 1.905000 ;
-      RECT 5.045000 2.190000  6.265000 2.360000 ;
-      RECT 5.135000 0.365000  5.895000 0.535000 ;
-      RECT 5.385000 1.655000  5.875000 2.010000 ;
-      RECT 5.725000 0.535000  5.895000 1.245000 ;
-      RECT 5.725000 1.245000  6.605000 1.485000 ;
-      RECT 6.045000 1.485000  6.605000 1.575000 ;
-      RECT 6.045000 1.575000  6.265000 2.190000 ;
-      RECT 6.065000 0.765000  6.995000 1.065000 ;
-      RECT 6.775000 0.365000  7.285000 0.535000 ;
-      RECT 6.775000 0.535000  6.995000 0.765000 ;
-      RECT 6.775000 1.065000  6.995000 2.135000 ;
-      RECT 6.775000 2.135000  7.075000 2.465000 ;
-      RECT 7.165000 0.705000  7.765000 1.035000 ;
-      RECT 7.165000 1.245000  7.405000 1.965000 ;
-      RECT 7.300000 2.165000  8.335000 2.335000 ;
-      RECT 7.565000 0.365000  8.205000 0.535000 ;
-      RECT 7.575000 1.035000  7.765000 1.575000 ;
-      RECT 7.575000 1.575000  7.945000 1.905000 ;
-      RECT 7.985000 0.535000  8.205000 0.995000 ;
-      RECT 7.985000 0.995000  9.150000 1.325000 ;
-      RECT 7.985000 1.325000  8.335000 1.405000 ;
-      RECT 8.165000 1.405000  8.335000 2.165000 ;
-      RECT 8.555000 1.575000  9.505000 1.905000 ;
-      RECT 9.140000 0.300000  9.500000 0.825000 ;
-      RECT 9.220000 1.905000  9.505000 2.455000 ;
-      RECT 9.320000 0.825000  9.500000 0.995000 ;
-      RECT 9.320000 0.995000 10.130000 1.325000 ;
-      RECT 9.320000 1.325000  9.505000 1.575000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.895000 0.805000 ;
+      RECT  0.180000  1.795000  0.895000 1.965000 ;
+      RECT  0.180000  1.965000  0.350000 2.465000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.520000  2.135000  0.900000 2.635000 ;
+      RECT  0.665000  0.805000  0.895000 1.795000 ;
+      RECT  1.115000  0.345000  1.345000 2.465000 ;
+      RECT  1.535000  0.275000  1.905000 0.445000 ;
+      RECT  1.535000  0.445000  1.705000 1.860000 ;
+      RECT  1.535000  1.860000  3.525000 2.075000 ;
+      RECT  1.535000  2.075000  1.810000 2.445000 ;
+      RECT  1.980000  2.245000  2.360000 2.635000 ;
+      RECT  2.125000  0.085000  2.455000 0.445000 ;
+      RECT  2.385000  0.955000  2.715000 1.125000 ;
+      RECT  2.385000  1.125000  2.555000 1.860000 ;
+      RECT  2.895000  2.245000  3.890000 2.415000 ;
+      RECT  3.070000  0.275000  3.895000 0.445000 ;
+      RECT  3.330000  1.355000  3.525000 1.860000 ;
+      RECT  3.720000  1.825000  4.735000 1.995000 ;
+      RECT  3.720000  1.995000  3.890000 2.245000 ;
+      RECT  3.725000  0.445000  3.895000 0.695000 ;
+      RECT  3.725000  0.695000  4.735000 0.865000 ;
+      RECT  4.110000  2.165000  4.280000 2.635000 ;
+      RECT  4.115000  0.085000  4.315000 0.525000 ;
+      RECT  4.565000  0.365000  4.915000 0.535000 ;
+      RECT  4.565000  0.535000  4.735000 0.695000 ;
+      RECT  4.565000  0.865000  4.735000 1.825000 ;
+      RECT  4.565000  1.995000  4.735000 2.065000 ;
+      RECT  4.565000  2.065000  4.800000 2.440000 ;
+      RECT  4.905000  0.705000  5.535000 1.035000 ;
+      RECT  4.905000  1.035000  5.195000 1.905000 ;
+      RECT  5.045000  2.190000  6.265000 2.360000 ;
+      RECT  5.135000  0.365000  5.895000 0.535000 ;
+      RECT  5.385000  1.655000  5.875000 2.010000 ;
+      RECT  5.725000  0.535000  5.895000 1.245000 ;
+      RECT  5.725000  1.245000  6.605000 1.485000 ;
+      RECT  6.045000  1.485000  6.605000 1.575000 ;
+      RECT  6.045000  1.575000  6.265000 2.190000 ;
+      RECT  6.065000  0.765000  6.995000 1.065000 ;
+      RECT  6.225000  0.085000  6.595000 0.585000 ;
+      RECT  6.435000  1.835000  6.605000 2.635000 ;
+      RECT  6.775000  0.365000  7.285000 0.535000 ;
+      RECT  6.775000  0.535000  6.995000 0.765000 ;
+      RECT  6.775000  1.065000  6.995000 2.135000 ;
+      RECT  6.775000  2.135000  7.075000 2.465000 ;
+      RECT  7.165000  0.705000  7.765000 1.035000 ;
+      RECT  7.165000  1.245000  7.405000 1.965000 ;
+      RECT  7.300000  2.165000  8.335000 2.335000 ;
+      RECT  7.565000  0.365000  8.205000 0.535000 ;
+      RECT  7.575000  1.035000  7.765000 1.575000 ;
+      RECT  7.575000  1.575000  7.945000 1.905000 ;
+      RECT  7.985000  0.535000  8.205000 0.995000 ;
+      RECT  7.985000  0.995000  9.150000 1.325000 ;
+      RECT  7.985000  1.325000  8.335000 1.405000 ;
+      RECT  8.165000  1.405000  8.335000 2.165000 ;
+      RECT  8.450000  0.085000  8.870000 0.615000 ;
+      RECT  8.555000  1.575000  9.505000 1.905000 ;
+      RECT  8.565000  2.135000  8.870000 2.635000 ;
+      RECT  9.140000  0.300000  9.500000 0.825000 ;
+      RECT  9.220000  1.905000  9.505000 2.455000 ;
+      RECT  9.320000  0.825000  9.500000 0.995000 ;
+      RECT  9.320000  0.995000 10.130000 1.325000 ;
+      RECT  9.320000  1.325000  9.505000 1.575000 ;
+      RECT  9.690000  0.085000  9.860000 0.695000 ;
+      RECT  9.690000  1.625000  9.860000 2.635000 ;
+      RECT 10.670000  0.085000 10.840000 0.565000 ;
+      RECT 10.670000  1.845000 10.840000 2.635000 ;
     LAYER mcon ;
-      RECT 0.665000 1.740000 0.835000 1.910000 ;
-      RECT 1.155000 0.720000 1.325000 0.890000 ;
-      RECT 5.155000 0.720000 5.325000 0.890000 ;
-      RECT 5.665000 1.740000 5.835000 1.910000 ;
-      RECT 7.225000 0.720000 7.395000 0.890000 ;
-      RECT 7.225000 1.740000 7.395000 1.910000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.665000  1.740000  0.835000 1.910000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.155000  0.720000  1.325000 0.890000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.155000  0.720000  5.325000 0.890000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  1.740000  5.835000 1.910000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.225000  0.720000  7.395000 0.890000 ;
+      RECT  7.225000  1.740000  7.395000 1.910000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
     LAYER met1 ;
       RECT 0.605000 1.710000 0.895000 1.800000 ;
       RECT 0.605000 1.800000 7.455000 1.940000 ;
diff --git a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
index 12a5b83..32dd55e 100644
--- a/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
+++ b/cells/sdfxtp/sky130_fd_sc_hdll__sdfxtp_4.magic.lef
@@ -91,43 +91,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.960000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.125000  0.085000  2.455000 0.445000 ;
-        RECT  4.115000  0.085000  4.315000 0.525000 ;
-        RECT  6.225000  0.085000  6.595000 0.585000 ;
-        RECT  8.450000  0.085000  8.870000 0.615000 ;
-        RECT  9.690000  0.085000  9.860000 0.695000 ;
-        RECT 10.640000  0.085000 10.810000 0.565000 ;
-        RECT 11.580000  0.085000 11.750000 0.565000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.960000 0.240000 ;
     END
@@ -136,110 +99,143 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.960000 2.805000 ;
-        RECT  0.520000 2.135000  0.900000 2.635000 ;
-        RECT  1.980000 2.245000  2.360000 2.635000 ;
-        RECT  4.110000 2.165000  4.280000 2.635000 ;
-        RECT  6.435000 1.835000  6.605000 2.635000 ;
-        RECT  8.565000 2.135000  8.870000 2.635000 ;
-        RECT  9.690000 1.625000  9.860000 2.635000 ;
-        RECT 10.640000 1.845000 10.810000 2.635000 ;
-        RECT 11.580000 1.845000 11.750000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.960000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.175000 0.345000  0.345000 0.635000 ;
-      RECT 0.175000 0.635000  0.895000 0.805000 ;
-      RECT 0.180000 1.795000  0.895000 1.965000 ;
-      RECT 0.180000 1.965000  0.350000 2.465000 ;
-      RECT 0.665000 0.805000  0.895000 1.795000 ;
-      RECT 1.115000 0.345000  1.345000 2.465000 ;
-      RECT 1.535000 0.275000  1.905000 0.445000 ;
-      RECT 1.535000 0.445000  1.705000 1.860000 ;
-      RECT 1.535000 1.860000  3.525000 2.075000 ;
-      RECT 1.535000 2.075000  1.810000 2.445000 ;
-      RECT 2.385000 0.955000  2.715000 1.125000 ;
-      RECT 2.385000 1.125000  2.555000 1.860000 ;
-      RECT 2.895000 2.245000  3.890000 2.415000 ;
-      RECT 3.070000 0.275000  3.895000 0.445000 ;
-      RECT 3.330000 1.355000  3.525000 1.860000 ;
-      RECT 3.720000 1.825000  4.735000 1.995000 ;
-      RECT 3.720000 1.995000  3.890000 2.245000 ;
-      RECT 3.725000 0.445000  3.895000 0.695000 ;
-      RECT 3.725000 0.695000  4.735000 0.865000 ;
-      RECT 4.565000 0.365000  4.915000 0.535000 ;
-      RECT 4.565000 0.535000  4.735000 0.695000 ;
-      RECT 4.565000 0.865000  4.735000 1.825000 ;
-      RECT 4.565000 1.995000  4.735000 2.065000 ;
-      RECT 4.565000 2.065000  4.800000 2.440000 ;
-      RECT 4.905000 0.705000  5.535000 1.035000 ;
-      RECT 4.905000 1.035000  5.195000 1.905000 ;
-      RECT 5.045000 2.190000  6.265000 2.360000 ;
-      RECT 5.135000 0.365000  5.895000 0.535000 ;
-      RECT 5.385000 1.655000  5.875000 2.010000 ;
-      RECT 5.725000 0.535000  5.895000 1.245000 ;
-      RECT 5.725000 1.245000  6.605000 1.485000 ;
-      RECT 6.045000 1.485000  6.605000 1.575000 ;
-      RECT 6.045000 1.575000  6.265000 2.190000 ;
-      RECT 6.065000 0.765000  6.995000 1.065000 ;
-      RECT 6.775000 0.365000  7.285000 0.535000 ;
-      RECT 6.775000 0.535000  6.995000 0.765000 ;
-      RECT 6.775000 1.065000  6.995000 2.135000 ;
-      RECT 6.775000 2.135000  7.075000 2.465000 ;
-      RECT 7.165000 0.705000  7.765000 1.035000 ;
-      RECT 7.165000 1.245000  7.405000 1.965000 ;
-      RECT 7.300000 2.165000  8.335000 2.335000 ;
-      RECT 7.565000 0.365000  8.205000 0.535000 ;
-      RECT 7.575000 1.035000  7.765000 1.575000 ;
-      RECT 7.575000 1.575000  7.945000 1.905000 ;
-      RECT 7.985000 0.535000  8.205000 0.995000 ;
-      RECT 7.985000 0.995000  9.150000 1.325000 ;
-      RECT 7.985000 1.325000  8.335000 1.405000 ;
-      RECT 8.165000 1.405000  8.335000 2.165000 ;
-      RECT 8.555000 1.575000  9.505000 1.905000 ;
-      RECT 9.140000 0.300000  9.500000 0.825000 ;
-      RECT 9.220000 1.905000  9.505000 2.455000 ;
-      RECT 9.320000 0.825000  9.500000 1.075000 ;
-      RECT 9.320000 1.075000 11.380000 1.325000 ;
-      RECT 9.320000 1.325000  9.505000 1.575000 ;
+      RECT  0.000000 -0.085000 11.960000 0.085000 ;
+      RECT  0.000000  2.635000 11.960000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.895000 0.805000 ;
+      RECT  0.180000  1.795000  0.895000 1.965000 ;
+      RECT  0.180000  1.965000  0.350000 2.465000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.520000  2.135000  0.900000 2.635000 ;
+      RECT  0.665000  0.805000  0.895000 1.795000 ;
+      RECT  1.115000  0.345000  1.345000 2.465000 ;
+      RECT  1.535000  0.275000  1.905000 0.445000 ;
+      RECT  1.535000  0.445000  1.705000 1.860000 ;
+      RECT  1.535000  1.860000  3.525000 2.075000 ;
+      RECT  1.535000  2.075000  1.810000 2.445000 ;
+      RECT  1.980000  2.245000  2.360000 2.635000 ;
+      RECT  2.125000  0.085000  2.455000 0.445000 ;
+      RECT  2.385000  0.955000  2.715000 1.125000 ;
+      RECT  2.385000  1.125000  2.555000 1.860000 ;
+      RECT  2.895000  2.245000  3.890000 2.415000 ;
+      RECT  3.070000  0.275000  3.895000 0.445000 ;
+      RECT  3.330000  1.355000  3.525000 1.860000 ;
+      RECT  3.720000  1.825000  4.735000 1.995000 ;
+      RECT  3.720000  1.995000  3.890000 2.245000 ;
+      RECT  3.725000  0.445000  3.895000 0.695000 ;
+      RECT  3.725000  0.695000  4.735000 0.865000 ;
+      RECT  4.110000  2.165000  4.280000 2.635000 ;
+      RECT  4.115000  0.085000  4.315000 0.525000 ;
+      RECT  4.565000  0.365000  4.915000 0.535000 ;
+      RECT  4.565000  0.535000  4.735000 0.695000 ;
+      RECT  4.565000  0.865000  4.735000 1.825000 ;
+      RECT  4.565000  1.995000  4.735000 2.065000 ;
+      RECT  4.565000  2.065000  4.800000 2.440000 ;
+      RECT  4.905000  0.705000  5.535000 1.035000 ;
+      RECT  4.905000  1.035000  5.195000 1.905000 ;
+      RECT  5.045000  2.190000  6.265000 2.360000 ;
+      RECT  5.135000  0.365000  5.895000 0.535000 ;
+      RECT  5.385000  1.655000  5.875000 2.010000 ;
+      RECT  5.725000  0.535000  5.895000 1.245000 ;
+      RECT  5.725000  1.245000  6.605000 1.485000 ;
+      RECT  6.045000  1.485000  6.605000 1.575000 ;
+      RECT  6.045000  1.575000  6.265000 2.190000 ;
+      RECT  6.065000  0.765000  6.995000 1.065000 ;
+      RECT  6.225000  0.085000  6.595000 0.585000 ;
+      RECT  6.435000  1.835000  6.605000 2.635000 ;
+      RECT  6.775000  0.365000  7.285000 0.535000 ;
+      RECT  6.775000  0.535000  6.995000 0.765000 ;
+      RECT  6.775000  1.065000  6.995000 2.135000 ;
+      RECT  6.775000  2.135000  7.075000 2.465000 ;
+      RECT  7.165000  0.705000  7.765000 1.035000 ;
+      RECT  7.165000  1.245000  7.405000 1.965000 ;
+      RECT  7.300000  2.165000  8.335000 2.335000 ;
+      RECT  7.565000  0.365000  8.205000 0.535000 ;
+      RECT  7.575000  1.035000  7.765000 1.575000 ;
+      RECT  7.575000  1.575000  7.945000 1.905000 ;
+      RECT  7.985000  0.535000  8.205000 0.995000 ;
+      RECT  7.985000  0.995000  9.150000 1.325000 ;
+      RECT  7.985000  1.325000  8.335000 1.405000 ;
+      RECT  8.165000  1.405000  8.335000 2.165000 ;
+      RECT  8.450000  0.085000  8.870000 0.615000 ;
+      RECT  8.555000  1.575000  9.505000 1.905000 ;
+      RECT  8.565000  2.135000  8.870000 2.635000 ;
+      RECT  9.140000  0.300000  9.500000 0.825000 ;
+      RECT  9.220000  1.905000  9.505000 2.455000 ;
+      RECT  9.320000  0.825000  9.500000 1.075000 ;
+      RECT  9.320000  1.075000 11.380000 1.325000 ;
+      RECT  9.320000  1.325000  9.505000 1.575000 ;
+      RECT  9.690000  0.085000  9.860000 0.695000 ;
+      RECT  9.690000  1.625000  9.860000 2.635000 ;
+      RECT 10.640000  0.085000 10.810000 0.565000 ;
+      RECT 10.640000  1.845000 10.810000 2.635000 ;
+      RECT 11.580000  0.085000 11.750000 0.565000 ;
+      RECT 11.580000  1.845000 11.750000 2.635000 ;
     LAYER mcon ;
-      RECT 0.665000 1.740000 0.835000 1.910000 ;
-      RECT 1.155000 0.720000 1.325000 0.890000 ;
-      RECT 5.155000 0.720000 5.325000 0.890000 ;
-      RECT 5.665000 1.740000 5.835000 1.910000 ;
-      RECT 7.225000 0.720000 7.395000 0.890000 ;
-      RECT 7.225000 1.740000 7.395000 1.910000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.665000  1.740000  0.835000 1.910000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.155000  0.720000  1.325000 0.890000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.155000  0.720000  5.325000 0.890000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  1.740000  5.835000 1.910000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.225000  0.720000  7.395000 0.890000 ;
+      RECT  7.225000  1.740000  7.395000 1.910000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
     LAYER met1 ;
       RECT 0.605000 1.710000 0.895000 1.800000 ;
       RECT 0.605000 1.800000 7.455000 1.940000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
index fb03f3d..c184019 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_1.magic.lef
@@ -39,12 +39,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 4.745000 0.995000 5.060000 1.325000 ;
-        RECT 5.955000 0.995000 6.395000 1.325000 ;
-      LAYER mcon ;
-        RECT 4.805000 1.105000 4.975000 1.275000 ;
-        RECT 6.000000 1.105000 6.170000 1.275000 ;
       LAYER met1 ;
         RECT 4.745000 1.075000 5.035000 1.120000 ;
         RECT 4.745000 1.120000 6.230000 1.260000 ;
@@ -84,29 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.360000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.445000 ;
-        RECT 2.910000  0.085000 3.080000 0.825000 ;
-        RECT 4.285000  0.085000 4.615000 0.445000 ;
-        RECT 6.325000  0.085000 6.685000 0.445000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.360000 0.240000 ;
     END
@@ -115,75 +86,98 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.360000 2.805000 ;
-        RECT 0.085000 1.835000 0.345000 2.635000 ;
-        RECT 2.520000 2.075000 3.105000 2.635000 ;
-        RECT 3.885000 2.255000 5.735000 2.635000 ;
-        RECT 6.385000 2.255000 6.715000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.360000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.615000 ;
-      RECT 0.085000 0.615000 1.295000 0.785000 ;
-      RECT 0.515000 0.785000 0.685000 2.125000 ;
-      RECT 0.515000 2.125000 1.280000 2.465000 ;
-      RECT 1.115000 0.255000 1.295000 0.615000 ;
-      RECT 1.465000 0.255000 2.645000 0.535000 ;
-      RECT 1.465000 0.705000 1.800000 1.205000 ;
-      RECT 1.465000 1.205000 1.960000 1.955000 ;
-      RECT 1.610000 2.125000 2.300000 2.465000 ;
-      RECT 1.970000 0.705000 2.305000 1.035000 ;
-      RECT 2.130000 1.205000 3.205000 1.375000 ;
-      RECT 2.130000 1.375000 2.300000 2.125000 ;
-      RECT 2.470000 1.575000 2.665000 1.635000 ;
-      RECT 2.470000 1.635000 3.545000 1.905000 ;
-      RECT 2.475000 0.535000 2.645000 0.995000 ;
-      RECT 2.475000 0.995000 3.205000 1.205000 ;
-      RECT 3.325000 1.905000 3.545000 1.915000 ;
-      RECT 3.325000 1.915000 5.735000 2.085000 ;
-      RECT 3.325000 2.085000 3.545000 2.465000 ;
-      RECT 3.375000 0.255000 3.545000 1.635000 ;
-      RECT 3.735000 0.255000 4.065000 0.935000 ;
-      RECT 3.735000 0.935000 3.905000 1.575000 ;
-      RECT 3.735000 1.575000 4.145000 1.745000 ;
-      RECT 4.075000 1.105000 4.550000 1.275000 ;
-      RECT 4.365000 1.275000 4.550000 1.495000 ;
-      RECT 4.365000 1.495000 5.215000 1.745000 ;
-      RECT 4.380000 0.615000 5.215000 0.785000 ;
-      RECT 4.380000 0.785000 4.550000 1.105000 ;
-      RECT 4.965000 0.255000 5.215000 0.615000 ;
-      RECT 5.385000 0.995000 5.735000 1.915000 ;
-      RECT 5.535000 0.255000 5.705000 0.615000 ;
-      RECT 5.535000 0.615000 6.815000 0.785000 ;
-      RECT 5.955000 1.495000 6.815000 2.085000 ;
-      RECT 5.955000 2.085000 6.125000 2.465000 ;
-      RECT 6.645000 0.785000 6.815000 1.495000 ;
+      RECT 0.000000 -0.085000 7.360000 0.085000 ;
+      RECT 0.000000  2.635000 7.360000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.615000 ;
+      RECT 0.085000  0.615000 1.295000 0.785000 ;
+      RECT 0.085000  1.835000 0.345000 2.635000 ;
+      RECT 0.515000  0.085000 0.895000 0.445000 ;
+      RECT 0.515000  0.785000 0.685000 2.125000 ;
+      RECT 0.515000  2.125000 1.280000 2.465000 ;
+      RECT 1.115000  0.255000 1.295000 0.615000 ;
+      RECT 1.465000  0.255000 2.645000 0.535000 ;
+      RECT 1.465000  0.705000 1.800000 1.205000 ;
+      RECT 1.465000  1.205000 1.960000 1.955000 ;
+      RECT 1.610000  2.125000 2.300000 2.465000 ;
+      RECT 1.970000  0.705000 2.305000 1.035000 ;
+      RECT 2.130000  1.205000 3.205000 1.375000 ;
+      RECT 2.130000  1.375000 2.300000 2.125000 ;
+      RECT 2.470000  1.575000 2.665000 1.635000 ;
+      RECT 2.470000  1.635000 3.545000 1.905000 ;
+      RECT 2.475000  0.535000 2.645000 0.995000 ;
+      RECT 2.475000  0.995000 3.205000 1.205000 ;
+      RECT 2.520000  2.075000 3.105000 2.635000 ;
+      RECT 2.910000  0.085000 3.080000 0.825000 ;
+      RECT 3.325000  1.905000 3.545000 1.915000 ;
+      RECT 3.325000  1.915000 5.735000 2.085000 ;
+      RECT 3.325000  2.085000 3.545000 2.465000 ;
+      RECT 3.375000  0.255000 3.545000 1.635000 ;
+      RECT 3.735000  0.255000 4.065000 0.935000 ;
+      RECT 3.735000  0.935000 3.905000 1.575000 ;
+      RECT 3.735000  1.575000 4.145000 1.745000 ;
+      RECT 3.885000  2.255000 5.735000 2.635000 ;
+      RECT 4.075000  1.105000 4.550000 1.275000 ;
+      RECT 4.285000  0.085000 4.615000 0.445000 ;
+      RECT 4.365000  1.275000 4.550000 1.495000 ;
+      RECT 4.365000  1.495000 5.215000 1.745000 ;
+      RECT 4.380000  0.615000 5.215000 0.785000 ;
+      RECT 4.380000  0.785000 4.550000 1.105000 ;
+      RECT 4.745000  0.995000 5.060000 1.325000 ;
+      RECT 4.965000  0.255000 5.215000 0.615000 ;
+      RECT 5.385000  0.995000 5.735000 1.915000 ;
+      RECT 5.535000  0.255000 5.705000 0.615000 ;
+      RECT 5.535000  0.615000 6.815000 0.785000 ;
+      RECT 5.955000  0.995000 6.395000 1.325000 ;
+      RECT 5.955000  1.495000 6.815000 2.085000 ;
+      RECT 5.955000  2.085000 6.125000 2.465000 ;
+      RECT 6.325000  0.085000 6.685000 0.445000 ;
+      RECT 6.385000  2.255000 6.715000 2.635000 ;
+      RECT 6.645000  0.785000 6.815000 1.495000 ;
     LAYER mcon ;
-      RECT 1.625000 1.445000 1.795000 1.615000 ;
-      RECT 2.135000 0.765000 2.305000 0.935000 ;
-      RECT 3.800000 0.765000 3.970000 0.935000 ;
-      RECT 4.365000 1.445000 4.535000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.625000  1.445000 1.795000 1.615000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.135000  0.765000 2.305000 0.935000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.800000  0.765000 3.970000 0.935000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.365000  1.445000 4.535000 1.615000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 4.805000  1.105000 4.975000 1.275000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.000000  1.105000 6.170000 1.275000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
     LAYER met1 ;
       RECT 1.565000 1.415000 1.855000 1.460000 ;
       RECT 1.565000 1.460000 4.595000 1.600000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
index 8ee0a78..a2789c8 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_2.magic.lef
@@ -39,12 +39,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 4.965000 0.995000 5.185000 1.325000 ;
-        RECT 5.975000 0.995000 6.405000 1.325000 ;
-      LAYER mcon ;
-        RECT 5.010000 1.105000 5.180000 1.275000 ;
-        RECT 6.000000 1.105000 6.170000 1.275000 ;
       LAYER met1 ;
         RECT 4.950000 1.075000 5.240000 1.120000 ;
         RECT 4.950000 1.120000 6.230000 1.260000 ;
@@ -89,31 +83,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 7.820000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.445000 ;
-        RECT 2.910000  0.085000 3.080000 0.825000 ;
-        RECT 4.285000  0.085000 4.615000 0.445000 ;
-        RECT 6.335000  0.085000 6.670000 0.445000 ;
-        RECT 7.390000  0.085000 7.560000 0.545000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 7.820000 0.240000 ;
     END
@@ -122,80 +91,105 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 7.820000 2.805000 ;
-        RECT 0.085000 1.835000 0.345000 2.635000 ;
-        RECT 2.520000 2.075000 3.105000 2.635000 ;
-        RECT 3.885000 2.255000 5.755000 2.635000 ;
-        RECT 6.395000 2.255000 6.725000 2.635000 ;
-        RECT 7.440000 1.825000 7.690000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 7.820000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.615000 ;
-      RECT 0.085000 0.615000 1.295000 0.785000 ;
-      RECT 0.515000 0.785000 0.720000 2.125000 ;
-      RECT 0.515000 2.125000 1.280000 2.465000 ;
-      RECT 1.115000 0.255000 1.295000 0.615000 ;
-      RECT 1.465000 0.255000 2.645000 0.535000 ;
-      RECT 1.465000 0.705000 1.800000 1.205000 ;
-      RECT 1.465000 1.205000 1.960000 1.955000 ;
-      RECT 1.610000 2.125000 2.300000 2.465000 ;
-      RECT 1.970000 0.705000 2.305000 1.035000 ;
-      RECT 2.130000 1.205000 3.205000 1.375000 ;
-      RECT 2.130000 1.375000 2.300000 2.125000 ;
-      RECT 2.470000 1.575000 2.665000 1.635000 ;
-      RECT 2.470000 1.635000 3.545000 1.905000 ;
-      RECT 2.475000 0.535000 2.645000 0.995000 ;
-      RECT 2.475000 0.995000 3.205000 1.205000 ;
-      RECT 3.325000 1.905000 3.545000 1.915000 ;
-      RECT 3.325000 1.915000 5.755000 2.085000 ;
-      RECT 3.325000 2.085000 3.545000 2.465000 ;
-      RECT 3.375000 0.255000 3.545000 1.635000 ;
-      RECT 3.735000 0.255000 4.065000 0.765000 ;
-      RECT 3.735000 0.765000 4.160000 0.935000 ;
-      RECT 3.735000 0.935000 3.905000 1.575000 ;
-      RECT 3.735000 1.575000 4.145000 1.745000 ;
-      RECT 4.075000 1.105000 4.670000 1.275000 ;
-      RECT 4.365000 1.275000 4.670000 1.495000 ;
-      RECT 4.365000 1.495000 5.215000 1.745000 ;
-      RECT 4.380000 0.615000 5.085000 0.785000 ;
-      RECT 4.380000 0.785000 4.670000 1.105000 ;
-      RECT 4.835000 0.255000 5.085000 0.615000 ;
-      RECT 5.405000 0.995000 5.755000 1.915000 ;
-      RECT 5.505000 0.255000 5.675000 0.615000 ;
-      RECT 5.505000 0.615000 6.750000 0.785000 ;
-      RECT 5.975000 1.495000 6.750000 2.085000 ;
-      RECT 5.975000 2.085000 6.145000 2.465000 ;
-      RECT 6.580000 0.785000 6.750000 1.055000 ;
-      RECT 6.580000 1.055000 7.270000 1.315000 ;
-      RECT 6.580000 1.315000 6.750000 1.495000 ;
+      RECT 0.000000 -0.085000 7.820000 0.085000 ;
+      RECT 0.000000  2.635000 7.820000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.615000 ;
+      RECT 0.085000  0.615000 1.295000 0.785000 ;
+      RECT 0.085000  1.835000 0.345000 2.635000 ;
+      RECT 0.515000  0.085000 0.895000 0.445000 ;
+      RECT 0.515000  0.785000 0.720000 2.125000 ;
+      RECT 0.515000  2.125000 1.280000 2.465000 ;
+      RECT 1.115000  0.255000 1.295000 0.615000 ;
+      RECT 1.465000  0.255000 2.645000 0.535000 ;
+      RECT 1.465000  0.705000 1.800000 1.205000 ;
+      RECT 1.465000  1.205000 1.960000 1.955000 ;
+      RECT 1.610000  2.125000 2.300000 2.465000 ;
+      RECT 1.970000  0.705000 2.305000 1.035000 ;
+      RECT 2.130000  1.205000 3.205000 1.375000 ;
+      RECT 2.130000  1.375000 2.300000 2.125000 ;
+      RECT 2.470000  1.575000 2.665000 1.635000 ;
+      RECT 2.470000  1.635000 3.545000 1.905000 ;
+      RECT 2.475000  0.535000 2.645000 0.995000 ;
+      RECT 2.475000  0.995000 3.205000 1.205000 ;
+      RECT 2.520000  2.075000 3.105000 2.635000 ;
+      RECT 2.910000  0.085000 3.080000 0.825000 ;
+      RECT 3.325000  1.905000 3.545000 1.915000 ;
+      RECT 3.325000  1.915000 5.755000 2.085000 ;
+      RECT 3.325000  2.085000 3.545000 2.465000 ;
+      RECT 3.375000  0.255000 3.545000 1.635000 ;
+      RECT 3.735000  0.255000 4.065000 0.765000 ;
+      RECT 3.735000  0.765000 4.160000 0.935000 ;
+      RECT 3.735000  0.935000 3.905000 1.575000 ;
+      RECT 3.735000  1.575000 4.145000 1.745000 ;
+      RECT 3.885000  2.255000 5.755000 2.635000 ;
+      RECT 4.075000  1.105000 4.670000 1.275000 ;
+      RECT 4.285000  0.085000 4.615000 0.445000 ;
+      RECT 4.365000  1.275000 4.670000 1.495000 ;
+      RECT 4.365000  1.495000 5.215000 1.745000 ;
+      RECT 4.380000  0.615000 5.085000 0.785000 ;
+      RECT 4.380000  0.785000 4.670000 1.105000 ;
+      RECT 4.835000  0.255000 5.085000 0.615000 ;
+      RECT 4.965000  0.995000 5.185000 1.325000 ;
+      RECT 5.405000  0.995000 5.755000 1.915000 ;
+      RECT 5.505000  0.255000 5.675000 0.615000 ;
+      RECT 5.505000  0.615000 6.750000 0.785000 ;
+      RECT 5.975000  0.995000 6.405000 1.325000 ;
+      RECT 5.975000  1.495000 6.750000 2.085000 ;
+      RECT 5.975000  2.085000 6.145000 2.465000 ;
+      RECT 6.335000  0.085000 6.670000 0.445000 ;
+      RECT 6.395000  2.255000 6.725000 2.635000 ;
+      RECT 6.580000  0.785000 6.750000 1.055000 ;
+      RECT 6.580000  1.055000 7.270000 1.315000 ;
+      RECT 6.580000  1.315000 6.750000 1.495000 ;
+      RECT 7.390000  0.085000 7.560000 0.545000 ;
+      RECT 7.440000  1.825000 7.690000 2.635000 ;
     LAYER mcon ;
-      RECT 1.625000 1.445000 1.795000 1.615000 ;
-      RECT 2.135000 0.765000 2.305000 0.935000 ;
-      RECT 3.990000 0.765000 4.160000 0.935000 ;
-      RECT 4.500000 1.445000 4.670000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.625000  1.445000 1.795000 1.615000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.135000  0.765000 2.305000 0.935000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 3.990000  0.765000 4.160000 0.935000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.500000  1.445000 4.670000 1.615000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.010000  1.105000 5.180000 1.275000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.000000  1.105000 6.170000 1.275000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
     LAYER met1 ;
       RECT 1.565000 1.415000 1.855000 1.460000 ;
       RECT 1.565000 1.460000 4.730000 1.600000 ;
diff --git a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
index dc77d5f..0657725 100644
--- a/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
+++ b/cells/sdlclkp/sky130_fd_sc_hdll__sdlclkp_4.magic.lef
@@ -39,12 +39,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 5.055000 0.995000 5.345000 1.325000 ;
-        RECT 6.135000 0.995000 6.565000 1.325000 ;
-      LAYER mcon ;
-        RECT 5.115000 1.105000 5.285000 1.275000 ;
-        RECT 6.160000 1.105000 6.330000 1.275000 ;
       LAYER met1 ;
         RECT 5.055000 1.075000 5.345000 1.120000 ;
         RECT 5.055000 1.120000 6.390000 1.260000 ;
@@ -94,35 +88,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.515000  0.085000 0.895000 0.445000 ;
-        RECT 2.920000  0.085000 3.265000 0.825000 ;
-        RECT 4.395000  0.085000 4.775000 0.445000 ;
-        RECT 6.005000  0.085000 6.830000 0.445000 ;
-        RECT 7.600000  0.085000 7.850000 0.545000 ;
-        RECT 8.765000  0.085000 9.035000 0.885000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -131,85 +96,114 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.085000 1.835000 0.345000 2.635000 ;
-        RECT 2.575000 2.075000 3.265000 2.635000 ;
-        RECT 3.895000 2.255000 5.915000 2.635000 ;
-        RECT 6.555000 2.255000 6.885000 2.635000 ;
-        RECT 7.600000 1.825000 7.850000 2.635000 ;
-        RECT 8.765000 1.485000 9.035000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.255000 0.345000 0.615000 ;
-      RECT 0.085000 0.615000 1.295000 0.785000 ;
-      RECT 0.515000 0.785000 0.735000 2.125000 ;
-      RECT 0.515000 2.125000 1.360000 2.465000 ;
-      RECT 1.115000 0.255000 1.295000 0.615000 ;
-      RECT 1.465000 0.255000 2.700000 0.535000 ;
-      RECT 1.465000 0.705000 1.855000 1.205000 ;
-      RECT 1.465000 1.205000 2.015000 1.325000 ;
-      RECT 1.510000 1.325000 2.015000 1.955000 ;
-      RECT 1.530000 2.125000 2.405000 2.465000 ;
-      RECT 2.025000 0.705000 2.360000 1.035000 ;
-      RECT 2.235000 1.205000 3.265000 1.375000 ;
-      RECT 2.235000 1.375000 2.405000 2.125000 ;
-      RECT 2.530000 0.535000 2.700000 0.995000 ;
-      RECT 2.530000 0.995000 3.265000 1.205000 ;
-      RECT 2.575000 1.575000 2.795000 1.635000 ;
-      RECT 2.575000 1.635000 3.705000 1.905000 ;
-      RECT 3.485000 0.255000 3.705000 1.635000 ;
-      RECT 3.485000 1.905000 3.705000 1.915000 ;
-      RECT 3.485000 1.915000 5.915000 2.085000 ;
-      RECT 3.485000 2.085000 3.705000 2.465000 ;
-      RECT 3.895000 0.255000 4.225000 0.765000 ;
-      RECT 3.895000 0.765000 4.320000 0.935000 ;
-      RECT 3.895000 0.935000 4.065000 1.575000 ;
-      RECT 3.895000 1.575000 4.305000 1.745000 ;
-      RECT 4.235000 1.105000 4.830000 1.275000 ;
-      RECT 4.525000 1.275000 4.830000 1.495000 ;
-      RECT 4.525000 1.495000 5.375000 1.745000 ;
-      RECT 4.540000 0.615000 5.245000 0.785000 ;
-      RECT 4.540000 0.785000 4.830000 1.105000 ;
-      RECT 4.995000 0.255000 5.245000 0.615000 ;
-      RECT 5.415000 0.255000 5.835000 0.615000 ;
-      RECT 5.415000 0.615000 6.910000 0.785000 ;
-      RECT 5.565000 0.995000 5.915000 1.915000 ;
-      RECT 6.135000 1.495000 6.910000 2.085000 ;
-      RECT 6.135000 2.085000 6.305000 2.465000 ;
-      RECT 6.740000 0.785000 6.910000 1.055000 ;
-      RECT 6.740000 1.055000 7.430000 1.315000 ;
-      RECT 6.740000 1.315000 6.910000 1.495000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.085000  0.255000 0.345000 0.615000 ;
+      RECT 0.085000  0.615000 1.295000 0.785000 ;
+      RECT 0.085000  1.835000 0.345000 2.635000 ;
+      RECT 0.515000  0.085000 0.895000 0.445000 ;
+      RECT 0.515000  0.785000 0.735000 2.125000 ;
+      RECT 0.515000  2.125000 1.360000 2.465000 ;
+      RECT 1.115000  0.255000 1.295000 0.615000 ;
+      RECT 1.465000  0.255000 2.700000 0.535000 ;
+      RECT 1.465000  0.705000 1.855000 1.205000 ;
+      RECT 1.465000  1.205000 2.015000 1.325000 ;
+      RECT 1.510000  1.325000 2.015000 1.955000 ;
+      RECT 1.530000  2.125000 2.405000 2.465000 ;
+      RECT 2.025000  0.705000 2.360000 1.035000 ;
+      RECT 2.235000  1.205000 3.265000 1.375000 ;
+      RECT 2.235000  1.375000 2.405000 2.125000 ;
+      RECT 2.530000  0.535000 2.700000 0.995000 ;
+      RECT 2.530000  0.995000 3.265000 1.205000 ;
+      RECT 2.575000  1.575000 2.795000 1.635000 ;
+      RECT 2.575000  1.635000 3.705000 1.905000 ;
+      RECT 2.575000  2.075000 3.265000 2.635000 ;
+      RECT 2.920000  0.085000 3.265000 0.825000 ;
+      RECT 3.485000  0.255000 3.705000 1.635000 ;
+      RECT 3.485000  1.905000 3.705000 1.915000 ;
+      RECT 3.485000  1.915000 5.915000 2.085000 ;
+      RECT 3.485000  2.085000 3.705000 2.465000 ;
+      RECT 3.895000  0.255000 4.225000 0.765000 ;
+      RECT 3.895000  0.765000 4.320000 0.935000 ;
+      RECT 3.895000  0.935000 4.065000 1.575000 ;
+      RECT 3.895000  1.575000 4.305000 1.745000 ;
+      RECT 3.895000  2.255000 5.915000 2.635000 ;
+      RECT 4.235000  1.105000 4.830000 1.275000 ;
+      RECT 4.395000  0.085000 4.775000 0.445000 ;
+      RECT 4.525000  1.275000 4.830000 1.495000 ;
+      RECT 4.525000  1.495000 5.375000 1.745000 ;
+      RECT 4.540000  0.615000 5.245000 0.785000 ;
+      RECT 4.540000  0.785000 4.830000 1.105000 ;
+      RECT 4.995000  0.255000 5.245000 0.615000 ;
+      RECT 5.055000  0.995000 5.345000 1.325000 ;
+      RECT 5.415000  0.255000 5.835000 0.615000 ;
+      RECT 5.415000  0.615000 6.910000 0.785000 ;
+      RECT 5.565000  0.995000 5.915000 1.915000 ;
+      RECT 6.005000  0.085000 6.830000 0.445000 ;
+      RECT 6.135000  0.995000 6.565000 1.325000 ;
+      RECT 6.135000  1.495000 6.910000 2.085000 ;
+      RECT 6.135000  2.085000 6.305000 2.465000 ;
+      RECT 6.555000  2.255000 6.885000 2.635000 ;
+      RECT 6.740000  0.785000 6.910000 1.055000 ;
+      RECT 6.740000  1.055000 7.430000 1.315000 ;
+      RECT 6.740000  1.315000 6.910000 1.495000 ;
+      RECT 7.600000  0.085000 7.850000 0.545000 ;
+      RECT 7.600000  1.825000 7.850000 2.635000 ;
+      RECT 8.765000  0.085000 9.035000 0.885000 ;
+      RECT 8.765000  1.485000 9.035000 2.635000 ;
     LAYER mcon ;
-      RECT 1.680000 1.445000 1.850000 1.615000 ;
-      RECT 2.190000 0.765000 2.360000 0.935000 ;
-      RECT 4.150000 0.765000 4.320000 0.935000 ;
-      RECT 4.660000 1.445000 4.830000 1.615000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.680000  1.445000 1.850000 1.615000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.190000  0.765000 2.360000 0.935000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.150000  0.765000 4.320000 0.935000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.660000  1.445000 4.830000 1.615000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.115000  1.105000 5.285000 1.275000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.160000  1.105000 6.330000 1.275000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
     LAYER met1 ;
       RECT 1.620000 1.415000 1.910000 1.460000 ;
       RECT 1.620000 1.460000 4.890000 1.600000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
index 3fbb746..53cc117 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_1.magic.lef
@@ -102,50 +102,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 15.180000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.385000  0.085000  2.765000 0.515000 ;
-        RECT  3.385000  0.085000  3.765000 0.610000 ;
-        RECT  6.445000  0.085000  6.695000 0.905000 ;
-        RECT  9.180000  0.085000  9.575000 0.560000 ;
-        RECT 10.450000  0.085000 10.725000 0.615000 ;
-        RECT 12.545000  0.085000 12.790000 0.900000 ;
-        RECT 14.165000  0.085000 14.400000 0.900000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 15.180000 0.240000 ;
     END
@@ -154,135 +110,175 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 15.180000 2.805000 ;
-        RECT  0.515000 2.135000  0.895000 2.635000 ;
-        RECT  2.385000 1.890000  2.765000 2.635000 ;
-        RECT  3.515000 1.825000  3.710000 2.635000 ;
-        RECT  6.350000 2.175000  6.695000 2.635000 ;
-        RECT  9.360000 1.835000  9.595000 2.635000 ;
-        RECT 10.355000 2.105000 10.645000 2.635000 ;
-        RECT 12.595000 1.495000 12.765000 2.635000 ;
-        RECT 14.165000 1.465000 14.400000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 15.180000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.895000 0.805000 ;
-      RECT  0.175000 1.795000  0.895000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.665000 0.805000  0.895000 1.795000 ;
-      RECT  1.115000 0.345000  1.285000 2.465000 ;
-      RECT  1.455000 0.255000  1.885000 0.515000 ;
-      RECT  1.455000 0.515000  1.625000 1.890000 ;
-      RECT  1.455000 1.890000  1.885000 2.465000 ;
-      RECT  2.695000 1.355000  3.285000 1.720000 ;
-      RECT  2.955000 1.720000  3.285000 2.425000 ;
-      RECT  2.980000 0.255000  3.205000 0.845000 ;
-      RECT  2.980000 0.845000  3.885000 1.175000 ;
-      RECT  2.980000 1.175000  3.285000 1.355000 ;
-      RECT  4.105000 0.685000  4.275000 1.320000 ;
-      RECT  4.105000 1.320000  4.525000 1.650000 ;
-      RECT  4.425000 1.820000  4.865000 2.020000 ;
-      RECT  4.425000 2.020000  4.805000 2.465000 ;
-      RECT  4.445000 0.255000  4.765000 0.980000 ;
-      RECT  4.445000 0.980000  4.865000 1.150000 ;
-      RECT  4.695000 1.150000  4.865000 1.820000 ;
-      RECT  4.995000 0.255000  5.195000 0.645000 ;
-      RECT  4.995000 0.645000  5.255000 0.825000 ;
-      RECT  5.035000 2.210000  5.365000 2.465000 ;
-      RECT  5.085000 0.825000  5.255000 1.785000 ;
-      RECT  5.085000 1.785000  5.365000 2.210000 ;
-      RECT  5.365000 0.255000  6.225000 0.515000 ;
-      RECT  5.790000 1.835000  7.370000 2.005000 ;
-      RECT  5.790000 2.005000  6.130000 2.465000 ;
-      RECT  5.895000 0.515000  6.225000 0.935000 ;
-      RECT  6.055000 0.935000  6.225000 1.835000 ;
-      RECT  7.120000 1.355000  7.370000 1.835000 ;
-      RECT  7.300000 0.255000  7.920000 0.565000 ;
-      RECT  7.300000 0.565000  7.710000 1.185000 ;
-      RECT  7.460000 2.150000  7.790000 2.465000 ;
-      RECT  7.540000 1.185000  7.710000 1.865000 ;
-      RECT  7.540000 1.865000  7.790000 2.150000 ;
-      RECT  7.880000 1.125000  8.115000 1.720000 ;
-      RECT  7.900000 0.735000  8.455000 0.955000 ;
-      RECT  8.000000 2.175000  9.190000 2.375000 ;
-      RECT  8.140000 0.255000  8.865000 0.565000 ;
-      RECT  8.285000 0.955000  8.455000 1.655000 ;
-      RECT  8.285000 1.655000  8.800000 2.005000 ;
-      RECT  8.695000 0.565000  8.865000 1.315000 ;
-      RECT  8.695000 1.315000  9.595000 1.485000 ;
-      RECT  8.970000 1.485000  9.595000 1.575000 ;
-      RECT  8.970000 1.575000  9.190000 2.175000 ;
-      RECT  9.055000 0.765000 10.220000 1.045000 ;
-      RECT  9.055000 1.045000 10.730000 1.065000 ;
-      RECT  9.055000 1.065000  9.305000 1.095000 ;
-      RECT  9.425000 1.245000  9.595000 1.315000 ;
-      RECT  9.765000 0.255000 10.220000 0.765000 ;
-      RECT  9.765000 1.065000 10.730000 1.375000 ;
-      RECT  9.765000 1.375000 10.145000 2.465000 ;
-      RECT 11.125000 1.245000 11.365000 1.965000 ;
-      RECT 11.260000 2.165000 12.375000 2.355000 ;
-      RECT 11.375000 0.705000 11.905000 1.035000 ;
-      RECT 11.410000 0.330000 12.375000 0.535000 ;
-      RECT 11.535000 1.035000 11.905000 1.995000 ;
-      RECT 12.125000 0.535000 12.375000 2.165000 ;
-      RECT 13.485000 0.890000 13.945000 1.220000 ;
-      RECT 13.605000 0.255000 13.945000 0.890000 ;
-      RECT 13.605000 1.220000 13.945000 2.465000 ;
-      RECT 14.115000 1.070000 14.445000 1.295000 ;
+      RECT  0.000000 -0.085000 15.180000 0.085000 ;
+      RECT  0.000000  2.635000 15.180000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.895000 0.805000 ;
+      RECT  0.175000  1.795000  0.895000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.515000  2.135000  0.895000 2.635000 ;
+      RECT  0.665000  0.805000  0.895000 1.795000 ;
+      RECT  1.115000  0.345000  1.285000 2.465000 ;
+      RECT  1.455000  0.255000  1.885000 0.515000 ;
+      RECT  1.455000  0.515000  1.625000 1.890000 ;
+      RECT  1.455000  1.890000  1.885000 2.465000 ;
+      RECT  2.385000  0.085000  2.765000 0.515000 ;
+      RECT  2.385000  1.890000  2.765000 2.635000 ;
+      RECT  2.695000  1.355000  3.285000 1.720000 ;
+      RECT  2.955000  1.720000  3.285000 2.425000 ;
+      RECT  2.980000  0.255000  3.205000 0.845000 ;
+      RECT  2.980000  0.845000  3.885000 1.175000 ;
+      RECT  2.980000  1.175000  3.285000 1.355000 ;
+      RECT  3.385000  0.085000  3.765000 0.610000 ;
+      RECT  3.515000  1.825000  3.710000 2.635000 ;
+      RECT  4.105000  0.685000  4.275000 1.320000 ;
+      RECT  4.105000  1.320000  4.525000 1.650000 ;
+      RECT  4.425000  1.820000  4.865000 2.020000 ;
+      RECT  4.425000  2.020000  4.805000 2.465000 ;
+      RECT  4.445000  0.255000  4.765000 0.980000 ;
+      RECT  4.445000  0.980000  4.865000 1.150000 ;
+      RECT  4.695000  1.150000  4.865000 1.820000 ;
+      RECT  4.995000  0.255000  5.195000 0.645000 ;
+      RECT  4.995000  0.645000  5.255000 0.825000 ;
+      RECT  5.035000  2.210000  5.365000 2.465000 ;
+      RECT  5.085000  0.825000  5.255000 1.785000 ;
+      RECT  5.085000  1.785000  5.365000 2.210000 ;
+      RECT  5.365000  0.255000  6.225000 0.515000 ;
+      RECT  5.790000  1.835000  7.370000 2.005000 ;
+      RECT  5.790000  2.005000  6.130000 2.465000 ;
+      RECT  5.895000  0.515000  6.225000 0.935000 ;
+      RECT  6.055000  0.935000  6.225000 1.835000 ;
+      RECT  6.350000  2.175000  6.695000 2.635000 ;
+      RECT  6.445000  0.085000  6.695000 0.905000 ;
+      RECT  7.120000  1.355000  7.370000 1.835000 ;
+      RECT  7.300000  0.255000  7.920000 0.565000 ;
+      RECT  7.300000  0.565000  7.710000 1.185000 ;
+      RECT  7.460000  2.150000  7.790000 2.465000 ;
+      RECT  7.540000  1.185000  7.710000 1.865000 ;
+      RECT  7.540000  1.865000  7.790000 2.150000 ;
+      RECT  7.880000  1.125000  8.115000 1.720000 ;
+      RECT  7.900000  0.735000  8.455000 0.955000 ;
+      RECT  8.000000  2.175000  9.190000 2.375000 ;
+      RECT  8.140000  0.255000  8.865000 0.565000 ;
+      RECT  8.285000  0.955000  8.455000 1.655000 ;
+      RECT  8.285000  1.655000  8.800000 2.005000 ;
+      RECT  8.695000  0.565000  8.865000 1.315000 ;
+      RECT  8.695000  1.315000  9.595000 1.485000 ;
+      RECT  8.970000  1.485000  9.595000 1.575000 ;
+      RECT  8.970000  1.575000  9.190000 2.175000 ;
+      RECT  9.055000  0.765000 10.220000 1.045000 ;
+      RECT  9.055000  1.045000 10.730000 1.065000 ;
+      RECT  9.055000  1.065000  9.305000 1.095000 ;
+      RECT  9.180000  0.085000  9.575000 0.560000 ;
+      RECT  9.360000  1.835000  9.595000 2.635000 ;
+      RECT  9.425000  1.245000  9.595000 1.315000 ;
+      RECT  9.765000  0.255000 10.220000 0.765000 ;
+      RECT  9.765000  1.065000 10.730000 1.375000 ;
+      RECT  9.765000  1.375000 10.145000 2.465000 ;
+      RECT 10.355000  2.105000 10.645000 2.635000 ;
+      RECT 10.450000  0.085000 10.725000 0.615000 ;
+      RECT 11.125000  1.245000 11.365000 1.965000 ;
+      RECT 11.260000  2.165000 12.375000 2.355000 ;
+      RECT 11.375000  0.705000 11.905000 1.035000 ;
+      RECT 11.410000  0.330000 12.375000 0.535000 ;
+      RECT 11.535000  1.035000 11.905000 1.995000 ;
+      RECT 12.125000  0.535000 12.375000 2.165000 ;
+      RECT 12.545000  0.085000 12.790000 0.900000 ;
+      RECT 12.595000  1.495000 12.765000 2.635000 ;
+      RECT 13.485000  0.890000 13.945000 1.220000 ;
+      RECT 13.605000  0.255000 13.945000 0.890000 ;
+      RECT 13.605000  1.220000 13.945000 2.465000 ;
+      RECT 14.115000  1.070000 14.445000 1.295000 ;
+      RECT 14.165000  0.085000 14.400000 0.900000 ;
+      RECT 14.165000  1.465000 14.400000 2.635000 ;
     LAYER mcon ;
-      RECT  0.685000 1.785000  0.855000 1.955000 ;
-      RECT  1.115000 1.445000  1.285000 1.615000 ;
-      RECT  1.455000 0.425000  1.625000 0.595000 ;
-      RECT  4.105000 0.765000  4.275000 0.935000 ;
-      RECT  4.535000 0.425000  4.705000 0.595000 ;
-      RECT  5.015000 0.425000  5.185000 0.595000 ;
-      RECT  7.315000 0.425000  7.485000 0.595000 ;
-      RECT  7.910000 1.445000  8.080000 1.615000 ;
-      RECT  8.345000 1.785000  8.515000 1.955000 ;
-      RECT 11.160000 1.785000 11.330000 1.955000 ;
-      RECT 11.630000 1.445000 11.800000 1.615000 ;
-      RECT 12.165000 1.105000 12.335000 1.275000 ;
-      RECT 13.700000 0.765000 13.870000 0.935000 ;
-      RECT 14.195000 1.105000 14.365000 1.275000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.685000  1.785000  0.855000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.115000  1.445000  1.285000 1.615000 ;
+      RECT  1.455000  0.425000  1.625000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.105000  0.765000  4.275000 0.935000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.535000  0.425000  4.705000 0.595000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.015000  0.425000  5.185000 0.595000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.315000  0.425000  7.485000 0.595000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.910000  1.445000  8.080000 1.615000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.345000  1.785000  8.515000 1.955000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.160000  1.785000 11.330000 1.955000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.630000  1.445000 11.800000 1.615000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.165000  1.105000 12.335000 1.275000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.700000  0.765000 13.870000 0.935000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 14.195000  1.105000 14.365000 1.275000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
     LAYER met1 ;
       RECT  0.625000 1.755000  0.915000 1.800000 ;
       RECT  0.625000 1.800000 11.415000 1.940000 ;
diff --git a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
index 083fc05..463916e 100644
--- a/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
+++ b/cells/sedfxbp/sky130_fd_sc_hdll__sedfxbp_2.magic.lef
@@ -104,55 +104,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 16.560000 0.085000 ;
-        RECT  0.515000  0.085000  0.895000 0.465000 ;
-        RECT  2.385000  0.085000  2.765000 0.515000 ;
-        RECT  3.385000  0.085000  3.765000 0.610000 ;
-        RECT  6.445000  0.085000  6.695000 0.905000 ;
-        RECT  9.180000  0.085000  9.575000 0.560000 ;
-        RECT 10.450000  0.085000 10.725000 0.615000 ;
-        RECT 12.630000  0.085000 12.880000 0.900000 ;
-        RECT 13.650000  0.085000 13.900000 0.900000 ;
-        RECT 14.915000  0.085000 15.150000 0.900000 ;
-        RECT 15.920000  0.085000 16.180000 0.900000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
-        RECT 11.185000 -0.085000 11.355000 0.085000 ;
-        RECT 11.645000 -0.085000 11.815000 0.085000 ;
-        RECT 12.105000 -0.085000 12.275000 0.085000 ;
-        RECT 12.565000 -0.085000 12.735000 0.085000 ;
-        RECT 13.025000 -0.085000 13.195000 0.085000 ;
-        RECT 13.485000 -0.085000 13.655000 0.085000 ;
-        RECT 13.945000 -0.085000 14.115000 0.085000 ;
-        RECT 14.405000 -0.085000 14.575000 0.085000 ;
-        RECT 14.865000 -0.085000 15.035000 0.085000 ;
-        RECT 15.325000 -0.085000 15.495000 0.085000 ;
-        RECT 15.785000 -0.085000 15.955000 0.085000 ;
-        RECT 16.245000 -0.085000 16.415000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 16.560000 0.240000 ;
     END
@@ -161,140 +112,185 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 16.560000 2.805000 ;
-        RECT  0.515000 2.135000  0.895000 2.635000 ;
-        RECT  2.385000 1.890000  2.765000 2.635000 ;
-        RECT  3.515000 1.825000  3.710000 2.635000 ;
-        RECT  6.350000 2.175000  6.695000 2.635000 ;
-        RECT  9.360000 1.835000  9.595000 2.635000 ;
-        RECT 10.355000 2.105000 10.645000 2.635000 ;
-        RECT 12.595000 1.495000 12.765000 2.635000 ;
-        RECT 13.535000 1.465000 13.785000 2.635000 ;
-        RECT 14.915000 1.465000 15.150000 2.635000 ;
-        RECT 15.920000 1.465000 16.180000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
-        RECT 11.185000 2.635000 11.355000 2.805000 ;
-        RECT 11.645000 2.635000 11.815000 2.805000 ;
-        RECT 12.105000 2.635000 12.275000 2.805000 ;
-        RECT 12.565000 2.635000 12.735000 2.805000 ;
-        RECT 13.025000 2.635000 13.195000 2.805000 ;
-        RECT 13.485000 2.635000 13.655000 2.805000 ;
-        RECT 13.945000 2.635000 14.115000 2.805000 ;
-        RECT 14.405000 2.635000 14.575000 2.805000 ;
-        RECT 14.865000 2.635000 15.035000 2.805000 ;
-        RECT 15.325000 2.635000 15.495000 2.805000 ;
-        RECT 15.785000 2.635000 15.955000 2.805000 ;
-        RECT 16.245000 2.635000 16.415000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 16.560000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.175000 0.345000  0.345000 0.635000 ;
-      RECT  0.175000 0.635000  0.895000 0.805000 ;
-      RECT  0.175000 1.795000  0.895000 1.965000 ;
-      RECT  0.175000 1.965000  0.345000 2.465000 ;
-      RECT  0.665000 0.805000  0.895000 1.795000 ;
-      RECT  1.115000 0.345000  1.285000 2.465000 ;
-      RECT  1.455000 0.255000  1.885000 0.515000 ;
-      RECT  1.455000 0.515000  1.625000 1.890000 ;
-      RECT  1.455000 1.890000  1.885000 2.465000 ;
-      RECT  2.695000 1.355000  3.285000 1.720000 ;
-      RECT  2.955000 1.720000  3.285000 2.425000 ;
-      RECT  2.980000 0.255000  3.205000 0.845000 ;
-      RECT  2.980000 0.845000  3.885000 1.175000 ;
-      RECT  2.980000 1.175000  3.285000 1.355000 ;
-      RECT  4.105000 0.685000  4.275000 1.320000 ;
-      RECT  4.105000 1.320000  4.525000 1.650000 ;
-      RECT  4.425000 1.820000  4.865000 2.020000 ;
-      RECT  4.425000 2.020000  4.805000 2.465000 ;
-      RECT  4.445000 0.255000  4.765000 0.980000 ;
-      RECT  4.445000 0.980000  4.865000 1.150000 ;
-      RECT  4.695000 1.150000  4.865000 1.820000 ;
-      RECT  4.995000 0.255000  5.195000 0.645000 ;
-      RECT  4.995000 0.645000  5.255000 0.825000 ;
-      RECT  5.035000 2.210000  5.365000 2.465000 ;
-      RECT  5.085000 0.825000  5.255000 1.785000 ;
-      RECT  5.085000 1.785000  5.365000 2.210000 ;
-      RECT  5.365000 0.255000  6.225000 0.515000 ;
-      RECT  5.790000 1.835000  7.370000 2.005000 ;
-      RECT  5.790000 2.005000  6.130000 2.465000 ;
-      RECT  5.895000 0.515000  6.225000 0.935000 ;
-      RECT  6.055000 0.935000  6.225000 1.835000 ;
-      RECT  7.120000 1.355000  7.370000 1.835000 ;
-      RECT  7.300000 0.255000  7.920000 0.565000 ;
-      RECT  7.300000 0.565000  7.710000 1.185000 ;
-      RECT  7.460000 2.150000  7.790000 2.465000 ;
-      RECT  7.540000 1.185000  7.710000 1.865000 ;
-      RECT  7.540000 1.865000  7.790000 2.150000 ;
-      RECT  7.880000 1.125000  8.115000 1.720000 ;
-      RECT  7.900000 0.735000  8.455000 0.955000 ;
-      RECT  8.000000 2.175000  9.190000 2.375000 ;
-      RECT  8.140000 0.255000  8.865000 0.565000 ;
-      RECT  8.285000 0.955000  8.455000 1.655000 ;
-      RECT  8.285000 1.655000  8.800000 2.005000 ;
-      RECT  8.695000 0.565000  8.865000 1.315000 ;
-      RECT  8.695000 1.315000  9.595000 1.485000 ;
-      RECT  8.970000 1.485000  9.595000 1.575000 ;
-      RECT  8.970000 1.575000  9.190000 2.175000 ;
-      RECT  9.055000 0.765000 10.220000 1.045000 ;
-      RECT  9.055000 1.045000 10.730000 1.065000 ;
-      RECT  9.055000 1.065000  9.305000 1.095000 ;
-      RECT  9.425000 1.245000  9.595000 1.315000 ;
-      RECT  9.765000 0.255000 10.220000 0.765000 ;
-      RECT  9.765000 1.065000 10.730000 1.375000 ;
-      RECT  9.765000 1.375000 10.145000 2.465000 ;
-      RECT 11.125000 1.245000 11.365000 1.965000 ;
-      RECT 11.260000 2.165000 12.375000 2.355000 ;
-      RECT 11.390000 0.705000 11.905000 1.035000 ;
-      RECT 11.410000 0.330000 12.375000 0.535000 ;
-      RECT 11.535000 1.035000 11.905000 1.995000 ;
-      RECT 12.125000 0.535000 12.375000 2.165000 ;
-      RECT 13.955000 1.575000 14.185000 2.010000 ;
-      RECT 14.070000 0.890000 14.695000 1.220000 ;
-      RECT 14.355000 0.255000 14.695000 0.890000 ;
-      RECT 14.355000 1.220000 14.695000 2.465000 ;
+      RECT  0.000000 -0.085000 16.560000 0.085000 ;
+      RECT  0.000000  2.635000 16.560000 2.805000 ;
+      RECT  0.175000  0.345000  0.345000 0.635000 ;
+      RECT  0.175000  0.635000  0.895000 0.805000 ;
+      RECT  0.175000  1.795000  0.895000 1.965000 ;
+      RECT  0.175000  1.965000  0.345000 2.465000 ;
+      RECT  0.515000  0.085000  0.895000 0.465000 ;
+      RECT  0.515000  2.135000  0.895000 2.635000 ;
+      RECT  0.665000  0.805000  0.895000 1.795000 ;
+      RECT  1.115000  0.345000  1.285000 2.465000 ;
+      RECT  1.455000  0.255000  1.885000 0.515000 ;
+      RECT  1.455000  0.515000  1.625000 1.890000 ;
+      RECT  1.455000  1.890000  1.885000 2.465000 ;
+      RECT  2.385000  0.085000  2.765000 0.515000 ;
+      RECT  2.385000  1.890000  2.765000 2.635000 ;
+      RECT  2.695000  1.355000  3.285000 1.720000 ;
+      RECT  2.955000  1.720000  3.285000 2.425000 ;
+      RECT  2.980000  0.255000  3.205000 0.845000 ;
+      RECT  2.980000  0.845000  3.885000 1.175000 ;
+      RECT  2.980000  1.175000  3.285000 1.355000 ;
+      RECT  3.385000  0.085000  3.765000 0.610000 ;
+      RECT  3.515000  1.825000  3.710000 2.635000 ;
+      RECT  4.105000  0.685000  4.275000 1.320000 ;
+      RECT  4.105000  1.320000  4.525000 1.650000 ;
+      RECT  4.425000  1.820000  4.865000 2.020000 ;
+      RECT  4.425000  2.020000  4.805000 2.465000 ;
+      RECT  4.445000  0.255000  4.765000 0.980000 ;
+      RECT  4.445000  0.980000  4.865000 1.150000 ;
+      RECT  4.695000  1.150000  4.865000 1.820000 ;
+      RECT  4.995000  0.255000  5.195000 0.645000 ;
+      RECT  4.995000  0.645000  5.255000 0.825000 ;
+      RECT  5.035000  2.210000  5.365000 2.465000 ;
+      RECT  5.085000  0.825000  5.255000 1.785000 ;
+      RECT  5.085000  1.785000  5.365000 2.210000 ;
+      RECT  5.365000  0.255000  6.225000 0.515000 ;
+      RECT  5.790000  1.835000  7.370000 2.005000 ;
+      RECT  5.790000  2.005000  6.130000 2.465000 ;
+      RECT  5.895000  0.515000  6.225000 0.935000 ;
+      RECT  6.055000  0.935000  6.225000 1.835000 ;
+      RECT  6.350000  2.175000  6.695000 2.635000 ;
+      RECT  6.445000  0.085000  6.695000 0.905000 ;
+      RECT  7.120000  1.355000  7.370000 1.835000 ;
+      RECT  7.300000  0.255000  7.920000 0.565000 ;
+      RECT  7.300000  0.565000  7.710000 1.185000 ;
+      RECT  7.460000  2.150000  7.790000 2.465000 ;
+      RECT  7.540000  1.185000  7.710000 1.865000 ;
+      RECT  7.540000  1.865000  7.790000 2.150000 ;
+      RECT  7.880000  1.125000  8.115000 1.720000 ;
+      RECT  7.900000  0.735000  8.455000 0.955000 ;
+      RECT  8.000000  2.175000  9.190000 2.375000 ;
+      RECT  8.140000  0.255000  8.865000 0.565000 ;
+      RECT  8.285000  0.955000  8.455000 1.655000 ;
+      RECT  8.285000  1.655000  8.800000 2.005000 ;
+      RECT  8.695000  0.565000  8.865000 1.315000 ;
+      RECT  8.695000  1.315000  9.595000 1.485000 ;
+      RECT  8.970000  1.485000  9.595000 1.575000 ;
+      RECT  8.970000  1.575000  9.190000 2.175000 ;
+      RECT  9.055000  0.765000 10.220000 1.045000 ;
+      RECT  9.055000  1.045000 10.730000 1.065000 ;
+      RECT  9.055000  1.065000  9.305000 1.095000 ;
+      RECT  9.180000  0.085000  9.575000 0.560000 ;
+      RECT  9.360000  1.835000  9.595000 2.635000 ;
+      RECT  9.425000  1.245000  9.595000 1.315000 ;
+      RECT  9.765000  0.255000 10.220000 0.765000 ;
+      RECT  9.765000  1.065000 10.730000 1.375000 ;
+      RECT  9.765000  1.375000 10.145000 2.465000 ;
+      RECT 10.355000  2.105000 10.645000 2.635000 ;
+      RECT 10.450000  0.085000 10.725000 0.615000 ;
+      RECT 11.125000  1.245000 11.365000 1.965000 ;
+      RECT 11.260000  2.165000 12.375000 2.355000 ;
+      RECT 11.390000  0.705000 11.905000 1.035000 ;
+      RECT 11.410000  0.330000 12.375000 0.535000 ;
+      RECT 11.535000  1.035000 11.905000 1.995000 ;
+      RECT 12.125000  0.535000 12.375000 2.165000 ;
+      RECT 12.595000  1.495000 12.765000 2.635000 ;
+      RECT 12.630000  0.085000 12.880000 0.900000 ;
+      RECT 13.535000  1.465000 13.785000 2.635000 ;
+      RECT 13.650000  0.085000 13.900000 0.900000 ;
+      RECT 13.955000  1.575000 14.185000 2.010000 ;
+      RECT 14.070000  0.890000 14.695000 1.220000 ;
+      RECT 14.355000  0.255000 14.695000 0.890000 ;
+      RECT 14.355000  1.220000 14.695000 2.465000 ;
+      RECT 14.915000  0.085000 15.150000 0.900000 ;
+      RECT 14.915000  1.465000 15.150000 2.635000 ;
+      RECT 15.920000  0.085000 16.180000 0.900000 ;
+      RECT 15.920000  1.465000 16.180000 2.635000 ;
     LAYER mcon ;
-      RECT  0.685000 1.785000  0.855000 1.955000 ;
-      RECT  1.115000 1.445000  1.285000 1.615000 ;
-      RECT  1.455000 0.425000  1.625000 0.595000 ;
-      RECT  4.105000 0.765000  4.275000 0.935000 ;
-      RECT  4.535000 0.425000  4.705000 0.595000 ;
-      RECT  5.015000 0.425000  5.185000 0.595000 ;
-      RECT  7.315000 0.425000  7.485000 0.595000 ;
-      RECT  7.910000 1.445000  8.080000 1.615000 ;
-      RECT  8.345000 1.785000  8.515000 1.955000 ;
-      RECT 11.160000 1.785000 11.330000 1.955000 ;
-      RECT 11.630000 1.445000 11.800000 1.615000 ;
-      RECT 12.165000 1.785000 12.335000 1.955000 ;
-      RECT 13.985000 1.785000 14.155000 1.955000 ;
-      RECT 14.445000 0.765000 14.615000 0.935000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  0.685000  1.785000  0.855000 1.955000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.115000  1.445000  1.285000 1.615000 ;
+      RECT  1.455000  0.425000  1.625000 0.595000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.105000  0.765000  4.275000 0.935000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.535000  0.425000  4.705000 0.595000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.015000  0.425000  5.185000 0.595000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.315000  0.425000  7.485000 0.595000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.910000  1.445000  8.080000 1.615000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.345000  1.785000  8.515000 1.955000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
+      RECT 11.160000  1.785000 11.330000 1.955000 ;
+      RECT 11.185000 -0.085000 11.355000 0.085000 ;
+      RECT 11.185000  2.635000 11.355000 2.805000 ;
+      RECT 11.630000  1.445000 11.800000 1.615000 ;
+      RECT 11.645000 -0.085000 11.815000 0.085000 ;
+      RECT 11.645000  2.635000 11.815000 2.805000 ;
+      RECT 12.105000 -0.085000 12.275000 0.085000 ;
+      RECT 12.105000  2.635000 12.275000 2.805000 ;
+      RECT 12.165000  1.785000 12.335000 1.955000 ;
+      RECT 12.565000 -0.085000 12.735000 0.085000 ;
+      RECT 12.565000  2.635000 12.735000 2.805000 ;
+      RECT 13.025000 -0.085000 13.195000 0.085000 ;
+      RECT 13.025000  2.635000 13.195000 2.805000 ;
+      RECT 13.485000 -0.085000 13.655000 0.085000 ;
+      RECT 13.485000  2.635000 13.655000 2.805000 ;
+      RECT 13.945000 -0.085000 14.115000 0.085000 ;
+      RECT 13.945000  2.635000 14.115000 2.805000 ;
+      RECT 13.985000  1.785000 14.155000 1.955000 ;
+      RECT 14.405000 -0.085000 14.575000 0.085000 ;
+      RECT 14.405000  2.635000 14.575000 2.805000 ;
+      RECT 14.445000  0.765000 14.615000 0.935000 ;
+      RECT 14.865000 -0.085000 15.035000 0.085000 ;
+      RECT 14.865000  2.635000 15.035000 2.805000 ;
+      RECT 15.325000 -0.085000 15.495000 0.085000 ;
+      RECT 15.325000  2.635000 15.495000 2.805000 ;
+      RECT 15.785000 -0.085000 15.955000 0.085000 ;
+      RECT 15.785000  2.635000 15.955000 2.805000 ;
+      RECT 16.245000 -0.085000 16.415000 0.085000 ;
+      RECT 16.245000  2.635000 16.415000 2.805000 ;
     LAYER met1 ;
       RECT  0.625000 1.755000  0.915000 1.800000 ;
       RECT  0.625000 1.800000 11.415000 1.940000 ;
diff --git a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
index 2917983..c2ef0f5 100644
--- a/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
+++ b/cells/tap/sky130_fd_sc_hdll__tap_1.magic.lef
@@ -52,10 +52,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.460000 0.085000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
@@ -64,14 +60,18 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.460000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      RECT 0.000000  2.635000 0.460000 2.805000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
index 97a4217..d2bb0e1 100644
--- a/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
+++ b/cells/tapvgnd/sky130_fd_sc_hdll__tapvgnd_1.magic.lef
@@ -37,10 +37,6 @@
   PIN VPB
     ANTENNADIFFAREA  0.148750 ;
     PORT
-      LAYER li1 ;
-        RECT 0.085000 1.470000 0.375000 2.455000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.125000 0.315000 2.295000 ;
       LAYER met1 ;
         RECT 0.085000 2.095000 0.375000 2.325000 ;
     END
@@ -48,11 +44,6 @@
   PIN VGND
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.460000 0.085000 ;
-        RECT 0.085000  0.085000 0.375000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
@@ -60,14 +51,21 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.460000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      RECT 0.000000  2.635000 0.460000 2.805000 ;
+      RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  1.470000 0.375000 2.455000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.125000 0.315000 2.295000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
index 3d3f1cd..b3d8773 100644
--- a/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
+++ b/cells/tapvgnd2/sky130_fd_sc_hdll__tapvgnd2_1.magic.lef
@@ -37,10 +37,6 @@
   PIN VPB
     ANTENNADIFFAREA  0.148750 ;
     PORT
-      LAYER li1 ;
-        RECT 0.085000 1.470000 0.375000 2.455000 ;
-      LAYER mcon ;
-        RECT 0.145000 1.785000 0.315000 1.955000 ;
       LAYER met1 ;
         RECT 0.085000 1.755000 0.375000 1.985000 ;
     END
@@ -48,11 +44,6 @@
   PIN VGND
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.460000 0.085000 ;
-        RECT 0.085000  0.085000 0.375000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
@@ -60,14 +51,21 @@
   PIN VPWR
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.460000 2.805000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      RECT 0.000000  2.635000 0.460000 2.805000 ;
+      RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  1.470000 0.375000 2.455000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  1.785000 0.315000 1.955000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
index 42bc9dc..3ef6ee8 100644
--- a/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
+++ b/cells/tapvpwrvgnd/sky130_fd_sc_hdll__tapvpwrvgnd_1.magic.lef
@@ -38,11 +38,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 0.460000 0.085000 ;
-        RECT 0.085000  0.085000 0.375000 0.810000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 0.460000 0.240000 ;
     END
@@ -51,15 +46,20 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 0.460000 2.805000 ;
-        RECT 0.085000 1.470000 0.375000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 0.460000 2.960000 ;
     END
   END VPWR
+  OBS
+    LAYER li1 ;
+      RECT 0.000000 -0.085000 0.460000 0.085000 ;
+      RECT 0.000000  2.635000 0.460000 2.805000 ;
+      RECT 0.085000  0.085000 0.375000 0.810000 ;
+      RECT 0.085000  1.470000 0.375000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+  END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
   PROPERTY originalViewName "layout" ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
index 38936d0..c593e97 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_1.magic.lef
@@ -72,19 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 1.155000  0.085000 1.325000 0.905000 ;
-        RECT 2.095000  0.085000 2.495000 0.475000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -93,36 +80,46 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 0.085000 2.125000 0.385000 2.635000 ;
-        RECT 1.155000 2.125000 1.835000 2.635000 ;
-        RECT 3.115000 2.125000 3.415000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.280000 0.550000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.785000 ;
-      RECT 0.085000 1.785000 2.555000 1.955000 ;
-      RECT 0.555000 1.955000 0.935000 2.465000 ;
-      RECT 1.495000 0.255000 1.875000 0.655000 ;
-      RECT 1.495000 0.655000 2.895000 0.825000 ;
-      RECT 2.335000 1.415000 3.095000 1.585000 ;
-      RECT 2.335000 1.585000 2.555000 1.785000 ;
-      RECT 2.665000 0.255000 2.895000 0.655000 ;
-      RECT 2.875000 0.995000 3.095000 1.415000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.280000 0.550000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.785000 ;
+      RECT 0.085000  1.785000 2.555000 1.955000 ;
+      RECT 0.085000  2.125000 0.385000 2.635000 ;
+      RECT 0.555000  1.955000 0.935000 2.465000 ;
+      RECT 1.155000  0.085000 1.325000 0.905000 ;
+      RECT 1.155000  2.125000 1.835000 2.635000 ;
+      RECT 1.495000  0.255000 1.875000 0.655000 ;
+      RECT 1.495000  0.655000 2.895000 0.825000 ;
+      RECT 2.095000  0.085000 2.495000 0.475000 ;
+      RECT 2.335000  1.415000 3.095000 1.585000 ;
+      RECT 2.335000  1.585000 2.555000 1.785000 ;
+      RECT 2.665000  0.255000 2.895000 0.655000 ;
+      RECT 2.875000  0.995000 3.095000 1.415000 ;
+      RECT 3.115000  2.125000 3.415000 2.635000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
index 2e028f2..dcb0abb 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_2.magic.lef
@@ -75,27 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 1.600000  0.085000 1.770000 0.555000 ;
-        RECT 2.630000  0.085000 2.800000 0.905000 ;
-        RECT 3.570000  0.085000 3.740000 0.555000 ;
-        RECT 4.545000  0.085000 4.715000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -104,60 +83,77 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.620000 2.135000 0.870000 2.635000 ;
-        RECT 1.560000 2.135000 1.810000 2.635000 ;
-        RECT 3.060000 2.135000 3.310000 2.635000 ;
-        RECT 5.025000 2.135000 5.275000 2.635000 ;
-        RECT 5.965000 1.795000 6.340000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.645000 0.910000 0.895000 ;
-      RECT 0.085000 0.895000 0.315000 1.785000 ;
-      RECT 0.085000 1.785000 3.780000 1.955000 ;
-      RECT 0.085000 1.955000 2.280000 1.965000 ;
-      RECT 0.085000 1.965000 0.400000 2.465000 ;
-      RECT 0.105000 0.255000 1.380000 0.475000 ;
-      RECT 1.090000 1.965000 1.340000 2.465000 ;
-      RECT 1.130000 0.475000 1.380000 0.725000 ;
-      RECT 1.130000 0.725000 2.320000 0.905000 ;
-      RECT 1.940000 0.255000 2.320000 0.725000 ;
-      RECT 2.030000 1.965000 2.280000 2.465000 ;
-      RECT 2.590000 2.125000 2.840000 2.465000 ;
-      RECT 2.970000 0.255000 3.350000 0.725000 ;
-      RECT 2.970000 0.725000 5.755000 0.905000 ;
-      RECT 3.530000 2.125000 3.855000 2.295000 ;
-      RECT 3.530000 2.295000 4.755000 2.465000 ;
-      RECT 3.610000 1.455000 5.205000 1.625000 ;
-      RECT 3.610000 1.625000 3.780000 1.785000 ;
-      RECT 3.910000 0.255000 4.325000 0.725000 ;
-      RECT 4.505000 2.135000 4.755000 2.295000 ;
-      RECT 5.035000 1.075000 5.745000 1.245000 ;
-      RECT 5.035000 1.245000 5.205000 1.455000 ;
-      RECT 5.405000 0.645000 5.755000 0.725000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.085000  0.645000 0.910000 0.895000 ;
+      RECT 0.085000  0.895000 0.315000 1.785000 ;
+      RECT 0.085000  1.785000 3.780000 1.955000 ;
+      RECT 0.085000  1.955000 2.280000 1.965000 ;
+      RECT 0.085000  1.965000 0.400000 2.465000 ;
+      RECT 0.105000  0.255000 1.380000 0.475000 ;
+      RECT 0.620000  2.135000 0.870000 2.635000 ;
+      RECT 1.090000  1.965000 1.340000 2.465000 ;
+      RECT 1.130000  0.475000 1.380000 0.725000 ;
+      RECT 1.130000  0.725000 2.320000 0.905000 ;
+      RECT 1.560000  2.135000 1.810000 2.635000 ;
+      RECT 1.600000  0.085000 1.770000 0.555000 ;
+      RECT 1.940000  0.255000 2.320000 0.725000 ;
+      RECT 2.030000  1.965000 2.280000 2.465000 ;
+      RECT 2.590000  2.125000 2.840000 2.465000 ;
+      RECT 2.630000  0.085000 2.800000 0.905000 ;
+      RECT 2.970000  0.255000 3.350000 0.725000 ;
+      RECT 2.970000  0.725000 5.755000 0.905000 ;
+      RECT 3.060000  2.135000 3.310000 2.635000 ;
+      RECT 3.530000  2.125000 3.855000 2.295000 ;
+      RECT 3.530000  2.295000 4.755000 2.465000 ;
+      RECT 3.570000  0.085000 3.740000 0.555000 ;
+      RECT 3.610000  1.455000 5.205000 1.625000 ;
+      RECT 3.610000  1.625000 3.780000 1.785000 ;
+      RECT 3.910000  0.255000 4.325000 0.725000 ;
+      RECT 4.505000  2.135000 4.755000 2.295000 ;
+      RECT 4.545000  0.085000 4.715000 0.555000 ;
+      RECT 5.025000  2.135000 5.275000 2.635000 ;
+      RECT 5.035000  1.075000 5.745000 1.245000 ;
+      RECT 5.035000  1.245000 5.205000 1.455000 ;
+      RECT 5.405000  0.645000 5.755000 0.725000 ;
+      RECT 5.965000  1.795000 6.340000 2.635000 ;
     LAYER mcon ;
-      RECT 2.665000 2.125000 2.835000 2.295000 ;
-      RECT 3.685000 2.125000 3.855000 2.295000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.665000  2.125000 2.835000 2.295000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.685000  2.125000 3.855000 2.295000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 2.605000 2.095000 2.895000 2.140000 ;
       RECT 2.605000 2.140000 3.915000 2.280000 ;
diff --git a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
index 74058d8..865ef12 100644
--- a/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
+++ b/cells/xnor2/sky130_fd_sc_hdll__xnor2_4.magic.lef
@@ -76,40 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 11.040000 0.085000 ;
-        RECT 2.600000  0.085000  2.770000 0.555000 ;
-        RECT 3.540000  0.085000  3.710000 0.555000 ;
-        RECT 4.430000  0.085000  4.700000 0.905000 ;
-        RECT 5.470000  0.085000  5.640000 0.555000 ;
-        RECT 6.410000  0.085000  6.580000 0.555000 ;
-        RECT 7.350000  0.085000  7.520000 0.555000 ;
-        RECT 8.290000  0.085000  8.460000 0.555000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -118,81 +84,111 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 2.635000 11.040000 2.805000 ;
-        RECT  0.680000 1.835000  0.930000 2.635000 ;
-        RECT  1.620000 2.175000  1.870000 2.635000 ;
-        RECT  2.560000 2.175000  2.810000 2.635000 ;
-        RECT  3.500000 2.175000  3.750000 2.635000 ;
-        RECT  4.960000 2.175000  5.210000 2.635000 ;
-        RECT  5.900000 2.175000  6.150000 2.635000 ;
-        RECT  9.240000 1.835000  9.490000 2.635000 ;
-        RECT 10.180000 1.835000 10.430000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.645000  1.910000 0.905000 ;
-      RECT 0.085000 0.905000  0.320000 1.445000 ;
-      RECT 0.085000 1.445000  1.400000 1.615000 ;
-      RECT 0.085000 1.615000  0.460000 2.465000 ;
-      RECT 0.170000 0.255000  2.380000 0.475000 ;
-      RECT 1.150000 1.615000  1.400000 1.785000 ;
-      RECT 1.150000 1.785000  4.220000 2.005000 ;
-      RECT 1.150000 2.005000  1.400000 2.465000 ;
-      RECT 2.090000 2.005000  2.340000 2.465000 ;
-      RECT 2.130000 0.475000  2.380000 0.725000 ;
-      RECT 2.130000 0.725000  4.260000 0.905000 ;
-      RECT 2.940000 0.255000  3.320000 0.725000 ;
-      RECT 3.030000 2.005000  3.280000 2.465000 ;
-      RECT 3.880000 0.255000  4.260000 0.725000 ;
-      RECT 3.970000 2.005000  4.220000 2.465000 ;
-      RECT 4.425000 1.785000  6.580000 2.005000 ;
-      RECT 4.425000 2.005000  4.740000 2.465000 ;
-      RECT 4.870000 0.255000  5.250000 0.725000 ;
-      RECT 4.870000 0.725000  8.170000 0.735000 ;
-      RECT 4.870000 0.735000  8.980000 0.905000 ;
-      RECT 5.430000 2.005000  5.680000 2.465000 ;
-      RECT 5.810000 0.255000  6.190000 0.725000 ;
-      RECT 6.370000 2.005000  6.580000 2.215000 ;
-      RECT 6.370000 2.215000  8.540000 2.465000 ;
-      RECT 6.490000 1.445000  8.560000 1.615000 ;
-      RECT 6.750000 0.255000  7.130000 0.725000 ;
-      RECT 7.690000 0.255000  8.070000 0.725000 ;
-      RECT 8.390000 1.075000 10.535000 1.275000 ;
-      RECT 8.390000 1.275000  8.560000 1.445000 ;
-      RECT 8.730000 0.305000 10.940000 0.475000 ;
-      RECT 8.730000 0.475000  8.980000 0.735000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.085000  0.645000  1.910000 0.905000 ;
+      RECT  0.085000  0.905000  0.320000 1.445000 ;
+      RECT  0.085000  1.445000  1.400000 1.615000 ;
+      RECT  0.085000  1.615000  0.460000 2.465000 ;
+      RECT  0.170000  0.255000  2.380000 0.475000 ;
+      RECT  0.680000  1.835000  0.930000 2.635000 ;
+      RECT  1.150000  1.615000  1.400000 1.785000 ;
+      RECT  1.150000  1.785000  4.220000 2.005000 ;
+      RECT  1.150000  2.005000  1.400000 2.465000 ;
+      RECT  1.620000  2.175000  1.870000 2.635000 ;
+      RECT  2.090000  2.005000  2.340000 2.465000 ;
+      RECT  2.130000  0.475000  2.380000 0.725000 ;
+      RECT  2.130000  0.725000  4.260000 0.905000 ;
+      RECT  2.560000  2.175000  2.810000 2.635000 ;
+      RECT  2.600000  0.085000  2.770000 0.555000 ;
+      RECT  2.940000  0.255000  3.320000 0.725000 ;
+      RECT  3.030000  2.005000  3.280000 2.465000 ;
+      RECT  3.500000  2.175000  3.750000 2.635000 ;
+      RECT  3.540000  0.085000  3.710000 0.555000 ;
+      RECT  3.880000  0.255000  4.260000 0.725000 ;
+      RECT  3.970000  2.005000  4.220000 2.465000 ;
+      RECT  4.425000  1.785000  6.580000 2.005000 ;
+      RECT  4.425000  2.005000  4.740000 2.465000 ;
+      RECT  4.430000  0.085000  4.700000 0.905000 ;
+      RECT  4.870000  0.255000  5.250000 0.725000 ;
+      RECT  4.870000  0.725000  8.170000 0.735000 ;
+      RECT  4.870000  0.735000  8.980000 0.905000 ;
+      RECT  4.960000  2.175000  5.210000 2.635000 ;
+      RECT  5.430000  2.005000  5.680000 2.465000 ;
+      RECT  5.470000  0.085000  5.640000 0.555000 ;
+      RECT  5.810000  0.255000  6.190000 0.725000 ;
+      RECT  5.900000  2.175000  6.150000 2.635000 ;
+      RECT  6.370000  2.005000  6.580000 2.215000 ;
+      RECT  6.370000  2.215000  8.540000 2.465000 ;
+      RECT  6.410000  0.085000  6.580000 0.555000 ;
+      RECT  6.490000  1.445000  8.560000 1.615000 ;
+      RECT  6.750000  0.255000  7.130000 0.725000 ;
+      RECT  7.350000  0.085000  7.520000 0.555000 ;
+      RECT  7.690000  0.255000  8.070000 0.725000 ;
+      RECT  8.290000  0.085000  8.460000 0.555000 ;
+      RECT  8.390000  1.075000 10.535000 1.275000 ;
+      RECT  8.390000  1.275000  8.560000 1.445000 ;
+      RECT  8.730000  0.305000 10.940000 0.475000 ;
+      RECT  8.730000  0.475000  8.980000 0.735000 ;
+      RECT  9.240000  1.835000  9.490000 2.635000 ;
+      RECT 10.180000  1.835000 10.430000 2.635000 ;
     LAYER mcon ;
-      RECT 1.165000 1.445000 1.335000 1.615000 ;
-      RECT 6.725000 1.445000 6.895000 1.615000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.165000  1.445000  1.335000 1.615000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  6.725000  1.445000  6.895000 1.615000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
     LAYER met1 ;
       RECT 1.055000 1.415000 1.395000 1.460000 ;
       RECT 1.055000 1.460000 7.005000 1.600000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
index 714a95d..1e183a1 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_1.magic.lef
@@ -76,32 +76,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.200000 0.085000 ;
-        RECT 0.515000  0.085000 0.815000 0.525000 ;
-        RECT 3.675000  0.085000 3.845000 0.865000 ;
-        RECT 8.050000  0.085000 8.510000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.200000 0.240000 ;
     END
@@ -110,103 +84,125 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.200000 2.805000 ;
-        RECT 0.535000 2.215000 0.920000 2.635000 ;
-        RECT 3.425000 2.235000 3.755000 2.635000 ;
-        RECT 7.915000 2.275000 8.595000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.200000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.515000 0.695000 1.205000 0.865000 ;
-      RECT 0.515000 0.865000 0.755000 1.330000 ;
-      RECT 0.535000 1.330000 0.755000 1.875000 ;
-      RECT 0.535000 1.875000 1.320000 2.045000 ;
-      RECT 0.985000 0.255000 2.655000 0.425000 ;
-      RECT 0.985000 0.425000 1.205000 0.695000 ;
-      RECT 0.985000 1.535000 2.670000 1.705000 ;
-      RECT 1.100000 2.045000 1.320000 2.235000 ;
-      RECT 1.100000 2.235000 2.670000 2.405000 ;
-      RECT 1.375000 0.595000 1.545000 1.535000 ;
-      RECT 1.660000 1.895000 4.360000 2.065000 ;
-      RECT 1.845000 0.625000 3.165000 0.795000 ;
-      RECT 1.845000 0.795000 2.225000 0.905000 ;
-      RECT 2.170000 0.425000 2.655000 0.455000 ;
-      RECT 2.500000 0.995000 2.825000 1.325000 ;
-      RECT 2.500000 1.325000 2.670000 1.535000 ;
-      RECT 2.875000 0.285000 3.505000 0.455000 ;
-      RECT 2.890000 1.525000 3.275000 1.695000 ;
-      RECT 2.995000 0.795000 3.165000 1.375000 ;
-      RECT 2.995000 1.375000 3.275000 1.525000 ;
-      RECT 3.335000 0.455000 3.505000 1.035000 ;
-      RECT 3.335000 1.035000 3.615000 1.205000 ;
-      RECT 3.445000 1.205000 3.615000 1.895000 ;
-      RECT 3.845000 1.445000 4.365000 1.715000 ;
-      RECT 4.075000 0.415000 4.365000 1.445000 ;
-      RECT 4.190000 2.065000 4.360000 2.275000 ;
-      RECT 4.190000 2.275000 7.485000 2.445000 ;
-      RECT 4.545000 0.265000 4.955000 0.485000 ;
-      RECT 4.545000 0.485000 4.755000 0.595000 ;
-      RECT 4.545000 0.595000 4.715000 2.105000 ;
-      RECT 4.885000 0.720000 5.345000 0.825000 ;
-      RECT 4.885000 0.825000 5.145000 0.890000 ;
-      RECT 4.885000 0.890000 5.055000 2.275000 ;
-      RECT 4.925000 0.655000 5.345000 0.720000 ;
-      RECT 5.175000 0.320000 5.345000 0.655000 ;
-      RECT 5.285000 1.445000 6.115000 1.615000 ;
-      RECT 5.285000 1.615000 5.700000 2.045000 ;
-      RECT 5.300000 0.995000 5.725000 1.270000 ;
-      RECT 5.515000 0.630000 5.725000 0.995000 ;
-      RECT 5.945000 0.255000 7.140000 0.425000 ;
-      RECT 5.945000 0.425000 6.115000 1.445000 ;
-      RECT 6.285000 0.595000 6.455000 1.935000 ;
-      RECT 6.285000 1.935000 9.110000 2.105000 ;
-      RECT 6.625000 0.425000 7.140000 0.465000 ;
-      RECT 7.015000 0.730000 7.220000 0.945000 ;
-      RECT 7.015000 0.945000 7.325000 1.275000 ;
-      RECT 7.475000 1.495000 8.660000 1.705000 ;
-      RECT 7.515000 0.295000 7.805000 0.735000 ;
-      RECT 7.515000 0.735000 8.660000 0.750000 ;
-      RECT 7.555000 0.750000 8.660000 0.905000 ;
-      RECT 8.490000 0.905000 8.660000 0.995000 ;
-      RECT 8.490000 0.995000 8.770000 1.325000 ;
-      RECT 8.490000 1.325000 8.660000 1.495000 ;
-      RECT 8.575000 1.875000 9.110000 1.935000 ;
-      RECT 8.810000 0.255000 9.110000 0.585000 ;
-      RECT 8.815000 2.105000 9.110000 2.465000 ;
-      RECT 8.940000 0.585000 9.110000 1.875000 ;
+      RECT 0.000000 -0.085000 9.200000 0.085000 ;
+      RECT 0.000000  2.635000 9.200000 2.805000 ;
+      RECT 0.515000  0.085000 0.815000 0.525000 ;
+      RECT 0.515000  0.695000 1.205000 0.865000 ;
+      RECT 0.515000  0.865000 0.755000 1.330000 ;
+      RECT 0.535000  1.330000 0.755000 1.875000 ;
+      RECT 0.535000  1.875000 1.320000 2.045000 ;
+      RECT 0.535000  2.215000 0.920000 2.635000 ;
+      RECT 0.985000  0.255000 2.655000 0.425000 ;
+      RECT 0.985000  0.425000 1.205000 0.695000 ;
+      RECT 0.985000  1.535000 2.670000 1.705000 ;
+      RECT 1.100000  2.045000 1.320000 2.235000 ;
+      RECT 1.100000  2.235000 2.670000 2.405000 ;
+      RECT 1.375000  0.595000 1.545000 1.535000 ;
+      RECT 1.660000  1.895000 4.360000 2.065000 ;
+      RECT 1.845000  0.625000 3.165000 0.795000 ;
+      RECT 1.845000  0.795000 2.225000 0.905000 ;
+      RECT 2.170000  0.425000 2.655000 0.455000 ;
+      RECT 2.500000  0.995000 2.825000 1.325000 ;
+      RECT 2.500000  1.325000 2.670000 1.535000 ;
+      RECT 2.875000  0.285000 3.505000 0.455000 ;
+      RECT 2.890000  1.525000 3.275000 1.695000 ;
+      RECT 2.995000  0.795000 3.165000 1.375000 ;
+      RECT 2.995000  1.375000 3.275000 1.525000 ;
+      RECT 3.335000  0.455000 3.505000 1.035000 ;
+      RECT 3.335000  1.035000 3.615000 1.205000 ;
+      RECT 3.425000  2.235000 3.755000 2.635000 ;
+      RECT 3.445000  1.205000 3.615000 1.895000 ;
+      RECT 3.675000  0.085000 3.845000 0.865000 ;
+      RECT 3.845000  1.445000 4.365000 1.715000 ;
+      RECT 4.075000  0.415000 4.365000 1.445000 ;
+      RECT 4.190000  2.065000 4.360000 2.275000 ;
+      RECT 4.190000  2.275000 7.485000 2.445000 ;
+      RECT 4.545000  0.265000 4.955000 0.485000 ;
+      RECT 4.545000  0.485000 4.755000 0.595000 ;
+      RECT 4.545000  0.595000 4.715000 2.105000 ;
+      RECT 4.885000  0.720000 5.345000 0.825000 ;
+      RECT 4.885000  0.825000 5.145000 0.890000 ;
+      RECT 4.885000  0.890000 5.055000 2.275000 ;
+      RECT 4.925000  0.655000 5.345000 0.720000 ;
+      RECT 5.175000  0.320000 5.345000 0.655000 ;
+      RECT 5.285000  1.445000 6.115000 1.615000 ;
+      RECT 5.285000  1.615000 5.700000 2.045000 ;
+      RECT 5.300000  0.995000 5.725000 1.270000 ;
+      RECT 5.515000  0.630000 5.725000 0.995000 ;
+      RECT 5.945000  0.255000 7.140000 0.425000 ;
+      RECT 5.945000  0.425000 6.115000 1.445000 ;
+      RECT 6.285000  0.595000 6.455000 1.935000 ;
+      RECT 6.285000  1.935000 9.110000 2.105000 ;
+      RECT 6.625000  0.425000 7.140000 0.465000 ;
+      RECT 7.015000  0.730000 7.220000 0.945000 ;
+      RECT 7.015000  0.945000 7.325000 1.275000 ;
+      RECT 7.475000  1.495000 8.660000 1.705000 ;
+      RECT 7.515000  0.295000 7.805000 0.735000 ;
+      RECT 7.515000  0.735000 8.660000 0.750000 ;
+      RECT 7.555000  0.750000 8.660000 0.905000 ;
+      RECT 7.915000  2.275000 8.595000 2.635000 ;
+      RECT 8.050000  0.085000 8.510000 0.565000 ;
+      RECT 8.490000  0.905000 8.660000 0.995000 ;
+      RECT 8.490000  0.995000 8.770000 1.325000 ;
+      RECT 8.490000  1.325000 8.660000 1.495000 ;
+      RECT 8.575000  1.875000 9.110000 1.935000 ;
+      RECT 8.810000  0.255000 9.110000 0.585000 ;
+      RECT 8.815000  2.105000 9.110000 2.465000 ;
+      RECT 8.940000  0.585000 9.110000 1.875000 ;
     LAYER mcon ;
-      RECT 3.105000 1.445000 3.275000 1.615000 ;
-      RECT 4.075000 0.765000 4.245000 0.935000 ;
-      RECT 4.585000 0.425000 4.755000 0.595000 ;
-      RECT 5.555000 0.765000 5.725000 0.935000 ;
-      RECT 5.555000 1.445000 5.725000 1.615000 ;
-      RECT 7.035000 0.765000 7.205000 0.935000 ;
-      RECT 7.545000 0.425000 7.715000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.105000  1.445000 3.275000 1.615000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.075000  0.765000 4.245000 0.935000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.585000  0.425000 4.755000 0.595000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.555000  0.765000 5.725000 0.935000 ;
+      RECT 5.555000  1.445000 5.725000 1.615000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.035000  0.765000 7.205000 0.935000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.545000  0.425000 7.715000 0.595000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
     LAYER met1 ;
       RECT 3.045000 1.415000 3.335000 1.460000 ;
       RECT 3.045000 1.460000 5.785000 1.600000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
index 7f42753..2e6d2eb 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_2.magic.lef
@@ -75,34 +75,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.085000  0.085000 0.375000 0.735000 ;
-        RECT 1.035000  0.085000 1.325000 0.525000 ;
-        RECT 4.185000  0.085000 4.355000 0.865000 ;
-        RECT 8.535000  0.085000 8.705000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -111,104 +83,128 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.085000 1.490000 0.375000 2.635000 ;
-        RECT 1.045000 2.215000 1.430000 2.635000 ;
-        RECT 3.935000 2.235000 4.265000 2.635000 ;
-        RECT 8.455000 2.275000 8.790000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.045000 0.695000 1.715000 0.865000 ;
-      RECT 1.045000 0.865000 1.265000 1.875000 ;
-      RECT 1.045000 1.875000 1.830000 2.045000 ;
-      RECT 1.495000 0.255000 3.165000 0.425000 ;
-      RECT 1.495000 0.425000 1.715000 0.695000 ;
-      RECT 1.495000 1.535000 3.180000 1.705000 ;
-      RECT 1.610000 2.045000 1.830000 2.235000 ;
-      RECT 1.610000 2.235000 3.180000 2.405000 ;
-      RECT 1.885000 0.595000 2.055000 1.535000 ;
-      RECT 2.170000 1.895000 4.870000 2.065000 ;
-      RECT 2.355000 0.625000 3.675000 0.795000 ;
-      RECT 2.355000 0.795000 2.735000 0.905000 ;
-      RECT 2.680000 0.425000 3.165000 0.455000 ;
-      RECT 3.010000 0.995000 3.335000 1.325000 ;
-      RECT 3.010000 1.325000 3.180000 1.535000 ;
-      RECT 3.385000 0.285000 4.015000 0.455000 ;
-      RECT 3.400000 1.525000 3.785000 1.695000 ;
-      RECT 3.505000 0.795000 3.675000 1.375000 ;
-      RECT 3.505000 1.375000 3.785000 1.525000 ;
-      RECT 3.845000 0.455000 4.015000 1.035000 ;
-      RECT 3.845000 1.035000 4.125000 1.205000 ;
-      RECT 3.955000 1.205000 4.125000 1.895000 ;
-      RECT 4.355000 1.445000 4.875000 1.715000 ;
-      RECT 4.585000 0.415000 4.875000 1.445000 ;
-      RECT 4.700000 2.065000 4.870000 2.275000 ;
-      RECT 4.700000 2.275000 7.995000 2.445000 ;
-      RECT 5.055000 0.265000 5.465000 0.485000 ;
-      RECT 5.055000 0.485000 5.265000 0.595000 ;
-      RECT 5.055000 0.595000 5.225000 2.105000 ;
-      RECT 5.395000 0.720000 5.855000 0.825000 ;
-      RECT 5.395000 0.825000 5.655000 0.890000 ;
-      RECT 5.395000 0.890000 5.565000 2.275000 ;
-      RECT 5.435000 0.655000 5.855000 0.720000 ;
-      RECT 5.685000 0.320000 5.855000 0.655000 ;
-      RECT 5.795000 1.445000 6.625000 1.615000 ;
-      RECT 5.795000 1.615000 6.210000 2.045000 ;
-      RECT 5.810000 0.995000 6.235000 1.270000 ;
-      RECT 6.025000 0.630000 6.235000 0.995000 ;
-      RECT 6.455000 0.255000 7.650000 0.425000 ;
-      RECT 6.455000 0.425000 6.625000 1.445000 ;
-      RECT 6.795000 0.595000 6.965000 1.935000 ;
-      RECT 6.795000 1.935000 9.485000 2.105000 ;
-      RECT 7.135000 0.425000 7.650000 0.465000 ;
-      RECT 7.525000 0.730000 7.730000 0.945000 ;
-      RECT 7.525000 0.945000 7.835000 1.275000 ;
-      RECT 7.985000 1.495000 9.035000 1.705000 ;
-      RECT 8.025000 0.295000 8.315000 0.735000 ;
-      RECT 8.025000 0.735000 9.035000 0.750000 ;
-      RECT 8.065000 0.750000 9.035000 0.905000 ;
-      RECT 8.865000 0.905000 9.035000 0.995000 ;
-      RECT 8.865000 0.995000 9.145000 1.325000 ;
-      RECT 8.865000 1.325000 9.035000 1.495000 ;
-      RECT 8.950000 1.875000 9.485000 1.935000 ;
-      RECT 9.185000 0.255000 9.485000 0.585000 ;
-      RECT 9.190000 2.105000 9.485000 2.465000 ;
-      RECT 9.315000 0.585000 9.485000 1.875000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.085000  0.085000 0.375000 0.735000 ;
+      RECT 0.085000  1.490000 0.375000 2.635000 ;
+      RECT 1.035000  0.085000 1.325000 0.525000 ;
+      RECT 1.045000  0.695000 1.715000 0.865000 ;
+      RECT 1.045000  0.865000 1.265000 1.875000 ;
+      RECT 1.045000  1.875000 1.830000 2.045000 ;
+      RECT 1.045000  2.215000 1.430000 2.635000 ;
+      RECT 1.495000  0.255000 3.165000 0.425000 ;
+      RECT 1.495000  0.425000 1.715000 0.695000 ;
+      RECT 1.495000  1.535000 3.180000 1.705000 ;
+      RECT 1.610000  2.045000 1.830000 2.235000 ;
+      RECT 1.610000  2.235000 3.180000 2.405000 ;
+      RECT 1.885000  0.595000 2.055000 1.535000 ;
+      RECT 2.170000  1.895000 4.870000 2.065000 ;
+      RECT 2.355000  0.625000 3.675000 0.795000 ;
+      RECT 2.355000  0.795000 2.735000 0.905000 ;
+      RECT 2.680000  0.425000 3.165000 0.455000 ;
+      RECT 3.010000  0.995000 3.335000 1.325000 ;
+      RECT 3.010000  1.325000 3.180000 1.535000 ;
+      RECT 3.385000  0.285000 4.015000 0.455000 ;
+      RECT 3.400000  1.525000 3.785000 1.695000 ;
+      RECT 3.505000  0.795000 3.675000 1.375000 ;
+      RECT 3.505000  1.375000 3.785000 1.525000 ;
+      RECT 3.845000  0.455000 4.015000 1.035000 ;
+      RECT 3.845000  1.035000 4.125000 1.205000 ;
+      RECT 3.935000  2.235000 4.265000 2.635000 ;
+      RECT 3.955000  1.205000 4.125000 1.895000 ;
+      RECT 4.185000  0.085000 4.355000 0.865000 ;
+      RECT 4.355000  1.445000 4.875000 1.715000 ;
+      RECT 4.585000  0.415000 4.875000 1.445000 ;
+      RECT 4.700000  2.065000 4.870000 2.275000 ;
+      RECT 4.700000  2.275000 7.995000 2.445000 ;
+      RECT 5.055000  0.265000 5.465000 0.485000 ;
+      RECT 5.055000  0.485000 5.265000 0.595000 ;
+      RECT 5.055000  0.595000 5.225000 2.105000 ;
+      RECT 5.395000  0.720000 5.855000 0.825000 ;
+      RECT 5.395000  0.825000 5.655000 0.890000 ;
+      RECT 5.395000  0.890000 5.565000 2.275000 ;
+      RECT 5.435000  0.655000 5.855000 0.720000 ;
+      RECT 5.685000  0.320000 5.855000 0.655000 ;
+      RECT 5.795000  1.445000 6.625000 1.615000 ;
+      RECT 5.795000  1.615000 6.210000 2.045000 ;
+      RECT 5.810000  0.995000 6.235000 1.270000 ;
+      RECT 6.025000  0.630000 6.235000 0.995000 ;
+      RECT 6.455000  0.255000 7.650000 0.425000 ;
+      RECT 6.455000  0.425000 6.625000 1.445000 ;
+      RECT 6.795000  0.595000 6.965000 1.935000 ;
+      RECT 6.795000  1.935000 9.485000 2.105000 ;
+      RECT 7.135000  0.425000 7.650000 0.465000 ;
+      RECT 7.525000  0.730000 7.730000 0.945000 ;
+      RECT 7.525000  0.945000 7.835000 1.275000 ;
+      RECT 7.985000  1.495000 9.035000 1.705000 ;
+      RECT 8.025000  0.295000 8.315000 0.735000 ;
+      RECT 8.025000  0.735000 9.035000 0.750000 ;
+      RECT 8.065000  0.750000 9.035000 0.905000 ;
+      RECT 8.455000  2.275000 8.790000 2.635000 ;
+      RECT 8.535000  0.085000 8.705000 0.565000 ;
+      RECT 8.865000  0.905000 9.035000 0.995000 ;
+      RECT 8.865000  0.995000 9.145000 1.325000 ;
+      RECT 8.865000  1.325000 9.035000 1.495000 ;
+      RECT 8.950000  1.875000 9.485000 1.935000 ;
+      RECT 9.185000  0.255000 9.485000 0.585000 ;
+      RECT 9.190000  2.105000 9.485000 2.465000 ;
+      RECT 9.315000  0.585000 9.485000 1.875000 ;
     LAYER mcon ;
-      RECT 3.615000 1.445000 3.785000 1.615000 ;
-      RECT 4.585000 0.765000 4.755000 0.935000 ;
-      RECT 5.095000 0.425000 5.265000 0.595000 ;
-      RECT 6.065000 0.765000 6.235000 0.935000 ;
-      RECT 6.065000 1.445000 6.235000 1.615000 ;
-      RECT 7.545000 0.765000 7.715000 0.935000 ;
-      RECT 8.055000 0.425000 8.225000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.615000  1.445000 3.785000 1.615000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.585000  0.765000 4.755000 0.935000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.095000  0.425000 5.265000 0.595000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.065000  0.765000 6.235000 0.935000 ;
+      RECT 6.065000  1.445000 6.235000 1.615000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.545000  0.765000 7.715000 0.935000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.055000  0.425000 8.225000 0.595000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
     LAYER met1 ;
       RECT 3.555000 1.415000 3.845000 1.460000 ;
       RECT 3.555000 1.460000 6.295000 1.600000 ;
diff --git a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
index ea751d5..50c4c84 100644
--- a/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
+++ b/cells/xnor3/sky130_fd_sc_hdll__xnor3_4.magic.lef
@@ -81,37 +81,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.580000 0.085000 ;
-        RECT 0.285000  0.085000  0.455000 0.735000 ;
-        RECT 1.225000  0.085000  1.395000 0.735000 ;
-        RECT 2.045000  0.085000  2.345000 0.525000 ;
-        RECT 5.205000  0.085000  5.375000 0.865000 ;
-        RECT 9.555000  0.085000  9.725000 0.565000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
@@ -120,106 +89,133 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.580000 2.805000 ;
-        RECT 0.285000 1.490000  0.455000 2.635000 ;
-        RECT 1.225000 1.495000  1.395000 2.635000 ;
-        RECT 2.065000 2.215000  2.450000 2.635000 ;
-        RECT 4.955000 2.235000  5.285000 2.635000 ;
-        RECT 9.425000 2.275000  9.810000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  2.030000 0.995000  2.285000 1.325000 ;
-      RECT  2.060000 0.695000  2.735000 0.865000 ;
-      RECT  2.060000 0.865000  2.285000 0.995000 ;
-      RECT  2.065000 1.325000  2.285000 1.875000 ;
-      RECT  2.065000 1.875000  2.850000 2.045000 ;
-      RECT  2.515000 0.255000  4.185000 0.425000 ;
-      RECT  2.515000 0.425000  2.735000 0.695000 ;
-      RECT  2.515000 1.535000  4.200000 1.705000 ;
-      RECT  2.630000 2.045000  2.850000 2.235000 ;
-      RECT  2.630000 2.235000  4.200000 2.405000 ;
-      RECT  2.905000 0.595000  3.075000 1.535000 ;
-      RECT  3.190000 1.895000  5.890000 2.065000 ;
-      RECT  3.375000 0.625000  4.695000 0.795000 ;
-      RECT  3.375000 0.795000  3.755000 0.905000 ;
-      RECT  3.700000 0.425000  4.185000 0.455000 ;
-      RECT  4.030000 0.995000  4.355000 1.325000 ;
-      RECT  4.030000 1.325000  4.200000 1.535000 ;
-      RECT  4.405000 0.285000  5.035000 0.455000 ;
-      RECT  4.420000 1.525000  4.805000 1.695000 ;
-      RECT  4.525000 0.795000  4.695000 1.375000 ;
-      RECT  4.525000 1.375000  4.805000 1.525000 ;
-      RECT  4.865000 0.455000  5.035000 1.035000 ;
-      RECT  4.865000 1.035000  5.145000 1.205000 ;
-      RECT  4.975000 1.205000  5.145000 1.895000 ;
-      RECT  5.375000 1.445000  5.895000 1.715000 ;
-      RECT  5.605000 0.415000  5.895000 1.445000 ;
-      RECT  5.720000 2.065000  5.890000 2.275000 ;
-      RECT  5.720000 2.275000  9.015000 2.445000 ;
-      RECT  6.075000 0.265000  6.520000 0.485000 ;
-      RECT  6.075000 0.485000  6.245000 2.105000 ;
-      RECT  6.415000 0.655000  6.875000 0.825000 ;
-      RECT  6.415000 0.825000  6.585000 2.275000 ;
-      RECT  6.705000 0.320000  6.875000 0.655000 ;
-      RECT  6.815000 1.445000  7.645000 1.615000 ;
-      RECT  6.815000 1.615000  7.230000 2.045000 ;
-      RECT  6.830000 0.995000  7.255000 1.270000 ;
-      RECT  7.045000 0.630000  7.255000 0.995000 ;
-      RECT  7.475000 0.255000  8.670000 0.425000 ;
-      RECT  7.475000 0.425000  7.645000 1.445000 ;
-      RECT  7.815000 0.595000  7.985000 1.935000 ;
-      RECT  7.815000 1.935000 10.325000 2.105000 ;
-      RECT  8.155000 0.425000  8.670000 0.465000 ;
-      RECT  8.545000 0.730000  8.750000 0.945000 ;
-      RECT  8.545000 0.945000  8.855000 1.275000 ;
-      RECT  9.005000 1.495000  9.875000 1.705000 ;
-      RECT  9.045000 0.295000  9.335000 0.735000 ;
-      RECT  9.045000 0.735000  9.875000 0.750000 ;
-      RECT  9.085000 0.750000  9.875000 0.905000 ;
-      RECT  9.705000 0.905000  9.875000 0.995000 ;
-      RECT  9.705000 0.995000  9.985000 1.325000 ;
-      RECT  9.705000 1.325000  9.875000 1.495000 ;
-      RECT  9.790000 1.875000 10.325000 1.935000 ;
-      RECT 10.025000 0.255000 10.325000 0.585000 ;
-      RECT 10.030000 2.105000 10.325000 2.465000 ;
-      RECT 10.155000 0.585000 10.325000 1.875000 ;
+      RECT  0.000000 -0.085000 10.580000 0.085000 ;
+      RECT  0.000000  2.635000 10.580000 2.805000 ;
+      RECT  0.285000  0.085000  0.455000 0.735000 ;
+      RECT  0.285000  1.490000  0.455000 2.635000 ;
+      RECT  1.225000  0.085000  1.395000 0.735000 ;
+      RECT  1.225000  1.495000  1.395000 2.635000 ;
+      RECT  2.030000  0.995000  2.285000 1.325000 ;
+      RECT  2.045000  0.085000  2.345000 0.525000 ;
+      RECT  2.060000  0.695000  2.735000 0.865000 ;
+      RECT  2.060000  0.865000  2.285000 0.995000 ;
+      RECT  2.065000  1.325000  2.285000 1.875000 ;
+      RECT  2.065000  1.875000  2.850000 2.045000 ;
+      RECT  2.065000  2.215000  2.450000 2.635000 ;
+      RECT  2.515000  0.255000  4.185000 0.425000 ;
+      RECT  2.515000  0.425000  2.735000 0.695000 ;
+      RECT  2.515000  1.535000  4.200000 1.705000 ;
+      RECT  2.630000  2.045000  2.850000 2.235000 ;
+      RECT  2.630000  2.235000  4.200000 2.405000 ;
+      RECT  2.905000  0.595000  3.075000 1.535000 ;
+      RECT  3.190000  1.895000  5.890000 2.065000 ;
+      RECT  3.375000  0.625000  4.695000 0.795000 ;
+      RECT  3.375000  0.795000  3.755000 0.905000 ;
+      RECT  3.700000  0.425000  4.185000 0.455000 ;
+      RECT  4.030000  0.995000  4.355000 1.325000 ;
+      RECT  4.030000  1.325000  4.200000 1.535000 ;
+      RECT  4.405000  0.285000  5.035000 0.455000 ;
+      RECT  4.420000  1.525000  4.805000 1.695000 ;
+      RECT  4.525000  0.795000  4.695000 1.375000 ;
+      RECT  4.525000  1.375000  4.805000 1.525000 ;
+      RECT  4.865000  0.455000  5.035000 1.035000 ;
+      RECT  4.865000  1.035000  5.145000 1.205000 ;
+      RECT  4.955000  2.235000  5.285000 2.635000 ;
+      RECT  4.975000  1.205000  5.145000 1.895000 ;
+      RECT  5.205000  0.085000  5.375000 0.865000 ;
+      RECT  5.375000  1.445000  5.895000 1.715000 ;
+      RECT  5.605000  0.415000  5.895000 1.445000 ;
+      RECT  5.720000  2.065000  5.890000 2.275000 ;
+      RECT  5.720000  2.275000  9.015000 2.445000 ;
+      RECT  6.075000  0.265000  6.520000 0.485000 ;
+      RECT  6.075000  0.485000  6.245000 2.105000 ;
+      RECT  6.415000  0.655000  6.875000 0.825000 ;
+      RECT  6.415000  0.825000  6.585000 2.275000 ;
+      RECT  6.705000  0.320000  6.875000 0.655000 ;
+      RECT  6.815000  1.445000  7.645000 1.615000 ;
+      RECT  6.815000  1.615000  7.230000 2.045000 ;
+      RECT  6.830000  0.995000  7.255000 1.270000 ;
+      RECT  7.045000  0.630000  7.255000 0.995000 ;
+      RECT  7.475000  0.255000  8.670000 0.425000 ;
+      RECT  7.475000  0.425000  7.645000 1.445000 ;
+      RECT  7.815000  0.595000  7.985000 1.935000 ;
+      RECT  7.815000  1.935000 10.325000 2.105000 ;
+      RECT  8.155000  0.425000  8.670000 0.465000 ;
+      RECT  8.545000  0.730000  8.750000 0.945000 ;
+      RECT  8.545000  0.945000  8.855000 1.275000 ;
+      RECT  9.005000  1.495000  9.875000 1.705000 ;
+      RECT  9.045000  0.295000  9.335000 0.735000 ;
+      RECT  9.045000  0.735000  9.875000 0.750000 ;
+      RECT  9.085000  0.750000  9.875000 0.905000 ;
+      RECT  9.425000  2.275000  9.810000 2.635000 ;
+      RECT  9.555000  0.085000  9.725000 0.565000 ;
+      RECT  9.705000  0.905000  9.875000 0.995000 ;
+      RECT  9.705000  0.995000  9.985000 1.325000 ;
+      RECT  9.705000  1.325000  9.875000 1.495000 ;
+      RECT  9.790000  1.875000 10.325000 1.935000 ;
+      RECT 10.025000  0.255000 10.325000 0.585000 ;
+      RECT 10.030000  2.105000 10.325000 2.465000 ;
+      RECT 10.155000  0.585000 10.325000 1.875000 ;
     LAYER mcon ;
-      RECT 4.635000 1.445000 4.805000 1.615000 ;
-      RECT 5.605000 0.765000 5.775000 0.935000 ;
-      RECT 6.075000 0.425000 6.245000 0.595000 ;
-      RECT 7.085000 0.765000 7.255000 0.935000 ;
-      RECT 7.085000 1.445000 7.255000 1.615000 ;
-      RECT 8.565000 0.765000 8.735000 0.935000 ;
-      RECT 9.075000 0.425000 9.245000 0.595000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.635000  1.445000  4.805000 1.615000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.605000  0.765000  5.775000 0.935000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  6.075000  0.425000  6.245000 0.595000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.085000  0.765000  7.255000 0.935000 ;
+      RECT  7.085000  1.445000  7.255000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.565000  0.765000  8.735000 0.935000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.075000  0.425000  9.245000 0.595000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
     LAYER met1 ;
       RECT 4.575000 1.415000 4.865000 1.460000 ;
       RECT 4.575000 1.460000 7.315000 1.600000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
index 3c82ed0..cd59a63 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_1.magic.lef
@@ -71,20 +71,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 3.680000 0.085000 ;
-        RECT 0.135000  0.085000 0.465000 0.475000 ;
-        RECT 1.035000  0.085000 1.415000 0.475000 ;
-        RECT 3.255000  0.085000 3.545000 0.920000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 3.680000 0.240000 ;
     END
@@ -93,33 +79,44 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 3.680000 2.805000 ;
-        RECT 1.165000 1.785000 1.335000 2.635000 ;
-        RECT 2.115000 2.125000 2.285000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 3.680000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.085000 0.655000 2.745000 0.825000 ;
-      RECT 0.085000 0.825000 0.255000 1.785000 ;
-      RECT 0.085000 1.785000 0.465000 2.465000 ;
-      RECT 0.685000 0.335000 0.855000 0.655000 ;
-      RECT 1.505000 1.785000 2.855000 1.955000 ;
-      RECT 1.505000 1.955000 1.885000 2.465000 ;
-      RECT 2.455000 1.955000 2.855000 2.465000 ;
-      RECT 2.515000 0.825000 2.745000 1.325000 ;
+      RECT 0.000000 -0.085000 3.680000 0.085000 ;
+      RECT 0.000000  2.635000 3.680000 2.805000 ;
+      RECT 0.085000  0.655000 2.745000 0.825000 ;
+      RECT 0.085000  0.825000 0.255000 1.785000 ;
+      RECT 0.085000  1.785000 0.465000 2.465000 ;
+      RECT 0.135000  0.085000 0.465000 0.475000 ;
+      RECT 0.685000  0.335000 0.855000 0.655000 ;
+      RECT 1.035000  0.085000 1.415000 0.475000 ;
+      RECT 1.165000  1.785000 1.335000 2.635000 ;
+      RECT 1.505000  1.785000 2.855000 1.955000 ;
+      RECT 1.505000  1.955000 1.885000 2.465000 ;
+      RECT 2.115000  2.125000 2.285000 2.635000 ;
+      RECT 2.455000  1.955000 2.855000 2.465000 ;
+      RECT 2.515000  0.825000 2.745000 1.325000 ;
+      RECT 3.255000  0.085000 3.545000 0.920000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
   END
   PROPERTY maskLayoutSubType "abstract" ;
   PROPERTY prCellType "standard" ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
index 3cbaa79..27e4b10 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_2.magic.lef
@@ -52,12 +52,6 @@
     DIRECTION INPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT 1.145000 1.075000 1.690000 1.275000 ;
-        RECT 3.720000 1.075000 4.490000 1.275000 ;
-      LAYER mcon ;
-        RECT 1.165000 1.105000 1.335000 1.275000 ;
-        RECT 3.825000 1.105000 3.995000 1.275000 ;
       LAYER met1 ;
         RECT 1.105000 1.075000 1.395000 1.120000 ;
         RECT 1.105000 1.120000 4.055000 1.260000 ;
@@ -84,29 +78,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 6.440000 0.085000 ;
-        RECT 0.190000  0.085000 0.360000 0.555000 ;
-        RECT 1.130000  0.085000 1.300000 0.555000 ;
-        RECT 2.070000  0.085000 2.240000 0.555000 ;
-        RECT 3.060000  0.085000 3.230000 0.555000 ;
-        RECT 5.045000  0.085000 5.215000 0.555000 ;
-        RECT 5.985000  0.085000 6.155000 0.555000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 6.440000 0.240000 ;
     END
@@ -115,59 +86,83 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 6.440000 2.805000 ;
-        RECT 0.620000 2.135000 0.870000 2.635000 ;
-        RECT 3.020000 2.135000 3.270000 2.635000 ;
-        RECT 3.960000 2.135000 4.265000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 6.440000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.120000 0.725000 1.850000 0.905000 ;
-      RECT 0.120000 0.905000 0.290000 1.785000 ;
-      RECT 0.120000 1.785000 2.420000 1.955000 ;
-      RECT 0.120000 2.135000 0.400000 2.465000 ;
-      RECT 0.145000 2.125000 0.315000 2.135000 ;
-      RECT 0.530000 0.255000 0.910000 0.725000 ;
-      RECT 1.090000 2.135000 1.340000 2.295000 ;
-      RECT 1.090000 2.295000 2.280000 2.465000 ;
-      RECT 1.165000 2.125000 1.335000 2.135000 ;
-      RECT 1.470000 0.255000 1.850000 0.725000 ;
-      RECT 1.560000 1.955000 1.810000 2.125000 ;
-      RECT 2.030000 2.135000 2.280000 2.295000 ;
-      RECT 2.250000 1.445000 5.185000 1.615000 ;
-      RECT 2.250000 1.615000 2.420000 1.785000 ;
-      RECT 2.485000 2.125000 2.800000 2.465000 ;
-      RECT 2.510000 0.255000 2.840000 0.725000 ;
-      RECT 2.510000 0.725000 3.700000 0.905000 ;
-      RECT 2.590000 1.785000 5.255000 1.955000 ;
-      RECT 2.590000 1.955000 2.800000 2.125000 ;
-      RECT 3.400000 0.255000 4.780000 0.475000 ;
-      RECT 3.400000 0.475000 3.700000 0.725000 ;
-      RECT 3.490000 1.955000 3.740000 2.465000 ;
-      RECT 4.485000 1.955000 5.255000 2.295000 ;
-      RECT 4.485000 2.295000 6.195000 2.465000 ;
-      RECT 5.015000 1.075000 5.725000 1.245000 ;
-      RECT 5.015000 1.245000 5.185000 1.445000 ;
-      RECT 5.945000 1.795000 6.195000 2.295000 ;
+      RECT 0.000000 -0.085000 6.440000 0.085000 ;
+      RECT 0.000000  2.635000 6.440000 2.805000 ;
+      RECT 0.120000  0.725000 1.850000 0.905000 ;
+      RECT 0.120000  0.905000 0.290000 1.785000 ;
+      RECT 0.120000  1.785000 2.420000 1.955000 ;
+      RECT 0.120000  2.135000 0.400000 2.465000 ;
+      RECT 0.145000  2.125000 0.315000 2.135000 ;
+      RECT 0.190000  0.085000 0.360000 0.555000 ;
+      RECT 0.530000  0.255000 0.910000 0.725000 ;
+      RECT 0.620000  2.135000 0.870000 2.635000 ;
+      RECT 1.090000  2.135000 1.340000 2.295000 ;
+      RECT 1.090000  2.295000 2.280000 2.465000 ;
+      RECT 1.130000  0.085000 1.300000 0.555000 ;
+      RECT 1.145000  1.075000 1.690000 1.275000 ;
+      RECT 1.165000  2.125000 1.335000 2.135000 ;
+      RECT 1.470000  0.255000 1.850000 0.725000 ;
+      RECT 1.560000  1.955000 1.810000 2.125000 ;
+      RECT 2.030000  2.135000 2.280000 2.295000 ;
+      RECT 2.070000  0.085000 2.240000 0.555000 ;
+      RECT 2.250000  1.445000 5.185000 1.615000 ;
+      RECT 2.250000  1.615000 2.420000 1.785000 ;
+      RECT 2.485000  2.125000 2.800000 2.465000 ;
+      RECT 2.510000  0.255000 2.840000 0.725000 ;
+      RECT 2.510000  0.725000 3.700000 0.905000 ;
+      RECT 2.590000  1.785000 5.255000 1.955000 ;
+      RECT 2.590000  1.955000 2.800000 2.125000 ;
+      RECT 3.020000  2.135000 3.270000 2.635000 ;
+      RECT 3.060000  0.085000 3.230000 0.555000 ;
+      RECT 3.400000  0.255000 4.780000 0.475000 ;
+      RECT 3.400000  0.475000 3.700000 0.725000 ;
+      RECT 3.490000  1.955000 3.740000 2.465000 ;
+      RECT 3.720000  1.075000 4.490000 1.275000 ;
+      RECT 3.960000  2.135000 4.265000 2.635000 ;
+      RECT 4.485000  1.955000 5.255000 2.295000 ;
+      RECT 4.485000  2.295000 6.195000 2.465000 ;
+      RECT 5.015000  1.075000 5.725000 1.245000 ;
+      RECT 5.015000  1.245000 5.185000 1.445000 ;
+      RECT 5.045000  0.085000 5.215000 0.555000 ;
+      RECT 5.945000  1.795000 6.195000 2.295000 ;
+      RECT 5.985000  0.085000 6.155000 0.555000 ;
+    LAYER mcon ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.165000  1.105000 1.335000 1.275000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  1.105000 3.995000 1.275000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
     LAYER met1 ;
       RECT 0.085000 2.095000 0.375000 2.140000 ;
       RECT 0.085000 2.140000 1.395000 2.280000 ;
diff --git a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
index c01289e..e2acf46 100644
--- a/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
+++ b/cells/xor2/sky130_fd_sc_hdll__xor2_4.magic.lef
@@ -62,22 +62,6 @@
     DIRECTION OUTPUT ;
     USE SIGNAL ;
     PORT
-      LAYER li1 ;
-        RECT  4.565000 0.645000  6.130000 0.905000 ;
-        RECT  5.650000 0.905000  6.130000 0.935000 ;
-        RECT  8.650000 0.725000  9.480000 0.735000 ;
-        RECT  8.650000 0.735000 10.955000 0.905000 ;
-        RECT  8.680000 1.445000 10.955000 1.625000 ;
-        RECT  8.680000 1.625000  9.910000 1.665000 ;
-        RECT  8.680000 1.665000  8.970000 2.125000 ;
-        RECT  9.100000 0.255000  9.480000 0.725000 ;
-        RECT  9.660000 1.665000  9.910000 2.125000 ;
-        RECT 10.040000 0.255000 10.420000 0.735000 ;
-        RECT 10.550000 1.625000 10.955000 2.465000 ;
-        RECT 10.635000 0.905000 10.955000 1.445000 ;
-      LAYER mcon ;
-        RECT 5.705000 0.725000 5.875000 0.895000 ;
-        RECT 8.765000 0.725000 8.935000 0.895000 ;
       LAYER met1 ;
         RECT 5.645000 0.695000 5.935000 0.780000 ;
         RECT 5.645000 0.780000 8.995000 0.925000 ;
@@ -88,43 +72,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT  0.000000 -0.085000 11.040000 0.085000 ;
-        RECT  0.085000  0.085000  0.360000 0.565000 ;
-        RECT  1.130000  0.085000  1.300000 0.555000 ;
-        RECT  2.070000  0.085000  2.240000 0.555000 ;
-        RECT  3.010000  0.085000  3.180000 0.555000 ;
-        RECT  3.950000  0.085000  4.220000 0.895000 ;
-        RECT  6.820000  0.085000  6.990000 0.555000 ;
-        RECT  7.760000  0.085000  7.930000 0.555000 ;
-        RECT  8.760000  0.085000  8.930000 0.555000 ;
-        RECT  9.700000  0.085000  9.870000 0.555000 ;
-        RECT 10.640000  0.085000 10.810000 0.555000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
-        RECT 10.725000 -0.085000 10.895000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 11.040000 0.240000 ;
     END
@@ -133,85 +80,132 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 11.040000 2.805000 ;
-        RECT 0.620000 2.175000  0.870000 2.635000 ;
-        RECT 1.560000 2.175000  1.810000 2.635000 ;
-        RECT 4.900000 2.175000  5.150000 2.635000 ;
-        RECT 5.840000 2.175000  6.090000 2.635000 ;
-        RECT 6.780000 2.175000  7.030000 2.635000 ;
-        RECT 7.720000 2.175000  7.970000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
-        RECT 10.725000 2.635000 10.895000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 11.040000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  0.085000 0.735000  3.730000 0.905000 ;
-      RECT  0.085000 0.905000  0.255000 1.445000 ;
-      RECT  0.085000 1.445000  2.670000 1.615000 ;
-      RECT  0.085000 1.785000  2.280000 2.005000 ;
-      RECT  0.085000 2.005000  0.400000 2.465000 ;
-      RECT  0.530000 0.255000  0.910000 0.725000 ;
-      RECT  0.530000 0.725000  3.730000 0.735000 ;
-      RECT  1.090000 2.005000  1.340000 2.465000 ;
-      RECT  1.470000 0.255000  1.850000 0.725000 ;
-      RECT  2.030000 2.005000  2.280000 2.295000 ;
-      RECT  2.030000 2.295000  4.160000 2.465000 ;
-      RECT  2.410000 0.255000  2.790000 0.725000 ;
-      RECT  2.500000 1.615000  2.670000 1.785000 ;
-      RECT  2.500000 1.785000  3.690000 1.955000 ;
-      RECT  2.500000 1.955000  2.750000 2.125000 ;
-      RECT  2.970000 2.125000  3.220000 2.295000 ;
-      RECT  3.350000 0.255000  3.730000 0.725000 ;
-      RECT  3.440000 1.955000  3.690000 2.125000 ;
-      RECT  3.910000 1.795000  4.160000 2.295000 ;
-      RECT  4.390000 0.255000  6.600000 0.475000 ;
-      RECT  4.430000 1.785000  8.440000 2.005000 ;
-      RECT  4.430000 2.005000  4.680000 2.465000 ;
-      RECT  5.370000 2.005000  5.620000 2.465000 ;
-      RECT  6.310000 2.005000  6.560000 2.465000 ;
-      RECT  6.350000 0.475000  6.600000 0.725000 ;
-      RECT  6.350000 0.725000  8.480000 0.905000 ;
-      RECT  7.160000 0.255000  7.540000 0.725000 ;
-      RECT  7.250000 1.455000  7.500000 1.785000 ;
-      RECT  7.250000 2.005000  7.500000 2.465000 ;
-      RECT  8.010000 1.445000  8.510000 1.615000 ;
-      RECT  8.100000 0.255000  8.480000 0.725000 ;
-      RECT  8.190000 2.005000  8.440000 2.295000 ;
-      RECT  8.190000 2.295000 10.380000 2.465000 ;
-      RECT  8.340000 1.075000 10.130000 1.275000 ;
-      RECT  8.340000 1.275000  8.510000 1.445000 ;
-      RECT  9.190000 1.835000  9.440000 2.295000 ;
-      RECT 10.130000 1.795000 10.380000 2.295000 ;
+      RECT  0.000000 -0.085000 11.040000 0.085000 ;
+      RECT  0.000000  2.635000 11.040000 2.805000 ;
+      RECT  0.085000  0.085000  0.360000 0.565000 ;
+      RECT  0.085000  0.735000  3.730000 0.905000 ;
+      RECT  0.085000  0.905000  0.255000 1.445000 ;
+      RECT  0.085000  1.445000  2.670000 1.615000 ;
+      RECT  0.085000  1.785000  2.280000 2.005000 ;
+      RECT  0.085000  2.005000  0.400000 2.465000 ;
+      RECT  0.530000  0.255000  0.910000 0.725000 ;
+      RECT  0.530000  0.725000  3.730000 0.735000 ;
+      RECT  0.620000  2.175000  0.870000 2.635000 ;
+      RECT  1.090000  2.005000  1.340000 2.465000 ;
+      RECT  1.130000  0.085000  1.300000 0.555000 ;
+      RECT  1.470000  0.255000  1.850000 0.725000 ;
+      RECT  1.560000  2.175000  1.810000 2.635000 ;
+      RECT  2.030000  2.005000  2.280000 2.295000 ;
+      RECT  2.030000  2.295000  4.160000 2.465000 ;
+      RECT  2.070000  0.085000  2.240000 0.555000 ;
+      RECT  2.410000  0.255000  2.790000 0.725000 ;
+      RECT  2.500000  1.615000  2.670000 1.785000 ;
+      RECT  2.500000  1.785000  3.690000 1.955000 ;
+      RECT  2.500000  1.955000  2.750000 2.125000 ;
+      RECT  2.970000  2.125000  3.220000 2.295000 ;
+      RECT  3.010000  0.085000  3.180000 0.555000 ;
+      RECT  3.350000  0.255000  3.730000 0.725000 ;
+      RECT  3.440000  1.955000  3.690000 2.125000 ;
+      RECT  3.910000  1.795000  4.160000 2.295000 ;
+      RECT  3.950000  0.085000  4.220000 0.895000 ;
+      RECT  4.390000  0.255000  6.600000 0.475000 ;
+      RECT  4.430000  1.785000  8.440000 2.005000 ;
+      RECT  4.430000  2.005000  4.680000 2.465000 ;
+      RECT  4.565000  0.645000  6.130000 0.905000 ;
+      RECT  4.900000  2.175000  5.150000 2.635000 ;
+      RECT  5.370000  2.005000  5.620000 2.465000 ;
+      RECT  5.650000  0.905000  6.130000 0.935000 ;
+      RECT  5.840000  2.175000  6.090000 2.635000 ;
+      RECT  6.310000  2.005000  6.560000 2.465000 ;
+      RECT  6.350000  0.475000  6.600000 0.725000 ;
+      RECT  6.350000  0.725000  8.480000 0.905000 ;
+      RECT  6.780000  2.175000  7.030000 2.635000 ;
+      RECT  6.820000  0.085000  6.990000 0.555000 ;
+      RECT  7.160000  0.255000  7.540000 0.725000 ;
+      RECT  7.250000  1.455000  7.500000 1.785000 ;
+      RECT  7.250000  2.005000  7.500000 2.465000 ;
+      RECT  7.720000  2.175000  7.970000 2.635000 ;
+      RECT  7.760000  0.085000  7.930000 0.555000 ;
+      RECT  8.010000  1.445000  8.510000 1.615000 ;
+      RECT  8.100000  0.255000  8.480000 0.725000 ;
+      RECT  8.190000  2.005000  8.440000 2.295000 ;
+      RECT  8.190000  2.295000 10.380000 2.465000 ;
+      RECT  8.340000  1.075000 10.130000 1.275000 ;
+      RECT  8.340000  1.275000  8.510000 1.445000 ;
+      RECT  8.650000  0.725000  9.480000 0.735000 ;
+      RECT  8.650000  0.735000 10.955000 0.905000 ;
+      RECT  8.680000  1.445000 10.955000 1.625000 ;
+      RECT  8.680000  1.625000  9.910000 1.665000 ;
+      RECT  8.680000  1.665000  8.970000 2.125000 ;
+      RECT  8.760000  0.085000  8.930000 0.555000 ;
+      RECT  9.100000  0.255000  9.480000 0.725000 ;
+      RECT  9.190000  1.835000  9.440000 2.295000 ;
+      RECT  9.660000  1.665000  9.910000 2.125000 ;
+      RECT  9.700000  0.085000  9.870000 0.555000 ;
+      RECT 10.040000  0.255000 10.420000 0.735000 ;
+      RECT 10.130000  1.795000 10.380000 2.295000 ;
+      RECT 10.550000  1.625000 10.955000 2.465000 ;
+      RECT 10.635000  0.905000 10.955000 1.445000 ;
+      RECT 10.640000  0.085000 10.810000 0.555000 ;
     LAYER mcon ;
-      RECT 2.185000 1.445000 2.355000 1.615000 ;
-      RECT 8.305000 1.445000 8.475000 1.615000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.185000  1.445000  2.355000 1.615000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  5.705000  0.725000  5.875000 0.895000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.305000  1.445000  8.475000 1.615000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.765000  0.725000  8.935000 0.895000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
+      RECT 10.725000 -0.085000 10.895000 0.085000 ;
+      RECT 10.725000  2.635000 10.895000 2.805000 ;
     LAYER met1 ;
       RECT 2.125000 1.415000 2.415000 1.460000 ;
       RECT 2.125000 1.460000 8.535000 1.600000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
index e135f7c..8bd3e33 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_1.magic.lef
@@ -77,33 +77,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.810000  0.085000 1.060000 0.525000 ;
-        RECT 4.130000  0.085000 4.300000 0.865000 ;
-        RECT 8.485000  0.085000 8.935000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -112,107 +85,130 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.830000 2.215000 1.165000 2.635000 ;
-        RECT 3.885000 2.235000 4.215000 2.635000 ;
-        RECT 8.355000 2.275000 9.050000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 0.800000 0.695000 1.450000 0.865000 ;
-      RECT 0.800000 0.865000 1.000000 1.875000 ;
-      RECT 0.800000 1.875000 1.570000 2.045000 ;
-      RECT 1.230000 0.255000 2.890000 0.425000 ;
-      RECT 1.230000 0.425000 1.450000 0.695000 ;
-      RECT 1.235000 1.535000 2.985000 1.705000 ;
-      RECT 1.350000 2.045000 1.570000 2.235000 ;
-      RECT 1.350000 2.235000 3.045000 2.405000 ;
-      RECT 1.620000 0.595000 1.790000 1.535000 ;
-      RECT 1.970000 1.895000 3.375000 2.065000 ;
-      RECT 2.070000 0.655000 3.280000 0.825000 ;
-      RECT 2.490000 0.425000 2.890000 0.455000 ;
-      RECT 2.815000 0.995000 3.140000 1.325000 ;
-      RECT 2.815000 1.325000 2.985000 1.535000 ;
-      RECT 3.060000 0.255000 3.960000 0.425000 ;
-      RECT 3.060000 0.425000 3.280000 0.655000 ;
-      RECT 3.205000 1.525000 3.735000 1.695000 ;
-      RECT 3.205000 1.695000 3.375000 1.895000 ;
-      RECT 3.310000 2.235000 3.715000 2.405000 ;
-      RECT 3.450000 0.595000 3.620000 1.375000 ;
-      RECT 3.450000 1.375000 3.735000 1.525000 ;
-      RECT 3.545000 1.895000 4.820000 2.065000 ;
-      RECT 3.545000 2.065000 3.715000 2.235000 ;
-      RECT 3.790000 0.425000 3.960000 1.035000 ;
-      RECT 3.790000 1.035000 4.075000 1.205000 ;
-      RECT 3.905000 1.205000 4.075000 1.895000 ;
-      RECT 4.305000 1.445000 4.820000 1.715000 ;
-      RECT 4.530000 0.415000 4.820000 1.445000 ;
-      RECT 4.650000 2.065000 4.820000 2.275000 ;
-      RECT 4.650000 2.275000 7.945000 2.445000 ;
-      RECT 4.995000 0.265000 5.410000 0.485000 ;
-      RECT 4.995000 0.485000 5.215000 0.595000 ;
-      RECT 4.995000 0.595000 5.165000 2.105000 ;
-      RECT 5.335000 0.720000 5.800000 0.825000 ;
-      RECT 5.335000 0.825000 5.605000 0.890000 ;
-      RECT 5.335000 0.890000 5.505000 2.275000 ;
-      RECT 5.385000 0.655000 5.800000 0.720000 ;
-      RECT 5.630000 0.320000 5.800000 0.655000 ;
-      RECT 5.745000 1.445000 6.575000 1.615000 ;
-      RECT 5.745000 1.615000 6.160000 2.045000 ;
-      RECT 5.760000 0.995000 6.185000 1.270000 ;
-      RECT 5.970000 0.630000 6.185000 0.995000 ;
-      RECT 6.405000 0.255000 7.600000 0.425000 ;
-      RECT 6.405000 0.425000 6.575000 1.445000 ;
-      RECT 6.745000 0.595000 6.915000 1.935000 ;
-      RECT 6.745000 1.935000 9.565000 2.105000 ;
-      RECT 7.085000 0.425000 7.600000 0.465000 ;
-      RECT 7.475000 0.730000 7.680000 0.945000 ;
-      RECT 7.475000 0.945000 7.785000 1.275000 ;
-      RECT 7.935000 1.495000 9.115000 1.705000 ;
-      RECT 7.975000 0.295000 8.265000 0.735000 ;
-      RECT 7.975000 0.735000 9.115000 0.750000 ;
-      RECT 8.015000 0.750000 9.115000 0.905000 ;
-      RECT 8.945000 0.905000 9.115000 0.995000 ;
-      RECT 8.945000 0.995000 9.225000 1.325000 ;
-      RECT 8.945000 1.325000 9.115000 1.495000 ;
-      RECT 9.030000 1.875000 9.565000 1.935000 ;
-      RECT 9.265000 0.255000 9.565000 0.585000 ;
-      RECT 9.270000 2.105000 9.565000 2.465000 ;
-      RECT 9.395000 0.585000 9.565000 1.875000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.800000  0.695000 1.450000 0.865000 ;
+      RECT 0.800000  0.865000 1.000000 1.875000 ;
+      RECT 0.800000  1.875000 1.570000 2.045000 ;
+      RECT 0.810000  0.085000 1.060000 0.525000 ;
+      RECT 0.830000  2.215000 1.165000 2.635000 ;
+      RECT 1.230000  0.255000 2.890000 0.425000 ;
+      RECT 1.230000  0.425000 1.450000 0.695000 ;
+      RECT 1.235000  1.535000 2.985000 1.705000 ;
+      RECT 1.350000  2.045000 1.570000 2.235000 ;
+      RECT 1.350000  2.235000 3.045000 2.405000 ;
+      RECT 1.620000  0.595000 1.790000 1.535000 ;
+      RECT 1.970000  1.895000 3.375000 2.065000 ;
+      RECT 2.070000  0.655000 3.280000 0.825000 ;
+      RECT 2.490000  0.425000 2.890000 0.455000 ;
+      RECT 2.815000  0.995000 3.140000 1.325000 ;
+      RECT 2.815000  1.325000 2.985000 1.535000 ;
+      RECT 3.060000  0.255000 3.960000 0.425000 ;
+      RECT 3.060000  0.425000 3.280000 0.655000 ;
+      RECT 3.205000  1.525000 3.735000 1.695000 ;
+      RECT 3.205000  1.695000 3.375000 1.895000 ;
+      RECT 3.310000  2.235000 3.715000 2.405000 ;
+      RECT 3.450000  0.595000 3.620000 1.375000 ;
+      RECT 3.450000  1.375000 3.735000 1.525000 ;
+      RECT 3.545000  1.895000 4.820000 2.065000 ;
+      RECT 3.545000  2.065000 3.715000 2.235000 ;
+      RECT 3.790000  0.425000 3.960000 1.035000 ;
+      RECT 3.790000  1.035000 4.075000 1.205000 ;
+      RECT 3.885000  2.235000 4.215000 2.635000 ;
+      RECT 3.905000  1.205000 4.075000 1.895000 ;
+      RECT 4.130000  0.085000 4.300000 0.865000 ;
+      RECT 4.305000  1.445000 4.820000 1.715000 ;
+      RECT 4.530000  0.415000 4.820000 1.445000 ;
+      RECT 4.650000  2.065000 4.820000 2.275000 ;
+      RECT 4.650000  2.275000 7.945000 2.445000 ;
+      RECT 4.995000  0.265000 5.410000 0.485000 ;
+      RECT 4.995000  0.485000 5.215000 0.595000 ;
+      RECT 4.995000  0.595000 5.165000 2.105000 ;
+      RECT 5.335000  0.720000 5.800000 0.825000 ;
+      RECT 5.335000  0.825000 5.605000 0.890000 ;
+      RECT 5.335000  0.890000 5.505000 2.275000 ;
+      RECT 5.385000  0.655000 5.800000 0.720000 ;
+      RECT 5.630000  0.320000 5.800000 0.655000 ;
+      RECT 5.745000  1.445000 6.575000 1.615000 ;
+      RECT 5.745000  1.615000 6.160000 2.045000 ;
+      RECT 5.760000  0.995000 6.185000 1.270000 ;
+      RECT 5.970000  0.630000 6.185000 0.995000 ;
+      RECT 6.405000  0.255000 7.600000 0.425000 ;
+      RECT 6.405000  0.425000 6.575000 1.445000 ;
+      RECT 6.745000  0.595000 6.915000 1.935000 ;
+      RECT 6.745000  1.935000 9.565000 2.105000 ;
+      RECT 7.085000  0.425000 7.600000 0.465000 ;
+      RECT 7.475000  0.730000 7.680000 0.945000 ;
+      RECT 7.475000  0.945000 7.785000 1.275000 ;
+      RECT 7.935000  1.495000 9.115000 1.705000 ;
+      RECT 7.975000  0.295000 8.265000 0.735000 ;
+      RECT 7.975000  0.735000 9.115000 0.750000 ;
+      RECT 8.015000  0.750000 9.115000 0.905000 ;
+      RECT 8.355000  2.275000 9.050000 2.635000 ;
+      RECT 8.485000  0.085000 8.935000 0.565000 ;
+      RECT 8.945000  0.905000 9.115000 0.995000 ;
+      RECT 8.945000  0.995000 9.225000 1.325000 ;
+      RECT 8.945000  1.325000 9.115000 1.495000 ;
+      RECT 9.030000  1.875000 9.565000 1.935000 ;
+      RECT 9.265000  0.255000 9.565000 0.585000 ;
+      RECT 9.270000  2.105000 9.565000 2.465000 ;
+      RECT 9.395000  0.585000 9.565000 1.875000 ;
     LAYER mcon ;
-      RECT 3.565000 1.445000 3.735000 1.615000 ;
-      RECT 4.535000 0.765000 4.705000 0.935000 ;
-      RECT 5.045000 0.425000 5.215000 0.595000 ;
-      RECT 6.015000 0.765000 6.185000 0.935000 ;
-      RECT 6.015000 1.445000 6.185000 1.615000 ;
-      RECT 7.495000 0.765000 7.665000 0.935000 ;
-      RECT 8.005000 0.425000 8.175000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.565000  1.445000 3.735000 1.615000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.535000  0.765000 4.705000 0.935000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 5.045000  0.425000 5.215000 0.595000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.015000  0.765000 6.185000 0.935000 ;
+      RECT 6.015000  1.445000 6.185000 1.615000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.495000  0.765000 7.665000 0.935000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.005000  0.425000 8.175000 0.595000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
     LAYER met1 ;
       RECT 3.505000 1.415000 3.795000 1.460000 ;
       RECT 3.505000 1.460000 6.245000 1.600000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
index 44c8317..9eb3395 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_2.magic.lef
@@ -79,34 +79,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 9.660000 0.085000 ;
-        RECT 0.105000  0.085000 0.435000 0.465000 ;
-        RECT 1.105000  0.085000 1.355000 0.525000 ;
-        RECT 4.425000  0.085000 4.595000 0.865000 ;
-        RECT 8.780000  0.085000 8.950000 0.565000 ;
-      LAYER mcon ;
-        RECT 0.145000 -0.085000 0.315000 0.085000 ;
-        RECT 0.605000 -0.085000 0.775000 0.085000 ;
-        RECT 1.065000 -0.085000 1.235000 0.085000 ;
-        RECT 1.525000 -0.085000 1.695000 0.085000 ;
-        RECT 1.985000 -0.085000 2.155000 0.085000 ;
-        RECT 2.445000 -0.085000 2.615000 0.085000 ;
-        RECT 2.905000 -0.085000 3.075000 0.085000 ;
-        RECT 3.365000 -0.085000 3.535000 0.085000 ;
-        RECT 3.825000 -0.085000 3.995000 0.085000 ;
-        RECT 4.285000 -0.085000 4.455000 0.085000 ;
-        RECT 4.745000 -0.085000 4.915000 0.085000 ;
-        RECT 5.205000 -0.085000 5.375000 0.085000 ;
-        RECT 5.665000 -0.085000 5.835000 0.085000 ;
-        RECT 6.125000 -0.085000 6.295000 0.085000 ;
-        RECT 6.585000 -0.085000 6.755000 0.085000 ;
-        RECT 7.045000 -0.085000 7.215000 0.085000 ;
-        RECT 7.505000 -0.085000 7.675000 0.085000 ;
-        RECT 7.965000 -0.085000 8.135000 0.085000 ;
-        RECT 8.425000 -0.085000 8.595000 0.085000 ;
-        RECT 8.885000 -0.085000 9.055000 0.085000 ;
-        RECT 9.345000 -0.085000 9.515000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 9.660000 0.240000 ;
     END
@@ -115,110 +87,134 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 9.660000 2.805000 ;
-        RECT 0.105000 2.215000 0.435000 2.635000 ;
-        RECT 1.125000 2.215000 1.460000 2.635000 ;
-        RECT 4.180000 2.235000 4.510000 2.635000 ;
-        RECT 8.650000 2.275000 9.035000 2.635000 ;
-      LAYER mcon ;
-        RECT 0.145000 2.635000 0.315000 2.805000 ;
-        RECT 0.605000 2.635000 0.775000 2.805000 ;
-        RECT 1.065000 2.635000 1.235000 2.805000 ;
-        RECT 1.525000 2.635000 1.695000 2.805000 ;
-        RECT 1.985000 2.635000 2.155000 2.805000 ;
-        RECT 2.445000 2.635000 2.615000 2.805000 ;
-        RECT 2.905000 2.635000 3.075000 2.805000 ;
-        RECT 3.365000 2.635000 3.535000 2.805000 ;
-        RECT 3.825000 2.635000 3.995000 2.805000 ;
-        RECT 4.285000 2.635000 4.455000 2.805000 ;
-        RECT 4.745000 2.635000 4.915000 2.805000 ;
-        RECT 5.205000 2.635000 5.375000 2.805000 ;
-        RECT 5.665000 2.635000 5.835000 2.805000 ;
-        RECT 6.125000 2.635000 6.295000 2.805000 ;
-        RECT 6.585000 2.635000 6.755000 2.805000 ;
-        RECT 7.045000 2.635000 7.215000 2.805000 ;
-        RECT 7.505000 2.635000 7.675000 2.805000 ;
-        RECT 7.965000 2.635000 8.135000 2.805000 ;
-        RECT 8.425000 2.635000 8.595000 2.805000 ;
-        RECT 8.885000 2.635000 9.055000 2.805000 ;
-        RECT 9.345000 2.635000 9.515000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 9.660000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT 1.095000 0.995000 1.295000 1.325000 ;
-      RECT 1.125000 0.695000 1.745000 0.865000 ;
-      RECT 1.125000 0.865000 1.295000 0.995000 ;
-      RECT 1.125000 1.325000 1.295000 1.875000 ;
-      RECT 1.125000 1.875000 1.865000 2.045000 ;
-      RECT 1.525000 0.255000 3.190000 0.425000 ;
-      RECT 1.525000 0.425000 1.745000 0.695000 ;
-      RECT 1.530000 1.535000 3.280000 1.705000 ;
-      RECT 1.645000 2.045000 1.865000 2.235000 ;
-      RECT 1.645000 2.235000 3.340000 2.405000 ;
-      RECT 1.915000 0.595000 2.085000 1.535000 ;
-      RECT 2.265000 1.895000 3.670000 2.065000 ;
-      RECT 2.365000 0.655000 3.575000 0.825000 ;
-      RECT 2.785000 0.425000 3.190000 0.455000 ;
-      RECT 3.110000 0.995000 3.435000 1.325000 ;
-      RECT 3.110000 1.325000 3.280000 1.535000 ;
-      RECT 3.360000 0.255000 4.255000 0.425000 ;
-      RECT 3.360000 0.425000 3.575000 0.655000 ;
-      RECT 3.500000 1.525000 4.030000 1.695000 ;
-      RECT 3.500000 1.695000 3.670000 1.895000 ;
-      RECT 3.605000 2.235000 4.010000 2.405000 ;
-      RECT 3.745000 0.595000 3.915000 1.375000 ;
-      RECT 3.745000 1.375000 4.030000 1.525000 ;
-      RECT 3.840000 1.895000 5.115000 2.065000 ;
-      RECT 3.840000 2.065000 4.010000 2.235000 ;
-      RECT 4.085000 0.425000 4.255000 1.035000 ;
-      RECT 4.085000 1.035000 4.370000 1.205000 ;
-      RECT 4.200000 1.205000 4.370000 1.895000 ;
-      RECT 4.600000 1.445000 5.115000 1.715000 ;
-      RECT 4.825000 0.415000 5.115000 1.445000 ;
-      RECT 4.945000 2.065000 5.115000 2.275000 ;
-      RECT 4.945000 2.275000 8.240000 2.445000 ;
-      RECT 5.290000 0.265000 5.705000 0.485000 ;
-      RECT 5.290000 0.485000 5.510000 0.595000 ;
-      RECT 5.290000 0.595000 5.460000 2.105000 ;
-      RECT 5.630000 0.720000 6.095000 0.825000 ;
-      RECT 5.630000 0.825000 5.900000 0.890000 ;
-      RECT 5.630000 0.890000 5.800000 2.275000 ;
-      RECT 5.680000 0.655000 6.095000 0.720000 ;
-      RECT 5.925000 0.320000 6.095000 0.655000 ;
-      RECT 6.040000 1.445000 6.870000 1.615000 ;
-      RECT 6.040000 1.615000 6.455000 2.045000 ;
-      RECT 6.055000 0.995000 6.480000 1.270000 ;
-      RECT 6.265000 0.630000 6.480000 0.995000 ;
-      RECT 6.700000 0.255000 7.895000 0.425000 ;
-      RECT 6.700000 0.425000 6.870000 1.445000 ;
-      RECT 7.040000 0.595000 7.210000 1.935000 ;
-      RECT 7.040000 1.935000 9.550000 2.105000 ;
-      RECT 7.380000 0.425000 7.895000 0.465000 ;
-      RECT 7.770000 0.730000 7.975000 0.945000 ;
-      RECT 7.770000 0.945000 8.090000 1.275000 ;
-      RECT 8.230000 1.495000 9.100000 1.705000 ;
-      RECT 8.270000 0.295000 8.560000 0.735000 ;
-      RECT 8.270000 0.735000 9.100000 0.750000 ;
-      RECT 8.310000 0.750000 9.100000 0.905000 ;
-      RECT 8.930000 0.905000 9.100000 0.995000 ;
-      RECT 8.930000 0.995000 9.210000 1.325000 ;
-      RECT 8.930000 1.325000 9.100000 1.495000 ;
-      RECT 9.015000 1.875000 9.550000 1.935000 ;
-      RECT 9.250000 0.255000 9.550000 0.585000 ;
-      RECT 9.255000 2.105000 9.550000 2.465000 ;
-      RECT 9.380000 0.585000 9.550000 1.875000 ;
+      RECT 0.000000 -0.085000 9.660000 0.085000 ;
+      RECT 0.000000  2.635000 9.660000 2.805000 ;
+      RECT 0.105000  0.085000 0.435000 0.465000 ;
+      RECT 0.105000  2.215000 0.435000 2.635000 ;
+      RECT 1.095000  0.995000 1.295000 1.325000 ;
+      RECT 1.105000  0.085000 1.355000 0.525000 ;
+      RECT 1.125000  0.695000 1.745000 0.865000 ;
+      RECT 1.125000  0.865000 1.295000 0.995000 ;
+      RECT 1.125000  1.325000 1.295000 1.875000 ;
+      RECT 1.125000  1.875000 1.865000 2.045000 ;
+      RECT 1.125000  2.215000 1.460000 2.635000 ;
+      RECT 1.525000  0.255000 3.190000 0.425000 ;
+      RECT 1.525000  0.425000 1.745000 0.695000 ;
+      RECT 1.530000  1.535000 3.280000 1.705000 ;
+      RECT 1.645000  2.045000 1.865000 2.235000 ;
+      RECT 1.645000  2.235000 3.340000 2.405000 ;
+      RECT 1.915000  0.595000 2.085000 1.535000 ;
+      RECT 2.265000  1.895000 3.670000 2.065000 ;
+      RECT 2.365000  0.655000 3.575000 0.825000 ;
+      RECT 2.785000  0.425000 3.190000 0.455000 ;
+      RECT 3.110000  0.995000 3.435000 1.325000 ;
+      RECT 3.110000  1.325000 3.280000 1.535000 ;
+      RECT 3.360000  0.255000 4.255000 0.425000 ;
+      RECT 3.360000  0.425000 3.575000 0.655000 ;
+      RECT 3.500000  1.525000 4.030000 1.695000 ;
+      RECT 3.500000  1.695000 3.670000 1.895000 ;
+      RECT 3.605000  2.235000 4.010000 2.405000 ;
+      RECT 3.745000  0.595000 3.915000 1.375000 ;
+      RECT 3.745000  1.375000 4.030000 1.525000 ;
+      RECT 3.840000  1.895000 5.115000 2.065000 ;
+      RECT 3.840000  2.065000 4.010000 2.235000 ;
+      RECT 4.085000  0.425000 4.255000 1.035000 ;
+      RECT 4.085000  1.035000 4.370000 1.205000 ;
+      RECT 4.180000  2.235000 4.510000 2.635000 ;
+      RECT 4.200000  1.205000 4.370000 1.895000 ;
+      RECT 4.425000  0.085000 4.595000 0.865000 ;
+      RECT 4.600000  1.445000 5.115000 1.715000 ;
+      RECT 4.825000  0.415000 5.115000 1.445000 ;
+      RECT 4.945000  2.065000 5.115000 2.275000 ;
+      RECT 4.945000  2.275000 8.240000 2.445000 ;
+      RECT 5.290000  0.265000 5.705000 0.485000 ;
+      RECT 5.290000  0.485000 5.510000 0.595000 ;
+      RECT 5.290000  0.595000 5.460000 2.105000 ;
+      RECT 5.630000  0.720000 6.095000 0.825000 ;
+      RECT 5.630000  0.825000 5.900000 0.890000 ;
+      RECT 5.630000  0.890000 5.800000 2.275000 ;
+      RECT 5.680000  0.655000 6.095000 0.720000 ;
+      RECT 5.925000  0.320000 6.095000 0.655000 ;
+      RECT 6.040000  1.445000 6.870000 1.615000 ;
+      RECT 6.040000  1.615000 6.455000 2.045000 ;
+      RECT 6.055000  0.995000 6.480000 1.270000 ;
+      RECT 6.265000  0.630000 6.480000 0.995000 ;
+      RECT 6.700000  0.255000 7.895000 0.425000 ;
+      RECT 6.700000  0.425000 6.870000 1.445000 ;
+      RECT 7.040000  0.595000 7.210000 1.935000 ;
+      RECT 7.040000  1.935000 9.550000 2.105000 ;
+      RECT 7.380000  0.425000 7.895000 0.465000 ;
+      RECT 7.770000  0.730000 7.975000 0.945000 ;
+      RECT 7.770000  0.945000 8.090000 1.275000 ;
+      RECT 8.230000  1.495000 9.100000 1.705000 ;
+      RECT 8.270000  0.295000 8.560000 0.735000 ;
+      RECT 8.270000  0.735000 9.100000 0.750000 ;
+      RECT 8.310000  0.750000 9.100000 0.905000 ;
+      RECT 8.650000  2.275000 9.035000 2.635000 ;
+      RECT 8.780000  0.085000 8.950000 0.565000 ;
+      RECT 8.930000  0.905000 9.100000 0.995000 ;
+      RECT 8.930000  0.995000 9.210000 1.325000 ;
+      RECT 8.930000  1.325000 9.100000 1.495000 ;
+      RECT 9.015000  1.875000 9.550000 1.935000 ;
+      RECT 9.250000  0.255000 9.550000 0.585000 ;
+      RECT 9.255000  2.105000 9.550000 2.465000 ;
+      RECT 9.380000  0.585000 9.550000 1.875000 ;
     LAYER mcon ;
-      RECT 3.860000 1.445000 4.030000 1.615000 ;
-      RECT 4.830000 0.765000 5.000000 0.935000 ;
-      RECT 5.340000 0.425000 5.510000 0.595000 ;
-      RECT 6.310000 0.765000 6.480000 0.935000 ;
-      RECT 6.310000 1.445000 6.480000 1.615000 ;
-      RECT 7.790000 0.765000 7.960000 0.935000 ;
-      RECT 8.300000 0.425000 8.470000 0.595000 ;
+      RECT 0.145000 -0.085000 0.315000 0.085000 ;
+      RECT 0.145000  2.635000 0.315000 2.805000 ;
+      RECT 0.605000 -0.085000 0.775000 0.085000 ;
+      RECT 0.605000  2.635000 0.775000 2.805000 ;
+      RECT 1.065000 -0.085000 1.235000 0.085000 ;
+      RECT 1.065000  2.635000 1.235000 2.805000 ;
+      RECT 1.525000 -0.085000 1.695000 0.085000 ;
+      RECT 1.525000  2.635000 1.695000 2.805000 ;
+      RECT 1.985000 -0.085000 2.155000 0.085000 ;
+      RECT 1.985000  2.635000 2.155000 2.805000 ;
+      RECT 2.445000 -0.085000 2.615000 0.085000 ;
+      RECT 2.445000  2.635000 2.615000 2.805000 ;
+      RECT 2.905000 -0.085000 3.075000 0.085000 ;
+      RECT 2.905000  2.635000 3.075000 2.805000 ;
+      RECT 3.365000 -0.085000 3.535000 0.085000 ;
+      RECT 3.365000  2.635000 3.535000 2.805000 ;
+      RECT 3.825000 -0.085000 3.995000 0.085000 ;
+      RECT 3.825000  2.635000 3.995000 2.805000 ;
+      RECT 3.860000  1.445000 4.030000 1.615000 ;
+      RECT 4.285000 -0.085000 4.455000 0.085000 ;
+      RECT 4.285000  2.635000 4.455000 2.805000 ;
+      RECT 4.745000 -0.085000 4.915000 0.085000 ;
+      RECT 4.745000  2.635000 4.915000 2.805000 ;
+      RECT 4.830000  0.765000 5.000000 0.935000 ;
+      RECT 5.205000 -0.085000 5.375000 0.085000 ;
+      RECT 5.205000  2.635000 5.375000 2.805000 ;
+      RECT 5.340000  0.425000 5.510000 0.595000 ;
+      RECT 5.665000 -0.085000 5.835000 0.085000 ;
+      RECT 5.665000  2.635000 5.835000 2.805000 ;
+      RECT 6.125000 -0.085000 6.295000 0.085000 ;
+      RECT 6.125000  2.635000 6.295000 2.805000 ;
+      RECT 6.310000  0.765000 6.480000 0.935000 ;
+      RECT 6.310000  1.445000 6.480000 1.615000 ;
+      RECT 6.585000 -0.085000 6.755000 0.085000 ;
+      RECT 6.585000  2.635000 6.755000 2.805000 ;
+      RECT 7.045000 -0.085000 7.215000 0.085000 ;
+      RECT 7.045000  2.635000 7.215000 2.805000 ;
+      RECT 7.505000 -0.085000 7.675000 0.085000 ;
+      RECT 7.505000  2.635000 7.675000 2.805000 ;
+      RECT 7.790000  0.765000 7.960000 0.935000 ;
+      RECT 7.965000 -0.085000 8.135000 0.085000 ;
+      RECT 7.965000  2.635000 8.135000 2.805000 ;
+      RECT 8.300000  0.425000 8.470000 0.595000 ;
+      RECT 8.425000 -0.085000 8.595000 0.085000 ;
+      RECT 8.425000  2.635000 8.595000 2.805000 ;
+      RECT 8.885000 -0.085000 9.055000 0.085000 ;
+      RECT 8.885000  2.635000 9.055000 2.805000 ;
+      RECT 9.345000 -0.085000 9.515000 0.085000 ;
+      RECT 9.345000  2.635000 9.515000 2.805000 ;
     LAYER met1 ;
       RECT 3.800000 1.415000 4.090000 1.460000 ;
       RECT 3.800000 1.460000 6.540000 1.600000 ;
diff --git a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
index 4c176b2..bd41cea 100644
--- a/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
+++ b/cells/xor3/sky130_fd_sc_hdll__xor3_4.magic.lef
@@ -82,37 +82,6 @@
     DIRECTION INOUT ;
     USE GROUND ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 -0.085000 10.580000 0.085000 ;
-        RECT 0.175000  0.085000  0.345000 0.545000 ;
-        RECT 0.985000  0.085000  1.365000 0.465000 ;
-        RECT 2.055000  0.085000  2.225000 0.525000 ;
-        RECT 5.300000  0.085000  5.470000 0.885000 ;
-        RECT 9.695000  0.085000  9.865000 0.565000 ;
-      LAYER mcon ;
-        RECT  0.145000 -0.085000  0.315000 0.085000 ;
-        RECT  0.605000 -0.085000  0.775000 0.085000 ;
-        RECT  1.065000 -0.085000  1.235000 0.085000 ;
-        RECT  1.525000 -0.085000  1.695000 0.085000 ;
-        RECT  1.985000 -0.085000  2.155000 0.085000 ;
-        RECT  2.445000 -0.085000  2.615000 0.085000 ;
-        RECT  2.905000 -0.085000  3.075000 0.085000 ;
-        RECT  3.365000 -0.085000  3.535000 0.085000 ;
-        RECT  3.825000 -0.085000  3.995000 0.085000 ;
-        RECT  4.285000 -0.085000  4.455000 0.085000 ;
-        RECT  4.745000 -0.085000  4.915000 0.085000 ;
-        RECT  5.205000 -0.085000  5.375000 0.085000 ;
-        RECT  5.665000 -0.085000  5.835000 0.085000 ;
-        RECT  6.125000 -0.085000  6.295000 0.085000 ;
-        RECT  6.585000 -0.085000  6.755000 0.085000 ;
-        RECT  7.045000 -0.085000  7.215000 0.085000 ;
-        RECT  7.505000 -0.085000  7.675000 0.085000 ;
-        RECT  7.965000 -0.085000  8.135000 0.085000 ;
-        RECT  8.425000 -0.085000  8.595000 0.085000 ;
-        RECT  8.885000 -0.085000  9.055000 0.085000 ;
-        RECT  9.345000 -0.085000  9.515000 0.085000 ;
-        RECT  9.805000 -0.085000  9.975000 0.085000 ;
-        RECT 10.265000 -0.085000 10.435000 0.085000 ;
       LAYER met1 ;
         RECT 0.000000 -0.240000 10.580000 0.240000 ;
     END
@@ -121,116 +90,143 @@
     DIRECTION INOUT ;
     USE POWER ;
     PORT
-      LAYER li1 ;
-        RECT 0.000000 2.635000 10.580000 2.805000 ;
-        RECT 0.275000 2.135000  0.445000 2.635000 ;
-        RECT 1.135000 2.215000  1.465000 2.635000 ;
-        RECT 2.075000 2.215000  2.405000 2.635000 ;
-        RECT 5.055000 2.235000  5.385000 2.635000 ;
-        RECT 9.615000 2.275000  9.945000 2.635000 ;
-      LAYER mcon ;
-        RECT  0.145000 2.635000  0.315000 2.805000 ;
-        RECT  0.605000 2.635000  0.775000 2.805000 ;
-        RECT  1.065000 2.635000  1.235000 2.805000 ;
-        RECT  1.525000 2.635000  1.695000 2.805000 ;
-        RECT  1.985000 2.635000  2.155000 2.805000 ;
-        RECT  2.445000 2.635000  2.615000 2.805000 ;
-        RECT  2.905000 2.635000  3.075000 2.805000 ;
-        RECT  3.365000 2.635000  3.535000 2.805000 ;
-        RECT  3.825000 2.635000  3.995000 2.805000 ;
-        RECT  4.285000 2.635000  4.455000 2.805000 ;
-        RECT  4.745000 2.635000  4.915000 2.805000 ;
-        RECT  5.205000 2.635000  5.375000 2.805000 ;
-        RECT  5.665000 2.635000  5.835000 2.805000 ;
-        RECT  6.125000 2.635000  6.295000 2.805000 ;
-        RECT  6.585000 2.635000  6.755000 2.805000 ;
-        RECT  7.045000 2.635000  7.215000 2.805000 ;
-        RECT  7.505000 2.635000  7.675000 2.805000 ;
-        RECT  7.965000 2.635000  8.135000 2.805000 ;
-        RECT  8.425000 2.635000  8.595000 2.805000 ;
-        RECT  8.885000 2.635000  9.055000 2.805000 ;
-        RECT  9.345000 2.635000  9.515000 2.805000 ;
-        RECT  9.805000 2.635000  9.975000 2.805000 ;
-        RECT 10.265000 2.635000 10.435000 2.805000 ;
       LAYER met1 ;
         RECT 0.000000 2.480000 10.580000 2.960000 ;
     END
   END VPWR
   OBS
     LAYER li1 ;
-      RECT  2.020000 0.965000  2.245000 1.325000 ;
-      RECT  2.075000 0.695000  2.565000 0.865000 ;
-      RECT  2.075000 0.865000  2.245000 0.965000 ;
-      RECT  2.075000 1.325000  2.245000 1.875000 ;
-      RECT  2.075000 1.875000  2.795000 2.045000 ;
-      RECT  2.395000 0.255000  4.060000 0.425000 ;
-      RECT  2.395000 0.425000  2.565000 0.695000 ;
-      RECT  2.570000 1.535000  4.155000 1.705000 ;
-      RECT  2.575000 2.045000  2.795000 2.235000 ;
-      RECT  2.575000 2.235000  4.215000 2.405000 ;
-      RECT  2.790000 0.595000  2.960000 1.535000 ;
-      RECT  3.140000 1.895000  4.545000 2.065000 ;
-      RECT  3.240000 0.655000  4.450000 0.825000 ;
-      RECT  3.660000 0.425000  4.060000 0.455000 ;
-      RECT  3.985000 0.995000  4.405000 1.325000 ;
-      RECT  3.985000 1.325000  4.155000 1.535000 ;
-      RECT  4.230000 0.255000  5.130000 0.425000 ;
-      RECT  4.230000 0.425000  4.450000 0.655000 ;
-      RECT  4.375000 1.525000  4.905000 1.695000 ;
-      RECT  4.375000 1.695000  4.545000 1.895000 ;
-      RECT  4.480000 2.235000  4.885000 2.405000 ;
-      RECT  4.620000 0.595000  4.790000 1.375000 ;
-      RECT  4.620000 1.375000  4.905000 1.525000 ;
-      RECT  4.715000 1.895000  5.990000 2.065000 ;
-      RECT  4.715000 2.065000  4.885000 2.235000 ;
-      RECT  4.960000 0.425000  5.130000 1.035000 ;
-      RECT  4.960000 1.035000  5.215000 1.040000 ;
-      RECT  4.960000 1.040000  5.230000 1.045000 ;
-      RECT  4.960000 1.045000  5.240000 1.050000 ;
-      RECT  4.960000 1.050000  5.245000 1.205000 ;
-      RECT  5.075000 1.205000  5.245000 1.895000 ;
-      RECT  5.475000 1.445000  5.990000 1.715000 ;
-      RECT  5.700000 0.415000  5.990000 1.445000 ;
-      RECT  5.820000 2.065000  5.990000 2.275000 ;
-      RECT  5.820000 2.275000  9.115000 2.445000 ;
-      RECT  6.165000 0.265000  6.580000 0.485000 ;
-      RECT  6.165000 0.485000  6.385000 0.595000 ;
-      RECT  6.165000 0.595000  6.335000 2.105000 ;
-      RECT  6.525000 0.720000  6.970000 0.825000 ;
-      RECT  6.525000 0.825000  6.775000 0.890000 ;
-      RECT  6.525000 0.890000  6.695000 2.275000 ;
-      RECT  6.555000 0.655000  6.970000 0.720000 ;
-      RECT  6.800000 0.320000  6.970000 0.655000 ;
-      RECT  6.915000 1.445000  7.745000 1.615000 ;
-      RECT  6.915000 1.615000  7.330000 2.045000 ;
-      RECT  6.930000 0.995000  7.355000 1.270000 ;
-      RECT  7.140000 0.630000  7.355000 0.995000 ;
-      RECT  7.575000 0.255000  8.770000 0.425000 ;
-      RECT  7.575000 0.425000  7.745000 1.445000 ;
-      RECT  7.915000 0.595000  8.085000 1.935000 ;
-      RECT  7.915000 1.935000 10.425000 2.105000 ;
-      RECT  8.255000 0.425000  8.770000 0.465000 ;
-      RECT  8.645000 0.730000  8.850000 0.945000 ;
-      RECT  8.645000 0.945000  8.955000 1.275000 ;
-      RECT  9.105000 1.495000  9.975000 1.705000 ;
-      RECT  9.145000 0.295000  9.435000 0.735000 ;
-      RECT  9.145000 0.735000  9.975000 0.750000 ;
-      RECT  9.185000 0.750000  9.975000 0.905000 ;
-      RECT  9.805000 0.905000  9.975000 0.995000 ;
-      RECT  9.805000 0.995000 10.035000 1.325000 ;
-      RECT  9.805000 1.325000  9.975000 1.495000 ;
-      RECT  9.890000 1.875000 10.425000 1.935000 ;
-      RECT 10.165000 0.255000 10.425000 0.585000 ;
-      RECT 10.165000 2.105000 10.425000 2.465000 ;
-      RECT 10.255000 0.585000 10.425000 1.875000 ;
+      RECT  0.000000 -0.085000 10.580000 0.085000 ;
+      RECT  0.000000  2.635000 10.580000 2.805000 ;
+      RECT  0.175000  0.085000  0.345000 0.545000 ;
+      RECT  0.275000  2.135000  0.445000 2.635000 ;
+      RECT  0.985000  0.085000  1.365000 0.465000 ;
+      RECT  1.135000  2.215000  1.465000 2.635000 ;
+      RECT  2.020000  0.965000  2.245000 1.325000 ;
+      RECT  2.055000  0.085000  2.225000 0.525000 ;
+      RECT  2.075000  0.695000  2.565000 0.865000 ;
+      RECT  2.075000  0.865000  2.245000 0.965000 ;
+      RECT  2.075000  1.325000  2.245000 1.875000 ;
+      RECT  2.075000  1.875000  2.795000 2.045000 ;
+      RECT  2.075000  2.215000  2.405000 2.635000 ;
+      RECT  2.395000  0.255000  4.060000 0.425000 ;
+      RECT  2.395000  0.425000  2.565000 0.695000 ;
+      RECT  2.570000  1.535000  4.155000 1.705000 ;
+      RECT  2.575000  2.045000  2.795000 2.235000 ;
+      RECT  2.575000  2.235000  4.215000 2.405000 ;
+      RECT  2.790000  0.595000  2.960000 1.535000 ;
+      RECT  3.140000  1.895000  4.545000 2.065000 ;
+      RECT  3.240000  0.655000  4.450000 0.825000 ;
+      RECT  3.660000  0.425000  4.060000 0.455000 ;
+      RECT  3.985000  0.995000  4.405000 1.325000 ;
+      RECT  3.985000  1.325000  4.155000 1.535000 ;
+      RECT  4.230000  0.255000  5.130000 0.425000 ;
+      RECT  4.230000  0.425000  4.450000 0.655000 ;
+      RECT  4.375000  1.525000  4.905000 1.695000 ;
+      RECT  4.375000  1.695000  4.545000 1.895000 ;
+      RECT  4.480000  2.235000  4.885000 2.405000 ;
+      RECT  4.620000  0.595000  4.790000 1.375000 ;
+      RECT  4.620000  1.375000  4.905000 1.525000 ;
+      RECT  4.715000  1.895000  5.990000 2.065000 ;
+      RECT  4.715000  2.065000  4.885000 2.235000 ;
+      RECT  4.960000  0.425000  5.130000 1.035000 ;
+      RECT  4.960000  1.035000  5.215000 1.040000 ;
+      RECT  4.960000  1.040000  5.230000 1.045000 ;
+      RECT  4.960000  1.045000  5.240000 1.050000 ;
+      RECT  4.960000  1.050000  5.245000 1.205000 ;
+      RECT  5.055000  2.235000  5.385000 2.635000 ;
+      RECT  5.075000  1.205000  5.245000 1.895000 ;
+      RECT  5.300000  0.085000  5.470000 0.885000 ;
+      RECT  5.475000  1.445000  5.990000 1.715000 ;
+      RECT  5.700000  0.415000  5.990000 1.445000 ;
+      RECT  5.820000  2.065000  5.990000 2.275000 ;
+      RECT  5.820000  2.275000  9.115000 2.445000 ;
+      RECT  6.165000  0.265000  6.580000 0.485000 ;
+      RECT  6.165000  0.485000  6.385000 0.595000 ;
+      RECT  6.165000  0.595000  6.335000 2.105000 ;
+      RECT  6.525000  0.720000  6.970000 0.825000 ;
+      RECT  6.525000  0.825000  6.775000 0.890000 ;
+      RECT  6.525000  0.890000  6.695000 2.275000 ;
+      RECT  6.555000  0.655000  6.970000 0.720000 ;
+      RECT  6.800000  0.320000  6.970000 0.655000 ;
+      RECT  6.915000  1.445000  7.745000 1.615000 ;
+      RECT  6.915000  1.615000  7.330000 2.045000 ;
+      RECT  6.930000  0.995000  7.355000 1.270000 ;
+      RECT  7.140000  0.630000  7.355000 0.995000 ;
+      RECT  7.575000  0.255000  8.770000 0.425000 ;
+      RECT  7.575000  0.425000  7.745000 1.445000 ;
+      RECT  7.915000  0.595000  8.085000 1.935000 ;
+      RECT  7.915000  1.935000 10.425000 2.105000 ;
+      RECT  8.255000  0.425000  8.770000 0.465000 ;
+      RECT  8.645000  0.730000  8.850000 0.945000 ;
+      RECT  8.645000  0.945000  8.955000 1.275000 ;
+      RECT  9.105000  1.495000  9.975000 1.705000 ;
+      RECT  9.145000  0.295000  9.435000 0.735000 ;
+      RECT  9.145000  0.735000  9.975000 0.750000 ;
+      RECT  9.185000  0.750000  9.975000 0.905000 ;
+      RECT  9.615000  2.275000  9.945000 2.635000 ;
+      RECT  9.695000  0.085000  9.865000 0.565000 ;
+      RECT  9.805000  0.905000  9.975000 0.995000 ;
+      RECT  9.805000  0.995000 10.035000 1.325000 ;
+      RECT  9.805000  1.325000  9.975000 1.495000 ;
+      RECT  9.890000  1.875000 10.425000 1.935000 ;
+      RECT 10.165000  0.255000 10.425000 0.585000 ;
+      RECT 10.165000  2.105000 10.425000 2.465000 ;
+      RECT 10.255000  0.585000 10.425000 1.875000 ;
     LAYER mcon ;
-      RECT 4.735000 1.445000 4.905000 1.615000 ;
-      RECT 5.705000 0.765000 5.875000 0.935000 ;
-      RECT 6.215000 0.425000 6.385000 0.595000 ;
-      RECT 7.185000 0.765000 7.355000 0.935000 ;
-      RECT 7.185000 1.445000 7.355000 1.615000 ;
-      RECT 8.665000 0.765000 8.835000 0.935000 ;
-      RECT 9.175000 0.425000 9.345000 0.595000 ;
+      RECT  0.145000 -0.085000  0.315000 0.085000 ;
+      RECT  0.145000  2.635000  0.315000 2.805000 ;
+      RECT  0.605000 -0.085000  0.775000 0.085000 ;
+      RECT  0.605000  2.635000  0.775000 2.805000 ;
+      RECT  1.065000 -0.085000  1.235000 0.085000 ;
+      RECT  1.065000  2.635000  1.235000 2.805000 ;
+      RECT  1.525000 -0.085000  1.695000 0.085000 ;
+      RECT  1.525000  2.635000  1.695000 2.805000 ;
+      RECT  1.985000 -0.085000  2.155000 0.085000 ;
+      RECT  1.985000  2.635000  2.155000 2.805000 ;
+      RECT  2.445000 -0.085000  2.615000 0.085000 ;
+      RECT  2.445000  2.635000  2.615000 2.805000 ;
+      RECT  2.905000 -0.085000  3.075000 0.085000 ;
+      RECT  2.905000  2.635000  3.075000 2.805000 ;
+      RECT  3.365000 -0.085000  3.535000 0.085000 ;
+      RECT  3.365000  2.635000  3.535000 2.805000 ;
+      RECT  3.825000 -0.085000  3.995000 0.085000 ;
+      RECT  3.825000  2.635000  3.995000 2.805000 ;
+      RECT  4.285000 -0.085000  4.455000 0.085000 ;
+      RECT  4.285000  2.635000  4.455000 2.805000 ;
+      RECT  4.735000  1.445000  4.905000 1.615000 ;
+      RECT  4.745000 -0.085000  4.915000 0.085000 ;
+      RECT  4.745000  2.635000  4.915000 2.805000 ;
+      RECT  5.205000 -0.085000  5.375000 0.085000 ;
+      RECT  5.205000  2.635000  5.375000 2.805000 ;
+      RECT  5.665000 -0.085000  5.835000 0.085000 ;
+      RECT  5.665000  2.635000  5.835000 2.805000 ;
+      RECT  5.705000  0.765000  5.875000 0.935000 ;
+      RECT  6.125000 -0.085000  6.295000 0.085000 ;
+      RECT  6.125000  2.635000  6.295000 2.805000 ;
+      RECT  6.215000  0.425000  6.385000 0.595000 ;
+      RECT  6.585000 -0.085000  6.755000 0.085000 ;
+      RECT  6.585000  2.635000  6.755000 2.805000 ;
+      RECT  7.045000 -0.085000  7.215000 0.085000 ;
+      RECT  7.045000  2.635000  7.215000 2.805000 ;
+      RECT  7.185000  0.765000  7.355000 0.935000 ;
+      RECT  7.185000  1.445000  7.355000 1.615000 ;
+      RECT  7.505000 -0.085000  7.675000 0.085000 ;
+      RECT  7.505000  2.635000  7.675000 2.805000 ;
+      RECT  7.965000 -0.085000  8.135000 0.085000 ;
+      RECT  7.965000  2.635000  8.135000 2.805000 ;
+      RECT  8.425000 -0.085000  8.595000 0.085000 ;
+      RECT  8.425000  2.635000  8.595000 2.805000 ;
+      RECT  8.665000  0.765000  8.835000 0.935000 ;
+      RECT  8.885000 -0.085000  9.055000 0.085000 ;
+      RECT  8.885000  2.635000  9.055000 2.805000 ;
+      RECT  9.175000  0.425000  9.345000 0.595000 ;
+      RECT  9.345000 -0.085000  9.515000 0.085000 ;
+      RECT  9.345000  2.635000  9.515000 2.805000 ;
+      RECT  9.805000 -0.085000  9.975000 0.085000 ;
+      RECT  9.805000  2.635000  9.975000 2.805000 ;
+      RECT 10.265000 -0.085000 10.435000 0.085000 ;
+      RECT 10.265000  2.635000 10.435000 2.805000 ;
     LAYER met1 ;
       RECT 4.675000 1.415000 4.965000 1.460000 ;
       RECT 4.675000 1.460000 7.415000 1.600000 ;