Updating `.magic.lef` files using `lef write {cell} -toplayer`.

Only top layer ends up in port value, others end up in the obstruction layer.

Updating sky130_fd_sc_hdll 0.1.0.

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
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 046014a..4a8d1be 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_1.magic.lef
@@ -75,19 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -97,19 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -126,15 +100,38 @@
   END X
   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 bcaa46b..a50c026 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_2.magic.lef
@@ -75,21 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -99,21 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -129,15 +99,42 @@
   END X
   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 eb19589..befff0a 100644
--- a/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
+++ b/cells/a211o/sky130_fd_sc_hdll__a211o_4.magic.lef
@@ -81,31 +81,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -115,30 +90,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -161,22 +112,68 @@
   END X
   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 0fe6ce5..3d8a8a5 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_1.magic.lef
@@ -76,17 +76,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -96,16 +85,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -125,9 +104,27 @@
   END Y
   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 920324c..59dfbd0 100644
--- a/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
+++ b/cells/a211oi/sky130_fd_sc_hdll__a211oi_2.magic.lef
@@ -77,24 +77,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -104,23 +86,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -138,19 +103,51 @@
   END Y
   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 444241e..7fd9c25 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 ;
@@ -90,34 +82,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -127,31 +91,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -178,21 +117,77 @@
   END Y
   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 ce1ff97..c68f6da 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_1.magic.lef
@@ -66,20 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -89,21 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -119,19 +90,45 @@
   END X
   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 2a6e0b2..8f1b590 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_2.magic.lef
@@ -66,22 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -91,21 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -125,23 +94,51 @@
   END X
   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 07d7f93..edaa676 100644
--- a/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
+++ b/cells/a21bo/sky130_fd_sc_hdll__a21bo_4.magic.lef
@@ -70,28 +70,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -101,28 +79,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -140,29 +96,70 @@
   END X
   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 69758da..04dea31 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_1.magic.lef
@@ -66,18 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -87,18 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -116,13 +92,34 @@
   END Y
   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 eeedc2a..2493dcc 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_2.magic.lef
@@ -69,22 +69,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -94,22 +78,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -128,17 +96,46 @@
   END Y
   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 32c9961..d01e593 100644
--- a/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
+++ b/cells/a21boi/sky130_fd_sc_hdll__a21boi_4.magic.lef
@@ -69,30 +69,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -102,30 +78,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -149,25 +101,70 @@
   END Y
   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 069d0d1..62ca4f4 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_1.magic.lef
@@ -67,18 +67,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -88,18 +76,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -115,14 +91,35 @@
   END X
   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 a1da1f9..2a9615d 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_2.magic.lef
@@ -66,20 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -89,20 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -118,14 +90,39 @@
   END X
   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 61e5c21..44e1583 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_4.magic.lef
@@ -70,27 +70,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -100,27 +79,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -140,22 +98,61 @@
   END X
   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 0e1ac1e..aff5a7f 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_6.magic.lef
@@ -70,30 +70,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -103,30 +79,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -150,21 +102,66 @@
   END X
   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 2a9bcdb..06a3e4f 100644
--- a/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
+++ b/cells/a21o/sky130_fd_sc_hdll__a21o_8.magic.lef
@@ -70,33 +70,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -106,33 +79,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -158,21 +104,72 @@
   END X
   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 cf2c855..9e53fdc 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_1.magic.lef
@@ -67,16 +67,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -86,15 +76,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -114,10 +95,26 @@
   END Y
   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 cdd6215..493a9bf 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_2.magic.lef
@@ -68,20 +68,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -91,19 +77,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -123,13 +96,37 @@
   END Y
   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 8e5dd90..2dbdb29 100644
--- a/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
+++ b/cells/a21oi/sky130_fd_sc_hdll__a21oi_4.magic.lef
@@ -69,28 +69,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -100,27 +78,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -144,19 +101,59 @@
   END Y
   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 f6776d4..3dc58c4 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_1.magic.lef
@@ -86,19 +86,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -108,19 +95,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -146,13 +120,36 @@
   END Y
   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 2bad8ab..51ff2e9 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_2.magic.lef
@@ -89,26 +89,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -118,24 +98,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -156,24 +118,59 @@
   END Y
   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 f668b68..46dfced 100644
--- a/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
+++ b/cells/a221oi/sky130_fd_sc_hdll__a221oi_4.magic.lef
@@ -90,40 +90,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -133,34 +99,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -189,28 +127,87 @@
   END Y
   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 b8473ff..06deecc 100644
--- a/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
+++ b/cells/a222oi/sky130_fd_sc_hdll__a222oi_1.magic.lef
@@ -93,20 +93,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -116,19 +102,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -149,13 +122,37 @@
   END Y
   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 260a573..a4faf07 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_1.magic.lef
@@ -77,19 +77,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -99,19 +86,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -129,15 +103,38 @@
   END X
   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 7cf2fad..4ad404c 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_2.magic.lef
@@ -77,21 +77,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -101,21 +86,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -133,17 +103,44 @@
   END X
   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 2c6f98e..cdab5fb 100644
--- a/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
+++ b/cells/a22o/sky130_fd_sc_hdll__a22o_4.magic.lef
@@ -80,29 +80,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -112,29 +89,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -156,26 +110,69 @@
   END X
   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 8ddb0e4..c27cbff 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_1.magic.lef
@@ -77,18 +77,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -98,18 +86,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -132,9 +108,30 @@
   END Y
   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 b1f4383..094eb7f 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_2.magic.lef
@@ -91,6 +91,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
@@ -116,6 +118,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 475b963..cec1e85 100644
--- a/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
+++ b/cells/a22oi/sky130_fd_sc_hdll__a22oi_4.magic.lef
@@ -75,32 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -110,32 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -157,27 +105,76 @@
   END Y
   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 fed67b7..598fe6a 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_1.magic.lef
@@ -90,6 +90,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
@@ -113,6 +115,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 dddb377..7dc723f 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_2.magic.lef
@@ -92,6 +92,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
@@ -117,6 +119,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 dd1d384..636f10b 100644
--- a/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
+++ b/cells/a2bb2o/sky130_fd_sc_hdll__a2bb2o_4.magic.lef
@@ -81,33 +81,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -117,32 +90,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -166,39 +113,88 @@
   END X
   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 2db661c..e7b9f9e 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_1.magic.lef
@@ -90,6 +90,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
@@ -112,6 +114,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 12fb7b3..45ed929 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_2.magic.lef
@@ -77,27 +77,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -107,25 +86,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -144,27 +104,64 @@
   END Y
   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 7119ddb..b7a89da 100644
--- a/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
+++ b/cells/a2bb2oi/sky130_fd_sc_hdll__a2bb2oi_4.magic.lef
@@ -78,41 +78,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -122,38 +87,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -176,40 +109,104 @@
   END Y
   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 35bf8d4..1d45c7f 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_1.magic.lef
@@ -76,18 +76,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -97,18 +85,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -126,15 +102,36 @@
   END X
   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 a712f97..be1a356 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_2.magic.lef
@@ -76,20 +76,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -99,20 +85,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -132,14 +104,39 @@
   END X
   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 742f758..2e3c9a9 100644
--- a/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
+++ b/cells/a31o/sky130_fd_sc_hdll__a31o_4.magic.lef
@@ -81,29 +81,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -113,30 +90,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -156,23 +109,67 @@
   END X
   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 a4b055d..45602d1 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_1.magic.lef
@@ -76,17 +76,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -96,17 +85,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -124,9 +102,28 @@
   END Y
   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 d372a9c..51b6058 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_2.magic.lef
@@ -76,22 +76,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -101,23 +85,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -139,15 +106,45 @@
   END Y
   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 4450d8b..6f116d8 100644
--- a/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
+++ b/cells/a31oi/sky130_fd_sc_hdll__a31oi_4.magic.lef
@@ -75,32 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -110,34 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -157,22 +103,73 @@
   END Y
   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 e36ffa7..1312e3b 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_1.magic.lef
@@ -86,20 +86,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -109,20 +95,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -140,19 +112,44 @@
   END X
   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 a227f93..b0c7a49 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_2.magic.lef
@@ -85,22 +85,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -110,22 +94,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -145,18 +113,47 @@
   END X
   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 3f892ff..4109c76 100644
--- a/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
+++ b/cells/a32o/sky130_fd_sc_hdll__a32o_4.magic.lef
@@ -85,32 +85,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -120,33 +94,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -168,30 +115,80 @@
   END X
   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 d0cc50a..f4deb73 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_1.magic.lef
@@ -84,18 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -105,18 +93,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -135,12 +111,33 @@
   END Y
   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 a3206d0..c43e155 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_2.magic.lef
@@ -85,26 +85,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -114,26 +94,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -153,21 +113,58 @@
   END Y
   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 cdfab36..6039dec 100644
--- a/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
+++ b/cells/a32oi/sky130_fd_sc_hdll__a32oi_4.magic.lef
@@ -118,6 +118,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
@@ -160,6 +162,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 9c0c42d..9e735ff 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_1.magic.lef
@@ -58,15 +58,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -76,16 +67,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -103,13 +84,29 @@
   END X
   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 a08d4df..e2f57e0 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_2.magic.lef
@@ -58,17 +58,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -78,18 +67,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -107,13 +84,33 @@
   END X
   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 114e869..36a5b2d 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_4.magic.lef
@@ -57,20 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -80,21 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -117,13 +88,39 @@
   END X
   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 1024842..cd90d6c 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_6.magic.lef
@@ -61,26 +61,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -90,27 +70,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -134,14 +93,52 @@
   END X
   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 1a8b4c2..e3fe544 100644
--- a/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
+++ b/cells/and2/sky130_fd_sc_hdll__and2_8.magic.lef
@@ -61,29 +61,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -93,30 +70,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -142,14 +95,58 @@
   END X
   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 9067756..1fb9022 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_1.magic.lef
@@ -57,18 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -78,18 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -107,19 +83,40 @@
   END X
   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 1b4577d..d0bd558 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_2.magic.lef
@@ -57,20 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -80,20 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -111,19 +83,44 @@
   END X
   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 5963f26..1a0965d 100644
--- a/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
+++ b/cells/and2b/sky130_fd_sc_hdll__and2b_4.magic.lef
@@ -57,21 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -81,22 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -115,17 +84,45 @@
   END X
   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 d108615..caceeef 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_1.magic.lef
@@ -66,16 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -85,20 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -116,15 +92,36 @@
   END X
   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 7c6aa97..487dc10 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_2.magic.lef
@@ -79,6 +79,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
@@ -103,6 +105,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 655d1b5..a076cc3 100644
--- a/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
+++ b/cells/and3/sky130_fd_sc_hdll__and3_4.magic.lef
@@ -67,22 +67,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -92,23 +76,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -131,16 +98,46 @@
   END X
   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 184e0e6..afb00c2 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_1.magic.lef
@@ -66,19 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -88,22 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -121,17 +92,43 @@
   END X
   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 81ad882..2b72abb 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_2.magic.lef
@@ -67,21 +67,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -91,24 +76,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -128,15 +95,45 @@
   END X
   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 0efbd4b..5da53d4 100644
--- a/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
+++ b/cells/and3b/sky130_fd_sc_hdll__and3b_4.magic.lef
@@ -66,23 +66,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -92,24 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -129,21 +94,53 @@
   END X
   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 4cbbdaa..b66f412 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_1.magic.lef
@@ -75,17 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -95,19 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -125,12 +101,33 @@
   END X
   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 518a7d7..54a40f9 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_2.magic.lef
@@ -75,19 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -97,21 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -129,12 +101,37 @@
   END X
   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 6b68786..24ba9e4 100644
--- a/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
+++ b/cells/and4/sky130_fd_sc_hdll__and4_4.magic.lef
@@ -75,22 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -100,24 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -140,13 +106,44 @@
   END X
   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 2096ebd..1b77c0b 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_1.magic.lef
@@ -75,20 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -98,21 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -130,20 +101,46 @@
   END X
   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 6480800..2172fdc 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_2.magic.lef
@@ -75,22 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -100,23 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -136,22 +103,52 @@
   END X
   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 897b93e..f6d80bf 100644
--- a/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
+++ b/cells/and4b/sky130_fd_sc_hdll__and4b_4.magic.lef
@@ -75,23 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -101,25 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -139,16 +103,49 @@
   END X
   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 f28bee2..2e5dec9 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_1.magic.lef
@@ -76,21 +76,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -100,23 +85,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -134,28 +102,57 @@
   END X
   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 22a199b..047ab3b 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_2.magic.lef
@@ -75,23 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -101,24 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -135,27 +100,59 @@
   END X
   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 a372d67..7ce633b 100644
--- a/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
+++ b/cells/and4bb/sky130_fd_sc_hdll__and4bb_4.magic.lef
@@ -75,27 +75,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -105,28 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -146,26 +103,66 @@
   END X
   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 620407e..b71932c 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_1.magic.lef
@@ -56,6 +56,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
@@ -73,6 +75,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 1f1a5ef..c137964 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_12.magic.lef
@@ -78,6 +78,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
@@ -117,6 +119,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 1e8b9fc..7198e40 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_16.magic.lef
@@ -48,46 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -97,46 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -175,17 +95,94 @@
   END X
   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 59435e8..14bd487 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_2.magic.lef
@@ -58,6 +58,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
@@ -77,6 +79,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 00fa3af..23efa64 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_4.magic.lef
@@ -61,6 +61,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
@@ -83,6 +85,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 058528a..fb4dc84 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_6.magic.lef
@@ -66,6 +66,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
@@ -93,6 +95,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 3dc3321..2b3ee30 100644
--- a/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
+++ b/cells/buf/sky130_fd_sc_hdll__buf_8.magic.lef
@@ -70,6 +70,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
@@ -101,6 +103,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 ec73ed1..d93bd75 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_16.magic.lef
@@ -48,52 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -103,52 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -185,31 +93,120 @@
   END X
   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 de2f5fe..fd6270f 100644
--- a/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
+++ b/cells/bufbuf/sky130_fd_sc_hdll__bufbuf_8.magic.lef
@@ -48,32 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -83,32 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -134,27 +82,76 @@
   END X
   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 5bd0230..3920df1 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_16.magic.lef
@@ -48,49 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -100,49 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -179,26 +93,109 @@
   END Y
   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 985e13a..2a82e62 100644
--- a/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
+++ b/cells/bufinv/sky130_fd_sc_hdll__bufinv_8.magic.lef
@@ -48,31 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -82,31 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -132,20 +82,67 @@
   END Y
   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 e36e583..dee7e24 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_1.magic.lef
@@ -48,14 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -65,14 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -90,13 +74,26 @@
   END X
   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 89601ed..5e9bdd1 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_12.magic.lef
@@ -48,36 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -87,36 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -146,16 +86,73 @@
   END X
   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 83a655c..e0c5632 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_16.magic.lef
@@ -48,42 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -93,43 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -164,11 +91,81 @@
   END X
   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 5bac9b5..b4778b9 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_2.magic.lef
@@ -48,16 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -67,16 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -96,11 +76,28 @@
   END X
   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 17b797b..d0eba28 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_4.magic.lef
@@ -48,19 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -70,19 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -106,12 +80,35 @@
   END X
   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 cfda866..7cab357 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_6.magic.lef
@@ -48,24 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -75,24 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -116,9 +80,42 @@
   END X
   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 a370b34..732bf04 100644
--- a/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
+++ b/cells/clkbuf/sky130_fd_sc_hdll__clkbuf_8.magic.lef
@@ -48,27 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -78,27 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -124,9 +82,48 @@
   END X
   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 76aec34..6554478 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_1.magic.lef
@@ -48,14 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -65,15 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -89,6 +72,23 @@
         RECT 0.515000 1.290000 0.895000 2.465000 ;
     END
   END Y
+  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 8d46564..f9ee29d 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_12.magic.lef
@@ -48,36 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -87,39 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -151,6 +88,69 @@
         RECT 8.115000 1.630000 8.385000 2.465000 ;
     END
   END Y
+  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 73037d0..1d7e35f 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 ;
@@ -60,45 +52,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -108,50 +61,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -186,6 +95,95 @@
         RECT 11.375000 1.665000 11.630000 2.450000 ;
     END
   END Y
+  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 7b74c08..be14f15 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_2.magic.lef
@@ -48,16 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -67,16 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -95,6 +75,26 @@
         RECT 1.520000 0.895000 2.155000 1.460000 ;
     END
   END Y
+  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 96fed84..4f58c83 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_4.magic.lef
@@ -48,20 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -71,21 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -107,6 +78,35 @@
         RECT 3.270000 0.895000 3.570000 1.460000 ;
     END
   END Y
+  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 1816371..1fefad5 100644
--- a/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
+++ b/cells/clkinv/sky130_fd_sc_hdll__clkinv_8.magic.lef
@@ -48,28 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -79,30 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -129,6 +83,52 @@
         RECT 6.060000 0.865000 6.330000 1.460000 ;
     END
   END Y
+  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 e5ecc1c..49db8e6 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_2.magic.lef
@@ -48,14 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -65,16 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -89,6 +71,24 @@
         RECT 0.785000 0.750000 1.235000 2.455000 ;
     END
   END Y
+  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 1a088b6..53036a4 100644
--- a/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
+++ b/cells/clkinvlp/sky130_fd_sc_hdll__clkinvlp_4.magic.lef
@@ -48,17 +48,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -68,18 +57,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -97,6 +74,29 @@
         RECT 1.655000 1.295000 1.985000 2.465000 ;
     END
   END Y
+  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 59275a5..312a8bf 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_1.magic.lef
@@ -73,21 +73,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -97,21 +82,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -128,17 +98,44 @@
   END X
   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 f709cea..52f294a 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_2.magic.lef
@@ -73,23 +73,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -99,23 +82,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -132,17 +98,48 @@
   END X
   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 992f2bb..c599908 100644
--- a/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
+++ b/cells/clkmux2/sky130_fd_sc_hdll__clkmux2_4.magic.lef
@@ -73,26 +73,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -102,26 +82,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -143,17 +103,54 @@
   END X
   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 b61e1bc..03849bd 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 SIGNAL ;
     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 SIGNAL ;
     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 0d0baa0..7a11871 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_12.magic.lef
@@ -40,23 +40,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -67,27 +50,44 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 01536dd..9f9f372 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_3.magic.lef
@@ -40,14 +40,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -58,18 +50,26 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 39ebee0..756bb41 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_4.magic.lef
@@ -40,15 +40,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -59,19 +50,28 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 52123b2..057e61b 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_6.magic.lef
@@ -40,17 +40,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -61,21 +50,32 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 575b41a..bbe3976 100644
--- a/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
+++ b/cells/decap/sky130_fd_sc_hdll__decap_8.magic.lef
@@ -40,19 +40,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -63,23 +50,36 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 2217598..7525b55 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 ;
@@ -87,35 +80,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -125,103 +89,133 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 d771de9..5a97aa5 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 ;
@@ -91,37 +84,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -131,105 +93,137 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 a353eea..db35bcf 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 ;
@@ -95,41 +86,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -139,110 +95,148 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 b3a0406..9901ff7 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 ;
@@ -119,6 +112,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
@@ -160,6 +155,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
@@ -188,6 +185,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 ;
@@ -207,6 +205,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 ;
@@ -221,8 +221,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 91c186c..8f6e8c7 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 ;
@@ -123,6 +116,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
@@ -166,6 +161,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
@@ -194,6 +191,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 ;
@@ -213,6 +211,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 ;
@@ -227,8 +227,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 e7e94ad..73bf873 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 ;
@@ -131,6 +124,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
@@ -178,6 +173,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
@@ -206,6 +203,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 ;
@@ -225,6 +223,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 ;
@@ -239,8 +239,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 d7be7f8..5ab4c30 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_1.magic.lef
@@ -79,28 +79,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -110,71 +88,89 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 ed7a3c8..a30a9d6 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_2.magic.lef
@@ -80,29 +80,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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
@@ -112,73 +89,92 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 0bd3841..23b6562 100644
--- a/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
+++ b/cells/dlrtn/sky130_fd_sc_hdll__dlrtn_4.magic.lef
@@ -85,32 +85,6 @@
     DIRECTION INOUT ;
     USE SIGNAL ;
     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 ;